🐛 fix: 데이트 코스 null 값 리

Author: catturtle123

src/main/java/org/withtime/be/withtimebe/domain/date/controller/command/DateCommandController.java

@@ -34,7 +34,7 @@ public DefaultResponse<DateResponseDTO.DateCourse> createDateCourse(
             @RequestBody DateRequestDTO.CreateDateCourse request
     ){
         RecommendedCourseResult datePlaces = dateCommandService.createDateCourse(request);
-        DateResponseDTO.DateCourse dateCourse = DateConverter.createDateCourseInfo(datePlaces.places(), datePlaces.signature());
+        DateResponseDTO.DateCourse dateCourse = DateConverter.createDateCourseInfo(datePlaces.places(), datePlaces.signature(), request);
         return DefaultResponse.created(dateCourse);
     }
 

src/main/java/org/withtime/be/withtimebe/domain/date/converter/DateConverter.java

@@ -1,15 +1,15 @@
 package org.withtime.be.withtimebe.domain.date.converter;
 
+import lombok.Builder;
 import org.springframework.data.domain.Page;
 import org.withtime.be.withtimebe.domain.date.dto.request.DateRequestDTO;
 import org.withtime.be.withtimebe.domain.date.dto.response.DateResponseDTO;
-import org.withtime.be.withtimebe.domain.date.entity.DateCourse;
-import org.withtime.be.withtimebe.domain.date.entity.DateCourseBookmark;
-import org.withtime.be.withtimebe.domain.date.entity.DatePlace;
-import org.withtime.be.withtimebe.domain.date.entity.DatePlaceDateCourse;
+import org.withtime.be.withtimebe.domain.date.entity.*;
 import org.withtime.be.withtimebe.domain.member.entity.Member;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -40,22 +40,48 @@ public static DateCourse createDateCourse(DateRequestDTO.SaveDateCourse dateCour
 
     // List<DatePlace> -> DateResponseDTO.DateCourseInfo
     // 단일 추천 코스를 응답으로 구성(시그니처 포함)
-    public static DateResponseDTO.DateCourse createDateCourseInfo(List<DatePlace> datePlaces, String signature){
+    public static DateResponseDTO.DateCourse createDateCourseInfo(List<DatePlace> datePlaces, String signature, DateRequestDTO.CreateDateCourse request){
+
         List<DateResponseDTO.DatePlace> datePlaceDtos = datePlaces.stream()
-                .map(dp -> DateConverter.createDatePlace(dp, null, null))
+                .map(dp -> {
+                    LocalDateTime startTime = request.startTime();
+
+                    int index = datePlaces.indexOf(dp);
+                    LocalDateTime thisStartTime = startTime.plusMinutes(90L * index);
+                    LocalDateTime endTime = thisStartTime.plusMinutes(90);
+
+                    return DateConverter.createDatePlace(dp, thisStartTime, endTime);
+                })
                 .toList();
 
         return DateResponseDTO.DateCourse.builder()
                 .name(LocalDateTime.now().toLocalDate().toString())
                 .datePlaces(datePlaceDtos)
+                .dateCourseSearchCondInfo(toDateCourseSearchCondInfo(request))
                 .signature(signature) // ← 추가
                 .build();
     }
 
+    public static DateResponseDTO.DateCourseSearchCondInfo toDateCourseSearchCondInfo(DateRequestDTO.CreateDateCourse request) {
+        return DateResponseDTO.DateCourseSearchCondInfo.builder()
+                .budget(request.budget())                       // 예산 구간
+                .datePlaces(request.datePlaces())               // 선택한 장소 리스트
+                .dateDurationTime(request.dateDurationTime())   // 데이트 소요 시간
+                .mealTypes(request.mealPlan())                  // 식사 계획
+                .transportation(request.transportation())       // 교통 수단
+                .userPreferredKeywords(request.userPreferredKeywords()) // 키워드
+                .build();
+    }
+
     // DatePlace -> DateResponseDTO.DatePlace
     public static DateResponseDTO.DatePlace createDatePlace(DatePlace datePlace,
-                                                            LocalDateTime startTime,
-                                                            LocalDateTime endTime) {
+                                                            LocalTime startTime,
+                                                            LocalTime endTime) {
+        Item item = null;
+        if (!datePlace.getItems().isEmpty()) {
+            item = datePlace.getItems().get(0);
+        }
+
         return DateResponseDTO.DatePlace.builder()
                 .datePlaceId(datePlace.getId())
                 .name(datePlace.getName())
@@ -70,6 +96,28 @@ public static DateResponseDTO.DatePlace createDatePlace(DatePlace datePlace,
                 .placeType(datePlace.getPlaceType())
                 .startTime(startTime)
                 .endTime(endTime)
+                .signatureDish(toSignatureDish(item))
+                .build();
+    }
+
+    public static DateResponseDTO.DatePlace createDatePlace(DatePlace datePlace,
+                                                            LocalDateTime startTime,
+                                                            LocalDateTime endTime) {
+        return DateResponseDTO.DatePlace.builder()
+                .datePlaceId(datePlace.getId())
+                .name(datePlace.getName())
+                .image(datePlace.getImage())
+                .tel(datePlace.getTel())
+                .averagePrice(datePlace.getAveragePrice())
+                .information(datePlace.getInformation())
+                .latitude(datePlace.getLatitude())
+                .longitude(datePlace.getLongitude())
+                .roadNameAddress(datePlace.getRoadNameAddress())
+                .lotNumberAddress(datePlace.getLotNumberAddress())
+                .placeType(datePlace.getPlaceType())
+                .startTime(LocalTime.from(startTime))
+                .endTime(LocalTime.from(endTime))
+                .signatureDish(toSignatureDish(datePlace.getItems().isEmpty() ? null : datePlace.getItems().get(0)))
                 .build();
     }
 
@@ -122,4 +170,16 @@ public static DateResponseDTO.DateCourseList createDateCourseList(Page<DateCours
                 .build();
     }
 
+    @Builder
+    public static DateResponseDTO.SignatureDish toSignatureDish(Item item) {
+        if (item == null) return null;
+
+        return DateResponseDTO.SignatureDish.builder()
+                .ItemId(item.getId())
+                .imageUrl(item.getImage())
+                .price(item.getPrice())
+                .name(item.getName())
+                .build();
+    }
+
 }

src/main/java/org/withtime/be/withtimebe/domain/date/dto/response/DateResponseDTO.java

@@ -3,7 +3,9 @@
 import lombok.Builder;
 import org.withtime.be.withtimebe.domain.date.entity.enums.*;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.List;
 
 public record DateResponseDTO() {
@@ -26,8 +28,9 @@ public record DatePlace(
         String roadNameAddress,
         String lotNumberAddress,
         PlaceType placeType,
-        LocalDateTime startTime,
-        LocalDateTime endTime
+        LocalTime startTime,
+        LocalTime endTime,
+        SignatureDish signatureDish
     ){}
 
     @Builder
@@ -58,4 +61,12 @@ public record DateCourseSearchCondInfo(
             Transportation transportation,
             List<String> userPreferredKeywords
     ){}
+
+    @Builder
+    public record SignatureDish(
+            Long ItemId,
+            String imageUrl,
+            String name,
+            String price
+    ){}
 }

src/main/java/org/withtime/be/withtimebe/domain/date/entity/DatePlace.java

@@ -54,4 +54,10 @@ public class DatePlace extends BaseEntity {
 
     @OneToMany(mappedBy = "datePlace", cascade = CascadeType.ALL)
     private List<DatePlacePlaceCategory> placeCategories;
+
+    @OneToMany(mappedBy = "datePlace", cascade = CascadeType.ALL)
+    private List<Item> items;
+
+    @OneToMany(mappedBy = "datePlace", cascade = CascadeType.ALL)
+    private List<BusinessTime> businessTimes;
 }