Merge pull request #41 from SWD392-Domus/feature/quotations-management

Feature/quotations management

Domus.Domain/Dtos/DtoArticle.cs → Domus.Domain/Dtos/Articles/DtoArticle.cs

@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Articles;
 
 public class DtoArticle
 {

Domus.Domain/Dtos/DtoArticleCategory.cs → Domus.Domain/Dtos/Articles/DtoArticleCategory.cs

@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Articles;
 
 public class DtoArticleCategory
 {

Domus.Domain/Dtos/DtoArticleImage.cs → Domus.Domain/Dtos/Articles/DtoArticleImage.cs

@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Articles;
 
 public class DtoArticleImage
 {

Domus.Domain/Dtos/DtoArticleWithoutCategory.cs → Domus.Domain/Dtos/Articles/DtoArticleWithoutCategory.cs

@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Articles;
 
 public class DtoArticleWithoutCategory
 {

Domus.Domain/Dtos/DtoProduct.cs → Domus.Domain/Dtos/Products/DtoProduct.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Products;
 
 public class DtoProduct
 {

Domus.Domain/Dtos/DtoProductAttributeValue.cs → Domus.Domain/Dtos/Products/DtoProductAttributeValue.cs

@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Products;
 
 public class DtoProductAttributeValue
 {

Domus.Domain/Dtos/DtoProductCategory.cs → Domus.Domain/Dtos/Products/DtoProductCategory.cs

@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Products;
 
 public class DtoProductCategory
 {

Domus.Domain/Dtos/DtoProductDetail.cs → Domus.Domain/Dtos/Products/DtoProductDetail.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Products;
 
 public class DtoProductDetail
 {

Domus.Domain/Dtos/Products/DtoProductDetailQuotation.cs

@@ -0,0 +1,16 @@
+namespace Domus.Domain.Dtos.Products;
+
+public class DtoProductDetailQuotation
+{
+	public string ProductName { get; set; } = null!;
+
+    public double Price { get; set; }
+
+    public string MonetaryUnit { get; set; } = null!;
+
+    public double Quantity { get; set; }
+
+    public string QuantityType { get; set; } = null!;
+
+    public DtoProductDetail Detail { get; set; } = null!;
+}

Domus.Domain/Dtos/DtoProductImage.cs → Domus.Domain/Dtos/Products/DtoProductImage.cs

@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Products;
 
 public class DtoProductImage
 {

Domus.Domain/Dtos/DtoProductWithoutCategory.cs → Domus.Domain/Dtos/Products/DtoProductWithoutCategory.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Products;
 
 public class DtoProductWithoutCategory
 {

Domus.Domain/Dtos/DtoProductWithoutCategoryAndDetails.cs → Domus.Domain/Dtos/Products/DtoProductWithoutCategoryAndDetails.cs

@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Products;
 
 public class DtoProductWithoutCategoryAndDetails
 {

Domus.Domain/Dtos/DtoNegotiationMessage.cs → Domus.Domain/Dtos/Quotations/DtoNegotiationMessage.cs

@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Quotations;
 
 public class DtoNegotiationMessage
 {

Domus.Domain/Dtos/DtoQuotation.cs → Domus.Domain/Dtos/Quotations/DtoQuotation.cs

@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Quotations;
 
 public class DtoQuotation
 {

Domus.Domain/Dtos/Quotations/DtoQuotationFullDetails.cs

@@ -0,0 +1,23 @@
+using System.Text.Json.Serialization;
+using Domus.Domain.Dtos.Products;
+
+namespace Domus.Domain.Dtos.Quotations;
+
+public class DtoQuotationFullDetails
+{
+	public string Id { get; set; } = null!;
+
+	public DtoDomusUser Customer { get; set; } = null!;
+
+	public DtoDomusUser Staff { get; set; } = null!;
+
+    public string Status { get; set; } = null!;
+
+    public DateTime? ExpireAt { get; set; }
+
+	[JsonPropertyName("products")]
+	public ICollection<DtoProductDetailQuotation> ProductDetailQuotations { get; set; } = new List<DtoProductDetailQuotation>();
+
+	[JsonPropertyName("negotiationLog")]
+	public DtoQuotationNegotiationLog QuotationNegotiationLog { get; set; } = null!;
+}

Domus.Domain/Dtos/Quotations/DtoQuotationNegotationLog.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace Domus.Domain.Dtos.Quotations;
+
+public class DtoQuotationNegotiationLog
+{
+    public bool? IsClosed { get; set; }
+
+    public DateTime StartAt { get; set; }
+
+    public DateTime? CloseAt { get; set; }
+
+	[JsonPropertyName("messages")]
+	public ICollection<DtoNegotiationMessage> NegotiationMessages { get; set; } = null!;
+}

Domus.Domain/Dtos/DtoQuotationNegotationLogWithoutMessages.cs → Domus.Domain/Dtos/Quotations/DtoQuotationNegotationLogWithoutMessages.cs

@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Quotations;
 
 public class DtoQuotationNegotiationLogWithoutMessages
 {

Domus.Service/AutoMappings/AutoMapperConfiguration.cs

@@ -1,5 +1,8 @@
 using AutoMapper;
 using Domus.Domain.Dtos;
+using Domus.Domain.Dtos.Articles;
+using Domus.Domain.Dtos.Products;
+using Domus.Domain.Dtos.Quotations;
 using Domus.Domain.Entities;
 using Domus.Service.Models.Requests.Articles;
 using Domus.Service.Models.Requests.Authentication;
@@ -53,6 +56,8 @@ private static void CreateProductMaps(IMapperConfigurationExpression mapper)
 		mapper.CreateMap<Product, DtoProductWithoutCategoryAndDetails>();
 		mapper.CreateMap<CreateProductRequest, Product>();
 		mapper.CreateMap<ProductCategory, DtoProductCategory>();
+		mapper.CreateMap<ProductDetailQuotation, DtoProductDetailQuotation>()
+			.ForMember(dest => dest.ProductName, opt => opt.MapFrom(src => src.ProductDetail.Product.ProductName));
 		mapper.CreateMap<ProductDetail, DtoProductDetail>()
 			.ForMember(dest => dest.DisplayPrice, opt => opt.MapFrom(src => Math.Round(src.DisplayPrice, 2)))
 			.ForMember(dest => dest.ProductAttributeValues, opt => opt.MapFrom((src) => src.ProductAttributeValues.Select(pav => new DtoProductAttributeValue { Name = pav.ProductAttribute.AttributeName, Value = pav.Value, ValueType = pav.ValueType })));
@@ -74,6 +79,8 @@ private static void CreateQuotationMaps(IMapperConfigurationExpression mapper)
 		mapper.CreateMap<Quotation, DtoQuotation>()
 			.ForMember(dest => dest.CustomerName, opt => opt.MapFrom(src => src.Customer.UserName))
 			.ForMember(dest => dest.StaffName, opt => opt.MapFrom(src => src.Staff.UserName));
+		mapper.CreateMap<Quotation, DtoQuotationFullDetails>();
+		mapper.CreateMap<QuotationNegotiationLog, DtoQuotationNegotiationLog>();
 		mapper.CreateMap<QuotationNegotiationLog, DtoQuotationNegotiationLogWithoutMessages>();
 		mapper.CreateMap<CreateNegotiationMessageRequest, NegotiationMessage>()
 			.ForMember(dest => dest.SentAt, opt => opt.MapFrom(src => DateTime.Now));

Domus.Service/Implementations/ArticleService.cs

@@ -2,7 +2,7 @@
 using AutoMapper.QueryableExtensions;
 using Domus.Common.Helpers;
 using Domus.DAL.Interfaces;
-using Domus.Domain.Dtos;
+using Domus.Domain.Dtos.Articles;
 using Domus.Domain.Entities;
 using Domus.Service.Exceptions;
 using Domus.Service.Interfaces;

Domus.Service/Implementations/ProductDetailService.cs

@@ -2,7 +2,7 @@
 using AutoMapper.QueryableExtensions;
 using Domus.Common.Helpers;
 using Domus.DAL.Interfaces;
-using Domus.Domain.Dtos;
+using Domus.Domain.Dtos.Products;
 using Domus.Domain.Entities;
 using Domus.Service.Exceptions;
 using Domus.Service.Interfaces;

Domus.Service/Implementations/ProductService.cs

@@ -3,7 +3,7 @@
 using Domus.Common.Exceptions;
 using Domus.Common.Helpers;
 using Domus.DAL.Interfaces;
-using Domus.Domain.Dtos;
+using Domus.Domain.Dtos.Products;
 using Domus.Domain.Entities;
 using Domus.Service.Exceptions;
 using Domus.Service.Interfaces;

Domus.Service/Implementations/QuotationService.cs

@@ -3,6 +3,7 @@
 using Domus.Common.Helpers;
 using Domus.DAL.Interfaces;
 using Domus.Domain.Dtos;
+using Domus.Domain.Dtos.Quotations;
 using Domus.Domain.Entities;
 using Domus.Service.Constants;
 using Domus.Service.Exceptions;
@@ -177,11 +178,12 @@ public async Task<ServiceActionResult> GetPaginatedQuotations(BasePaginatedReque
 
     public async Task<ServiceActionResult> GetQuotationById(Guid id)
     {
-		var quotation = await _quotationRepository.GetAsync(q => q.Id == id);
-		if (quotation == null)
-			throw new QuotationNotFoundException();
+		var quotation = (await _quotationRepository.GetAllAsync())
+			.Where(q => q.Id == id)
+			.ProjectTo<DtoQuotationFullDetails>(_mapper.ConfigurationProvider)
+			.FirstOrDefault() ?? throw new QuotationNotFoundException();
 
-		return new ServiceActionResult(true) { Data = _mapper.Map<DtoQuotation>(quotation) };
+		return new ServiceActionResult(true) { Data = quotation };
     }
 
     public async Task<ServiceActionResult> UpdateQuotation(UpdateQuotationRequest request, Guid id)

Domus.Service/Models/Requests/Articles/UpdateArticleRequest.cs

@@ -1,4 +1,4 @@
-using Domus.Domain.Dtos;
+using Domus.Domain.Dtos.Articles;
 
 namespace Domus.Service.Models.Requests.Articles;