Compare commits
15 Commits
19c85ca534
...
feat/delet
| Author | SHA1 | Date | |
|---|---|---|---|
| 40972cad0d | |||
| f66f057e6f | |||
| 9803ef0af6 | |||
| cc12d77fba | |||
| 14bc105042 | |||
| 285063ebcd | |||
| 37eca08753 | |||
| 67337db5c3 | |||
| 3041e85add | |||
|
|
f0928aae3b | ||
|
|
fe91908098 | ||
| aed5f7ea93 | |||
| 1fb1f49f9d | |||
| fe7d50971f | |||
| 272e928304 |
4
.idea/.idea.ldap-cesi/.idea/vcs.xml
generated
4
.idea/.idea.ldap-cesi/.idea/vcs.xml
generated
@@ -1,4 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings" defaultProject="true" />
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -1,6 +1,8 @@
|
||||
using System.Reflection;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using FluentValidation;
|
||||
using FluentValidation.AspNetCore;
|
||||
using ldap_cesi.Context;
|
||||
using ldap_cesi.Repository;
|
||||
using ldap_cesi.Repository.Services;
|
||||
@@ -27,6 +29,7 @@ public static class Conf
|
||||
builder.AddSerilog();
|
||||
builder.AddJwt();
|
||||
builder.Services.AddAutoMapper(typeof(Program));
|
||||
|
||||
}
|
||||
|
||||
public static void AddRepositories(this WebApplicationBuilder builder)
|
||||
@@ -41,12 +44,14 @@ public static class Conf
|
||||
public static void AddServices(this WebApplicationBuilder builder)
|
||||
{
|
||||
builder.Services.AddScoped<IServiceService, ServiceService >();
|
||||
// builder.Services.AddScoped<IRoleService, RoleService>();
|
||||
// builder.Services.AddScoped<ISiteService, SiteService>();
|
||||
builder.Services.AddScoped<IRoleService, RoleService>();
|
||||
builder.Services.AddScoped<ISiteService, SiteService>();
|
||||
builder.Services.AddScoped<ISalarieService, SalarieService>();
|
||||
builder.Services.AddScoped<IUtilisateurService, UtilisateurService>();
|
||||
builder.Services.AddScoped<IJwtService, JwtService>();
|
||||
builder.Services.AddSingleton<IRsaKeyService, RsaKeyService>();
|
||||
builder.Services.AddValidatorsFromAssemblyContaining<Program>();
|
||||
builder.Services.AddFluentValidationAutoValidation();
|
||||
}
|
||||
public static void AddEFCoreConfiguration(this WebApplicationBuilder builder)
|
||||
{
|
||||
@@ -57,9 +62,9 @@ public static class Conf
|
||||
{
|
||||
builder.Services.AddCors(options =>
|
||||
{
|
||||
options.AddPolicy("AllowAll",
|
||||
options.AddPolicy("AllowSpecific",
|
||||
builder => builder
|
||||
.AllowAnyOrigin()
|
||||
.WithOrigins("http://localhost:3000")
|
||||
.AllowAnyMethod()
|
||||
.AllowAnyHeader());
|
||||
});
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using ldap_cesi.Services.Interfaces;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace ldap_cesi.Controllers;
|
||||
|
||||
88
ldap-cesi/Controllers/RoleController.cs
Normal file
88
ldap-cesi/Controllers/RoleController.cs
Normal file
@@ -0,0 +1,88 @@
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using ldap_cesi.DTOs.Inputs.Role;
|
||||
using ldap_cesi.Services.Interfaces;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
|
||||
namespace ldap_cesi.Controllers
|
||||
{
|
||||
[Route("api/[controller]")]
|
||||
[ApiController]
|
||||
public class RoleController : ControllerBase
|
||||
{
|
||||
private readonly IRoleService _roleService;
|
||||
|
||||
public RoleController(IRoleService roleService)
|
||||
{
|
||||
_roleService = roleService;
|
||||
}
|
||||
|
||||
// GET: api/Role
|
||||
/// <summary>
|
||||
/// Endpoint qui retourne tous les rôles
|
||||
/// </summary>
|
||||
/// <returns>Un tableau de rôle</returns>
|
||||
[HttpGet]
|
||||
[Authorize(Roles = "admin")]
|
||||
public async Task<IActionResult> GetAllRoles([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 10)
|
||||
{
|
||||
var result = await _roleService.GetAll(pageNumber, pageSize);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
// GET: api/Role/{id}
|
||||
/// <summary>
|
||||
/// Endpoint qui retourne le role
|
||||
/// </summary>
|
||||
/// <param name="id">L'id du rôle.</param>
|
||||
/// <returns>Le role update</returns>
|
||||
[HttpGet("{id}")]
|
||||
[Authorize(Roles = "admin")]
|
||||
public async Task<IActionResult> GetRoleById(int id)
|
||||
{
|
||||
var result = await _roleService.GetById(id);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
// POST: api/Role
|
||||
/// <summary>
|
||||
/// Endpoint créer le Role
|
||||
/// </summary>
|
||||
/// <param name="CreateRoleInput">Le nom du rôle.</param>
|
||||
/// <returns>Response.</returns>
|
||||
[HttpPost]
|
||||
[Authorize(Roles = "admin")]
|
||||
public async Task<IActionResult> CreateRole([FromBody] RoleCreateDto roleDto)
|
||||
{
|
||||
var result = await _roleService.Create(roleDto);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
// PUT: api/Role
|
||||
/// <summary>
|
||||
/// Endpoint qui met à jour un role.
|
||||
/// </summary>
|
||||
/// <param name="roleUpdateDto">Les informations du role à mettre à jour. Id, nom</param>
|
||||
/// <returns>Le role mis à jour.</returns>
|
||||
[HttpPut]
|
||||
[Authorize(Roles = "admin")]
|
||||
public async Task<IActionResult> UpdateRole([FromBody] RoleUpdateDto roleDto)
|
||||
{
|
||||
var result = await _roleService.Update(roleDto);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
// DELETE: api/Role/{id}
|
||||
/// <summary>
|
||||
/// Endpoint qui supprime un rôle.
|
||||
/// </summary>
|
||||
/// <param name="id">L'ID du rôle à supprimer.</param>
|
||||
/// <returns>Un message de confirmation de suppression.</returns>
|
||||
[HttpDelete("{id}")]
|
||||
[Authorize(Roles = "admin")]
|
||||
public async Task<IActionResult> DeleteRole(int id)
|
||||
{
|
||||
var result = await _roleService.Delete(id);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,12 @@
|
||||
using ldap_cesi.DTOs.Inputs.Salarie;
|
||||
using ldap_cesi.DTOs.Inputs.Service;
|
||||
using ldap_cesi.Services.Interfaces;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace ldap_cesi.Controllers;
|
||||
[ApiController]
|
||||
[Route("api/salarie")]
|
||||
[Route("api/salaries")]
|
||||
public class SalarieController : ControllerBase
|
||||
{
|
||||
private ISalarieService _salarieService;
|
||||
@@ -13,27 +16,131 @@ public class SalarieController : ControllerBase
|
||||
_salarieService = salarieService;
|
||||
}
|
||||
|
||||
// GET: api/salaries
|
||||
/// <summary>
|
||||
/// Endpoint qui retournes tous les salaries
|
||||
/// Endpoint qui retourne tous les salariés.
|
||||
/// </summary>
|
||||
/// <returns>List<Salarie></returns>
|
||||
/// <returns>Une liste de salariés.</returns>
|
||||
[HttpGet]
|
||||
public async Task<ActionResult> GetUtilisateurs()
|
||||
public async Task<IActionResult> GetAllSalaries([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 25)
|
||||
{
|
||||
var result = await _salarieService.GetAll();
|
||||
var result = await _salarieService.GetAll(pageNumber, pageSize);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
|
||||
[HttpGet("search")]
|
||||
public async Task<IActionResult> SearchSalaries(
|
||||
[FromQuery] string searchTerm,
|
||||
[FromQuery] int pageNumber = 1,
|
||||
[FromQuery] int pageSize = 10)
|
||||
{
|
||||
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);
|
||||
}
|
||||
|
||||
// GET: api/salaries
|
||||
/// <summary>
|
||||
/// Endpoint retourne le salarie correspondant à l'id en param
|
||||
/// Endpoint qui retourne le salarié correspondant à l'ID en paramètre.
|
||||
/// </summary>
|
||||
/// <returns>Salarie</returns>
|
||||
/// <param name="id">L'ID du salarié.</param>
|
||||
/// <returns>Le salarié correspondant à l'ID.</returns>
|
||||
[HttpGet("{id}")]
|
||||
public async Task<ActionResult> GetUtilisateurById(int id)
|
||||
public async Task<IActionResult> GetById(int id)
|
||||
{
|
||||
var result = await _salarieService.GetById(id);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Endpoint qui retourne le salarié correspondant à l'ID en paramètre. Avec le nom de service et de site auxquels il apaprtient.
|
||||
/// </summary>
|
||||
/// <param name="id">L'ID du salarié.</param>
|
||||
/// <returns>Le salarié correspondant à l'ID. Ainsi que son service et son site</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);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Endpoint qui retourne tout les salariés et les relations qu'il détient
|
||||
/// </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)
|
||||
{
|
||||
var result = await _salarieService.GetAllWithRelationsAsync(pageNumber, pageSize,s => s.IdServiceNavigation, s => s.IdSiteNavigation);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Endpoint qui crée un salarié.
|
||||
/// </summary>
|
||||
/// <param name="salarieInput">Les informations du salarié à créer.</param>
|
||||
/// <returns>Le salarié créé.</returns>
|
||||
[HttpPost]
|
||||
[Authorize(Roles = "admin")]
|
||||
public async Task<IActionResult> CreateSalarie([FromBody] SalarieCreateDto salarieInput)
|
||||
{
|
||||
var result = await _salarieService.Create(salarieInput);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Endpoint qui met à jour un salarié.
|
||||
/// </summary>
|
||||
/// <param name="salarieInput">Les informations du salarié à mettre à jour.</param>
|
||||
/// <returns>Le salarié mis à jour.</returns>
|
||||
[HttpPut]
|
||||
[Authorize(Roles = "admin")]
|
||||
public async Task<IActionResult> UpdateSalarie([FromBody] SalarieUpdateDto salarieInput)
|
||||
{
|
||||
var result = await _salarieService.Update(salarieInput);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Endpoint qui supprime un salarié.
|
||||
/// </summary>
|
||||
/// <param name="id">L'ID du salarié à supprimer.</param>
|
||||
/// <returns>Un message de confirmation de suppression.</returns>
|
||||
[HttpDelete("{id}")]
|
||||
[Authorize(Roles = "admin")]
|
||||
public async Task<IActionResult> DeleteSalarie(int id)
|
||||
{
|
||||
var result = await _salarieService.Delete(id);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Récupère les salariés appartenant à un site spécifique
|
||||
/// </summary>
|
||||
/// <param name="siteId">Identifiant du site</param>
|
||||
/// <returns>Liste des salariés du site</returns>
|
||||
[HttpGet("site/{siteId}")]
|
||||
public async Task<IActionResult> GetSalariesBySite(int siteId)
|
||||
{
|
||||
var result = await _salarieService.GetSalariesBySite(siteId);
|
||||
return result.Success ? Ok(result) : NotFound(result);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Récupère les salariés appartenant à un service spécifique
|
||||
/// </summary>
|
||||
/// <param name="serviceId">Identifiant du service</param>
|
||||
/// <returns>Liste des salariés du service</returns>
|
||||
[HttpGet("service/{serviceId}")]
|
||||
public async Task<IActionResult> GetSalariesByService(int serviceId)
|
||||
{
|
||||
var result = await _salarieService.GetSalariesByService(serviceId);
|
||||
return result.Success ? Ok(result) : NotFound(result);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc;
|
||||
namespace ldap_cesi.Controllers;
|
||||
|
||||
[ApiController]
|
||||
[Route("api/service")]
|
||||
[Route("api/services")]
|
||||
public class ServicesController : ControllerBase
|
||||
{
|
||||
private IServiceService _serviceService;
|
||||
@@ -16,40 +16,76 @@ public class ServicesController : ControllerBase
|
||||
_serviceService = serviceService;
|
||||
}
|
||||
|
||||
// GET: api/services
|
||||
/// <summary>
|
||||
/// Endpoint qui retournes tous les services
|
||||
/// Endpoint qui retourne tous les services.
|
||||
/// </summary>
|
||||
/// <returns>Retourne tous les services</returns>
|
||||
/// <returns>Retourne tous les services.</returns>
|
||||
[HttpGet]
|
||||
// [Authorize(Roles = "admin")]
|
||||
public async Task<ActionResult> GetServices()
|
||||
{
|
||||
var result = await _serviceService.GetAll();
|
||||
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);
|
||||
}
|
||||
|
||||
// GET: api/services
|
||||
/// <summary>
|
||||
/// Endpoint retourne le service correspondant à l'id en param
|
||||
/// Endpoint qui retourne le service correspondant à l'id en paramètre.
|
||||
/// </summary>
|
||||
/// <returns>Service</returns>
|
||||
/// <param name="id">L'ID du service.</param>
|
||||
/// <returns>Le service correspondant à l'ID.</returns>
|
||||
[HttpGet("{id}")]
|
||||
public async Task<ActionResult> GetServices(int id)
|
||||
public async Task<IActionResult> GetServiceById(int id)
|
||||
{
|
||||
var result = await _serviceService.GetById(id);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
// {POST}: api/services
|
||||
/// <summary>
|
||||
/// Endpoint qui créé un service
|
||||
/// Endpoint qui retourne le service et ses salariés correspondant à l'id en paramètre.
|
||||
/// </summary>
|
||||
/// <returns>Retourne tous les services</returns>
|
||||
[HttpPost]
|
||||
public async Task<ActionResult> CreateService([FromBody] ServiceCreateDto serviceInputDto)
|
||||
/// <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.CreateService(serviceInputDto);
|
||||
var result = await _serviceService.GetByIdWithRelations(id, s=>s.Salaries);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Endpoint qui crée un service.
|
||||
/// </summary>
|
||||
/// <param name="serviceInputDto">Les informations du service à créer.</param>
|
||||
/// <returns>Le service créé.</returns>
|
||||
[HttpPost]
|
||||
[Authorize(Roles = "admin")]
|
||||
public async Task<IActionResult> CreateService([FromBody] ServiceCreateDto serviceInputDto)
|
||||
{
|
||||
var result = await _serviceService.Create(serviceInputDto);
|
||||
return result.Success ? Ok(result.Data) : BadRequest(result);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Endpoint qui met à jour un service.
|
||||
/// </summary>
|
||||
/// <param name="serviceUpdateDto">Les informations du service à mettre à jour.</param>
|
||||
/// <returns>Le service mis à jour.</returns>
|
||||
[HttpPut]
|
||||
[Authorize(Roles = "admin")]
|
||||
public async Task<IActionResult> UpdateService([FromBody] ServiceUpdateDto serviceUpdateDto)
|
||||
{
|
||||
var result = await _serviceService.Update(serviceUpdateDto);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Endpoint qui supprime un service.
|
||||
/// </summary>
|
||||
/// <param name="id">L'ID du service à supprimer.</param>
|
||||
/// <returns>Un message de confirmation de suppression.</returns>
|
||||
[HttpDelete("{id}")]
|
||||
[Authorize(Roles = "admin")]
|
||||
public async Task<IActionResult> DeleteService(int id)
|
||||
{
|
||||
var result = await _serviceService.DeleteWithEntiteCheck(id);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
}
|
||||
101
ldap-cesi/Controllers/SiteController.cs
Normal file
101
ldap-cesi/Controllers/SiteController.cs
Normal file
@@ -0,0 +1,101 @@
|
||||
using ldap_cesi.DTOs.Inputs.Site;
|
||||
using ldap_cesi.Services.Interfaces;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace ldap_cesi.Controllers;
|
||||
|
||||
[ApiController]
|
||||
[Route("/api/sites")]
|
||||
public class SiteController : ControllerBase
|
||||
{
|
||||
private readonly ISiteService _siteService;
|
||||
|
||||
public SiteController(ISiteService siteService)
|
||||
{
|
||||
_siteService = siteService;
|
||||
}
|
||||
|
||||
// GET: api/site
|
||||
/// <summary>
|
||||
/// Récupère la liste de tous les sites.
|
||||
/// </summary>
|
||||
/// <returns>Retourne une liste de tous les sites.</returns>
|
||||
[HttpGet]
|
||||
public async Task<ActionResult> GetSites([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 10)
|
||||
{
|
||||
var result = await _siteService.GetAll(pageNumber, pageSize);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
// GET: api/site/{id}
|
||||
/// <summary>
|
||||
/// Récupère un site spécifique par son identifiant.
|
||||
/// </summary>
|
||||
/// <param name="id">L'identifiant du site à récupérer.</param>
|
||||
/// <returns>Retourne le site correspondant à l'identifiant.</returns>
|
||||
/// <response code="200">Le site a été récupéré avec succès.</response>
|
||||
/// <response code="400">Une erreur s'est produite lors de la récupération du site.</response>
|
||||
/// <response code="404">Le site n'a pas été trouvé.</response>
|
||||
[HttpGet("{id}")]
|
||||
public async Task<ActionResult> GetSite(int id)
|
||||
{
|
||||
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
|
||||
/// <summary>
|
||||
/// Crée un nouveau site.
|
||||
/// </summary>
|
||||
/// <param name="siteCreateDto">Les données du site à créer.</param>
|
||||
/// <returns>Retourne l'identifiant du site créé.</returns>
|
||||
[HttpPost]
|
||||
[Authorize(Roles = "admin")]
|
||||
public async Task<ActionResult> CreateSite([FromBody] SiteCreateDto siteCreateDto)
|
||||
{
|
||||
var result = await _siteService.Create(siteCreateDto);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
// PUT: api/site
|
||||
/// <summary>
|
||||
/// Met à jour un site existant.
|
||||
/// </summary>
|
||||
/// <param name="siteUpdateDto">Les données du site à mettre à jour.</param>
|
||||
/// <returns>Retourne l'objet ou une erreur.</returns>
|
||||
[HttpPut]
|
||||
[Authorize(Roles = "admin")]
|
||||
public async Task<IActionResult> UpdateSite([FromBody] SiteUpdateDto siteUpdateDto)
|
||||
{
|
||||
var result = await _siteService.Update(siteUpdateDto);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
// DELETE: api/site/{id}
|
||||
/// <summary>
|
||||
/// Supprime un site par son identifiant.
|
||||
/// </summary>
|
||||
/// <param name="id">L'identifiant du site à supprimer.</param>
|
||||
/// <returns>Retourne l'id, ou l'erreur</returns>
|
||||
[HttpDelete("{id}")]
|
||||
[Authorize(Roles = "admin")]
|
||||
public async Task<IActionResult> DeleteSite(int id)
|
||||
{
|
||||
var result = await _siteService.DeleteWithEntiteCheck(id);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
}
|
||||
@@ -1,45 +1,129 @@
|
||||
using System.Security.Claims;
|
||||
using ldap_cesi.DTOs.Inputs;
|
||||
using ldap_cesi.Services.Interfaces;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace ldap_cesi.Controllers;
|
||||
[ApiController]
|
||||
[Route("api/utilisateur")]
|
||||
[Route("api/utilisateurs")]
|
||||
public class UtilisateurController : ControllerBase
|
||||
{
|
||||
private IUtilisateurService _utilisateurService;
|
||||
|
||||
public UtilisateurController(IUtilisateurService utilisateurService)
|
||||
private readonly IUtilisateurService _utilisateurService;
|
||||
private readonly IJwtService _jwtService;
|
||||
public UtilisateurController(IUtilisateurService utilisateurService, IJwtService jwtService)
|
||||
{
|
||||
_utilisateurService = utilisateurService;
|
||||
_jwtService = jwtService;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Endpoint pour la connexion des utilisateurs.
|
||||
/// </summary>
|
||||
/// <param name="utilisateurInput">Les informations de connexion de l'utilisateur.</param>
|
||||
/// <returns>Un token JWT si la connexion est réussie.</returns>
|
||||
[HttpPost("login")]
|
||||
public async Task<IActionResult> Login([FromBody] UtilisateurLoginDto utilisateurInput)
|
||||
{
|
||||
var response = await _utilisateurService.Login(utilisateurInput);
|
||||
return StatusCode(response.StatusCode, response);
|
||||
var result = await _utilisateurService.Login(utilisateurInput);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
[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}" });
|
||||
}
|
||||
}
|
||||
|
||||
// GET: api/utilisateurs
|
||||
/// <summary>
|
||||
/// Endpoint qui retournes tous les utilisateurs
|
||||
/// Endpoint pour déconnecter un utilisateur (invalider son token).
|
||||
/// </summary>
|
||||
/// <returns>List<Utilisateur></returns>
|
||||
/// <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>
|
||||
/// Endpoint pour récupérer tous les utilisateurs.
|
||||
/// </summary>
|
||||
/// <returns>Une liste d'utilisateurs.</returns>
|
||||
[HttpGet]
|
||||
public async Task<ActionResult> GetUtilisateurs()
|
||||
[Authorize(Roles = "admin")]
|
||||
public async Task<IActionResult> GetUtilisateurs()
|
||||
{
|
||||
var result = await _utilisateurService.GetAll();
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
}
|
||||
|
||||
// GET: api/utilisateur
|
||||
/// <summary>
|
||||
/// Endpoint retourne l'utilisateur correspondant à l'id en param
|
||||
/// Endpoint pour récupérer un utilisateur par son ID.
|
||||
/// </summary>
|
||||
/// <returns>Utilisateur</returns>
|
||||
/// <param name="id">L'ID de l'utilisateur.</param>
|
||||
/// <returns>L'utilisateur correspondant à l'ID.</returns>
|
||||
[HttpGet("{id}")]
|
||||
public async Task<ActionResult> GetUtilisateurById(int id)
|
||||
[Authorize(Roles = "admin")]
|
||||
public async Task<IActionResult> GetUtilisateurById(int id)
|
||||
{
|
||||
var result = await _utilisateurService.GetById(id);
|
||||
return result.Success ? Ok(result) : BadRequest(result);
|
||||
|
||||
8
ldap-cesi/DTOs/Generic/RoleDto.cs
Normal file
8
ldap-cesi/DTOs/Generic/RoleDto.cs
Normal file
@@ -0,0 +1,8 @@
|
||||
namespace ldap_cesi.DTOs;
|
||||
|
||||
public class RoleDto
|
||||
{
|
||||
public int Id { get; set; }
|
||||
|
||||
public string Nom { get; set; }
|
||||
}
|
||||
19
ldap-cesi/DTOs/Generic/SalarieDto.cs
Normal file
19
ldap-cesi/DTOs/Generic/SalarieDto.cs
Normal file
@@ -0,0 +1,19 @@
|
||||
namespace ldap_cesi.DTOs;
|
||||
|
||||
public class SalarieDto
|
||||
{
|
||||
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!;
|
||||
|
||||
public ServiceDto Service { get; set; }
|
||||
public SiteDto Site { get; set; }
|
||||
}
|
||||
11
ldap-cesi/DTOs/Generic/ServiceDto.cs
Normal file
11
ldap-cesi/DTOs/Generic/ServiceDto.cs
Normal file
@@ -0,0 +1,11 @@
|
||||
using ldap_cesi.DTOs.Outputs.Salarie;
|
||||
|
||||
namespace ldap_cesi.DTOs;
|
||||
|
||||
public class ServiceDto
|
||||
{
|
||||
public int Id { get; set; }
|
||||
|
||||
public string Nom { get; set; }
|
||||
public List<SalarieMinimalDto> Salaries { get; set; }
|
||||
}
|
||||
11
ldap-cesi/DTOs/Generic/SiteDto.cs
Normal file
11
ldap-cesi/DTOs/Generic/SiteDto.cs
Normal file
@@ -0,0 +1,11 @@
|
||||
using ldap_cesi.DTOs.Outputs.Salarie;
|
||||
|
||||
namespace ldap_cesi.DTOs;
|
||||
|
||||
public class SiteDto
|
||||
{
|
||||
public int Id { get; set; }
|
||||
|
||||
public string Ville { get; set; }
|
||||
public ICollection<SalarieMinimalDto> Salaries { get; set; }
|
||||
}
|
||||
7
ldap-cesi/DTOs/Inputs/Role/RoleCreateDto.cs
Normal file
7
ldap-cesi/DTOs/Inputs/Role/RoleCreateDto.cs
Normal file
@@ -0,0 +1,7 @@
|
||||
|
||||
namespace ldap_cesi.DTOs.Inputs.Role;
|
||||
|
||||
public class RoleCreateDto
|
||||
{
|
||||
public string Nom { get; set; }
|
||||
}
|
||||
7
ldap-cesi/DTOs/Inputs/Role/RoleUpdateDto.cs
Normal file
7
ldap-cesi/DTOs/Inputs/Role/RoleUpdateDto.cs
Normal file
@@ -0,0 +1,7 @@
|
||||
namespace ldap_cesi.DTOs.Inputs.Role;
|
||||
|
||||
public class RoleUpdateDto
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string Nom { get; set; }
|
||||
}
|
||||
@@ -4,8 +4,8 @@ public class SalarieCreateDto
|
||||
{
|
||||
public string Nom { get; set; }
|
||||
public string Prenom { get; set; }
|
||||
public string Telephone_fix { get; set; }
|
||||
public string Telephone_portable { get; set; }
|
||||
public string TelephoneFixe { get; set; }
|
||||
public string TelephonePortable { get; set; }
|
||||
public string Email { get; set; }
|
||||
public int IdSite { get; set; }
|
||||
public int IdService { get; set; }
|
||||
|
||||
14
ldap-cesi/DTOs/Outputs/Salarie/SalarieListDto.cs
Normal file
14
ldap-cesi/DTOs/Outputs/Salarie/SalarieListDto.cs
Normal file
@@ -0,0 +1,14 @@
|
||||
using ldap_cesi.DTOs.Outputs.Service;
|
||||
|
||||
namespace ldap_cesi.DTOs.Outputs.Salarie;
|
||||
|
||||
public class SalarieListDto
|
||||
{
|
||||
|
||||
public int Id { get; set; }
|
||||
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; }
|
||||
}
|
||||
17
ldap-cesi/DTOs/Outputs/Salarie/SalarieMinimalDto.cs
Normal file
17
ldap-cesi/DTOs/Outputs/Salarie/SalarieMinimalDto.cs
Normal file
@@ -0,0 +1,17 @@
|
||||
namespace ldap_cesi.DTOs.Outputs.Salarie;
|
||||
|
||||
public class SalarieMinimalDto
|
||||
{
|
||||
public int Id { get; set; }
|
||||
|
||||
public string Nom { get; set; } = null!;
|
||||
|
||||
public string Prenom { get; set; } = null!;
|
||||
|
||||
public string TelephoneFixe { get; set; } = null!;
|
||||
|
||||
public string TelephonePortable { get; set; } = null!;
|
||||
|
||||
public string Email { get; set; } = null!;
|
||||
|
||||
}
|
||||
21
ldap-cesi/DTOs/Outputs/Salarie/SalarieOutputDetail.cs
Normal file
21
ldap-cesi/DTOs/Outputs/Salarie/SalarieOutputDetail.cs
Normal file
@@ -0,0 +1,21 @@
|
||||
using ldap_cesi.DTOs.Outputs.Service;
|
||||
|
||||
namespace ldap_cesi.DTOs.Outputs.Salarie;
|
||||
|
||||
public class SalarieOutputDetail
|
||||
{
|
||||
public int Id { get; set; }
|
||||
|
||||
public string Nom { get; set; }
|
||||
|
||||
public string Prenom { get; set; }
|
||||
|
||||
public string TelephoneFixe { get; set; }
|
||||
|
||||
public string TelephonePortable { get; set; }
|
||||
|
||||
public string Email { get; set; }
|
||||
|
||||
public ServiceMinimalDto Service { get; set; }
|
||||
public SiteMinimalDto Site { get; set; }
|
||||
}
|
||||
8
ldap-cesi/DTOs/Outputs/Service/ServiceMinimalDto.cs
Normal file
8
ldap-cesi/DTOs/Outputs/Service/ServiceMinimalDto.cs
Normal file
@@ -0,0 +1,8 @@
|
||||
namespace ldap_cesi.DTOs.Outputs.Service;
|
||||
|
||||
public class ServiceMinimalDto
|
||||
{
|
||||
public int Id { get; set; }
|
||||
|
||||
public string Nom { get; set; }
|
||||
}
|
||||
8
ldap-cesi/DTOs/Outputs/Site/SiteMinimalDto.cs
Normal file
8
ldap-cesi/DTOs/Outputs/Site/SiteMinimalDto.cs
Normal file
@@ -0,0 +1,8 @@
|
||||
namespace ldap_cesi.DTOs.Outputs.Service;
|
||||
|
||||
public class SiteMinimalDto
|
||||
{
|
||||
public int Id { get; set; }
|
||||
|
||||
public string Ville { get; set; }
|
||||
}
|
||||
@@ -1,5 +1,11 @@
|
||||
using AutoMapper;
|
||||
using ldap_cesi.DTOs;
|
||||
using ldap_cesi.DTOs.Inputs.Role;
|
||||
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;
|
||||
|
||||
@@ -9,8 +15,41 @@ public class AutoMapperProfile : Profile
|
||||
{
|
||||
public AutoMapperProfile()
|
||||
{
|
||||
// INPUTS MAPPER
|
||||
CreateMap<ServiceCreateDto, Service>();
|
||||
CreateMap<ServiceUpdateDto, Service>();
|
||||
CreateMap<SiteCreateDto, Site>();
|
||||
CreateMap<RoleCreateDto, Role>();
|
||||
CreateMap<SiteUpdateDto, Site>();
|
||||
CreateMap<SalarieCreateDto, Salarie>()
|
||||
.ForMember(dest => dest.TelephoneFixe, opt => opt.MapFrom(src => src.TelephoneFixe))
|
||||
.ForMember(dest => dest.TelephonePortable, opt => opt.MapFrom(src => src.TelephonePortable));
|
||||
CreateMap<SalarieUpdateDto, Salarie>()
|
||||
.ForMember(dest => dest.TelephoneFixe, opt => opt.MapFrom(src => src.TelephoneFixe))
|
||||
.ForMember(dest => dest.TelephonePortable, opt => opt.MapFrom(src => src.TelephonePortable));
|
||||
|
||||
|
||||
//OUTPUTS MAPPER
|
||||
CreateMap<Utilisateur, UtilisateurOutputDto>()
|
||||
.ForMember(dest => dest.RoleNom, opt => opt.MapFrom(src => src.IdRoleNavigation.Nom));
|
||||
CreateMap<ServiceCreateDto, Service>();
|
||||
CreateMap<Salarie, SalarieDto>()
|
||||
.ForMember(dest => dest.Service, opt => opt.MapFrom(src => src.IdServiceNavigation))
|
||||
.ForMember(dest => dest.Site, opt => opt.MapFrom(src => src.IdSiteNavigation));
|
||||
CreateMap<Salarie, SalarieOutputDetail>()
|
||||
.ForMember(dest => dest.Service, opt => opt.MapFrom(src => src.IdServiceNavigation))
|
||||
.ForMember(dest => dest.Site, opt => opt.MapFrom(src => src.IdSiteNavigation));
|
||||
CreateMap<Service, ServiceDto>();
|
||||
CreateMap<Service, ServiceMinimalDto>();
|
||||
CreateMap<Site, SiteMinimalDto>();
|
||||
CreateMap<Site, SiteDto>()
|
||||
.ForMember(dest => dest.Salaries, opt => opt.MapFrom(src => src.Salaries));
|
||||
CreateMap<Salarie, SalarieListDto>()
|
||||
.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, SalarieListDto>()
|
||||
.ForMember(dest => dest.Service, opt => opt.MapFrom(src => src.IdServiceNavigation.Nom))
|
||||
.ForMember(dest => dest.Site, opt => opt.MapFrom(src => src.IdSiteNavigation.Ville));
|
||||
}
|
||||
}
|
||||
22
ldap-cesi/Models/PaginatedList.cs
Normal file
22
ldap-cesi/Models/PaginatedList.cs
Normal file
@@ -0,0 +1,22 @@
|
||||
namespace ldap_cesi.Models
|
||||
{
|
||||
public class PaginatedList<T>
|
||||
{
|
||||
public List<T> Data { get; }
|
||||
public int TotalCount { get; }
|
||||
public int PageNumber { get; }
|
||||
public int PageSize { get; }
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -3,5 +3,8 @@ namespace ldap_cesi.Models;
|
||||
public class ResponseDataModel<T> : ResponseModel, IResponseDataModel<T> where T : class
|
||||
{
|
||||
public T Data { get; set; } = null!;
|
||||
public string Token { get; set; }
|
||||
public int? TotalPages { get; set; }
|
||||
public int? TotalCount { get; set; }
|
||||
public int? PageNumber { get; set; }
|
||||
public int? PageSize { get; set; }
|
||||
}
|
||||
@@ -4,7 +4,7 @@ public class ResponseModel : IResponseModel
|
||||
{
|
||||
public bool Success { get; set; }
|
||||
public string? Message { get; set; }
|
||||
public string? TokenJWT { get; set; }
|
||||
public string? Token { get; set; }
|
||||
|
||||
public int StatusCode { get; set; }
|
||||
}
|
||||
@@ -1,4 +1,6 @@
|
||||
using ldap_cesi.Configurations;
|
||||
using ldap_cesi.Context;
|
||||
using ldap_cesi.Seeders;
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
builder.BuildConf();
|
||||
@@ -21,8 +23,21 @@ if (app.Environment.IsDevelopment())
|
||||
});
|
||||
}
|
||||
|
||||
using (var scope = app.Services.CreateScope())
|
||||
{
|
||||
var services = scope.ServiceProvider;
|
||||
var context = services.GetRequiredService<PgContext>();
|
||||
var seeder = new Seeders(context);
|
||||
|
||||
if (app.Environment.IsDevelopment())
|
||||
{
|
||||
await seeder.GenerateSalaries(500);
|
||||
}
|
||||
}
|
||||
|
||||
app.UseHttpsRedirection();
|
||||
app.UseRouting();
|
||||
app.UseCors("AllowAll");
|
||||
app.UseAuthentication();
|
||||
app.UseAuthorization();
|
||||
app.MapControllers();
|
||||
|
||||
@@ -7,9 +7,23 @@ public interface IRepositoryBase<TEntity> where TEntity : class
|
||||
Task<TEntity> AddAsync(TEntity entity, CancellationToken cancellationToken = default);
|
||||
Task<bool> AnyAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default);
|
||||
Task<TEntity> GetByIdAsync<TId>(TId id, CancellationToken cancellationToken = default) where TId : notnull;
|
||||
Task<List<TEntity>> GetAllAsync(CancellationToken cancellationToken = default);
|
||||
Task UpdateAsync(TEntity entity, CancellationToken cancellationToken = default);
|
||||
Task DeleteAsync(TEntity entity, CancellationToken cancellationToken = default);
|
||||
|
||||
Task<(List<TEntity> Data, int TotalPages, int TotalItems)> GetAllAsync(int pageNumber = 1, int pageSize = 10, CancellationToken cancellationToken = default);
|
||||
Task<bool> UpdateAsync(TEntity entity, CancellationToken cancellationToken = default);
|
||||
Task<bool> DeleteAsync(TEntity entity, CancellationToken cancellationToken = default);
|
||||
Task<TEntity> GetWithRelationsAsync(int id, params Expression<Func<TEntity, object>>[] relationsAInclude);
|
||||
|
||||
Task<(List<TEntity> 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<int> CountRelatedEntitiesAsync<TRelated>(int id, Expression<Func<TRelated, bool>> predicate) where TRelated : class;
|
||||
|
||||
Task<TEntity?> FirstOrDefaultAsync(Expression<Func<TEntity, bool>> predicate,
|
||||
CancellationToken cancellationToken = default);
|
||||
|
||||
Task<int> CountAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default);
|
||||
}
|
||||
@@ -4,5 +4,8 @@ namespace ldap_cesi.Repository.Services;
|
||||
|
||||
public interface IRepositorySalarie : IRepositoryBase<Salarie>
|
||||
{
|
||||
|
||||
Task<Salarie> GetSalarieWithRelationsAsync(int id);
|
||||
Task<List<Salarie>> SearchByNameAsync(string inputRecherche);
|
||||
Task<List<Salarie>> GetSalariesBySiteAsync(int siteId);
|
||||
Task<List<Salarie>> GetSalariesByServiceAsync(int serviceId);
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
using System.Linq.Expressions;
|
||||
using ldap_cesi.Context;
|
||||
using ldap_cesi.Models;
|
||||
using ldap_cesi.Repository.Services;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
@@ -8,10 +9,11 @@ namespace ldap_cesi.Repository;
|
||||
public class RepositoryBase<TEntity> : IRepositoryBase<TEntity> where TEntity : class
|
||||
{
|
||||
protected readonly PgContext _context;
|
||||
|
||||
protected readonly DbSet<TEntity> _dbSet;
|
||||
public RepositoryBase(PgContext context)
|
||||
{
|
||||
_context = context ?? throw new ArgumentNullException(nameof(context));
|
||||
_dbSet = context.Set<TEntity>();
|
||||
}
|
||||
public virtual async Task<TEntity> AddAsync(TEntity entity, CancellationToken cancellationToken = default)
|
||||
{
|
||||
@@ -32,36 +34,6 @@ public class RepositoryBase<TEntity> : IRepositoryBase<TEntity> where TEntity :
|
||||
return await _context.Set<TEntity>().AnyAsync(predicate, cancellationToken);
|
||||
}
|
||||
|
||||
|
||||
public virtual async Task<List<TEntity>> GetAllAsync(CancellationToken cancellationToken = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
return await _context.Set<TEntity>().ToListAsync(cancellationToken);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
throw new Exception("Erreur pendant la récupérations 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);
|
||||
}
|
||||
|
||||
public virtual async Task UpdateAsync(TEntity entity, CancellationToken cancellationToken = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
_context.Set<TEntity>().Update(entity);
|
||||
await SaveChangesAsync(cancellationToken);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
throw new Exception("Erreur pendant la mis à jour", ex);
|
||||
}
|
||||
}
|
||||
|
||||
public virtual async Task<TEntity?> GetByIdAsync<TId>(TId id, CancellationToken cancellationToken = default) where TId : notnull
|
||||
{
|
||||
try
|
||||
@@ -74,12 +46,73 @@ public class RepositoryBase<TEntity> : IRepositoryBase<TEntity> where TEntity :
|
||||
}
|
||||
}
|
||||
|
||||
public virtual async Task DeleteAsync(TEntity entity, CancellationToken cancellationToken = default)
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
public virtual async Task<bool> UpdateAsync(TEntity entity, CancellationToken cancellationToken = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
_context.Set<TEntity>().Update(entity);
|
||||
await SaveChangesAsync(cancellationToken);
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
throw new Exception("Erreur pendant la mis à jour", ex);
|
||||
}
|
||||
}
|
||||
|
||||
public virtual async Task<(List<TEntity> Data, int TotalPages, int TotalItems)> GetAllWithRelationsAsync(int pageNumber = 1, int pageSize = 10, params Expression<Func<TEntity, object>>[] relationInclues)
|
||||
{
|
||||
IQueryable<TEntity> query = _dbSet;
|
||||
|
||||
foreach (var relationInclue in relationInclues)
|
||||
{
|
||||
query = query.Include(relationInclue);
|
||||
}
|
||||
|
||||
var totalCount = await query.CountAsync();
|
||||
var totalPages = (int)Math.Ceiling(totalCount / (double)pageSize);
|
||||
|
||||
var data = await query
|
||||
.Skip((pageNumber - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.ToListAsync();
|
||||
|
||||
return (data, totalPages, totalCount);
|
||||
}
|
||||
|
||||
public virtual async Task<bool> DeleteAsync(TEntity entity, CancellationToken cancellationToken = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
_context.Set<TEntity>().Remove(entity);
|
||||
await SaveChangesAsync(cancellationToken);
|
||||
return true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -99,16 +132,53 @@ public class RepositoryBase<TEntity> : IRepositoryBase<TEntity> where TEntity :
|
||||
}
|
||||
}
|
||||
|
||||
public virtual async Task<List<TEntity>> ListAsync(CancellationToken cancellationToken = default)
|
||||
|
||||
public virtual async Task<TEntity> GetWithRelationsAsync(int id, params Expression<Func<TEntity, object>>[] relationInclues)
|
||||
{
|
||||
try
|
||||
IQueryable<TEntity> query = _dbSet;
|
||||
|
||||
foreach (var relationInclue in relationInclues)
|
||||
{
|
||||
return await _context.Set<TEntity>().ToListAsync(cancellationToken);
|
||||
query = query.Include(relationInclue);
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
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)
|
||||
{
|
||||
throw new Exception("Erreur qui concerne le listing des entités", ex);
|
||||
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);
|
||||
}
|
||||
|
||||
public virtual async Task<int> CountRelatedEntitiesAsync<TRelated>(int id, Expression<Func<TRelated, bool>> predicate) where TRelated : class
|
||||
{
|
||||
return await _context.Set<TRelated>().CountAsync(predicate);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
using ldap_cesi.Context;
|
||||
using ldap_cesi.Entities;
|
||||
using ldap_cesi.Repository.Services;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace ldap_cesi.Repository;
|
||||
|
||||
@@ -10,4 +11,39 @@ public class SalarieRepository : RepositoryBase<Salarie>, IRepositorySalarie
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public async Task<Salarie> GetSalarieWithRelationsAsync(int id)
|
||||
{
|
||||
return await _context.Salaries
|
||||
.Include(s => s.IdServiceNavigation)
|
||||
.Include(s => s.IdSiteNavigation)
|
||||
.FirstOrDefaultAsync(s => s.Id == id);
|
||||
}
|
||||
|
||||
public async Task<List<Salarie>> SearchByNameAsync(string inputRecherche)
|
||||
{
|
||||
return await _context.Salaries
|
||||
.Where(s => s.Nom.Contains(inputRecherche) || s.Prenom.Contains(inputRecherche))
|
||||
.Include(s => s.IdServiceNavigation)
|
||||
.Include(s => s.IdSiteNavigation)
|
||||
.ToListAsync();
|
||||
}
|
||||
|
||||
public async Task<List<Salarie>> GetSalariesBySiteAsync(int siteId)
|
||||
{
|
||||
return await _context.Salaries
|
||||
.Where(s => s.IdSite == siteId)
|
||||
.Include(s => s.IdServiceNavigation)
|
||||
.Include(s => s.IdSiteNavigation)
|
||||
.ToListAsync();
|
||||
}
|
||||
|
||||
public async Task<List<Salarie>> GetSalariesByServiceAsync(int serviceId)
|
||||
{
|
||||
return await _context.Salaries
|
||||
.Where(s => s.IdService == serviceId)
|
||||
.Include(s => s.IdServiceNavigation)
|
||||
.Include(s => s.IdSiteNavigation)
|
||||
.ToListAsync();
|
||||
}
|
||||
}
|
||||
49
ldap-cesi/Seeders/Seeders.cs
Normal file
49
ldap-cesi/Seeders/Seeders.cs
Normal file
@@ -0,0 +1,49 @@
|
||||
using Bogus;
|
||||
using ldap_cesi.Context;
|
||||
using ldap_cesi.Entities;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace ldap_cesi.Seeders;
|
||||
|
||||
public class Seeders
|
||||
{
|
||||
private readonly PgContext _context;
|
||||
|
||||
public Seeders(PgContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
public async Task GenerateSalaries(int count = 1000)
|
||||
{
|
||||
|
||||
if (await _context.Salaries.AnyAsync())
|
||||
{
|
||||
Console.WriteLine("Des salariés existent déjà dans la base de données. Aucune donnée insérée.");
|
||||
return;
|
||||
}
|
||||
|
||||
var salarieFaker = new Faker<Salarie>("fr")
|
||||
.RuleFor(s => s.Nom, f => f.Name.LastName())
|
||||
.RuleFor(s => s.Prenom, f => f.Name.FirstName())
|
||||
.RuleFor(s => s.TelephoneFixe, f => f.Phone.PhoneNumber())
|
||||
.RuleFor(s => s.TelephonePortable, f => f.Phone.PhoneNumber())
|
||||
.RuleFor(s => s.Email, (f, s) => f.Internet.Email(s.Prenom, s.Nom));
|
||||
|
||||
var salaries = salarieFaker.Generate(count);
|
||||
|
||||
// on s'assure que les relations (Service, Site) existent avant d'ajouter les salariés
|
||||
var services = await _context.Services.ToListAsync();
|
||||
var sites = await _context.Sites.ToListAsync();
|
||||
|
||||
var random = new Random();
|
||||
foreach (var salarie in salaries)
|
||||
{
|
||||
salarie.IdServiceNavigation = services[random.Next(services.Count)];
|
||||
salarie.IdSiteNavigation = sites[random.Next(sites.Count)];
|
||||
}
|
||||
|
||||
await _context.Salaries.AddRangeAsync(salaries);
|
||||
await _context.SaveChangesAsync();
|
||||
}
|
||||
}
|
||||
@@ -7,4 +7,5 @@ public interface IJwtService
|
||||
string GenerateToken(Utilisateur utilisateur);
|
||||
string GetPublicKey();
|
||||
Task<bool> ValidateToken(string token, int userId);
|
||||
Task<bool> InvalidateToken(string token);
|
||||
}
|
||||
@@ -1,6 +1,10 @@
|
||||
namespace ldap_cesi.Services.Interfaces;
|
||||
using ldap_cesi.Entities;
|
||||
using ldap_cesi.DTOs;
|
||||
using ldap_cesi.DTOs.Inputs.Role;
|
||||
|
||||
public interface IRoleService
|
||||
namespace ldap_cesi.Services.Interfaces
|
||||
{
|
||||
|
||||
public interface IRoleService : IServiceBase<Role, RoleDto, RoleCreateDto, RoleUpdateDto>
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,17 @@
|
||||
using ldap_cesi.DTOs;
|
||||
using ldap_cesi.DTOs.Inputs.Salarie;
|
||||
using ldap_cesi.DTOs.Inputs.Service;
|
||||
using ldap_cesi.DTOs.Outputs.Salarie;
|
||||
using ldap_cesi.Entities;
|
||||
using ldap_cesi.Models;
|
||||
|
||||
namespace ldap_cesi.Services.Interfaces;
|
||||
|
||||
public interface ISalarieService
|
||||
public interface ISalarieService : IServiceBase<Salarie, SalarieOutputDetail, SalarieCreateDto, SalarieUpdateDto>
|
||||
{
|
||||
Task<IResponseDataModel<List<Salarie>>> GetAll();
|
||||
Task<IResponseDataModel<Salarie>> GetById(int id);
|
||||
Task<IResponseDataModel<List<SalarieOutputDetail>>> GetSalariesByService(int serviceId, int pageNumber = 1,
|
||||
int pageSize = 25);
|
||||
|
||||
Task<IResponseDataModel<List<SalarieOutputDetail>>> GetSalariesBySite(int siteId, int pageNumber = 1,
|
||||
int pageSize = 25);
|
||||
}
|
||||
23
ldap-cesi/Services/Interfaces/IServiceBase.cs
Normal file
23
ldap-cesi/Services/Interfaces/IServiceBase.cs
Normal file
@@ -0,0 +1,23 @@
|
||||
using System.Linq.Expressions;
|
||||
using ldap_cesi.Models;
|
||||
|
||||
namespace ldap_cesi.Services.Interfaces;
|
||||
|
||||
public interface IServiceBase<T, TDto, TCreateDto, TUpdateDto>
|
||||
where T : class
|
||||
where TDto : class
|
||||
where TCreateDto : class
|
||||
where TUpdateDto : class
|
||||
{
|
||||
Task<IResponseDataModel<List<T>>> GetAll(int pageNumber, int pageSize);
|
||||
Task<IResponseDataModel<T>> GetById(int id);
|
||||
Task<IResponseDataModel<TDto>> GetByIdWithRelations(int id, params Expression<Func<T, object>>[] relationsAInclures); // préciser avec une ou des fonctions lambda les relations à inclure dans la réponse
|
||||
Task<IResponseDataModel<List<TDto>>> GetAllWithRelationsAsync(int pageNumber, int pageSize, params Expression<Func<T, object>>[] relationsAInclure);
|
||||
|
||||
Task<IResponseDataModel<List<TDto>>> SearchWithRelations(string searchTerm, int pageNumber, int pageSize,
|
||||
params Expression<Func<T, object>>[] includeProperties);
|
||||
Task<IResponseDataModel<T>> Create(TCreateDto dto);
|
||||
Task<IResponseDataModel<T>> Update(TUpdateDto dto);
|
||||
Task<IResponseDataModel<string>> Delete(int id);
|
||||
Task<IResponseDataModel<string>> DeleteWithDependencyCheck<TRelated>(int id, Expression<Func<TRelated, bool>> relationPredicate, string relationErrorMessage) where TRelated : class;
|
||||
}
|
||||
@@ -1,12 +1,12 @@
|
||||
using ldap_cesi.DTOs.Inputs.Service;
|
||||
using ldap_cesi.DTOs;
|
||||
using ldap_cesi.Entities;
|
||||
using ldap_cesi.Models;
|
||||
|
||||
namespace ldap_cesi.Services.Interfaces;
|
||||
|
||||
public interface IServiceService
|
||||
namespace ldap_cesi.Services.Interfaces
|
||||
{
|
||||
Task<IResponseDataModel<List<Service>>> GetAll();
|
||||
Task<IResponseDataModel<Service>> GetById(int id);
|
||||
Task<IResponseDataModel<string>> CreateService(ServiceCreateDto serviceCreateDto);
|
||||
public interface IServiceService : IServiceBase<Service, ServiceDto, ServiceCreateDto, ServiceUpdateDto>
|
||||
{
|
||||
Task<IResponseDataModel<string>> DeleteWithEntiteCheck(int id);
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,11 @@
|
||||
using ldap_cesi.DTOs;
|
||||
using ldap_cesi.DTOs.Inputs.Site;
|
||||
using ldap_cesi.Entities;
|
||||
using ldap_cesi.Models;
|
||||
|
||||
namespace ldap_cesi.Services.Interfaces;
|
||||
|
||||
public interface ISiteService
|
||||
public interface ISiteService : IServiceBase<Site, SiteDto, SiteCreateDto, SiteUpdateDto>
|
||||
{
|
||||
|
||||
Task<IResponseDataModel<string>> DeleteWithEntiteCheck(int id);
|
||||
}
|
||||
@@ -7,7 +7,7 @@ namespace ldap_cesi.Services.Interfaces;
|
||||
|
||||
public interface IUtilisateurService
|
||||
{
|
||||
Task<IResponseDataModel<List<Utilisateur>>> GetAll();
|
||||
Task<IResponseDataModel<Utilisateur>> GetById(int id);
|
||||
Task<IResponseDataModel<List<UtilisateurOutputDto>>> GetAll();
|
||||
Task<IResponseDataModel<UtilisateurOutputDto>> GetById(int id);
|
||||
Task<IResponseDataModel<UtilisateurOutputDto>> Login(UtilisateurLoginDto utilisateurInput);
|
||||
}
|
||||
@@ -60,7 +60,7 @@ public class JwtService : IJwtService
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "An error occurred while generating the JWT token.");
|
||||
_logger.LogError(ex, "Une erreur s'est produitel lors de la génération du token.");
|
||||
throw;
|
||||
}
|
||||
}
|
||||
@@ -74,11 +74,52 @@ public class JwtService : IJwtService
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "An error occurred while retrieving the public key.");
|
||||
_logger.LogError(ex, "Une erreur s'est produite pendant la récupération de la clé.");
|
||||
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)
|
||||
{
|
||||
try
|
||||
@@ -100,14 +141,14 @@ public class JwtService : IJwtService
|
||||
var nameIdClaim = principal.FindFirst(ClaimTypes.NameIdentifier);
|
||||
if (nameIdClaim == null || !int.TryParse(nameIdClaim.Value, out var tokenUserId) || tokenUserId != userId)
|
||||
{
|
||||
_logger.LogWarning("Token validation failed: Invalid user ID.");
|
||||
_logger.LogWarning("Erreur de validation : Id utilisateur invalide.");
|
||||
return false;
|
||||
}
|
||||
|
||||
var utilisateur = await _context.Utilisateurs.FindAsync(userId);
|
||||
if (utilisateur == null)
|
||||
{
|
||||
_logger.LogWarning("Token validation failed: User not found.");
|
||||
_logger.LogWarning("Erreur de validation : Utilisateur non trouvé.");
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -119,7 +160,7 @@ public class JwtService : IJwtService
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "An error occurred while validating the JWT token.");
|
||||
_logger.LogError(ex, "Une erreur s'est produite lors pendant la validation du token JWT.");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,15 +1,17 @@
|
||||
using ldap_cesi.Repository.Services;
|
||||
using ldap_cesi.Services.Interfaces;
|
||||
using ldap_cesi.Entities;
|
||||
using ldap_cesi.DTOs;
|
||||
using ldap_cesi.DTOs.Inputs.Role;
|
||||
using AutoMapper;
|
||||
using ldap_cesi.Validator.Role;
|
||||
|
||||
namespace ldap_cesi.Services;
|
||||
|
||||
public class RoleService : IRoleService
|
||||
public class RoleService : ServiceBase<Role, RoleDto, RoleCreateDto, RoleUpdateDto>,IRoleService
|
||||
{
|
||||
private IRepositoryRole _repositoryRole;
|
||||
|
||||
public RoleService(IRepositoryRole repositoryRole)
|
||||
public RoleService(IRepositoryRole repositoryRole, IMapper mapper, ILogger<RoleService> logger, RoleCreateValidator roleCreateValidator, RoleUpdateValidator roleUpdateValidator)
|
||||
: base(repositoryRole, mapper, logger, roleCreateValidator, roleUpdateValidator)
|
||||
{
|
||||
_repositoryRole = repositoryRole;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,38 +1,98 @@
|
||||
using AutoMapper;
|
||||
using ldap_cesi.DTOs;
|
||||
using ldap_cesi.DTOs.Inputs.Salarie;
|
||||
using ldap_cesi.DTOs.Inputs.Service;
|
||||
using ldap_cesi.DTOs.Outputs.Salarie;
|
||||
using ldap_cesi.Entities;
|
||||
using ldap_cesi.Models;
|
||||
using ldap_cesi.Repository.Services;
|
||||
using ldap_cesi.Services.Interfaces;
|
||||
using ldap_cesi.Validator.Salarie;
|
||||
|
||||
namespace ldap_cesi.Services;
|
||||
|
||||
public class SalarieService : ISalarieService
|
||||
public class SalarieService : ServiceBase<Salarie, SalarieOutputDetail, SalarieCreateDto, SalarieUpdateDto>, ISalarieService
|
||||
{
|
||||
private IRepositorySalarie _repositorySalarie;
|
||||
private readonly IRepositorySite _repositorySite;
|
||||
private readonly IRepositoryService _repositoryService;
|
||||
private readonly IMapper _mapper;
|
||||
|
||||
public SalarieService(IRepositorySalarie repositorySalarie)
|
||||
public SalarieService(IRepositorySalarie repositorySalarie, IMapper mapper, IRepositorySite repositorySite, IRepositoryService repositoryService,
|
||||
ILogger<SalarieService> logger, SalarieCreateValidator salarieCreateValidator, SalarieUpdateValidator salarieUpdateValidator)
|
||||
: base(repositorySalarie, mapper, logger, salarieCreateValidator, salarieUpdateValidator)
|
||||
{
|
||||
_repositorySalarie = repositorySalarie;
|
||||
_repositorySite = repositorySite;
|
||||
_repositoryService = repositoryService;
|
||||
_mapper = mapper;
|
||||
}
|
||||
|
||||
public async Task<IResponseDataModel<List<Salarie>>> GetAll()
|
||||
public async Task<IResponseDataModel<List<SalarieOutputDetail>>> GetSalariesBySite(int siteId, int pageNumber = 1, int pageSize = 25)
|
||||
{
|
||||
var salaries = await _repositorySalarie.GetAllAsync();
|
||||
return new ResponseDataModel<List<Salarie>>
|
||||
var site = await _repositorySite.GetByIdAsync(siteId);
|
||||
if (site == null)
|
||||
{
|
||||
return new ResponseDataModel<List<SalarieOutputDetail>>
|
||||
{
|
||||
Success = false,
|
||||
Message = "Site non trouvé",
|
||||
StatusCode = 404
|
||||
};
|
||||
}
|
||||
|
||||
var salaries = await _repositorySalarie.GetSalariesBySiteAsync(siteId);
|
||||
var totalCount = salaries.Count;
|
||||
var paginatedSalaries = salaries
|
||||
.Skip((pageNumber - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.ToList();
|
||||
|
||||
var salariesDto = _mapper.Map<List<SalarieOutputDetail>>(paginatedSalaries);
|
||||
|
||||
return new ResponseDataModel<List<SalarieOutputDetail>>
|
||||
{
|
||||
Success = true,
|
||||
Data = salaries,
|
||||
StatusCode = 200,
|
||||
Data = salariesDto,
|
||||
TotalPages = (int)Math.Ceiling((double)totalCount / pageSize),
|
||||
TotalCount = totalCount,
|
||||
PageNumber = pageNumber,
|
||||
PageSize = pageSize,
|
||||
StatusCode = 200
|
||||
};
|
||||
}
|
||||
|
||||
public async Task<IResponseDataModel<Salarie>> GetById(int id)
|
||||
public async Task<IResponseDataModel<List<SalarieOutputDetail>>> GetSalariesByService(int serviceId, int pageNumber = 1, int pageSize = 25)
|
||||
{
|
||||
var service = await _repositorySalarie.GetByIdAsync(id);
|
||||
return new ResponseDataModel<Salarie>
|
||||
var service = await _repositoryService.GetByIdAsync(serviceId);
|
||||
if (service == null)
|
||||
{
|
||||
return new ResponseDataModel<List<SalarieOutputDetail>>
|
||||
{
|
||||
Success = false,
|
||||
Message = "Service non trouvé",
|
||||
StatusCode = 404
|
||||
};
|
||||
}
|
||||
|
||||
var salaries = await _repositorySalarie.GetSalariesByServiceAsync(serviceId);
|
||||
var totalCount = salaries.Count;
|
||||
var paginatedSalaries = salaries
|
||||
.Skip((pageNumber - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.ToList();
|
||||
|
||||
var salariesDto = _mapper.Map<List<SalarieOutputDetail>>(paginatedSalaries);
|
||||
|
||||
return new ResponseDataModel<List<SalarieOutputDetail>>
|
||||
{
|
||||
Success = true,
|
||||
Data = service,
|
||||
StatusCode = 200,
|
||||
Data = salariesDto, // Les salariés paginés
|
||||
TotalPages = (int)Math.Ceiling((double)totalCount / pageSize),
|
||||
TotalCount = totalCount,
|
||||
PageNumber = pageNumber,
|
||||
PageSize = pageSize,
|
||||
StatusCode = 200
|
||||
};
|
||||
}
|
||||
}
|
||||
360
ldap-cesi/Services/ServiceBase.cs
Normal file
360
ldap-cesi/Services/ServiceBase.cs
Normal file
@@ -0,0 +1,360 @@
|
||||
using AutoMapper;
|
||||
using ldap_cesi.Models;
|
||||
using ldap_cesi.Repository.Services;
|
||||
using ldap_cesi.Services.Interfaces;
|
||||
using System.Linq.Expressions;
|
||||
using FluentValidation;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace ldap_cesi.Services;
|
||||
|
||||
public class ServiceBase<T, TDto, TCreateDto, TUpdateDto> : IServiceBase<T, TDto, TCreateDto, TUpdateDto>
|
||||
where T : class
|
||||
where TDto : class
|
||||
where TCreateDto : class
|
||||
where TUpdateDto : class
|
||||
{
|
||||
protected readonly IRepositoryBase<T> _repository;
|
||||
protected readonly IMapper _mapper;
|
||||
protected readonly ILogger<ServiceBase<T, TDto, TCreateDto, TUpdateDto>> _logger;
|
||||
protected readonly IValidator<TCreateDto> _createDtoValidator;
|
||||
protected readonly IValidator<TUpdateDto> _updateDtoValidator;
|
||||
|
||||
public ServiceBase(IRepositoryBase<T> repository, IMapper mapper, ILogger<ServiceBase<T, TDto, TCreateDto, TUpdateDto>> logger, IValidator<TCreateDto> createDtoValidator, IValidator<TUpdateDto> updateDtoValidator)
|
||||
{
|
||||
_repository = repository;
|
||||
_mapper = mapper;
|
||||
_logger = logger;
|
||||
_createDtoValidator = createDtoValidator;
|
||||
_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)
|
||||
{
|
||||
try
|
||||
{
|
||||
var response = await _repository.GetAllAsync( pageNumber, pageSize);
|
||||
return new ResponseDataModel<List<T>>
|
||||
{
|
||||
Success = true,
|
||||
Data = response.Data,
|
||||
TotalPages = response.TotalPages,
|
||||
TotalCount = response.TotalItems,
|
||||
StatusCode = 200,
|
||||
Message = "Liste des entités récupérée avec succès."
|
||||
};
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Une erreur s'est produite lors de la récupération des entités.");
|
||||
return new ResponseDataModel<List<T>>
|
||||
{
|
||||
Success = false,
|
||||
Message = "Une erreur s'est produite lors de la récupération des entités.",
|
||||
StatusCode = 500
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public virtual async Task<IResponseDataModel<T>> GetById(int id)
|
||||
{
|
||||
try
|
||||
{
|
||||
var entity = await _repository.GetByIdAsync(id);
|
||||
if (entity == null)
|
||||
{
|
||||
return new ResponseDataModel<T>
|
||||
{
|
||||
Success = false,
|
||||
Message = $"Aucune entité trouvée avec l'identifiant {id}.",
|
||||
StatusCode = 404
|
||||
};
|
||||
}
|
||||
|
||||
return new ResponseDataModel<T>
|
||||
{
|
||||
Success = true,
|
||||
Data = entity,
|
||||
StatusCode = 200,
|
||||
Message = "Entité récupérée avec succès."
|
||||
};
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, $"Une erreur s'est produite lors de la récupération de l'entité avec l'identifiant {id}.");
|
||||
return new ResponseDataModel<T>
|
||||
{
|
||||
Success = false,
|
||||
Message = "Une erreur s'est produite lors de la récupération de l'entité.",
|
||||
StatusCode = 500
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public virtual async Task<IResponseDataModel<List<TDto>>> GetAllWithRelationsAsync(int pageNumber, int pageSize,params Expression<Func<T, object>>[] relationsAInclure)
|
||||
{
|
||||
try
|
||||
{
|
||||
var response = await _repository.GetAllWithRelationsAsync(pageNumber, pageSize,relationsAInclure);
|
||||
var dtos = _mapper.Map<List<TDto>>(response.Data);
|
||||
return new ResponseDataModel<List<TDto>>
|
||||
{
|
||||
Success = true,
|
||||
Data = dtos,
|
||||
TotalPages = response.TotalPages,
|
||||
TotalCount = response.TotalItems,
|
||||
StatusCode = 200,
|
||||
Message = "Liste des entités récupérée avec succès."
|
||||
};
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Une erreur s'est produite lors de la récupération des entités.");
|
||||
return new ResponseDataModel<List<TDto>>
|
||||
{
|
||||
Success = false,
|
||||
Message = "Une erreur s'est produite lors de la récupération des entités.",
|
||||
StatusCode = 500
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public virtual async Task<IResponseDataModel<TDto>> GetByIdWithRelations(int id, params Expression<Func<T, object>>[] relationsAInclure)
|
||||
{
|
||||
try
|
||||
{
|
||||
var entity = await _repository.GetWithRelationsAsync(id, relationsAInclure);
|
||||
if (entity == null)
|
||||
{
|
||||
return new ResponseDataModel<TDto>
|
||||
{
|
||||
Success = false,
|
||||
Message = $"Aucune entité trouvée avec l'identifiant {id}.",
|
||||
StatusCode = 404
|
||||
};
|
||||
}
|
||||
|
||||
var dto = _mapper.Map<TDto>(entity);
|
||||
return new ResponseDataModel<TDto>
|
||||
{
|
||||
Success = true,
|
||||
Data = dto,
|
||||
StatusCode = 200,
|
||||
Message = "Entité avec relations récupérée avec succès."
|
||||
};
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, $"Une erreur s'est produite lors de la récupération de l'entité avec l'identifiant {id}.");
|
||||
return new ResponseDataModel<TDto>
|
||||
{
|
||||
Success = false,
|
||||
Message = "Une erreur s'est produite lors de la récupération de l'entité avec relations.",
|
||||
StatusCode = 500
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public virtual async Task<IResponseDataModel<T>> Create(TCreateDto dto)
|
||||
{
|
||||
try
|
||||
{
|
||||
var validationResult = _createDtoValidator.Validate(dto);
|
||||
if (!validationResult.IsValid)
|
||||
{
|
||||
return new ResponseDataModel<T>
|
||||
{
|
||||
Success = false,
|
||||
Message = string.Join("; ", validationResult.Errors.Select(e => e.ErrorMessage)),
|
||||
StatusCode = 400
|
||||
};
|
||||
}
|
||||
var entity = _mapper.Map<T>(dto);
|
||||
var createdEntity = await _repository.AddAsync(entity);
|
||||
return new ResponseDataModel<T>
|
||||
{
|
||||
Success = createdEntity != null,
|
||||
Data = createdEntity,
|
||||
StatusCode = createdEntity != null ? 201 : 500,
|
||||
Message = createdEntity != null ? "Entité créée avec succès." : "Échec de la création de l'entité."
|
||||
};
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Une erreur s'est produite lors de la création de l'entité.");
|
||||
return new ResponseDataModel<T>
|
||||
{
|
||||
Success = false,
|
||||
Message = "Une erreur s'est produite lors de la création de l'entité.",
|
||||
StatusCode = 500
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public virtual async Task<IResponseDataModel<T>> Update(TUpdateDto dto)
|
||||
{
|
||||
try
|
||||
{
|
||||
var validationResult = _updateDtoValidator.Validate(dto);
|
||||
if (!validationResult.IsValid)
|
||||
{
|
||||
return new ResponseDataModel<T>
|
||||
{
|
||||
Success = false,
|
||||
Message = string.Join("; ", validationResult.Errors.Select(e => e.ErrorMessage)),
|
||||
StatusCode = 400
|
||||
};
|
||||
}
|
||||
var entity = _mapper.Map<T>(dto);
|
||||
bool isUpdated = await _repository.UpdateAsync(entity);
|
||||
return new ResponseDataModel<T>
|
||||
{
|
||||
Success = isUpdated,
|
||||
Data = isUpdated ? entity : default,
|
||||
StatusCode = isUpdated ? 200 : 500,
|
||||
Message = isUpdated ? "Entité mise à jour avec succès." : "Échec de la mise à jour de l'entité."
|
||||
};
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Une erreur s'est produite lors de la mise à jour de l'entité.");
|
||||
return new ResponseDataModel<T>
|
||||
{
|
||||
Success = false,
|
||||
Message = "Une erreur s'est produite lors de la mise à jour de l'entité.",
|
||||
StatusCode = 500
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public virtual async Task<IResponseDataModel<string>> Delete(int id)
|
||||
{
|
||||
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
|
||||
};
|
||||
}
|
||||
|
||||
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
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public virtual async Task<IResponseDataModel<List<TDto>>> SearchWithRelations(string searchTerm, int pageNumber, int pageSize, params Expression<Func<T, object>>[] includeProperties)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(searchTerm) || searchTerm.Length < 2)
|
||||
{
|
||||
return new ResponseDataModel<List<TDto>>
|
||||
{
|
||||
Success = false,
|
||||
Message = "Le terme de recherche doit contenir au moins deux caractères.",
|
||||
StatusCode = 400
|
||||
};
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
var predicate = BuildSearchPredicate(searchTerm);
|
||||
var response = await _repository.SearchAsync(predicate, pageNumber, pageSize, includeProperties);
|
||||
var dtos = _mapper.Map<List<TDto>>(response.Data);
|
||||
|
||||
return new ResponseDataModel<List<TDto>>
|
||||
{
|
||||
Success = true,
|
||||
Data = dtos,
|
||||
TotalPages = response.TotalPages,
|
||||
TotalCount = response.TotalItems,
|
||||
StatusCode = 200,
|
||||
Message = "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<List<TDto>>
|
||||
{
|
||||
Success = false,
|
||||
Message = "Une erreur s'est produite lors de la recherche des entités.",
|
||||
StatusCode = 500
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
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
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,51 +4,153 @@ using ldap_cesi.Entities;
|
||||
using ldap_cesi.Models;
|
||||
using ldap_cesi.Repository.Services;
|
||||
using ldap_cesi.Services.Interfaces;
|
||||
using ldap_cesi.Validator.Service;
|
||||
using ldap_cesi.DTOs;
|
||||
using ldap_cesi.DTOs.Inputs.Service;
|
||||
|
||||
namespace ldap_cesi.Services;
|
||||
|
||||
public class ServiceService : IServiceService
|
||||
public class ServiceService : ServiceBase<Service, ServiceDto, ServiceCreateDto, ServiceUpdateDto>, IServiceService
|
||||
{
|
||||
private readonly IRepositoryService _repositoryService;
|
||||
private readonly IMapper _mapper;
|
||||
|
||||
public ServiceService(IRepositoryService repositoryService, IMapper mapper)
|
||||
public ServiceService(IRepositoryService repositoryService, IMapper mapper, ILogger<ServiceService> logger, ServiceCreateValidator serviceCreateValidator, ServiceUpdateValidator serviceUpdateValidator)
|
||||
: base(repositoryService, mapper, logger, serviceCreateValidator, serviceUpdateValidator)
|
||||
{
|
||||
_repositoryService = repositoryService;
|
||||
_mapper = mapper;
|
||||
}
|
||||
public async Task<IResponseDataModel<string>> DeleteWithEntiteCheck(int id)
|
||||
{
|
||||
return await DeleteWithDependencyCheck<Salarie>(
|
||||
id,
|
||||
salarie => salarie.IdServiceNavigation.Id == id,
|
||||
"Impossible de supprimer ce service car des salariés y sont affectés."
|
||||
);
|
||||
}
|
||||
|
||||
// public async Task<IResponseDataModel<List<Service>>> GetAll()
|
||||
// {
|
||||
// var services = await _repositoryService.GetAllAsync();
|
||||
// return new ResponseDataModel<List<Service>>
|
||||
// {
|
||||
// Success = true,
|
||||
// Data = services,
|
||||
// StatusCode = 200,
|
||||
// };
|
||||
// }
|
||||
|
||||
public async Task<IResponseDataModel<List<Service>>> GetAll()
|
||||
{
|
||||
var services = await _repositoryService.GetAllAsync();
|
||||
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<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<string>> CreateService(ServiceCreateDto serviceCreateDto)
|
||||
{
|
||||
var service = _mapper.Map<Service>(serviceCreateDto);
|
||||
var response = await _repositoryService.AddAsync(service);
|
||||
return new ResponseDataModel<string>
|
||||
{
|
||||
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(),
|
||||
// };
|
||||
// }
|
||||
}
|
||||
159
ldap-cesi/Services/SiteService.cs
Normal file
159
ldap-cesi/Services/SiteService.cs
Normal file
@@ -0,0 +1,159 @@
|
||||
using AutoMapper;
|
||||
using ldap_cesi.DTOs;
|
||||
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;
|
||||
|
||||
namespace ldap_cesi.Services;
|
||||
|
||||
public class SiteService : ServiceBase<Site, SiteDto, SiteCreateDto, SiteUpdateDto>, ISiteService
|
||||
{
|
||||
|
||||
private readonly IRepositorySite _repositorySite;
|
||||
|
||||
public SiteService(IRepositorySite repositorySite, IMapper mapper,
|
||||
ILogger<SiteService> logger, SiteCreateValidator siteCreateValidator, SiteUpdateValidator siteUpdateValidator)
|
||||
: base(repositorySite, mapper, logger, siteCreateValidator, siteUpdateValidator )
|
||||
{
|
||||
_repositorySite = repositorySite;
|
||||
}
|
||||
public async Task<IResponseDataModel<string>> DeleteWithEntiteCheck(int id)
|
||||
{
|
||||
return await DeleteWithDependencyCheck<Salarie>(
|
||||
id,
|
||||
salarie => salarie.IdSiteNavigation.Id == id,
|
||||
"Impossible de supprimer ce site car des salariés y sont affectés."
|
||||
);
|
||||
}
|
||||
|
||||
// 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<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(),
|
||||
// };
|
||||
// }
|
||||
@@ -1,10 +1,10 @@
|
||||
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;
|
||||
using ldap_cesi.Validator.Utilisateur;
|
||||
|
||||
namespace ldap_cesi.Services;
|
||||
|
||||
@@ -20,30 +20,44 @@ public class UtilisateurService : IUtilisateurService
|
||||
_mapper = mapper;
|
||||
}
|
||||
|
||||
public async Task<IResponseDataModel<List<Utilisateur>>> GetAll()
|
||||
public async Task<IResponseDataModel<List<UtilisateurOutputDto>>> GetAll()
|
||||
{
|
||||
var utilisateurs = await _repositoryUtilisateur.GetAllAsync();
|
||||
return new ResponseDataModel<List<Utilisateur>>
|
||||
var utilisateurs = await _repositoryUtilisateur.GetAllAsync(1,10);
|
||||
var utilisateursOutputDto = _mapper.Map<List<UtilisateurOutputDto>>(utilisateurs);
|
||||
return new ResponseDataModel<List<UtilisateurOutputDto>>
|
||||
{
|
||||
Success = true,
|
||||
StatusCode = 200,
|
||||
Data = utilisateurs,
|
||||
Data = utilisateursOutputDto,
|
||||
};
|
||||
}
|
||||
|
||||
public async Task<IResponseDataModel<Utilisateur>> GetById(int id)
|
||||
public async Task<IResponseDataModel<UtilisateurOutputDto>> GetById(int id)
|
||||
{
|
||||
var utililisateur = await _repositoryUtilisateur.GetByIdAsync(id);
|
||||
return new ResponseDataModel<Utilisateur>
|
||||
var utilisateurOutput = _mapper.Map<UtilisateurOutputDto>(utililisateur);
|
||||
return new ResponseDataModel<UtilisateurOutputDto>
|
||||
{
|
||||
Success = true,
|
||||
StatusCode = 200,
|
||||
Data = utililisateur,
|
||||
Data = utilisateurOutput,
|
||||
};
|
||||
}
|
||||
|
||||
public async Task<IResponseDataModel<UtilisateurOutputDto>> Login(UtilisateurLoginDto utilisateurInput)
|
||||
{
|
||||
var validation = new UtilisateurLoginValidator();
|
||||
var result = validation.Validate(utilisateurInput);
|
||||
if (!result.IsValid)
|
||||
{
|
||||
return new ResponseDataModel<UtilisateurOutputDto>
|
||||
{
|
||||
StatusCode = 400,
|
||||
Success = false,
|
||||
Message = "Données utilisateur invalides: " + string.Join(", ", result.Errors)
|
||||
};
|
||||
}
|
||||
|
||||
var utilisateur = await _repositoryUtilisateur.GetByEmailAsync(utilisateurInput.Email);
|
||||
|
||||
if (utilisateur == null)
|
||||
|
||||
14
ldap-cesi/Validator/Role/RoleCreateValidator.cs
Normal file
14
ldap-cesi/Validator/Role/RoleCreateValidator.cs
Normal file
@@ -0,0 +1,14 @@
|
||||
using FluentValidation;
|
||||
using ldap_cesi.DTOs.Inputs.Role;
|
||||
|
||||
namespace ldap_cesi.Validator.Role;
|
||||
|
||||
public class RoleCreateValidator : AbstractValidator<RoleCreateDto>
|
||||
{
|
||||
public RoleCreateValidator()
|
||||
{
|
||||
RuleFor(x => x.Nom)
|
||||
.NotEmpty().WithMessage("Le nom est requis.")
|
||||
.MaximumLength(50).WithMessage("Le nom ne doit pas dépasser 50 caractères.");
|
||||
}
|
||||
}
|
||||
16
ldap-cesi/Validator/Role/RoleUpdateValidator.cs
Normal file
16
ldap-cesi/Validator/Role/RoleUpdateValidator.cs
Normal file
@@ -0,0 +1,16 @@
|
||||
using FluentValidation;
|
||||
using ldap_cesi.DTOs.Inputs.Role;
|
||||
|
||||
namespace ldap_cesi.Validator.Role;
|
||||
|
||||
public class RoleUpdateValidator : AbstractValidator<RoleUpdateDto>
|
||||
{
|
||||
public RoleUpdateValidator()
|
||||
{
|
||||
RuleFor(x => x.Nom)
|
||||
.NotEmpty().WithMessage("Le nom est requis.")
|
||||
.MaximumLength(50).WithMessage("Le nom ne doit pas dépasser 50 caractères.");
|
||||
RuleFor(x => x.Id)
|
||||
.NotEmpty().WithMessage("L'identifiant du Rôle est requis.");
|
||||
}
|
||||
}
|
||||
41
ldap-cesi/Validator/Salarie/SalarieCreateValidator.cs
Normal file
41
ldap-cesi/Validator/Salarie/SalarieCreateValidator.cs
Normal file
@@ -0,0 +1,41 @@
|
||||
using FluentValidation;
|
||||
using ldap_cesi.DTOs.Inputs.Salarie;
|
||||
|
||||
namespace ldap_cesi.Validator.Salarie;
|
||||
|
||||
public class SalarieCreateValidator : AbstractValidator<SalarieCreateDto>
|
||||
{
|
||||
public SalarieCreateValidator()
|
||||
{
|
||||
RuleFor(x => x.Nom)
|
||||
.NotEmpty().WithMessage("Le nom est requis.")
|
||||
.MaximumLength(50).WithMessage("Le nom ne doit pas dépasser 50 caractères.");
|
||||
|
||||
RuleFor(x => x.Prenom)
|
||||
.NotEmpty().WithMessage("Le prénom est requis.")
|
||||
.MaximumLength(50).WithMessage("Le prénom ne doit pas dépasser 50 caractères.");
|
||||
|
||||
RuleFor(x => x.TelephoneFixe)
|
||||
.NotEmpty().WithMessage("Le téléphone fixe est requis.")
|
||||
.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.")
|
||||
.MaximumLength(15).WithMessage("Le téléphone fixe ne doit pas dépasser 15 caractères.");
|
||||
|
||||
RuleFor(x => x.TelephonePortable)
|
||||
.NotEmpty().WithMessage("Le téléphone portable est requis.")
|
||||
.Matches(@"^(\+33|0)[6-7](\d{2}){4}$")
|
||||
.WithMessage("Le numéro de téléphone portable n'est pas valide. Format attendu : +33XXXXXXXXX ou 0XXXXXXXXX.")
|
||||
.MaximumLength(15).WithMessage("Le téléphone portable ne doit pas dépasser 15 caractères.");
|
||||
|
||||
RuleFor(x => x.Email)
|
||||
.NotEmpty().WithMessage("L'email est requis.")
|
||||
.EmailAddress().WithMessage("L'email n'est pas valide.")
|
||||
.MaximumLength(50).WithMessage("L'email ne doit pas dépasser 50 caractères.");
|
||||
|
||||
RuleFor(x => x.IdSite)
|
||||
.NotEmpty().WithMessage("L'ID du site est requis.");
|
||||
|
||||
RuleFor(x => x.IdService)
|
||||
.NotEmpty().WithMessage("L'ID du service est requis.");
|
||||
}
|
||||
}
|
||||
43
ldap-cesi/Validator/Salarie/SalarieUpdateValidator.cs
Normal file
43
ldap-cesi/Validator/Salarie/SalarieUpdateValidator.cs
Normal file
@@ -0,0 +1,43 @@
|
||||
using FluentValidation;
|
||||
using ldap_cesi.DTOs.Inputs.Service;
|
||||
|
||||
namespace ldap_cesi.Validator.Salarie;
|
||||
|
||||
public class SalarieUpdateValidator : AbstractValidator<SalarieUpdateDto>
|
||||
{
|
||||
public SalarieUpdateValidator()
|
||||
{
|
||||
RuleFor(x => x.Id)
|
||||
.NotEmpty().WithMessage("L'identifiant du salarié est requis.");
|
||||
RuleFor(x => x.Nom)
|
||||
.NotEmpty().WithMessage("Le nom est requis.")
|
||||
.MaximumLength(50).WithMessage("Le nom ne doit pas dépasser 50 caractères.");
|
||||
|
||||
RuleFor(x => x.Prenom)
|
||||
.NotEmpty().WithMessage("Le prénom est requis.")
|
||||
.MaximumLength(50).WithMessage("Le prénom ne doit pas dépasser 50 caractères.");
|
||||
|
||||
RuleFor(x => x.TelephoneFixe)
|
||||
.NotEmpty().WithMessage("Le téléphone fixe est requis.")
|
||||
.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.")
|
||||
.MaximumLength(15).WithMessage("Le téléphone fixe ne doit pas dépasser 15 caractères.");
|
||||
|
||||
RuleFor(x => x.TelephonePortable)
|
||||
.NotEmpty().WithMessage("Le téléphone portable est requis.")
|
||||
.Matches(@"^(\+33|0)[6-7](\d{2}){4}$")
|
||||
.WithMessage("Le numéro de téléphone portable n'est pas valide. Format attendu : +33XXXXXXXXX ou 0XXXXXXXXX.")
|
||||
.MaximumLength(15).WithMessage("Le téléphone portable ne doit pas dépasser 15 caractères.");
|
||||
|
||||
RuleFor(x => x.Email)
|
||||
.NotEmpty().WithMessage("L'email est requis.")
|
||||
.EmailAddress().WithMessage("L'email n'est pas valide.")
|
||||
.MaximumLength(50).WithMessage("L'email ne doit pas dépasser 50 caractères.");
|
||||
|
||||
RuleFor(x => x.IdSite)
|
||||
.NotEmpty().WithMessage("L'ID du site est requis.");
|
||||
|
||||
RuleFor(x => x.IdService)
|
||||
.NotEmpty().WithMessage("L'ID du service est requis.");
|
||||
}
|
||||
}
|
||||
14
ldap-cesi/Validator/Service/ServiceCreateValidator.cs
Normal file
14
ldap-cesi/Validator/Service/ServiceCreateValidator.cs
Normal file
@@ -0,0 +1,14 @@
|
||||
using FluentValidation;
|
||||
using ldap_cesi.DTOs.Inputs.Service;
|
||||
|
||||
namespace ldap_cesi.Validator.Service;
|
||||
|
||||
public class ServiceCreateValidator : AbstractValidator<ServiceCreateDto>
|
||||
{
|
||||
public ServiceCreateValidator()
|
||||
{
|
||||
RuleFor(x => x.Nom)
|
||||
.NotEmpty().WithMessage("Le nom est requis.")
|
||||
.MaximumLength(50).WithMessage("Le nom ne doit pas dépasser 50 caractères.");
|
||||
}
|
||||
}
|
||||
18
ldap-cesi/Validator/Service/ServiceUpdateValidator.cs
Normal file
18
ldap-cesi/Validator/Service/ServiceUpdateValidator.cs
Normal file
@@ -0,0 +1,18 @@
|
||||
using FluentValidation;
|
||||
using ldap_cesi.DTOs.Inputs.Service;
|
||||
|
||||
namespace ldap_cesi.Validator.Service;
|
||||
|
||||
public class ServiceUpdateValidator : AbstractValidator<ServiceUpdateDto>
|
||||
{
|
||||
public ServiceUpdateValidator()
|
||||
{
|
||||
RuleFor(x => x.Nom)
|
||||
.NotEmpty().WithMessage("Le nom est requis.")
|
||||
.MaximumLength(50).WithMessage("Le nom ne doit pas dépasser 50 caractères.");
|
||||
RuleFor(x => x.Id)
|
||||
.NotEmpty().WithMessage("L'identifiant du service est requis.");
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
14
ldap-cesi/Validator/Site/SiteCreateValidator.cs
Normal file
14
ldap-cesi/Validator/Site/SiteCreateValidator.cs
Normal file
@@ -0,0 +1,14 @@
|
||||
using FluentValidation;
|
||||
using ldap_cesi.DTOs.Inputs.Site;
|
||||
|
||||
namespace ldap_cesi.Validator.Site;
|
||||
|
||||
public class SiteCreateValidator : AbstractValidator<SiteCreateDto>
|
||||
{
|
||||
public SiteCreateValidator()
|
||||
{
|
||||
RuleFor(x => x.Ville)
|
||||
.NotEmpty().WithMessage("Le nom est requis.")
|
||||
.MaximumLength(150).WithMessage("Le nom de la ville ne doit pas dépasser 150 caractères.");
|
||||
}
|
||||
}
|
||||
16
ldap-cesi/Validator/Site/SiteUpdateValidator.cs
Normal file
16
ldap-cesi/Validator/Site/SiteUpdateValidator.cs
Normal file
@@ -0,0 +1,16 @@
|
||||
using FluentValidation;
|
||||
using ldap_cesi.DTOs.Inputs.Site;
|
||||
|
||||
namespace ldap_cesi.Validator.Site;
|
||||
|
||||
public class SiteUpdateValidator : AbstractValidator<SiteUpdateDto>
|
||||
{
|
||||
public SiteUpdateValidator()
|
||||
{
|
||||
RuleFor(x => x.Ville)
|
||||
.NotEmpty().WithMessage("Le nom est requis.")
|
||||
.MaximumLength(150).WithMessage("Le nom de la ville ne doit pas dépasser 150 caractères.");
|
||||
RuleFor(x => x.Id)
|
||||
.NotEmpty().WithMessage("L'identifiant du site est requis.");
|
||||
}
|
||||
}
|
||||
20
ldap-cesi/Validator/Utilisateur/UtilisateurLoginValidator.cs
Normal file
20
ldap-cesi/Validator/Utilisateur/UtilisateurLoginValidator.cs
Normal file
@@ -0,0 +1,20 @@
|
||||
using FluentValidation;
|
||||
using ldap_cesi.DTOs.Inputs;
|
||||
|
||||
namespace ldap_cesi.Validator.Utilisateur;
|
||||
|
||||
public class UtilisateurLoginValidator : AbstractValidator<UtilisateurLoginDto>
|
||||
{
|
||||
public UtilisateurLoginValidator()
|
||||
{
|
||||
RuleFor(x => x.Email)
|
||||
.NotEmpty().WithMessage("L'email est requis.")
|
||||
.EmailAddress().WithMessage("L'email n'est pas valide.")
|
||||
.MaximumLength(50).WithMessage("L'email ne doit pas dépasser 50 caractères.");
|
||||
|
||||
RuleFor(x => x.MotDePasse)
|
||||
.NotEmpty().WithMessage("Le mot de passe est requis.")
|
||||
.MinimumLength(6).WithMessage("Le mot de passe doit contenir au moins 6 caractères.")
|
||||
.MaximumLength(20).WithMessage("Le mot de passe ne doit pas dépasser 20 caractères.");
|
||||
}
|
||||
}
|
||||
@@ -5,14 +5,18 @@
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<RootNamespace>ldap_cesi</RootNamespace>
|
||||
<NoWarn>CS0472,CS1591,CS1587</NoWarn>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
</PropertyGroup>
|
||||
|
||||
<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" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.2"/>
|
||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.2" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.2" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.2">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
@@ -29,7 +33,6 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Entities\" />
|
||||
<Folder Include="Migrations\" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user