Skip to content

Commit 3080c1c

Browse files
authored
feat: 250920 식당 dto id 수정 요청 사항 반영 (#227)
1 parent cae4fee commit 3080c1c

2 files changed

Lines changed: 28 additions & 11 deletions

File tree

src/main/java/ssu/eatssu/domain/review/dto/ValidMenuForViewResponse.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import lombok.AllArgsConstructor;
55
import lombok.Builder;
66
import lombok.Getter;
7+
import lombok.NoArgsConstructor;
78
import lombok.Setter;
89

910
import java.util.List;
@@ -15,6 +16,17 @@
1516
@AllArgsConstructor
1617
public class ValidMenuForViewResponse {
1718
@Schema(description = "리뷰에 포함되는 메뉴 리스트", example = "[김치볶음밥, 고구마치즈돈까스, 김자반]")
18-
private List<String> menuList;
19+
private List<MenuDto> menuList;
20+
21+
@Getter
22+
@Builder
23+
@AllArgsConstructor
24+
public static class MenuDto {
25+
@Schema(description = "메뉴 ID", example = "3143")
26+
private Long menuId;
27+
28+
@Schema(description = "메뉴 이름", example = "우삼겹갈비탕")
29+
private String name;
30+
}
1931

2032
}

src/main/java/ssu/eatssu/domain/review/service/ReviewServiceV2.java

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import ssu.eatssu.domain.user.repository.UserRepository;
3636
import ssu.eatssu.global.handler.response.BaseException;
3737

38-
import java.util.ArrayList;
3938
import java.util.Collections;
4039
import java.util.List;
4140
import java.util.Map;
@@ -382,16 +381,22 @@ public SliceResponse<MyMealReviewResponse> findMyReviews(CustomUserDetails userD
382381

383382

384383
public ValidMenuForViewResponse validMenuForReview(Long mealId) {
385-
Meal meal = mealRepository.findById(mealId).orElseThrow(() -> new BaseException(NOT_FOUND_MEAL));
386-
List<String> menuNames = meal.getMenuNames();
387-
List<String> validMenuNames = new ArrayList<>();
388-
for (String menu : menuNames) {
389-
if (!MenuFilterUtil.isExcludedFromReview(menu)) {
390-
validMenuNames.add(menu);
391-
}
392-
}
384+
Meal meal = mealRepository.findById(mealId)
385+
.orElseThrow(() -> new BaseException(NOT_FOUND_MEAL));
386+
387+
List<Menu> menus = mealMenuRepository.findMenusByMeal(meal);
388+
389+
List<ValidMenuForViewResponse.MenuDto> validMenus = menus.stream()
390+
.filter(menu -> !MenuFilterUtil.isExcludedFromReview(
391+
menu.getName()))
392+
.map(menu -> ValidMenuForViewResponse.MenuDto.builder()
393+
.menuId(menu.getId())
394+
.name(menu.getName())
395+
.build())
396+
.collect(Collectors.toList());
393397

394398
return ValidMenuForViewResponse.builder()
395-
.menuList(validMenuNames).build();
399+
.menuList(validMenus)
400+
.build();
396401
}
397402
}

0 commit comments

Comments
 (0)