hotfix: get reservation details API field 수정

MEME-UMC · Mar 27, 2024 · 933d1bc · 933d1bc
1 parent b932d83
commit 933d1bc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/main/java/umc/meme/shop/domain/portfolio/controller/PortfolioController.java b/src/main/java/umc/meme/shop/domain/portfolio/controller/PortfolioController.java
@@ -38,7 +38,6 @@ public ApiResponse getPortfolioDetails(@PathVariable(name = "userId") Long userI
     @Operation(summary = "포트폴리오 수정/삭제", description = "포트폴리오를 수정/삭제하는 API입니다.")
     @PatchMapping()
     public ApiResponse updatePortfolio(@RequestBody UpdatePortfolioDto portfolioDto){
-        // TODO: PortfolioImg 추가
         portfolioService.updatePortfolio(portfolioDto);
         return ApiResponse.SuccessResponse(SuccessStatus.PORTFOLIO_UPDATE);
     }

diff --git a/src/main/java/umc/meme/shop/domain/reservation/dto/response/ArtistReservationDetailDto.java b/src/main/java/umc/meme/shop/domain/reservation/dto/response/ArtistReservationDetailDto.java
@@ -9,6 +9,7 @@
 import umc.meme.shop.global.enums.*;
 
 import java.util.Date;
+import java.util.Map;
 
 @Getter
 @Builder
@@ -25,11 +26,15 @@ public class ArtistReservationDetailDto {
     //예약 정보
     private String portfolioName;
     private Date date;
-//    private DayOfWeek dayOfWeek;
-//    private Times times;
+    private DayOfWeek dayOfWeek;
+    private Times times;
     private String location;
 
     public static ArtistReservationDetailDto from(Reservation reservation, Model model){
+        //TODO AvailableTime entity fix
+        Map<DayOfWeek, Times> times = reservation.getReservationDayOfWeekAndTime();
+        DayOfWeek dayOfWeek = times.keySet().iterator().next();
+
         return ArtistReservationDetailDto.builder()
                 .reservationId(reservation.getReservationId())
                 .modelNickName(model.getNickname())
@@ -39,8 +44,8 @@ public static ArtistReservationDetailDto from(Reservation reservation, Model mod
                 .personalColor(model.getPersonalColor())
                 .portfolioName(reservation.getPortfolio().getMakeupName())
                 .date(reservation.getReservationDate())
-//                .dayOfWeek(reservation.getReservationDayOfWeekAndTime())
-//                .times(reservation.getAvailableTime().getTimes())
+                .dayOfWeek(dayOfWeek)
+                .times(times.get(dayOfWeek))
                 .location(reservation.getLocation())
                 .build();
     }