fix: #128 악기 목록 조회 API 검색 기능이 정상 동작하지 않는 문제 수정

Ajou-Hertz · May 31, 2024 · e71d8ce · e71d8ce
1 parent 9a277a2
commit e71d8ce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/...main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java b/...main/java/com/ajou/hertz/domain/instrument/repository/InstrumentRepositoryCustomImpl.java
@@ -260,10 +260,12 @@ private List<Predicate> convertInstrumentFilterAndSearchConditionsToPredicates(
 
         // Searching
 		if (StringUtils.hasText(searchKeyword)) {
-			res.add(titlePath.containsIgnoreCase(searchKeyword));
-			res.add(tradeAddressSidoPath.containsIgnoreCase(searchKeyword));
-			res.add(tradeAddressSggPath.containsIgnoreCase(searchKeyword));
-			res.add(tradeAddressEmdPath.containsIgnoreCase(searchKeyword));
+			res.add(
+				titlePath.containsIgnoreCase(searchKeyword)
+					.or(tradeAddressSidoPath.containsIgnoreCase(searchKeyword))
+					.or(tradeAddressSggPath.containsIgnoreCase(searchKeyword))
+					.or(tradeAddressEmdPath.containsIgnoreCase(searchKeyword))
+			);
 		}
 
         return res;

diff --git a/...ava/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java b/...ava/com/ajou/hertz/integration/domain/instrument/repository/InstrumentRepositoryTest.java
@@ -292,7 +292,8 @@ public InstrumentRepositoryTest(
 		));
 
 		// when
-		Page<BassGuitar> result = sut.findBassGuitars(0, 10, sortOption, filterConditions, null);
+		// Page<BassGuitar> result = sut.findBassGuitars(0, 10, sortOption, filterConditions, null);
+		Page<BassGuitar> result = sut.findBassGuitars(0, 10, sortOption, filterConditions, "Test");
 
 		// then
 		assertThat(result.getNumberOfElements()).isEqualTo(savedInstruments.size() - 1);