refactor/OPS-346 : 검색 기능 출처 누락 수정

Author: yonggi1234

src/main/java/org/tuna/zoopzoop/backend/domain/datasource/controller/DatasourceController.java

@@ -231,6 +231,7 @@ public ResponseEntity<?> search(
             @RequestParam(required = false) String title,
             @RequestParam(required = false) String summary,
             @RequestParam(required = false) String category,
+            @RequestParam(required = false) String keyword,
             @RequestParam(required = false) Integer folderId,
             @RequestParam(required = false) String folderName,
             @RequestParam(required = false, defaultValue = "true") Boolean isActive,
@@ -247,6 +248,7 @@ public ResponseEntity<?> search(
                 .folderId(folderId)
                 .folderName(folderName)
                 .isActive(isActive)
+                .keyword(keyword)
                 .build();
 
         Page<DataSourceSearchItem> page = dataSourceService.search(memberId, cond, pageable);

src/main/java/org/tuna/zoopzoop/backend/domain/datasource/dto/DataSourceSearchCondition.java

@@ -12,4 +12,5 @@ public class DataSourceSearchCondition {
     private final Integer folderId;
     private final String folderName;
     private final Boolean isActive;
+    private final String keyword;
 }

src/main/java/org/tuna/zoopzoop/backend/domain/datasource/dto/DataSourceSearchItem.java

@@ -13,6 +13,7 @@ public class DataSourceSearchItem {
     private String title;
     private LocalDate dataCreatedDate;
     private String summary;
+    private String source;
     private String sourceUrl;
     private String imageUrl;
     private List<String> tags;

src/main/java/org/tuna/zoopzoop/backend/domain/datasource/repository/DataSourceQRepositoryImpl.java

@@ -20,6 +20,8 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static org.springframework.util.StringUtils.hasText;
+
 @Repository
 @RequiredArgsConstructor
 public class DataSourceQRepositoryImpl implements DataSourceQRepository {
@@ -52,6 +54,15 @@ public Page<DataSourceSearchItem> search(Integer memberId, DataSourceSearchCondi
         if (cond.getCategory() != null && !cond.getCategory().isBlank()) {
             where.and(ds.category.stringValue().containsIgnoreCase(cond.getCategory()));
         }
+        if (hasText(cond.getKeyword())) {
+            String kw = cond.getKeyword();
+            where.and(
+                    ds.title.containsIgnoreCase(kw)
+                            .or(ds.summary.containsIgnoreCase(kw))
+                            .or(ds.category.stringValue().containsIgnoreCase(kw))
+            );
+        }
+
         if (cond.getFolderName() != null && !cond.getFolderName().isBlank()) {
             where.and(ds.folder.name.eq(cond.getFolderName()));
         }
@@ -72,7 +83,7 @@ public Page<DataSourceSearchItem> search(Integer memberId, DataSourceSearchCondi
 
         // content
         JPAQuery<Tuple> contentQuery = queryFactory
-                .select(ds.id, ds.title, ds.dataCreatedDate, ds.summary, ds.sourceUrl, ds.imageUrl, ds.category)
+                .select(ds.id, ds.title, ds.dataCreatedDate, ds.summary, ds.source, ds.sourceUrl, ds.imageUrl, ds.category)
                 .from(ds)
                 .join(ds.folder, folder)
                 .join(pa).on(pa.archive.eq(folder.archive))
@@ -110,13 +121,13 @@ public Page<DataSourceSearchItem> search(Integer memberId, DataSourceSearchCondi
                         Collectors.mapping(row -> row.get(tag.tagName), Collectors.toList())
                 ));
 
-        // map to DTO
         List<DataSourceSearchItem> content = tuples.stream()
                 .map(row -> new DataSourceSearchItem(
                         row.get(ds.id),
                         row.get(ds.title),
                         row.get(ds.dataCreatedDate),
                         row.get(ds.summary),
+                        row.get(ds.source),
                         row.get(ds.sourceUrl),
                         row.get(ds.imageUrl),
                         tagsById.getOrDefault(row.get(ds.id), List.of()),
@@ -140,7 +151,7 @@ private List<OrderSpecifier<?>> toOrderSpecifiers(Sort sort) {
             switch (o.getProperty()) {
                 case "title" ->
                         specs.add(new OrderSpecifier<>(dir, root.getString("title")));
-                case "createdAt" -> // 요청 키
+                case "createdAt" ->
                         specs.add(new OrderSpecifier<>(dir, root.getDate("dataCreatedDate", java.time.LocalDate.class)));
                 default -> { }
             }