From 19f3745180894fa159bac28a87ce0b603aa9d7a5 Mon Sep 17 00:00:00 2001 From: yoonsseo Date: Thu, 1 Feb 2024 20:34:47 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20dto=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/FragranceFamilyRepositoryImpl.java | 15 ++++++++------- .../fragrance/dto/response/FragranceInfo.java | 5 ++++- 2 files changed, 12 insertions(+), 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 index 603a486..54867d3 100644 --- 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 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 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 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 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 index b68b2c2..e7ca1dd 100644 --- 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,6 +2,7 @@ import com.querydsl.core.annotations.QueryProjection; import lombok.Data; +import server.acode.domain.fragrance.entity.Concentration; @Data public class FragranceInfo { @@ -9,12 +10,14 @@ public class FragranceInfo { 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(); } }