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

Compare commits

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

No commits in common. "main" and "feat/service-base" have entirely different histories.
main ... feat/servi

32 changed files with 590 additions and 438 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 => builder.Services.AddCors(options =>
{ {
options.AddPolicy("AllowSpecific", options.AddPolicy("AllowAll",
builder => builder builder => builder
.WithOrigins("http://localhost:3000") .AllowAnyOrigin()
.AllowAnyMethod() .AllowAnyMethod()
.AllowAnyHeader()); .AllowAnyHeader());
}); });

1
ldap-cesi/Controllers/JwtController.cs
View File

@ -1,5 +1,4 @@
using ldap_cesi.Services.Interfaces; using ldap_cesi.Services.Interfaces;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
namespace ldap_cesi.Controllers; namespace ldap_cesi.Controllers;

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

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

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

@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc;
namespace ldap_cesi.Controllers; namespace ldap_cesi.Controllers;
[ApiController] [ApiController]
[Route("api/salaries")] [Route("api/salarie")]
public class SalarieController : ControllerBase public class SalarieController : ControllerBase
{ {
private ISalarieService _salarieService; private ISalarieService _salarieService;
@ -21,14 +21,15 @@ public class SalarieController : ControllerBase
/// </summary> /// </summary>
/// <returns>Une liste de salariés.</returns> /// <returns>Une liste de salariés.</returns>
[HttpGet] [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); var result = await _salarieService.GetAll();
return result.Success ? Ok(result) : BadRequest(result); return result.Success ? Ok(result.Data) : BadRequest(result.Message);
} }
[HttpGet("search")] [HttpGet("search")]
[Authorize(Roles = "admin")]
public async Task<IActionResult> SearchSalaries( public async Task<IActionResult> SearchSalaries(
[FromQuery] string searchTerm, [FromQuery] string searchTerm,
[FromQuery] int pageNumber = 1, [FromQuery] int pageNumber = 1,
@ -42,7 +43,7 @@ public class SalarieController : ControllerBase
var result = await _salarieService.SearchWithRelations( var result = await _salarieService.SearchWithRelations(
searchTerm, pageNumber, pageSize, s => s.IdServiceNavigation, s => s.IdSiteNavigation); searchTerm, pageNumber, pageSize, s => s.IdServiceNavigation, s => s.IdSiteNavigation);
return result.Success ? Ok(result) : BadRequest(result); return result.Success ? Ok(result.Data) : BadRequest(result.Message);
} }
/// <summary> /// <summary>
@ -54,7 +55,7 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> GetById(int id) public async Task<IActionResult> GetById(int id)
{ {
var result = await _salarieService.GetById(id); var result = await _salarieService.GetById(id);
return result.Success ? Ok(result) : BadRequest(result); return result.Success ? Ok(result.Data) : BadRequest(result.Message);
} }
/// <summary> /// <summary>
@ -66,7 +67,7 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> GetSalarieCompletById(int id) public async Task<IActionResult> GetSalarieCompletById(int id)
{ {
var result = await _salarieService.GetByIdWithRelations(id,s => s.IdServiceNavigation, s => s.IdSiteNavigation); var result = await _salarieService.GetByIdWithRelations(id,s => s.IdServiceNavigation, s => s.IdSiteNavigation);
return result.Success ? Ok(result) : BadRequest(result); return result.Success ? Ok(result.Data) : BadRequest(result.Message);
} }
/// <summary> /// <summary>
@ -74,10 +75,10 @@ public class SalarieController : ControllerBase
/// </summary> /// </summary>
/// <returns>Tous les salariés avec leurs relations</returns> /// <returns>Tous les salariés avec leurs relations</returns>
[HttpGet("all")] [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); var result = await _salarieService.GetAllWithRelationsAsync(s => s.IdServiceNavigation, s => s.IdSiteNavigation);
return result.Success ? Ok(result) : BadRequest(result); return result.Success ? Ok(result.Data) : BadRequest(result.Message);
} }
/// <summary> /// <summary>
@ -90,7 +91,7 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> CreateSalarie([FromBody] SalarieCreateDto salarieInput) public async Task<IActionResult> CreateSalarie([FromBody] SalarieCreateDto salarieInput)
{ {
var result = await _salarieService.Create(salarieInput); var result = await _salarieService.Create(salarieInput);
return result.Success ? Ok(result) : BadRequest(result); return result.Success ? Ok(result.Data) : BadRequest(result.Message);
} }
/// <summary> /// <summary>
@ -103,7 +104,7 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> UpdateSalarie([FromBody] SalarieUpdateDto salarieInput) public async Task<IActionResult> UpdateSalarie([FromBody] SalarieUpdateDto salarieInput)
{ {
var result = await _salarieService.Update(salarieInput); var result = await _salarieService.Update(salarieInput);
return result.Success ? Ok(result) : BadRequest(result); return result.Success ? Ok(result.Data) : BadRequest(result.Message);
} }
/// <summary> /// <summary>
@ -116,7 +117,7 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> DeleteSalarie(int id) public async Task<IActionResult> DeleteSalarie(int id)
{ {
var result = await _salarieService.Delete(id); var result = await _salarieService.Delete(id);
return result.Success ? Ok(result) : BadRequest(result); return result.Success ? Ok(result.Data) : BadRequest(result.Message);
} }
/// <summary> /// <summary>
@ -128,7 +129,7 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> GetSalariesBySite(int siteId) public async Task<IActionResult> GetSalariesBySite(int siteId)
{ {
var result = await _salarieService.GetSalariesBySite(siteId); var result = await _salarieService.GetSalariesBySite(siteId);
return result.Success ? Ok(result) : NotFound(result); return result.Success ? Ok(result.Data) : NotFound(result.Message);
} }
/// <summary> /// <summary>
@ -140,7 +141,7 @@ public class SalarieController : ControllerBase
public async Task<IActionResult> GetSalariesByService(int serviceId) public async Task<IActionResult> GetSalariesByService(int serviceId)
{ {
var result = await _salarieService.GetSalariesByService(serviceId); var result = await _salarieService.GetSalariesByService(serviceId);
return result.Success ? Ok(result) : NotFound(result); return result.Success ? Ok(result.Data) : NotFound(result.Message);
} }
} }

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

