chore: 코드 리뷰 사항 반영

7zrv · 7zrv · commit 59eef43fe796 · 2024-12-01T13:46:16.000+09:00
- 일부 mapper 클래스의 네이밍을 수정
- mapper 클래스의 디렉토리 위치 수정
- 응답 클래스에 대한 스웨거 작
diff --git a/src/main/java/com/somemore/center/repository/CenterRepository.java b/src/main/java/com/somemore/center/repository/CenterRepository.java
@@ -1,7 +1,7 @@
 package com.somemore.center.repository;
 
 import com.somemore.center.domain.Center;
-import com.somemore.center.dto.response.CenterOverviewInfoResponseDto;
+import com.somemore.center.repository.mapper.CenterOverviewInfo;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -16,6 +16,6 @@ default boolean doesNotExistById(UUID id) {
         return !existsById(id);
     }
     Optional<Center> findCenterById(UUID id);
-    List<CenterOverviewInfoResponseDto> findCenterOverviewsByIds(List<UUID> ids);
+    List<CenterOverviewInfo> findCenterOverviewsByIds(List<UUID> ids);
     void deleteAllInBatch();
 }
diff --git a/src/main/java/com/somemore/center/repository/CenterRepositoryImpl.java b/src/main/java/com/somemore/center/repository/CenterRepositoryImpl.java
@@ -4,7 +4,7 @@
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import com.somemore.center.domain.Center;
 import com.somemore.center.domain.QCenter;
-import com.somemore.center.dto.response.CenterOverviewInfoResponseDto;
+import com.somemore.center.repository.mapper.CenterOverviewInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
@@ -35,12 +35,12 @@ public Optional<Center> findCenterById(UUID id) {
     }
 
     @Override
