Yoann/ldap-cesi
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

feat/pagination #17

Merged
Yoann merged 3 commits from feat/pagination into dev 2025-03-08 18:34:03 +01:00
Conversation 0 Commits 3 Files Changed 30 +525 -272
30 changed files with 525 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ldap-cesi/Configurations/Conf.cs
View File

@ -62,9 +62,9 @@ public static class Conf
{
builder.Services.AddCors(options =>
{
options.AddPolicy("AllowAll",
options.AddPolicy("AllowSpecific",
builder => builder
.AllowAnyOrigin()
.WithOrigins("http://localhost:3000")
.AllowAnyMethod()
.AllowAnyHeader());
});

14
ldap-cesi/Controllers/RoleController.cs
View File

@ -23,10 +23,10 @@ namespace ldap_cesi.Controllers
/// <returns>Un tableau de rôle</returns>
[HttpGet]
[Authorize(Roles = "admin")]
public async Task<IActionResult> GetAllRoles()
public async Task<IActionResult> GetAllRoles([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 10)
{
var result = await _roleService.GetAll();
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
var result = await _roleService.GetAll(pageNumber, pageSize);
return result.Success ? Ok(result) : BadRequest(result);
}
// GET: api/Role/{id}
@ -40,7 +40,7 @@ namespace ldap_cesi.Controllers
public async Task<IActionResult> GetRoleById(int id)
{
var result = await _roleService.GetById(id);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
return result.Success ? Ok(result) : BadRequest(result);
}
// POST: api/Role
@ -54,7 +54,7 @@ namespace ldap_cesi.Controllers
public async Task<IActionResult> CreateRole([FromBody] RoleCreateDto roleDto)
{
var result = await _roleService.Create(roleDto);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
return result.Success ? Ok(result) : BadRequest(result);
}
// PUT: api/Role
@ -68,7 +68,7 @@ namespace ldap_cesi.Controllers
public async Task<IActionResult> UpdateRole([FromBody] RoleUpdateDto roleDto)
{
var result = await _roleService.Update(roleDto);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
return result.Success ? Ok(result) : BadRequest(result);
}
// DELETE: api/Role/{id}
@ -82,7 +82,7 @@ namespace ldap_cesi.Controllers
public async Task<IActionResult> DeleteRole(int id)
{
var result = await _roleService.Delete(id);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
return result.Success ? Ok(result) : BadRequest(result);
}
}
}

68
ldap-cesi/Controllers/SalarieController.cs
View File

@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc;
namespace ldap_cesi.Controllers;
[ApiController]
[Route("api/salarie")]
[Route("api/salaries")]
public class SalarieController : ControllerBase
{
private ISalarieService _salarieService;
@ -21,21 +21,28 @@ public class SalarieController : ControllerBase
/// </summary>
/// <returns>Une liste de salariés.</returns>
[HttpGet]
public async Task<IActionResult> GetAllSalaries()
public async Task<IActionResult> GetAllSalaries([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 25)
{
var result = await _salarieService.GetAll();
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
var result = await _salarieService.GetAll(pageNumber, pageSize);
return result.Success ? Ok(result) : BadRequest(result);
}
/// <summary>
/// Endpoint qui retourne tous les salariés.
/// </summary>
/// <returns>Une liste de salariés.</returns>
[HttpGet("/complete")]
public async Task<IActionResult> GetAllSalariesComplet()
[HttpGet("search")]
public async Task<IActionResult> SearchSalaries(
[FromQuery] string searchTerm,
[FromQuery] int pageNumber = 1,
[FromQuery] int pageSize = 10)
{
var result = await _salarieService.GetAllWithoutIService();
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
if (string.IsNullOrWhiteSpace(searchTerm) || searchTerm.Length < 2)
{
return BadRequest("Votre recherche doit contenir au moins deux caractères.");
}
var result = await _salarieService.SearchWithRelations(
searchTerm, pageNumber, pageSize, s => s.IdServiceNavigation, s => s.IdSiteNavigation);
return result.Success ? Ok(result) : BadRequest(result);
}
/// <summary>
@ -47,19 +54,19 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> GetById(int id)
{
var result = await _salarieService.GetById(id);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
return result.Success ? Ok(result) : BadRequest(result);
}
/// <summary>
/// Endpoint qui retourne le salarié correspondant à l'ID en paramètre. Avec le nom de service et de site auxquels il apaprtient.
/// </summary>
/// <param name="id">L'ID du salarié.</param>
/// <returns>Le salarié correspondant à l'ID.</returns>
/// <returns>Le salarié correspondant à l'ID. Ainsi que son service et son site</returns>
[HttpGet("/complet/{id}")]
public async Task<IActionResult> GetSalarieCompletById(int id)
{
var result = await _salarieService.GetCompletById(id);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
var result = await _salarieService.GetByIdWithRelations(id,s => s.IdServiceNavigation, s => s.IdSiteNavigation);
return result.Success ? Ok(result) : BadRequest(result);
}
/// <summary>
@ -67,10 +74,10 @@ public class SalarieController : ControllerBase
/// </summary>
/// <returns>Tous les salariés avec leurs relations</returns>
[HttpGet("all")]
public async Task<IActionResult> GetAllSariesWithRelations()
public async Task<IActionResult> GetAllSariesWithRelations([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 25)
{
var result = await _salarieService.GetAllWithRelationsAsync(s => s.IdServiceNavigation, s => s.IdSiteNavigation);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
var result = await _salarieService.GetAllWithRelationsAsync(pageNumber, pageSize,s => s.IdServiceNavigation, s => s.IdSiteNavigation);
return result.Success ? Ok(result) : BadRequest(result);
}
/// <summary>
@ -83,7 +90,7 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> CreateSalarie([FromBody] SalarieCreateDto salarieInput)
{
var result = await _salarieService.Create(salarieInput);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
return result.Success ? Ok(result) : BadRequest(result);
}
/// <summary>
@ -96,7 +103,7 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> UpdateSalarie([FromBody] SalarieUpdateDto salarieInput)
{
var result = await _salarieService.Update(salarieInput);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
return result.Success ? Ok(result) : BadRequest(result);
}
/// <summary>
@ -109,7 +116,7 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> DeleteSalarie(int id)
{
var result = await _salarieService.Delete(id);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
return result.Success ? Ok(result) : BadRequest(result);
}
/// <summary>
@ -121,7 +128,7 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> GetSalariesBySite(int siteId)
{
var result = await _salarieService.GetSalariesBySite(siteId);
return result.Success ? Ok(result.Data) : NotFound(result.Message);
return result.Success ? Ok(result) : NotFound(result);
}
/// <summary>
@ -133,20 +140,7 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> GetSalariesByService(int serviceId)
{
var result = await _salarieService.GetSalariesByService(serviceId);
return result.Success ? Ok(result.Data) : NotFound(result.Message);
return result.Success ? Ok(result) : NotFound(result);
}
/// <summary>
/// Endpoint qui met à jour partiellement un salarié.
/// </summary>
/// <param name="id">L'ID du salarié.</param>
/// <param name="salariePatch">Les informations du salarié à mettre à jour partiellement.</param>
/// <returns>Le salarié mis à jour partiellement.</returns>
// [HttpPatch("{id}")]
// [Authorize(Roles = "admin")]
// public async Task<IActionResult> PatchSalarie(int id, [FromBody] SalariePatchDto salariePatch)
// {
// var result = await _salarieService.Patch(id, salariePatch);
// return result.Success ? Ok(result.Data) : BadRequest(result.Message);
// }
}

29
ldap-cesi/Controllers/ServicesController.cs
View File

@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc;
namespace ldap_cesi.Controllers;
[ApiController]
[Route("api/service")]
[Route("api/services")]
public class ServicesController : ControllerBase
{
private IServiceService _serviceService;
@ -21,10 +21,9 @@ public class ServicesController : ControllerBase
/// </summary>
/// <returns>Retourne tous les services.</returns>
[HttpGet]
public async Task<IActionResult> GetServices()
{
var result = await _serviceService.GetAll();
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
public async Task<IActionResult> GetServices([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 10) {
var result = await _serviceService.GetAll(pageNumber, pageSize);
return result.Success ? Ok(result) : BadRequest(result);
}
/// <summary>
@ -36,7 +35,19 @@ public class ServicesController : ControllerBase
public async Task<IActionResult> GetServiceById(int id)
{
var result = await _serviceService.GetById(id);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
return result.Success ? Ok(result) : BadRequest(result);
}
/// <summary>
/// Endpoint qui retourne le service et ses salariés correspondant à l'id en paramètre.
/// </summary>
/// <param name="id">L'ID du service.</param>
/// <returns>Le service correspondant à l'ID, avec ses salariés</returns>
[HttpGet("complete/{id}")]
public async Task<IActionResult> GetServiceByIdWithSalaries(int id)
{
var result = await _serviceService.GetByIdWithRelations(id, s=>s.Salaries);
return result.Success ? Ok(result) : BadRequest(result);
}
/// <summary>
@ -49,7 +60,7 @@ public class ServicesController : ControllerBase
public async Task<IActionResult> CreateService([FromBody] ServiceCreateDto serviceInputDto)
{
var result = await _serviceService.Create(serviceInputDto);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
return result.Success ? Ok(result.Data) : BadRequest(result);
}
/// <summary>
@ -62,7 +73,7 @@ public class ServicesController : ControllerBase
public async Task<IActionResult> UpdateService([FromBody] ServiceUpdateDto serviceUpdateDto)
{
var result = await _serviceService.Update(serviceUpdateDto);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
return result.Success ? Ok(result) : BadRequest(result);
}
/// <summary>
@ -75,6 +86,6 @@ public class ServicesController : ControllerBase
public async Task<IActionResult> DeleteService(int id)
{
var result = await _serviceService.Delete(id);
return result.Success ? Ok(result.Message) : BadRequest(result.Message);
return result.Success ? Ok(result) : BadRequest(result);
}
}

25
ldap-cesi/Controllers/SiteController.cs
View File

@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc;
namespace ldap_cesi.Controllers;
[ApiController]
[Route("/api/site")]
[Route("/api/sites")]
public class SiteController : ControllerBase
{
private readonly ISiteService _siteService;
@ -21,9 +21,9 @@ public class SiteController : ControllerBase
/// </summary>
/// <returns>Retourne une liste de tous les sites.</returns>
[HttpGet]
public async Task<ActionResult> GetSites()
public async Task<ActionResult> GetSites([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 10)
{
var result = await _siteService.GetAll();
var result = await _siteService.GetAll(pageNumber, pageSize);
return result.Success ? Ok(result) : BadRequest(result);
}
@ -43,6 +43,19 @@ public class SiteController : ControllerBase
return result.Success ? Ok(result) : BadRequest(result);
}
// GET: api/site/{id}
/// <summary>
/// Récupère un site et ses salariés spécifique par son identifiant.
/// </summary>
/// <param name="id">L'identifiant du site à récupérer.</param>
/// <returns>Retourne le site et ses salariés</returns>
[HttpGet("/complete/{id}")]
public async Task<ActionResult> GetSiteWithClient(int id)
{
var result = await _siteService.GetByIdWithRelations(id, s => s.Salaries);
return result.Success ? Ok(result) : BadRequest(result);
}
// POST: api/site
/// <summary>
/// Crée un nouveau site.
@ -52,7 +65,7 @@ public class SiteController : ControllerBase
[HttpPost]
public async Task<ActionResult> CreateSite([FromBody] SiteCreateDto siteCreateDto)
{
var result = await _siteService.CreateSite(siteCreateDto);
var result = await _siteService.Create(siteCreateDto);
return result.Success ? Ok(result) : BadRequest(result);
}
@ -65,7 +78,7 @@ public class SiteController : ControllerBase
[HttpPut]
public async Task<IActionResult> UpdateSite([FromBody] SiteUpdateDto siteUpdateDto)
{
var result = await _siteService.UpdateSite(siteUpdateDto);
var result = await _siteService.Update(siteUpdateDto);
return result.Success ? Ok(result) : BadRequest(result);
}
@ -78,7 +91,7 @@ public class SiteController : ControllerBase
[HttpDelete("{id}")]
public async Task<IActionResult> DeleteSite(int id)
{
var result = await _siteService.DeleteSite(id);
var result = await _siteService.Delete(id);
return result.Success ? Ok(result) : BadRequest(result);
}
}

10
ldap-cesi/Controllers/UtilisateurController.cs
View File

@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc;
namespace ldap_cesi.Controllers;
[ApiController]
[Route("api/utilisateur")]
[Route("api/utilisateurs")]
public class UtilisateurController : ControllerBase
{
private IUtilisateurService _utilisateurService;
@ -24,8 +24,8 @@ public class UtilisateurController : ControllerBase
[HttpPost("login")]
public async Task<IActionResult> Login([FromBody] UtilisateurLoginDto utilisateurInput)
{
var response = await _utilisateurService.Login(utilisateurInput);
return StatusCode(response.StatusCode, response);
var result = await _utilisateurService.Login(utilisateurInput);
return result.Success ? Ok(result) : BadRequest(result);
}
/// <summary>
@ -37,7 +37,7 @@ public class UtilisateurController : ControllerBase
public async Task<IActionResult> GetUtilisateurs()
{
var result = await _utilisateurService.GetAll();
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
return result.Success ? Ok(result) : BadRequest(result);
}
/// <summary>
@ -50,6 +50,6 @@ public class UtilisateurController : ControllerBase
public async Task<IActionResult> GetUtilisateurById(int id)
{
var result = await _utilisateurService.GetById(id);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
return result.Success ? Ok(result) : BadRequest(result);
}
}

3
ldap-cesi/DTOs/Generic/ServiceDto.cs
View File

@ -1,3 +1,5 @@
using ldap_cesi.DTOs.Outputs.Salarie;
namespace ldap_cesi.DTOs;
public class ServiceDto
@ -5,4 +7,5 @@ public class ServiceDto
public int Id { get; set; }
public string Nom { get; set; }
public List<SalarieMinimalDto> Salaries { get; set; }
}

3
ldap-cesi/DTOs/Generic/SiteDto.cs
View File

@ -1,3 +1,5 @@
using ldap_cesi.DTOs.Outputs.Salarie;
namespace ldap_cesi.DTOs;
public class SiteDto
@ -5,4 +7,5 @@ public class SiteDto
public int Id { get; set; }
public string Ville { get; set; }
public ICollection<SalarieMinimalDto> Salaries { get; set; }
}

6
ldap-cesi/DTOs/Outputs/Salarie/SalarieListDto.cs
View File

@ -1,3 +1,5 @@
using ldap_cesi.DTOs.Outputs.Service;
namespace ldap_cesi.DTOs.Outputs.Salarie;
public class SalarieListDto
@ -7,6 +9,6 @@ public class SalarieListDto
public string Nom { get; set; }
public string Prenom { get; set; }
public string NomComplet => $"{Prenom} {Nom}";
public ServiceDto Service { get; set; }
public SiteDto Site { get; set; }
public ServiceMinimalDto Service { get; set; }
public SiteMinimalDto Site { get; set; }
}

17
ldap-cesi/DTOs/Outputs/Salarie/SalarieMinimalDto.cs Normal file
View File

@ -0,0 +1,17 @@
namespace ldap_cesi.DTOs.Outputs.Salarie;
public class SalarieMinimalDto
{
public int Id { get; set; }
public string Nom { get; set; } = null!;
public string Prenom { get; set; } = null!;
public string TelephoneFixe { get; set; } = null!;
public string TelephonePortable { get; set; } = null!;
public string Email { get; set; } = null!;
}

6
ldap-cesi/DTOs/Outputs/Salarie/SalarieOutputDetail.cs
View File

@ -1,3 +1,5 @@
using ldap_cesi.DTOs.Outputs.Service;
namespace ldap_cesi.DTOs.Outputs.Salarie;
public class SalarieOutputDetail
@ -14,6 +16,6 @@ public class SalarieOutputDetail
public string Email { get; set; }
public ServiceDto Service { get; set; }
public SiteDto Site { get; set; }
public ServiceMinimalDto Service { get; set; }
public SiteMinimalDto Site { get; set; }
}

8
ldap-cesi/DTOs/Outputs/Service/ServiceMinimalDto.cs Normal file
View File

@ -0,0 +1,8 @@
namespace ldap_cesi.DTOs.Outputs.Service;
public class ServiceMinimalDto
{
public int Id { get; set; }
public string Nom { get; set; }
}

8
ldap-cesi/DTOs/Outputs/Site/SiteMinimalDto.cs Normal file
View File

@ -0,0 +1,8 @@
namespace ldap_cesi.DTOs.Outputs.Service;
public class SiteMinimalDto
{
public int Id { get; set; }
public string Ville { get; set; }
}

10
ldap-cesi/Mapper/AutoMapperProfile.cs
View File

@ -5,6 +5,7 @@ using ldap_cesi.DTOs.Inputs.Salarie;
using ldap_cesi.DTOs.Inputs.Service;
using ldap_cesi.DTOs.Inputs.Site;
using ldap_cesi.DTOs.Outputs.Salarie;
using ldap_cesi.DTOs.Outputs.Service;
using ldap_cesi.DTOs.Outputs.Utilisateur;
using ldap_cesi.Entities;
@ -34,9 +35,16 @@ public class AutoMapperProfile : Profile
CreateMap<Salarie, SalarieDto>()
.ForMember(dest => dest.Service, opt => opt.MapFrom(src => src.IdServiceNavigation))
.ForMember(dest => dest.Site, opt => opt.MapFrom(src => src.IdSiteNavigation));
CreateMap<Salarie, SalarieOutputDetail>()
.ForMember(dest => dest.Service, opt => opt.MapFrom(src => src.IdServiceNavigation))
.ForMember(dest => dest.Site, opt => opt.MapFrom(src => src.IdSiteNavigation));
CreateMap<Service, ServiceDto>();
CreateMap<Site, SiteDto>();
CreateMap<Service, ServiceMinimalDto>();
CreateMap<Site, SiteMinimalDto>();
CreateMap<Site, SiteDto>()
.ForMember(dest => dest.Salaries, opt => opt.MapFrom(src => src.Salaries));
CreateMap<Salarie, SalarieListDto>();
CreateMap<Salarie, SalarieMinimalDto>();
CreateMap<Salarie, SalarieListDto>()
.ForMember(dest => dest.Service, opt => opt.MapFrom(src => src.IdServiceNavigation.Nom))
.ForMember(dest => dest.Site, opt => opt.MapFrom(src => src.IdSiteNavigation.Ville));

6
ldap-cesi/Models/IEntity.cs
View File

@ -1,6 +0,0 @@
namespace ldap_cesi.Models;
public interface IEntity
{
int Id { get; set; }
}

2
ldap-cesi/Models/IResponseDataModel.cs
View File

@ -3,5 +3,7 @@ namespace ldap_cesi.Models;
public interface IResponseDataModel<T> : IResponseModel
{
public T Data { get; set; }
public int? TotalPages { get; set; }
public int? TotalCount { get; set; }
string Token { get; set; }
}

21
ldap-cesi/Models/PaginatedList.cs Normal file
View File

@ -0,0 +1,21 @@
namespace ldap_cesi.Models;
public class PaginatedList<T>
{
public List<T> Datas { get; }
public int TotalCount { get; }
public int PageNumber { get; }
public int PageSize { get; }
public int TotalPages => (int)Math.Ceiling(TotalCount / (double)PageSize);
public PaginatedList(List<T> donnees, int totalCount, int pageNumber, int pageSize)
{
Datas = donnees;
TotalCount = totalCount;
PageNumber = pageNumber;
PageSize = pageSize;
}
public bool HasPreviousPage => PageNumber > 1;
public bool HasNextPage => PageNumber < TotalPages;
}

2
ldap-cesi/Models/ResponseDataModel.cs
View File

@ -3,4 +3,6 @@ namespace ldap_cesi.Models;
public class ResponseDataModel<T> : ResponseModel, IResponseDataModel<T> where T : class
{
public T Data { get; set; } = null!;
public int? TotalPages { get; set; }
public int? TotalCount { get; set; }
}

15
ldap-cesi/Program.cs
View File

@ -1,4 +1,6 @@
using ldap_cesi.Configurations;
using ldap_cesi.Context;
using ldap_cesi.Seeders;
var builder = WebApplication.CreateBuilder(args);
builder.BuildConf();
@ -21,8 +23,21 @@ if (app.Environment.IsDevelopment())
});
}
using (var scope = app.Services.CreateScope())
{
var services = scope.ServiceProvider;
var context = services.GetRequiredService<PgContext>();
var seeder = new Seeders(context);
if (app.Environment.IsDevelopment())
{
await seeder.GenerateSalaries(500);
}
}
app.UseHttpsRedirection();
app.UseRouting();
app.UseCors("AllowAll");
app.UseAuthentication();
app.UseAuthorization();
app.MapControllers();

