From 231688ca40efb18b0d1476b43fd9f83eb4583454 Mon Sep 17 00:00:00 2001
From: duykasama <duykasama@gmail.com>
Date: Wed, 14 Feb 2024 22:50:21 +0700
Subject: [PATCH 1/4] [Quotations management][Duy] Add 'QuotationDetail' to
 single quotation response

---
 Domus.Service/Implementations/QuotationService.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Domus.Service/Implementations/QuotationService.cs b/Domus.Service/Implementations/QuotationService.cs
index 52c8282..f31a051 100644
--- a/Domus.Service/Implementations/QuotationService.cs
+++ b/Domus.Service/Implementations/QuotationService.cs
@@ -177,11 +177,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<DtoQuotation>(_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)

From 5469a34d8fb8cd2f6551acd676a458496854b9a1 Mon Sep 17 00:00:00 2001
From: duykasama <duykasama@gmail.com>
Date: Wed, 14 Feb 2024 23:23:04 +0700
Subject: [PATCH 2/4] [Refactor][Duy] Reorganize file structure in dtos folder

---
 Domus.Domain/Dtos/{ => Articles}/DtoArticle.cs |  0
 .../Dtos/{ => Articles}/DtoArticleCategory.cs  |  0
 .../Dtos/{ => Articles}/DtoArticleImage.cs     |  0
 .../DtoArticleWithoutCategory.cs               |  0
 Domus.Domain/Dtos/{ => Products}/DtoProduct.cs |  0
 .../{ => Products}/DtoProductAttributeValue.cs |  0
 .../Dtos/{ => Products}/DtoProductCategory.cs  |  0
 .../Dtos/{ => Products}/DtoProductDetail.cs    |  0
 .../Dtos/Products/DtoProductDetailQuotation.cs | 14 ++++++++++++++
 .../Dtos/{ => Products}/DtoProductImage.cs     |  0
 .../DtoProductWithoutCategory.cs               |  0
 .../DtoProductWithoutCategoryAndDetails.cs     |  0
 .../{ => Quotations}/DtoNegotiationMessage.cs  |  0
 .../Dtos/{ => Quotations}/DtoQuotation.cs      |  0
 .../Dtos/Quotations/DtoQuotationFullDetails.cs | 18 ++++++++++++++++++
 .../Quotations/DtoQuotationNegotationLog.cs    | 12 ++++++++++++
 ...DtoQuotationNegotationLogWithoutMessages.cs |  0
 17 files changed, 44 insertions(+)
 rename Domus.Domain/Dtos/{ => Articles}/DtoArticle.cs (100%)
 rename Domus.Domain/Dtos/{ => Articles}/DtoArticleCategory.cs (100%)
 rename Domus.Domain/Dtos/{ => Articles}/DtoArticleImage.cs (100%)
 rename Domus.Domain/Dtos/{ => Articles}/DtoArticleWithoutCategory.cs (100%)
 rename Domus.Domain/Dtos/{ => Products}/DtoProduct.cs (100%)
 rename Domus.Domain/Dtos/{ => Products}/DtoProductAttributeValue.cs (100%)
 rename Domus.Domain/Dtos/{ => Products}/DtoProductCategory.cs (100%)
 rename Domus.Domain/Dtos/{ => Products}/DtoProductDetail.cs (100%)
 create mode 100644 Domus.Domain/Dtos/Products/DtoProductDetailQuotation.cs
 rename Domus.Domain/Dtos/{ => Products}/DtoProductImage.cs (100%)
 rename Domus.Domain/Dtos/{ => Products}/DtoProductWithoutCategory.cs (100%)
 rename Domus.Domain/Dtos/{ => Products}/DtoProductWithoutCategoryAndDetails.cs (100%)
 rename Domus.Domain/Dtos/{ => Quotations}/DtoNegotiationMessage.cs (100%)
 rename Domus.Domain/Dtos/{ => Quotations}/DtoQuotation.cs (100%)
 create mode 100644 Domus.Domain/Dtos/Quotations/DtoQuotationFullDetails.cs
 create mode 100644 Domus.Domain/Dtos/Quotations/DtoQuotationNegotationLog.cs
 rename Domus.Domain/Dtos/{ => Quotations}/DtoQuotationNegotationLogWithoutMessages.cs (100%)

