From 7e8abf0ba03c01b4fa4bf93a2a000b34ac42afa0 Mon Sep 17 00:00:00 2001 From: "victor.gaborit" Date: Thu, 14 Mar 2024 19:07:08 +0100 Subject: [PATCH] =?UTF-8?q?resolution=20de=20bug=20sur=20les=20diff=C3=A9r?= =?UTF-8?q?entes=20routes=20certaines=20=C3=A9taient=20identique=20et=20ut?= =?UTF-8?q?ilisation=20getItems=20pour=20GetUserById?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- API_SQLuedo/API/Controllers/UserController.cs | 10 +++++----- API_SQLuedo/API/Service/UserDataServiceAPI.cs | 2 +- API_SQLuedo/DbDataManager/Service/UserDataService.cs | 2 +- API_SQLuedo/Shared/Extensions.cs | 1 - API_SQLuedo/Shared/IGenericDataService.cs | 2 +- API_SQLuedo/Shared/UserDataService.cs | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/API_SQLuedo/API/Controllers/UserController.cs b/API_SQLuedo/API/Controllers/UserController.cs index 77e8cb1..40476a3 100644 --- a/API_SQLuedo/API/Controllers/UserController.cs +++ b/API_SQLuedo/API/Controllers/UserController.cs @@ -29,15 +29,15 @@ namespace API.Controllers return Ok(users); } - [HttpGet("user/{id}")] + [HttpGet("user/id/{id}")] [ProducesResponseType(typeof(UserDTO), 200)] [ProducesResponseType(typeof(string), 404)] - public IActionResult GetUserById(int id) + public async Task GetUserById(int id) { try { logger.LogInformation("[INFORMATION] Utilisateur avec l'id {id} a été trouvé.", id); - return Ok(dataService.userService.GetUserById(id)); + return Ok( (await dataService.userService.GetItems(1, 1, null, UserOrderCriteria.ById.ToString().Substring(2), id))); } catch (ArgumentException) { @@ -46,7 +46,7 @@ namespace API.Controllers } } - [HttpGet("user/{username}")] + [HttpGet("user/username/{username}")] [ProducesResponseType(typeof(UserDTO), 200)] [ProducesResponseType(typeof(string), 404)] public IActionResult GetUserByUsername(string username) @@ -63,7 +63,7 @@ namespace API.Controllers } } - [HttpDelete("user/{id}")] + [HttpDelete] [ProducesResponseType(typeof(UserDTO), 200)] [ProducesResponseType(typeof(string), 404)] public IActionResult DeleteUser(int id) diff --git a/API_SQLuedo/API/Service/UserDataServiceAPI.cs b/API_SQLuedo/API/Service/UserDataServiceAPI.cs index 93e366b..ca43ae5 100644 --- a/API_SQLuedo/API/Service/UserDataServiceAPI.cs +++ b/API_SQLuedo/API/Service/UserDataServiceAPI.cs @@ -40,7 +40,7 @@ public class UserDataServiceApi(IUserService userService) : IUserSer throw new NotImplementedException(); } - public async Task> GetItems(int page, int count, object orderCriteria, string? filter = null, object? valueFilter = null) + public async Task> GetItems(int page, int count, object? orderCriteria = null, string? filter = null, object? valueFilter = null) { var usersEntities = await userService.GetItems(page, count, orderCriteria, filter, valueFilter); return usersEntities.Select(e => e).ToList(); diff --git a/API_SQLuedo/DbDataManager/Service/UserDataService.cs b/API_SQLuedo/DbDataManager/Service/UserDataService.cs index 6af4805..89802f3 100644 --- a/API_SQLuedo/DbDataManager/Service/UserDataService.cs +++ b/API_SQLuedo/DbDataManager/Service/UserDataService.cs @@ -106,7 +106,7 @@ public class UserDataService : IUserService throw new NotImplementedException(); } - public async Task> GetItems(int page, int count, object orderCriteria, string? filter = null, object? valueFilter = null) + public async Task> GetItems(int page, int count, object? orderCriteria = null, string? filter = null, object? valueFilter = null) { var user = (await DbContext.GetItemsWithFilter(page, count, orderCriteria, filter, valueFilter)); if(user == null) diff --git a/API_SQLuedo/Shared/Extensions.cs b/API_SQLuedo/Shared/Extensions.cs index d99011e..95c07f4 100644 --- a/API_SQLuedo/Shared/Extensions.cs +++ b/API_SQLuedo/Shared/Extensions.cs @@ -121,7 +121,6 @@ namespace Shared query = query.Provider.CreateQuery(orderedQuery); } - //var orderingItem = query.OrderBy(s => s.Equals(orderCriteria)).ToList(); var orderingItem = query.ToList(); return Task.FromResult>(orderingItem); } diff --git a/API_SQLuedo/Shared/IGenericDataService.cs b/API_SQLuedo/Shared/IGenericDataService.cs index 334892a..5d5acc1 100644 --- a/API_SQLuedo/Shared/IGenericDataService.cs +++ b/API_SQLuedo/Shared/IGenericDataService.cs @@ -11,7 +11,7 @@ namespace Shared public Task AddItem(T? item); public Task DeleteItem(int id); public Task UpdateItem(int? id, TDto? newItem) where TDto : class; - public Task> GetItems(int page, int count, object orderCriteria, string? filter = null, object? valueFilter = null); + public Task> GetItems(int page, int count, object? orderCriteria = null, string? filter = null, object? valueFilter = null); } } diff --git a/API_SQLuedo/Shared/UserDataService.cs b/API_SQLuedo/Shared/UserDataService.cs index a5a740a..2761375 100644 --- a/API_SQLuedo/Shared/UserDataService.cs +++ b/API_SQLuedo/Shared/UserDataService.cs @@ -134,7 +134,7 @@ namespace Shared throw new NotImplementedException(); } - public async Task> GetItems(int page, int count, object orderCriteria, string? filter = null, object? valueFilter = null) + public async Task> GetItems(int page, int count, object? orderCriteria = null, string? filter = null, object? valueFilter = null) { var usersEntities = await DbContext.GetItemsWithFilter(page, count, orderCriteria, filter, valueFilter); return usersEntities.Select(e => e).ToList().Select(e => e.FromEntityToDTO());