@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc;
namespace ldap_cesi.Controllers; namespace ldap_cesi.Controllers;
[ApiController] [ApiController]
[Route("api/services")] [Route("api/service")]
public class ServicesController : ControllerBase public class ServicesController : ControllerBase
{ {
private IServiceService _serviceService; private IServiceService _serviceService;
@ -21,9 +21,10 @@ public class ServicesController : ControllerBase
/// </summary> /// </summary>
/// <returns>Retourne tous les services.</returns> /// <returns>Retourne tous les services.</returns>
[HttpGet] [HttpGet]
public async Task<IActionResult> GetServices([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 10) { public async Task<IActionResult> GetServices()
var result = await _serviceService.GetAll(pageNumber, pageSize); {
return result.Success ? Ok(result) : BadRequest(result); var result = await _serviceService.GetAll();
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
} }
/// <summary> /// <summary>
@ -35,7 +36,7 @@ public class ServicesController : ControllerBase
public async Task<IActionResult> GetServiceById(int id) public async Task<IActionResult> GetServiceById(int id)
{ {
var result = await _serviceService.GetById(id); var result = await _serviceService.GetById(id);
return result.Success ? Ok(result) : BadRequest(result); return result.Success ? Ok(result.Data) : BadRequest(result.Message);
} }
/// <summary> /// <summary>
@ -47,7 +48,7 @@ public class ServicesController : ControllerBase
public async Task<IActionResult> GetServiceByIdWithSalaries(int id) public async Task<IActionResult> GetServiceByIdWithSalaries(int id)
{ {
var result = await _serviceService.GetByIdWithRelations(id, s=>s.Salaries); 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> /// <summary>
@ -60,7 +61,7 @@ public class ServicesController : ControllerBase
public async Task<IActionResult> CreateService([FromBody] ServiceCreateDto serviceInputDto) public async Task<IActionResult> CreateService([FromBody] ServiceCreateDto serviceInputDto)
{ {
var result = await _serviceService.Create(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> /// <summary>
@ -73,7 +74,7 @@ public class ServicesController : ControllerBase
public async Task<IActionResult> UpdateService([FromBody] ServiceUpdateDto serviceUpdateDto) public async Task<IActionResult> UpdateService([FromBody] ServiceUpdateDto serviceUpdateDto)
{ {
var result = await _serviceService.Update(serviceUpdateDto); var result = await _serviceService.Update(serviceUpdateDto);
return result.Success ? Ok(result) : BadRequest(result); return result.Success ? Ok(result.Data) : BadRequest(result.Message);
} }
/// <summary> /// <summary>
@ -85,7 +86,7 @@ public class ServicesController : ControllerBase
[Authorize(Roles = "admin")] [Authorize(Roles = "admin")]
public async Task<IActionResult> DeleteService(int id) public async Task<IActionResult> DeleteService(int id)
{ {
var result = await _serviceService.DeleteWithEntiteCheck(id); var result = await _serviceService.Delete(id);
return result.Success ? Ok(result) : BadRequest(result); return result.Success ? Ok(result.Message) : BadRequest(result.Message);
} }
} }

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

@ -1,12 +1,11 @@
using ldap_cesi.DTOs.Inputs.Site; using ldap_cesi.DTOs.Inputs.Site;
using ldap_cesi.Services.Interfaces; using ldap_cesi.Services.Interfaces;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
namespace ldap_cesi.Controllers; namespace ldap_cesi.Controllers;
[ApiController] [ApiController]
[Route("/api/sites")] [Route("/api/site")]
public class SiteController : ControllerBase public class SiteController : ControllerBase
{ {
private readonly ISiteService _siteService; private readonly ISiteService _siteService;
@ -22,9 +21,9 @@ public class SiteController : ControllerBase
/// </summary> /// </summary>
/// <returns>Retourne une liste de tous les sites.</returns> /// <returns>Retourne une liste de tous les sites.</returns>
[HttpGet] [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); return result.Success ? Ok(result) : BadRequest(result);
} }
@ -64,10 +63,9 @@ public class SiteController : ControllerBase
/// <param name="siteCreateDto">Les données du site à créer.</param> /// <param name="siteCreateDto">Les données du site à créer.</param>
/// <returns>Retourne l'identifiant du site créé.</returns> /// <returns>Retourne l'identifiant du site créé.</returns>
[HttpPost] [HttpPost]
[Authorize(Roles = "admin")]
public async Task<ActionResult> CreateSite([FromBody] SiteCreateDto siteCreateDto) 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); return result.Success ? Ok(result) : BadRequest(result);
} }
@ -78,10 +76,9 @@ public class SiteController : ControllerBase
/// <param name="siteUpdateDto">Les données du site à mettre à jour.</param> /// <param name="siteUpdateDto">Les données du site à mettre à jour.</param>
/// <returns>Retourne l'objet ou une erreur.</returns> /// <returns>Retourne l'objet ou une erreur.</returns>
[HttpPut] [HttpPut]
[Authorize(Roles = "admin")]
public async Task<IActionResult> UpdateSite([FromBody] SiteUpdateDto siteUpdateDto) 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); return result.Success ? Ok(result) : BadRequest(result);
} }
@ -92,10 +89,9 @@ public class SiteController : ControllerBase
/// <param name="id">L'identifiant du site à supprimer.</param> /// <param name="id">L'identifiant du site à supprimer.</param>
/// <returns>Retourne l'id, ou l'erreur</returns> /// <returns>Retourne l'id, ou l'erreur</returns>
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize(Roles = "admin")]
public async Task<IActionResult> DeleteSite(int id) public async Task<IActionResult> DeleteSite(int id)
{ {
var result = await _siteService.DeleteWithEntiteCheck(id); var result = await _siteService.DeleteSite(id);
return result.Success ? Ok(result) : BadRequest(result); return result.Success ? Ok(result) : BadRequest(result);
} }
} }

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