diff --git a/Domus.Domain/Dtos/DtoArticle.cs b/Domus.Domain/Dtos/Articles/DtoArticle.cs
similarity index 100%
rename from Domus.Domain/Dtos/DtoArticle.cs
rename to Domus.Domain/Dtos/Articles/DtoArticle.cs
diff --git a/Domus.Domain/Dtos/DtoArticleCategory.cs b/Domus.Domain/Dtos/Articles/DtoArticleCategory.cs
similarity index 100%
rename from Domus.Domain/Dtos/DtoArticleCategory.cs
rename to Domus.Domain/Dtos/Articles/DtoArticleCategory.cs
diff --git a/Domus.Domain/Dtos/DtoArticleImage.cs b/Domus.Domain/Dtos/Articles/DtoArticleImage.cs
similarity index 100%
rename from Domus.Domain/Dtos/DtoArticleImage.cs
rename to Domus.Domain/Dtos/Articles/DtoArticleImage.cs
diff --git a/Domus.Domain/Dtos/DtoArticleWithoutCategory.cs b/Domus.Domain/Dtos/Articles/DtoArticleWithoutCategory.cs
similarity index 100%
rename from Domus.Domain/Dtos/DtoArticleWithoutCategory.cs
rename to Domus.Domain/Dtos/Articles/DtoArticleWithoutCategory.cs
diff --git a/Domus.Domain/Dtos/DtoProduct.cs b/Domus.Domain/Dtos/Products/DtoProduct.cs
similarity index 100%
rename from Domus.Domain/Dtos/DtoProduct.cs
rename to Domus.Domain/Dtos/Products/DtoProduct.cs
diff --git a/Domus.Domain/Dtos/DtoProductAttributeValue.cs b/Domus.Domain/Dtos/Products/DtoProductAttributeValue.cs
similarity index 100%
rename from Domus.Domain/Dtos/DtoProductAttributeValue.cs
rename to Domus.Domain/Dtos/Products/DtoProductAttributeValue.cs
diff --git a/Domus.Domain/Dtos/DtoProductCategory.cs b/Domus.Domain/Dtos/Products/DtoProductCategory.cs
similarity index 100%
rename from Domus.Domain/Dtos/DtoProductCategory.cs
rename to Domus.Domain/Dtos/Products/DtoProductCategory.cs
diff --git a/Domus.Domain/Dtos/DtoProductDetail.cs b/Domus.Domain/Dtos/Products/DtoProductDetail.cs
similarity index 100%
rename from Domus.Domain/Dtos/DtoProductDetail.cs
rename to Domus.Domain/Dtos/Products/DtoProductDetail.cs
diff --git a/Domus.Domain/Dtos/Products/DtoProductDetailQuotation.cs b/Domus.Domain/Dtos/Products/DtoProductDetailQuotation.cs
new file mode 100644
index 0000000..e889f78
--- /dev/null
+++ b/Domus.Domain/Dtos/Products/DtoProductDetailQuotation.cs
@@ -0,0 +1,14 @@
+namespace Domus.Domain.Dtos.Products;
+
+public class DtoProductDetailQuotation
+{
+    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!;
+}
diff --git a/Domus.Domain/Dtos/DtoProductImage.cs b/Domus.Domain/Dtos/Products/DtoProductImage.cs
similarity index 100%
rename from Domus.Domain/Dtos/DtoProductImage.cs
rename to Domus.Domain/Dtos/Products/DtoProductImage.cs
diff --git a/Domus.Domain/Dtos/DtoProductWithoutCategory.cs b/Domus.Domain/Dtos/Products/DtoProductWithoutCategory.cs
similarity index 100%
rename from Domus.Domain/Dtos/DtoProductWithoutCategory.cs
rename to Domus.Domain/Dtos/Products/DtoProductWithoutCategory.cs
diff --git a/Domus.Domain/Dtos/DtoProductWithoutCategoryAndDetails.cs b/Domus.Domain/Dtos/Products/DtoProductWithoutCategoryAndDetails.cs
similarity index 100%
rename from Domus.Domain/Dtos/DtoProductWithoutCategoryAndDetails.cs
rename to Domus.Domain/Dtos/Products/DtoProductWithoutCategoryAndDetails.cs
diff --git a/Domus.Domain/Dtos/DtoNegotiationMessage.cs b/Domus.Domain/Dtos/Quotations/DtoNegotiationMessage.cs
similarity index 100%
rename from Domus.Domain/Dtos/DtoNegotiationMessage.cs
rename to Domus.Domain/Dtos/Quotations/DtoNegotiationMessage.cs
diff --git a/Domus.Domain/Dtos/DtoQuotation.cs b/Domus.Domain/Dtos/Quotations/DtoQuotation.cs
similarity index 100%
rename from Domus.Domain/Dtos/DtoQuotation.cs
rename to Domus.Domain/Dtos/Quotations/DtoQuotation.cs
diff --git a/Domus.Domain/Dtos/Quotations/DtoQuotationFullDetails.cs b/Domus.Domain/Dtos/Quotations/DtoQuotationFullDetails.cs
new file mode 100644
index 0000000..54fade0
--- /dev/null
+++ b/Domus.Domain/Dtos/Quotations/DtoQuotationFullDetails.cs
@@ -0,0 +1,18 @@
+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; }
+
+	public ICollection<DtoProductDetailQuotation> Products { get; set; } = null!;
+
+	public DtoQuotationNegotiationLog QuotationNegotiationLog { get; set; } = null!;
+}
diff --git a/Domus.Domain/Dtos/Quotations/DtoQuotationNegotationLog.cs b/Domus.Domain/Dtos/Quotations/DtoQuotationNegotationLog.cs
new file mode 100644
index 0000000..f2470d7
--- /dev/null
+++ b/Domus.Domain/Dtos/Quotations/DtoQuotationNegotationLog.cs
@@ -0,0 +1,12 @@
+namespace Domus.Domain.Dtos.Quotations;
+
+public class DtoQuotationNegotiationLog
+{
+    public bool? IsClosed { get; set; }
+
+    public DateTime StartAt { get; set; }
+
+    public DateTime? CloseAt { get; set; }
+
+	public ICollection<DtoNegotiationMessage> NegotiationMessages { get; set; } = null!;
+}
diff --git a/Domus.Domain/Dtos/DtoQuotationNegotationLogWithoutMessages.cs b/Domus.Domain/Dtos/Quotations/DtoQuotationNegotationLogWithoutMessages.cs
similarity index 100%
rename from Domus.Domain/Dtos/DtoQuotationNegotationLogWithoutMessages.cs
rename to Domus.Domain/Dtos/Quotations/DtoQuotationNegotationLogWithoutMessages.cs

