Merge pull request #46 from DiyorMarket/update-mappings

Update mappings

Author: SharifovDeveloper

Inflow.Domain/DTOs/Product/ProductForUpdateDto.cs

@@ -4,7 +4,8 @@ public record ProductForUpdateDto(
         int Id,
         string Name,
         string Description,
-        decimal Price,
+        decimal SalePrice,
+        decimal SupplyPrice,
         DateTime ExpireDate,
         int CategoryId);
 }

Inflow.Domain/DTOs/SaleItem/SaleItemDto.cs

@@ -1,9 +1,13 @@
-namespace Inflow.Domain.DTOs.SaleItem
+using Inflow.Domain.DTOs.Product;
+
+namespace Inflow.Domain.DTOs.SaleItem
 {
     public record SaleItemDto(
-        int Id,
-        int Quantity,
-        decimal UnitPrice,
-        int ProductId,
-        int SaleId);
+         int Id,
+         string ProductName,
+         int Quantity,
+         decimal UnitPrice,
+         ProductDto Product,
+         int SaleId,
+         decimal TotalDue);
 }

Inflow.Domain/Entities/Category.cs

@@ -3,6 +3,6 @@
     public class Category : EntityBase
     {
         public string? Name { get; set; }
-        public virtual ICollection<Product>? Products { get; set; }
+        public virtual ICollection<Product> Products { get; set; }
     }
 }

Inflow.Domain/Entities/SaleItem.cs

@@ -6,7 +6,7 @@ public class SaleItem : EntityBase
         public decimal UnitPrice { get; set; }
 
         public int ProductId { get; set; }
-        public Product? Product { get; set; }
+        public Product Product { get; set; }
 
         public int SaleId { get; set; }
         public Sale? Sale { get; set; }

Inflow.Domain/Mappings/CategoryMappings.cs

@@ -6,10 +6,10 @@ namespace Inflow.Domain.Mappings
 {
     public class CategoryMappings : Profile
     {
-        public CategoryMappings() 
+        public CategoryMappings()
         {
             CreateMap<Category, CategoryDto>()
-                .ForMember(x => x.NumberOfProducts, r => r.MapFrom(x => x.Products.Count));      
+                  .ForMember(x => x.NumberOfProducts, r => r.MapFrom(x => x.Products.Count()));
             CreateMap<CategoryDto, Category>();
             CreateMap<CategoryForCreateDto, Category>();
             CreateMap<Category, CategoryForCreateDto>();

Inflow.Domain/Mappings/ProductMappings.cs

@@ -6,7 +6,7 @@ namespace Inflow.Domain.Mappings
 {
     public class ProductMappings : Profile
     {
-        public ProductMappings() 
+        public ProductMappings()
         {
             CreateMap<Product, ProductDto>()
                 .ForMember(x => x.SupplyPrice, r => r.MapFrom(x => x.Price))
@@ -15,7 +15,8 @@ public ProductMappings()
             CreateMap<ProductDto, Product>();
             CreateMap<ProductForCreateDto, Product>()
                 .ForMember(x => x.Price, r => r.MapFrom(x => x.SupplyPrice));
-            CreateMap<ProductForUpdateDto, Product>();
+            CreateMap<ProductForUpdateDto, Product>()
+                .ForMember(x => x.Price, r => r.MapFrom(x => x.SupplyPrice));
             CreateMap<Product, ProductForCreateDto>();
             CreateMap<Product, ProductForUpdateDto>();
         }

Inflow.Domain/Mappings/SaleItemMappings.cs

@@ -7,10 +7,12 @@ namespace Inflow.Domain.Mappings
 {
     public class SaleItemMappings : Profile
     {
-        public SaleItemMappings() 
+        public SaleItemMappings()
         {
             CreateMap<SaleItemDto, SaleItem>();
-            CreateMap<SaleItem, SaleItemDto>();
+            CreateMap<SaleItem, SaleItemDto>()
+                .ForCtorParam(nameof(SaleItemDto.TotalDue), x => x.MapFrom(q => q.Quantity * q.UnitPrice))
+                .ForCtorParam(nameof(SaleItemDto.ProductName), x => x.MapFrom(q => q.Product.Name));
             CreateMap<SaleItemForCreateDto, SaleItem>();
             CreateMap<SaleItemForUpdateDto, SaleItem>();
         }

Inflow.Domain/Mappings/SupplyMappings.cs

@@ -1,13 +1,12 @@
 using AutoMapper;
-using Inflow.Domain.DTOs.Sale;
 using Inflow.Domain.DTOs.Supply;
 using Inflow.Domain.Entities;
 
 namespace Inflow.Domain.Mappings
 {
     public class SupplyMappings : Profile
     {
-        public SupplyMappings() 
+        public SupplyMappings()
         {
             CreateMap<SupplyDto, Supply>()
                 .PreserveReferences();