-    public List<CenterOverviewInfoResponseDto> findCenterOverviewsByIds(List<UUID> ids) {
+    public List<CenterOverviewInfo> findCenterOverviewsByIds(List<UUID> ids) {
         QCenter center = QCenter.center;
 
         return queryFactory
                 .select(Projections.constructor(
-                        CenterOverviewInfoResponseDto.class,
+                        CenterOverviewInfo.class,
                         center.id,
                         center.name,
                         center.imgUrl
diff --git a/src/main/java/com/somemore/center/repository/mapper/CenterOverviewInfo.java b/src/main/java/com/somemore/center/repository/mapper/CenterOverviewInfo.java
@@ -1,9 +1,9 @@
-package com.somemore.center.dto.response;
+package com.somemore.center.repository.mapper;
 
 
 import java.util.UUID;
 
-public record CenterOverviewInfoResponseDto(
+public record CenterOverviewInfo(
         UUID centerId,
         String centerName,
         String imgUrl
diff --git a/src/main/java/com/somemore/center/service/query/CenterQueryService.java b/src/main/java/com/somemore/center/service/query/CenterQueryService.java
@@ -1,7 +1,7 @@
 package com.somemore.center.service.query;
 
 import com.somemore.center.domain.Center;
-import com.somemore.center.dto.response.CenterOverviewInfoResponseDto;
+import com.somemore.center.repository.mapper.CenterOverviewInfo;
 import com.somemore.center.dto.response.CenterProfileResponseDto;
 import com.somemore.center.dto.response.PreferItemResponseDto;
 import com.somemore.center.repository.CenterRepository;
@@ -35,7 +35,7 @@ public CenterProfileResponseDto getCenterProfileByCenterId(UUID centerId) {
     }
 
     @Override
-    public List<CenterOverviewInfoResponseDto> getCenterOverviewsByIds(List<UUID> centerIds) {
+    public List<CenterOverviewInfo> getCenterOverviewsByIds(List<UUID> centerIds) {
         return centerRepository.findCenterOverviewsByIds(centerIds);
     }
 
diff --git a/src/main/java/com/somemore/center/usecase/query/CenterQueryUseCase.java b/src/main/java/com/somemore/center/usecase/query/CenterQueryUseCase.java
@@ -1,13 +1,13 @@
 package com.somemore.center.usecase.query;
 
-import com.somemore.center.dto.response.CenterOverviewInfoResponseDto;
+import com.somemore.center.repository.mapper.CenterOverviewInfo;
 import com.somemore.center.dto.response.CenterProfileResponseDto;
 
 import java.util.List;
 import java.util.UUID;
 
 public interface CenterQueryUseCase {
     CenterProfileResponseDto getCenterProfileByCenterId(UUID centerId);
-    List<CenterOverviewInfoResponseDto> getCenterOverviewsByIds(List<UUID> centerIds);
+    List<CenterOverviewInfo> getCenterOverviewsByIds(List<UUID> centerIds);
     void validateCenterExists(UUID centerId);
 }
diff --git a/src/main/java/com/somemore/interestcenter/controller/InterestCenterQueryApiController.java b/src/main/java/com/somemore/interestcenter/controller/InterestCenterQueryApiController.java
@@ -1,7 +1,7 @@
 package com.somemore.interestcenter.controller;
 
 import com.somemore.global.common.response.ApiResponse;
-import com.somemore.interestcenter.dto.response.GetInterestCentersResponseDto;
+import com.somemore.interestcenter.dto.response.InterestCentersResponseDto;
 import com.somemore.interestcenter.usecase.InterestCenterQueryUseCase;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -22,9 +22,9 @@ public class InterestCenterQueryApiController {
 
     @Operation(summary = "관심기관 목록 조회 API")
     @GetMapping("/api/interest-centers")
-    public ApiResponse<List<GetInterestCentersResponseDto>> getInterestCenters(@AuthenticationPrincipal String volunteerId) {
+    public ApiResponse<List<InterestCentersResponseDto>> getInterestCenters(@AuthenticationPrincipal String volunteerId) {
 
-        List<GetInterestCentersResponseDto> responseDtos = interestCenterQueryUseCase.getInterestCenters(UUID.fromString(volunteerId));
+        List<InterestCentersResponseDto> responseDtos = interestCenterQueryUseCase.getInterestCenters(UUID.fromString(volunteerId));
 
         return ApiResponse.ok(200, responseDtos, "관심기관 조회 성공");
     }
diff --git a/src/main/java/com/somemore/interestcenter/dto/response/GetInterestCentersResponseDto.java b/src/main/java/com/somemore/interestcenter/dto/response/GetInterestCentersResponseDto.java
diff --git a/src/main/java/com/somemore/interestcenter/dto/response/InterestCentersResponseDto.java b/src/main/java/com/somemore/interestcenter/dto/response/InterestCentersResponseDto.java
@@ -0,0 +1,28 @@
+package com.somemore.interestcenter.dto.response;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import com.somemore.center.repository.mapper.CenterOverviewInfo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+
+import java.util.UUID;
+
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+@Builder
+public record InterestCentersResponseDto(
+        @Schema(description = "관심기관의 ID", example = "123e4567-e89b-12d3-a456-426614174000")
+        UUID centerId,
+        @Schema(description = "관심기관의 이름", example = "서울 도서관")
+        String centerName,
+        @Schema(description = "관심기관의 프로필 이미지 링크", example = "~~/image.jpeg")
+        String imgUrl
+) {
+    public static InterestCentersResponseDto of(CenterOverviewInfo responseDto) {
+        return InterestCentersResponseDto.builder()
+                .centerId(responseDto.centerId())
+                .centerName(responseDto.centerName())
+                .imgUrl(responseDto.imgUrl())
+                .build();
+    }
+}
diff --git a/src/main/java/com/somemore/interestcenter/dto/response/RegisterInterestCenterResponseDto.java b/src/main/java/com/somemore/interestcenter/dto/response/RegisterInterestCenterResponseDto.java
@@ -17,7 +17,7 @@ public record RegisterInterestCenterResponseDto(
         @Schema(description = "봉사자 ID", example = "123e4567-e89b-12d3-a456-426614174000")
         UUID volunteerId,
 
-        @Schema(description = "센터 ID", example = "123e4567-e89b-12d3-a456-426614174000")
+        @Schema(description = "기관 ID", example = "123e4567-e89b-12d3-a456-426614174000")
         UUID centerId
 ) {
         public static RegisterInterestCenterResponseDto from(InterestCenter interestCenter) {
diff --git a/src/main/java/com/somemore/interestcenter/service/InterestCenterQueryService.java b/src/main/java/com/somemore/interestcenter/service/InterestCenterQueryService.java
@@ -1,8 +1,8 @@
 package com.somemore.interestcenter.service;
 
-import com.somemore.center.dto.response.CenterOverviewInfoResponseDto;
+import com.somemore.center.repository.mapper.CenterOverviewInfo;
 import com.somemore.center.usecase.query.CenterQueryUseCase;
-import com.somemore.interestcenter.dto.response.GetInterestCentersResponseDto;
+import com.somemore.interestcenter.dto.response.InterestCentersResponseDto;
 import com.somemore.interestcenter.repository.InterestCenterRepository;
 import com.somemore.interestcenter.usecase.InterestCenterQueryUseCase;
 import lombok.RequiredArgsConstructor;
@@ -19,16 +19,16 @@ public class InterestCenterQueryService implements InterestCenterQueryUseCase {
     private final InterestCenterRepository interestCenterRepository;
 
     @Override
-    public List<GetInterestCentersResponseDto> getInterestCenters(UUID volunteerId) {
+    public List<InterestCentersResponseDto> getInterestCenters(UUID volunteerId) {
 
         List<UUID> interestCenterIds = interestCenterRepository.findInterestCenterIdsByVolunteerId(volunteerId);
         if (interestCenterIds.isEmpty()) {
             return List.of();
         }
 
-        List<CenterOverviewInfoResponseDto> centerOverviews = centerQueryUseCase.getCenterOverviewsByIds(interestCenterIds);
+        List<CenterOverviewInfo> centerOverviews = centerQueryUseCase.getCenterOverviewsByIds(interestCenterIds);
         return centerOverviews.stream()
-                .map(GetInterestCentersResponseDto::of)
+                .map(InterestCentersResponseDto::of)
                 .toList();
     }
 }
diff --git a/src/main/java/com/somemore/interestcenter/usecase/InterestCenterQueryUseCase.java b/src/main/java/com/somemore/interestcenter/usecase/InterestCenterQueryUseCase.java
@@ -1,10 +1,10 @@
 package com.somemore.interestcenter.usecase;
 
-import com.somemore.interestcenter.dto.response.GetInterestCentersResponseDto;
+import com.somemore.interestcenter.dto.response.InterestCentersResponseDto;
 
 import java.util.List;
 import java.util.UUID;
 
 public interface InterestCenterQueryUseCase {
-    List<GetInterestCentersResponseDto> getInterestCenters(UUID volunteerId);
+    List<InterestCentersResponseDto> getInterestCenters(UUID volunteerId);
 }
diff --git a/src/test/java/com/somemore/center/service/query/CenterQueryServiceTest.java b/src/test/java/com/somemore/center/service/query/CenterQueryServiceTest.java
@@ -3,7 +3,7 @@
 import com.somemore.IntegrationTestSupport;
 import com.somemore.center.domain.Center;
 import com.somemore.center.domain.PreferItem;
-import com.somemore.center.dto.response.CenterOverviewInfoResponseDto;
+import com.somemore.center.repository.mapper.CenterOverviewInfo;
 import com.somemore.center.dto.response.CenterProfileResponseDto;
 import com.somemore.center.repository.CenterJpaRepository;
 import com.somemore.center.repository.CenterRepository;
@@ -86,7 +86,7 @@ void getCenterOverviewsByIds() {
         List<UUID> ids = List.of(center.getId(),center1.getId(), center2.getId());
 
         //when
-        List<CenterOverviewInfoResponseDto> responseDtos = centerQueryService.getCenterOverviewsByIds(ids);
+        List<CenterOverviewInfo> responseDtos = centerQueryService.getCenterOverviewsByIds(ids);
 
         //then
         assertThat(responseDtos)
diff --git a/src/test/java/com/somemore/interestcenter/controller/InterestCenterQueryApiControllerTest.java b/src/test/java/com/somemore/interestcenter/controller/InterestCenterQueryApiControllerTest.java
@@ -2,7 +2,7 @@
 
 import com.somemore.ControllerTestSupport;
 import com.somemore.WithMockCustomUser;
-import com.somemore.interestcenter.dto.response.GetInterestCentersResponseDto;
+import com.somemore.interestcenter.dto.response.InterestCentersResponseDto;
 import com.somemore.interestcenter.usecase.InterestCenterQueryUseCase;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -29,9 +29,9 @@ void getInterestCenters_ShouldReturnInterestCentersList() throws Exception {
         // given
         UUID volunteerId = UUID.fromString("123e4567-e89b-12d3-a456-426614174000");
         UUID centerId = UUID.fromString("123e4567-e89b-12d3-a456-426614174001");
-        List<GetInterestCentersResponseDto> responseDtos = List.of(
-                new GetInterestCentersResponseDto(centerId, "센터1", "http://image1.jpg"),
-                new GetInterestCentersResponseDto(centerId, "센터2", "http://image2.jpg")
+        List<InterestCentersResponseDto> responseDtos = List.of(
+                new InterestCentersResponseDto(centerId, "센터1", "http://image1.jpg"),
+                new InterestCentersResponseDto(centerId, "센터2", "http://image2.jpg")
         );
 
         given(interestCenterQueryUseCase.getInterestCenters(volunteerId)).willReturn(responseDtos);
diff --git a/src/test/java/com/somemore/interestcenter/service/InterestCenterQueryServiceTest.java b/src/test/java/com/somemore/interestcenter/service/InterestCenterQueryServiceTest.java
@@ -4,7 +4,7 @@
 import com.somemore.center.domain.Center;
 import com.somemore.center.repository.CenterJpaRepository;
 import com.somemore.interestcenter.domain.InterestCenter;
-import com.somemore.interestcenter.dto.response.GetInterestCentersResponseDto;
+import com.somemore.interestcenter.dto.response.InterestCentersResponseDto;
 import com.somemore.interestcenter.repository.InterestCenterJpaRepository;
 import com.somemore.interestcenter.repository.InterestCenterRepository;
 import org.junit.jupiter.api.DisplayName;
@@ -50,7 +50,7 @@ void getInterestCenters() {
         interestCenterJpaRepository.saveAll(List.of(interestCenter, interestCenter1, interestCenter2));
 
         // when
-        List<GetInterestCentersResponseDto> result = interestCenterQueryService.getInterestCenters(volunteerId);
+        List<InterestCentersResponseDto> result = interestCenterQueryService.getInterestCenters(volunteerId);
 
         // then
         assertThat(result)
@@ -80,7 +80,7 @@ void getInterestCenters_ReturnsEmptyList_WhenNoInterestCenters() {
         interestCenterJpaRepository.save(unrelatedInterestCenter);
 
         // when
-        List<GetInterestCentersResponseDto> result = interestCenterQueryService.getInterestCenters(volunteerId);
+        List<InterestCentersResponseDto> result = interestCenterQueryService.getInterestCenters(volunteerId);
 
         // then
         assertThat(result).isEmpty();

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package com.somemore.center.repository;`
`2`	`2`
`3`	`3`	`import com.somemore.center.domain.Center;`
`4`		`-import com.somemore.center.dto.response.CenterOverviewInfoResponseDto;`
	`4`	`+import com.somemore.center.repository.mapper.CenterOverviewInfo;`
`5`	`5`	`import org.springframework.stereotype.Repository;`
`6`	`6`
`7`	`7`	`import java.util.List;`
`@@ -16,6 +16,6 @@ default boolean doesNotExistById(UUID id) {`
`16`	`16`	`return !existsById(id);`
`17`	`17`	`}`
`18`	`18`	`Optional<Center> findCenterById(UUID id);`
`19`		`- List<CenterOverviewInfoResponseDto> findCenterOverviewsByIds(List<UUID> ids);`
	`19`	`+ List<CenterOverviewInfo> findCenterOverviewsByIds(List<UUID> ids);`
`20`	`20`	`void deleteAllInBatch();`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package com.somemore.center.service.query;`
`2`	`2`
`3`	`3`	`import com.somemore.center.domain.Center;`
`4`		`-import com.somemore.center.dto.response.CenterOverviewInfoResponseDto;`
	`4`	`+import com.somemore.center.repository.mapper.CenterOverviewInfo;`
`5`	`5`	`import com.somemore.center.dto.response.CenterProfileResponseDto;`
`6`	`6`	`import com.somemore.center.dto.response.PreferItemResponseDto;`
`7`	`7`	`import com.somemore.center.repository.CenterRepository;`
`@@ -35,7 +35,7 @@ public CenterProfileResponseDto getCenterProfileByCenterId(UUID centerId) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@Override`
`38`		`- public List<CenterOverviewInfoResponseDto> getCenterOverviewsByIds(List<UUID> centerIds) {`
	`38`	`+ public List<CenterOverviewInfo> getCenterOverviewsByIds(List<UUID> centerIds) {`
`39`	`39`	`return centerRepository.findCenterOverviewsByIds(centerIds);`
`40`	`40`	`}`
`41`	`41`