[REFACTOR/#169] 성지순례 카테고리 조회 리팩토링 및 서비스 테스트 추가

build.gradle

@@ -38,9 +38,10 @@ dependencies {
 	runtimeOnly 'com.mysql:mysql-connector-j'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
+	testRuntimeOnly 'com.h2database:h2'
 
 	// Lombok
-	compileOnly 'org.projectlombok:lombok'
+	implementation 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'
 
 	// Email

src/main/java/com/favoriteplace/app/pilgrimage/controller/PilgrimageApiController.java

@@ -3,9 +3,11 @@
 import com.favoriteplace.app.member.domain.Member;
 import com.favoriteplace.app.common.dto.CommonResponseDto;
 import com.favoriteplace.app.pilgrimage.controller.dto.PilgrimageResponseDto;
+import com.favoriteplace.app.pilgrimage.service.PilgrimageCategoryQueryService;
 import com.favoriteplace.app.rally.controller.dto.RallyResponseDto;
 import com.favoriteplace.app.pilgrimage.service.PilgrimageCommandService;
 import com.favoriteplace.app.pilgrimage.service.PilgrimageQueryService;
+import com.favoriteplace.global.auth.resolver.UserEmail;
 import com.favoriteplace.global.exception.ErrorCode;
 import com.favoriteplace.global.exception.RestApiException;
 import com.favoriteplace.global.util.SecurityUtil;
@@ -31,6 +33,7 @@
 @RequestMapping(value = "/pilgrimage")
 @RequiredArgsConstructor
 public class PilgrimageApiController {
+    private final PilgrimageCategoryQueryService pilgrimageCategoryQueryService;
     private final PilgrimageQueryService pilgrimageQueryService;
     private final PilgrimageCommandService pilgrimageCommandService;
     private final SecurityUtil securityUtil;
@@ -55,29 +58,29 @@ public RallyResponseDto.RallyTrendingDto getRallyTrending(HttpServletRequest req
     // 성지순례 애니메이션 카테고리
     // 회원 + 비회원
     @GetMapping("/anime")
-    public List<RallyResponseDto.PilgrimageCategoryAnimeDto> getCategoryAnime(HttpServletRequest request){
-        Member member = securityUtil.getUserFromHeader(request);
-        return pilgrimageQueryService.getCategoryAnime(member);
+    public List<RallyResponseDto.PilgrimageCategoryAnimeDto> getCategoryAnime(@UserEmail String email) {
+        return pilgrimageCategoryQueryService.getCategoryAnime(email);
     }
 
     // 성지순례 지역 카테고리
     @GetMapping("/region")
-    public List<PilgrimageResponseDto.PilgrimageCategoryRegionDto> getCategoryRegion(){
-        return pilgrimageQueryService.getCategoryRegion();
+    public List<PilgrimageResponseDto.PilgrimageCategoryRegionDto> getCategoryRegion() {
+        return pilgrimageCategoryQueryService.getCategoryRegion();
     }
 
     // 성지순례 지역 상세 카테고리
     @GetMapping("/region/{regionId}")
-    public List<PilgrimageResponseDto.PilgrimageCategoryRegionDetailDto> getCategoryRegionDetail(@PathVariable("regionId")Long regionId){
-        return pilgrimageQueryService.getCategoryRegionDetail(regionId);
+    public List<PilgrimageResponseDto.PilgrimageCategoryRegionDetailDto> getCategoryRegionDetail(
+            @PathVariable("regionId") Long regionId) {
+        return pilgrimageCategoryQueryService.getCategoryRegionDetail(regionId);
     }
 
     // 성지순례 랠리 상세
     // 랠리 찜 개발 후 테스트 필요
     // 회원 + 비회원
     @GetMapping("/{rallyId}")
     public RallyResponseDto.RallyDetailResponseDto getRallyDetail(HttpServletRequest request,
-                                                                  @PathVariable("rallyId")Long rallyId){
+                                                                  @PathVariable("rallyId") Long rallyId) {
         Member member = securityUtil.getUserFromHeader(request);
         return pilgrimageQueryService.getRallyDetail(rallyId, member);
     }
@@ -87,15 +90,16 @@ public RallyResponseDto.RallyDetailResponseDto getRallyDetail(HttpServletRequest
     // 회원 + 비회원
     @GetMapping("/{rallyId}/list")
     public RallyResponseDto.RallyAddressListDto getRallyAddressList(
-            HttpServletRequest request, @PathVariable("rallyId")Long rallyId){
+            HttpServletRequest request, @PathVariable("rallyId") Long rallyId) {
         Member member = securityUtil.getUserFromHeader(request);
         return pilgrimageQueryService.getRallyAddressList(rallyId, member);
     }
 
     // 성지순례 랠리 장소 상세
     // 회원
     @GetMapping("/detail/{pilgrimageId}")
-    public PilgrimageResponseDto.PilgrimageDetailDto getPilgrimageDetail(HttpServletRequest request, @PathVariable("pilgrimageId")Long pilgrimageId){
+    public PilgrimageResponseDto.PilgrimageDetailDto getPilgrimageDetail(HttpServletRequest request,
+                                                                         @PathVariable("pilgrimageId") Long pilgrimageId) {
         // Jwt AuthenticationFilter에 엔드포인트 추가
         Member member = securityUtil.getUserFromHeader(request);
         return pilgrimageQueryService.getPilgrimageDetail(pilgrimageId, member);
@@ -126,28 +130,19 @@ public ResponseEntity<Void> unsubscribeRally(@PathVariable("rally_id") Long rall
         return ResponseEntity.noContent().build();
     }
 
-    // 성지순례 장소 방문 인증하기
-//    @PostMapping("/certified/{pilgrimage_id}")
-//    public CommonResponseDto.RallyResponseDto certifyToPilgrimage(
-//            @PathVariable("pilgrimage_id")Long pilgrimageId,
-//            @RequestBody PilgrimageDto.PilgrimageCertifyRequestDto form){
-//        Member member = securityUtil.getUser();
-//        return pilgrimageCommandService.certifyToPilgrimage(pilgrimageId, member, form);
-//    }
-
     // 성지순례 애니 별 검색
     @GetMapping("/category")
-    public List<RallyResponseDto.SearchAnimeDto> searchAnime(HttpServletRequest request, @RequestParam String value){
+    public List<RallyResponseDto.SearchAnimeDto> searchAnime(HttpServletRequest request, @RequestParam String value) {
         Member member = securityUtil.getUserFromHeader(request);
-        if (value.equals("")){
+        if (value.equals("")) {
             throw new RestApiException(ErrorCode.RALLY_NOT_FOUND);
         }
         return pilgrimageQueryService.searchAnime(value, member);
     }
 
     // 성지순례 지역 별 검색
     @GetMapping("/category/region")
-    public List<RallyResponseDto.SearchRegionDto> searchRegion(HttpServletRequest request, @RequestParam String value){
+    public List<RallyResponseDto.SearchRegionDto> searchRegion(HttpServletRequest request, @RequestParam String value) {
         Member member = securityUtil.getUserFromHeader(request);
         if (value.equals("")) {
             throw new RestApiException(ErrorCode.PILGRIMAGE_NOT_FOUND);

src/main/java/com/favoriteplace/app/pilgrimage/service/PilgrimageCategoryQueryService.java

@@ -0,0 +1,138 @@
+package com.favoriteplace.app.pilgrimage.service;
+
+import com.favoriteplace.app.member.domain.Member;
+import com.favoriteplace.app.member.repository.MemberRepository;
+import com.favoriteplace.app.pilgrimage.controller.dto.PilgrimageResponseDto;
+import com.favoriteplace.app.pilgrimage.controller.dto.PilgrimageResponseDto.PilgrimageAddressDetailDto;
+import com.favoriteplace.app.pilgrimage.controller.dto.PilgrimageResponseDto.PilgrimageCategoryRegionDto;
+import com.favoriteplace.app.pilgrimage.converter.PilgrimageConverter;
+import com.favoriteplace.app.pilgrimage.domain.Pilgrimage;
+import com.favoriteplace.app.pilgrimage.repository.PilgrimageRepository;
+import com.favoriteplace.app.pilgrimage.repository.VisitedPilgrimageRepository;
+import com.favoriteplace.app.rally.controller.dto.RallyResponseDto.PilgrimageCategoryAnimeDto;
+import com.favoriteplace.app.rally.converter.RallyConverter;
+import com.favoriteplace.app.rally.domain.Address;
+import com.favoriteplace.app.rally.domain.Rally;
+import com.favoriteplace.app.rally.repository.AddressRepository;
+import com.favoriteplace.app.rally.repository.RallyRepository;
+import com.favoriteplace.global.auth.resolver.UserEmail;
+import com.favoriteplace.global.exception.ErrorCode;
+import com.favoriteplace.global.exception.RestApiException;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import lombok.RequiredArgsConstructor;
+
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class PilgrimageCategoryQueryService {
+    private final MemberRepository memberRepository;
+    private final RallyRepository rallyRepository;
+    private final VisitedPilgrimageRepository visitedPilgrimageRepository;
+    private final AddressRepository addressRepository;
+    private final PilgrimageRepository pilgrimageRepository;
+
+    /***
+     * 성지순례 애니 별 카테고리
+     * @param email 사용자 이메일
+     * @return
+     */
+    public List<PilgrimageCategoryAnimeDto> getCategoryAnime(@UserEmail String email) {
+        List<Rally> rallyList = rallyRepository.findAllOrderByCreatedAt();
+
+        if (email == null || email.isEmpty()) {
+            return getPilgrimageAnimeCategoryWithoutMember(rallyList);
+        }
+
+        Member member = getMemberByEmail(email);
+        return getPilgrimageAnimeCategoryWithMember(rallyList, member);
+    }
+
+    /***
+     * 성지순례 지역 별 카테고리
+     * @return state 별로 그룹화 한 지역 정보
+     */
+    public List<PilgrimageResponseDto.PilgrimageCategoryRegionDto> getCategoryRegion() {
+        List<Address> address = addressRepository.findAll();
+
+        Set<String> addressKeyList = getStateAll(address);
+        Map<String, List<Address>> addressGroupByState = getDistrictGroupByState(address);
+
+        return getPilgrimageCategoryRegionDtos(addressKeyList, addressGroupByState);
+    }
+
+    /***
+     * 성지순례 지역 상세 카테고리
+     * @param regionId
+     * @return district 별 성지순례 리스트
+     */
+    public List<PilgrimageResponseDto.PilgrimageCategoryRegionDetailDto> getCategoryRegionDetail(Long regionId) {
+        Address address = getAddressByRegion(regionId);
+        List<Pilgrimage> pilgrimages = pilgrimageRepository.findByAddress(address);
+
+        return pilgrimages.stream()
+                .map(pilgrimage -> {
+                    Rally rally = rallyRepository.findByPilgrimage(pilgrimage);
+                    return PilgrimageConverter.toPilgrimageCategoryRegionDetailDto(rally.getName(), pilgrimage);
+                })
+                .toList();
+    }
+
+    private Member getMemberByEmail(String email) {
+        return memberRepository.findByEmail(email)
+                .orElseThrow(() -> new RestApiException(ErrorCode.USER_NOT_FOUND));
+    }
+
+    private List<PilgrimageCategoryAnimeDto> getPilgrimageAnimeCategoryWithMember(List<Rally> rallyList,
+                                                                                  Member member) {
+        return rallyList.stream().map(rally -> {
+            Long visitedPilgrimages = visitedPilgrimageRepository.findByDistinctCount(member.getId(), rally.getId());
+            return RallyConverter.toPilgrimageCategoryAnimeDto(rally, visitedPilgrimages);
+        }).toList();
+    }
+
+    private List<PilgrimageCategoryAnimeDto> getPilgrimageAnimeCategoryWithoutMember(List<Rally> rallyList) {
+        return rallyList.stream()
+                .map(rally -> RallyConverter.toPilgrimageCategoryAnimeDto(rally, 0L))
+                .toList();
+    }
+
+    private Address getAddressByRegion(Long regionId) {
+        return addressRepository.findById(regionId).orElseThrow(() ->
+                new RestApiException(ErrorCode.ADDRESS_NOT_FOUND));
+    }
+
+    private Map<String, List<Address>> getDistrictGroupByState(List<Address> address) {
+        return address.stream()
+                .collect(Collectors.groupingBy(Address::getState));
+    }
+
+    private Set<String> getStateAll(List<Address> address) {
+        return address.stream()
+                .map(Address::getState)
+                .collect(Collectors.toSet());
+    }
+
+    private List<PilgrimageCategoryRegionDto> getPilgrimageCategoryRegionDtos(Set<String> addressKeyList,
+                                                                              Map<String, List<Address>> addressGroupByState) {
+        return addressKeyList.stream().map(
+                stateKey -> {
+                    List<Address> addressList = addressGroupByState.get(stateKey);
+                    List<PilgrimageAddressDetailDto> addressDetailDtos = getPilgrimageAddressDetailDtos(
+                            addressList);
+                    return PilgrimageConverter.toPilgrimageCategoryRegionDto(stateKey, addressDetailDtos);
+                }
+        ).toList();
+    }
+
+    private List<PilgrimageAddressDetailDto> getPilgrimageAddressDetailDtos(List<Address> addressList) {
+        return addressList.stream()
+                .map(PilgrimageConverter::toPilgrimageAddressDetailDto)
+                .toList();
+    }
+}