resolution de bug sur les différentes routes certaines étaient identique et utilisation getItems pour GetUserById
continuous-integration/drone/push Build is failing Details

MethodeExtensions
Victor GABORIT 1 year ago
parent 727311c99b
commit 7e8abf0ba0

@ -29,15 +29,15 @@ namespace API.Controllers
return Ok(users); return Ok(users);
} }
[HttpGet("user/{id}")] [HttpGet("user/id/{id}")]
[ProducesResponseType(typeof(UserDTO), 200)] [ProducesResponseType(typeof(UserDTO), 200)]
[ProducesResponseType(typeof(string), 404)] [ProducesResponseType(typeof(string), 404)]
public IActionResult GetUserById(int id) public async Task<IActionResult> GetUserById(int id)
{ {
try try
{ {
logger.LogInformation("[INFORMATION] Utilisateur avec l'id {id} a été trouvé.", id); 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) catch (ArgumentException)
{ {
@ -46,7 +46,7 @@ namespace API.Controllers
} }
} }
[HttpGet("user/{username}")] [HttpGet("user/username/{username}")]
[ProducesResponseType(typeof(UserDTO), 200)] [ProducesResponseType(typeof(UserDTO), 200)]
[ProducesResponseType(typeof(string), 404)] [ProducesResponseType(typeof(string), 404)]
public IActionResult GetUserByUsername(string username) public IActionResult GetUserByUsername(string username)
@ -63,7 +63,7 @@ namespace API.Controllers
} }
} }
[HttpDelete("user/{id}")] [HttpDelete]
[ProducesResponseType(typeof(UserDTO), 200)] [ProducesResponseType(typeof(UserDTO), 200)]
[ProducesResponseType(typeof(string), 404)] [ProducesResponseType(typeof(string), 404)]
public IActionResult DeleteUser(int id) public IActionResult DeleteUser(int id)

@ -40,7 +40,7 @@ public class UserDataServiceApi(IUserService<UserEntity> userService) : IUserSer
throw new NotImplementedException(); throw new NotImplementedException();
} }
public async Task<IEnumerable<UserEntity>> GetItems(int page, int count, object orderCriteria, string? filter = null, object? valueFilter = null) public async Task<IEnumerable<UserEntity>> GetItems(int page, int count, object? orderCriteria = null, string? filter = null, object? valueFilter = null)
{ {
var usersEntities = await userService.GetItems(page, count, orderCriteria, filter, valueFilter); var usersEntities = await userService.GetItems(page, count, orderCriteria, filter, valueFilter);
return usersEntities.Select(e => e).ToList(); return usersEntities.Select(e => e).ToList();

@ -106,7 +106,7 @@ public class UserDataService : IUserService<UserEntity>
throw new NotImplementedException(); throw new NotImplementedException();
} }
public async Task<IEnumerable<UserEntity>> GetItems(int page, int count, object orderCriteria, string? filter = null, object? valueFilter = null) public async Task<IEnumerable<UserEntity>> GetItems(int page, int count, object? orderCriteria = null, string? filter = null, object? valueFilter = null)
{ {
var user = (await DbContext.GetItemsWithFilter<UserEntity>(page, count, orderCriteria, filter, valueFilter)); var user = (await DbContext.GetItemsWithFilter<UserEntity>(page, count, orderCriteria, filter, valueFilter));
if(user == null) if(user == null)

@ -121,7 +121,6 @@ namespace Shared
query = query.Provider.CreateQuery<T>(orderedQuery); query = query.Provider.CreateQuery<T>(orderedQuery);
} }
//var orderingItem = query.OrderBy(s => s.Equals(orderCriteria)).ToList();
var orderingItem = query.ToList(); var orderingItem = query.ToList();
return Task.FromResult<IEnumerable<T?>>(orderingItem); return Task.FromResult<IEnumerable<T?>>(orderingItem);
} }

@ -11,7 +11,7 @@ namespace Shared
public Task<T?> AddItem(T? item); public Task<T?> AddItem(T? item);
public Task<bool> DeleteItem(int id); public Task<bool> DeleteItem(int id);
public Task<T> UpdateItem<TDto>(int? id, TDto? newItem) where TDto : class; public Task<T> UpdateItem<TDto>(int? id, TDto? newItem) where TDto : class;
public Task<IEnumerable<T>> GetItems(int page, int count, object orderCriteria, string? filter = null, object? valueFilter = null); public Task<IEnumerable<T>> GetItems(int page, int count, object? orderCriteria = null, string? filter = null, object? valueFilter = null);
} }
} }

@ -134,7 +134,7 @@ namespace Shared
throw new NotImplementedException(); throw new NotImplementedException();
} }
public async Task<IEnumerable<UserDTO>> GetItems(int page, int count, object orderCriteria, string? filter = null, object? valueFilter = null) public async Task<IEnumerable<UserDTO>> GetItems(int page, int count, object? orderCriteria = null, string? filter = null, object? valueFilter = null)
{ {
var usersEntities = await DbContext.GetItemsWithFilter<UserEntity>(page, count, orderCriteria, filter, valueFilter); var usersEntities = await DbContext.GetItemsWithFilter<UserEntity>(page, count, orderCriteria, filter, valueFilter);
return usersEntities.Select(e => e).ToList().Select(e => e.FromEntityToDTO()); return usersEntities.Select(e => e).ToList().Select(e => e.FromEntityToDTO());

Loading…
Cancel
Save