chore: dto 수정

team-acode · Feb 1, 2024 · 19f3745 · 19f3745
1 parent bd8c068
commit 19f3745
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/main/java/server/acode/domain/family/repository/FragranceFamilyRepositoryImpl.java b/src/main/java/server/acode/domain/family/repository/FragranceFamilyRepositoryImpl.java
@@ -110,7 +110,8 @@ public List<FragranceInfo> searchSimilarFragranceAnd(Long fragranceId, Long fami
                         fragrance.id.as("fragranceId"),
                         fragrance.thumbnail,
                         fragrance.name.as("fragranceName"),
-                        fragrance.brand.korName.as("brandName")
+                        fragrance.brand.korName.as("brandName"),
+                        fragrance.concentration
                 ))
                 .from(fragranceFamily)
                 .join(fragranceFamily.fragrance, fragrance)
@@ -146,8 +147,8 @@ public List<FragranceInfo> searchSimilarFragranceOr(SimilarFragranceOrCond cond)
                         fragrance.id.as("fragranceId"),
                         fragrance.thumbnail,
                         fragrance.name.as("fragranceName"),
-                        fragrance.brand.korName.as("brandName")
-                ))
+                        fragrance.brand.korName.as("brandName"),
+                        fragrance.concentration))
                 .from(fragranceFamily)
                 .join(fragranceFamily.fragrance, fragrance)
                 .where(
@@ -168,8 +169,8 @@ public List<FragranceInfo> searchSimilarFragrance(Long fragranceId, Long familyI
                         fragrance.id.as("fragranceId"),
                         fragrance.thumbnail,
                         fragrance.name.as("fragranceName"),
-                        fragrance.brand.korName.as("brandName")
-                ))
+                        fragrance.brand.korName.as("brandName"),
+                        fragrance.concentration))
                 .from(fragranceFamily)
                 .join(fragranceFamily.fragrance, fragrance)
                 .where(
@@ -252,8 +253,8 @@ public Page<FragranceInfo> searchFragrance(SearchCond cond, String additionalFam
                         fragrance.id.as("fragranceId"),
                         fragrance.thumbnail,
                         fragrance.name.as("fragranceName"),
-                        fragrance.brand.korName.as("brandName")
-                )).distinct()
+                        fragrance.brand.korName.as("brandName"),
+                        fragrance.concentration)).distinct()
                 .from(fragranceFamily)
                 .where(
                         fragranceNameContains(cond.getSearch())

diff --git a/src/main/java/server/acode/domain/fragrance/dto/response/FragranceInfo.java b/src/main/java/server/acode/domain/fragrance/dto/response/FragranceInfo.java
@@ -2,19 +2,22 @@
 
 import com.querydsl.core.annotations.QueryProjection;
 import lombok.Data;
+import server.acode.domain.fragrance.entity.Concentration;
 
 @Data
 public class FragranceInfo {
     private Long fragranceId;
     private String thumbnail;
     private String fragranceName;
     private String brandName;
+    private String concentration;
 
     @QueryProjection
-    public FragranceInfo(Long fragranceId, String thumbnail, String fragranceName, String korBrand) {
+    public FragranceInfo(Long fragranceId, String thumbnail, String fragranceName, String korBrand, Concentration concentration) {
         this.fragranceId = fragranceId;
         this.thumbnail = thumbnail;
         this.fragranceName = fragranceName;
         this.brandName = korBrand;
+        this.concentration = concentration.toString();
     }
 }