From e66f873303050a2477865730703bc544e5298c5e Mon Sep 17 00:00:00 2001
From: Aleksey <alleksey-Kn@yandex.ru>
Date: Mon, 14 Apr 2025 01:13:05 +0700
Subject: [PATCH] Fix DishEntityModerationDtoMapper.productToString

---
 pom.xml                                                |  2 +-
 .../chefbot/mappers/DishEntityModerationDtoMapper.java |  3 ++-
 .../enkarin/chefbot/service/ModerationServiceTest.java | 10 ++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f975ef6..9b28586 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>io.github.enkarin</groupId>
     <artifactId>chef-bot</artifactId>
-    <version>2.8.4</version>
+    <version>2.8.5</version>
     <name>Chef Bot</name>
 
     <properties>
diff --git a/src/main/java/io/github/enkarin/chefbot/mappers/DishEntityModerationDtoMapper.java b/src/main/java/io/github/enkarin/chefbot/mappers/DishEntityModerationDtoMapper.java
index 40e351d..9af5649 100644
--- a/src/main/java/io/github/enkarin/chefbot/mappers/DishEntityModerationDtoMapper.java
+++ b/src/main/java/io/github/enkarin/chefbot/mappers/DishEntityModerationDtoMapper.java
@@ -7,6 +7,7 @@
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingConstants;
 
+import java.util.Optional;
 import java.util.Set;
 
 @Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
@@ -20,6 +21,6 @@ public interface DishEntityModerationDtoMapper {
     Set<String> productsToString(Set<ProductQuantity> products);
 
     default String productToString(final ProductQuantity productQuantity) {
-        return productQuantity.getProduct().getProductName();
+        return productQuantity.getProduct().getProductName().concat(Optional.ofNullable(productQuantity.getQuantityProduct()).map(": "::concat).orElse(""));
     }
 }
diff --git a/src/test/java/io/github/enkarin/chefbot/service/ModerationServiceTest.java b/src/test/java/io/github/enkarin/chefbot/service/ModerationServiceTest.java
index 3843c15..258a16f 100644
--- a/src/test/java/io/github/enkarin/chefbot/service/ModerationServiceTest.java
+++ b/src/test/java/io/github/enkarin/chefbot/service/ModerationServiceTest.java
@@ -13,6 +13,7 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -46,6 +47,15 @@ void createModerationRequest() {
         assertThat(moderationRequestRepository.findAll()).hasSize(1).extracting(ModerationRequest::getModerationDish).extracting(Dish::getDishName).contains("newDish");
     }
 
+    @Test
+    void createModerationRequestWithShowQuantityOfProduct() {
+        moderationRequestRepository.deleteAll();
+        dishService.initDishName(USER_ID, "newDish");
+        dishService.putAllDishFoodstuff(USER_ID, Map.of("Egg", "2", "Milk", "200 ml", "Salt", "2 gram"));
+
+        assertThat(moderationService.createModerationRequest(USER_ID).getProducts()).containsOnly("Egg: 2", "Milk: 200 ml", "Salt: 2 gram");
+    }
+
     @Test
     void addRequestMessages() {
         final Set<ModerationRequestMessageDto> messageDtoSet = moderationRequestMessageRepository