15
ldap-cesi/Repositories/Interfaces/IRepositoryBase.cs
View File

@ -7,11 +7,22 @@ public interface IRepositoryBase<TEntity> where TEntity : class
Task<TEntity> AddAsync(TEntity entity, CancellationToken cancellationToken = default);
Task<bool> AnyAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default);
Task<TEntity> GetByIdAsync<TId>(TId id, CancellationToken cancellationToken = default) where TId : notnull;
Task<List<TEntity>> GetAllAsync(CancellationToken cancellationToken = default);
Task<(List<TEntity> Data, int TotalPages, int TotalItems)> GetAllAsync(int pageNumber = 1, int pageSize = 10, CancellationToken cancellationToken = default);
Task<bool> UpdateAsync(TEntity entity, CancellationToken cancellationToken = default);
Task<bool> DeleteAsync(TEntity entity, CancellationToken cancellationToken = default);
Task<TEntity> GetWithRelationsAsync(int id, params Expression<Func<TEntity, object>>[] relationsAInclude);
Task<List<TEntity>> GetAllWithRelationsAsync(params Expression<Func<TEntity, object>>[] relationsAInclude);
Task<(List<TEntity> Data, int TotalPages, int TotalItems)> GetAllWithRelationsAsync(int pageNumber = 1, int pageSize = 10, params Expression<Func<TEntity, object>>[] relationInclues);
Task<(List<TEntity> Data, int TotalPages, int TotalItems)> SearchAsync(
Expression<Func<TEntity, bool>> predicate,
int pageNumber = 1,
int pageSize = 10,
params Expression<Func<TEntity, object>>[] relationsAInclude);
Task<TEntity?> FirstOrDefaultAsync(Expression<Func<TEntity, bool>> predicate,
CancellationToken cancellationToken = default);
Task<int> CountAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default);
}