From fd426ddfce9756b2b931cda6067f51dc38390f76 Mon Sep 17 00:00:00 2001
From: duykasama <duykasama@gmail.com>
Date: Thu, 15 Feb 2024 00:07:31 +0700
Subject: [PATCH 3/4] [Quotations management][Duy] Add more information to
 single quotation response

- Add full users' information
- Add products' information
- Add negotiation messages
---
 Domus.Domain/Dtos/Products/DtoProductDetailQuotation.cs   | 2 ++
 Domus.Domain/Dtos/Quotations/DtoQuotationFullDetails.cs   | 7 ++++++-
 Domus.Domain/Dtos/Quotations/DtoQuotationNegotationLog.cs | 3 +++
 Domus.Service/AutoMappings/AutoMapperConfiguration.cs     | 6 ++++++
 Domus.Service/Implementations/QuotationService.cs         | 3 ++-
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Domus.Domain/Dtos/Products/DtoProductDetailQuotation.cs b/Domus.Domain/Dtos/Products/DtoProductDetailQuotation.cs
index e889f78..13ebe15 100644
--- a/Domus.Domain/Dtos/Products/DtoProductDetailQuotation.cs
+++ b/Domus.Domain/Dtos/Products/DtoProductDetailQuotation.cs
@@ -2,6 +2,8 @@ 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!;
diff --git a/Domus.Domain/Dtos/Quotations/DtoQuotationFullDetails.cs b/Domus.Domain/Dtos/Quotations/DtoQuotationFullDetails.cs
index 54fade0..0af56e3 100644
--- a/Domus.Domain/Dtos/Quotations/DtoQuotationFullDetails.cs
+++ b/Domus.Domain/Dtos/Quotations/DtoQuotationFullDetails.cs
@@ -1,3 +1,6 @@
+using System.Text.Json.Serialization;
+using Domus.Domain.Dtos.Products;
+
 namespace Domus.Domain.Dtos.Quotations;
 
 public class DtoQuotationFullDetails
