Refactor all code

PyroFetes/DTO/DeliveryNote/Request/CreateDeliveryNoteDto.cs

@@ -5,8 +5,8 @@ public class CreateDeliveryNoteDto
     public string? TrackingNumber { get; set; }
     public DateOnly EstimateDeliveryDate { get; set; }
     public DateOnly ExpeditionDate { get; set; }
-    
+
     public int DelivererId { get; set; }
-    
-    public Dictionary<int,int>? ProductQuantities { get; set; }
+
+    public Dictionary<int, int>? ProductQuantities { get; set; }
 }

PyroFetes/DTO/Price/Request/CreatePriceDto.cs

@@ -3,25 +3,6 @@
 public class CreatePriceDto
 {
     public decimal SellingPrice { get; set; }
-    
     public int? SupplierId { get; set; }
-    public string? SupplierName { get; set; }
-    public string? SupplierEmail { get; set; }
-    public string? SupplierPhone { get; set; }
-    public string? SupplierAddress { get; set; }
-    public string? SupplierZipCode { get; set; }
-    public string? SupplierCity { get; set; }
-    public int SupplierDeliveryDelay { get; set; }
-    
-    public int? ProductId { get; set; }
-    public string? ProductReferences { get; set; }
-    public string? ProductName { get; set; }
-    public decimal ProductDuration {get; set;} 
-    public int ProductCaliber { get; set; }
-    public string? ProductApprovalNumber { get; set; }
-    public decimal ProductWeight { get; set; }
-    public decimal ProductNec { get; set; }
-    public string? ProductImage { get; set; }
-    public string? ProductLink { get; set; }
-    public int ProductMinimalQuantity { get; set; }
+    public int ProductId { get; set; }
 }

PyroFetes/DTO/Price/Request/UpdatePriceDto.cs

@@ -1,28 +0,0 @@
-namespace PyroFetes.DTO.Price.Request;
-
-public class UpdatePriceDto
-{
-    public int Id { get; set; }
-    public decimal SellingPrice { get; set; }
-    
-    public int SupplierId { get; set; }
-    public string? SupplierName { get; set; }
-    public string? SupplierEmail { get; set; }
-    public string? SupplierPhone { get; set; }
-    public string? SupplierAddress { get; set; }
-    public int SupplierZipCode { get; set; }
-    public string? SupplierCity { get; set; }
-    public int SupplierDeliveryDelay { get; set; }
-    
-    public int ProductId { get; set; }
-    public string? ProductReferences { get; set; }
-    public string? ProductName { get; set; }
-    public decimal ProductDuration {get; set;} 
-    public decimal ProductCaliber { get; set; }
-    public int ProductApprovalNumber { get; set; }
-    public decimal ProductWeight { get; set; }
-    public decimal ProductNec { get; set; }
-    public string? ProductImage { get; set; }
-    public string? ProductLink { get; set; }
-    public int ProductMinimalQuantity { get; set; }
-}

PyroFetes/DTO/Price/Response/GetPriceDto.cs

@@ -2,18 +2,8 @@
 
 public class GetPriceDto
 {
-    public int Id { get; set; }
     public decimal SellingPrice { get; set; }
     
-    public int SupplierId { get; set; }
-    public string? SupplierName { get; set; }
-    public string? SupplierEmail { get; set; }
-    public string? SupplierPhone { get; set; }
-    public string? SupplierAddress { get; set; }
-    public string? SupplierZipCode { get; set; }
-    public string? SupplierCity { get; set; }
-    public int SupplierDeliveryDelay { get; set; }
-    
     public int ProductId { get; set; }
     public string? ProductReference { get; set; }
     public string? ProductName { get; set; }

PyroFetes/DTO/Product/Request/CreateProductDto.cs

@@ -1,15 +0,0 @@
-namespace PyroFetes.DTO.Product.Request;
-
-public class CreateProductDto
-{
-    public string? References { get; set; }
-    public string? Name { get; set; }
-    public decimal Duration {get; set;} 
-    public int Caliber { get; set; }
-    public string? ApprovalNumber { get; set; }
-    public decimal Weight { get; set; }
-    public decimal Nec { get; set; }
-    public string? Image { get; set; }
-    public string? Link { get; set; }
-    public int MinimalQuantity { get; set; }
-}

PyroFetes/DTO/ProductDelivery/Request/CreateProductDeliveryDto.cs

@@ -1,8 +0,0 @@
-namespace PyroFetes.DTO.ProductDelivery.Request;
-
-public class CreateProductDeliveryDto
-{
-    public int ProductId { get; set; }
-    public int DeliveryNoteId { get; set; }
-    public int Quantity { get; set; }
-}

PyroFetes/DTO/ProductDelivery/Request/UpdateProductDeliveryDto.cs

@@ -1,8 +0,0 @@
-namespace PyroFetes.DTO.ProductDelivery.Request;
-
-public class UpdateProductDeliveryDto
-{
-    public int Quantity { get; set; }
-    public int ProductId { get; set; }
-    public int DeliveryNoteId { get; set; }
-}

PyroFetes/DTO/ProductDelivery/Response/GetProductDeliveryDto.cs

@@ -14,15 +14,5 @@ public class GetProductDeliveryDto
     public string? ProductLink { get; set; }
     public int ProductMinimalQuantity { get; set; }
     
-    public int DeliveryNoteId { get; set; }
-    public string? DeliveryNoteTrackingNumber { get; set; }
-    public DateOnly DeliveryNoteEstimateDeliveryDate { get; set; }
-    public DateOnly DeliveryNoteExpeditionDate { get; set; }
-    public DateOnly? DeliveryNoteRealDeliveryDate { get; set; }
-    
-    public int DeliveryNoteDeliverId { get; set; }
-    public string? DeliveryNoteDeliverTransporter { get; set; }
-    
-    
     public int Quantity { get; set; }
 }

PyroFetes/DTO/PurchaseOrder/Response/GetPurchaseOrderDto.cs

@@ -6,5 +6,6 @@ public class GetPurchaseOrderDto
 {
     public int Id { get; set; }
     public string? PurchaseConditions { get; set; }
+    public int SupplierId { get; set; }
     public List<GetPurchaseProductDto>? Products { get; set; }
 }

PyroFetes/DTO/PurchaseProduct/Request/CreatePurchaseProductDto.cs

@@ -5,5 +5,4 @@ public class CreatePurchaseProductDto
     public int Quantity { get; set; } 
     public int ProductId { get; set; }
     public int PurchaseOrderId { get; set; }
-    public string? PurchaseOrderPurchaseConditions { get; set; }
 }

PyroFetes/DTO/PurchaseProduct/Request/UpdatePurchaseProductDto.cs

@@ -1,22 +0,0 @@
-namespace PyroFetes.DTO.PurchaseProduct.Request;
-
-public class UpdatePurchaseProductDto
-{
-    public int ProductId { get; set; }
-    public int PurchaseOrderId { get; set; }
-    
-    public int Quantity { get; set; } 
-    
-    public string? ProductReferences { get; set; }
-    public string? ProductName { get; set; }
-    public decimal ProductDuration {get; set;} 
-    public int ProductCaliber { get; set; }
-    public string? ProductApprovalNumber { get; set; }
-    public decimal ProductWeight { get; set; }
-    public decimal ProductNec { get; set; }
-    public string? ProductImage { get; set; }
-    public string? ProductLink { get; set; }
-    public int ProductMinimalQuantity { get; set; }
-    
-    public string? PurchaseOrderPurchaseConditions { get; set; }
-}

PyroFetes/DTO/PurchaseProduct/Response/GetPurchaseProductDto.cs

@@ -3,7 +3,7 @@ namespace PyroFetes.DTO.PurchaseProduct.Response;
 public class GetPurchaseProductDto
 {
     public int ProductId { get; set; }
-    public string? ProductReferences { get; set; }
+    public string? ProductReference { get; set; }
     public string? ProductName { get; set; }
     public decimal ProductDuration {get; set;} 
     public int ProductCaliber { get; set; }
@@ -15,8 +15,5 @@ public class GetPurchaseProductDto
     public int ProductMinimalQuantity { get; set; }
     public decimal ProductPrice { get; set; }
     
-    public int PurchaseOrderId { get; set; }
-    public string? PurchaseOrderPurchaseConditions { get; set; }
-    
     public int Quantity { get; set; }
 }

PyroFetes/DTO/QuotationProduct/Request/CreateProductQuotationDto.cs

@@ -1,6 +1,5 @@
 namespace PyroFetes.DTO.QuotationProduct.Request;
 
