Provider service works with guids (#424)

ita-social-projects · Nov 4, 2021 · 988f4b6 · 988f4b6
1 parent f620881
commit 988f4b6
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 27 deletions.
diff --git a/OutOfSchool/OutOfSchool.DataAccess/Repository/IProviderRepository.cs b/OutOfSchool/OutOfSchool.DataAccess/Repository/IProviderRepository.cs
@@ -1,8 +1,9 @@
-using OutOfSchool.Services.Models;
+using System;
+using OutOfSchool.Services.Models;
 
 namespace OutOfSchool.Services.Repository
 {
-    public interface IProviderRepository : IEntityRepository<Provider>, IExistable<Provider>
+    public interface IProviderRepository : ISensitiveEntityRepository<Provider>, IExistable<Provider>
     {
         bool ExistsUserId(string id);
     }

diff --git a/OutOfSchool/OutOfSchool.DataAccess/Repository/ProviderRepository.cs b/OutOfSchool/OutOfSchool.DataAccess/Repository/ProviderRepository.cs
@@ -6,7 +6,7 @@
 
 namespace OutOfSchool.Services.Repository
 {
-    public class ProviderRepository : EntityRepository<Provider>, IProviderRepository
+    public class ProviderRepository : SensitiveEntityRepository<Provider>, IProviderRepository
     {
         private readonly OutOfSchoolDbContext db;
 

diff --git a/OutOfSchool/OutOfSchool.WebApi/Controllers/V1/ProviderController.cs b/OutOfSchool/OutOfSchool.WebApi/Controllers/V1/ProviderController.cs
@@ -71,21 +71,10 @@ public async Task<IActionResult> Get()
         /// <returns>Provider.</returns>
         [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(ProviderDto))]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        [HttpGet("{providerId:long}")]
+        [HttpGet("{providerId:Guid}")]
         [AllowAnonymous]
-        public async Task<IActionResult> GetById(long providerId)
+        public async Task<IActionResult> GetById(Guid providerId)
         {
-            try
-            {
-                this.ValidateId(providerId, localizer);
-            }
-            catch (ArgumentOutOfRangeException ex)
-            {
-                logger.LogError(ex, $"Validation failed for provider ID: {providerId}");
-
-                return BadRequest("Provider data is missing or invalid.");
-            }
-
             var provider = await providerService.GetById(providerId).ConfigureAwait(false);
 
             if (provider == null)
@@ -210,18 +199,16 @@ public async Task<IActionResult> Update(ProviderDto providerModel)
         /// <summary>
         /// Delete a specific Provider from the database.
         /// </summary>
-        /// <param name="id">Provider's key.</param>
+        /// <param name="uid">Provider's key.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
         [Authorize(Roles = "provider,admin")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status401Unauthorized)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        [HttpDelete("{id}")]
-        public async Task<IActionResult> Delete(long id)
+        [HttpDelete("{uid:guid}")]
+        public async Task<IActionResult> Delete(Guid uid)
         {
-            this.ValidateId(id, localizer);
-
-            await providerService.Delete(id).ConfigureAwait(false);
+            await providerService.Delete(uid).ConfigureAwait(false);
 
             return NoContent();
         }

diff --git a/OutOfSchool/OutOfSchool.WebApi/Services/IAddressService.cs b/OutOfSchool/OutOfSchool.WebApi/Services/IAddressService.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 using OutOfSchool.WebApi.Models;

diff --git a/OutOfSchool/OutOfSchool.WebApi/Services/IProviderService.cs b/OutOfSchool/OutOfSchool.WebApi/Services/IProviderService.cs
@@ -29,7 +29,7 @@ public interface IProviderService
         /// </summary>
         /// <param name="id">Key in the table.</param>
         /// <returns>Provider.</returns>
-        Task<ProviderDto> GetById(long id);
+        Task<ProviderDto> GetById(Guid id);
 
         /// <summary>
         /// Get entity by User id.
@@ -52,6 +52,6 @@ public interface IProviderService
         /// </summary>
         /// <param name="id">Provider's key.</param>
         /// <returns>A <see cref="Task"/> representing the result of the asynchronous operation.</returns>
-        Task Delete(long id);
+        Task Delete(Guid id);
     }
 }
diff --git a/OutOfSchool/OutOfSchool.WebApi/Services/ProviderService.cs b/OutOfSchool/OutOfSchool.WebApi/Services/ProviderService.cs
@@ -119,7 +119,7 @@ public async Task<IEnumerable<ProviderDto>> GetAll()
         }
 
         /// <inheritdoc/>
-        public async Task<ProviderDto> GetById(long id)
+        public async Task<ProviderDto> GetById(Guid id)
         {
             logger.LogInformation($"Getting Provider by Id started. Looking Id = {id}.");
 
@@ -193,7 +193,7 @@ public async Task<ProviderDto> Update(ProviderDto providerDto, string userId, st
         }
 
         /// <inheritdoc/>
-        public async Task Delete(long id)
+        public async Task Delete(Guid id)
         {
             // BUG: Possible bug with deleting provider not owned by the user itself.
             // TODO: add unit tests to check ownership functionality