Merge pull request #41 from hackathon-soa/feat/#38

Jinseong01 · web-flow · commit 2277ebf4b778 · 2025-07-06T07:05:05.000+09:00
Refactor : 여행코스 상세 조회 API 2차 구현
diff --git a/src/main/java/hackathon/soa/domain/segment/SegmentConverter.java b/src/main/java/hackathon/soa/domain/segment/SegmentConverter.java
@@ -0,0 +1,67 @@
+package hackathon.soa.domain.segment;
+
+import hackathon.soa.domain.search.dto.SearchResponseDTO;
+import hackathon.soa.domain.segment.dto.SegmentResponseDTO;
+import hackathon.soa.entity.CourseSegment;
+import hackathon.soa.entity.MoveSegment;
+import hackathon.soa.entity.StaySegment;
+
+import java.math.BigDecimal;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Locale;
+
+public class SegmentConverter {
+
+    public static SegmentResponseDTO.CourseDetailResponseDTO toCourseDetailResponseDTO(
+            Long courseId, Boolean isOwner,
+            SearchResponseDTO.SearchCourseResponseDTO courseInfo,
+            List<SegmentResponseDTO.SegmentDetailDTO> segments) {
+        return SegmentResponseDTO.CourseDetailResponseDTO.builder()
+                .courseId(courseId)
+                .isMine(isOwner)
+                .courseInfo(courseInfo)
+                .segments(segments)
+                .build();
+    }
+
+    public static SegmentResponseDTO.SegmentDetailDTO toSegmentDetailDTO(
+            CourseSegment courseSegment,
+            StaySegment staySegment,
+            MoveSegment moveSegment,
+            Boolean isParticipated) {
+
+        // 시간 포맷터 정의
+        DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("MM/dd(E)", Locale.KOREAN);
+        DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm");
+
+        String segmentType = (staySegment != null) ? "장소" : "이동";
+
+        return SegmentResponseDTO.SegmentDetailDTO.builder()
+                .segmentOrder(courseSegment.getSegmentOrder())
+                .segmentType(segmentType)
+                .date(courseSegment.getStartTime().format(dateFormatter))
+                .startTime(courseSegment.getStartTime().format(timeFormatter))
+                .endTime(courseSegment.getEndTime().format(timeFormatter))
+                .staySegment(staySegment != null ? toStaySegmentDTO(staySegment, isParticipated) : null)
+                .moveSegment(moveSegment != null ? toMoveSegmentDTO(moveSegment) : null)
+                .build();
+    }
+
+    public static SegmentResponseDTO.StaySegmentDTO toStaySegmentDTO(StaySegment staySegment, Boolean isParticipated) {
+        return SegmentResponseDTO.StaySegmentDTO.builder()
+                .segmentId(staySegment.getSegmentId())
+                .locationName(staySegment.getLocationName())
+                .locationAddress(staySegment.getLocationAddress())
+                .isParticipated(isParticipated)
+                .build();
+    }
+
+    public static SegmentResponseDTO.MoveSegmentDTO toMoveSegmentDTO(MoveSegment moveSegment) {
+        return SegmentResponseDTO.MoveSegmentDTO.builder()
+                .segmentId(moveSegment.getSegmentId())
+                .movementType(moveSegment.getMovementType())
+                .movementDistanceKm(BigDecimal.valueOf(moveSegment.getMovementDistanceKm()))
+                .build();
+    }
+}
diff --git a/src/main/java/hackathon/soa/domain/segment/SegmentService.java b/src/main/java/hackathon/soa/domain/segment/SegmentService.java
@@ -2,16 +2,18 @@
 
 import hackathon.soa.common.apiPayload.code.status.ErrorStatus;
 import hackathon.soa.common.apiPayload.exception.CourseHandler;
+import hackathon.soa.common.apiPayload.exception.GeneralException;
 import hackathon.soa.common.apiPayload.exception.SegmentHandler;
 import hackathon.soa.domain.course.repository.CourseRepository;