@ -1,4 +1,3 @@
using System.Security.Claims;
using ldap_cesi.DTOs.Inputs; using ldap_cesi.DTOs.Inputs;
using ldap_cesi.Services.Interfaces; using ldap_cesi.Services.Interfaces;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
@ -6,15 +5,14 @@ using Microsoft.AspNetCore.Mvc;
namespace ldap_cesi.Controllers; namespace ldap_cesi.Controllers;
[ApiController] [ApiController]
[Route("api/utilisateurs")] [Route("api/utilisateur")]
public class UtilisateurController : ControllerBase public class UtilisateurController : ControllerBase
{ {
private readonly IUtilisateurService _utilisateurService; private IUtilisateurService _utilisateurService;
private readonly IJwtService _jwtService;
public UtilisateurController(IUtilisateurService utilisateurService, IJwtService jwtService) public UtilisateurController(IUtilisateurService utilisateurService)
{ {
_utilisateurService = utilisateurService; _utilisateurService = utilisateurService;
_jwtService = jwtService;
} }
@ -26,82 +24,8 @@ public class UtilisateurController : ControllerBase
[HttpPost("login")] [HttpPost("login")]
public async Task<IActionResult> Login([FromBody] UtilisateurLoginDto utilisateurInput) public async Task<IActionResult> Login([FromBody] UtilisateurLoginDto utilisateurInput)
{ {
var result = await _utilisateurService.Login(utilisateurInput); var response = await _utilisateurService.Login(utilisateurInput);
return result.Success ? Ok(result) : BadRequest(result); return StatusCode(response.StatusCode, response);
}
[HttpGet("me")]
[Authorize]
public async Task<IActionResult> GetCurrentUser()
{
try {
// rçupère tous les claims de type NameIdentifier
var nameIdClaims = User.FindAll(ClaimTypes.NameIdentifier).ToList();
// cherche le claim qui contient un nombre entier
int userId = 0;
bool foundValidId = false;
foreach (var claim in nameIdClaims)
{
if (int.TryParse(claim.Value, out userId))
{
foundValidId = true;
break;
}
}
if (!foundValidId)
{
return BadRequest(new {
Success = false,
Message = "Utilisateur non identifié. Aucun ID numérique trouvé."
});
}
// rçupère les informations utilisateur
var result = await _utilisateurService.GetById(userId);
return result.Success ? Ok(result) : BadRequest(result);
}
catch (Exception ex) {
return BadRequest(new { Success = false, Message = $"Erreur: {ex.Message}" });
}
}
/// <summary>
/// Endpoint pour déconnecter un utilisateur (invalider son token).
/// </summary>
/// <returns>Un statut indiquant que la déconnexion a réussi.</returns>
[HttpPost("logout")]
[Authorize]
public async Task<IActionResult> Logout()
{
try
{
var authHeader = Request.Headers["Authorization"].ToString();
if (string.IsNullOrEmpty(authHeader) || !authHeader.StartsWith("Bearer "))
{
return BadRequest(new { Success = false, Message = "Token non fourni" });
}
var token = authHeader.Substring("Bearer ".Length).Trim();
// rendre le tokenm invalide
var result = await _jwtService.InvalidateToken(token);
if (result)
{
return Ok(new { Success = true, Message = "Déconnexion réussie" });
}
else
{
return BadRequest(new { Success = false, Message = "Échec de la déconnexion" });
}
}
catch (Exception ex)
{
return StatusCode(500, new { Success = false, Message = "Erreur interne du serveur" });
}
} }
/// <summary> /// <summary>
@ -113,7 +37,7 @@ public class UtilisateurController : ControllerBase
public async Task<IActionResult> GetUtilisateurs() public async Task<IActionResult> GetUtilisateurs()
{ {
var result = await _utilisateurService.GetAll(); var result = await _utilisateurService.GetAll();
return result.Success ? Ok(result) : BadRequest(result); return result.Success ? Ok(result.Data) : BadRequest(result.Message);
} }
/// <summary> /// <summary>
@ -126,6 +50,6 @@ public class UtilisateurController : ControllerBase
public async Task<IActionResult> GetUtilisateurById(int id) public async Task<IActionResult> GetUtilisateurById(int id)
{ {
var result = await _utilisateurService.GetById(id); var result = await _utilisateurService.GetById(id);
return result.Success ? Ok(result) : BadRequest(result); return result.Success ? Ok(result.Data) : BadRequest(result.Message);
} }
} }

2
ldap-cesi/DTOs/Inputs/Salarie/SalarieCreateDto.cs
View File

