- Api v1.0 #20

Merged
Yoann merged 26 commits from dev into main 2025-03-16 20:22:36 +01:00
12 changed files with 309 additions and 278 deletions
Showing only changes of commit fe91908098 - Show all commits

View File

@ -42,7 +42,7 @@ public static class Conf
public static void AddServices(this WebApplicationBuilder builder)
{
builder.Services.AddScoped<IServiceService, ServiceService >();
// builder.Services.AddScoped<IRoleService, RoleService>();
builder.Services.AddScoped<IRoleService, RoleService>();
builder.Services.AddScoped<ISiteService, SiteService>();
builder.Services.AddScoped<ISalarieService, SalarieService>();
builder.Services.AddScoped<IUtilisateurService, UtilisateurService>();

View File

@ -16,7 +16,7 @@ public class SalarieController : ControllerBase
_salarieService = salarieService;
}
/// <summary>
/// <summary>
/// Endpoint qui retourne tous les salariés.
/// </summary>
/// <returns>Une liste de salariés.</returns>
@ -25,6 +25,17 @@ public class SalarieController : ControllerBase
{
var result = await _salarieService.GetAll();
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
/// <summary>
/// Endpoint qui retourne tous les salariés.
/// </summary>
/// <returns>Une liste de salariés.</returns>
[HttpGet("/complete")]
public async Task<IActionResult> GetAllSalariesComplet()
{
var result = await _salarieService.GetAllWithoutIService();
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
/// <summary>
@ -33,7 +44,7 @@ public class SalarieController : ControllerBase
/// <param name="id">L'ID du salarié.</param>
/// <returns>Le salarié correspondant à l'ID.</returns>
[HttpGet("{id}")]
public async Task<IActionResult> GetSalarieById(int id)
public async Task<IActionResult> GetById(int id)
{
var result = await _salarieService.GetById(id);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
@ -45,6 +56,7 @@ public class SalarieController : ControllerBase
/// <param name="id">L'ID du salarié.</param>
/// <returns>Le salarié correspondant à l'ID.</returns>
[HttpGet("/complet/{id}")]
[Authorize(Roles = "admin")]
public async Task<IActionResult> GetSalarieCompletById(int id)
{
var result = await _salarieService.GetCompletById(id);

View File

@ -21,7 +21,6 @@ public class ServicesController : ControllerBase
/// </summary>
/// <returns>Retourne tous les services.</returns>
[HttpGet]
[Authorize(Roles = "admin")]
public async Task<IActionResult> GetServices()
{
var result = await _serviceService.GetAll();
@ -34,7 +33,6 @@ public class ServicesController : ControllerBase
/// <param name="id">L'ID du service.</param>
/// <returns>Le service correspondant à l'ID.</returns>
[HttpGet("{id}")]
[Authorize(Roles = "admin")]
public async Task<IActionResult> GetServiceById(int id)
{
var result = await _serviceService.GetById(id);
@ -50,7 +48,7 @@ public class ServicesController : ControllerBase
[Authorize(Roles = "admin")]
public async Task<IActionResult> CreateService([FromBody] ServiceCreateDto serviceInputDto)
{
var result = await _serviceService.CreateService(serviceInputDto);
var result = await _serviceService.Create(serviceInputDto);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
@ -63,7 +61,7 @@ public class ServicesController : ControllerBase
[Authorize(Roles = "admin")]
public async Task<IActionResult> UpdateService([FromBody] ServiceUpdateDto serviceUpdateDto)
{
var result = await _serviceService.UpdateService(serviceUpdateDto);
var result = await _serviceService.Update(serviceUpdateDto);
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
}
@ -76,7 +74,7 @@ public class ServicesController : ControllerBase
[Authorize(Roles = "admin")]
public async Task<IActionResult> DeleteService(int id)
{
var result = await _serviceService.DeleteService(id);
var result = await _serviceService.Delete(id);
return result.Success ? Ok(result.Message) : BadRequest(result.Message);
}
}

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

View File

@ -1,6 +1,13 @@
namespace ldap_cesi.Services.Interfaces;
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;
public interface IRoleService
namespace ldap_cesi.Services.Interfaces
{
public interface IRoleService : IServiceBase<Role, RoleDto, RoleCreateDto, RoleUpdateDto>
{
}
}

View File

@ -1,3 +1,4 @@
using ldap_cesi.DTOs;
using ldap_cesi.DTOs.Inputs.Salarie;
using ldap_cesi.DTOs.Inputs.Service;
using ldap_cesi.DTOs.Outputs.Salarie;
@ -6,14 +7,10 @@ using ldap_cesi.Models;
namespace ldap_cesi.Services.Interfaces;
public interface ISalarieService
public interface ISalarieService : IServiceBase<Salarie, SalarieDto, SalarieCreateDto, SalarieUpdateDto>
{
Task<IResponseDataModel<List<Salarie>>> GetAll();
Task<IResponseDataModel<Salarie>> GetById(int id);
Task<IResponseDataModel<List<Salarie>>> GetAllWithoutIService();
Task<IResponseDataModel<List<SalarieListDto>>> GetSalariesBySite(int siteId);
Task<IResponseDataModel<List<SalarieListDto>>> GetSalariesByService(int serviceId);
Task<IResponseDataModel<string>> Create(SalarieCreateDto salarieInput);
Task<IResponseDataModel<Salarie>> Update(SalarieUpdateDto salarieInput);
Task<IResponseDataModel<string>> Delete(int id);
Task<IResponseDataModel<SalarieOutputDetail>> GetCompletById(int id);
}

View File

@ -1,14 +1,11 @@
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);
Task<IResponseDataModel<Service>> UpdateService(ServiceUpdateDto serviceUpdateDto);
Task<IResponseDataModel<string>> DeleteService(int id);
}
public interface IServiceService : IServiceBase<Service, ServiceDto, ServiceCreateDto, ServiceUpdateDto>
{
}
}

View File

@ -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,7 +74,7 @@ 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;
}
}
@ -100,14 +100,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 +119,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;
}
}

