Skip to content

Commit 19f3745

Browse files
committed
chore: dto 수정
1 parent bd8c068 commit 19f3745

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

src/main/java/server/acode/domain/family/repository/FragranceFamilyRepositoryImpl.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ public List<FragranceInfo> searchSimilarFragranceAnd(Long fragranceId, Long fami
110110
fragrance.id.as("fragranceId"),
111111
fragrance.thumbnail,
112112
fragrance.name.as("fragranceName"),
113-
fragrance.brand.korName.as("brandName")
113+
fragrance.brand.korName.as("brandName"),
114+
fragrance.concentration
114115
))
115116
.from(fragranceFamily)
116117
.join(fragranceFamily.fragrance, fragrance)
@@ -146,8 +147,8 @@ public List<FragranceInfo> searchSimilarFragranceOr(SimilarFragranceOrCond cond)
146147
fragrance.id.as("fragranceId"),
147148
fragrance.thumbnail,
148149
fragrance.name.as("fragranceName"),
149-
fragrance.brand.korName.as("brandName")
150-
))
150+
fragrance.brand.korName.as("brandName"),
151+
fragrance.concentration))
151152
.from(fragranceFamily)
152153
.join(fragranceFamily.fragrance, fragrance)
153154
.where(
@@ -168,8 +169,8 @@ public List<FragranceInfo> searchSimilarFragrance(Long fragranceId, Long familyI
168169
fragrance.id.as("fragranceId"),
169170
fragrance.thumbnail,
170171
fragrance.name.as("fragranceName"),
171-
fragrance.brand.korName.as("brandName")
172-
))
172+
fragrance.brand.korName.as("brandName"),
173+
fragrance.concentration))
173174
.from(fragranceFamily)
174175
.join(fragranceFamily.fragrance, fragrance)
175176
.where(
@@ -252,8 +253,8 @@ public Page<FragranceInfo> searchFragrance(SearchCond cond, String additionalFam
252253
fragrance.id.as("fragranceId"),
253254
fragrance.thumbnail,
254255
fragrance.name.as("fragranceName"),
255-
fragrance.brand.korName.as("brandName")
256-
)).distinct()
256+
fragrance.brand.korName.as("brandName"),
257+
fragrance.concentration)).distinct()
257258
.from(fragranceFamily)
258259
.where(
259260
fragranceNameContains(cond.getSearch())

src/main/java/server/acode/domain/fragrance/dto/response/FragranceInfo.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,22 @@
22

33
import com.querydsl.core.annotations.QueryProjection;
44
import lombok.Data;
5+
import server.acode.domain.fragrance.entity.Concentration;
56

67
@Data
78
public class FragranceInfo {
89
private Long fragranceId;
910
private String thumbnail;
1011
private String fragranceName;
1112
private String brandName;
13+
private String concentration;
1214

1315
@QueryProjection
14-
public FragranceInfo(Long fragranceId, String thumbnail, String fragranceName, String korBrand) {
16+
public FragranceInfo(Long fragranceId, String thumbnail, String fragranceName, String korBrand, Concentration concentration) {
1517
this.fragranceId = fragranceId;
1618
this.thumbnail = thumbnail;
1719
this.fragranceName = fragranceName;
1820
this.brandName = korBrand;
21+
this.concentration = concentration.toString();
1922
}
2023
}

0 commit comments

Comments
 (0)