@ -4,7 +4,7 @@ public class SalarieCreateDto
{ {
public string Nom { get; set; } public string Nom { get; set; }
public string Prenom { get; set; } public string Prenom { get; set; }
public string TelephoneFixe { get; set; } public string TelephoneFix { get; set; }
public string TelephonePortable { get; set; } public string TelephonePortable { get; set; }
public string Email { get; set; } public string Email { get; set; }
public int IdSite { get; set; } public int IdSite { 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; namespace ldap_cesi.DTOs.Outputs.Salarie;
public class SalarieListDto public class SalarieListDto
@ -9,6 +7,6 @@ public class SalarieListDto
public string Nom { get; set; } public string Nom { get; set; }
public string Prenom { get; set; } public string Prenom { get; set; }
public string NomComplet => $"{Prenom} {Nom}"; public string NomComplet => $"{Prenom} {Nom}";
public ServiceMinimalDto Service { get; set; } public ServiceDto Service { get; set; }
public SiteMinimalDto Site { get; set; } public SiteDto Site { get; set; }
} }

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

13
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.Service;
using ldap_cesi.DTOs.Inputs.Site; using ldap_cesi.DTOs.Inputs.Site;
using ldap_cesi.DTOs.Outputs.Salarie; using ldap_cesi.DTOs.Outputs.Salarie;
using ldap_cesi.DTOs.Outputs.Service;
using ldap_cesi.DTOs.Outputs.Utilisateur; using ldap_cesi.DTOs.Outputs.Utilisateur;
using ldap_cesi.Entities; using ldap_cesi.Entities;
@ -22,7 +21,7 @@ public class AutoMapperProfile : Profile
CreateMap<RoleCreateDto, Role>(); CreateMap<RoleCreateDto, Role>();
CreateMap<SiteUpdateDto, Site>(); CreateMap<SiteUpdateDto, Site>();
CreateMap<SalarieCreateDto, Salarie>() CreateMap<SalarieCreateDto, Salarie>()
.ForMember(dest => dest.TelephoneFixe, opt => opt.MapFrom(src => src.TelephoneFixe)) .ForMember(dest => dest.TelephoneFixe, opt => opt.MapFrom(src => src.TelephoneFix))
.ForMember(dest => dest.TelephonePortable, opt => opt.MapFrom(src => src.TelephonePortable)); .ForMember(dest => dest.TelephonePortable, opt => opt.MapFrom(src => src.TelephonePortable));
CreateMap<SalarieUpdateDto, Salarie>() CreateMap<SalarieUpdateDto, Salarie>()
.ForMember(dest => dest.TelephoneFixe, opt => opt.MapFrom(src => src.TelephoneFixe)) .ForMember(dest => dest.TelephoneFixe, opt => opt.MapFrom(src => src.TelephoneFixe))
@ -35,18 +34,10 @@ public class AutoMapperProfile : Profile
CreateMap<Salarie, SalarieDto>() CreateMap<Salarie, SalarieDto>()
.ForMember(dest => dest.Service, opt => opt.MapFrom(src => src.IdServiceNavigation)) .ForMember(dest => dest.Service, opt => opt.MapFrom(src => src.IdServiceNavigation))
.ForMember(dest => dest.Site, opt => opt.MapFrom(src => src.IdSiteNavigation)); .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, ServiceDto>();
CreateMap<Service, ServiceMinimalDto>();
CreateMap<Site, SiteMinimalDto>();
CreateMap<Site, SiteDto>() CreateMap<Site, SiteDto>()
.ForMember(dest => dest.Salaries, opt => opt.MapFrom(src => src.Salaries)); .ForMember(dest => dest.Salaries, opt => opt.MapFrom(src => src.Salaries));
CreateMap<Salarie, SalarieListDto>() CreateMap<Salarie, SalarieListDto>();
.ForMember(dest => dest.Service, opt => opt.MapFrom(src => src.IdServiceNavigation))
.ForMember(dest => dest.Site, opt => opt.MapFrom(src => src.IdSiteNavigation));
CreateMap<Service, ServiceDto>();
CreateMap<Salarie, SalarieMinimalDto>(); CreateMap<Salarie, SalarieMinimalDto>();
CreateMap<Salarie, SalarieListDto>() CreateMap<Salarie, SalarieListDto>()
.ForMember(dest => dest.Service, opt => opt.MapFrom(src => src.IdServiceNavigation.Nom)) .ForMember(dest => dest.Service, opt => opt.MapFrom(src => src.IdServiceNavigation.Nom))

35
ldap-cesi/Models/PaginatedList.cs
View File

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

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

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

1
ldap-cesi/Program.cs
View File

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

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

@ -7,20 +7,14 @@ public interface IRepositoryBase<TEntity> where TEntity : class
Task<TEntity> AddAsync(TEntity entity, CancellationToken cancellationToken = default); Task<TEntity> AddAsync(TEntity entity, CancellationToken cancellationToken = default);
Task<bool> AnyAsync(Expression<Func<TEntity, bool>> predicate, 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<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> UpdateAsync(TEntity entity, CancellationToken cancellationToken = default);
Task<bool> DeleteAsync(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<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>> SearchAsync(Expression<Func<TEntity, bool>> predicate, int numPage, int taillePage,
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); params Expression<Func<TEntity, object>>[] relationsAInclude);
Task<int> CountRelatedEntitiesAsync<TRelated>(int id, Expression<Func<TRelated, bool>> predicate) where TRelated : class;
Task<TEntity?> FirstOrDefaultAsync(Expression<Func<TEntity, bool>> predicate, Task<TEntity?> FirstOrDefaultAsync(Expression<Func<TEntity, bool>> predicate,
CancellationToken cancellationToken = default); CancellationToken cancellationToken = default);

1
ldap-cesi/Repositories/Interfaces/IRepositoryUtilisateur.cs
View File

@ -5,5 +5,4 @@ namespace ldap_cesi.Repository.Services;
public interface IRepositoryUtilisateur : IRepositoryBase<Utilisateur> public interface IRepositoryUtilisateur : IRepositoryBase<Utilisateur>
{ {
Task<Utilisateur> GetByEmailAsync(string email); Task<Utilisateur> GetByEmailAsync(string email);
Task<Utilisateur> GetByIdIncludeRoleAsync(int id);
} }

94
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); 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 try
{ {
return await _context.FindAsync<TEntity>(id, cancellationToken); return await _context.Set<TEntity>().ToListAsync(cancellationToken);
} }
catch (Exception ex) 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) public virtual async Task<TEntity?> FirstOrDefaultAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default)
{ {
return await _context.Set<TEntity>().FirstOrDefaultAsync(predicate, cancellationToken); 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; try
foreach (var relationInclue in relationInclues)
{ {
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) public virtual async Task<bool> DeleteAsync(TEntity entity, CancellationToken cancellationToken = default)
@ -132,6 +103,28 @@ public class RepositoryBase<TEntity> : IRepositoryBase<TEntity> where TEntity :
} }
} }
public virtual async Task<List<TEntity>> ListAsync(CancellationToken cancellationToken = default)
{
try
{
return await _context.Set<TEntity>().ToListAsync(cancellationToken);
}
catch (Exception ex)
{
throw new Exception("Erreur qui concerne le listing des entités", ex);
}
}
public virtual async Task<List<TEntity>> GetAllWithRelationsAsync(params Expression<Func<TEntity, object>>[] relationInclues)
{
IQueryable<TEntity> query = _dbSet;
foreach (var relationInclue in relationInclues)
{
query = query.Include(relationInclue);
}
return await query.ToListAsync();
}
public virtual async Task<TEntity> GetWithRelationsAsync(int id, params Expression<Func<TEntity, object>>[] relationInclues) public virtual async Task<TEntity> GetWithRelationsAsync(int id, params Expression<Func<TEntity, object>>[] relationInclues)
{ {
@ -145,11 +138,7 @@ public class RepositoryBase<TEntity> : IRepositoryBase<TEntity> where TEntity :
return await query.FirstOrDefaultAsync(e => EF.Property<int>(e, "Id") == id); return await query.FirstOrDefaultAsync(e => EF.Property<int>(e, "Id") == id);
} }
public virtual async Task<(List<TEntity> Data, int TotalPages, int TotalItems)> SearchAsync( public virtual async Task<List<TEntity>> SearchAsync(Expression<Func<TEntity, bool>> predicate, int numPage, int taillePage, params Expression<Func<TEntity, object>>[] relationsAInclude)
Expression<Func<TEntity, bool>> predicate,
int pageNumber = 1,
int pageSize = 10,
params Expression<Func<TEntity, object>>[] relationsAInclude)
{ {
IQueryable<TEntity> query = _dbSet; IQueryable<TEntity> query = _dbSet;
@ -160,15 +149,10 @@ public class RepositoryBase<TEntity> : IRepositoryBase<TEntity> where TEntity :
query = query.Where(predicate); query = query.Where(predicate);
var totalCount = await query.CountAsync(); return await query
var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize); .Skip((numPage - 1) * taillePage)
.Take(taillePage)
var data = await query
.Skip((pageNumber - 1) * pageSize)
.Take(pageSize)
.ToListAsync(); .ToListAsync();
return (data, totalPages, totalCount);
} }
public virtual async Task<int> CountAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default) public virtual async Task<int> CountAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default)
@ -176,9 +160,5 @@ public class RepositoryBase<TEntity> : IRepositoryBase<TEntity> where TEntity :
return await _dbSet.CountAsync(predicate, cancellationToken); return await _dbSet.CountAsync(predicate, cancellationToken);
} }
public virtual async Task<int> CountRelatedEntitiesAsync<TRelated>(int id, Expression<Func<TRelated, bool>> predicate) where TRelated : class
{
return await _context.Set<TRelated>().CountAsync(predicate);
}
} }

9
ldap-cesi/Repositories/UtilisateurRepository.cs
View File

