- Intégration de la pagination dans les fonctions getAll

- Modification du dto de sorti pour salarie.

ldap-cesi/Configurations/Conf.cs

@@ -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());
         }); 

ldap-cesi/Controllers/RoleController.cs

@@ -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();
+            var result = await _roleService.GetAll(pageNumber, pageSize);
-            return result.Success ? Ok(result.Data) : BadRequest(result.Message);
+            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);
         }
     }
 }

ldap-cesi/Controllers/SalarieController.cs

@@ -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,15 +21,14 @@ 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();
+        var result = await _salarieService.GetAll(pageNumber, pageSize);
-        return result.Success ? Ok(result.Data) : BadRequest(result.Message);
+        return result.Success ? Ok(result) : BadRequest(result);
     }
     
     
     [HttpGet("search")]
-    [Authorize(Roles = "admin")]
     public async Task<IActionResult> SearchSalaries(
         [FromQuery] string searchTerm,
         [FromQuery] int pageNumber = 1,
@@ -43,7 +42,7 @@ public class SalarieController : ControllerBase
         var result = await _salarieService.SearchWithRelations(
             searchTerm, pageNumber, pageSize, s => s.IdServiceNavigation, s => s.IdSiteNavigation);
 
-        return result.Success ? Ok(result.Data) : BadRequest(result.Message);
+        return result.Success ? Ok(result) : BadRequest(result);
     }
 
     /// <summary>
@@ -55,7 +54,7 @@ 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>
@@ -67,7 +66,7 @@ public class SalarieController : ControllerBase
     public async Task<IActionResult> GetSalarieCompletById(int id)
     {
         var result = await _salarieService.GetByIdWithRelations(id,s => s.IdServiceNavigation, s => s.IdSiteNavigation);
-        return result.Success ? Ok(result.Data) : BadRequest(result.Message);
+        return result.Success ? Ok(result) : BadRequest(result);
     }    
     
     /// <summary>
@@ -75,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);
+        var result = await _salarieService.GetAllWithRelationsAsync(pageNumber, pageSize,s => s.IdServiceNavigation, s => s.IdSiteNavigation);
-        return result.Success ? Ok(result.Data) : BadRequest(result.Message);
+        return result.Success ? Ok(result) : BadRequest(result);
     }
 
     /// <summary>
@@ -91,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>
@@ -104,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>
@@ -117,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>
@@ -129,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>
@@ -141,7 +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);
     }
     
 }

ldap-cesi/Controllers/ServicesController.cs

@@ -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()
+    public async Task<IActionResult> GetServices([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 10) {
-    {
+        var result = await _serviceService.GetAll(pageNumber, pageSize);
-        var result = await _serviceService.GetAll();
+        return result.Success ? Ok(result) : BadRequest(result);
-        return result.Success ? Ok(result.Data) : BadRequest(result.Message);
     }
 
     /// <summary>
@@ -36,7 +35,7 @@ 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>
@@ -48,7 +47,7 @@ public class ServicesController : ControllerBase
     public async Task<IActionResult> GetServiceByIdWithSalaries(int id)
     {
         var result = await _serviceService.GetByIdWithRelations(id, s=>s.Salaries);
-        return result.Success ? Ok(result.Data) : BadRequest(result.Message);
+        return result.Success ? Ok(result) : BadRequest(result);
     }
 
     /// <summary>
@@ -61,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>
@@ -74,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>
@@ -87,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);
     }
 }

ldap-cesi/Controllers/SiteController.cs

@@ -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);
     }            
     
@@ -65,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);
     }
     
@@ -78,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);
     }
     
@@ -91,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);
     }
 }

ldap-cesi/Controllers/UtilisateurController.cs

@@ -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);
+        var result = await _utilisateurService.Login(utilisateurInput);
-        return StatusCode(response.StatusCode, response);
+        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);
     }
 }

ldap-cesi/DTOs/Outputs/Salarie/SalarieListDto.cs

@@ -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 ServiceMinimalDto Service { get; set; }
-    public SiteDto Site { get; set; }
+    public SiteMinimalDto Site { get; set; }
 }

ldap-cesi/DTOs/Outputs/Salarie/SalarieOutputDetail.cs

@@ -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 ServiceMinimalDto Service { get; set; }
-    public SiteDto Site { get; set; }
+    public SiteMinimalDto Site { get; set; }
 }

