refactor/OPS-246 : 요구사항 리팩토링

yonggi1234 · yonggi1234 · commit 2932d02ba902 · 2025-10-01T11:10:52.000+09:00
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/datasource/controller/DatasourceController.java b/src/main/java/org/tuna/zoopzoop/backend/domain/datasource/controller/DatasourceController.java
@@ -212,6 +212,7 @@ public ResponseEntity<?> search(
             @RequestParam(required = false) String title,
             @RequestParam(required = false) String summary,
             @RequestParam(required = false) String category,
+            @RequestParam(required = false) Integer folderId,
             @RequestParam(required = false) String folderName,
             @RequestParam(required = false, defaultValue = "true") Boolean isActive,
             @PageableDefault(size = 8, sort = "createdAt", direction = Sort.Direction.DESC)
@@ -223,8 +224,9 @@ public ResponseEntity<?> search(
         DataSourceSearchCondition cond = DataSourceSearchCondition.builder()
                 .title(title)
                 .summary(summary)
-                .folderName(folderName)
                 .category(category)
+                .folderId(folderId)
+                .folderName(folderName)
                 .isActive(isActive)
                 .build();
 
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/datasource/dto/DataSourceSearchCondition.java b/src/main/java/org/tuna/zoopzoop/backend/domain/datasource/dto/DataSourceSearchCondition.java
@@ -9,6 +9,7 @@ public class DataSourceSearchCondition {
     private final String title;
     private final String summary;
     private final String category;
+    private final Integer folderId;
     private final String folderName;
     private final Boolean isActive;
 }
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/datasource/dto/reqBodyForCreateDataSource.java b/src/main/java/org/tuna/zoopzoop/backend/domain/datasource/dto/reqBodyForCreateDataSource.java
@@ -3,5 +3,5 @@
 
 public record reqBodyForCreateDataSource(
     @NotBlank String sourceUrl,
-    Integer folderId            // null 일 경우 default 폴더(최상위 폴더)
+    Integer folderId            // 0일 경우 default folder
 ) {}
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/datasource/repository/DataSourceQRepositoryImpl.java b/src/main/java/org/tuna/zoopzoop/backend/domain/datasource/repository/DataSourceQRepositoryImpl.java
@@ -36,7 +36,6 @@ public Page<DataSourceSearchItem> search(Integer memberId, DataSourceSearchCondi
         QPersonalArchive pa = QPersonalArchive.personalArchive;
         QTag tag = QTag.tag;
 
-        // where
         BooleanBuilder where = new BooleanBuilder();
 
         if (cond.getIsActive() == null || Boolean.TRUE.equals(cond.getIsActive())) {
@@ -56,6 +55,9 @@ public Page<DataSourceSearchItem> search(Integer memberId, DataSourceSearchCondi
         if (cond.getFolderName() != null && !cond.getFolderName().isBlank()) {
             where.and(ds.folder.name.eq(cond.getFolderName()));
         }
+        if (cond.getFolderId() != null) {
+            where.and(ds.folder.id.eq(cond.getFolderId()));
+        }
 
         BooleanBuilder ownership = new BooleanBuilder()
                 .and(pa.member.id.eq(memberId));
@@ -113,7 +115,7 @@ public Page<DataSourceSearchItem> search(Integer memberId, DataSourceSearchCondi
                 .map(row -> new DataSourceSearchItem(
                         row.get(ds.id),
                         row.get(ds.title),
-                        row.get(ds.dataCreatedDate), // LocalDate 그대로 내려줌
+                        row.get(ds.dataCreatedDate),
                         row.get(ds.summary),
                         row.get(ds.sourceUrl),
                         row.get(ds.imageUrl),
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/datasource/service/DataSourceService.java b/src/main/java/org/tuna/zoopzoop/backend/domain/datasource/service/DataSourceService.java
@@ -10,6 +10,7 @@
 import org.tuna.zoopzoop.backend.domain.archive.archive.repository.PersonalArchiveRepository;
 import org.tuna.zoopzoop.backend.domain.archive.folder.entity.Folder;
 import org.tuna.zoopzoop.backend.domain.archive.folder.repository.FolderRepository;
+import org.tuna.zoopzoop.backend.domain.archive.folder.service.FolderService;
 import org.tuna.zoopzoop.backend.domain.datasource.dataprocessor.service.DataProcessorService;
 import org.tuna.zoopzoop.backend.domain.datasource.dto.DataSourceDto;
 import org.tuna.zoopzoop.backend.domain.datasource.dto.DataSourceSearchCondition;
@@ -30,6 +31,7 @@
 public class DataSourceService {
     private final DataSourceRepository dataSourceRepository;
     private final FolderRepository folderRepository;
+    private final FolderService folderService;
     private final PersonalArchiveRepository personalArchiveRepository;
     private final TagRepository tagRepository;
     private final DataProcessorService dataProcessorService;
@@ -41,11 +43,15 @@ public class DataSourceService {
     @Transactional
     public int createDataSource(int currentMemberId, String sourceUrl, Integer folderId) {
         Folder folder;
-        if(folderId == null)
+        if( folderId == null) {
+            throw new IllegalArgumentException("유효하지 않은 입력값입니다.");
+        }
+        if (folderId == 0) {
             folder = findDefaultFolder(currentMemberId);
-        else
+        } else {
             folder = folderRepository.findById(folderId)
                     .orElseThrow(() -> new NoResultException("존재하지 않는 폴더입니다."));
+        }
 
         // 폴더 하위 자료 태그 수집(중복 X)
         List<Tag> contextTags = collectDistinctTagsOfFolder(folder.getId());
@@ -248,6 +254,20 @@ public Integer updateDataSource(Integer memberId, Integer dataSourceId, String n
      */
     @Transactional
     public Page<DataSourceSearchItem> search(Integer memberId, DataSourceSearchCondition cond, Pageable pageable) {
+        Integer folderId = cond.getFolderId();
+
+        if (folderId != null && folderId == 0) {
+            int defaultFolderId = folderService.getDefaultFolderId(memberId);
+
+            cond = DataSourceSearchCondition.builder()
+                    .title(cond.getTitle())
+                    .summary(cond.getSummary())
+                    .category(cond.getCategory())
+                    .folderName(cond.getFolderName())
+                    .isActive(cond.getIsActive())
+                    .folderId(defaultFolderId)
+                    .build();
+        }
         return dataSourceQRepository.search(memberId, cond, pageable);
     }
 
diff --git a/src/test/java/org/tuna/zoopzoop/backend/domain/datasource/controller/DatasourceControllerTest.java b/src/test/java/org/tuna/zoopzoop/backend/domain/datasource/controller/DatasourceControllerTest.java
@@ -170,10 +170,10 @@ void afterAll() {
 
     // create
     @Test
-    @DisplayName("자료 생성 성공 - folderId=null → default 폴더에 등록")
+    @DisplayName("자료 생성 성공 - folderId=0 → default 폴더에 등록")
     @WithUserDetails(value = "KAKAO:testUser_sc1111", setupBefore = TestExecutionEvent.TEST_METHOD)
     void create_defaultFolder() throws Exception {
-        var rq = new reqBodyForCreateDataSource("https://example.com/a", null);
+        var rq = new reqBodyForCreateDataSource("https://example.com/a", 0);
 
         mockMvc.perform(post("/api/v1/archive")
                         .contentType(MediaType.APPLICATION_JSON)
@@ -184,6 +184,7 @@ void create_defaultFolder() throws Exception {
                 .andExpect(jsonPath("$.data").isNumber());
     }
 
+
     @Test
     @DisplayName("자료 생성 성공 - folderId 지정 → 해당 폴더에 등록")
     @WithUserDetails(value = "KAKAO:testUser_sc1111", setupBefore = TestExecutionEvent.TEST_METHOD)
diff --git a/src/test/java/org/tuna/zoopzoop/backend/domain/datasource/crawler/service/VelogCrawlerTest.java b/src/test/java/org/tuna/zoopzoop/backend/domain/datasource/crawler/service/VelogCrawlerTest.java
@@ -6,7 +6,7 @@ class VelogCrawlerTest {
 
     // 날짜 바뀐 velog 포스트에 대해 에러 처리 필요
     // Text '어제' could not be parsed at index 0
-    //java.time.format.DateTimeParseException
+//    java.time.format.DateTimeParseException
 //    @Test
 //    void testExtract() throws IOException {
 //        Document doc = Jsoup.connect("https://velog.io/@hyeonnnnn/VampireSurvivorsClone-04.-PoolManager").get();
diff --git a/src/test/java/org/tuna/zoopzoop/backend/domain/datasource/service/DataSourceServiceTest.java b/src/test/java/org/tuna/zoopzoop/backend/domain/datasource/service/DataSourceServiceTest.java
@@ -92,7 +92,7 @@ void createDataSource_defaultFolder() throws IOException {
                     return ds;
                 });
 
-        int id = dataSourceService.createDataSource(currentMemberId, sourceUrl, null);
+        int id = dataSourceService.createDataSource(currentMemberId, sourceUrl, 0);
         assertThat(id).isEqualTo(123);
     }
 
@@ -161,7 +161,7 @@ void createDataSource_defaultFolderNotFound() {
 
         // when / then
         assertThrows(NoResultException.class, () ->
-                dataSourceService.createDataSource(currentMemberId, "https://x", null)
+                dataSourceService.createDataSource(currentMemberId, "https://x", 0)
         );
     }
 
@@ -242,7 +242,7 @@ void collectDistinctTagsOfFolder_success() {
                 .thenReturn(List.of("AI", "Spring", "JPA"));
 
         @SuppressWarnings("unchecked")
-        List<Tag> ctxTags = (List<Tag>) ReflectionTestUtils.invokeMethod(
+        List<Tag> ctxTags = ReflectionTestUtils.invokeMethod(
                 dataSourceService, "collectDistinctTagsOfFolder", folderId
         );
 
@@ -276,7 +276,7 @@ void buildDataSource_maps_dto_and_tags() throws Exception{
         when(dataProcessorService.process(eq(url), anyList())).thenReturn(returnedDto);
 
         // when (private 메서드 호출)
-        DataSource ds = (DataSource) ReflectionTestUtils.invokeMethod(
+        DataSource ds = ReflectionTestUtils.invokeMethod(
                 dataSourceService, "buildDataSource", folder, url, context
         );
 

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ public class DataSourceSearchCondition {`
`9`	`9`	`private final String title;`
`10`	`10`	`private final String summary;`
`11`	`11`	`private final String category;`
	`12`	`+ private final Integer folderId;`
`12`	`13`	`private final String folderName;`
`13`	`14`	`private final Boolean isActive;`
`14`	`15`	`}`