@ -14,14 +14,7 @@ public class UtilisateurRepository : RepositoryBase<Utilisateur>, IRepositoryUti
public async Task<Utilisateur> GetByEmailAsync(string email) public async Task<Utilisateur> GetByEmailAsync(string email)
{ {
return await _context.Utilisateurs return await _context.Utilisateurs.Include(u => u.IdRoleNavigation)
.Include(u => u.IdRoleNavigation)
.FirstOrDefaultAsync(u => u.Email == email); .FirstOrDefaultAsync(u => u.Email == email);
} }
public async Task<Utilisateur> GetByIdIncludeRoleAsync(int id)
{
return await _context.Utilisateurs
.Include(u => u.IdRoleNavigation)
.FirstOrDefaultAsync(u => u.Id == id);
}
} }

1
ldap-cesi/Services/Interfaces/IJwtService.cs
View File

@ -7,5 +7,4 @@ public interface IJwtService
string GenerateToken(Utilisateur utilisateur); string GenerateToken(Utilisateur utilisateur);
string GetPublicKey(); string GetPublicKey();
Task<bool> ValidateToken(string token, int userId); Task<bool> ValidateToken(string token, int userId);
Task<bool> InvalidateToken(string token);
} }

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

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

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

@ -9,15 +9,14 @@ public interface IServiceBase<T, TDto, TCreateDto, TUpdateDto>
where TCreateDto : class where TCreateDto : class
where TUpdateDto : 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<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<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<List<TDto>>> GetAllWithRelationsAsync(params Expression<Func<T, object>>[] relationsAInclure);
Task<IResponseDataModel<List<TDto>>> SearchWithRelations(string searchTerm, int pageNumber, int pageSize, Task<IResponseDataModel<PaginatedList<TDto>>> SearchWithRelations(string searchTerm, int pageNumber, int pageSize,
params Expression<Func<T, object>>[] includeProperties); params Expression<Func<T, object>>[] includeProperties);
Task<IResponseDataModel<T>> Create(TCreateDto dto); Task<IResponseDataModel<T>> Create(TCreateDto dto);
Task<IResponseDataModel<T>> Update(TUpdateDto dto); Task<IResponseDataModel<T>> Update(TUpdateDto dto);
Task<IResponseDataModel<string>> Delete(int id); Task<IResponseDataModel<string>> Delete(int id);
Task<IResponseDataModel<string>> DeleteWithDependencyCheck<TRelated>(int id, Expression<Func<TRelated, bool>> relationPredicate, string relationErrorMessage) where TRelated : class;
} }

1
ldap-cesi/Services/Interfaces/IServiceService.cs
View File

@ -7,6 +7,5 @@ namespace ldap_cesi.Services.Interfaces
{ {
public interface IServiceService : IServiceBase<Service, ServiceDto, ServiceCreateDto, ServiceUpdateDto> public interface IServiceService : IServiceBase<Service, ServiceDto, ServiceCreateDto, ServiceUpdateDto>
{ {
Task<IResponseDataModel<string>> DeleteWithEntiteCheck(int id);
} }
} }

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

@ -7,5 +7,9 @@ namespace ldap_cesi.Services.Interfaces;
public interface ISiteService : IServiceBase<Site, SiteDto, SiteCreateDto, SiteUpdateDto> public interface ISiteService : IServiceBase<Site, SiteDto, SiteCreateDto, SiteUpdateDto>
{ {
Task<IResponseDataModel<string>> DeleteWithEntiteCheck(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);
} }

41
ldap-cesi/Services/JwtService.cs
View File