ldap-cesi/DTOs/Outputs/Service/ServiceMinimalDto.cs

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

ldap-cesi/DTOs/Outputs/Site/SiteMinimalDto.cs

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

ldap-cesi/Mapper/AutoMapperProfile.cs

@@ -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,7 +35,12 @@ 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<Service, ServiceMinimalDto>();
+        CreateMap<Site, SiteMinimalDto>();
         CreateMap<Site, SiteDto>()
             .ForMember(dest => dest.Salaries, opt => opt.MapFrom(src => src.Salaries));
         CreateMap<Salarie, SalarieListDto>();

ldap-cesi/Models/IResponseDataModel.cs

@@ -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; } 
 }

ldap-cesi/Models/ResponseDataModel.cs

@@ -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; }
 }

ldap-cesi/Program.cs

@@ -37,6 +37,7 @@ using (var scope = app.Services.CreateScope())
 
 app.UseHttpsRedirection();
 app.UseRouting();
+app.UseCors("AllowAll");
 app.UseAuthentication();
 app.UseAuthorization();
 app.MapControllers();

ldap-cesi/Repositories/Interfaces/IRepositoryBase.cs

@@ -7,13 +7,18 @@ 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>> SearchAsync(Expression<Func<TEntity, bool>> predicate, int numPage, int taillePage,
+    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,

ldap-cesi/Repositories/RepositoryBase.cs

@@ -34,18 +34,39 @@ public class RepositoryBase<TEntity> : IRepositoryBase<TEntity> where TEntity :
             return await _context.Set<TEntity>().AnyAsync(predicate, cancellationToken);
         }
 
-        
+        public virtual async Task<TEntity?> GetByIdAsync<TId>(TId id, CancellationToken cancellationToken = default) where TId : notnull
-        public virtual async Task<List<TEntity>> GetAllAsync(CancellationToken cancellationToken = default)
         {
             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);
+                query = query.Include(relationInclue);
-            }
-            catch (Exception ex)
-            {
-                throw new Exception($"Erreur lors de la récupération avec l'id : {id}.", ex);
             }
+
+            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,7 +167,11 @@ 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>> SearchAsync(Expression<Func<TEntity, bool>> predicate, int numPage, int taillePage, params Expression<Func<TEntity, object>>[] relationsAInclude)
+        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;
 
@@ -149,10 +182,15 @@ public class RepositoryBase<TEntity> : IRepositoryBase<TEntity> where TEntity :
 
             query = query.Where(predicate);
 
-            return await query
+            var totalCount = await query.CountAsync();
-                .Skip((numPage - 1) * taillePage)
+            var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize);
-                .Take(taillePage)
+
+            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)

ldap-cesi/Services/Interfaces/ISalarieService.cs

@@ -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);

ldap-cesi/Services/Interfaces/IServiceBase.cs

@@ -9,10 +9,10 @@ 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);

ldap-cesi/Services/Interfaces/ISiteService.cs

@@ -7,9 +7,9 @@ namespace ldap_cesi.Services.Interfaces;
 
 public interface ISiteService : IServiceBase<Site, SiteDto, SiteCreateDto, SiteUpdateDto>
 {
-    Task<IResponseDataModel<List<Site>>> GetAll();
+    // Task<IResponseDataModel<List<Site>>> GetAll();
-    Task<IResponseDataModel<Site>> GetById(int id);
+    // Task<IResponseDataModel<Site>> GetById(int id);
-    Task<IResponseDataModel<string>> CreateSite(SiteCreateDto siteCreateDto);
+    // Task<IResponseDataModel<string>> CreateSite(SiteCreateDto siteCreateDto);
-    Task<IResponseDataModel<Site>> UpdateSite(SiteUpdateDto siteUpdate);
+    // Task<IResponseDataModel<Site>> UpdateSite(SiteUpdateDto siteUpdate);
-    Task<IResponseDataModel<string>> DeleteSite(int id);
+    // Task<IResponseDataModel<string>> DeleteSite(int id);
 }

ldap-cesi/Services/SalarieService.cs

@@ -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);

ldap-cesi/Services/ServiceBase.cs

@@ -1,14 +1,8 @@
 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;
 
@@ -41,15 +35,17 @@ public class ServiceBase<T, TDto, TCreateDto, TUpdateDto> : IServiceBase<T, TDto
             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()