@@ -12,7 +15,9 @@ public class DtoQuotationFullDetails
 
     public DateTime? ExpireAt { get; set; }
 
-	public ICollection<DtoProductDetailQuotation> Products { get; set; } = null!;
+	[JsonPropertyName("products")]
+	public ICollection<DtoProductDetailQuotation> ProductDetailQuotations { get; set; } = new List<DtoProductDetailQuotation>();
 
+	[JsonPropertyName("negotiationLog")]
 	public DtoQuotationNegotiationLog QuotationNegotiationLog { get; set; } = null!;
 }
diff --git a/Domus.Domain/Dtos/Quotations/DtoQuotationNegotationLog.cs b/Domus.Domain/Dtos/Quotations/DtoQuotationNegotationLog.cs
index f2470d7..37b1a13 100644
--- a/Domus.Domain/Dtos/Quotations/DtoQuotationNegotationLog.cs
+++ b/Domus.Domain/Dtos/Quotations/DtoQuotationNegotationLog.cs
@@ -1,3 +1,5 @@
+using System.Text.Json.Serialization;
+
 namespace Domus.Domain.Dtos.Quotations;
 
 public class DtoQuotationNegotiationLog
@@ -8,5 +10,6 @@ public class DtoQuotationNegotiationLog
 
     public DateTime? CloseAt { get; set; }
 
+	[JsonPropertyName("messages")]
 	public ICollection<DtoNegotiationMessage> NegotiationMessages { get; set; } = null!;
 }
diff --git a/Domus.Service/AutoMappings/AutoMapperConfiguration.cs b/Domus.Service/AutoMappings/AutoMapperConfiguration.cs
index 215ad30..6c1a208 100644
--- a/Domus.Service/AutoMappings/AutoMapperConfiguration.cs
+++ b/Domus.Service/AutoMappings/AutoMapperConfiguration.cs
@@ -1,5 +1,7 @@
 using AutoMapper;
 using Domus.Domain.Dtos;