-// Pour création global
 public class CreateProductQuotationDto
 {
     public int ProductId { get; set; }

PyroFetes/DTO/QuotationProduct/Request/CreateQuotationProductDto.cs

@@ -1,22 +1,8 @@
 namespace PyroFetes.DTO.QuotationProduct.Request;
 
-public class CreateQuotationProductDto
+public class AddQuotationProductDto
 {
     public int Quantity { get; set; }
-    
     public int QuotationId { get; set; }
-    public string? QuotationMessage { get; set; }
-    public string? QuotationConditionsSale { get; set; }
-    
     public int ProductId { get; set; }
-    public int ProductReferences { get; set; }
-    public string? ProductName { get; set; }
-    public decimal ProductDuration {get; set;} 
-    public int ProductCaliber { get; set; }
-    public string? ProductApprovalNumber { get; set; }
-    public decimal ProductWeight { get; set; }
-    public decimal ProductNec { get; set; }
-    public string? ProductImage { get; set; }
-    public string? ProductLink { get; set; }
-    public int ProductMinimalQuantity { get; set; }
 }

PyroFetes/DTO/QuotationProduct/Request/UpdateQuotationProductDto.cs

@@ -1,23 +0,0 @@
-namespace PyroFetes.DTO.QuotationProduct.Request;
-
-public class UpdateQuotationProductDto
-{
-    public int Id { get; set; }
-    public int Quantity { get; set; }
-    
-    public int QuotationId { get; set; }
-    public string? QuotationMessage { get; set; }
-    public string? QuotationConditionsSale { get; set; }
-    
-    public int ProductId { get; set; }
-    public int ProductReferences { get; set; }
-    public string? ProductName { get; set; }
-    public decimal ProductDuration {get; set;} 
-    public int ProductCaliber { get; set; }
-    public string? ProductApprovalNumber { get; set; }
-    public decimal ProductWeight { get; set; }
-    public decimal ProductNec { get; set; }
-    public string? ProductImage { get; set; }
-    public string? ProductLink { get; set; }
-    public int ProductMinimalQuantity { get; set; }
-}

PyroFetes/DTO/QuotationProduct/Response/GetQuotationProductDto.cs

@@ -4,12 +4,8 @@ public class GetQuotationProductDto
 {
     public int Quantity { get; set; }
     
-    public int QuotationId { get; set; }
-    public string? QuotationMessage { get; set; }
-    public string? QuotationConditionsSale { get; set; }
-    
     public int ProductId { get; set; }
-    public string? ProductReferences { get; set; }
+    public string? ProductReference { get; set; }
     public string? ProductName { get; set; }
     public decimal ProductDuration {get; set;} 
     public int ProductCaliber { get; set; }

PyroFetes/DTO/SettingDTO/Request/CreateSettingDto.cs

@@ -2,6 +2,6 @@ namespace PyroFetes.DTO.SettingDTO.Request;
 
 public class CreateSettingDto
 {
-    public string? ElectronicSignature { get; set; }
-    public string? Logo { get; set; }
+    public IFormFile? ElectronicSignature { get; set; }
+    public IFormFile? Logo { get; set; }
 }

PyroFetes/DTO/SettingDTO/Request/PatchSettingElectronicSignatureDto.cs

@@ -3,5 +3,5 @@ namespace PyroFetes.DTO.SettingDTO.Request;
 public class PatchSettingElectronicSignatureDto
 {
     public int Id { get; set; }
-    public string? ElectronicSignature { get; set; }
+    public IFormFile? ElectronicSignature { get; set; }
 }

PyroFetes/DTO/SettingDTO/Request/PatchSettingLogoDto.cs

@@ -3,5 +3,5 @@ namespace PyroFetes.DTO.SettingDTO.Request;
 public class PatchSettingLogoDto
 {
     public int Id { get; set; }
-    public string? Logo { get; set; }
+    public IFormFile? Logo { get; set; }
 }

PyroFetes/DTO/Supplier/Response/GetSupplierDto.cs

@@ -1,5 +1,4 @@
 using PyroFetes.DTO.Price.Response;
-using PyroFetes.DTO.Product.Response;
 
 namespace PyroFetes.DTO.Supplier.Response;
 
@@ -13,6 +12,5 @@ public class GetSupplierDto
     public string? ZipCode { get; set; }
     public string? City { get; set; }
     public int DeliveryDelay { get; set; }
-    public List<GetProductDto>? Products { get; set; }
     public List<GetPriceDto>? Prices { get; set; }
 }

PyroFetes/Endpoints/Deliverers/CreateDelivererEndpoint.cs

@@ -6,9 +6,7 @@ using PyroFetes.Repositories;
 
 namespace PyroFetes.Endpoints.Deliverers;
 
-public class CreateDelivererEndpoint(
-    DeliverersRepository deliverersRepository, 
-    AutoMapper.IMapper mapper) : Endpoint<CreateDelivererDto, GetDelivererDto>
+public class CreateDelivererEndpoint(DeliverersRepository deliverersRepository) : Endpoint<CreateDelivererDto, GetDelivererDto>
 {
     public override void Configure()
     {
@@ -18,13 +16,12 @@ public class CreateDelivererEndpoint(
 
     public override async Task HandleAsync(CreateDelivererDto req, CancellationToken ct)
     {
-        Deliverer newDeliverer = new Deliverer()
+        Deliverer newDeliverer = new()
         {
             Transporter = req.Transporter,
         };
 
         await deliverersRepository.AddAsync(newDeliverer, ct);
-
-        await Send.OkAsync(mapper.Map<GetDelivererDto>(newDeliverer), ct);
+        await Send.NoContentAsync(ct);
     }
-}
+}

PyroFetes/Endpoints/Deliverers/DeleteDelivererEndpoint.cs

@@ -9,28 +9,26 @@ public class DeleteDelivererRequest
 {
     public int DelivererId { get; set; }
 }
+
 public class DeleteDelivererEndpoint(DeliverersRepository deliverersRepository) : Endpoint<DeleteDelivererRequest>
 {
     public override void Configure()
     {
-        Delete("/deliverers/{@id}", x=>new {x.DelivererId});
+        Delete("/deliverers/{@Id}", x => new { x.DelivererId });
         AllowAnonymous();
-
     }
 
     public override async Task HandleAsync(DeleteDelivererRequest req, CancellationToken ct)
     {
-        Deliverer? deliverer = await deliverersRepository.FirstOrDefaultAsync(new GetDelivererByIdSpec(req.DelivererId), ct);
+        Deliverer? deliverer = await deliverersRepository.SingleOrDefaultAsync(new GetDelivererByIdSpec(req.DelivererId), ct);
 
-        if (deliverer == null)
+        if (deliverer is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
+
         await deliverersRepository.DeleteAsync(deliverer, ct);
-
-        await Send.OkAsync(ct);
+        await Send.NoContentAsync(ct);
     }
-
 }

PyroFetes/Endpoints/Deliverers/GetAllDelivererEndpoint.cs

@@ -1,6 +1,4 @@
-using AutoMapper.QueryableExtensions;
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.Deliverer.Response;
 using PyroFetes.Repositories;
 
@@ -12,12 +10,10 @@ public class GetAllDelivererEndpoint(DeliverersRepository deliverersRepository)
     {
         Get("/deliverers");
         AllowAnonymous();
-
     }
 
     public override async Task HandleAsync(CancellationToken ct)
     {
         await Send.OkAsync(await deliverersRepository.ProjectToListAsync<GetDelivererDto>(ct), ct);
     }
-
 }

PyroFetes/Endpoints/Deliverers/GetDelivererEndpoint.cs

@@ -1,5 +1,4 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.Deliverer.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
@@ -12,22 +11,19 @@ public class GetDelivererRequest
     public int DelivererId { get; set; }
 }
 
-public class GetDelivererEndpoint(
-    DeliverersRepository deliverersRepository,
-    AutoMapper.IMapper mapper) : Endpoint<GetDelivererRequest, GetDelivererDto>
+public class GetDelivererEndpoint(DeliverersRepository deliverersRepository, AutoMapper.IMapper mapper) : Endpoint<GetDelivererRequest, GetDelivererDto>
 {
     public override void Configure()
     {
-        Get("/deliverers/{@id}", x=>new {x.DelivererId});
+        Get("/deliverers/{@Id}", x => new { x.DelivererId });
         AllowAnonymous();
-
     }
 
     public override async Task HandleAsync(GetDelivererRequest req, CancellationToken ct)
     {
-        Deliverer? deliverer = await deliverersRepository.FirstOrDefaultAsync(new GetDelivererByIdSpec(req.DelivererId), ct);
+        Deliverer? deliverer = await deliverersRepository.SingleOrDefaultAsync(new GetDelivererByIdSpec(req.DelivererId), ct);
 
-        if (deliverer == null)
+        if (deliverer is null)
         {
             await Send.NotFoundAsync(ct);
             return;
@@ -35,5 +31,4 @@ public class GetDelivererEndpoint(
 
         await Send.OkAsync(mapper.Map<GetDelivererDto>(deliverer), ct);
     }
-
 }

PyroFetes/Endpoints/Deliverers/UpdateDelivererEndpoint.cs

@@ -1,5 +1,4 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.Deliverer.Request;
 using PyroFetes.DTO.Deliverer.Response;
 using PyroFetes.Models;
@@ -8,32 +7,27 @@ using PyroFetes.Specifications.Deliverers;
 
 namespace PyroFetes.Endpoints.Deliverers;
 
-public class UpdateDelivererEndpoint(
-    DeliverersRepository deliverersRepository,
-    AutoMapper.IMapper mapper) : Endpoint<UpdateDelivererDto, GetDelivererDto>
+public class UpdateDelivererEndpoint(DeliverersRepository deliverersRepository, AutoMapper.IMapper mapper) : Endpoint<UpdateDelivererDto, GetDelivererDto>
 {
     public override void Configure()
     {
-        Put("/deliverers/{@id}", x=>new {x.Id});
+        Put("/deliverers/{@Id}", x => new { x.Id });
         AllowAnonymous();
-
     }
 
     public override async Task HandleAsync(UpdateDelivererDto req, CancellationToken ct)
     {
-        Deliverer? deliverer = await deliverersRepository.FirstOrDefaultAsync(new GetDelivererByIdSpec(req.Id), ct);
+        Deliverer? deliverer = await deliverersRepository.SingleOrDefaultAsync(new GetDelivererByIdSpec(req.Id), ct);
 
-        if (deliverer == null)
+        if (deliverer is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
-        deliverer.Transporter = req.Transporter;
-        
-        await deliverersRepository.UpdateAsync(deliverer,ct);
 
-        await Send.OkAsync(mapper.Map<GetDelivererDto>(deliverer), ct);
+        mapper.Map(req, deliverer);
+
+        await deliverersRepository.SaveChangesAsync(ct);
+        await Send.NoContentAsync(ct);
     }
-
 }

PyroFetes/Endpoints/DeliveryNotes/CreateDeliveryNoteEndpoint.cs

@@ -1,6 +1,5 @@
 using FastEndpoints;
 using PyroFetes.DTO.DeliveryNote.Request;
-using PyroFetes.DTO.DeliveryNote.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.Deliverers;
@@ -12,8 +11,7 @@ public class CreateDeliveryNoteEndpoint(
     DeliveryNotesRepository deliveryNotesRepository,
     DeliverersRepository deliverersRepository,
     ProductsRepository productsRepository,
-    ProductDeliveriesRepository productDeliveriesRepository,
-    AutoMapper.IMapper mapper) : Endpoint<CreateDeliveryNoteDto, GetDeliveryNoteDto>
+    ProductDeliveriesRepository productDeliveriesRepository) : Endpoint<CreateDeliveryNoteDto>
 {
     public override void Configure()
     {
@@ -23,46 +21,44 @@ public class CreateDeliveryNoteEndpoint(
 
     public override async Task HandleAsync(CreateDeliveryNoteDto req, CancellationToken ct)
     {
-        Deliverer? deliverer = await deliverersRepository.FirstOrDefaultAsync(new GetDelivererByIdSpec(req.DelivererId), ct);
-        
-        if (deliverer == null)
+        Deliverer? deliverer = await deliverersRepository.SingleOrDefaultAsync(new GetDelivererByIdSpec(req.DelivererId), ct);
+        if (deliverer is null)
         {
-            await Send.StringAsync("No deliverer found", 404, cancellation: ct);
+            await Send.NotFoundAsync(ct);
             return;
         }
-        
+
         //Creating the Delivery Note
-        DeliveryNote newDeliveryNote = new DeliveryNote()
+        DeliveryNote newDeliveryNote = new()
         {
             TrackingNumber = req.TrackingNumber,
             EstimateDeliveryDate = req.EstimateDeliveryDate,
-            ExpeditionDate =  req.ExpeditionDate,
-            DelivererId = req.DelivererId,
+            ExpeditionDate = req.ExpeditionDate,
+            DelivererId = deliverer.Id,
             Deliverer = deliverer,
-            
         };
-        
+
         await deliveryNotesRepository.AddAsync(newDeliveryNote, ct);
 
-        foreach (var productQuantity in req.ProductQuantities!)
+        if (req.ProductQuantities is not null)
         {
-            Product? product =
-                await productsRepository.FirstOrDefaultAsync(new GetProductByIdSpec(productQuantity.Key), ct);
-            if (product != null)
+            foreach (KeyValuePair<int, int> productQuantity in req.ProductQuantities)
             {
-                ProductDelivery productDelivery = new ProductDelivery()
+                Product? product = await productsRepository.SingleOrDefaultAsync(new GetProductByIdSpec(productQuantity.Key), ct);
+                if (product is null) continue;
+                ProductDelivery productDelivery = new()
                 {
                     DeliveryNote = newDeliveryNote,
                     Quantity = productQuantity.Value,
                     Product = product,
+                    ProductId =  product.Id,
                     DeliveryNoteId = newDeliveryNote.Id
                 };
-                
+
                 await productDeliveriesRepository.AddAsync(productDelivery, ct);
             }
-
         }
-        
-        await Send.OkAsync(mapper.Map<GetDeliveryNoteDto>(newDeliveryNote), ct);
+
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/DeliveryNotes/DeleteDeliveryNoteEndpoint.cs

@@ -1,9 +1,7 @@
 using FastEndpoints;
-using PyroFetes.Endpoints.Quotations;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.DeliveryNotes;
-using PyroFetes.Specifications.Quotations;
 
 namespace PyroFetes.Endpoints.DeliveryNotes;
 
@@ -17,22 +15,21 @@ public class DeleteDeliveryNoteEndpoint(
 {
     public override void Configure()
     {
-        Delete("/deliveryNotes/{@Id}", x => new {x.Id});
+        Delete("/deliveryNotes/{@Id}", x => new { x.Id });
         AllowAnonymous();
     }
 
     public override async Task HandleAsync(DeleteDeliveryNoteRequest req, CancellationToken ct)
     {
-        DeliveryNote? deliveryNote = await deliveryNotesRepository.FirstOrDefaultAsync(new GetDeliveryNoteByIdSpec(req.Id), ct);
+        DeliveryNote? deliveryNote = await deliveryNotesRepository.SingleOrDefaultAsync(new GetDeliveryNoteByIdSpec(req.Id), ct);
 
-        if (deliveryNote == null)
+        if (deliveryNote is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
+
         await deliveryNotesRepository.DeleteAsync(deliveryNote, ct);
-        
         await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/DeliveryNotes/GetAllDeliveryNoteEndpoint.cs

@@ -1,6 +1,7 @@
 using FastEndpoints;
 using PyroFetes.DTO.DeliveryNote.Response;
 using PyroFetes.Repositories;
+using PyroFetes.Specifications.DeliveryNotes;
 
 namespace PyroFetes.Endpoints.DeliveryNotes;
 
@@ -14,7 +15,6 @@ public class GetAllDeliveryNoteEndpoint(DeliveryNotesRepository deliveryNotesRep
 
     public override async Task HandleAsync(CancellationToken ct)
     {
-        await Send.OkAsync(await deliveryNotesRepository.ProjectToListAsync<GetDeliveryNoteDto>(ct), ct);
+        await Send.OkAsync(await deliveryNotesRepository.ProjectToListAsync<GetDeliveryNoteDto>(new GetAllDeliveryNoteSpec() ,ct), ct);
     }
-    
 }

PyroFetes/Endpoints/DeliveryNotes/GetDeliveryNoteEndpoint.cs

@@ -10,26 +10,27 @@ public class GetDeliveryNoteRequest
 {
     public int DeliveryNoteId { get; set; }
 }
+
 public class GetDeliveryNoteEndpoint(
     DeliveryNotesRepository deliveryNotesRepository,
     AutoMapper.IMapper mapper) : Endpoint<GetDeliveryNoteRequest, GetDeliveryNoteDto>
 {
     public override void Configure()
     {
-        Get("/deliveryNotes/{@id}", x=> new {x.DeliveryNoteId});
+        Get("/deliveryNotes/{@Id}", x => new { x.DeliveryNoteId });
         AllowAnonymous();
     }
 
     public override async Task HandleAsync(GetDeliveryNoteRequest req, CancellationToken ct)
     {
-        DeliveryNote? deliveryNote = await deliveryNotesRepository.FirstOrDefaultAsync(new GetDeliveryNoteByIdSpec(req.DeliveryNoteId), ct);
+        DeliveryNote? deliveryNote = await deliveryNotesRepository.SingleOrDefaultAsync(new GetDeliveryNoteByIdSpec(req.DeliveryNoteId), ct);
 
-        if (deliveryNote == null)
+        if (deliveryNote is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
+
         await Send.OkAsync(mapper.Map<GetDeliveryNoteDto>(deliveryNote), ct);
     }
 }

PyroFetes/Endpoints/DeliveryNotes/GetDeliveryNotePdfEndpoint.cs

@@ -5,39 +5,37 @@ using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Services.Pdf;
 using PyroFetes.Specifications.DeliveryNotes;
-using PyroFetes.Specifications.Quotations;
 
 namespace PyroFetes.Endpoints.DeliveryNotes;
 
-public class GetDeliveryNotePdfEndpoint(
-    DeliveryNotesRepository deliveryNotesRepository,
-    IDeliveryNotePdfService deliveryNotePdfService)
-    : Endpoint<GetDeliveryNotePdfDto, byte[]>
+public class GetDeliveryNotePdfEndpoint(DeliveryNotesRepository deliveryNotesRepository, IDeliveryNotePdfService deliveryNotePdfService, SettingsRepository settingsRepository) : Endpoint<GetDeliveryNotePdfDto, byte[]>
 {
     public override void Configure()
     {
-        Get("/deliveryNotes/{@Id}/pdf", x => new {x.Id});
+        Get("/deliveryNotes/{@Id}/pdf", x => new { x.Id });
         AllowAnonymous();
         Description(b => b.Produces<byte[]>(200, MediaTypeNames.Application.Pdf));
     }
-    
+
     public override async Task HandleAsync(GetDeliveryNotePdfDto req, CancellationToken ct)
     {
         DeliveryNote? deliveryNote = await deliveryNotesRepository
-            .FirstOrDefaultAsync(new GetDeliveryNoteByIdWithProductsSpec(req.Id), ct);
+            .SingleOrDefaultAsync(new GetDeliveryNoteByIdWithProductsSpec(req.Id), ct);
 
-        if (deliveryNote == null)
+        Setting? setting = await settingsRepository.FirstOrDefaultAsync(ct);
+
+        if (deliveryNote is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
-        var bytes = deliveryNotePdfService.Generate(deliveryNote, deliveryNote.ProductDeliveries!);
+
+        byte[] bytes = deliveryNotePdfService.Generate(deliveryNote, deliveryNote.ProductDeliveries!, setting!);
 
         await Send.BytesAsync(
             bytes: bytes,
             contentType: "application/pdf",
-            fileName: $"bon-de-livraison-{deliveryNote.Id}.pdf",
+            fileName: $"bon-de-livraison-{deliveryNote.Id}{DateOnly.FromDateTime(DateTime.Now)}.pdf",
             cancellation: ct);
     }
 }

PyroFetes/Endpoints/DeliveryNotes/PatchRealDeliveryDateEndpoint.cs

@@ -1,45 +1,41 @@
 using FastEndpoints;
 using PyroFetes.DTO.DeliveryNote.Request;
-using PyroFetes.DTO.DeliveryNote.Response;
-using PyroFetes.DTO.PurchaseProduct.Request;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
-using PyroFetes.Specifications.Deliverers;
 using PyroFetes.Specifications.DeliveryNotes;
 
 namespace PyroFetes.Endpoints.DeliveryNotes;
 
 public class PatchRealDeliveryDateEndpoint(
     DeliveryNotesRepository deliveryNotesRepository,
-    AutoMapper.IMapper mapper) : Endpoint<PatchDeliveryNoteRealDeliveryDateDto, GetDeliveryNoteDto>
+    AutoMapper.IMapper mapper) : Endpoint<PatchDeliveryNoteRealDeliveryDateDto>
 {
     public override void Configure()
     {
-        Patch("/deliveryNotes/{@id}", x=> new {x.Id});
+        Patch("/deliveryNotes/{@Id}", x => new { x.Id });
         AllowAnonymous();
     }
 
     public override async Task HandleAsync(PatchDeliveryNoteRealDeliveryDateDto req, CancellationToken ct)
     {
-        DeliveryNote? deliveryNoteToPath =
-            await deliveryNotesRepository.FirstOrDefaultAsync(new GetDeliveryNoteByIdSpec(req.Id),ct);
+        DeliveryNote? deliveryNoteToPath = await deliveryNotesRepository.SingleOrDefaultAsync(new GetDeliveryNoteByIdSpec(req.Id), ct);
 
-        if (deliveryNoteToPath == null)
+        if (deliveryNoteToPath is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
-        if (deliveryNoteToPath.RealDeliveryDate != null)
+
+        if (deliveryNoteToPath.RealDeliveryDate is not null)
         {
-            await Send.StringAsync("Impossible de modifier la date.", 400);
+            await Send.StringAsync("Impossible de modifier la date.", 400, cancellation: ct);
             return;
         }
-        
-        deliveryNoteToPath.RealDeliveryDate = req.RealDeliveryDate;
-        
+
+        mapper.Map(req, deliveryNoteToPath);
+
         await deliveryNotesRepository.UpdateAsync(deliveryNoteToPath, ct);
-        
-        await Send.OkAsync(mapper.Map<GetDeliveryNoteDto>(deliveryNoteToPath), ct);
+
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/DeliveryNotes/UpdateDeliveryNoteEndpoint.cs

@@ -1,40 +1,32 @@
 using FastEndpoints;
 using PyroFetes.DTO.DeliveryNote.Request;
-using PyroFetes.DTO.DeliveryNote.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.DeliveryNotes;
 
 namespace PyroFetes.Endpoints.DeliveryNotes;
 
-public class UpdateDeliveryNoteEndpoint(
-    DeliveryNotesRepository deliveryNotesRepository,
-    AutoMapper.IMapper mapper) : Endpoint<UpdateDeliveryNoteDto, GetDeliveryNoteDto>
+public class UpdateDeliveryNoteEndpoint(DeliveryNotesRepository deliveryNotesRepository, AutoMapper.IMapper mapper) : Endpoint<UpdateDeliveryNoteDto>
 {
     public override void Configure()
     {
-        Put("/deliveryNotes/{@Id}", x => new {x.Id});
+        Put("/deliveryNotes/{@Id}", x => new { x.Id });
         AllowAnonymous();
     }
 
     public override async Task HandleAsync(UpdateDeliveryNoteDto req, CancellationToken ct)
     {
-        DeliveryNote? deliveryNote = await deliveryNotesRepository.FirstOrDefaultAsync(new GetDeliveryNoteByIdSpec(req.Id), ct);
-        
-        if (deliveryNote == null)
+        DeliveryNote? deliveryNote = await deliveryNotesRepository.SingleOrDefaultAsync(new GetDeliveryNoteByIdSpec(req.Id), ct);
+
+        if (deliveryNote is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
-        deliveryNote.TrackingNumber = req.TrackingNumber;
-        deliveryNote.EstimateDeliveryDate = req.EstimateDeliveryDate;
-        deliveryNote.ExpeditionDate = req.ExpeditionDate;
-        deliveryNote.RealDeliveryDate = req.RealDeliveryDate;
-        deliveryNote.DelivererId = req.DelivererId;
-        
-        await deliveryNotesRepository.UpdateAsync(deliveryNote, ct);
-        
-        await Send.OkAsync(mapper.Map<GetDeliveryNoteDto>(deliveryNote), ct);
+
+        mapper.Map(req, deliveryNote);
+
+        await deliveryNotesRepository.SaveChangesAsync(ct);
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Prices/CreatePriceEndpoint.cs

@@ -1,84 +0,0 @@
-using FastEndpoints;
-using PyroFetes.DTO.Price.Request;
-using PyroFetes.DTO.Price.Response;
-using PyroFetes.Models;
-using PyroFetes.Repositories;
-using PyroFetes.Specifications.Prices;
-using PyroFetes.Specifications.Products;
-using PyroFetes.Specifications.Suppliers;
-
-namespace PyroFetes.Endpoints.Prices;
-
-public class CreatePriceEndpoint(
-    SuppliersRepository suppliersRepository,
-    ProductsRepository productsRepository,
-    PricesRepository pricesRepository,
-    AutoMapper.IMapper mapper) : Endpoint<CreatePriceDto, GetPriceDto>
-{
-    public override void Configure()
-    {
-        Post("/prices");
-        AllowAnonymous();
-    }
-
-    public override async Task HandleAsync(CreatePriceDto req, CancellationToken ct)
-    {
-        // Gestion du fournisseur
-        Supplier? supplier = await suppliersRepository.FirstOrDefaultAsync(new GetSupplierByIdSpec(req.SupplierId), ct);
-        if (supplier == null)
-        {
-            supplier = new Supplier()
-            {
-                Name = req.SupplierName,
-                Email = req.SupplierEmail,
-                Phone = req.SupplierPhone,
-                Address = req.SupplierAddress,
-                City = req.SupplierCity,
-                ZipCode = req.SupplierZipCode,
-                DeliveryDelay = req.SupplierDeliveryDelay
-            };
-            await  suppliersRepository.AddAsync(supplier, ct);
-        }
-
-        // Gestion du produit
-        Product? product = await productsRepository.FirstOrDefaultAsync(new GetProductByIdSpec(req.ProductId), ct);
-        if (product == null)
-        {
-            product = new Product()
-            {
-                Reference = req.ProductReferences,
-                Name = req.ProductName,
-                Duration = req.ProductDuration,
-                Caliber = req.ProductCaliber,
-                ApprovalNumber = req.ProductApprovalNumber,
-                Weight = req.ProductWeight,
-                Nec = req.ProductNec,
-                Image = req.ProductImage,
-                Link = req.ProductLink,
-                MinimalQuantity = req.ProductMinimalQuantity
-            };
-            await productsRepository.AddAsync(product, ct);
-        }
-
-        // Vérifie si le prix existe déjà pour ce fournisseur et produit
-        Price? existingPrice = await pricesRepository.FirstOrDefaultAsync(new GetPriceByProductIdAndSupplierIdSpec(req.ProductId, req.SupplierId), ct);
-
-        if (existingPrice != null)
-        {
-            await Send.StringAsync("Le fournisseur a déjà un prix pour ce produit.", 400, cancellation: ct);
-            return;
-        }
-
-        // Création du prix
-        var priceAdded = new Price()
-        {
-            SellingPrice = req.SellingPrice,
-            SupplierId = supplier.Id,
-            ProductId = product.Id
-        };
-        await pricesRepository.AddAsync(priceAdded, ct);
-
-      
-        await Send.OkAsync(mapper.Map<GetPriceDto>(priceAdded), ct);
-    }
-}

PyroFetes/Endpoints/Products/DeleteProductEndpoint.cs

@@ -1,8 +1,6 @@
 using FastEndpoints;
-using PyroFetes.Endpoints.Deliverers;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
-using PyroFetes.Specifications.Deliverers;
 using PyroFetes.Specifications.Products;
 
 namespace PyroFetes.Endpoints.Products;
@@ -11,28 +9,26 @@ public class DeleteProductsRequest
 {
     public int ProductId { get; set; }
 }
+
 public class DeleteProductEndpoint(ProductsRepository productsRepository) : Endpoint<DeleteProductsRequest>
 {
     public override void Configure()
     {
-        Delete("/products/{@id}", x=>new {x.ProductId});
+        Delete("/products/{@Id}", x => new { x.ProductId });
         AllowAnonymous();
-
     }
 
     public override async Task HandleAsync(DeleteProductsRequest req, CancellationToken ct)
     {
-        Product? product = await productsRepository.FirstOrDefaultAsync(new GetProductByIdSpec(req.ProductId), ct);
+        Product? product = await productsRepository.SingleOrDefaultAsync(new GetProductByIdSpec(req.ProductId), ct);
 
-        if (product == null)
+        if (product is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
-        await productsRepository.DeleteAsync(product, ct);
 
+        await productsRepository.DeleteAsync(product, ct);
         await Send.OkAsync(ct);
     }
-
 }

PyroFetes/Endpoints/Products/GetAllProductsEndpoint.cs

@@ -1,7 +1,5 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.Product.Response;
-using PyroFetes.Models;
 using PyroFetes.Repositories;
 
 namespace PyroFetes.Endpoints.Products;

PyroFetes/Endpoints/Products/GetAllProductsUnderLimitEndpoint.cs

@@ -1,4 +1,3 @@
-using AutoMapper;
 using FastEndpoints;
 using PyroFetes.DTO.Product.Response;
 using PyroFetes.Repositories;
@@ -15,7 +14,7 @@ public class GetAllProductsUnderLimitEndpoint(ProductsRepository productsReposit
     }
 
     public override async Task HandleAsync(CancellationToken ct)
-    {   
+    {
         await Send.OkAsync(await productsRepository.ProjectToListAsync<GetProductDto>(new GetProductsUnderLimitSpec(), ct), ct);
     }
 }

PyroFetes/Endpoints/Products/GetProductEndpoint.cs

@@ -1,5 +1,4 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.Product.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
@@ -18,7 +17,7 @@ public class GetProductEndpoint(
 {
     public override void Configure()
     {
-        Get("/products/{@Id}", x => new {x.Id});
+        Get("/products/{@Id}", x => new { x.Id });
         AllowAnonymous();
     }
 
@@ -26,12 +25,12 @@ public class GetProductEndpoint(
     {
         Product? product = await productsRepository.FirstOrDefaultAsync(new GetProductByIdSpec(req.Id), ct);
 
-        if (product == null)
+        if (product is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
-        await  Send.OkAsync(mapper.Map<GetProductDto>(product), ct);
+
+        await Send.OkAsync(mapper.Map<GetProductDto>(product), ct);
     }
 }

PyroFetes/Endpoints/Products/PatchProductMinimalStockEndpoint.cs

@@ -1,16 +1,12 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.Product.Request;
-using PyroFetes.DTO.Product.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.Products;
 
 namespace PyroFetes.Endpoints.Products;
 
-public class PatchProductMinimalStockEndpoint(
-    ProductsRepository productsRepository,
-    AutoMapper.IMapper mapper) : Endpoint<PatchProductMinimalStockDto, GetProductDto>
+public class PatchProductMinimalStockEndpoint(ProductsRepository productsRepository, AutoMapper.IMapper mapper) : Endpoint<PatchProductMinimalStockDto>
 {
     public override void Configure()
     {
@@ -20,17 +16,17 @@ public class PatchProductMinimalStockEndpoint(
 
     public override async Task HandleAsync(PatchProductMinimalStockDto req, CancellationToken ct)
     {
-        Product? product = await productsRepository.FirstOrDefaultAsync(new GetProductByIdSpec(req.Id), ct);
-        
-        if (product == null)
+        Product? product = await productsRepository.SingleOrDefaultAsync(new GetProductByIdSpec(req.Id), ct);
+
+        if (product is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
 
-        product.MinimalQuantity = req.MinimalQuantity;
+        mapper.Map(req, product);
+            
         await productsRepository.UpdateAsync(product, ct);
-        
-        await Send.OkAsync(mapper.Map<GetProductDto>(product), ct);
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Products/UpdateProductEndpoint.cs

@@ -1,46 +1,32 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.Product.Request;
-using PyroFetes.DTO.Product.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.Products;
 
 namespace PyroFetes.Endpoints.Products;
 
-public class UpdateProductEndpoint(
-    ProductsRepository productsRepository,
-    AutoMapper.IMapper mapper) : Endpoint<UpdateProductDto, GetProductDto>
+public class UpdateProductEndpoint(ProductsRepository productsRepository, AutoMapper.IMapper mapper) : Endpoint<UpdateProductDto>
 {
     public override void Configure()
     {
-        Put("/products/{@Id}", x => new {x.Id});
+        Put("/products/{@Id}", x => new { x.Id });
         AllowAnonymous();
     }
 
     public override async Task HandleAsync(UpdateProductDto req, CancellationToken ct)
     {
-        Product? product = await productsRepository.FirstOrDefaultAsync(new GetProductByIdSpec(req.Id), ct);
-        
-        if (product == null)
+        Product? product = await productsRepository.SingleOrDefaultAsync(new GetProductByIdSpec(req.Id), ct);
+
+        if (product is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
 
-        product.Reference = req.References;
-        product.Name = req.Name;
-        product.Duration = req.Duration;
-        product.Caliber = req.Caliber;
-        product.ApprovalNumber = req.ApprovalNumber;
-        product.Weight = req.Weight;
-        product.Nec = req.Nec;
-        product.Image = req.Image;
-        product.Link = req.Link;
-        product.MinimalQuantity = req.MinimalQuantity;
-        
+        mapper.Map(req, product);
+
         await productsRepository.UpdateAsync(product, ct);
-        
-        await Send.OkAsync(mapper.Map<GetProductDto>(product), ct);
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/PurchaseOrders/AddProductFromPurchaseOrderEndpoint.cs

@@ -0,0 +1,32 @@
+using FastEndpoints;
+using PyroFetes.DTO.PurchaseProduct.Request;
+using PyroFetes.Models;
+using PyroFetes.Repositories;
+using PyroFetes.Specifications.PurchaseProducts;
+
+namespace PyroFetes.Endpoints.PurchaseOrders;
+
+public class AddProductFromPurchaseOrderEndpoint(PurchaseProductsRepository purchaseProductsRepository, AutoMapper.IMapper mapper) : Endpoint<CreatePurchaseProductDto>
+{
+    public override void Configure()
+    {
+        Post("/purchaseOrders/{@PurchaseOrderId}/{@ProductId}", x => new { x.PurchaseOrderId, x.ProductId });
+        AllowAnonymous();
+    }
+
+    public override async Task HandleAsync(CreatePurchaseProductDto req, CancellationToken ct)
+    {
+        PurchaseProduct? purchaseOrderProduct =
+            await purchaseProductsRepository.SingleOrDefaultAsync(new GetPurchaseProductByProductIdAndPurchaseOrderIdSpec(req.ProductId, req.PurchaseOrderId), ct);
+        if (purchaseOrderProduct is not null)
+        {
+            await Send.StringAsync("Le produit est déjà dans le bon de commande", 400, cancellation: ct);
+            return;
+        }
+
+        purchaseOrderProduct = mapper.Map<PurchaseProduct>(req);
+
+        await purchaseProductsRepository.AddAsync(purchaseOrderProduct, ct);
+        await Send.NoContentAsync(ct);
+    }
+}

PyroFetes/Endpoints/PurchaseOrders/CreatePurchaseOrder.cs

@@ -1,19 +1,18 @@
 using FastEndpoints;
 using PyroFetes.DTO.PurchaseOrder.Request;
-using PyroFetes.DTO.PurchaseOrder.Response;
 using PyroFetes.DTO.PurchaseProduct.Request;
-using PyroFetes.DTO.PurchaseProduct.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.Products;
-using PyroFetes.Specifications.PurchaseOrders;
+using PyroFetes.Specifications.PurchaseProducts;
 
 namespace PyroFetes.Endpoints.PurchaseOrders;
 
 public class CreatePurchaseOrder(
     PurchaseOrdersRepository purchaseOrdersRepository,
     ProductsRepository productsRepository,
-    AutoMapper.IMapper mapper) : Endpoint<CreatePurchaseOrderDto, GetPurchaseOrderDto>
+    PurchaseProductsRepository purchaseProductsRepository,
+    AutoMapper.IMapper mapper) : Endpoint<CreatePurchaseOrderDto>
 {
     public override void Configure()
     {
@@ -23,30 +22,35 @@ public class CreatePurchaseOrder(
 
     public override async Task HandleAsync(CreatePurchaseOrderDto req, CancellationToken ct)
     {
-        PurchaseOrder purchaseOrder = new PurchaseOrder
-        {
-            PurchaseConditions = req.PurchaseConditions ?? "Conditions non précisées",
-            PurchaseProducts = new List<PurchaseProduct>()
-        };
+        PurchaseOrder purchaseOrder = mapper.Map<PurchaseOrder>(req);
 
-        foreach (var line in req.Products)
+        if (req.Products != null)
         {
-            var product = await productsRepository.GetByIdAsync(line.ProductId, ct);
-            if (product == null)
+            foreach (CreatePurchaseOrderProductDto line in req.Products)
             {
-                await Send.NotFoundAsync(ct);
-                return;
+                Product? product = await productsRepository.SingleOrDefaultAsync(new GetProductByIdSpec(line.ProductId), ct);
+                if (product is null)
+                {
+                    await Send.NotFoundAsync(ct);
+                    return;
+                }
+                
+                PurchaseProduct? purchaseProduct = 
+                    await purchaseProductsRepository.SingleOrDefaultAsync(new GetPurchaseProductByProductIdAndPurchaseOrderIdSpec(line.ProductId, purchaseOrder.Id), ct);
+
+                if (purchaseProduct is not null)
+                {
+                    await Send.StringAsync("Le produit est déjà dans le bon de commande", 400, cancellation: ct);
+                }
+
+                PurchaseProduct? productOnPurchase = mapper.Map<PurchaseProduct>(line);
+                productOnPurchase.PurchaseOrderId = purchaseOrder.Id;
+
+                await purchaseProductsRepository.AddAsync(productOnPurchase, ct);
             }
-
-            purchaseOrder.PurchaseProducts.Add(new PurchaseProduct
-            {
-                ProductId = product.Id,
-                Quantity = line.Quantity,
-            });
         }
 
         await purchaseOrdersRepository.AddAsync(purchaseOrder, ct);
-
-        await Send.OkAsync(mapper.Map<GetPurchaseOrderDto>(purchaseOrder), ct);
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/PurchaseOrders/DeleteProductFromPurchaseOrderEndpoint.cs

@@ -1,10 +1,9 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.PurchaseProducts;
 
-namespace PyroFetes.Endpoints.PurchaseProducts;
+namespace PyroFetes.Endpoints.PurchaseOrders;
 
 public class DeletePurchaseProductRequest
 {
@@ -12,27 +11,26 @@ public class DeletePurchaseProductRequest
     public int PurchaseOrderId { get; set; }
 }
 
-public class DeletePurchaseProductEndpoint(PurchaseProductsRepository purchaseProductsRepository) : Endpoint<DeletePurchaseProductRequest>
+public class DeleteProductFromPurchaseOrderEndpoint(PurchaseProductsRepository purchaseProductsRepository) : Endpoint<DeletePurchaseProductRequest>
 {
     public override void Configure()
     {
-        Delete("/purchaseProducts/{@ProductId}/{@PurchaseOrderId}", x => new {x.ProductId, x.PurchaseOrderId});
+        Delete("/purchaseOrders/{@ProductId}/{@PurchaseOrderId}", x => new { x.ProductId, x.PurchaseOrderId });
         AllowAnonymous();
     }
 
     public override async Task HandleAsync(DeletePurchaseProductRequest req, CancellationToken ct)
     {
-        PurchaseProduct? purchaseProduct = await purchaseProductsRepository.FirstOrDefaultAsync(
-            new GetPurchaseProductByProductIdAndPurchaseOrderIdSpec(req.ProductId, req.PurchaseOrderId), ct);
+        PurchaseProduct? purchaseProduct =
+            await purchaseProductsRepository.SingleOrDefaultAsync(new GetPurchaseProductByProductIdAndPurchaseOrderIdSpec(req.ProductId, req.PurchaseOrderId), ct);
 
-        if (purchaseProduct == null)
+        if (purchaseProduct is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
+
         await purchaseProductsRepository.DeleteAsync(purchaseProduct, ct);
-        
         await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/PurchaseOrders/DeletePurchaseOrderEndpoint.cs

@@ -1,5 +1,4 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.PurchaseOrders;
@@ -11,13 +10,11 @@ public class DeletePurchaseOrderRequest
     public int Id { get; set; }
 }
 
-public class DeletePurchaseOrderEndpoint(
-    PurchaseOrdersRepository purchaseOrdersRepository,
-    PurchaseProductsRepository purchaseProductsRepository) : Endpoint<DeletePurchaseOrderRequest>
+public class DeletePurchaseOrderEndpoint(PurchaseOrdersRepository purchaseOrdersRepository) : Endpoint<DeletePurchaseOrderRequest>
 {
     public override void Configure()
     {
-        Delete("/purchaseOrders/{@Id}", x => new {x.Id});
+        Delete("/purchaseOrders/{@Id}", x => new { x.Id });
         AllowAnonymous();
     }
 
@@ -25,19 +22,13 @@ public class DeletePurchaseOrderEndpoint(
     {
         PurchaseOrder? purchaseOrder = await purchaseOrdersRepository.FirstOrDefaultAsync(new GetPurchaseOrderByIdSpec(req.Id), ct);
 
-        if (purchaseOrder == null)
+        if (purchaseOrder is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
-        if (purchaseOrder.PurchaseProducts != null && purchaseOrder.PurchaseProducts.Any())
-        {
-            await purchaseProductsRepository.DeleteRangeAsync(purchaseOrder.PurchaseProducts, ct);
-        }
-        
-        await purchaseOrdersRepository.DeleteAsync(purchaseOrder, ct);   
-        
+
+        await purchaseOrdersRepository.DeleteAsync(purchaseOrder, ct);
         await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/PurchaseOrders/GetAllPurchaseOrderEndpoint.cs

@@ -1,7 +1,5 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.PurchaseOrder.Response;
-using PyroFetes.DTO.PurchaseProduct.Response;
 using PyroFetes.Repositories;
 
 namespace PyroFetes.Endpoints.PurchaseOrders;

PyroFetes/Endpoints/PurchaseOrders/GetPurchaseOrderEndpoint.cs

@@ -1,7 +1,5 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.PurchaseOrder.Response;
-using PyroFetes.DTO.PurchaseProduct.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.PurchaseOrders;
@@ -13,26 +11,24 @@ public class GetPurchaseOrderRequest
     public int Id { get; set; }
 }
 
-public class GetPurchaseOrderEndpoint(
-    PurchaseOrdersRepository purchaseOrdersRepository,
-    AutoMapper.IMapper mapper) : Endpoint<GetPurchaseOrderRequest, GetPurchaseOrderDto>
+public class GetPurchaseOrderEndpoint(PurchaseOrdersRepository purchaseOrdersRepository, AutoMapper.IMapper mapper) : Endpoint<GetPurchaseOrderRequest, GetPurchaseOrderDto>
 {
     public override void Configure()
     {
-        Get("/purchaseOrders/{@Id}", x => new {x.Id});
+        Get("/purchaseOrders/{@Id}", x => new { x.Id });
         AllowAnonymous();
     }
 
     public override async Task HandleAsync(GetPurchaseOrderRequest req, CancellationToken ct)
     {
-        PurchaseOrder? purchaseOrder = await purchaseOrdersRepository.FirstOrDefaultAsync(new GetPurchaseOrderByIdSpec(req.Id), ct);
+        PurchaseOrder? purchaseOrder = await purchaseOrdersRepository.SingleOrDefaultAsync(new GetPurchaseOrderByIdSpec(req.Id), ct);
 
-        if (purchaseOrder == null)
+        if (purchaseOrder is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
+
         await Send.OkAsync(mapper.Map<GetPurchaseOrderDto>(purchaseOrder), ct);
     }
 }

PyroFetes/Endpoints/PurchaseOrders/GetPurchaseOrderPdfEndpoint.cs

@@ -5,37 +5,40 @@ using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Services.Pdf;
 using PyroFetes.Specifications.PurchaseOrders;
+
 namespace PyroFetes.Endpoints.PurchaseOrders;
 
 public class GetPurchaseOrderPdfEndpoint(
     PurchaseOrdersRepository purchaseOrdersRepository,
-    IPurchaseOrderPdfService purchaseOrderPdfService) 
+    IPurchaseOrderPdfService purchaseOrderPdfService, 
+    SettingsRepository settingsRepository)
     : Endpoint<GetPurchaseOrderPdfDto, byte[]>
 {
     public override void Configure()
     {
-        Get("/purchaseOrders/{@Id}/pdf", x => new {x.Id});
+        Get("/purchaseOrders/{@Id}/pdf", x => new { x.Id });
         AllowAnonymous();
         Description(b => b.Produces<byte[]>(200, MediaTypeNames.Application.Pdf));
     }
-    
+
     public override async Task HandleAsync(GetPurchaseOrderPdfDto req, CancellationToken ct)
     {
-        PurchaseOrder? purchaseOrder = await purchaseOrdersRepository
-            .FirstOrDefaultAsync(new GetPurchaseOrderByIdWithProductsSpec(req.Id), ct);
-
-        if (purchaseOrder == null)
+        PurchaseOrder? purchaseOrder = await purchaseOrdersRepository.SingleOrDefaultAsync(new GetPurchaseOrderByIdWithProductsSpec(req.Id), ct);
+        
+        if (purchaseOrder is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
+
+        Setting? setting = await settingsRepository.FirstOrDefaultAsync(ct);
         
-        var bytes = purchaseOrderPdfService.Generate(purchaseOrder, purchaseOrder.PurchaseProducts!);
+        byte[] bytes = purchaseOrderPdfService.Generate(purchaseOrder, purchaseOrder.PurchaseProducts!, setting!);
 
         await Send.BytesAsync(
             bytes: bytes,
             contentType: "application/pdf",
-            fileName: $"bon-de-commande-{purchaseOrder.Id}.pdf",
+            fileName: $"bon-de-commande-{purchaseOrder.Id}{DateOnly.FromDateTime(DateTime.Now)}.pdf",
             cancellation: ct);
     }
 }

PyroFetes/Endpoints/PurchaseOrders/PatchPurchaseOrderPurchaseConditionsEndpoint.cs

@@ -1,17 +1,14 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.PurchaseOrder.Request;
 using PyroFetes.DTO.PurchaseOrder.Response;
-using PyroFetes.DTO.PurchaseProduct.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.PurchaseOrders;
 
 namespace PyroFetes.Endpoints.PurchaseOrders;
 
-public class PatchPurchaseOrderPurchaseConditionsEndpoint(
-    PurchaseOrdersRepository purchaseOrdersRepository,
-    AutoMapper.IMapper mapper) : Endpoint<PatchPurchaseOrderPurchaseConditionsDto, GetPurchaseOrderDto>
+public class PatchPurchaseOrderPurchaseConditionsEndpoint(PurchaseOrdersRepository purchaseOrdersRepository, AutoMapper.IMapper mapper)
+    : Endpoint<PatchPurchaseOrderPurchaseConditionsDto>
 {
     public override void Configure()
     {
@@ -21,16 +18,16 @@ public class PatchPurchaseOrderPurchaseConditionsEndpoint(
 
     public override async Task HandleAsync(PatchPurchaseOrderPurchaseConditionsDto req, CancellationToken ct)
     {
-        PurchaseOrder? purchaseOrder = await purchaseOrdersRepository.FirstOrDefaultAsync(new GetPurchaseOrderByIdSpec(req.Id), ct);
-        if (purchaseOrder == null)
+        PurchaseOrder? purchaseOrder = await purchaseOrdersRepository.SingleOrDefaultAsync(new GetPurchaseOrderByIdSpec(req.Id), ct);
+        if (purchaseOrder is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
-        purchaseOrder.PurchaseConditions = req.PurchaseConditions;
-        await purchaseOrdersRepository.UpdateAsync(purchaseOrder, ct);
 
-        await Send.OkAsync(mapper.Map<GetPurchaseOrderDto>(purchaseOrder), ct);
+        mapper.Map(req, purchaseOrder);
+
+        await purchaseOrdersRepository.UpdateAsync(purchaseOrder, ct);
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/PurchaseOrders/PatchPurchaseProductQuantityEndpoint.cs

@@ -0,0 +1,35 @@
+using FastEndpoints;
+using PyroFetes.DTO.PurchaseProduct.Request;
+using PyroFetes.DTO.PurchaseProduct.Response;
+using PyroFetes.Models;
+using PyroFetes.Repositories;
+using PyroFetes.Specifications.PurchaseProducts;
+
+namespace PyroFetes.Endpoints.PurchaseOrders;
+
+public class PatchPurchaseProductQuantityEndpoint(PurchaseProductsRepository purchaseProductsRepository, AutoMapper.IMapper mapper)
+    : Endpoint<PatchPurchaseProductQuantityDto>
+{
+    public override void Configure()
+    {
+        Patch("/purchaseOrders/{@ProductId}/{@PurchaseOrderId}/Quantity", x => new { x.ProductId, x.PurchaseOrderId });
+        AllowAnonymous();
+    }
+
+    public override async Task HandleAsync(PatchPurchaseProductQuantityDto req, CancellationToken ct)
+    {
+        PurchaseProduct? purchaseProduct =
+            await purchaseProductsRepository.SingleOrDefaultAsync(new GetPurchaseProductByProductIdAndPurchaseOrderIdSpec(req.ProductId, req.PurchaseOrderId), ct);
+
+        if (purchaseProduct is null)
+        {
+            await Send.NotFoundAsync(ct);
+            return;
+        }
+
+        mapper.Map(req, purchaseProduct);
+        
+        await purchaseProductsRepository.SaveChangesAsync(ct);
+        await Send.NoContentAsync(ct);
+    }
+}

PyroFetes/Endpoints/PurchaseProducts/CreatePurchaseProductEndpoint.cs

@@ -1,56 +0,0 @@
-using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
-using PyroFetes.DTO.PurchaseProduct.Request;
-using PyroFetes.DTO.PurchaseProduct.Response;
-using PyroFetes.Models;
-using PyroFetes.Repositories;
-using PyroFetes.Specifications.Products;
-using PyroFetes.Specifications.PurchaseOrders;
-
-namespace PyroFetes.Endpoints.PurchaseProducts;
-
-public class CreatePurchaseProductEndpoint(
-    ProductsRepository productsRepository,
-    PurchaseOrdersRepository purchaseOrdersRepository,
-    PurchaseProductsRepository purchaseProductsRepository,
-    AutoMapper.IMapper mapper) : Endpoint<CreatePurchaseProductDto, GetPurchaseProductDto>
-{
-    public override void Configure()
-    {
-        Post("/purchaseProducts");
-        AllowAnonymous();
-    }
-
-    public override async Task HandleAsync(CreatePurchaseProductDto req, CancellationToken ct)
-    {
-        Product? product = await productsRepository.FirstOrDefaultAsync(new GetProductByIdSpec(req.ProductId), ct);
-        if (product == null)
-        {
-            await Send.NotFoundAsync(ct);
-            return;
-        }
-
-        PurchaseOrder? purchaseOrder =
-            await purchaseOrdersRepository.FirstOrDefaultAsync(new GetPurchaseOrderByIdSpec(req.PurchaseOrderId), ct);
-
-        if (purchaseOrder == null)
-        {
-            purchaseOrder = new PurchaseOrder()
-            {
-                PurchaseConditions = req.PurchaseOrderPurchaseConditions ?? "Conditions non précisées"
-            };
-            await purchaseOrdersRepository.AddAsync(purchaseOrder, ct);
-        }
-
-        PurchaseProduct purchaseProduct = new PurchaseProduct()
-        {
-            ProductId = product.Id,
-            PurchaseOrderId = purchaseOrder.Id,
-            Quantity = req.Quantity
-        };
-
-        await purchaseProductsRepository.AddAsync(purchaseProduct, ct);
-
-        await Send.OkAsync(mapper.Map<GetPurchaseProductDto>(purchaseProduct), ct);
-    }
-}

PyroFetes/Endpoints/PurchaseProducts/PatchPurchaseProductQuantityEndpoint.cs

@@ -1,38 +0,0 @@
-using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
-using PyroFetes.DTO.PurchaseProduct.Request;
-using PyroFetes.DTO.PurchaseProduct.Response;
-using PyroFetes.Models;
-using PyroFetes.Repositories;
-using PyroFetes.Specifications.PurchaseProducts;
-
-namespace PyroFetes.Endpoints.PurchaseProducts;
-
-public class PatchPurchaseProductQuantityEndpoint(
-    PurchaseProductsRepository purchaseProductsRepository,
-    AutoMapper.IMapper mapper) : Endpoint<PatchPurchaseProductQuantityDto, GetPurchaseProductDto>
-{
-    public override void Configure()
-    {
-        Patch("/purchaseProducts/{@ProductId}/{@PurchaseOrderId}/Quantity", x => new { x.ProductId, x.PurchaseOrderId });
-        AllowAnonymous();
-    }
-
-    public override async Task HandleAsync(PatchPurchaseProductQuantityDto req, CancellationToken ct)
-    {
-        PurchaseProduct? purchaseProduct =
-            await purchaseProductsRepository.FirstOrDefaultAsync(
-                new GetPurchaseProductByProductIdAndPurchaseOrderIdSpec(req.ProductId, req.PurchaseOrderId), ct);
-        
-        if (purchaseProduct == null)
-        {
-            await Send.NotFoundAsync(ct);
-            return;
-        }
-        
-        purchaseProduct.Quantity = req.Quantity;
-        await purchaseProductsRepository.UpdateAsync(purchaseProduct, ct);
-
-        await Send.OkAsync(mapper.Map<GetPurchaseProductDto>(purchaseProduct), ct);
-    }
-}

PyroFetes/Endpoints/QuotationProducts/CreateQuotationProductEndpoint.cs

@@ -1,58 +0,0 @@
-using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
-using PyroFetes.DTO.QuotationProduct.Request;
-using PyroFetes.DTO.QuotationProduct.Response;
-using PyroFetes.Models;
-using PyroFetes.Repositories;
-using PyroFetes.Specifications.Products;
-using PyroFetes.Specifications.Quotations;
-
-namespace PyroFetes.Endpoints.QuotationProducts;
-
-public class CreateQuotationProductEndpoint(
-    QuotationProductsRepository quotationProductsRepository,
-    ProductsRepository productsRepository,
-    QuotationsRepository quotationsRepository,
-    AutoMapper.IMapper mapper) : Endpoint<CreateQuotationProductDto, GetQuotationProductDto>
-{
-    public override void Configure()
-    {
-        Post("/quotationProducts");
-        AllowAnonymous();
-    }
-
-    public override async Task HandleAsync(CreateQuotationProductDto req, CancellationToken ct)
-    {
-        Product? product = await productsRepository.FirstOrDefaultAsync(new GetProductByIdSpec(req.ProductId), ct);
-        
-        if (product == null)
-        {
-            await Send.NotFoundAsync(ct);
-            return;
-        }
-        
-        Quotation? quotation = await quotationsRepository.FirstOrDefaultAsync(new GetQuotationByIdSpec(req.QuotationId), ct);
-        
-        if (quotation == null)
-        {
-            quotation = new Quotation()
-            {
-                Message = req.QuotationMessage ?? "",
-                ConditionsSale = req.QuotationConditionsSale,
-            };
-            
-            await quotationsRepository.AddAsync(quotation, ct);
-        }
-        
-        QuotationProduct quotationProduct = new QuotationProduct()
-        {
-            ProductId = product.Id,
-            QuotationId = quotation.Id,
-            Quantity = req.Quantity
-        };
-        
-        await quotationProductsRepository.AddAsync(quotationProduct, ct);
-
-        await Send.OkAsync(mapper.Map<GetQuotationProductDto>(quotationProduct), ct);
-    }
-}

PyroFetes/Endpoints/Quotations/AddProductoToQuotationEndpoint.cs

@@ -0,0 +1,35 @@
+using FastEndpoints;
+using PyroFetes.DTO.QuotationProduct.Request;
+using PyroFetes.DTO.QuotationProduct.Response;
+using PyroFetes.Models;
+using PyroFetes.Repositories;
+using PyroFetes.Specifications.QuotationProducts;
+
+namespace PyroFetes.Endpoints.Quotations;
+
+public class AddProductoToQuotationEndpoint(
+    QuotationProductsRepository quotationProductsRepository,
+    AutoMapper.IMapper mapper) : Endpoint<AddQuotationProductDto>
+{
+    public override void Configure()
+    {
+        Post("/quotations/{@Id}/products", x => new { x.ProductId, x.QuotationId });
+        AllowAnonymous();
+    }
+
+    public override async Task HandleAsync(AddQuotationProductDto req, CancellationToken ct)
+    {
+        QuotationProduct? productQuotation = await  quotationProductsRepository.SingleOrDefaultAsync(new GetQuotationProductByProductIdAndQuotationIdSpec(req.ProductId, req.QuotationId), ct);
+
+        if (productQuotation is not null)
+        {
+            await Send.StringAsync("ce produit existe déjà dans le devis", 400, cancellation: ct);
+            return;
+        }
+
+        QuotationProduct quotationProduct = mapper.Map<QuotationProduct>(req);
+        
+        await quotationProductsRepository.AddAsync(quotationProduct, ct);
+        await Send.NoContentAsync(ct);
+    }
+}

PyroFetes/Endpoints/Quotations/CreateQuotationEndpoint.cs

@@ -1,15 +1,19 @@
 using FastEndpoints;
 using PyroFetes.DTO.Quotation.Request;
 using PyroFetes.DTO.Quotation.Response;
+using PyroFetes.DTO.QuotationProduct.Request;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
+using PyroFetes.Specifications.Products;
+using PyroFetes.Specifications.QuotationProducts;
 
 namespace PyroFetes.Endpoints.Quotations;
 
 public class CreateQuotationEndpoint(
     QuotationsRepository quotationsRepository,
+    QuotationProductsRepository quotationProductsRepository,
     ProductsRepository productsRepository,
-    AutoMapper.IMapper mapper) : Endpoint<CreateQuotationDto, GetQuotationDto>
+    AutoMapper.IMapper mapper) : Endpoint<CreateQuotationDto>
 {
     public override void Configure()
     {
@@ -19,32 +23,36 @@ public class CreateQuotationEndpoint(
 
     public override async Task HandleAsync(CreateQuotationDto req, CancellationToken ct)
     {
-        Quotation quotation = new Quotation
-        {
-            Message = req.Message,
-            ConditionsSale = req.ConditionsSale ?? "Conditions non précisées",
-            CustomerId = 1, // A changer
-            QuotationProducts = new List<QuotationProduct>()
-        };
+        Quotation quotation = mapper.Map<Quotation>(req);
+        quotation.CustomerId = 1; // TODO: A changer
 
-        foreach (var line in req.Products)
+        if (req.Products != null)
         {
-            var product = await productsRepository.GetByIdAsync(line.ProductId, ct);
-            if (product == null)
+            foreach (CreateProductQuotationDto line in req.Products)
             {
-                await Send.NotFoundAsync(ct);
-                return;
+                Product? product = await productsRepository.SingleOrDefaultAsync(new GetProductByIdSpec(line.ProductId), ct);
+                QuotationProduct? quotationProduct =
+                    await quotationProductsRepository.SingleOrDefaultAsync(new GetQuotationProductByProductIdAndQuotationIdSpec(line.ProductId, quotation.Id), ct);
+               
+                if (product is null)
+                {
+                    await Send.NotFoundAsync(ct);
+                    return;
+                }
+
+                if (quotationProduct is not null)
+                {
+                    await Send.StringAsync("Le produit est déjà dans le devis", 400, cancellation: ct);
+                }
+
+                QuotationProduct? productOnQuotation = mapper.Map<QuotationProduct>(line);
+                productOnQuotation.QuotationId = quotation.Id;
+
+                await quotationProductsRepository.AddAsync(productOnQuotation, ct);
             }
-
-            quotation.QuotationProducts.Add(new QuotationProduct
-            {
-                ProductId = product.Id,
-                Quantity = line.Quantity,
-            });
         }
 
         await quotationsRepository.AddAsync(quotation, ct);
-
-        await Send.OkAsync(mapper.Map<GetQuotationDto>(quotation), ct);
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Quotations/DeleteProductFromQuotationEndpoint.cs

@@ -1,10 +1,9 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.QuotationProducts;
 
-namespace PyroFetes.Endpoints.QuotationProducts;
+namespace PyroFetes.Endpoints.Quotations;
 
 public class DeleteQuotationProductRequest
 {
@@ -12,28 +11,26 @@ public class DeleteQuotationProductRequest
     public int QuotationId { get; set; }
 }
 
-public class DeleteQuotationProductEndpoint(QuotationProductsRepository quotationProductsRepository) : Endpoint<DeleteQuotationProductRequest>
+public class DeleteProductFromQuotationEndpoint(QuotationProductsRepository quotationProductsRepository) : Endpoint<DeleteQuotationProductRequest>
 {
     public override void Configure()
     {
-        Delete("/quotationProducts/{@ProductId}/{@QuotationId}", x => new {x.ProductId, x.QuotationId});
+        Delete("/quotations/{@ProductId}/{@QuotationId}", x => new { x.ProductId, x.QuotationId });
         AllowAnonymous();
     }
 
     public override async Task HandleAsync(DeleteQuotationProductRequest req, CancellationToken ct)
     {
         QuotationProduct? quotationProduct =
-            await quotationProductsRepository.FirstOrDefaultAsync(
-                new GetQuotationProductByProductIdAndQuotationIdSpec(req.ProductId, req.QuotationId), ct);
+            await quotationProductsRepository.SingleOrDefaultAsync(new GetQuotationProductByProductIdAndQuotationIdSpec(req.ProductId, req.QuotationId), ct);
 
-        if (quotationProduct == null)
+        if (quotationProduct is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
+
         await quotationProductsRepository.DeleteAsync(quotationProduct, ct);
-        
         await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Quotations/DeleteQuotationEndpoint.cs

@@ -1,5 +1,4 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.Quotations;
@@ -11,33 +10,25 @@ public class DeleteQuotationRequest
     public int Id { get; set; }
 }
 
-public class DeleteQuotationEndpoint(
-    QuotationsRepository quotationsRepository,
-    QuotationProductsRepository quotationProductsRepository) : Endpoint<DeleteQuotationRequest>
+public class DeleteQuotationEndpoint(QuotationsRepository quotationsRepository) : Endpoint<DeleteQuotationRequest>
 {
     public override void Configure()
     {
-        Delete("/quotations/{@Id}", x => new {x.Id});
+        Delete("/quotations/{@Id}", x => new { x.Id });
         AllowAnonymous();
     }
 
     public override async Task HandleAsync(DeleteQuotationRequest req, CancellationToken ct)
     {
-        Quotation? quotation = await quotationsRepository.FirstOrDefaultAsync(new GetQuotationByIdSpec(req.Id), ct);
+        Quotation? quotation = await quotationsRepository.SingleOrDefaultAsync(new GetQuotationByIdSpec(req.Id), ct);
 
-        if (quotation == null)
+        if (quotation is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
-        if (quotation.QuotationProducts != null && quotation.QuotationProducts.Any())
-        {
-            await quotationProductsRepository.DeleteRangeAsync(quotation.QuotationProducts, ct);
-        }
-        
+
         await quotationsRepository.DeleteAsync(quotation, ct);
-        
         await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Quotations/GetAllQuotationEndpoint.cs

@@ -1,8 +1,5 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.Quotation.Response;
-using PyroFetes.DTO.QuotationProduct.Response;
-using PyroFetes.Models;
 using PyroFetes.Repositories;
 
 namespace PyroFetes.Endpoints.Quotations;

PyroFetes/Endpoints/Quotations/GetQuotationEndpoint.cs

@@ -1,7 +1,5 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.Quotation.Response;
-using PyroFetes.DTO.QuotationProduct.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.Quotations;
@@ -19,20 +17,20 @@ public class GetQuotationEndpoint(
 {
     public override void Configure()
     {
-        Get("/quotations/{@Id}", x => new {x.Id});
+        Get("/quotations/{@Id}", x => new { x.Id });
         AllowAnonymous();
     }
 
     public override async Task HandleAsync(GetQuotationRequest req, CancellationToken ct)
     {
-        Quotation? quotation = await quotationsRepository.FirstOrDefaultAsync(new GetQuotationByIdSpec(req.Id), ct);
+        Quotation? quotation = await quotationsRepository.SingleOrDefaultAsync(new GetQuotationByIdSpec(req.Id), ct);
 
-        if (quotation == null)
+        if (quotation is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
+
         await Send.OkAsync(mapper.Map<GetQuotationDto>(quotation), ct);
     }
 }

PyroFetes/Endpoints/Quotations/GetQuotationPdfEndpoint.cs

@@ -10,33 +10,35 @@ namespace PyroFetes.Endpoints.Quotations;
 
 public class GetQuotationPdfEndpoint(
     QuotationsRepository quotationRepository,
-    IQuotationPdfService quotationPdfService) 
+    IQuotationPdfService quotationPdfService, 
+    SettingsRepository settingsRepository)
     : Endpoint<GetQuotationPdfDto, byte[]>
 {
     public override void Configure()
     {
-        Get("/quotations/{@Id}/pdf", x => new {x.Id});
+        Get("/quotations/{@Id}/pdf", x => new { x.Id });
         AllowAnonymous();
         Description(b => b.Produces<byte[]>(200, MediaTypeNames.Application.Pdf));
     }
-    
+
     public override async Task HandleAsync(GetQuotationPdfDto req, CancellationToken ct)
     {
-        Quotation? quotation = await quotationRepository
-            .FirstOrDefaultAsync(new GetQuotationByIdWithProductsSpec(req.Id), ct);
+        Quotation? quotation = await quotationRepository.SingleOrDefaultAsync(new GetQuotationByIdWithProductsSpec(req.Id), ct);
 
-        if (quotation == null)
+        if (quotation is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
+
+        Setting? setting = await settingsRepository.FirstOrDefaultAsync(ct);
         
-        var bytes = quotationPdfService.Generate(quotation, quotation.QuotationProducts!);
+        byte[] bytes = quotationPdfService.Generate(quotation, quotation.QuotationProducts!, setting!);
 
         await Send.BytesAsync(
             bytes: bytes,
             contentType: "application/pdf",
-            fileName: $"devis-{quotation.Id}.pdf",
+            fileName: $"devis-{quotation.Id}{DateOnly.FromDateTime(DateTime.Now)}.pdf",
             cancellation: ct);
     }
 }

PyroFetes/Endpoints/Quotations/PatchQuotationConditionsSaleEndpoint.cs

@@ -9,7 +9,7 @@ namespace PyroFetes.Endpoints.Quotations;
 
 public class PatchQuotationConditionsSaleEndpoint(
     QuotationsRepository quotationsRepository,
-    AutoMapper.IMapper mapper) : Endpoint<PatchQuotationConditionsSaleDto, GetQuotationDto>
+    AutoMapper.IMapper mapper) : Endpoint<PatchQuotationConditionsSaleDto>
 {
     public override void Configure()
     {
@@ -19,18 +19,17 @@ public class PatchQuotationConditionsSaleEndpoint(
 
     public override async Task HandleAsync(PatchQuotationConditionsSaleDto req, CancellationToken ct)
     {
-        Quotation? quotation = await quotationsRepository.FirstOrDefaultAsync(new GetQuotationByIdSpec(req.Id), ct);
-        
-        if (quotation == null)
+        Quotation? quotation = await quotationsRepository.SingleOrDefaultAsync(new GetQuotationByIdSpec(req.Id), ct);
+
+        if (quotation is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
-        quotation.ConditionsSale = req.ConditionsSale;
-        await quotationsRepository.UpdateAsync(quotation, ct);
 
+        mapper.Map(req, quotation);
         
-        await Send.OkAsync(mapper.Map<GetQuotationDto>(quotation), ct);
+        await quotationsRepository.SaveChangesAsync(ct);
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Quotations/PatchQuotationMessageEndpoint.cs

@@ -0,0 +1,35 @@
+using FastEndpoints;
+using PyroFetes.DTO.Quotation.Request;
+using PyroFetes.DTO.Quotation.Response;
+using PyroFetes.Models;
+using PyroFetes.Repositories;
+using PyroFetes.Specifications.Quotations;
+
+namespace PyroFetes.Endpoints.Quotations;
+
+public class PatchQuotationMessageEndpoint(
+    QuotationsRepository quotationsRepository,
+    AutoMapper.IMapper mapper) : Endpoint<PatchQuotationMessageDto>
+{
+    public override void Configure()
+    {
+        Patch("/quotations/{@Id}/message", x => new { x.Id });
+        AllowAnonymous();
+    }
+
+    public override async Task HandleAsync(PatchQuotationMessageDto req, CancellationToken ct)
+    {
+        Quotation? quotation = await quotationsRepository.SingleOrDefaultAsync(new GetQuotationByIdSpec(req.Id), ct);
+
+        if (quotation is null)
+        {
+            await Send.NotFoundAsync(ct);
+            return;
+        }
+
+        mapper.Map(req, quotation);
+        
+        await quotationsRepository.SaveChangesAsync(ct);
+        await Send.NoContentAsync(ct);
+    }
+}

PyroFetes/Endpoints/Quotations/PatchQuotationProductQuantityEndpoint.cs

@@ -1,37 +1,35 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.QuotationProduct.Request;
 using PyroFetes.DTO.QuotationProduct.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.QuotationProducts;
 
-namespace PyroFetes.Endpoints.QuotationProducts;
+namespace PyroFetes.Endpoints.Quotations;
 
 public class PatchQuotationProductQuantityEndpoint(
     QuotationProductsRepository quotationProductsRepository,
-    AutoMapper.IMapper mapper) : Endpoint<PatchQuotationProductQuantityDto, GetQuotationProductDto>
+    AutoMapper.IMapper mapper) : Endpoint<PatchQuotationProductQuantityDto>
 {
     public override void Configure()
     {
-        Patch("/quotationProducts/{@ProductId}/{@QuotationId}/Quantity", x => new { x.ProductId, x.QuotationId });
+        Patch("/quotations/{@ProductId}/{@QuotationId}/Quantity", x => new { x.ProductId, x.QuotationId });
         AllowAnonymous();
     }
 
     public override async Task HandleAsync(PatchQuotationProductQuantityDto req, CancellationToken ct)
     {
         QuotationProduct? quotationProduct =
-            await quotationProductsRepository.FirstOrDefaultAsync(
-                new GetQuotationProductByProductIdAndQuotationIdSpec(req.ProductId, req.QuotationId), ct);
-        if (quotationProduct == null)
+            await quotationProductsRepository.SingleOrDefaultAsync(new GetQuotationProductByProductIdAndQuotationIdSpec(req.ProductId, req.QuotationId), ct);
+        if (quotationProduct is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
+
+        mapper.Map(req, quotationProduct);
         
-        quotationProduct.Quantity = req.Quantity;
-        await quotationProductsRepository.UpdateAsync(quotationProduct, ct);
-        
-        await Send.OkAsync(mapper.Map<GetQuotationProductDto>(quotationProduct), ct);
+        await quotationProductsRepository.SaveChangesAsync(ct);
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Quotations/UpdateQuotationEndpoint.cs

@@ -9,7 +9,7 @@ namespace PyroFetes.Endpoints.Quotations;
 
 public class UpdateQuotationEndpoint(
     QuotationsRepository quotationsRepository,
-    AutoMapper.IMapper mapper) : Endpoint<UpdateQuotationDto, GetQuotationDto>
+    AutoMapper.IMapper mapper) : Endpoint<UpdateQuotationDto>
 {
     public override void Configure()
     {
@@ -19,18 +19,17 @@ public class UpdateQuotationEndpoint(
 
     public override async Task HandleAsync(UpdateQuotationDto req, CancellationToken ct)
     {
-        Quotation? quotation = await quotationsRepository.FirstOrDefaultAsync(new GetQuotationByIdSpec(req.Id), ct);
-        
-        if (quotation == null)
+        Quotation? quotation = await quotationsRepository.SingleOrDefaultAsync(new GetQuotationByIdSpec(req.Id), ct);
+
+        if (quotation is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
+
+        mapper.Map(req, quotation);
         
-        quotation.ConditionsSale = req.ConditionsSale;
-        quotation.Message = req.Message;
-        await quotationsRepository.UpdateAsync(quotation, ct);
-        
-        await Send.OkAsync(mapper.Map<GetQuotationDto>(quotation), ct);
+        await quotationsRepository.SaveChangesAsync(ct);
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Settings/CreateSettingEndpoint.cs

@@ -1,14 +1,11 @@
 using FastEndpoints;
 using PyroFetes.DTO.SettingDTO.Request;
-using PyroFetes.DTO.SettingDTO.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 
 namespace PyroFetes.Endpoints.Settings;
 
-public class CreateSettingEndpoint(
-    SettingsRepository settingsRepository,
-    AutoMapper.IMapper mapper) : Endpoint<CreateSettingDto, GetSettingDto>
+public class CreateSettingEndpoint(SettingsRepository settingsRepository) : Endpoint<CreateSettingDto>
 {
     public override void Configure()
     {
@@ -18,14 +15,21 @@ public class CreateSettingEndpoint(
 
     public override async Task HandleAsync(CreateSettingDto req, CancellationToken ct)
     {
-        Setting setting = new Setting()
-        {
-            ElectronicSignature = req.ElectronicSignature,
-            Logo = req.Logo
-        };
-        
-        await settingsRepository.AddAsync(setting, ct);
+        // Encodage en base64
+        using MemoryStream memoryStream = new();
+        if (req.Logo != null) await req.Logo.CopyToAsync(memoryStream, ct);
+        byte[] logoBytes = memoryStream.ToArray();
 
-        await Send.OkAsync(mapper.Map<GetSettingDto>(setting), ct);
+        if (req.ElectronicSignature != null) await req.ElectronicSignature.CopyToAsync(memoryStream, ct);
+        byte[] signatureBytes = memoryStream.ToArray();
+        
+        Setting setting = new()
+        {
+            ElectronicSignature = Convert.ToBase64String(signatureBytes),
+            Logo = Convert.ToBase64String(logoBytes)
+        };
+
+        await settingsRepository.AddAsync(setting, ct);
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Settings/DeleteSettingEndpoint.cs

@@ -1,5 +1,4 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.Settings;
@@ -15,22 +14,21 @@ public class DeleteSettingEndpoint(SettingsRepository settingsRepository) : Endp
 {
     public override void Configure()
     {
-        Delete("/settings/{@Id}", x => new {x.Id});
+        Delete("/settings/{@Id}", x => new { x.Id });
         AllowAnonymous();
     }
-    
+
     public override async Task HandleAsync(DeleteSettingRequest req, CancellationToken ct)
     {
-        Setting? setting = await settingsRepository.FirstOrDefaultAsync(new GetSettingByIdSpec(req.Id), ct);
+        Setting? setting = await settingsRepository.SingleOrDefaultAsync(new GetSettingByIdSpec(req.Id), ct);
 
-        if (setting == null)
+        if (setting is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
+
         await settingsRepository.DeleteAsync(setting, ct);
-        
         await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Settings/GetSettingEndpoint.cs

@@ -1,5 +1,4 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.SettingDTO.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
@@ -18,15 +17,15 @@ public class GetSettingEndpoint(
 {
     public override void Configure()
     {
-        Get("/settings/{@Id}", x => new {x.Id});
+        Get("/settings/{@Id}", x => new { x.Id });
         AllowAnonymous();
     }
-    
+
     public override async Task HandleAsync(GetSettingRequest req, CancellationToken ct)
     {
-        Setting? setting = await settingsRepository.FirstOrDefaultAsync(new GetSettingByIdSpec(req.Id), ct);
+        Setting? setting = await settingsRepository.SingleOrDefaultAsync(new GetSettingByIdSpec(req.Id), ct);
 
-        if (setting == null)
+        if (setting is null)
         {
             await Send.NotFoundAsync(ct);
             return;

PyroFetes/Endpoints/Settings/PatchSettingElectronicSignatureEndpoint.cs

@@ -1,36 +1,37 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.SettingDTO.Request;
-using PyroFetes.DTO.SettingDTO.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.Settings;
 
 namespace PyroFetes.Endpoints.Settings;
 
-public class PatchSettingElectronicSignatureEndpoint(
-    SettingsRepository settingsRepository,
-    AutoMapper.IMapper mapper) : Endpoint<PatchSettingElectronicSignatureDto, GetSettingDto>
+public class PatchSettingElectronicSignatureEndpoint(SettingsRepository settingsRepository) : Endpoint<PatchSettingElectronicSignatureDto>
 {
     public override void Configure()
     {
-        Patch("/settings/{@Id}/ElectronicSignature", x => new {x.Id});
+        Patch("/settings/{@Id}/ElectronicSignature", x => new { x.Id });
         AllowAnonymous();
     }
-    
+
     public override async Task HandleAsync(PatchSettingElectronicSignatureDto req, CancellationToken ct)
     {
-        Setting? setting = await settingsRepository.FirstOrDefaultAsync(new GetSettingByIdSpec(req.Id), ct);
-        
-        if (setting == null)
+        Setting? setting = await settingsRepository.SingleOrDefaultAsync(new GetSettingByIdSpec(req.Id), ct);
+
+        if (setting is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
 
-        setting.ElectronicSignature = req.ElectronicSignature;
-        await settingsRepository.UpdateAsync(setting, ct);
-
-        await Send.OkAsync(mapper.Map<GetSettingDto>(setting), ct);
+        // Encodage en base64
+        using MemoryStream memoryStream = new();
+        if (req.ElectronicSignature != null) await req.ElectronicSignature.CopyToAsync(memoryStream, ct);
+        byte[] signatureBytes = memoryStream.ToArray();
+        
+        setting.ElectronicSignature = Convert.ToBase64String(signatureBytes);
+        
+        await settingsRepository.SaveChangesAsync(ct);
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Settings/PatchSettingLogoEndpoint.cs

@@ -1,36 +1,37 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.SettingDTO.Request;
-using PyroFetes.DTO.SettingDTO.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.Settings;
 
 namespace PyroFetes.Endpoints.Settings;
 
-public class PatchSettingLogoEndpoint(
-    SettingsRepository settingsRepository,
-    AutoMapper.IMapper mapper) : Endpoint<PatchSettingLogoDto, GetSettingDto>
+public class PatchSettingLogoEndpoint(SettingsRepository settingsRepository) : Endpoint<PatchSettingLogoDto>
 {
     public override void Configure()
     {
-        Patch("/settings/{@Id}/logo", x => new {x.Id});
+        Patch("/settings/{@Id}/logo", x => new { x.Id });
         AllowAnonymous();
     }
-    
+
     public override async Task HandleAsync(PatchSettingLogoDto req, CancellationToken ct)
     {
-        Setting? setting = await settingsRepository.FirstOrDefaultAsync(new GetSettingByIdSpec(req.Id), ct);
+        Setting? setting = await settingsRepository.SingleOrDefaultAsync(new GetSettingByIdSpec(req.Id), ct);
 
-        if (setting == null)
+        if (setting is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
 
-        setting.Logo = req.Logo;
-        await settingsRepository.UpdateAsync(setting, ct);
+        // Encodage en base64
+        using MemoryStream memoryStream = new();
+        if (req.Logo != null) await req.Logo.CopyToAsync(memoryStream, ct);
+        byte[] logoBytes = memoryStream.ToArray();
         
-        await Send.OkAsync(mapper.Map<GetSettingDto>(setting), ct);
+        setting.Logo = Convert.ToBase64String(logoBytes);
+        
+        await settingsRepository.SaveChangesAsync(ct);
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Suppliers/AddProductToSupplierEndpoint.cs

@@ -0,0 +1,43 @@
+using FastEndpoints;
+using PyroFetes.DTO.Price.Request;
+using PyroFetes.Models;
+using PyroFetes.Repositories;
+using PyroFetes.Specifications.Prices;
+using PyroFetes.Specifications.Products;
+using PyroFetes.Specifications.Suppliers;
+
+namespace PyroFetes.Endpoints.Suppliers;
+
+public class AddProductToSupplierEndpoint(
+    SuppliersRepository suppliersRepository,
+    ProductsRepository productsRepository,
+    PricesRepository pricesRepository, 
+    AutoMapper.IMapper mapper) : Endpoint<CreatePriceDto>
+{
+    public override void Configure()
+    {
+        Post("/suppliers/{@SupplierId}/{@ProductId}/", x => new { x.SupplierId, x.ProductId });
+        AllowAnonymous();
+    }
+
+    public override async Task HandleAsync(CreatePriceDto req, CancellationToken ct)
+    {
+        Supplier? supplier = await suppliersRepository.FirstOrDefaultAsync(new GetSupplierByIdSpec(req.SupplierId), ct);
+        Product? product = await productsRepository.SingleOrDefaultAsync(new GetProductByIdSpec(req.ProductId), ct);
+        if (supplier is null || product is null)
+        {
+            await Send.NotFoundAsync(ct);
+            return;
+        }
+
+        Price? existingPrice = await pricesRepository.SingleOrDefaultAsync(new GetPriceByProductIdAndSupplierIdSpec(req.ProductId, req.SupplierId), ct);
+        if (existingPrice is not null)
+        {
+            await Send.StringAsync("Le fournisseur a déjà un prix pour ce produit.", 400, cancellation: ct);
+            return;
+        }
+        
+        await pricesRepository.AddAsync(mapper.Map<Price>(req), ct);
+        await Send.NoContentAsync(ct);
+    }
+}

PyroFetes/Endpoints/Suppliers/CreateSupplierEndpoint.cs

@@ -1,14 +1,11 @@
 using FastEndpoints;
 using PyroFetes.DTO.Supplier.Request;
-using PyroFetes.DTO.Supplier.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 
 namespace PyroFetes.Endpoints.Suppliers;
 
-public class CreateSupplierEndpoint(
-    SuppliersRepository suppliersRepository,
-    AutoMapper.IMapper mapper) : Endpoint<CreateSupplierDto, GetSupplierDto>
+public class CreateSupplierEndpoint(SuppliersRepository suppliersRepository, AutoMapper.IMapper mapper) : Endpoint<CreateSupplierDto>
 {
     public override void Configure()
     {
@@ -18,19 +15,7 @@ public class CreateSupplierEndpoint(
 
     public override async Task HandleAsync(CreateSupplierDto req, CancellationToken ct)
     {
-        Supplier? supplier = new Supplier()
-        {
-            Name = req.Name,
-            Email = req.Email,
-            Phone = req.Phone,
-            Address = req.Address,
-            City = req.City,
-            ZipCode = req.ZipCode,
-            DeliveryDelay = req.DeliveryDelay
-        };
-        
-        await suppliersRepository.AddAsync(supplier, ct);
-
-        await Send.OkAsync(mapper.Map<GetSupplierDto>(supplier), ct);
+        await suppliersRepository.AddAsync(mapper.Map<Supplier>(req), ct);
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Suppliers/DeleteProductToSupplierEndpoint.cs

@@ -1,10 +1,9 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.Prices;
 
-namespace PyroFetes.Endpoints.Prices;
+namespace PyroFetes.Endpoints.Suppliers;
 
 public class DeletePriceRequest
 {
@@ -12,26 +11,25 @@ public class DeletePriceRequest
     public int SupplierId { get; set; }
 }
 
-public class DeletePriceEndpoint(PricesRepository pricesRepository) : Endpoint<DeletePriceRequest>
+public class DeleteProductToSupplierEndpoint(PricesRepository pricesRepository) : Endpoint<DeletePriceRequest>
 {
     public override void Configure()
     {
-        Delete("/prices/{@ProductId}/{@SupplierId}", x => new {x.ProductId, x.SupplierId});
+        Delete("/suppliers/{@SupplierId}/{@Product}", x => new { x.SupplierId, x.ProductId });
         AllowAnonymous();
     }
 
     public override async Task HandleAsync(DeletePriceRequest req, CancellationToken ct)
     {
-        Price? price = await pricesRepository.FirstOrDefaultAsync(new GetPriceByProductIdAndSupplierIdSpec(req.ProductId,req.SupplierId), ct);
+        Price? price = await pricesRepository.SingleOrDefaultAsync(new GetPriceByProductIdAndSupplierIdSpec(req.ProductId, req.SupplierId), ct);
 
-        if (price == null)
+        if (price is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
-        await  pricesRepository.DeleteAsync(price, ct);
-        
+
+        await pricesRepository.DeleteAsync(price, ct);
         await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Suppliers/DeleteSupplierEndpoint.cs

@@ -1,5 +1,4 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.Suppliers;
@@ -15,22 +14,21 @@ public class DeleteSupplierEndpoint(SuppliersRepository suppliersRepository) : E
 {
     public override void Configure()
     {
-        Delete("/suppliers/{@Id}", x => new {x.Id});
+        Delete("/suppliers/{@Id}", x => new { x.Id });
         AllowAnonymous();
     }
-    
+
     public override async Task HandleAsync(DeleteSupplierRequest req, CancellationToken ct)
     {
-        Supplier? supplier = await suppliersRepository.FirstOrDefaultAsync(new GetSupplierByIdSpec(req.Id), ct);
+        Supplier? supplier = await suppliersRepository.SingleOrDefaultAsync(new GetSupplierByIdSpec(req.Id), ct);
 
-        if (supplier == null)
+        if (supplier is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
-        await  suppliersRepository.DeleteAsync(supplier, ct);
-        
+
+        await suppliersRepository.DeleteAsync(supplier, ct);
         await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Suppliers/GetAllSuppliersEndpoint.cs

@@ -1,5 +1,4 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.Supplier.Response;
 using PyroFetes.Repositories;
 

PyroFetes/Endpoints/Suppliers/GetSupplierEndpoint.cs

@@ -1,5 +1,4 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.Supplier.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
@@ -12,21 +11,19 @@ public class GetSupplierRequest
     public int Id { get; set; }
 }
 
-public class GetSupplierEndpoint(
-    SuppliersRepository suppliersRepository,
-    AutoMapper.IMapper mapper) : Endpoint<GetSupplierRequest, GetSupplierDto>
+public class GetSupplierEndpoint(SuppliersRepository suppliersRepository, AutoMapper.IMapper mapper) : Endpoint<GetSupplierRequest, GetSupplierDto>
 {
     public override void Configure()
     {
-        Get("/suppliers/{@Id}", x => new {x.Id});
+        Get("/suppliers/{@Id}", x => new { x.Id });
         AllowAnonymous();
     }
-    
+
     public override async Task HandleAsync(GetSupplierRequest req, CancellationToken ct)
     {
-        Supplier? supplier = await suppliersRepository.FirstOrDefaultAsync(new GetSupplierByIdSpec(req.Id), ct);
+        Supplier? supplier = await suppliersRepository.SingleOrDefaultAsync(new GetSupplierByIdSpec(req.Id), ct);
 
-        if (supplier == null)
+        if (supplier is null)
         {
             await Send.NotFoundAsync(ct);
             return;

PyroFetes/Endpoints/Suppliers/PatchPriceEndpoint.cs

@@ -1,15 +1,14 @@
 using FastEndpoints;
 using PyroFetes.DTO.Price.Request;
-using PyroFetes.DTO.Price.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.Prices;
 
-namespace PyroFetes.Endpoints.Prices;
+namespace PyroFetes.Endpoints.Suppliers;
 
 public class PatchPriceEndpoint(
     PricesRepository pricesRepository,
-    AutoMapper.IMapper mapper) : Endpoint<PatchPriceSellingPriceDto, GetPriceDto>
+    AutoMapper.IMapper mapper) : Endpoint<PatchPriceSellingPriceDto>
 {
     public override void Configure()
     {
@@ -19,18 +18,17 @@ public class PatchPriceEndpoint(
 
     public override async Task HandleAsync(PatchPriceSellingPriceDto req, CancellationToken ct)
     {
-        Price? price = await pricesRepository.FirstOrDefaultAsync(new GetPriceByProductIdAndSupplierIdSpec(req.ProductId, req.SupplierId),ct);
-        
-        if (price == null)
+        Price? price = await pricesRepository.SingleOrDefaultAsync(new GetPriceByProductIdAndSupplierIdSpec(req.ProductId, req.SupplierId), ct);
+
+        if (price is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
+
+        mapper.Map(req, price);
         
-        price.SellingPrice = req.SellingPrice;
-        
-        await pricesRepository.UpdateAsync(price, ct);
-        
-        await Send.OkAsync(mapper.Map<GetPriceDto>(price), ct);
+        await pricesRepository.SaveChangesAsync(ct);
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Suppliers/PatchSupplierDeliveryDelayEndpoint.cs

@@ -1,5 +1,4 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.Supplier.Request;
 using PyroFetes.DTO.Supplier.Response;
 using PyroFetes.Models;
@@ -8,29 +7,27 @@ using PyroFetes.Specifications.Suppliers;
 
 namespace PyroFetes.Endpoints.Suppliers;
 
-public class PatchSupplierDeliveryDelayEndpoint(
-    SuppliersRepository suppliersRepository,
-    AutoMapper.IMapper mapper) : Endpoint<PatchSupplierDeliveryDelayDto, GetSupplierDto>
+public class PatchSupplierDeliveryDelayEndpoint(SuppliersRepository suppliersRepository, AutoMapper.IMapper mapper) : Endpoint<PatchSupplierDeliveryDelayDto>
 {
     public override void Configure()
     {
-        Patch("/suppliers/{@Id}/deliveryDelay", x => new {x.Id});
+        Patch("/suppliers/{@Id}/deliveryDelay", x => new { x.Id });
         AllowAnonymous();
     }
-    
+
     public override async Task HandleAsync(PatchSupplierDeliveryDelayDto req, CancellationToken ct)
     {
-        Supplier? supplier = await suppliersRepository.FirstOrDefaultAsync(new GetSupplierByIdSpec(req.Id), ct);
+        Supplier? supplier = await suppliersRepository.SingleOrDefaultAsync(new GetSupplierByIdSpec(req.Id), ct);
 
-        if (supplier == null)
+        if (supplier is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
 
         supplier.DeliveryDelay = req.DeliveryDelay;
-        await suppliersRepository.UpdateAsync(supplier, ct);
-        
+        await suppliersRepository.SaveChangesAsync(ct);
+
         await Send.OkAsync(mapper.Map<GetSupplierDto>(supplier), ct);
     }
 }

PyroFetes/Endpoints/Suppliers/UpdateSupplierEndpoint.cs

@@ -1,43 +1,31 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.Supplier.Request;
-using PyroFetes.DTO.Supplier.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.Suppliers;
 
 namespace PyroFetes.Endpoints.Suppliers;
 
-public class UpdateSupplierEndpoint(
-    SuppliersRepository suppliersRepository,
-    AutoMapper.IMapper mapper) : Endpoint<UpdateSupplierDto, GetSupplierDto>
+public class UpdateSupplierEndpoint(SuppliersRepository suppliersRepository, AutoMapper.IMapper mapper) : Endpoint<UpdateSupplierDto>
 {
     public override void Configure()
     {
-        Put("/suppliers/{@Id}", x => new {x.Id});
+        Put("/suppliers/{@Id}", x => new { x.Id });
         AllowAnonymous();
     }
 
     public override async Task HandleAsync(UpdateSupplierDto req, CancellationToken ct)
     {
         Supplier? supplier = await suppliersRepository.FirstOrDefaultAsync(new GetSupplierByIdSpec(req.Id), ct);
-        
-        if (supplier == null)
+        if (supplier is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
 
-        supplier.Name = req.Name;
-        supplier.Email = req.Email;
-        supplier.Phone = req.Phone;
-        supplier.Address = req.Address;
-        supplier.City = req.City;
-        supplier.ZipCode = req.ZipCode;
-        supplier.DeliveryDelay = req.DeliveryDelay;
-        
-        await suppliersRepository.UpdateAsync(supplier, ct);
-        
-        await Send.OkAsync(mapper.Map<GetSupplierDto>(supplier), ct);
+        mapper.Map(req, supplier);
+
+        await suppliersRepository.SaveChangesAsync(ct);
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Users/ConnectUserEndpoint.cs

@@ -19,31 +19,30 @@ public class ConnectUserEndpoint(UsersRepository usersRepository) : Endpoint<Con
 
     public override async Task HandleAsync(ConnectUserDto req, CancellationToken ct)
     {
-        User? user = await usersRepository.FirstOrDefaultAsync(new GetUserByNameSpec(req.Name!), ct);
+        User? user = await usersRepository.SingleOrDefaultAsync(new GetUserByNameSpec(req.Name!), ct);
 
-        if (user == null)
+        if (user is null)
         {
             await Send.UnauthorizedAsync(ct);
             return;
         }
-        
+
         if (BCrypt.Net.BCrypt.Verify(req.Password + user.Salt, user.Password))
         {
-            string jwtToken = JwtBearer.CreateToken(
-                o =>
-                {
-                    o.SigningKey = "ThisIsASuperSecretJwtKeyThatIsAtLeast32CharsLong";
-                    o.ExpireAt = DateTime.UtcNow.AddMinutes(15);
-                    if (user.Fonction != null) o.User.Roles.Add(user.Fonction);
-                    o.User.Claims.Add(("Name", user.Name)!);
-                    o.User.Claims.Add(("Id", user.Id.ToString())!);
-                });
+            string jwtToken = JwtBearer.CreateToken(o =>
+            {
+                o.SigningKey = "ThisIsASuperSecretJwtKeyThatIsAtLeast32CharsLong";
+                o.ExpireAt = DateTime.UtcNow.AddMinutes(15);
+                if (user.Fonction is not null) o.User.Roles.Add(user.Fonction);
+                o.User.Claims.Add(("Name", user.Name)!);
+                o.User.Claims.Add(("Id", user.Id.ToString())!);
+            });
 
             GetTokenDto responseDto = new()
             {
                 Token = jwtToken
             };
-            
+
             await Send.OkAsync(responseDto, ct);
         }
         else await Send.UnauthorizedAsync(ct);

PyroFetes/Endpoints/Users/CreateUserEndpoint.cs

@@ -8,9 +8,7 @@ using PyroFetes.Specifications.Users;
 
 namespace PyroFetes.Endpoints.Users;
 
-public class CreateUserEndpoint(
-    UsersRepository usersRepository,
-    AutoMapper.IMapper mapper) : Endpoint<CreateUserDto, GetUserDto>
+public class CreateUserEndpoint(UsersRepository usersRepository) : Endpoint<CreateUserDto, GetUserDto>
 {
     public override void Configure()
     {
@@ -20,17 +18,17 @@ public class CreateUserEndpoint(
 
     public override async Task HandleAsync(CreateUserDto req, CancellationToken ct)
     {
-        User? ckeckName = await usersRepository.FirstOrDefaultAsync(new GetUserByNameSpec(req.Name!), ct);
-        
-        if (ckeckName != null)
+        User? ckeckName = await usersRepository.SingleOrDefaultAsync(new GetUserByNameSpec(req.Name!), ct);
+
+        if (ckeckName is not null)
         {
-            await Send.StringAsync("Ce nom d'utilisateur existe déjà.",409, cancellation: ct);
+            await Send.StringAsync("Ce nom d'utilisateur existe déjà.", 400, cancellation: ct);
             return;
         }
-        
+
         string? salt = new Password().IncludeLowercase().IncludeUppercase().IncludeNumeric().LengthRequired(24).Next();
-        
-        User user = new User()
+
+        User user = new()
         {
             Name = req.Name,
             Password = BCrypt.Net.BCrypt.HashPassword(req.Password + salt),
@@ -38,9 +36,8 @@ public class CreateUserEndpoint(
             Email = req.Email,
             Fonction = req.Fonction
         };
-        
+
         await usersRepository.AddAsync(user, ct);
-        
-        await Send.OkAsync(mapper.Map<GetUserDto>(user), ct);
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Users/DeleteUserEndpoint.cs

@@ -1,5 +1,4 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.Users;
@@ -15,22 +14,21 @@ public class DeleteUserEndpoint(UsersRepository usersRepository) : Endpoint<Dele
 {
     public override void Configure()
     {
-        Delete("/users/{@Id}", x => new {x.Id});
+        Delete("/users/{@Id}", x => new { x.Id });
         AllowAnonymous();
     }
 
     public override async Task HandleAsync(DeleteUserRequest req, CancellationToken ct)
     {
-        User? user = await usersRepository.FirstOrDefaultAsync(new GetUserByIdSpec(req.Id), ct);
+        User? user = await usersRepository.SingleOrDefaultAsync(new GetUserByIdSpec(req.Id), ct);
 
-        if (user == null)
+        if (user is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
+
         await usersRepository.DeleteAsync(user, ct);
-        
         await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Users/GetAllUsersEndpoint.cs

@@ -1,5 +1,4 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.User.Response;
 using PyroFetes.Repositories;
 

PyroFetes/Endpoints/Users/GetUserEndpoint.cs

@@ -1,5 +1,4 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.User.Response;
 using PyroFetes.Models;
 using PyroFetes.Repositories;
@@ -12,26 +11,24 @@ public class GetUserRequest
     public int Id { get; set; }
 }
 
-public class GetUserEndpoint(
-    UsersRepository usersRepository,
-    AutoMapper.IMapper mapper) : Endpoint<GetUserRequest, GetUserDto>
+public class GetUserEndpoint(UsersRepository usersRepository, AutoMapper.IMapper mapper) : Endpoint<GetUserRequest, GetUserDto>
 {
     public override void Configure()
     {
-        Get("/users/{@Id}", x => new {x.Id});
+        Get("/users/{@Id}", x => new { x.Id });
         AllowAnonymous();
     }
 
     public override async Task HandleAsync(GetUserRequest req, CancellationToken ct)
     {
-        User? user = await usersRepository.FirstOrDefaultAsync(new GetUserByIdSpec(req.Id), ct);
+        User? user = await usersRepository.SingleOrDefaultAsync(new GetUserByIdSpec(req.Id), ct);
 
-        if (user == null)
+        if (user is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
+
         await Send.OkAsync(mapper.Map<GetUserDto>(user), ct);
     }
 }

PyroFetes/Endpoints/Users/PatchUserPasswordEndpoint.cs

@@ -1,5 +1,4 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.User.Request;
 using PyroFetes.DTO.User.Response;
 using PyroFetes.Models;
@@ -8,9 +7,7 @@ using PyroFetes.Specifications.Users;
 
 namespace PyroFetes.Endpoints.Users;
 
-public class PatchUserPasswordEndpoint(
-    UsersRepository usersRepository,
-    AutoMapper.IMapper mapper) : Endpoint<PatchUserPasswordDto, GetUserDto>
+public class PatchUserPasswordEndpoint(UsersRepository usersRepository,AutoMapper.IMapper mapper) : Endpoint<PatchUserPasswordDto, GetUserDto>
 {
     public override void Configure()
     {
@@ -20,9 +17,9 @@ public class PatchUserPasswordEndpoint(
 
     public override async Task HandleAsync(PatchUserPasswordDto req, CancellationToken ct)
     {
-        User? user = await usersRepository.FirstOrDefaultAsync(new GetUserByIdSpec(req.Id), ct);
-        
-        if (user == null)
+        User? user = await usersRepository.SingleOrDefaultAsync(new GetUserByIdSpec(req.Id), ct);
+
+        if (user is null)
         {
             await Send.NotFoundAsync(ct);
             return;
@@ -30,7 +27,7 @@ public class PatchUserPasswordEndpoint(
 
         user.Password = BCrypt.Net.BCrypt.HashPassword(req.Password + user.Salt);
         await usersRepository.UpdateAsync(user, ct);
-        
-        await Send.OkAsync(mapper.Map<GetUserDto>(user), ct);
+
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/Users/UpdateUserEndpoint.cs

@@ -1,5 +1,4 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PasswordGenerator;
 using PyroFetes.DTO.User.Request;
 using PyroFetes.DTO.User.Response;
@@ -9,43 +8,41 @@ using PyroFetes.Specifications.Users;
 
 namespace PyroFetes.Endpoints.Users;
 
-public class UpdateUserEndpoint(
-    UsersRepository usersRepository,
-    AutoMapper.IMapper mapper) : Endpoint<UpdateUserDto, GetUserDto>
+public class UpdateUserEndpoint(UsersRepository usersRepository) : Endpoint<UpdateUserDto, GetUserDto>
 {
     public override void Configure()
     {
-        Put("/users/{@Id}", x => new {x.Id});
+        Put("/users/{@Id}", x => new { x.Id });
         AllowAnonymous();
     }
 
     public override async Task HandleAsync(UpdateUserDto req, CancellationToken ct)
     {
-        User? user = await usersRepository.FirstOrDefaultAsync(new GetUserByIdSpec(req.Id), ct);
-        User? ckeckName = await usersRepository.FirstOrDefaultAsync(new GetUserByNameSpec(req.Name!), ct);
+        User? user = await usersRepository.SingleOrDefaultAsync(new GetUserByIdSpec(req.Id), ct);
+        User? ckeckName = await usersRepository.SingleOrDefaultAsync(new GetUserByNameSpec(req.Name!), ct);
 
-        if (user == null)
+        if (user is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
-        if (ckeckName != null && ckeckName.Id != user.Id)
+
+        if (ckeckName is not null && ckeckName.Id != user.Id)
         {
-            await Send.StringAsync("Ce nom d'utilisateur existe déjà.",409, cancellation: ct);
+            await Send.StringAsync("Ce nom d'utilisateur existe déjà.", 400, cancellation: ct);
             return;
         }
 
         string? salt = new Password().IncludeLowercase().IncludeUppercase().IncludeNumeric().LengthRequired(24).Next();
-        
+
         user.Name = req.Name;
         user.Password = BCrypt.Net.BCrypt.HashPassword(req.Password + salt);
         user.Salt = salt;
         user.Email = req.Email;
         user.Fonction = req.Fonction;
-        
+
         await usersRepository.UpdateAsync(user, ct);
-        
-        await Send.OkAsync(mapper.Map<GetUserDto>(user), ct);
+
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/Endpoints/WareHouseProducts/GetTotalQuantityEndpoint.cs

@@ -1,7 +1,5 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.WareHouseProduct.Response;
-using PyroFetes.Models;
 using PyroFetes.Repositories;
 using PyroFetes.Specifications.WarehouseProducts;
 
@@ -20,21 +18,20 @@ public class GetTotalQuantityEndpoint(
         Get("/wareHouseProducts/{@ProductId}", x => new { x.ProductId });
         AllowAnonymous();
     }
-    
+
     public override async Task HandleAsync(GetTotalQuantityRequest req, CancellationToken ct)
     {
-        bool exists = await warehouseProductsRepository.AnyAsync(new GetWarehouseProductByProductIdSpec(req.ProductId), ct);
+        bool exists = await warehouseProductsRepository.AnyAsync(new GetWarehouseProductByProductIdSpec(req.ProductId, null), ct);
 
         if (!exists)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
-        
-        int? totalQuantityNullable = await warehouseProductsRepository.
-            SumAsync(new GetProductTotalQuantitySpec(req.ProductId), wp => wp.Quantity, ct);
-        
-        int totalQuantity =  totalQuantityNullable ?? 0;
+
+        int? totalQuantityNullable = await warehouseProductsRepository.SumAsync(new GetProductTotalQuantitySpec(req.ProductId), wp => wp.Quantity, ct);
+
+        int totalQuantity = totalQuantityNullable ?? 0;
 
         GetTotalQuantityDto responseDto = new()
         {

PyroFetes/Endpoints/WareHouseProducts/PatchWareHouseProductQuantityEndpoint.cs

@@ -1,13 +1,13 @@
 using FastEndpoints;
-using Microsoft.EntityFrameworkCore;
 using PyroFetes.DTO.WareHouseProduct.Request;
 using PyroFetes.DTO.WareHouseProduct.Response;
 using PyroFetes.Models;
+using PyroFetes.Repositories;
+using PyroFetes.Specifications.WarehouseProducts;
 
 namespace PyroFetes.Endpoints.WareHouseProducts;
 
-public class PatchWareHouseProductQuantityEndpoint(PyroFetesDbContext database)
-    : Endpoint<PatchWareHouseProductQuantityDto, GetWareHouseProductDto>
+public class PatchWareHouseProductQuantityEndpoint(WarehouseProductsRepository warehouseProductsRepository) : Endpoint<PatchWareHouseProductQuantityDto, GetWareHouseProductDto>
 {
     public override void Configure()
     {
@@ -17,25 +17,17 @@ public class PatchWareHouseProductQuantityEndpoint(PyroFetesDbContext database)
 
     public override async Task HandleAsync(PatchWareHouseProductQuantityDto req, CancellationToken ct)
     {
-        WarehouseProduct? wareHouseProduct =
-            await database.WarehouseProducts.SingleOrDefaultAsync(
-                wp => wp.ProductId == req.ProductId && wp.WarehouseId == req.WareHouseId, ct);
-        
-        if (wareHouseProduct == null)
+        WarehouseProduct? wareHouseProduct = await warehouseProductsRepository.FirstOrDefaultAsync(new GetWarehouseProductByProductIdSpec(req.ProductId, req.WareHouseId) , ct);
+
+        if (wareHouseProduct is null)
         {
             await Send.NotFoundAsync(ct);
             return;
         }
 
         wareHouseProduct.Quantity = req.Quantity;
-        await database.SaveChangesAsync(ct);
-
-        GetWareHouseProductDto responseDto = new()
-        {
-            ProductId = wareHouseProduct.ProductId,
-            WareHouseId = wareHouseProduct.WarehouseId,
-            Quantity = wareHouseProduct.Quantity
-        };
-        await Send.OkAsync(responseDto, ct);
+        await warehouseProductsRepository.SaveChangesAsync(ct);
+        
+        await Send.NoContentAsync(ct);
     }
 }

PyroFetes/MappingProfiles/DtoToEntityMappings.cs

@@ -3,7 +3,6 @@ using PyroFetes.DTO.Deliverer.Request;
 using PyroFetes.DTO.DeliveryNote.Request;
 using PyroFetes.DTO.Price.Request;
 using PyroFetes.DTO.Product.Request;
-using PyroFetes.DTO.ProductDelivery.Request;
 using PyroFetes.DTO.PurchaseOrder.Request;
 using PyroFetes.DTO.PurchaseProduct.Request;
 using PyroFetes.DTO.Quotation.Request;
@@ -21,50 +20,65 @@ public class DtoToEntityMappings : Profile
     public DtoToEntityMappings()
     {
         CreateMap<CreateDelivererDto, Deliverer>();
-        CreateMap<UpdateDelivererDto, Deliverer>();
+        CreateMap<UpdateDelivererDto, Deliverer>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());
 
         CreateMap<CreateDeliveryNoteDto, DeliveryNote>();
-        CreateMap<UpdateDeliveryNoteDto, DeliveryNote>();
-        CreateMap<PatchDeliveryNoteRealDeliveryDateDto, DeliveryNote>();
+        CreateMap<UpdateDeliveryNoteDto, DeliveryNote>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());
+        CreateMap<PatchDeliveryNoteRealDeliveryDateDto, DeliveryNote>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());
 
         CreateMap<CreatePriceDto, Price>();
-        CreateMap<UpdatePriceDto, Price>();
-        CreateMap<PatchPriceSellingPriceDto, Price>();
+        CreateMap<PatchPriceSellingPriceDto, Price>()
+            .ForMember(dest => dest.ProductId, opt => opt.Ignore())
+            .ForMember(dest => dest.SupplierId, opt => opt.Ignore());
 
-        CreateMap<CreateProductDto, Product>();
-        CreateMap<UpdateProductDto, Product>();
-        CreateMap<PatchProductMinimalStockDto, Product>();
-
-        CreateMap<CreateProductDeliveryDto, ProductDelivery>();
-        CreateMap<UpdateProductDeliveryDto, ProductDelivery>();
+        CreateMap<UpdateProductDto, Product>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());
+        CreateMap<PatchProductMinimalStockDto, Product>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());
         
         CreateMap<CreatePurchaseOrderDto, PurchaseOrder>();
-        CreateMap<PatchPurchaseOrderPurchaseConditionsDto,PurchaseOrder>();
+        CreateMap<PatchPurchaseOrderPurchaseConditionsDto,PurchaseOrder>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());
         
         CreateMap<CreatePurchaseProductDto, PurchaseProduct>();
-        CreateMap<UpdatePurchaseProductDto, PurchaseProduct>();
-        CreateMap<PatchPurchaseProductQuantityDto, PurchaseProduct>();
+        CreateMap<PatchPurchaseProductQuantityDto, PurchaseProduct>()
+            .ForMember(dest => dest.ProductId, opt => opt.Ignore())
+            .ForMember(dest => dest.PurchaseOrderId, opt => opt.Ignore());
         
-        CreateMap<PatchQuotationConditionsSaleDto, Quotation>();
-        CreateMap<PatchQuotationMessageDto, Quotation>();
+        CreateMap<PatchQuotationConditionsSaleDto, Quotation>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());
+        CreateMap<PatchQuotationMessageDto, Quotation>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());
         CreateMap<CreateProductQuotationDto, Quotation>();
 
-        CreateMap<CreateQuotationProductDto, QuotationProduct>();
-        CreateMap<UpdateQuotationProductDto, QuotationProduct>();
-        CreateMap<PatchQuotationProductQuantityDto, QuotationProduct>();
+        CreateMap<AddQuotationProductDto, QuotationProduct>();
+        CreateMap<PatchQuotationProductQuantityDto, QuotationProduct>()
+            .ForMember(dest => dest.ProductId, opt => opt.Ignore())
+            .ForMember(dest => dest.QuotationId, opt => opt.Ignore());
         
         CreateMap<CreateSettingDto, Setting>();
-        CreateMap<PatchSettingElectronicSignatureDto, Setting>();
-        CreateMap<PatchSettingLogoDto, Setting>();
+        CreateMap<PatchSettingElectronicSignatureDto, Setting>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());
+        CreateMap<PatchSettingLogoDto, Setting>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());
         
         CreateMap<CreateSupplierDto, Supplier>();
-        CreateMap<UpdateSupplierDto, Supplier>();
-        CreateMap<PatchSupplierDeliveryDelayDto, Supplier>();
+        CreateMap<UpdateSupplierDto, Supplier>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());
+        CreateMap<PatchSupplierDeliveryDelayDto, Supplier>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());
         
         CreateMap<CreateUserDto, User>();
-        CreateMap<UpdateUserDto, User>();
-        CreateMap<PatchUserPasswordDto, User>();
+        CreateMap<UpdateUserDto, User>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());
+        CreateMap<PatchUserPasswordDto, User>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());
 
-        CreateMap<PatchWareHouseProductQuantityDto, WarehouseProduct>();
+        CreateMap<PatchWareHouseProductQuantityDto, WarehouseProduct>()
+            .ForMember(dest => dest.ProductId, opt => opt.Ignore())
+            .ForMember(dest => dest.WarehouseId, opt => opt.Ignore());
     }
 }

PyroFetes/MappingProfiles/EntityToDtoMappings.cs

@@ -24,46 +24,25 @@ public class EntityToDtoMappings : Profile
 
         CreateMap<Supplier, GetSupplierDto>();
 
-        CreateMap<DeliveryNote, GetDeliveryNoteDto>();
+        CreateMap<DeliveryNote, GetDeliveryNoteDto>()
+            .ForMember(dest => dest.Products, opt => opt.MapFrom(src => src.ProductDeliveries));
 
         CreateMap<Price, GetPriceDto>();
-
-        CreateMap<Product, GetProductDto>();
-
+        
+        CreateMap<Product, GetProductDto>()
+            .ForMember(dest => dest.References, opt => opt.MapFrom(src => src.Reference));
+            
         CreateMap<ProductDelivery, GetProductDeliveryDto>();
 
-        // CreateMap<PurchaseOrder, GetPurchaseOrderDto>();
-        //
-        //CreateMap<PurchaseProduct, GetPurchaseProductDto>();
-
-
         CreateMap<PurchaseOrder, GetPurchaseOrderDto>()
-            .ForMember(dest => dest.Products,
-                opt => opt.MapFrom(src => src.PurchaseProducts));
-
-        CreateMap<PurchaseProduct, GetPurchaseProductDto>()
-            .ForMember(dest => dest.ProductId, opt => opt.MapFrom(src => src.ProductId))
-            .ForMember(dest => dest.Quantity, opt => opt.MapFrom(src => src.Quantity))
-            .ForMember(dest => dest.ProductName, opt => opt.MapFrom(src => src.Product.Name))
-            .ForMember(dest => dest.ProductReferences, opt => opt.MapFrom(src => src.Product.Reference))
-            .ForMember(dest => dest.ProductPrice, opt => opt.MapFrom(src => src.Product.Prices
-                .FirstOrDefault(p => p.SupplierId == src.PurchaseOrder!.SupplierId)
-                .SellingPrice));
-
-        // CreateMap<Quotation, GetQuotationDto>();
-        //
-        //CreateMap<QuotationProduct, GetQuotationProductDto>();
+            .ForMember(dest => dest.Products, opt => opt.MapFrom(src => src.PurchaseProducts));
 
+        CreateMap<PurchaseProduct, GetPurchaseProductDto>();
 
         CreateMap<Quotation, GetQuotationDto>()
-            .ForMember(dest => dest.Products,
-                opt => opt.MapFrom(src => src.QuotationProducts));
+            .ForMember(dest => dest.Products, opt => opt.MapFrom(src => src.QuotationProducts));
 
-        CreateMap<QuotationProduct, GetQuotationProductDto>()
-            .ForMember(dest => dest.ProductId, opt => opt.MapFrom(src => src.ProductId))
-            .ForMember(dest => dest.Quantity, opt => opt.MapFrom(src => src.Quantity))
-            .ForMember(dest => dest.ProductName, opt => opt.MapFrom(src => src.Product.Name))
-            .ForMember(dest => dest.ProductReferences, opt => opt.MapFrom(src => src.Product.Reference));
+        CreateMap<QuotationProduct, GetQuotationProductDto>();
 
         CreateMap<Setting, GetSettingDto>();
 

PyroFetes/Migrations/20260524095820_ChangeDatabaseName.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PyroFetes.Migrations
+{
+    /// <inheritdoc />
+    public partial class ChangeDatabaseName : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

PyroFetes/Program.cs

@@ -80,7 +80,7 @@ app.UseAuthentication()
     })
     .UseSwaggerGen();
 
-app.UseHttpsRedirection();
+// app.UseHttpsRedirection();
 
 app.UseCors();
 

PyroFetes/PyroFetes.csproj

@@ -31,17 +31,9 @@
       <_ContentIncludedByDefault Remove="wwwroot\Images\logo.jpg" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Content Update="wwwroot\Images\logo.jpg">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </Content>
-      <Content Update="wwwroot\Images\signature.png">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </Content>
-    </ItemGroup>
-
     <ItemGroup>
       <Folder Include="Migrations\" />
+      <Folder Include="wwwroot\" />
     </ItemGroup>
 
 </Project>

PyroFetes/PyroFetesDbContext.cs

@@ -63,15 +63,13 @@ public class PyroFetesDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         string connectionString =
-            "Server=localhost,1433;" +
-            "Database=pyrofetes-db;" +
-            "User Id=sa;" +
-            "Password=AdminMotDePasse!;" +
+            "Server=romaric-thibault.fr;" +
+            "Database=PyroFetes-Sujet2;" +
+            "User Id=pyrofetes;" +
+            "Password=Crablike8-Fringe-Swimmable;" +
             "TrustServerCertificate=true;";
 
         optionsBuilder.UseSqlServer(connectionString);
-
-
     }
     
     // Models customization

PyroFetes/Services/Pdf/DeliveryNotePdfService.cs

@@ -7,18 +7,18 @@ namespace PyroFetes.Services.Pdf;
 
 public interface IDeliveryNotePdfService
 {
-    byte[] Generate(DeliveryNote deliveryNote, List<ProductDelivery> lignes);
+    byte[] Generate(DeliveryNote deliveryNote, List<ProductDelivery> lignes, Setting setting);
 }
 
 public class DeliveryNotePdfService : IDeliveryNotePdfService
 {
-    public byte[] Generate(DeliveryNote deliveryNote, List<ProductDelivery> lignes)
+    public byte[] Generate(DeliveryNote deliveryNote, List<ProductDelivery> lignes, Setting setting)
     {
-        var logoPath = Path.Combine(AppContext.BaseDirectory, "wwwroot", "Images", "logo.jpg");
-        var signaturePath = Path.Combine(AppContext.BaseDirectory, "wwwroot", "Images", "signature.png");
+        byte[] logo = Convert.FromBase64String(setting.Logo!);
+        byte[] signature = Convert.FromBase64String(setting.ElectronicSignature!);
         int total = 0;
         int totalQuantity = 0;
-        var document = Document.Create(container =>
+        Document document = Document.Create(container =>
         {
             container.Page(page =>
             {
@@ -48,7 +48,7 @@ public class DeliveryNotePdfService : IDeliveryNotePdfService
                     // Logo + société à droite
                     row.ConstantItem(200).Column(col =>
                     {
-                        col.Item().AlignRight().Height(70).Image(logoPath, ImageScaling.FitArea);
+                        col.Item().AlignRight().Height(70).Image(logo, ImageScaling.FitArea);
                         col.Item().Height(20);
                         col.Item().AlignRight().Text("Pyro-Fêtes").SemiBold();
                         col.Item().Height(5);
@@ -93,7 +93,7 @@ public class DeliveryNotePdfService : IDeliveryNotePdfService
                             header.Cell().Element(CellHeader).AlignRight().Text("Total");
                         });
                         
-                        foreach (var l in lignes)
+                        foreach (ProductDelivery l in lignes)
                         {
                             table.Cell().Element(CellBody).Text(l.Product?.Name);
                             table.Cell().Element(CellBody).AlignRight().Text(l.Quantity.ToString());
@@ -123,7 +123,7 @@ public class DeliveryNotePdfService : IDeliveryNotePdfService
                 // Signature en bas à droite
                 page.Footer().AlignRight().Column(col =>
                 {
-                    col.Item().AlignRight().Height(100).Image(signaturePath, ImageScaling.FitArea);
+                    col.Item().AlignRight().Height(100).Image(signature, ImageScaling.FitArea);
                 });
             });
         });

PyroFetes/Services/Pdf/PurchaseOrderPdfService.cs

@@ -7,18 +7,18 @@ namespace PyroFetes.Services.Pdf;
 
 public interface IPurchaseOrderPdfService
 {
-    byte[] Generate(PurchaseOrder purchaseOrder, List<PurchaseProduct> lignes);
+    byte[] Generate(PurchaseOrder purchaseOrder, List<PurchaseProduct> lignes, Setting setting);
 }
 
 public class PurchaseOrderPdfService : IPurchaseOrderPdfService
 {
-    public byte[] Generate(PurchaseOrder purchaseOrder, List<PurchaseProduct> lignes)
+    public byte[] Generate(PurchaseOrder purchaseOrder, List<PurchaseProduct> lignes, Setting setting)
     {
-        var logoPath = Path.Combine(AppContext.BaseDirectory, "wwwroot", "Images", "logo.jpg");
-        var signaturePath = Path.Combine(AppContext.BaseDirectory, "wwwroot", "Images", "signature.png");
+        byte[] logo = Convert.FromBase64String(setting.Logo!);
+        byte[] signature = Convert.FromBase64String(setting.ElectronicSignature!);
         int totalQuantity = 0;
         decimal total = 0;
-        var document = Document.Create(container =>
+        Document document = Document.Create(container =>
         {
             container.Page(page =>
             {
@@ -42,7 +42,7 @@ public class PurchaseOrderPdfService : IPurchaseOrderPdfService
                     // Logo + société à droite
                     row.ConstantItem(200).Column(col =>
                     {
-                        col.Item().AlignRight().Height(70).Image(logoPath, ImageScaling.FitArea);
+                        col.Item().AlignRight().Height(70).Image(logo, ImageScaling.FitArea);
                         col.Item().Height(20);
                         col.Item().AlignRight().Text("Pyro-Fêtes").SemiBold();
                         col.Item().Height(5);
@@ -90,7 +90,7 @@ public class PurchaseOrderPdfService : IPurchaseOrderPdfService
                             header.Cell().Element(CellHeader).AlignRight().Text("Total");
                         });
                         
-                        foreach (var l in lignes)
+                        foreach (PurchaseProduct l in lignes)
                         {
                             decimal price = l.Product!.Prices!
                                 .FirstOrDefault(p => p.SupplierId == l.PurchaseOrder!.SupplierId)
@@ -140,7 +140,7 @@ public class PurchaseOrderPdfService : IPurchaseOrderPdfService
                 // Signature en bas à droite
                 page.Footer().AlignRight().Column(col =>
                 {
-                    col.Item().AlignRight().Height(100).Image(signaturePath, ImageScaling.FitArea);
+                    col.Item().AlignRight().Height(100).Image(signature, ImageScaling.FitArea);
                 });
             });
         });

PyroFetes/Services/Pdf/QuotationPdfService.cs

@@ -1,5 +1,4 @@
 using PyroFetes.Models;
-using QuestPDF.Companion;
 using QuestPDF.Fluent;
 using QuestPDF.Helpers;
 using QuestPDF.Infrastructure;
@@ -8,17 +7,17 @@ namespace PyroFetes.Services.Pdf;
 
 public interface IQuotationPdfService
 {
-    byte[] Generate(Quotation quotation, List<QuotationProduct> lignes);
+    byte[] Generate(Quotation quotation, List<QuotationProduct> lignes, Setting setting);
 }
 
 public class QuotationPdfService : IQuotationPdfService
 {
-    public byte[] Generate(Quotation quotation, List<QuotationProduct> lignes)
+    public byte[] Generate(Quotation quotation, List<QuotationProduct> lignes, Setting setting)
     {
-        var logoPath = Path.Combine(AppContext.BaseDirectory, "wwwroot", "Images", "logo.jpg");
-        var signaturePath = Path.Combine(AppContext.BaseDirectory, "wwwroot", "Images", "signature.png");
+        byte[] logo = Convert.FromBase64String(setting.Logo!);
+        byte[] signature = Convert.FromBase64String(setting.ElectronicSignature!);
         int total = 0;
-        var document = Document.Create(container =>
+        Document document = Document.Create(container =>
         {
             container.Page(page =>
             {
@@ -42,7 +41,7 @@ public class QuotationPdfService : IQuotationPdfService
                     // Logo + société à droite
                     row.ConstantItem(200).Column(col =>
                     {
-                        col.Item().AlignRight().Height(70).Image(logoPath, ImageScaling.FitArea);
+                        col.Item().AlignRight().Height(70).Image(logo, ImageScaling.FitArea);
                         col.Item().Height(20);
                         col.Item().AlignRight().Text("Pyro-Fêtes").SemiBold();
                         col.Item().Height(5);
@@ -90,7 +89,7 @@ public class QuotationPdfService : IQuotationPdfService
                             header.Cell().Element(CellHeader).AlignRight().Text("Total");
                         });
                         
-                        foreach (var l in lignes)
+                        foreach (QuotationProduct l in lignes)
                         {
                             table.Cell().Element(CellBody).Text(l.Product?.Name);
                             table.Cell().Element(CellBody).AlignRight().Text(l.Quantity.ToString());
@@ -134,7 +133,7 @@ public class QuotationPdfService : IQuotationPdfService
                 // Signature en bas à droite
                 page.Footer().AlignRight().Column(col =>
                 {
-                    col.Item().AlignRight().Height(100).Image(signaturePath, ImageScaling.FitArea);
+                    col.Item().AlignRight().Height(100).Image(signature, ImageScaling.FitArea);
                 });
             });
         });

PyroFetes/Specifications/Deliverers/GetDelivererByIdSpec.cs

@@ -3,7 +3,7 @@ using PyroFetes.Models;
 
 namespace PyroFetes.Specifications.Deliverers;
 
-public sealed class GetDelivererByIdSpec : Specification<Deliverer>
+public sealed class GetDelivererByIdSpec : SingleResultSpecification<Deliverer>
 {
     public GetDelivererByIdSpec(int delivererId)
     {

PyroFetes/Specifications/DeliveryNotes/GetAllDeliveryNoteSpec.cs

@@ -0,0 +1,16 @@
+using Ardalis.Specification;
+using PyroFetes.Models;
+
+namespace PyroFetes.Specifications.DeliveryNotes;
+
+public class GetAllDeliveryNoteSpec : Specification<DeliveryNote>
+{
+    public GetAllDeliveryNoteSpec()
+    {
+        Query
+            .Include(x => x.Deliverer)
+            .Include(x => x.ProductDeliveries)!
+            .ThenInclude(x => x.Product)
+            .Where(x => true);
+    }
+}

PyroFetes/Specifications/DeliveryNotes/GetDeliveryNoteByIdSpec.cs

@@ -3,11 +3,14 @@ using PyroFetes.Models;
 
 namespace PyroFetes.Specifications.DeliveryNotes;
 
-public sealed class GetDeliveryNoteByIdSpec : Specification<DeliveryNote>
+public sealed class GetDeliveryNoteByIdSpec : SingleResultSpecification<DeliveryNote>
 {
     public GetDeliveryNoteByIdSpec(int deliveryNoteId)
     {
         Query
+            .Include(x => x.Deliverer)
+            .Include(x => x.ProductDeliveries!)
+            .ThenInclude(x => x.Product)
             .Where(x => x.Id == deliveryNoteId);
     }
 }

PyroFetes/Specifications/DeliveryNotes/GetDeliveryNoteByIdWithProductsSpec.cs

@@ -3,13 +3,13 @@ using PyroFetes.Models;
 
 namespace PyroFetes.Specifications.DeliveryNotes;
 
-public class GetDeliveryNoteByIdWithProductsSpec : Specification<DeliveryNote>
+public class GetDeliveryNoteByIdWithProductsSpec : SingleResultSpecification<DeliveryNote>
 {
     public GetDeliveryNoteByIdWithProductsSpec(int deliveryNoteId)
     {
         Query
-            .Where(d => d.Id == deliveryNoteId)
-            .Include(d => d.ProductDeliveries!)
-            .ThenInclude(dp => dp.Product);
+            .Where(x => x.Id == deliveryNoteId)
+            .Include(x => x.ProductDeliveries!)
+            .ThenInclude(p => p.Product);
     }
 }

PyroFetes/Specifications/Prices/GetPriceByProductIdAndSupplierIdSpec.cs

@@ -3,11 +3,11 @@ using PyroFetes.Models;
 
 namespace PyroFetes.Specifications.Prices;
 
-public sealed class GetPriceByProductIdAndSupplierIdSpec : Specification<Price>
+public sealed class GetPriceByProductIdAndSupplierIdSpec : SingleResultSpecification<Price>
 {
     public GetPriceByProductIdAndSupplierIdSpec(int? productId, int? supplierId)
     {
         Query
-            .Where(p => p.ProductId == productId && p.SupplierId == supplierId);
+            .Where(x => x.ProductId == productId && x.SupplierId == supplierId);
     }
 }