- Api v1.0 #20
@ -25,16 +25,24 @@ 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()
|
||||
}
|
||||
|
||||
|
||||
[HttpGet("search")]
|
||||
[Authorize(Roles = "admin")]
|
||||
public async Task<IActionResult> SearchSalaries(
|
||||
[FromQuery] string searchTerm,
|
||||
[FromQuery] int pageNumber = 1,
|
||||
[FromQuery] int pageSize = 10)
|
||||
{
|
||||
var result = await _salarieService.GetAllWithoutIService();
|
||||
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.Data) : BadRequest(result.Message);
|
||||
}
|
||||
|
||||
@ -54,11 +62,11 @@ public class SalarieController : ControllerBase
|
||||
/// 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.</returns>
|
||||
/// <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.GetCompletById(id);
|
||||
var result = await _salarieService.GetByIdWithRelations(id,s => s.IdServiceNavigation, s => s.IdSiteNavigation);
|
||||
return result.Success ? Ok(result.Data) : BadRequest(result.Message);
|
||||
}
|
||||
|
||||
@ -135,18 +143,5 @@ public class SalarieController : ControllerBase
|
||||
var result = await _salarieService.GetSalariesByService(serviceId);
|
||||
return result.Success ? Ok(result.Data) : NotFound(result.Message);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Endpoint qui met à jour partiellement un salarié.
|
||||
/// </summary>
|
||||
/// <param name="id">L'ID du salarié.</param>
|
||||
/// <param name="salariePatch">Les informations du salarié à mettre à jour partiellement.</param>
|
||||
/// <returns>Le salarié mis à jour partiellement.</returns>
|
||||
// [HttpPatch("{id}")]
|
||||
// [Authorize(Roles = "admin")]
|
||||
// public async Task<IActionResult> PatchSalarie(int id, [FromBody] SalariePatchDto salariePatch)
|
||||
// {
|
||||
// var result = await _salarieService.Patch(id, salariePatch);
|
||||
// return result.Success ? Ok(result.Data) : BadRequest(result.Message);
|
||||
// }
|
||||
|
||||
}
|
||||
|
@ -1,6 +0,0 @@
|
||||
namespace ldap_cesi.Models;
|
||||
|
||||
public interface IEntity
|
||||
{
|
||||
int Id { get; set; }
|
||||
}
|
21
ldap-cesi/Models/PaginatedList.cs
Normal file
21
ldap-cesi/Models/PaginatedList.cs
Normal file
@ -0,0 +1,21 @@
|
||||
namespace ldap_cesi.Models;
|
||||
|
||||
public class PaginatedList<T>
|
||||
{
|
||||
public List<T> Datas { get; }
|
||||
public int TotalCount { get; }
|
||||
public int PageNumber { get; }
|
||||
public int PageSize { get; }
|
||||
public int TotalPages => (int)Math.Ceiling(TotalCount / (double)PageSize);
|
||||
|
||||
public PaginatedList(List<T> donnees, int totalCount, int pageNumber, int pageSize)
|
||||
{
|
||||
Datas = donnees;
|
||||
TotalCount = totalCount;
|
||||
PageNumber = pageNumber;
|
||||
PageSize = pageSize;
|
||||
}
|
||||
|
||||
public bool HasPreviousPage => PageNumber > 1;
|
||||
public bool HasNextPage => PageNumber < TotalPages;
|
||||
}
|
@ -1,4 +1,6 @@
|
||||
using ldap_cesi.Configurations;
|
||||
using ldap_cesi.Context;
|
||||
using ldap_cesi.Seeders;
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
builder.BuildConf();
|
||||
@ -21,6 +23,18 @@ 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.UseAuthentication();
|
||||
|
@ -12,6 +12,12 @@ public interface IRepositoryBase<TEntity> where TEntity : class
|
||||
Task<bool> DeleteAsync(TEntity entity, CancellationToken cancellationToken = default);
|
||||
Task<TEntity> GetWithRelationsAsync(int id, params Expression<Func<TEntity, object>>[] relationsAInclude);
|
||||
Task<List<TEntity>> GetAllWithRelationsAsync(params Expression<Func<TEntity, object>>[] relationsAInclude);
|
||||
|
||||
Task<List<TEntity>> SearchAsync(Expression<Func<TEntity, bool>> predicate, int numPage, int taillePage,
|
||||
params Expression<Func<TEntity, object>>[] relationsAInclude);
|
||||
|
||||
Task<TEntity?> FirstOrDefaultAsync(Expression<Func<TEntity, bool>> predicate,
|
||||
CancellationToken cancellationToken = default);
|
||||
|
||||
Task<int> CountAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default);
|
||||
}
|
@ -137,5 +137,28 @@ public class RepositoryBase<TEntity> : IRepositoryBase<TEntity> where TEntity :
|
||||
|
||||
return await query.FirstOrDefaultAsync(e => EF.Property<int>(e, "Id") == id);
|
||||
}
|
||||
|
||||
public virtual async Task<List<TEntity>> SearchAsync(Expression<Func<TEntity, bool>> predicate, int numPage, int taillePage, params Expression<Func<TEntity, object>>[] relationsAInclude)
|
||||
{
|
||||
IQueryable<TEntity> query = _dbSet;
|
||||
|
||||
foreach (var relationInclue in relationsAInclude)
|
||||
{
|
||||
query = query.Include(relationInclue);
|
||||
}
|
||||
|
||||
query = query.Where(predicate);
|
||||
|
||||
return await query
|
||||
.Skip((numPage - 1) * taillePage)
|
||||
.Take(taillePage)
|
||||
.ToListAsync();
|
||||
}
|
||||
|
||||
public virtual async Task<int> CountAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default)
|
||||
{
|
||||
return await _dbSet.CountAsync(predicate, cancellationToken);
|
||||
}
|
||||
|
||||
|
||||
}
|
49
ldap-cesi/Seeders/Seeders.cs
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();
|
||||
}
|
||||
}
|
@ -13,6 +13,9 @@ public interface IServiceBase<T, TDto, TCreateDto, TUpdateDto>
|
||||
Task<IResponseDataModel<T>> GetById(int id);
|
||||
Task<IResponseDataModel<TDto>> GetByIdWithRelations(int id, params Expression<Func<T, object>>[] relationsAInclures); // préciser avec une ou des fonctions lambda les relations à inclure dans la réponse
|
||||
Task<IResponseDataModel<List<TDto>>> GetAllWithRelationsAsync(params Expression<Func<T, object>>[] relationsAInclure);
|
||||
|
||||
Task<IResponseDataModel<PaginatedList<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);
|
||||
|
@ -10,6 +10,7 @@ using System.Collections.Generic;
|
||||
using System.Linq.Expressions;
|
||||
using System.Threading.Tasks;
|
||||
using FluentValidation;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace ldap_cesi.Services;
|
||||
|
||||
@ -34,6 +35,12 @@ public class ServiceBase<T, TDto, TCreateDto, TUpdateDto> : IServiceBase<T, TDto
|
||||
_updateDtoValidator = updateDtoValidator;
|
||||
}
|
||||
|
||||
private Expression<Func<T, bool>> BuildSearchPredicate(string inputSearch)
|
||||
{
|
||||
return entity =>
|
||||
EF.Functions.ILike(EF.Property<string>(entity, "Nom"), $"%{inputSearch}%") ||
|
||||
EF.Functions.ILike(EF.Property<string>(entity, "Prenom"), $"%{inputSearch}%");
|
||||
}
|
||||
public virtual async Task<IResponseDataModel<List<T>>> GetAll()
|
||||
{
|
||||
try
|
||||
@ -263,4 +270,46 @@ public class ServiceBase<T, TDto, TCreateDto, TUpdateDto> : IServiceBase<T, TDto
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public virtual async Task<IResponseDataModel<PaginatedList<TDto>>> SearchWithRelations(string searchTerm, int pageNumber, int pageSize, params Expression<Func<T, object>>[] includeProperties)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(searchTerm) || searchTerm.Length < 2)
|
||||
{
|
||||
return new ResponseDataModel<PaginatedList<TDto>>
|
||||
{
|
||||
Success = false,
|
||||
Message = "Le terme de recherche doit contenir au moins deux caractères.",
|
||||
StatusCode = 400
|
||||
};
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
var predicate = BuildSearchPredicate(searchTerm);
|
||||
var entities = await _repository.SearchAsync(predicate, pageNumber, pageSize, includeProperties);
|
||||
var dtos = _mapper.Map<List<TDto>>(entities);
|
||||
var totalCount = await _repository.CountAsync(predicate);
|
||||
|
||||
var paginatedList = new PaginatedList<TDto>(dtos, totalCount, pageNumber, pageSize);
|
||||
|
||||
return new ResponseDataModel<PaginatedList<TDto>>
|
||||
{
|
||||
Success = true,
|
||||
Data = paginatedList,
|
||||
StatusCode = 200,
|
||||
Message = "Recherche effectuée avec succès."
|
||||
};
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Une erreur s'est produite lors de la recherche des entités.");
|
||||
return new ResponseDataModel<PaginatedList<TDto>>
|
||||
{
|
||||
Success = false,
|
||||
Message = "Une erreur s'est produite lors de la recherche des entités.",
|
||||
StatusCode = 500
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
}
|
@ -12,6 +12,7 @@
|
||||
<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" />
|
||||
|
Loading…
x
Reference in New Issue
Block a user