Skip to content

Commit 470273d

Browse files
committed
refactor : add cocktailPreview field in cocktailSearchResponseDto
1 parent c2719d7 commit 470273d

File tree

2 files changed

+28
-41
lines changed

2 files changed

+28
-41
lines changed
Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
package com.back.domain.cocktail.dto;
22

3-
import lombok.Getter;
4-
import lombok.NoArgsConstructor;
5-
import lombok.Setter;
3+
import com.back.domain.cocktail.entity.Cocktail;
64

7-
@Getter
8-
@Setter
9-
@NoArgsConstructor
10-
public class CocktailSearchResponseDto {
5+
public record CocktailSearchResponseDto (
116

12-
private long cocktailId;
13-
private String cocktailName;
14-
private String cocktailNameKo;
15-
private String alcoholStrength;
16-
private String cocktailType;
17-
private String alcoholBaseType;
18-
private String cocktailImgUrl;
19-
private String cocktailStory;
7+
Long cocktailId,
8+
String cocktailName,
9+
String cocktailNameKo,
10+
String alcoholStrength,
11+
String cocktailType,
12+
String alcoholBaseType,
13+
String cocktailImgUrl,
14+
String cocktailStory,
15+
String cocktailPreview
16+
){
17+
public static CocktailSearchResponseDto from(Cocktail cocktail){
18+
String preview =cocktail.getCocktailStory().length() >80 ?
19+
cocktail.getCocktailStory().substring(0,80)+"..."
20+
: cocktail.getCocktailStory();
2021

21-
public CocktailSearchResponseDto(long cocktailId, String cocktailName, String cocktailNameKo,
22-
String alcoholStrength, String cocktailType,
23-
String alcoholBaseType, String cocktailImgUrl,
24-
String cocktailStory) {
25-
this.cocktailId = cocktailId;
26-
this.cocktailName = cocktailName;
27-
this.cocktailNameKo = cocktailNameKo;
28-
this.alcoholStrength = alcoholStrength;
29-
this.cocktailType = cocktailType;
30-
this.alcoholBaseType = alcoholBaseType;
31-
this.cocktailImgUrl = cocktailImgUrl;
32-
this.cocktailStory = cocktailStory;
22+
return new CocktailSearchResponseDto(
23+
cocktail.getId(),
24+
cocktail.getCocktailName(),
25+
cocktail.getCocktailNameKo(),
26+
cocktail.getAlcoholStrength().getDescription(),
27+
cocktail.getCocktailType().getDescription(),
28+
cocktail.getAlcoholBaseType().getDescription(),
29+
cocktail.getCocktailImgUrl(),
30+
cocktail.getCocktailStory(),
31+
preview
32+
);
3333
}
3434
}

src/main/java/com/back/domain/cocktail/service/CocktailService.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -105,25 +105,12 @@ public List<CocktailSearchResponseDto> searchAndFilter(CocktailSearchRequestDto
105105

106106
//Cocktail 엔티티 → CocktailResponseDto 응답 DTO로 바꿔주는 과정
107107
List<CocktailSearchResponseDto> resultDtos = pageResult.stream()
108-
.map(c -> new CocktailSearchResponseDto(
109-
c.getId(),
110-
c.getCocktailName(),
111-
c.getCocktailNameKo(),
112-
c.getAlcoholStrength().getDescription(),
113-
c.getCocktailType().getDescription(),
114-
c.getAlcoholBaseType().getDescription(),
115-
c.getCocktailImgUrl(),
116-
c.getCocktailStory()
117-
))
108+
.map(CocktailSearchResponseDto::from)
118109
.collect(Collectors.toList());
119110

120111
return resultDtos;
121112
}
122113

123-
// private <T> List<T> nullIfEmpty(List<T> list) {
124-
// return CollectionUtils.isEmpty(list) ? null : list;
125-
// }
126-
127114
// 칵테일 상세조회
128115
@Transactional(readOnly = true)
129116
public CocktailDetailResponseDto getCocktailDetailById(Long cocktailId) {

0 commit comments

Comments
 (0)