[PDS-32] feat: 아카이빙 자료 검색어 API 기능 구현

PLADI-ALM · Oct 14, 2023 · 766d63c · 766d63c
1 parent 3bcaa16
commit 766d63c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/main/java/com/example/PLADIALMArchiving/archiving/repository/MaterialRepository.java b/src/main/java/com/example/PLADIALMArchiving/archiving/repository/MaterialRepository.java
@@ -11,9 +11,5 @@
 
 @Repository
 public interface MaterialRepository extends JpaRepository<Material, Long> {
-
-//  @Query("SELECT mt FROM Material mt WHERE :extension LIKE CONCAT('%', mt.extension, '%') ")
-//  List<Material> findByProject(Project project, @Param("extension") String extension);
-
-  Page<Material> findByProjectAndExtensionIn(Project project, List<String> extensions, Pageable pageable);
+  Page<Material> findByProjectAndExtensionInAndNameContaining(Project project, List<String> extensions, String cond, Pageable pageable);
 }
diff --git a/src/main/java/com/example/PLADIALMArchiving/archiving/service/ArchivingService.java b/src/main/java/com/example/PLADIALMArchiving/archiving/service/ArchivingService.java
@@ -60,7 +60,7 @@ public Page<SearchMaterialRes> searchMaterial(Long projectId, SearchMaterialReq
       } else if (category == Category.DOCS) {
         extension = List.of(Constants.EXTENSION.DOCS.split(" "));
       }
-      filteredMaterials = materialRepository.findByProjectAndExtensionIn(project, extension, pageable);
+      filteredMaterials = materialRepository.findByProjectAndExtensionInAndNameContaining(project, extension, searchMaterialReq.getCond(), pageable);
     } else {
       filteredMaterials = materialRepository.findAll(pageable);
     }