83
ldap-cesi/Repositories/RepositoryBase.cs
View File

@ -34,18 +34,39 @@ public class RepositoryBase<TEntity> : IRepositoryBase<TEntity> where TEntity :
return await _context.Set<TEntity>().AnyAsync(predicate, cancellationToken);
}
public virtual async Task<List<TEntity>> GetAllAsync(CancellationToken cancellationToken = default)
public virtual async Task<TEntity?> GetByIdAsync<TId>(TId id, CancellationToken cancellationToken = default) where TId : notnull
{
try
{
return await _context.Set<TEntity>().ToListAsync(cancellationToken);
return await _context.FindAsync<TEntity>(id, cancellationToken);
}
catch (Exception ex)
{
throw new Exception("Erreur pendant la récupérations des entités.", ex);
throw new Exception($"Erreur lors de la récupération avec l'id : {id}.", ex);
}
}
public virtual async Task<(List<TEntity> Data, int TotalPages, int TotalItems)> GetAllAsync(int pageNumber = 1, int pageSize = 10, CancellationToken cancellationToken = default)
{
try
{
var totalCount = await _dbSet.CountAsync(cancellationToken);
var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize);
var data = await _dbSet
.Skip((pageNumber - 1) * pageSize)
.Take(pageSize)
.ToListAsync(cancellationToken);
return (data, totalPages, totalCount);
}
catch (Exception ex)
{
throw new Exception("Erreur pendant la récupération des entités.", ex);
}
}
public virtual async Task<TEntity?> FirstOrDefaultAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default)
{
return await _context.Set<TEntity>().FirstOrDefaultAsync(predicate, cancellationToken);
@ -65,16 +86,24 @@ public class RepositoryBase<TEntity> : IRepositoryBase<TEntity> where TEntity :
}
}
public virtual async Task<TEntity?> GetByIdAsync<TId>(TId id, CancellationToken cancellationToken = default) where TId : notnull
public virtual async Task<(List<TEntity> Data, int TotalPages, int TotalItems)> GetAllWithRelationsAsync(int pageNumber = 1, int pageSize = 10, params Expression<Func<TEntity, object>>[] relationInclues)
{
try
IQueryable<TEntity> query = _dbSet;
foreach (var relationInclue in relationInclues)
{
return await _context.FindAsync<TEntity>(id, cancellationToken);
}
catch (Exception ex)
{
throw new Exception($"Erreur lors de la récupération avec l'id : {id}.", ex);
query = query.Include(relationInclue);
}
var totalCount = await query.CountAsync();
var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize);
var data = await query
.Skip((pageNumber - 1) * pageSize)
.Take(pageSize)
.ToListAsync();
return (data, totalPages, totalCount);
}
public virtual async Task<bool> DeleteAsync(TEntity entity, CancellationToken cancellationToken = default)
@ -138,4 +167,36 @@ public class RepositoryBase<TEntity> : IRepositoryBase<TEntity> where TEntity :
return await query.FirstOrDefaultAsync(e => EF.Property<int>(e, "Id") == id);
}
public virtual async Task<(List<TEntity> Data, int TotalPages, int TotalItems)> SearchAsync(
Expression<Func<TEntity, bool>> predicate,
int pageNumber = 1,
int pageSize = 10,
params Expression<Func<TEntity, object>>[] relationsAInclude)
{
IQueryable<TEntity> query = _dbSet;
foreach (var relationInclue in relationsAInclude)
{
query = query.Include(relationInclue);
}
query = query.Where(predicate);
var totalCount = await query.CountAsync();
var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize);
var data = await query
.Skip((pageNumber - 1) * pageSize)
.Take(pageSize)
.ToListAsync();
return (data, totalPages, totalCount);
}
public virtual async Task<int> CountAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default)
{
return await _dbSet.CountAsync(predicate, cancellationToken);
}
}

