Refactor: 코드 리뷰 사항 반영

- 기관 프로필 조회 응답값중 선호 물품 엔티티를 직접 응답하는것이 아닌 Dto로 전환하여 응답하도록 수정과 그에 따른 usecase, service 수정, 선호물품 응답 Dto 생성
- 단위 테스트 코드 작성과 검증 완료

Author: 7zrv

src/main/java/com/somemore/center/dto/response/CenterProfileResponseDto.java

@@ -18,17 +18,17 @@ public record CenterProfileResponseDto(
         String imgUrl,
         String introduce,
         String homepageLink,
-        List<PreferItem> preferItems
+        List<PreferItemResponseDto> preferItems
 ) {
-    public static CenterProfileResponseDto of(Center center, List<PreferItem> preferItems) {
+    public static CenterProfileResponseDto of(Center center, List<PreferItemResponseDto> preferItemDtos) {
         return CenterProfileResponseDto.builder()
                 .centerId(center.getId())
                 .name(center.getName())
                 .contactNumber(center.getContactNumber())
                 .imgUrl(center.getImgUrl())
                 .introduce(center.getIntroduce())
                 .homepageLink(center.getHomepageLink())
-                .preferItems(preferItems)
+                .preferItems(preferItemDtos)
                 .build();
     }
 }

src/main/java/com/somemore/center/dto/response/PreferItemResponseDto.java

@@ -0,0 +1,21 @@
+package com.somemore.center.dto.response;
+
+import com.somemore.center.domain.PreferItem;
+import lombok.Builder;
+
+import java.util.UUID;
+
+@Builder
+public record PreferItemResponseDto (
+        Long id,
+        UUID centerId,
+        String itemName
+){
+    public static PreferItemResponseDto from(PreferItem preferItem) {
+        return PreferItemResponseDto.builder()
+                .id(preferItem.getId())
+                .centerId(preferItem.getCenterId())
+                .itemName(preferItem.getItemName())
+                .build();
+    }
+}

src/main/java/com/somemore/center/repository/PreferItemRepository.java

@@ -2,7 +2,6 @@
 
 import com.somemore.center.domain.PreferItem;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -11,6 +10,6 @@
 @Repository
 public interface PreferItemRepository extends JpaRepository<PreferItem, Long> {
 
-    List<PreferItem> findByCenterId(@Param("centerId") UUID centerId);
+    List<PreferItem> findByCenterId(UUID centerId);
 
 }

src/main/java/com/somemore/center/service/query/CenterQueryService.java

@@ -1,7 +1,8 @@
 package com.somemore.center.service.query;
+
 import com.somemore.center.domain.Center;
-import com.somemore.center.domain.PreferItem;
 import com.somemore.center.dto.response.CenterProfileResponseDto;
+import com.somemore.center.dto.response.PreferItemResponseDto;
 import com.somemore.center.repository.CenterRepository;
 import com.somemore.center.usecase.query.CenterQueryUseCase;
 import com.somemore.center.usecase.query.PreferItemQueryUseCase;
@@ -27,9 +28,9 @@ public class CenterQueryService implements CenterQueryUseCase {
     public CenterProfileResponseDto getCenterProfileByCenterId(UUID centerId) {
 
         Center center = getCenterById(centerId);
-        List<PreferItem> preferItems = preferItemQueryUseCase.getPreferItemsByCenterId(centerId);
+        List<PreferItemResponseDto> preferItemDtos = preferItemQueryUseCase.getPreferItemDtosByCenterId(centerId);
 
-        return CenterProfileResponseDto.of(center, preferItems);
+        return CenterProfileResponseDto.of(center, preferItemDtos);
     }
 
     @Override

src/main/java/com/somemore/center/service/query/PreferItemQueryService.java

@@ -1,6 +1,7 @@
 package com.somemore.center.service.query;
 
 import com.somemore.center.domain.PreferItem;
+import com.somemore.center.dto.response.PreferItemResponseDto;
 import com.somemore.center.repository.PreferItemRepository;
 import com.somemore.center.usecase.query.PreferItemQueryUseCase;
 import lombok.RequiredArgsConstructor;
@@ -17,8 +18,21 @@ public class PreferItemQueryService implements PreferItemQueryUseCase {
 
     private final PreferItemRepository preferItemRepository;
 
+    @Override
+    public List<PreferItemResponseDto> getPreferItemDtosByCenterId(UUID centerId) {
+        List<PreferItem> preferItems = getPreferItemsByCenterId(centerId);
+        return preferItemConvertToDtos(preferItems);
+    }
+
+    //프론트와 의논후 private으로 전환 예정
     @Override
     public List<PreferItem> getPreferItemsByCenterId(UUID centerId) {
        return preferItemRepository.findByCenterId(centerId);
     }
+
+    private static List<PreferItemResponseDto> preferItemConvertToDtos(List<PreferItem> preferItems) {
+        return preferItems.stream()
+                .map(PreferItemResponseDto::from)
+                .toList();
+    }
 }

src/main/java/com/somemore/center/usecase/query/PreferItemQueryUseCase.java

@@ -1,10 +1,12 @@
 package com.somemore.center.usecase.query;
 
 import com.somemore.center.domain.PreferItem;
+import com.somemore.center.dto.response.PreferItemResponseDto;
 
 import java.util.List;
 import java.util.UUID;
 
 public interface PreferItemQueryUseCase {
+    List<PreferItemResponseDto> getPreferItemDtosByCenterId(UUID centerId);
     List<PreferItem> getPreferItemsByCenterId(UUID centerId);
 }

src/test/java/com/somemore/center/repository/PreferItemRepositoryTest.java

@@ -17,15 +17,21 @@ class PreferItemRepositoryTest extends IntegrationTestSupport {
     @Autowired
     private PreferItemRepository preferItemRepository;
 
+
+    private UUID centerId = UUID.fromString("1a1a1a1a-1a1a-1a1a-1a1a-1a1a1a1a1a1");
+    private UUID centerId1 = UUID.fromString("1a1a1a1a-1a1a-1a1a-1a1a-1a1a1a1a1a1");
+    private UUID centerId2 = UUID.fromString("1a1a1a1a-1a1a-1a1a-1a1a-1a1a1a1a1a2");
+    private UUID centerId3 = UUID.fromString("1a1a1a1a-1a1a-1a1a-1a1a-1a1a1a1a1a3");
+
     @DisplayName("기관의 id로 선호물품을 검색할 수 있다.")
     @Test
     void findByCenterId() {
 
         //given
-        PreferItem preferItem = PreferItem.create(UUID.fromString("1a1a1a1a-1a1a-1a1a-1a1a-1a1a1a1a1a1"), "어린이 동화책");
-        PreferItem preferItem1 = PreferItem.create(UUID.fromString("1a1a1a1a-1a1a-1a1a-1a1a-1a1a1a1a1a1"), "간식");
-        PreferItem preferItem2 = PreferItem.create(UUID.fromString("1a1a1a1a-1a1a-1a1a-1a1a-1a1a1a1a1a2"), "수건");
-        PreferItem preferItem3 = PreferItem.create(UUID.fromString("1a1a1a1a-1a1a-1a1a-1a1a-1a1a1a1a1a3"), "식재료");
+        PreferItem preferItem = PreferItem.create(centerId, "어린이 동화책");
+        PreferItem preferItem1 = PreferItem.create(centerId1, "간식");
+        PreferItem preferItem2 = PreferItem.create(centerId2, "수건");
+        PreferItem preferItem3 = PreferItem.create(centerId3, "식재료");
         preferItemRepository.saveAll(List.of(preferItem, preferItem1, preferItem2, preferItem3));
 
         //when

src/test/java/com/somemore/center/service/query/PreferItemQueryServiceTest.java

@@ -0,0 +1,75 @@
+package com.somemore.center.service.query;
+
+import com.somemore.center.domain.PreferItem;
+import com.somemore.center.dto.response.PreferItemResponseDto;
+import com.somemore.center.repository.PreferItemRepository;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.List;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class PreferItemQueryServiceTest {
+
+    @Mock
+    private PreferItemRepository preferItemRepository;
+
+    @InjectMocks
+    private PreferItemQueryService preferItemQueryService;
+
+    @Test
+    void getPreferItemDtosByCenterId() {
+        // Given
+        UUID centerId = UUID.randomUUID();
+        PreferItem preferItem1 = createPreferItem(centerId, "item1");
+        PreferItem preferItem2 = createPreferItem(centerId, "item2");
+        List<PreferItem> preferItems = List.of(preferItem1, preferItem2);
+
+        when(preferItemRepository.findByCenterId(centerId)).thenReturn(preferItems);
+
+        // When
+        List<PreferItemResponseDto> result = preferItemQueryService.getPreferItemDtosByCenterId(centerId);
+
+        // Then
+        assertThat(result).hasSize(2);
+        assertThat(result.get(0).centerId()).isEqualTo(centerId);
+        assertThat(result.get(0).itemName()).isEqualTo("item1");
+
+        assertThat(result.get(1).centerId()).isEqualTo(centerId);
+        assertThat(result.get(1).itemName()).isEqualTo("item2");
+
+        verify(preferItemRepository, times(1)).findByCenterId(centerId);
+    }
+
+    @Test
+    void getPreferItemsByCenterId() {
+        // Given
+        UUID centerId = UUID.randomUUID();
+        PreferItem preferItem1 = createPreferItem(centerId, "item1");
+        PreferItem preferItem2 = createPreferItem(centerId, "item2");
+        List<PreferItem> expectedItems = List.of(preferItem1, preferItem2);
+
+        when(preferItemRepository.findByCenterId(centerId)).thenReturn(expectedItems);
+
+        // When
+        List<PreferItem> result = preferItemQueryService.getPreferItemsByCenterId(centerId);
+
+        // Then
+        assertThat(result).hasSize(2).isEqualTo(expectedItems);
+        verify(preferItemRepository, times(1)).findByCenterId(centerId);
+    }
+
+    private PreferItem createPreferItem(UUID centerId, String itemName) {
+        return PreferItem.builder()
+                .centerId(centerId)
+                .itemName(itemName)
+                .build();
+    }
+}

src/test/resources/application-test.yml

@@ -19,4 +19,6 @@ spring:
 
   sql:
     init:
-      mode: never
+      mode: never
+
+JWT_SECRET: 965b005bea929b5da041a3c8cf24ce0130880eb438942c159039f210aac07cc6857394c1253db2f4673f81e9485415764a086971620149072329179b800ea8e7