+import hackathon.soa.domain.likes.LikesRepository;
+import hackathon.soa.domain.member.MemberRepository;
+import hackathon.soa.domain.search.SearchConverter;
+import hackathon.soa.domain.search.dto.SearchResponseDTO;
 import hackathon.soa.domain.segment.dto.SegmentResponseDTO;
 import hackathon.soa.domain.segment.repository.CourseSegmentRepository;
 import hackathon.soa.domain.segment.repository.MoveSegmentRepository;
 import hackathon.soa.domain.segment.repository.StaySegmentRepository;
-import hackathon.soa.entity.Course;
-import hackathon.soa.entity.CourseSegment;
-import hackathon.soa.entity.MoveSegment;
-import hackathon.soa.entity.StaySegment;
+import hackathon.soa.entity.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -33,6 +35,8 @@ public class SegmentService {
     private final StaySegmentRepository staySegmentRepository;
     private final MoveSegmentRepository moveSegmentRepository;
     private final CourseRepository courseRepository;
+    private final MemberRepository memberRepository;
+    private final LikesRepository likesRepository;
 
     public SegmentResponseDTO.CourseDetailResponseDTO getCourseDetail(Long courseId, Long memberId) {
         // 1. 코스 조회 및 작성자 확인
@@ -41,59 +45,45 @@ public SegmentResponseDTO.CourseDetailResponseDTO getCourseDetail(Long courseId,
 
         boolean isOwner = course.getMember().getId().equals(memberId);
 
-        // 2. 코스 세그먼트들을 순서대로 조회함
+        // 2. 코스 기본 정보 및 좋아요 정보 조회
+        SearchResponseDTO.SearchCourseResponseDTO courseInfo = getCourseById(memberId, courseId);
+
+        // 3. 코스 세그먼트들을 순서대로 조회
         List<CourseSegment> courseSegments = courseSegmentRepository.findByCourse_IdOrderBySegmentOrder(courseId);
 
         if (courseSegments.isEmpty()) {
             throw new CourseHandler(ErrorStatus.NOT_FOUND_COURSE);
         }
 
-        // 3. 각 세그먼트 정보를 조회하여 DTO 생성
+        // 4. 각 세그먼트 정보를 조회하여 DTO 생성
         List<SegmentResponseDTO.SegmentDetailDTO> segmentDetails = courseSegments.stream()
-                .map(this::buildSegmentDetail)
+                .map(segment -> buildSegmentDetail(segment, memberId))
                 .collect(Collectors.toList());
 
-        return SegmentResponseDTO.CourseDetailResponseDTO.builder()
-                .courseId(courseId)
-                .isOwner(isOwner)
-                .segments(segmentDetails)
-                .build();
+        // 5. SegmentConverter를 사용하여 최종 응답 DTO 생성
+        return SegmentConverter.toCourseDetailResponseDTO(courseId, isOwner, courseInfo, segmentDetails);
     }
 
-    private SegmentResponseDTO.SegmentDetailDTO buildSegmentDetail(CourseSegment courseSegment) {
+    private SegmentResponseDTO.SegmentDetailDTO buildSegmentDetail(CourseSegment courseSegment, Long memberId) {
         Long segmentId = courseSegment.getId();
 
-        // 시간 포맷터 정의
-        DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("MM/dd(E)", Locale.KOREAN);
-        DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm");
-
         try {
             // 장소 세그먼트 먼저 확인 (@MapsId로 PK가 동일함)
             Optional<StaySegment> staySegment = staySegmentRepository.findById(segmentId);
             if (staySegment.isPresent()) {
-                return SegmentResponseDTO.SegmentDetailDTO.builder()
-                        .segmentOrder(courseSegment.getSegmentOrder())
-                        .segmentType("장소")
-                        .date(courseSegment.getStartTime().format(dateFormatter))
-                        .startTime(courseSegment.getStartTime().format(timeFormatter))
-                        .endTime(courseSegment.getEndTime().format(timeFormatter))
-                        .staySegment(SegmentResponseDTO.StaySegmentDTO.from(staySegment.get()))
-                        .moveSegment(null)
-                        .build();
+                // 현재 사용자가 이 장소 세그먼트에 참여했는지 확인
+                boolean isParticipated = staySegment.get().getSegmentParticipations().stream()
+                        .anyMatch(participation -> participation.getMember().getId().equals(memberId));
+
+                // SegmentConverter를 사용하여 장소 세그먼트 DTO 생성
+                return SegmentConverter.toSegmentDetailDTO(courseSegment, staySegment.get(), null, isParticipated);
             }
 
             // 이동 세그먼트 확인 (@MapsId로 PK가 동일함)
             Optional<MoveSegment> moveSegment = moveSegmentRepository.findById(segmentId);
             if (moveSegment.isPresent()) {
-                return SegmentResponseDTO.SegmentDetailDTO.builder()
-                        .segmentOrder(courseSegment.getSegmentOrder())
-                        .segmentType("이동")
-                        .date(courseSegment.getStartTime().format(dateFormatter))
-                        .startTime(courseSegment.getStartTime().format(timeFormatter))
-                        .endTime(courseSegment.getEndTime().format(timeFormatter))
-                        .staySegment(null)
-                        .moveSegment(SegmentResponseDTO.MoveSegmentDTO.from(moveSegment.get()))
-                        .build();
+                // SegmentConverter를 사용하여 이동 세그먼트 DTO 생성
+                return SegmentConverter.toSegmentDetailDTO(courseSegment, null, moveSegment.get(), false);
             }
 
             throw new SegmentHandler(ErrorStatus.SEGMENT_NOT_FOUND);
@@ -103,4 +93,17 @@ private SegmentResponseDTO.SegmentDetailDTO buildSegmentDetail(CourseSegment cou
             throw new SegmentHandler(ErrorStatus.SEGMENT_DESERIALIZATION_ERROR);
         }
     }
+
+    public SearchResponseDTO.SearchCourseResponseDTO getCourseById(Long memberId, Long courseId) {
+
+        Member member = memberRepository.findById(memberId)
+                .orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND));
+
+        Course course = courseRepository.findById(courseId)
+                .orElseThrow(() -> new GeneralException(ErrorStatus.NOT_FOUND_COURSE));
+
+        boolean liked = likesRepository.existsByCourseAndMember(course, member);
+
+        return SearchConverter.toSearchCourseResponseDTO(course, liked);
+    }
 }
diff --git a/src/main/java/hackathon/soa/domain/segment/dto/SegmentResponseDTO.java b/src/main/java/hackathon/soa/domain/segment/dto/SegmentResponseDTO.java
@@ -1,5 +1,6 @@
 package hackathon.soa.domain.segment.dto;
 
+import hackathon.soa.domain.search.dto.SearchResponseDTO;
 import hackathon.soa.entity.MoveSegment;
 import hackathon.soa.entity.MovementType;
 import hackathon.soa.entity.StaySegment;
@@ -19,7 +20,8 @@ public class SegmentResponseDTO {
     @AllArgsConstructor
     public static class CourseDetailResponseDTO {
         private Long courseId;
-        private Boolean isOwner; // 해당 멤버가 코스 작성자인지 여부
+        private Boolean isMine; // 해당 멤버가 코스 작성자인지 여부
+        private SearchResponseDTO.SearchCourseResponseDTO courseInfo; // 코스 기본 정보 및 좋아요 정보
         private List<SegmentDetailDTO> segments;
     }
 
@@ -30,9 +32,9 @@ public static class CourseDetailResponseDTO {
     public static class SegmentDetailDTO {
         private Integer segmentOrder;
         private String segmentType; // "장소" or "이동"
-        private String date; // "07/05(토)"
-        private String startTime; // "09:00"
-        private String endTime; // "09:30"
+        private String date; // "07/05(토)" 형식
+        private String startTime; // "09:00" 형식
+        private String endTime; // "09:30" 형식
         private StaySegmentDTO staySegment;
         private MoveSegmentDTO moveSegment;
     }
@@ -45,12 +47,14 @@ public static class StaySegmentDTO {
         private Long segmentId;
         private String locationName;
         private String locationAddress;
+        private Boolean isParticipated; // 현재 사용자의 참여 여부
 
-        public static StaySegmentDTO from(StaySegment staySegment) {
+        public static StaySegmentDTO from(StaySegment staySegment, Boolean isParticipated) {
             return StaySegmentDTO.builder()
                     .segmentId(staySegment.getSegmentId())
                     .locationName(staySegment.getLocationName())
                     .locationAddress(staySegment.getLocationAddress())
+                    .isParticipated(isParticipated)
                     .build();
         }
     }
