Merge pull request #39 from WHERE2GOES/v3-certification

feat: 인증 조회 시 리턴 구조체 추가 수정

Author: 7dngur7

greatjourney/src/main/java/backend/greatjourney/domain/certification/dto/CourseCertificationStatusResponse.java

@@ -6,5 +6,6 @@ public record CourseCertificationStatusResponse(
         boolean isCompleted, // 코스 완료 여부
         long totalCertificationsCount, // (추가) 해당 코스의 전체 인증소 개수
         long certifiedCount,           // (추가) 사용자가 인증한 개수
-        List<CertificationStatusDto> certifications // 기존 인증 내역 리스트
+        List<CertificationStatusDto> certifications, // 기존 인증 내역 리스트
+        List<UncertifiedPlaceDto> uncertifiedList   // (추가) 아직 인증하지 않은 목록
 ) {}

greatjourney/src/main/java/backend/greatjourney/domain/certification/dto/UncertifiedPlaceDto.java

@@ -0,0 +1,27 @@
+package backend.greatjourney.domain.certification.dto;
+
+
+import backend.greatjourney.domain.course.domain.Place;
+
+public record UncertifiedPlaceDto(
+        Long placeId,
+        String placeName
+//        String address,
+//        Double latitude,
+//        Double longitude
+) {
+    /**
+     * Place 엔티티를 UncertifiedPlaceDto로 변환합니다.
+     * @param place 원본 Place 엔티티
+     * @return 변환된 DTO
+     */
+    public static UncertifiedPlaceDto from(Place place) {
+        return new UncertifiedPlaceDto(
+                place.getId(),
+                place.getName()
+//                place.getAddress(),
+//                place.getLatitude(),
+//                place.getLongitude()
+        );
+    }
+}

greatjourney/src/main/java/backend/greatjourney/domain/certification/service/CertificationService.java

@@ -4,9 +4,12 @@
 import backend.greatjourney.domain.certification.dto.CertificationRequest;
 import backend.greatjourney.domain.certification.dto.CertificationStatusDto;
 import backend.greatjourney.domain.certification.dto.CourseCertificationStatusResponse;
+import backend.greatjourney.domain.certification.dto.UncertifiedPlaceDto;
 import backend.greatjourney.domain.certification.repository.UserCertificationRepository;
 import backend.greatjourney.domain.course.domain.Place;
+import backend.greatjourney.domain.course.dto.CertificationCenterDto;
 import backend.greatjourney.domain.course.repository.PlaceRepository;
+import backend.greatjourney.domain.course.service.CourseInfoService;
 import backend.greatjourney.domain.user.entity.User;
 import backend.greatjourney.domain.user.repository.UserRepository;
 import backend.greatjourney.global.exception.CustomException;