+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 +55,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 +78,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));
diff --git a/Domus.Service/Implementations/QuotationService.cs b/Domus.Service/Implementations/QuotationService.cs
index f31a051..821501b 100644
--- a/Domus.Service/Implementations/QuotationService.cs
+++ b/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;
@@ -179,7 +180,7 @@ public async Task<ServiceActionResult> GetQuotationById(Guid id)
     {
 		var quotation = (await _quotationRepository.GetAllAsync())
 			.Where(q => q.Id == id)
-			.ProjectTo<DtoQuotation>(_mapper.ConfigurationProvider)
+			.ProjectTo<DtoQuotationFullDetails>(_mapper.ConfigurationProvider)
 			.FirstOrDefault() ?? throw new QuotationNotFoundException();
 
 		return new ServiceActionResult(true) { Data = quotation };

From 25a4cfc8e2713d46e72ddb124a9e94af42c12da9 Mon Sep 17 00:00:00 2001
From: duykasama <duykasama@gmail.com>
Date: Thu, 15 Feb 2024 00:17:00 +0700
Subject: [PATCH 4/4] [Refactor][Duy] Move dtos to corresponding namespaces

---
 Domus.Domain/Dtos/Articles/DtoArticle.cs                        | 2 +-
 Domus.Domain/Dtos/Articles/DtoArticleCategory.cs                | 2 +-
 Domus.Domain/Dtos/Articles/DtoArticleImage.cs                   | 2 +-
 Domus.Domain/Dtos/Articles/DtoArticleWithoutCategory.cs         | 2 +-
 Domus.Domain/Dtos/Products/DtoProduct.cs                        | 2 +-
 Domus.Domain/Dtos/Products/DtoProductAttributeValue.cs          | 2 +-
 Domus.Domain/Dtos/Products/DtoProductCategory.cs                | 2 +-
 Domus.Domain/Dtos/Products/DtoProductDetail.cs                  | 2 +-
 Domus.Domain/Dtos/Products/DtoProductImage.cs                   | 2 +-
 Domus.Domain/Dtos/Products/DtoProductWithoutCategory.cs         | 2 +-
 .../Dtos/Products/DtoProductWithoutCategoryAndDetails.cs        | 2 +-
 Domus.Domain/Dtos/Quotations/DtoNegotiationMessage.cs           | 2 +-
 Domus.Domain/Dtos/Quotations/DtoQuotation.cs                    | 2 +-
 .../Dtos/Quotations/DtoQuotationNegotationLogWithoutMessages.cs | 2 +-
 Domus.Service/AutoMappings/AutoMapperConfiguration.cs           | 1 +
 Domus.Service/Implementations/ArticleService.cs                 | 2 +-
 Domus.Service/Implementations/ProductDetailService.cs           | 2 +-
 Domus.Service/Implementations/ProductService.cs                 | 2 +-
 Domus.Service/Models/Requests/Articles/UpdateArticleRequest.cs  | 2 +-
 19 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Domus.Domain/Dtos/Articles/DtoArticle.cs b/Domus.Domain/Dtos/Articles/DtoArticle.cs
index 6d4d036..071dc1e 100644
--- a/Domus.Domain/Dtos/Articles/DtoArticle.cs
+++ b/Domus.Domain/Dtos/Articles/DtoArticle.cs
@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Articles;
 
 public class DtoArticle
 {
diff --git a/Domus.Domain/Dtos/Articles/DtoArticleCategory.cs b/Domus.Domain/Dtos/Articles/DtoArticleCategory.cs
index 930ab3a..db7293a 100644
--- a/Domus.Domain/Dtos/Articles/DtoArticleCategory.cs
+++ b/Domus.Domain/Dtos/Articles/DtoArticleCategory.cs
@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Articles;
 
 public class DtoArticleCategory
 {
diff --git a/Domus.Domain/Dtos/Articles/DtoArticleImage.cs b/Domus.Domain/Dtos/Articles/DtoArticleImage.cs
index c5457ae..78396a0 100644
--- a/Domus.Domain/Dtos/Articles/DtoArticleImage.cs
+++ b/Domus.Domain/Dtos/Articles/DtoArticleImage.cs
@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Articles;
 
 public class DtoArticleImage
 {
diff --git a/Domus.Domain/Dtos/Articles/DtoArticleWithoutCategory.cs b/Domus.Domain/Dtos/Articles/DtoArticleWithoutCategory.cs
index 5255a6c..4e89018 100644
--- a/Domus.Domain/Dtos/Articles/DtoArticleWithoutCategory.cs
+++ b/Domus.Domain/Dtos/Articles/DtoArticleWithoutCategory.cs
@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Articles;
 
 public class DtoArticleWithoutCategory
 {
diff --git a/Domus.Domain/Dtos/Products/DtoProduct.cs b/Domus.Domain/Dtos/Products/DtoProduct.cs
index 3967745..5efa95c 100644
--- a/Domus.Domain/Dtos/Products/DtoProduct.cs
+++ b/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
 {
diff --git a/Domus.Domain/Dtos/Products/DtoProductAttributeValue.cs b/Domus.Domain/Dtos/Products/DtoProductAttributeValue.cs
index 708f8b6..076163a 100644
--- a/Domus.Domain/Dtos/Products/DtoProductAttributeValue.cs
+++ b/Domus.Domain/Dtos/Products/DtoProductAttributeValue.cs
@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Products;
 
 public class DtoProductAttributeValue
 {
diff --git a/Domus.Domain/Dtos/Products/DtoProductCategory.cs b/Domus.Domain/Dtos/Products/DtoProductCategory.cs
index 3eb8612..1ee0b4c 100644
--- a/Domus.Domain/Dtos/Products/DtoProductCategory.cs
+++ b/Domus.Domain/Dtos/Products/DtoProductCategory.cs
@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Products;
 
 public class DtoProductCategory
 {
diff --git a/Domus.Domain/Dtos/Products/DtoProductDetail.cs b/Domus.Domain/Dtos/Products/DtoProductDetail.cs
index 9e57db2..9c47967 100644
--- a/Domus.Domain/Dtos/Products/DtoProductDetail.cs
+++ b/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
 {
diff --git a/Domus.Domain/Dtos/Products/DtoProductImage.cs b/Domus.Domain/Dtos/Products/DtoProductImage.cs
index 6e176a1..93a2c6c 100644
--- a/Domus.Domain/Dtos/Products/DtoProductImage.cs
+++ b/Domus.Domain/Dtos/Products/DtoProductImage.cs
@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Products;
 
 public class DtoProductImage
 {
diff --git a/Domus.Domain/Dtos/Products/DtoProductWithoutCategory.cs b/Domus.Domain/Dtos/Products/DtoProductWithoutCategory.cs
index fe47120..f6b4633 100644
--- a/Domus.Domain/Dtos/Products/DtoProductWithoutCategory.cs
+++ b/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
 {
diff --git a/Domus.Domain/Dtos/Products/DtoProductWithoutCategoryAndDetails.cs b/Domus.Domain/Dtos/Products/DtoProductWithoutCategoryAndDetails.cs
index 56a84e4..6541b34 100644
--- a/Domus.Domain/Dtos/Products/DtoProductWithoutCategoryAndDetails.cs
+++ b/Domus.Domain/Dtos/Products/DtoProductWithoutCategoryAndDetails.cs
@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Products;
 
 public class DtoProductWithoutCategoryAndDetails
 {
diff --git a/Domus.Domain/Dtos/Quotations/DtoNegotiationMessage.cs b/Domus.Domain/Dtos/Quotations/DtoNegotiationMessage.cs
index a81df36..6f99dd7 100644
--- a/Domus.Domain/Dtos/Quotations/DtoNegotiationMessage.cs
+++ b/Domus.Domain/Dtos/Quotations/DtoNegotiationMessage.cs
@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Quotations;
 
 public class DtoNegotiationMessage
 {
diff --git a/Domus.Domain/Dtos/Quotations/DtoQuotation.cs b/Domus.Domain/Dtos/Quotations/DtoQuotation.cs
index ca80e29..af9b282 100644
--- a/Domus.Domain/Dtos/Quotations/DtoQuotation.cs
+++ b/Domus.Domain/Dtos/Quotations/DtoQuotation.cs
@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Quotations;
 
 public class DtoQuotation
 {
diff --git a/Domus.Domain/Dtos/Quotations/DtoQuotationNegotationLogWithoutMessages.cs b/Domus.Domain/Dtos/Quotations/DtoQuotationNegotationLogWithoutMessages.cs
index 811fcc1..20494a0 100644
--- a/Domus.Domain/Dtos/Quotations/DtoQuotationNegotationLogWithoutMessages.cs
+++ b/Domus.Domain/Dtos/Quotations/DtoQuotationNegotationLogWithoutMessages.cs
@@ -1,4 +1,4 @@
-namespace Domus.Domain.Dtos;
+namespace Domus.Domain.Dtos.Quotations;
 
 public class DtoQuotationNegotiationLogWithoutMessages
 {
diff --git a/Domus.Service/AutoMappings/AutoMapperConfiguration.cs b/Domus.Service/AutoMappings/AutoMapperConfiguration.cs
index 6c1a208..4e2c005 100644
--- a/Domus.Service/AutoMappings/AutoMapperConfiguration.cs
+++ b/Domus.Service/AutoMappings/AutoMapperConfiguration.cs
@@ -1,5 +1,6 @@
 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;
diff --git a/Domus.Service/Implementations/ArticleService.cs b/Domus.Service/Implementations/ArticleService.cs
index 16f1413..bfaee56 100644
--- a/Domus.Service/Implementations/ArticleService.cs
+++ b/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;
diff --git a/Domus.Service/Implementations/ProductDetailService.cs b/Domus.Service/Implementations/ProductDetailService.cs
index 7c99db9..a9eae95 100644
--- a/Domus.Service/Implementations/ProductDetailService.cs
+++ b/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;
diff --git a/Domus.Service/Implementations/ProductService.cs b/Domus.Service/Implementations/ProductService.cs
index 1fa6fb7..ae49610 100644
--- a/Domus.Service/Implementations/ProductService.cs
+++ b/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;
diff --git a/Domus.Service/Models/Requests/Articles/UpdateArticleRequest.cs b/Domus.Service/Models/Requests/Articles/UpdateArticleRequest.cs
index 39d007b..827f5fe 100644
--- a/Domus.Service/Models/Requests/Articles/UpdateArticleRequest.cs
+++ b/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;