49
ldap-cesi/Seeders/Seeders.cs Normal file
View File

@ -0,0 +1,49 @@
using Bogus;
using ldap_cesi.Context;
using ldap_cesi.Entities;
using Microsoft.EntityFrameworkCore;
namespace ldap_cesi.Seeders;
public class Seeders
{
private readonly PgContext _context;
public Seeders(PgContext context)
{
_context = context;
}
public async Task GenerateSalaries(int count = 1000)
{
if (await _context.Salaries.AnyAsync())
{
Console.WriteLine("Des salariés existent déjà dans la base de données. Aucune donnée insérée.");
return;
}
var salarieFaker = new Faker<Salarie>("fr")
.RuleFor(s => s.Nom, f => f.Name.LastName())
.RuleFor(s => s.Prenom, f => f.Name.FirstName())
.RuleFor(s => s.TelephoneFixe, f => f.Phone.PhoneNumber())
.RuleFor(s => s.TelephonePortable, f => f.Phone.PhoneNumber())
.RuleFor(s => s.Email, (f, s) => f.Internet.Email(s.Prenom, s.Nom));
var salaries = salarieFaker.Generate(count);
// on s'assure que les relations (Service, Site) existent avant d'ajouter les salariés
var services = await _context.Services.ToListAsync();
var sites = await _context.Sites.ToListAsync();
var random = new Random();
foreach (var salarie in salaries)
{
salarie.IdServiceNavigation = services[random.Next(services.Count)];
salarie.IdSiteNavigation = sites[random.Next(sites.Count)];
}
await _context.Salaries.AddRangeAsync(salaries);
await _context.SaveChangesAsync();
}
}