+    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."
             };
@@ -101,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 response = await _repository.GetAllWithRelationsAsync(pageNumber, pageSize,relationsAInclure);
-            var dtos = _mapper.Map<List<TDto>>(entities);
+            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."
             };
@@ -290,12 +288,14 @@ public class ServiceBase<T, TDto, TCreateDto, TUpdateDto> : IServiceBase<T, TDto
             var dtos = _mapper.Map<List<TDto>>(entities);
             var totalCount = await _repository.CountAsync(predicate);
             
-            var paginatedList = new PaginatedList<TDto>(dtos, totalCount, pageNumber, pageSize);
+            var response = new PaginatedList<TDto>(dtos, totalCount, pageNumber, pageSize);
 
             return new ResponseDataModel<PaginatedList<TDto>>
             {
                 Success = true,
-                Data = paginatedList,
+                Data = response,
+                TotalPages = response.TotalPages,
+                TotalCount = response.TotalCount,
                 StatusCode = 200,
                 Message = "Recherche effectuée avec succès."
             };

ldap-cesi/Services/SiteService.cs

@@ -21,132 +21,131 @@ public class SiteService : ServiceBase<Site, SiteDto, SiteCreateDto, SiteUpdateD
         _repositorySite = repositorySite;
     }
     
-    public async Task<IResponseDataModel<List<Site>>> GetAll()
+    // public async Task<IResponseDataModel<List<Site>>> GetAll()
-    {
+    // {
-        var sites = await _repositorySite.GetAllAsync();
+    //     var sites = await _repositorySite.GetAllAsync();
-        return new ResponseDataModel<List<Site>>
+    //     return new ResponseDataModel<List<Site>>
-        {
+    //     {
-            Success = true,
+    //         Success = true,
-            Data = sites,
+    //         Data = sites,
-            StatusCode = 200,
+    //         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)
+    // public async Task<IResponseDataModel<string>> CreateSite(SiteCreateDto siteCreateDto)
-    {
+    // {
-        var site = await _repositorySite.GetByIdAsync(id);
+    //     var validation = new SiteCreateValidator();
-        return new ResponseDataModel<Site>
+    //     var result = validation.Validate(siteCreateDto);
-        {
+    //     if (!result.IsValid)
-            Success = true,
+    //     {
-            Data = site,
+    //         return new ResponseDataModel<string>
-            StatusCode = 200,
+    //         {
-        };
+    //             StatusCode = 400,
-    }
+    //             Success = false,
-
+    //             Message = "Données du site invalides: " + string.Join(", ", result.Errors)
-    public async Task<IResponseDataModel<string>> CreateSite(SiteCreateDto siteCreateDto)
+    //         };
-    {
+    //     }
-        var validation = new SiteCreateValidator();
+    //     var site = _mapper.Map<Site>(siteCreateDto);
-        var result = validation.Validate(siteCreateDto);
+    //     var response = await _repositorySite.AddAsync(site);
-        if (!result.IsValid)
+    //     return new ResponseDataModel<string>
-        {
+    //     {
-            return new ResponseDataModel<string>
+    //         StatusCode = 201,
-            {
+    //         Success = true,
-                StatusCode = 400,
+    //         Data = response.Id.ToString(),
-                Success = false,
+    //     };
-                Message = "Données du site invalides: " + string.Join(", ", result.Errors)
+    // }
-            };
+    //
-        }
+    // public async Task<IResponseDataModel<Site>> UpdateSite(SiteUpdateDto siteUpdate)
-        var site = _mapper.Map<Site>(siteCreateDto);
+    // {
-        var response = await _repositorySite.AddAsync(site);
+    //     var validation = new SiteUpdateValidator();
-        return new ResponseDataModel<string>
+    //     var result = validation.Validate(siteUpdate);
-        {
+    //     if (!result.IsValid)
-            StatusCode = 201,
+    //     {
-            Success = true,
+    //         return new ResponseDataModel<Site>
-            Data = response.Id.ToString(),
+    //         {
-        };
+    //             StatusCode = 400,
-    }
+    //             Success = false,
-
+    //             Message = "Données du site invalides: " + string.Join(", ", result.Errors)
-    public async Task<IResponseDataModel<Site>> UpdateSite(SiteUpdateDto siteUpdate)
+    //         };
-    {
+    //     }
-        var validation = new SiteUpdateValidator();
+    //     
-        var result = validation.Validate(siteUpdate);
+    //     var siteFind = await _repositorySite.GetByIdAsync(siteUpdate.Id);
-        if (!result.IsValid)
+    //     if (siteFind is null)
-        {
+    //     {
-            return new ResponseDataModel<Site>
+    //         return new ResponseDataModel<Site>
-            {
+    //         {
-                StatusCode = 400,
+    //             Success = false,
-                Success = false,
+    //             Message = "Site introuvable.",
-                Message = "Données du site invalides: " + string.Join(", ", result.Errors)
+    //             StatusCode = 404
-            };
+    //         };
-        }
+    //     }
-        
+    //     
-        var siteFind = await _repositorySite.GetByIdAsync(siteUpdate.Id);
+    //     var site = _mapper.Map(siteUpdate, siteFind);
-        if (siteFind is null)
+    //     var response = await _repositorySite.UpdateAsync(site);
-        {
+    //     if (!response)
-            return new ResponseDataModel<Site>
+    //     {
-            {
+    //         return new ResponseDataModel<Site>
-                Success = false,
+    //         {
-                Message = "Site introuvable.",
+    //             StatusCode = 500,
-                StatusCode = 404
+    //             Success = false,
-            };
+    //             Message = "Erreur lors de la mise à jour du site : " + string.Join(", ", result.Errors)
-        }
+    //         };
-        
+    //     }
-        var site = _mapper.Map(siteUpdate, siteFind);
+    //     return new ResponseDataModel<Site>
-        var response = await _repositorySite.UpdateAsync(site);
+    //     {
-        if (!response)
+    //         StatusCode = 200,
-        {
+    //         Success = true,
-            return new ResponseDataModel<Site>
+    //         Data = site,
-            {
+    //     };
-                StatusCode = 500,
+    // }
-                Success = false,
+    //
-                Message = "Erreur lors de la mise à jour du site : " + string.Join(", ", result.Errors)
+    // public async Task<IResponseDataModel<string>> DeleteSite(int id)
-            };
+    // {
-        }
+    //     if (id == null)
-        return new ResponseDataModel<Site>
+    //     {
-        {
+    //         return new ResponseDataModel<string>
-            StatusCode = 200,
+    //         {
-            Success = true,
+    //             StatusCode = 400,
-            Data = site,
+    //             Success = false,
-        };
+    //             Message = "Id manquant"
-    }
+    //         };
-
+    //     }
-    public async Task<IResponseDataModel<string>> DeleteSite(int id)
+    //
-    {
+    //     var site = await _repositorySite.GetByIdAsync(id);
-        if (id == null)
+    //     if (site == null)
-        {
+    //     {
-            return new ResponseDataModel<string>
+    //         return new ResponseDataModel<string>
-            {
+    //         {
-                StatusCode = 400,
+    //             Success = false,
-                Success = false,
+    //             Message = "Site introuvable.",
-                Message = "Id manquant"
+    //             StatusCode = 404
-            };
+    //         };
-        }
+    //     }
-
+    //     var response = await _repositorySite.DeleteAsync(site);
-        var site = await _repositorySite.GetByIdAsync(id);
+    //     if (!response)
-        if (site == null)
+    //     {
-        {
+    //         return new ResponseDataModel<string>
-            return new ResponseDataModel<string>
+    //         {
-            {
+    //             StatusCode = 500,
-                Success = false,
+    //             Success = false,
-                Message = "Site introuvable.",
+    //             Message = "Erreur durant la suppression du site"
-                StatusCode = 404
+    //         };
-            };
+    //     }
-        }
+    //     return new ResponseDataModel<string>
-        var response = await _repositorySite.DeleteAsync(site);
+    //     {
-        if (!response)
+    //         StatusCode = 200,
-        {
+    //         Success = true,
-            return new ResponseDataModel<string>
+    //         Data = site.Id.ToString(),
-            {
+    //     };
-                StatusCode = 500,
+    // }
-                Success = false,
-                Message = "Erreur durant la suppression du site"
-            };
-        }
-        return new ResponseDataModel<string>
-        {
-            StatusCode = 200,
-            Success = true,
-            Data = site.Id.ToString(),
-        };
-    }
-}

ldap-cesi/Services/UtilisateurService.cs

@@ -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>>
         {