View File

@ -1,15 +1,16 @@
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;
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)
: base(repositoryRole, mapper, logger)
{
_repositoryRole = repositoryRole;
}
}

View File

@ -1,4 +1,5 @@
using AutoMapper;
using ldap_cesi.DTOs;
using ldap_cesi.DTOs.Inputs.Salarie;
using ldap_cesi.DTOs.Inputs.Service;
using ldap_cesi.DTOs.Outputs.Salarie;
@ -10,14 +11,14 @@ using ldap_cesi.Validator.Salarie;
namespace ldap_cesi.Services;
public class SalarieService : ISalarieService
public class SalarieService : ServiceBase<Salarie, SalarieDto, SalarieCreateDto, SalarieUpdateDto>, ISalarieService
{
private IRepositorySalarie _repositorySalarie;
private readonly IRepositorySite _repositorySite;
private readonly IRepositoryService _repositoryService;
private readonly IMapper _mapper;
public SalarieService(IRepositorySalarie repositorySalarie, IMapper mapper, IRepositorySite repositorySite, IRepositoryService repositoryService)
public SalarieService(IRepositorySalarie repositorySalarie, IMapper mapper, IRepositorySite repositorySite, IRepositoryService repositoryService, ILogger<SalarieService> logger) : base(repositorySalarie, mapper, logger)
{
_repositorySalarie = repositorySalarie;
_repositorySite = repositorySite;
@ -25,7 +26,7 @@ public class SalarieService : ISalarieService
_mapper = mapper;
}
public async Task<IResponseDataModel<List<Salarie>>> GetAll()
public async Task<IResponseDataModel<List<Salarie>>> GetAllWithoutIService()
{
var salaries = await _repositorySalarie.GetAllAsync();
return new ResponseDataModel<List<Salarie>>
@ -36,16 +37,16 @@ public class SalarieService : ISalarieService
};
}
public async Task<IResponseDataModel<Salarie>> GetById(int id)
{
var salarie = await _repositorySalarie.GetSalarieWithRelationsAsync(id);
return new ResponseDataModel<Salarie>
{
Success = true,
Data = salarie,
StatusCode = 200,
};
}
// public async Task<IResponseDataModel<Salarie>> GetById(int id)
// {
// var salarie = await _repositorySalarie.GetSalarieWithRelationsAsync(id);
// return new ResponseDataModel<Salarie>
// {
// Success = true,
// Data = salarie,
// StatusCode = 200,
// };
// }
public async Task<IResponseDataModel<SalarieOutputDetail>> GetCompletById(int id)
{
@ -131,109 +132,109 @@ public class SalarieService : ISalarieService
};
}
public async Task<IResponseDataModel<string>> Create(SalarieCreateDto salarieInput)
{
var validation = new SalarieCreateValidator();
var result = validation.Validate(salarieInput);
if (!result.IsValid)
{
return new ResponseDataModel<string>
{
StatusCode = 400,
Success = false,
Message = "Données salariées invalides: " + string.Join(", ", result.Errors)
};
}
var service = _mapper.Map<Salarie>(salarieInput);
var response = await _repositorySalarie.AddAsync(service);
return new ResponseDataModel<string>
{
StatusCode = 201,
Success = true,
Data = response.Id.ToString(),
};
}
// public async Task<IResponseDataModel<string>> Create(SalarieCreateDto salarieInput)
// {
// var validation = new SalarieCreateValidator();
// var result = validation.Validate(salarieInput);
// if (!result.IsValid)
// {
// return new ResponseDataModel<string>
// {
// StatusCode = 400,
// Success = false,
// Message = "Données salariées invalides: " + string.Join(", ", result.Errors)
// };
// }
// var service = _mapper.Map<Salarie>(salarieInput);
// var response = await _repositorySalarie.AddAsync(service);
// return new ResponseDataModel<string>
// {
// StatusCode = 201,
// Success = true,
// Data = response.Id.ToString(),
// };
// }
public async Task<IResponseDataModel<Salarie>> Update(SalarieUpdateDto salarieInput)
{
var validation = new SalarieUpdateValidator();
var result = validation.Validate(salarieInput);
if (!result.IsValid)
{
return new ResponseDataModel<Salarie>
{
StatusCode = 400,
Success = false,
Message = "Données salariées invalides: " + string.Join(", ", result.Errors)
};
}
// public async Task<IResponseDataModel<Salarie>> Update(SalarieUpdateDto salarieInput)
// {
// var validation = new SalarieUpdateValidator();
// var result = validation.Validate(salarieInput);
// if (!result.IsValid)
// {
// return new ResponseDataModel<Salarie>
// {
// StatusCode = 400,
// Success = false,
// Message = "Données salariées invalides: " + string.Join(", ", result.Errors)
// };
// }
var salarieFind = await _repositorySalarie.GetByIdAsync(salarieInput.Id);
if (salarieFind == null)
{
return new ResponseDataModel<Salarie>
{
Success = false,
Message = "Salarié introuvable.",
StatusCode = 404
};
}
// var salarieFind = await _repositorySalarie.GetByIdAsync(salarieInput.Id);
// if (salarieFind == null)
// {
// return new ResponseDataModel<Salarie>
// {
// Success = false,
// Message = "Salarié introuvable.",
// StatusCode = 404
// };
// }
var salarie = _mapper.Map(salarieInput, salarieFind);
var response = await _repositorySalarie.UpdateAsync(salarie);
if (!response)
{
return new ResponseDataModel<Salarie>
{
StatusCode = 500,
Success = false,
Message = "Erreur lors de la mise à jour du salarié : " + string.Join(", ", result.Errors)
};
}
return new ResponseDataModel<Salarie>
{
StatusCode = 200,
Success = true,
Data = salarie,
};
}
// var salarie = _mapper.Map(salarieInput, salarieFind);
// var response = await _repositorySalarie.UpdateAsync(salarie);
// if (!response)
// {
// return new ResponseDataModel<Salarie>
// {
// StatusCode = 500,
// Success = false,
// Message = "Erreur lors de la mise à jour du salarié : " + string.Join(", ", result.Errors)
// };
// }
// return new ResponseDataModel<Salarie>
// {
// StatusCode = 200,
// Success = true,
// Data = salarie,
// };
// }
public async Task<IResponseDataModel<string>> Delete(int id)
{
if (id == null)
{
return new ResponseDataModel<string>
{
StatusCode = 400,
Success = false,
Message = "Id manquant"
};
}
var salarie = await _repositorySalarie.GetByIdAsync(id);
if (salarie == null)
{
return new ResponseDataModel<string>
{
Success = false,
Message = "Salarié introuvable.",
StatusCode = 404
};
}
var response = await _repositorySalarie.DeleteAsync(salarie);
if (!response)
{
return new ResponseDataModel<string>
{
StatusCode = 500,
Success = false,
Message = "Erreur durant la suppression du service"
};
}
return new ResponseDataModel<string>
{
StatusCode = 200,
Success = true,
Data = salarie.Id.ToString(),
};
}
// public async Task<IResponseDataModel<string>> Delete(int id)
// {
// if (id == null)
// {
// return new ResponseDataModel<string>
// {
// StatusCode = 400,
// Success = false,
// Message = "Id manquant"
// };
// }
// var salarie = await _repositorySalarie.GetByIdAsync(id);
// if (salarie == null)
// {
// return new ResponseDataModel<string>
// {
// Success = false,
// Message = "Salarié introuvable.",
// StatusCode = 404
// };
// }
// var response = await _repositorySalarie.DeleteAsync(salarie);
// if (!response)
// {
// return new ResponseDataModel<string>
// {
// StatusCode = 500,
// Success = false,
// Message = "Erreur durant la suppression du service"
// };
// }
// return new ResponseDataModel<string>
// {
// StatusCode = 200,
// Success = true,
// Data = salarie.Id.ToString(),
// };
// }
}