@ -78,47 +78,6 @@ public class JwtService : IJwtService
throw; throw;
} }
} }
// Ajouter cette méthode à votre JwtService.cs
public async Task<bool> InvalidateToken(string token)
{
try
{
var tokenHandler = new JwtSecurityTokenHandler();
// récupération du token
var jwtToken = tokenHandler.ReadJwtToken(token);
// identifiant de l'utilisateur
var userIdClaim = jwtToken.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier);
if (userIdClaim == null || !int.TryParse(userIdClaim.Value, out var userId))
{
_logger.LogWarning("Erreur d'invalidation du token : Id utilisateur non trouvé ou invalide.");
return false;
}
var utilisateur = await _context.Utilisateurs.FindAsync(userId);
if (utilisateur == null)
{
_logger.LogWarning("Erreur d'invalidation du token : Utilisateur non trouvé.");
return false;
}
// delte le token stocké
utilisateur.AccessToken = null;
_context.Utilisateurs.Update(utilisateur);
await _context.SaveChangesAsync();
_logger.LogInformation($"Token invalidé pour l'utilisateur {userId}.");
return true;
}
catch (Exception ex)
{
_logger.LogError(ex, "Une erreur s'est produite pendant l'invalidation du token JWT.");
return false;
}
}
public async Task<bool> ValidateToken(string token, int userId) public async Task<bool> ValidateToken(string token, int userId)
{ {

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

@ -11,7 +11,7 @@ using ldap_cesi.Validator.Salarie;
namespace ldap_cesi.Services; 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 IRepositorySalarie _repositorySalarie;
private readonly IRepositorySite _repositorySite; private readonly IRepositorySite _repositorySite;
@ -27,13 +27,47 @@ public class SalarieService : ServiceBase<Salarie, SalarieOutputDetail, SalarieC
_repositoryService = repositoryService; _repositoryService = repositoryService;
_mapper = mapper; _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);
var salarieOutput = _mapper.Map<SalarieDto>(salarie);
return new ResponseDataModel<SalarieDto>
{
Success = true,
Data = salarieOutput,
StatusCode = 200,
};
}
public async Task<IResponseDataModel<List<SalarieOutputDetail>>> GetSalariesBySite(int siteId, int pageNumber = 1, int pageSize = 25) public async Task<IResponseDataModel<List<SalarieListDto>>> GetSalariesBySite(int siteId)
{ {
var site = await _repositorySite.GetByIdAsync(siteId); var site = await _repositorySite.GetByIdAsync(siteId);
if (site == null) if (site == null)
{ {
return new ResponseDataModel<List<SalarieOutputDetail>> return new ResponseDataModel<List<SalarieListDto>>
{ {
Success = false, Success = false,
Message = "Site non trouvé", Message = "Site non trouvé",
@ -42,32 +76,33 @@ public class SalarieService : ServiceBase<Salarie, SalarieOutputDetail, SalarieC
} }
var salaries = await _repositorySalarie.GetSalariesBySiteAsync(siteId); var salaries = await _repositorySalarie.GetSalariesBySiteAsync(siteId);
var totalCount = salaries.Count; if (!salaries.Any())
var paginatedSalaries = salaries {
.Skip((pageNumber - 1) * pageSize) return new ResponseDataModel<List<SalarieListDto>>
.Take(pageSize) {
.ToList(); Success = true,
Message = "Aucun salarié trouvé pour ce site",
Data = new List<SalarieListDto>(),
StatusCode = 200
};
}
var salariesDto = _mapper.Map<List<SalarieOutputDetail>>(paginatedSalaries); var salariesDto = _mapper.Map<List<SalarieListDto>>(salaries);
return new ResponseDataModel<List<SalarieOutputDetail>> return new ResponseDataModel<List<SalarieListDto>>
{ {
Success = true, Success = true,
Data = salariesDto, Data = salariesDto,
TotalPages = (int)Math.Ceiling((double)totalCount / pageSize),
TotalCount = totalCount,
PageNumber = pageNumber,
PageSize = pageSize,
StatusCode = 200 StatusCode = 200
}; };
} }
public async Task<IResponseDataModel<List<SalarieOutputDetail>>> GetSalariesByService(int serviceId, int pageNumber = 1, int pageSize = 25) public async Task<IResponseDataModel<List<SalarieListDto>>> GetSalariesByService(int serviceId)
{ {
var service = await _repositoryService.GetByIdAsync(serviceId); var service = await _repositoryService.GetByIdAsync(serviceId);
if (service == null) if (service == null)
{ {
return new ResponseDataModel<List<SalarieOutputDetail>> return new ResponseDataModel<List<SalarieListDto>>
{ {
Success = false, Success = false,
Message = "Service non trouvé", Message = "Service non trouvé",
@ -76,23 +111,132 @@ public class SalarieService : ServiceBase<Salarie, SalarieOutputDetail, SalarieC
} }
var salaries = await _repositorySalarie.GetSalariesByServiceAsync(serviceId); var salaries = await _repositorySalarie.GetSalariesByServiceAsync(serviceId);
var totalCount = salaries.Count; var salariesDto = _mapper.Map<List<SalarieListDto>>(salaries);
var paginatedSalaries = salaries
.Skip((pageNumber - 1) * pageSize) return new ResponseDataModel<List<SalarieListDto>>
.Take(pageSize)
.ToList();
var salariesDto = _mapper.Map<List<SalarieOutputDetail>>(paginatedSalaries);
return new ResponseDataModel<List<SalarieOutputDetail>>
{ {
Success = true, Success = true,
Data = salariesDto, // Les salariés paginés Data = salariesDto,
TotalPages = (int)Math.Ceiling((double)totalCount / pageSize),
TotalCount = totalCount,
PageNumber = pageNumber,
PageSize = pageSize,
StatusCode = 200 StatusCode = 200
}; };
} }
public async Task<IResponseDataModel<List<SalarieListDto>>> RechercherParNom(string nom)
{
var salaries = await _repositorySalarie.SearchByNameAsync(nom);
var salariesDto = _mapper.Map<List<SalarieListDto>>(salaries);
return new ResponseDataModel<List<SalarieListDto>>
{
Success = true,
Data = salariesDto,
StatusCode = 200
};
}
// public async Task<IResponseDataModel<string>> Create(SalarieCreateDto salarieInput)
// {
// var validation = new SalarieCreateValidator();
// var result = validation.Validate(salarieInput);
// if (!result.IsValid)
// {
// return new ResponseDataModel<string>
// {
// StatusCode = 400,
// Success = false,
// Message = "Données salariées invalides: " + string.Join(", ", result.Errors)
// };
// }
// var service = _mapper.Map<Salarie>(salarieInput);
// var response = await _repositorySalarie.AddAsync(service);
// return new ResponseDataModel<string>
// {
// StatusCode = 201,
// Success = true,
// Data = response.Id.ToString(),
// };
// }
// public async Task<IResponseDataModel<Salarie>> Update(SalarieUpdateDto salarieInput)
// {
// var validation = new SalarieUpdateValidator();
// var result = validation.Validate(salarieInput);
// if (!result.IsValid)
// {
// return new ResponseDataModel<Salarie>
// {
// StatusCode = 400,
// Success = false,
// Message = "Données salariées invalides: " + string.Join(", ", result.Errors)
// };
// }
// var salarieFind = await _repositorySalarie.GetByIdAsync(salarieInput.Id);
// if (salarieFind == null)
// {
// return new ResponseDataModel<Salarie>
// {
// Success = false,
// Message = "Salarié introuvable.",
// StatusCode = 404
// };
// }
// var salarie = _mapper.Map(salarieInput, salarieFind);
// var response = await _repositorySalarie.UpdateAsync(salarie);
// if (!response)
// {
// return new ResponseDataModel<Salarie>
// {
// StatusCode = 500,
// Success = false,
// Message = "Erreur lors de la mise à jour du salarié : " + string.Join(", ", result.Errors)
// };
// }
// return new ResponseDataModel<Salarie>
// {
// StatusCode = 200,
// Success = true,
// Data = salarie,
// };
// }
// public async Task<IResponseDataModel<string>> Delete(int id)
// {
// if (id == null)
// {
// return new ResponseDataModel<string>
// {
// StatusCode = 400,
// Success = false,
// Message = "Id manquant"
// };
// }
// var salarie = await _repositorySalarie.GetByIdAsync(id);
// if (salarie == null)
// {
// return new ResponseDataModel<string>
// {
// Success = false,
// Message = "Salarié introuvable.",
// StatusCode = 404
// };
// }
// var response = await _repositorySalarie.DeleteAsync(salarie);
// if (!response)
// {
// return new ResponseDataModel<string>
// {
// StatusCode = 500,
// Success = false,
// Message = "Erreur durant la suppression du service"
// };
// }
// return new ResponseDataModel<string>
// {
// StatusCode = 200,
// Success = true,
// Data = salarie.Id.ToString(),
// };
// }
} }

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

@ -1,8 +1,14 @@
using AutoMapper; using AutoMapper;
using ldap_cesi.DTOs.Inputs.Site;
using ldap_cesi.Entities;
using ldap_cesi.Models; using ldap_cesi.Models;
using ldap_cesi.Repository.Services; using ldap_cesi.Repository.Services;
using ldap_cesi.Services.Interfaces; using ldap_cesi.Services.Interfaces;
using ldap_cesi.Validator.Site;
using Microsoft.Extensions.Logging;
using System.Collections.Generic;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Threading.Tasks;
using FluentValidation; using FluentValidation;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
@ -35,17 +41,15 @@ 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, "Nom"), $"%{inputSearch}%") ||
EF.Functions.ILike(EF.Property<string>(entity, "Prenom"), $"%{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 try
{ {
var response = await _repository.GetAllAsync( pageNumber, pageSize); var entities = await _repository.GetAllAsync();
return new ResponseDataModel<List<T>> return new ResponseDataModel<List<T>>
{ {
Success = true, Success = true,
Data = response.Data, Data = entities,
TotalPages = response.TotalPages,
TotalCount = response.TotalItems,
StatusCode = 200, StatusCode = 200,
Message = "Liste des entités récupérée avec succès." Message = "Liste des entités récupérée avec succès."
}; };
@ -97,18 +101,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 try
{ {
var response = await _repository.GetAllWithRelationsAsync(pageNumber, pageSize,relationsAInclure); var entities = await _repository.GetAllWithRelationsAsync(relationsAInclure);
var dtos = _mapper.Map<List<TDto>>(response.Data); var dtos = _mapper.Map<List<TDto>>(entities);
return new ResponseDataModel<List<TDto>> return new ResponseDataModel<List<TDto>>
{ {
Success = true, Success = true,
Data = dtos, Data = dtos,
TotalPages = response.TotalPages,
TotalCount = response.TotalItems,
StatusCode = 200, StatusCode = 200,
Message = "Liste des entités récupérée avec succès." Message = "Liste des entités récupérée avec succès."
}; };
@ -269,11 +271,11 @@ public class ServiceBase<T, TDto, TCreateDto, TUpdateDto> : IServiceBase<T, TDto
} }
} }
public virtual async Task<IResponseDataModel<List<TDto>>> SearchWithRelations(string searchTerm, int pageNumber, int pageSize, params Expression<Func<T, object>>[] includeProperties) 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) if (string.IsNullOrWhiteSpace(searchTerm) || searchTerm.Length < 2)
{ {
return new ResponseDataModel<List<TDto>> return new ResponseDataModel<PaginatedList<TDto>>
{ {
Success = false, Success = false,
Message = "Le terme de recherche doit contenir au moins deux caractères.", Message = "Le terme de recherche doit contenir au moins deux caractères.",
@ -284,15 +286,16 @@ public class ServiceBase<T, TDto, TCreateDto, TUpdateDto> : IServiceBase<T, TDto
try try
{ {
var predicate = BuildSearchPredicate(searchTerm); var predicate = BuildSearchPredicate(searchTerm);
var response = await _repository.SearchAsync(predicate, pageNumber, pageSize, includeProperties); var entities = await _repository.SearchAsync(predicate, pageNumber, pageSize, includeProperties);
var dtos = _mapper.Map<List<TDto>>(response.Data); var dtos = _mapper.Map<List<TDto>>(entities);
var totalCount = await _repository.CountAsync(predicate);
var paginatedList = new PaginatedList<TDto>(dtos, totalCount, pageNumber, pageSize);
return new ResponseDataModel<List<TDto>> return new ResponseDataModel<PaginatedList<TDto>>
{ {
Success = true, Success = true,
Data = dtos, Data = paginatedList,
TotalPages = response.TotalPages,
TotalCount = response.TotalItems,
StatusCode = 200, StatusCode = 200,
Message = "Recherche effectuée avec succès." Message = "Recherche effectuée avec succès."
}; };
@ -300,7 +303,7 @@ public class ServiceBase<T, TDto, TCreateDto, TUpdateDto> : IServiceBase<T, TDto
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Une erreur s'est produite lors de la recherche des entités."); _logger.LogError(ex, "Une erreur s'est produite lors de la recherche des entités.");
return new ResponseDataModel<List<TDto>> return new ResponseDataModel<PaginatedList<TDto>>
{ {
Success = false, Success = false,
Message = "Une erreur s'est produite lors de la recherche des entités.", Message = "Une erreur s'est produite lors de la recherche des entités.",
@ -308,53 +311,5 @@ public class ServiceBase<T, TDto, TCreateDto, TUpdateDto> : IServiceBase<T, TDto
}; };
} }
} }
public virtual async Task<IResponseDataModel<string>> DeleteWithDependencyCheck<TRelated>(int id, Expression<Func<TRelated, bool>> relationPredicate, string relationErrorMessage) where TRelated : class
{
try
{
var entity = await _repository.GetByIdAsync(id);
if (entity == null)
{
return new ResponseDataModel<string>
{
Success = false,
Message = $"Aucune entité trouvée avec l'identifiant {id}.",
StatusCode = 404
};
}
// Vérifier si des entités dépendantes existent
var relatedCount = await (_repository as IRepositoryBase<T>).CountRelatedEntitiesAsync<TRelated>(id, relationPredicate);
if (relatedCount > 0)
{
return new ResponseDataModel<string>
{
Success = false,
Message = relationErrorMessage,
StatusCode = 400
};
}
var isDeleted = await _repository.DeleteAsync(entity);
return new ResponseDataModel<string>
{
Success = isDeleted,
Data = isDeleted ? id.ToString() : null,
StatusCode = isDeleted ? 200 : 500,
Message = isDeleted ? "Entité supprimée avec succès." : "Échec de la suppression de l'entité."
};
}
catch (Exception ex)
{
_logger.LogError(ex, $"Une erreur s'est produite lors de la suppression de l'entité avec l'identifiant {id}.");
return new ResponseDataModel<string>
{
Success = false,
Message = "Une erreur s'est produite lors de la suppression de l'entité.",
StatusCode = 500
};
}
}
} }