3
ldap-cesi/Services/Interfaces/ISalarieService.cs
View File

@ -7,9 +7,8 @@ using ldap_cesi.Models;
namespace ldap_cesi.Services.Interfaces;
public interface ISalarieService : IServiceBase<Salarie, SalarieDto, SalarieCreateDto, SalarieUpdateDto>
public interface ISalarieService : IServiceBase<Salarie, SalarieOutputDetail, SalarieCreateDto, SalarieUpdateDto>
{
Task<IResponseDataModel<List<Salarie>>> GetAllWithoutIService();
Task<IResponseDataModel<List<SalarieListDto>>> GetSalariesBySite(int siteId);
Task<IResponseDataModel<List<SalarieListDto>>> GetSalariesByService(int serviceId);
Task<IResponseDataModel<SalarieDto>> GetCompletById(int id);

7
ldap-cesi/Services/Interfaces/IServiceBase.cs
View File

@ -9,10 +9,13 @@ public interface IServiceBase<T, TDto, TCreateDto, TUpdateDto>
where TCreateDto : class
where TUpdateDto : class
{
Task<IResponseDataModel<List<T>>> GetAll();
Task<IResponseDataModel<List<T>>> GetAll(int pageNumber, int pageSize);
Task<IResponseDataModel<T>> GetById(int id);
Task<IResponseDataModel<TDto>> GetByIdWithRelations(int id, params Expression<Func<T, object>>[] relationsAInclures); // préciser avec une ou des fonctions lambda les relations à inclure dans la réponse
Task<IResponseDataModel<List<TDto>>> GetAllWithRelationsAsync(params Expression<Func<T, object>>[] relationsAInclure);
Task<IResponseDataModel<List<TDto>>> GetAllWithRelationsAsync(int pageNumber, int pageSize, params Expression<Func<T, object>>[] relationsAInclure);
Task<IResponseDataModel<PaginatedList<TDto>>> SearchWithRelations(string searchTerm, int pageNumber, int pageSize,
params Expression<Func<T, object>>[] includeProperties);
Task<IResponseDataModel<T>> Create(TCreateDto dto);
Task<IResponseDataModel<T>> Update(TUpdateDto dto);
Task<IResponseDataModel<string>> Delete(int id);

14
ldap-cesi/Services/Interfaces/ISiteService.cs
View File

@ -1,15 +1,15 @@
using ldap_cesi.DTOs.Inputs.Service;
using ldap_cesi.DTOs;
using ldap_cesi.DTOs.Inputs.Site;
using ldap_cesi.Entities;
using ldap_cesi.Models;
namespace ldap_cesi.Services.Interfaces;
public interface ISiteService
public interface ISiteService : IServiceBase<Site, SiteDto, SiteCreateDto, SiteUpdateDto>
{
Task<IResponseDataModel<List<Site>>> GetAll();
Task<IResponseDataModel<Site>> GetById(int id);
Task<IResponseDataModel<string>> CreateSite(SiteCreateDto siteCreateDto);
Task<IResponseDataModel<Site>> UpdateSite(SiteUpdateDto siteUpdate);
Task<IResponseDataModel<string>> DeleteSite(int id);
// Task<IResponseDataModel<List<Site>>> GetAll();
// Task<IResponseDataModel<Site>> GetById(int id);
// Task<IResponseDataModel<string>> CreateSite(SiteCreateDto siteCreateDto);
// Task<IResponseDataModel<Site>> UpdateSite(SiteUpdateDto siteUpdate);
// Task<IResponseDataModel<string>> DeleteSite(int id);
}

24
ldap-cesi/Services/SalarieService.cs
View File

@ -11,7 +11,7 @@ using ldap_cesi.Validator.Salarie;
namespace ldap_cesi.Services;
public class SalarieService : ServiceBase<Salarie, SalarieDto, SalarieCreateDto, SalarieUpdateDto>, ISalarieService
public class SalarieService : ServiceBase<Salarie, SalarieOutputDetail, SalarieCreateDto, SalarieUpdateDto>, ISalarieService
{
private IRepositorySalarie _repositorySalarie;
private readonly IRepositorySite _repositorySite;
@ -28,28 +28,6 @@ public class SalarieService : ServiceBase<Salarie, SalarieDto, SalarieCreateDto,
_mapper = mapper;
}
public async Task<IResponseDataModel<List<Salarie>>> GetAllWithoutIService()
{
var salaries = await _repositorySalarie.GetAllAsync();
return new ResponseDataModel<List<Salarie>>
{
Success = true,
Data = salaries,
StatusCode = 200,
};
}
// public async Task<IResponseDataModel<Salarie>> GetById(int id)
// {
// var salarie = await _repositorySalarie.GetSalarieWithRelationsAsync(id);
// return new ResponseDataModel<Salarie>
// {
// Success = true,
// Data = salarie,
// StatusCode = 200,
// };
// }
public async Task<IResponseDataModel<SalarieDto>> GetCompletById(int id)
{
var salarie = await _repositorySalarie.GetSalarieWithRelationsAsync(id);

73
ldap-cesi/Services/ServiceBase.cs
View File

@ -1,15 +1,10 @@
using AutoMapper;
using ldap_cesi.DTOs.Inputs.Site;
using ldap_cesi.Entities;
using ldap_cesi.Models;
using ldap_cesi.Repository.Services;
using ldap_cesi.Services.Interfaces;
using ldap_cesi.Validator.Site;
using Microsoft.Extensions.Logging;
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Threading.Tasks;
using FluentValidation;
using Microsoft.EntityFrameworkCore;
namespace ldap_cesi.Services;
@ -34,15 +29,23 @@ public class ServiceBase<T, TDto, TCreateDto, TUpdateDto> : IServiceBase<T, TDto
_updateDtoValidator = updateDtoValidator;
}
public virtual async Task<IResponseDataModel<List<T>>> GetAll()
private Expression<Func<T, bool>> BuildSearchPredicate(string inputSearch)
{
return entity =>
EF.Functions.ILike(EF.Property<string>(entity, "Nom"), $"%{inputSearch}%") ||
EF.Functions.ILike(EF.Property<string>(entity, "Prenom"), $"%{inputSearch}%");
}
public virtual async Task<IResponseDataModel<List<T>>> GetAll(int pageNumber, int pageSize)
{
try
{
var entities = await _repository.GetAllAsync();
var response = await _repository.GetAllAsync( pageNumber, pageSize);
return new ResponseDataModel<List<T>>
{
Success = true,
Data = entities,
Data = response.Data,
TotalPages = response.TotalPages,
TotalCount = response.TotalItems,
StatusCode = 200,
Message = "Liste des entités récupérée avec succès."
};
@ -94,16 +97,18 @@ public class ServiceBase<T, TDto, TCreateDto, TUpdateDto> : IServiceBase<T, TDto
}
}
public virtual async Task<IResponseDataModel<List<TDto>>> GetAllWithRelationsAsync(params Expression<Func<T, object>>[] relationsAInclure)
public virtual async Task<IResponseDataModel<List<TDto>>> GetAllWithRelationsAsync(int pageNumber, int pageSize,params Expression<Func<T, object>>[] relationsAInclure)
{
try
{
var entities = await _repository.GetAllWithRelationsAsync(relationsAInclure);
var dtos = _mapper.Map<List<TDto>>(entities);
var response = await _repository.GetAllWithRelationsAsync(pageNumber, pageSize,relationsAInclure);
var dtos = _mapper.Map<List<TDto>>(response.Data);
return new ResponseDataModel<List<TDto>>
{
Success = true,
Data = dtos,
TotalPages = response.TotalPages,
TotalCount = response.TotalItems,
StatusCode = 200,
Message = "Liste des entités récupérée avec succès."
};
@ -263,4 +268,48 @@ public class ServiceBase<T, TDto, TCreateDto, TUpdateDto> : IServiceBase<T, TDto
};
}
}
public virtual async Task<IResponseDataModel<PaginatedList<TDto>>> SearchWithRelations(string searchTerm, int pageNumber, int pageSize, params Expression<Func<T, object>>[] includeProperties)
{
if (string.IsNullOrWhiteSpace(searchTerm) || searchTerm.Length < 2)
{
return new ResponseDataModel<PaginatedList<TDto>>
{
Success = false,
Message = "Le terme de recherche doit contenir au moins deux caractères.",
StatusCode = 400
};
}
try
{
var predicate = BuildSearchPredicate(searchTerm);
var entities = await _repository.SearchAsync(predicate, pageNumber, pageSize, includeProperties);
var dtos = _mapper.Map<List<TDto>>(entities);
var totalCount = await _repository.CountAsync(predicate);
var response = new PaginatedList<TDto>(dtos, totalCount, pageNumber, pageSize);
return new ResponseDataModel<PaginatedList<TDto>>
{
Success = true,
Data = response,
TotalPages = response.TotalPages,
TotalCount = response.TotalCount,
StatusCode = 200,
Message = "Recherche effectuée avec succès."
};
}
catch (Exception ex)
{
_logger.LogError(ex, "Une erreur s'est produite lors de la recherche des entités.");
return new ResponseDataModel<PaginatedList<TDto>>
{
Success = false,
Message = "Une erreur s'est produite lors de la recherche des entités.",
StatusCode = 500
};
}
}
}