@@ -17,6 +20,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -27,6 +31,7 @@ public class CertificationService {
     private final PlaceRepository placeRepository;
     private final UserRepository userRepository;
     private final UserCertificationRepository userCertificationRepository;
+    private final CourseInfoService courseInfoService;
 
     public void certify(CustomOAuth2User customOAuth2User, CertificationRequest request) {
         // 1. 요청받은 placeId로 인증센터를 조회합니다.
@@ -65,6 +70,11 @@ public void certify(CustomOAuth2User customOAuth2User, CertificationRequest requ
     public CourseCertificationStatusResponse getUserCertificationsForCourse(CustomOAuth2User customOAuth2User, Integer courseId) {
         Long userId = Long.parseLong(customOAuth2User.getUserId());
 
+        // 1. CourseInfoService를 통해 코스의 전체 인증센터 DTO 목록을 가져옵니다.
+        List<CertificationCenterDto> allCenterDtos = courseInfoService.getCertificationCentersForCourse(courseId);
+        long totalCertificationsCount = allCenterDtos.size();
+
+
         // 1. 해당 코스의 전체 인증센터 개수를 조회합니다.
         long totalCertificationCenters = placeRepository.countByCategoryAndCourseId("인증센터", courseId);
 
@@ -82,7 +92,24 @@ public CourseCertificationStatusResponse getUserCertificationsForCourse(CustomOA
                 .map(CertificationStatusDto::from)
                 .toList();
 
+        // 5. '미인증' 목록('uncertifiedList')을 계산합니다.
+        //    - 먼저, 인증 완료한 장소의 ID만 Set으로 추출합니다.
+        Set<Long> certifiedPlaceIds = userCertifications.stream()
+                .map(uc -> uc.getCertificationCenter().getId())
+                .collect(Collectors.toSet());
+
+        //    - 전체 인증센터 DTO 목록에서, 인증된 ID를 포함하지 않는 것들만 필터링합니다.
+        List<UncertifiedPlaceDto> uncertifiedDtos = allCenterDtos.stream()
+                .filter(centerDto -> !certifiedPlaceIds.contains(centerDto.placeId()))
+                .map(centerDto -> new UncertifiedPlaceDto(
+                        centerDto.placeId(),
+                        centerDto.placeName()
+//                        centerDto.latitude(),
+//                        centerDto.longitude()
+                ))
+                .toList();
+
         // 5. 최종 응답 DTO를 생성하여 반환합니다.
-        return new CourseCertificationStatusResponse(isCompleted, totalCertificationCenters, certifiedCount, certificationDtos);
+        return new CourseCertificationStatusResponse(isCompleted, totalCertificationCenters, certifiedCount, certificationDtos, uncertifiedDtos);
     }
 }

greatjourney/src/main/java/backend/greatjourney/domain/course/dto/CertificationCenterDto.java

@@ -0,0 +1,20 @@
+package backend.greatjourney.domain.course.dto;
+
+import backend.greatjourney.domain.course.domain.Place;
+
+// 이 DTO는 이전에 만들었던 UncertifiedPlaceDto와 거의 동일할 수 있습니다.
+public record CertificationCenterDto(
+        long placeId,
+        String placeName,
+        Double latitude,
+        Double longitude
+) {
+    public static CertificationCenterDto from(Place place) {
+        return new CertificationCenterDto(
+                place.getId(),
+                place.getName(),
+                place.getLatitude(),
+                place.getLongitude()
+        );
+    }
+}

greatjourney/src/main/java/backend/greatjourney/domain/course/service/CourseInfoService.java

@@ -0,0 +1,42 @@
+package backend.greatjourney.domain.course.service;
+
+import backend.greatjourney.domain.course.domain.Place;
+import backend.greatjourney.domain.course.dto.CertificationCenterDto;
+import backend.greatjourney.domain.course.repository.CourseRepository;
+import backend.greatjourney.domain.course.repository.PlaceRepository;
+import backend.greatjourney.global.exception.CustomException;
+import backend.greatjourney.global.exception.ErrorCode;
+import jakarta.transaction.Transactional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+@Transactional // 정보 조회이므로 readOnly = true 설정
+public class CourseInfoService {
+
+    private final PlaceRepository placeRepository;
+    private final CourseRepository courseRepository;
+
+    /**
+     * 특정 코스에 포함된 모든 인증센터 목록을 조회합니다.
+     * @param courseId 조회할 코스의 ID
+     * @return 인증센터 DTO 리스트
+     */
+    public List<CertificationCenterDto> getCertificationCentersForCourse(Integer courseId) {
+        // 1. 코스가 실제로 존재하는지 확인 (안정성)
+        if (!courseRepository.existsById(courseId)) {
+            throw new CustomException(ErrorCode.COURSE_NOT_FOUND);
+        }
+
+        // 2. PlaceRepository를 사용해 해당 코스의 '인증센터'들을 모두 조회
+        List<Place> centers = placeRepository.findByCategoryAndCourseId("인증센터", courseId);
+
+        // 3. 조회된 Place 엔티티 리스트를 CertificationCenterDto 리스트로 변환하여 반환
+        return centers.stream()
+                .map(CertificationCenterDto::from)
+                .toList();
+    }
+}