137
ldap-cesi/Services/ServiceService.cs
View File

@ -17,12 +17,133 @@ public class ServiceService : ServiceBase<Service, ServiceDto, ServiceCreateDto,
: base(repositoryService, mapper, logger, serviceCreateValidator, serviceUpdateValidator) : base(repositoryService, mapper, logger, serviceCreateValidator, serviceUpdateValidator)
{ {
} }
public async Task<IResponseDataModel<string>> DeleteWithEntiteCheck(int id)
{
return await DeleteWithDependencyCheck<Salarie>( // public async Task<IResponseDataModel<List<Service>>> GetAll()
id, // {
salarie => salarie.IdServiceNavigation.Id == id, // var services = await _repositoryService.GetAllAsync();
"il n'est pas possible de supprimer ce service car des salariés y sont liés" // return new ResponseDataModel<List<Service>>
); // {
} // Success = true,
// Data = services,
// StatusCode = 200,
// };
// }
// public async Task<IResponseDataModel<Service>> GetById(int id)
// {
// var service = await _repositoryService.GetByIdAsync(id);
// return new ResponseDataModel<Service>
// {
// Success = true,
// Data = service,
// StatusCode = 200,
// };
// }
// public async Task<IResponseDataModel<string>> CreateService(ServiceCreateDto serviceCreateDto)
// {
// var validation = new ServiceCreateValidator();
// var result = validation.Validate(serviceCreateDto);
// if (!result.IsValid)
// {
// return new ResponseDataModel<string>
// {
// StatusCode = 400,
// Success = false,
// Message = "Données du service invalides: " + string.Join(", ", result.Errors)
// };
// }
// var service = _mapper.Map<Service>(serviceCreateDto);
// var response = await _repositoryService.AddAsync(service);
// return new ResponseDataModel<string>
// {
// StatusCode = 201,
// Success = true,
// Data = response.Id.ToString(),
// };
// }
// public async Task<IResponseDataModel<Service>> UpdateService(ServiceUpdateDto serviceUpdateDto)
// {
// var validation = new ServiceUpdateValidator();
// var result = validation.Validate(serviceUpdateDto);
// if (!result.IsValid)
// {
// return new ResponseDataModel<Service>
// {
// StatusCode = 400,
// Success = false,
// Message = "Données du service invalides: " + string.Join(", ", result.Errors)
// };
// }
// var serviceFind = await _repositoryService.GetByIdAsync(serviceUpdateDto.Id);
// if (serviceFind is null)
// {
// return new ResponseDataModel<Service>
// {
// Success = false,
// Message = "Service introuvable.",
// StatusCode = 404
// };
// }
// var service = _mapper.Map(serviceUpdateDto, serviceFind);
// var response = await _repositoryService.UpdateAsync(service);
// if (!response)
// {
// return new ResponseDataModel<Service>
// {
// StatusCode = 500,
// Success = false,
// Message = "Erreur lors de la mise à jour du service : " + string.Join(", ", result.Errors)
// };
// }
// return new ResponseDataModel<Service>
// {
// StatusCode = 200,
// Success = true,
// Data = service,
// };
// }
// public async Task<IResponseDataModel<string>> DeleteService(int idService)
// {
// if (idService == null)
// {
// return new ResponseDataModel<string>
// {
// StatusCode = 400,
// Success = false,
// Message = "Id manquant"
// };
// }
// var service = await _repositoryService.GetByIdAsync(idService);
// if (service == null)
// {
// return new ResponseDataModel<string>
// {
// Success = false,
// Message = "Service introuvable.",
// StatusCode = 404
// };
// }
// var response = await _repositoryService.DeleteAsync(service);
// if (!response)
// {
// return new ResponseDataModel<string>
// {
// StatusCode = 500,
// Success = false,
// Message = "Erreur durant la suppression du service"
// };
// }
// return new ResponseDataModel<string>
// {
// StatusCode = 200,
// Success = true,
// Data = service.Id.ToString(),
// };
// }
} }

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