View File

@ -5,146 +5,144 @@ 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) : base(repositoryService, mapper, logger)
{
_repositoryService = repositoryService;
_mapper = mapper;
}
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 validation = new ServiceCreateValidator();
// var result = validation.Validate(serviceCreateDto);
// if (!result.IsValid)
// {
// return new ResponseDataModel<string>
// {
// StatusCode = 400,
// Success = false,
// Message = "Données du service invalides: " + string.Join(", ", result.Errors)
// };
// }
// var service = _mapper.Map<Service>(serviceCreateDto);
// var response = await _repositoryService.AddAsync(service);
// return new ResponseDataModel<string>
// {
// StatusCode = 201,
// Success = true,
// Data = response.Id.ToString(),
// };
// }
public async Task<IResponseDataModel<Service>> UpdateService(ServiceUpdateDto serviceUpdateDto)
{
var validation = new ServiceUpdateValidator();
var result = validation.Validate(serviceUpdateDto);
if (!result.IsValid)
{
return new ResponseDataModel<Service>
{
StatusCode = 400,
Success = false,
Message = "Données du service invalides: " + string.Join(", ", result.Errors)
};
}
var serviceFind = await _repositoryService.GetByIdAsync(serviceUpdateDto.Id);
if (serviceFind is null)
{
return new ResponseDataModel<Service>
{
Success = false,
Message = "Service introuvable.",
StatusCode = 404
};
}
// 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,
};
}
// 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"
};
}
// 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(),
};
}
// 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(),
// };
// }
}

View File

@ -5,6 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>ldap_cesi</RootNamespace>
<NoWarn>CS0472,CS1591,CS1587</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>