262
ldap-cesi/Services/SiteService.cs
View File

@ -1,4 +1,5 @@
using AutoMapper;
using ldap_cesi.DTOs;
using ldap_cesi.DTOs.Inputs.Site;
using ldap_cesi.Entities;
using ldap_cesi.Models;
@ -8,144 +9,143 @@ using ldap_cesi.Validator.Site;
namespace ldap_cesi.Services;
public class SiteService : ISiteService
public class SiteService : ServiceBase<Site, SiteDto, SiteCreateDto, SiteUpdateDto>, ISiteService
{
private readonly IRepositorySite _repositorySite;
private readonly IMapper _mapper;
public SiteService(IRepositorySite repositorySite, IMapper mapper)
public SiteService(IRepositorySite repositorySite, IMapper mapper,
ILogger<SiteService> logger, SiteCreateValidator siteCreateValidator, SiteUpdateValidator siteUpdateValidator)
: base(repositorySite, mapper, logger, siteCreateValidator, siteUpdateValidator )
{
_repositorySite = repositorySite;
_mapper = mapper;
}
public async Task<IResponseDataModel<List<Site>>> GetAll()
{
var sites = await _repositorySite.GetAllAsync();
return new ResponseDataModel<List<Site>>
{
Success = true,
Data = sites,
StatusCode = 200,
};
// public async Task<IResponseDataModel<List<Site>>> GetAll()
// {
// var sites = await _repositorySite.GetAllAsync();
// return new ResponseDataModel<List<Site>>
// {
// Success = true,
// Data = sites,
// StatusCode = 200,
// };
// }
//
// public async Task<IResponseDataModel<Site>> GetById(int id)
// {
// var site = await _repositorySite.GetByIdAsync(id);
// return new ResponseDataModel<Site>
// {
// Success = true,
// Data = site,
// StatusCode = 200,
// };
}
public async Task<IResponseDataModel<Site>> GetById(int id)
{
var site = await _repositorySite.GetByIdAsync(id);
return new ResponseDataModel<Site>
{
Success = true,
Data = site,
StatusCode = 200,
};
}
public async Task<IResponseDataModel<string>> CreateSite(SiteCreateDto siteCreateDto)
{
var validation = new SiteCreateValidator();
var result = validation.Validate(siteCreateDto);
if (!result.IsValid)
{
return new ResponseDataModel<string>
{
StatusCode = 400,
Success = false,
Message = "Données du site invalides: " + string.Join(", ", result.Errors)
};
}
var site = _mapper.Map<Site>(siteCreateDto);
var response = await _repositorySite.AddAsync(site);
return new ResponseDataModel<string>
{
StatusCode = 201,
Success = true,
Data = response.Id.ToString(),
};
}
public async Task<IResponseDataModel<Site>> UpdateSite(SiteUpdateDto siteUpdate)
{
var validation = new SiteUpdateValidator();
var result = validation.Validate(siteUpdate);
if (!result.IsValid)
{
return new ResponseDataModel<Site>
{
StatusCode = 400,
Success = false,
Message = "Données du site invalides: " + string.Join(", ", result.Errors)
};
}
var siteFind = await _repositorySite.GetByIdAsync(siteUpdate.Id);
if (siteFind is null)
{
return new ResponseDataModel<Site>
{
Success = false,
Message = "Site introuvable.",
StatusCode = 404
};
}
var site = _mapper.Map(siteUpdate, siteFind);
var response = await _repositorySite.UpdateAsync(site);
if (!response)
{
return new ResponseDataModel<Site>
{
StatusCode = 500,
Success = false,
Message = "Erreur lors de la mise à jour du site : " + string.Join(", ", result.Errors)
};
}
return new ResponseDataModel<Site>
{
StatusCode = 200,
Success = true,
Data = site,
};
}
public async Task<IResponseDataModel<string>> DeleteSite(int id)
{
if (id == null)
{
return new ResponseDataModel<string>
{
StatusCode = 400,
Success = false,
Message = "Id manquant"
};
}
var site = await _repositorySite.GetByIdAsync(id);
if (site == null)
{
return new ResponseDataModel<string>
{
Success = false,
Message = "Site introuvable.",
StatusCode = 404
};
}
var response = await _repositorySite.DeleteAsync(site);
if (!response)
{
return new ResponseDataModel<string>
{
StatusCode = 500,
Success = false,
Message = "Erreur durant la suppression du site"
};
}
return new ResponseDataModel<string>
{
StatusCode = 200,
Success = true,
Data = site.Id.ToString(),
};
}
}
// public async Task<IResponseDataModel<string>> CreateSite(SiteCreateDto siteCreateDto)
// {
// var validation = new SiteCreateValidator();
// var result = validation.Validate(siteCreateDto);
// if (!result.IsValid)
// {
// return new ResponseDataModel<string>
// {
// StatusCode = 400,
// Success = false,
// Message = "Données du site invalides: " + string.Join(", ", result.Errors)
// };
// }
// var site = _mapper.Map<Site>(siteCreateDto);
// var response = await _repositorySite.AddAsync(site);
// return new ResponseDataModel<string>
// {
// StatusCode = 201,
// Success = true,
// Data = response.Id.ToString(),
// };
// }
//
// public async Task<IResponseDataModel<Site>> UpdateSite(SiteUpdateDto siteUpdate)
// {
// var validation = new SiteUpdateValidator();
// var result = validation.Validate(siteUpdate);
// if (!result.IsValid)
// {
// return new ResponseDataModel<Site>
// {
// StatusCode = 400,
// Success = false,
// Message = "Données du site invalides: " + string.Join(", ", result.Errors)
// };
// }
//
// var siteFind = await _repositorySite.GetByIdAsync(siteUpdate.Id);
// if (siteFind is null)
// {
// return new ResponseDataModel<Site>
// {
// Success = false,
// Message = "Site introuvable.",
// StatusCode = 404
// };
// }
//
// var site = _mapper.Map(siteUpdate, siteFind);
// var response = await _repositorySite.UpdateAsync(site);
// if (!response)
// {
// return new ResponseDataModel<Site>
// {
// StatusCode = 500,
// Success = false,
// Message = "Erreur lors de la mise à jour du site : " + string.Join(", ", result.Errors)
// };
// }
// return new ResponseDataModel<Site>
// {
// StatusCode = 200,
// Success = true,
// Data = site,
// };
// }
//
// public async Task<IResponseDataModel<string>> DeleteSite(int id)
// {
// if (id == null)
// {
// return new ResponseDataModel<string>
// {
// StatusCode = 400,
// Success = false,
// Message = "Id manquant"
// };
// }
//
// var site = await _repositorySite.GetByIdAsync(id);
// if (site == null)
// {
// return new ResponseDataModel<string>
// {
// Success = false,
// Message = "Site introuvable.",
// StatusCode = 404
// };
// }
// var response = await _repositorySite.DeleteAsync(site);
// if (!response)
// {
// return new ResponseDataModel<string>
// {
// StatusCode = 500,
// Success = false,
// Message = "Erreur durant la suppression du site"
// };
// }
// return new ResponseDataModel<string>
// {
// StatusCode = 200,
// Success = true,
// Data = site.Id.ToString(),
// };
// }

3
ldap-cesi/Services/UtilisateurService.cs
View File

@ -1,7 +1,6 @@
using AutoMapper;
using ldap_cesi.DTOs.Inputs;
using ldap_cesi.DTOs.Outputs.Utilisateur;
using ldap_cesi.Entities;
using ldap_cesi.Models;
using ldap_cesi.Repository.Services;
using ldap_cesi.Services.Interfaces;
@ -23,7 +22,7 @@ public class UtilisateurService : IUtilisateurService
public async Task<IResponseDataModel<List<UtilisateurOutputDto>>> GetAll()
{
var utilisateurs = await _repositoryUtilisateur.GetAllAsync();
var utilisateurs = await _repositoryUtilisateur.GetAllAsync(1,10);
var utilisateursOutputDto = _mapper.Map<List<UtilisateurOutputDto>>(utilisateurs);
return new ResponseDataModel<List<UtilisateurOutputDto>>
{

1
ldap-cesi/ldap-cesi.csproj
View File

@ -12,6 +12,7 @@
<ItemGroup>
<PackageReference Include="AutoMapper" Version="14.0.0" />
<PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
<PackageReference Include="Bogus" Version="35.6.2" />
<PackageReference Include="FluentValidation" Version="11.11.0" />
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.2" />