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

Compare commits

base: Yoann:cc12d77fba44efb017d1a76641ea5e5eb17709ff
Branches Tags
Yoann:main
Yoann:dev
Yoann:feat/delete-check-entite
Yoann:feat/service-base
..
compare: Yoann:67337db5c33e8df5ae69cde6b306b557fac1625d
Branches Tags
Yoann:main
Yoann:dev
Yoann:feat/delete-check-entite
Yoann:feat/service-base

No commits in common. "cc12d77fba44efb017d1a76641ea5e5eb17709ff" and "67337db5c33e8df5ae69cde6b306b557fac1625d" have entirely different histories.
cc12d77fba ... 67337db5c3

30 changed files with 272 additions and 525 deletions
Show Stats 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("AllowSpecific",
options.AddPolicy("AllowAll",
builder => builder
.WithOrigins("http://localhost:3000")
.AllowAnyOrigin()
.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([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 10)
public async Task<IActionResult> GetAllRoles()
{
var result = await _roleService.GetAll(pageNumber, pageSize);
return result.Success ? Ok(result) : BadRequest(result);
var result = await _roleService.GetAll();
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
// 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) : BadRequest(result);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
// 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) : BadRequest(result);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
// 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) : BadRequest(result);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
// 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) : BadRequest(result);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
}
}

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

@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc;
namespace ldap_cesi.Controllers;
[ApiController]
[Route("api/salaries")]
[Route("api/salarie")]
public class SalarieController : ControllerBase
{
private ISalarieService _salarieService;
@ -21,28 +21,21 @@ public class SalarieController : ControllerBase
/// </summary>
/// <returns>Une liste de salariés.</returns>
[HttpGet]
public async Task<IActionResult> GetAllSalaries([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 25)
public async Task<IActionResult> GetAllSalaries()
{
var result = await _salarieService.GetAll(pageNumber, pageSize);
return result.Success ? Ok(result) : BadRequest(result);
}
[HttpGet("search")]
public async Task<IActionResult> SearchSalaries(
[FromQuery] string searchTerm,
[FromQuery] int pageNumber = 1,
[FromQuery] int pageSize = 10)
var result = await _salarieService.GetAll();
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
/// <summary>
/// Endpoint qui retourne tous les salariés.
/// </summary>
/// <returns>Une liste de salariés.</returns>
[HttpGet("/complete")]
public async Task<IActionResult> GetAllSalariesComplet()
{
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);
var result = await _salarieService.GetAllWithoutIService();
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
/// <summary>
@ -54,19 +47,19 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> GetById(int id)
{
var result = await _salarieService.GetById(id);
return result.Success ? Ok(result) : BadRequest(result);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
/// <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. Ainsi que son service et son site</returns>
/// <returns>Le salarié correspondant à l'ID.</returns>
[HttpGet("/complet/{id}")]
public async Task<IActionResult> GetSalarieCompletById(int id)
{
var result = await _salarieService.GetByIdWithRelations(id,s => s.IdServiceNavigation, s => s.IdSiteNavigation);
return result.Success ? Ok(result) : BadRequest(result);
var result = await _salarieService.GetCompletById(id);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
/// <summary>
@ -74,10 +67,10 @@ public class SalarieController : ControllerBase
/// </summary>
/// <returns>Tous les salariés avec leurs relations</returns>
[HttpGet("all")]
public async Task<IActionResult> GetAllSariesWithRelations([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 25)
public async Task<IActionResult> GetAllSariesWithRelations()
{
var result = await _salarieService.GetAllWithRelationsAsync(pageNumber, pageSize,s => s.IdServiceNavigation, s => s.IdSiteNavigation);
return result.Success ? Ok(result) : BadRequest(result);
var result = await _salarieService.GetAllWithRelationsAsync(s => s.IdServiceNavigation, s => s.IdSiteNavigation);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
/// <summary>
@ -90,7 +83,7 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> CreateSalarie([FromBody] SalarieCreateDto salarieInput)
{
var result = await _salarieService.Create(salarieInput);
return result.Success ? Ok(result) : BadRequest(result);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
/// <summary>
@ -103,7 +96,7 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> UpdateSalarie([FromBody] SalarieUpdateDto salarieInput)
{
var result = await _salarieService.Update(salarieInput);
return result.Success ? Ok(result) : BadRequest(result);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
/// <summary>
@ -116,7 +109,7 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> DeleteSalarie(int id)
{
var result = await _salarieService.Delete(id);
return result.Success ? Ok(result) : BadRequest(result);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
/// <summary>
@ -128,7 +121,7 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> GetSalariesBySite(int siteId)
{
var result = await _salarieService.GetSalariesBySite(siteId);
return result.Success ? Ok(result) : NotFound(result);
return result.Success ? Ok(result.Data) : NotFound(result.Message);
}
/// <summary>
@ -140,7 +133,20 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> GetSalariesByService(int serviceId)
{
var result = await _salarieService.GetSalariesByService(serviceId);
return result.Success ? Ok(result) : NotFound(result);
return result.Success ? Ok(result.Data) : NotFound(result.Message);
}
/// <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/services")]
[Route("api/service")]
public class ServicesController : ControllerBase
{
private IServiceService _serviceService;
@ -21,9 +21,10 @@ public class ServicesController : ControllerBase
/// </summary>
/// <returns>Retourne tous les services.</returns>
[HttpGet]
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);
public async Task<IActionResult> GetServices()
{
var result = await _serviceService.GetAll();
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
/// <summary>
@ -35,19 +36,7 @@ public class ServicesController : ControllerBase
public async Task<IActionResult> GetServiceById(int id)
{
var result = await _serviceService.GetById(id);
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);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
/// <summary>
@ -60,7 +49,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);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
/// <summary>
@ -73,7 +62,7 @@ public class ServicesController : ControllerBase
public async Task<IActionResult> UpdateService([FromBody] ServiceUpdateDto serviceUpdateDto)
{
var result = await _serviceService.Update(serviceUpdateDto);
return result.Success ? Ok(result) : BadRequest(result);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
/// <summary>
@ -86,6 +75,6 @@ public class ServicesController : ControllerBase
public async Task<IActionResult> DeleteService(int id)
{
var result = await _serviceService.Delete(id);
return result.Success ? Ok(result) : BadRequest(result);
return result.Success ? Ok(result.Message) : BadRequest(result.Message);
}
}

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

@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc;
namespace ldap_cesi.Controllers;
[ApiController]
[Route("/api/sites")]
[Route("/api/site")]
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([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 10)
public async Task<ActionResult> GetSites()
{
var result = await _siteService.GetAll(pageNumber, pageSize);
var result = await _siteService.GetAll();
return result.Success ? Ok(result) : BadRequest(result);
}
@ -41,19 +41,6 @@ public class SiteController : ControllerBase
{
var result = await _siteService.GetById(id);
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
@ -65,7 +52,7 @@ public class SiteController : ControllerBase
[HttpPost]
public async Task<ActionResult> CreateSite([FromBody] SiteCreateDto siteCreateDto)
{
var result = await _siteService.Create(siteCreateDto);
var result = await _siteService.CreateSite(siteCreateDto);
return result.Success ? Ok(result) : BadRequest(result);
}
@ -78,7 +65,7 @@ public class SiteController : ControllerBase
[HttpPut]
public async Task<IActionResult> UpdateSite([FromBody] SiteUpdateDto siteUpdateDto)
{
var result = await _siteService.Update(siteUpdateDto);
var result = await _siteService.UpdateSite(siteUpdateDto);
return result.Success ? Ok(result) : BadRequest(result);
}
@ -91,7 +78,7 @@ public class SiteController : ControllerBase
[HttpDelete("{id}")]
public async Task<IActionResult> DeleteSite(int id)
{
var result = await _siteService.Delete(id);
var result = await _siteService.DeleteSite(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/utilisateurs")]
[Route("api/utilisateur")]
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 result = await _utilisateurService.Login(utilisateurInput);
return result.Success ? Ok(result) : BadRequest(result);
var response = await _utilisateurService.Login(utilisateurInput);
return StatusCode(response.StatusCode, response);
}
/// <summary>
@ -37,7 +37,7 @@ public class UtilisateurController : ControllerBase
public async Task<IActionResult> GetUtilisateurs()
{
var result = await _utilisateurService.GetAll();
return result.Success ? Ok(result) : BadRequest(result);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
/// <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) : BadRequest(result);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
}

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

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

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

@ -1,17 +0,0 @@
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,5 +1,3 @@
using ldap_cesi.DTOs.Outputs.Service;
namespace ldap_cesi.DTOs.Outputs.Salarie;
public class SalarieOutputDetail
@ -16,6 +14,6 @@ public class SalarieOutputDetail
public string Email { get; set; }
public ServiceMinimalDto Service { get; set; }
public SiteMinimalDto Site { get; set; }
public ServiceDto Service { get; set; }
public SiteDto Site { get; set; }
}

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

@ -1,8 +0,0 @@
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
View File

@ -1,8 +0,0 @@
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,7 +5,6 @@ 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;
@ -35,16 +34,9 @@ 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<Site, SiteDto>();
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 Normal file
View File

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

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

@ -3,7 +3,5 @@ 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
View File

@ -1,21 +0,0 @@
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,6 +3,4 @@ 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,6 +1,4 @@
using ldap_cesi.Configurations;
using ldap_cesi.Context;
using ldap_cesi.Seeders;
var builder = WebApplication.CreateBuilder(args);
builder.BuildConf();
@ -23,21 +21,8 @@ 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,22 +7,11 @@ 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> Data, int TotalPages, int TotalItems)> GetAllAsync(int pageNumber = 1, int pageSize = 10, CancellationToken cancellationToken = default);
Task<List<TEntity>> GetAllAsync(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> 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<List<TEntity>> GetAllWithRelationsAsync(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,39 +34,18 @@ 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.FindAsync<TEntity>(id, cancellationToken);
return await _context.Set<TEntity>().ToListAsync(cancellationToken);
}
catch (Exception ex)
{
throw new Exception($"Erreur lors de la récupération avec l'id : {id}.", ex);
throw new Exception("Erreur pendant la récupérations des entités.", 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);
@ -86,24 +65,16 @@ public class RepositoryBase<TEntity> : IRepositoryBase<TEntity> where TEntity :
}
}
public virtual async Task<(List<TEntity> Data, int TotalPages, int TotalItems)> GetAllWithRelationsAsync(int pageNumber = 1, int pageSize = 10, params Expression<Func<TEntity, object>>[] relationInclues)
public virtual async Task<TEntity?> GetByIdAsync<TId>(TId id, CancellationToken cancellationToken = default) where TId : notnull
{
IQueryable<TEntity> query = _dbSet;
foreach (var relationInclue in relationInclues)
try
{
query = query.Include(relationInclue);
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);
}
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)
@ -166,37 +137,5 @@ 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
View File

@ -1,49 +0,0 @@
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,8 +7,9 @@ using ldap_cesi.Models;
namespace ldap_cesi.Services.Interfaces;
public interface ISalarieService : IServiceBase<Salarie, SalarieOutputDetail, SalarieCreateDto, SalarieUpdateDto>
public interface ISalarieService : IServiceBase<Salarie, SalarieDto, 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,13 +9,10 @@ public interface IServiceBase<T, TDto, TCreateDto, TUpdateDto>
where TCreateDto : class
where TUpdateDto : class
{
Task<IResponseDataModel<List<T>>> GetAll(int pageNumber, int pageSize);
Task<IResponseDataModel<List<T>>> GetAll();
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(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<List<TDto>>> GetAllWithRelationsAsync(params Expression<Func<T, object>>[] relationsAInclure);
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;
using ldap_cesi.DTOs.Inputs.Service;
using ldap_cesi.DTOs.Inputs.Site;
using ldap_cesi.Entities;
using ldap_cesi.Models;
namespace ldap_cesi.Services.Interfaces;
public interface ISiteService : IServiceBase<Site, SiteDto, SiteCreateDto, SiteUpdateDto>
public interface ISiteService
{
// 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, SalarieOutputDetail, SalarieCreateDto, SalarieUpdateDto>, ISalarieService
public class SalarieService : ServiceBase<Salarie, SalarieDto, SalarieCreateDto, SalarieUpdateDto>, ISalarieService
{
private IRepositorySalarie _repositorySalarie;
private readonly IRepositorySite _repositorySite;
@ -28,6 +28,28 @@ public class SalarieService : ServiceBase<Salarie, SalarieOutputDetail, SalarieC
_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,10 +1,15 @@
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;
@ -29,23 +34,15 @@ public class ServiceBase<T, TDto, TCreateDto, TUpdateDto> : IServiceBase<T, TDto
_updateDtoValidator = updateDtoValidator;
}
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)
public virtual async Task<IResponseDataModel<List<T>>> GetAll()
{
try
{
var response = await _repository.GetAllAsync( pageNumber, pageSize);
var entities = await _repository.GetAllAsync();
return new ResponseDataModel<List<T>>
{
Success = true,
Data = response.Data,
TotalPages = response.TotalPages,
TotalCount = response.TotalItems,
Data = entities,
StatusCode = 200,
Message = "Liste des entités récupérée avec succès."
};
@ -97,18 +94,16 @@ public class ServiceBase<T, TDto, TCreateDto, TUpdateDto> : IServiceBase<T, TDto
}
}
public virtual async Task<IResponseDataModel<List<TDto>>> GetAllWithRelationsAsync(int pageNumber, int pageSize,params Expression<Func<T, object>>[] relationsAInclure)
public virtual async Task<IResponseDataModel<List<TDto>>> GetAllWithRelationsAsync(params Expression<Func<T, object>>[] relationsAInclure)
{
try
{
var response = await _repository.GetAllWithRelationsAsync(pageNumber, pageSize,relationsAInclure);
var dtos = _mapper.Map<List<TDto>>(response.Data);
var entities = await _repository.GetAllWithRelationsAsync(relationsAInclure);
var dtos = _mapper.Map<List<TDto>>(entities);
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."
};
@ -268,48 +263,4 @@ 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,5 +1,4 @@
using AutoMapper;
using ldap_cesi.DTOs;
using ldap_cesi.DTOs.Inputs.Site;
using ldap_cesi.Entities;
using ldap_cesi.Models;
@ -9,143 +8,144 @@ using ldap_cesi.Validator.Site;
namespace ldap_cesi.Services;
public class SiteService : ServiceBase<Site, SiteDto, SiteCreateDto, SiteUpdateDto>, ISiteService
public class SiteService : ISiteService
{
private readonly IRepositorySite _repositorySite;
private readonly IMapper _mapper;
public SiteService(IRepositorySite repositorySite, IMapper mapper,
ILogger<SiteService> logger, SiteCreateValidator siteCreateValidator, SiteUpdateValidator siteUpdateValidator)
: base(repositorySite, mapper, logger, siteCreateValidator, siteUpdateValidator )
public SiteService(IRepositorySite repositorySite, IMapper mapper)
{
_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<Site>> GetById(int id)
// {
// var site = await _repositorySite.GetByIdAsync(id);
// return new ResponseDataModel<Site>
// {
// Success = true,
// Data = site,
// 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<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<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(),
};
}
}

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

@ -1,6 +1,7 @@
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;
@ -22,7 +23,7 @@ public class UtilisateurService : IUtilisateurService
public async Task<IResponseDataModel<List<UtilisateurOutputDto>>> GetAll()
{
var utilisateurs = await _repositoryUtilisateur.GetAllAsync(1,10);
var utilisateurs = await _repositoryUtilisateur.GetAllAsync();
var utilisateursOutputDto = _mapper.Map<List<UtilisateurOutputDto>>(utilisateurs);
return new ResponseDataModel<List<UtilisateurOutputDto>>
{

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

@ -12,7 +12,6 @@
<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" />