@ -14,19 +14,139 @@ public class SiteService : ServiceBase<Site, SiteDto, SiteCreateDto, SiteUpdateD
private readonly IRepositorySite _repositorySite; private readonly IRepositorySite _repositorySite;
public SiteService(IRepositorySite repositorySite, IMapper mapper, public SiteService(IRepositorySite repositorySite, IMapper mapper,
ILogger<SiteService> logger, SiteCreateValidator siteCreateValidator, SiteUpdateValidator siteUpdateValidator) ILogger<SiteService> logger, SiteCreateValidator siteCreateValidator, SiteUpdateValidator siteUpdateValidator)
: base(repositorySite, mapper, logger, siteCreateValidator, siteUpdateValidator) : base(repositorySite, mapper, logger, siteCreateValidator, siteUpdateValidator )
{ {
_repositorySite = repositorySite; _repositorySite = repositorySite;
} }
public async Task<IResponseDataModel<string>> DeleteWithEntiteCheck(int id) public async Task<IResponseDataModel<List<Site>>> GetAll()
{ {
return await DeleteWithDependencyCheck<Salarie>( var sites = await _repositorySite.GetAllAsync();
id, return new ResponseDataModel<List<Site>>
salarie => salarie.IdSiteNavigation.Id == id, {
"il n'est pas possible de supprimer ce site car des salariés y sont liés" 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<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(),
};
}
}

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

@ -1,6 +1,7 @@
using AutoMapper; using AutoMapper;
using ldap_cesi.DTOs.Inputs; using ldap_cesi.DTOs.Inputs;
using ldap_cesi.DTOs.Outputs.Utilisateur; using ldap_cesi.DTOs.Outputs.Utilisateur;
using ldap_cesi.Entities;
using ldap_cesi.Models; using ldap_cesi.Models;
using ldap_cesi.Repository.Services; using ldap_cesi.Repository.Services;
using ldap_cesi.Services.Interfaces; using ldap_cesi.Services.Interfaces;
@ -22,7 +23,7 @@ public class UtilisateurService : IUtilisateurService
public async Task<IResponseDataModel<List<UtilisateurOutputDto>>> GetAll() 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); var utilisateursOutputDto = _mapper.Map<List<UtilisateurOutputDto>>(utilisateurs);
return new ResponseDataModel<List<UtilisateurOutputDto>> return new ResponseDataModel<List<UtilisateurOutputDto>>
{ {
@ -34,7 +35,7 @@ public class UtilisateurService : IUtilisateurService
public async Task<IResponseDataModel<UtilisateurOutputDto>> GetById(int id) public async Task<IResponseDataModel<UtilisateurOutputDto>> GetById(int id)
{ {
var utililisateur = await _repositoryUtilisateur.GetByIdIncludeRoleAsync(id); var utililisateur = await _repositoryUtilisateur.GetByIdAsync(id);
var utilisateurOutput = _mapper.Map<UtilisateurOutputDto>(utililisateur); var utilisateurOutput = _mapper.Map<UtilisateurOutputDto>(utililisateur);
return new ResponseDataModel<UtilisateurOutputDto> return new ResponseDataModel<UtilisateurOutputDto>
{ {

2
ldap-cesi/Validator/Salarie/SalarieCreateValidator.cs
View File

@ -15,7 +15,7 @@ public class SalarieCreateValidator : AbstractValidator<SalarieCreateDto>
.NotEmpty().WithMessage("Le prénom est requis.") .NotEmpty().WithMessage("Le prénom est requis.")
.MaximumLength(50).WithMessage("Le prénom ne doit pas dépasser 50 caractères."); .MaximumLength(50).WithMessage("Le prénom ne doit pas dépasser 50 caractères.");
RuleFor(x => x.TelephoneFixe) RuleFor(x => x.TelephoneFix)
.NotEmpty().WithMessage("Le téléphone fixe est requis.") .NotEmpty().WithMessage("Le téléphone fixe est requis.")
.Matches(@"^(\+33|0)[1-9](\d{2}){4}$") .Matches(@"^(\+33|0)[1-9](\d{2}){4}$")
.WithMessage("Le numéro de téléphone fixe n'est pas valide. Format attendu : +33XXXXXXXXX ou 0XXXXXXXXX.") .WithMessage("Le numéro de téléphone fixe n'est pas valide. Format attendu : +33XXXXXXXXX ou 0XXXXXXXXX.")