Skip to content

Commit

Permalink
[REFACTOR] 검색어 word에서 query로 수정(명세서에 맞춰)
Browse files Browse the repository at this point in the history
  • Loading branch information
rinarina0429 committed May 19, 2024
1 parent d6ac08e commit ffc1a6d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class KeywordController {
private final KeywordService keywordService;

@GetMapping
public ResponseEntity<KeywordByCategoryGetResponse> getKeywordsByCategory(@RequestParam(required = false) String word) {
return ResponseEntity.ok(keywordService.getAll(word));
public ResponseEntity<KeywordByCategoryGetResponse> getKeywordsByCategory(@RequestParam(required = false) String query) {
return ResponseEntity.ok(keywordService.getAll(query));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
import org.websoso.WSSServer.domain.common.KeywordCategory;

public interface KeywordRepository extends JpaRepository<Keyword, Integer> {
List<Keyword> findByKeywordNameContaining(String word);
List<Keyword> findByKeywordNameContaining(String query);
}
20 changes: 10 additions & 10 deletions src/main/java/org/websoso/WSSServer/service/KeywordService.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ public class KeywordService {

private final KeywordRepository keywordRepository;

public List<KeywordGetResponse> searchKeywordsByCategory(String word, KeywordCategory keywordCategory) {
List<Keyword> searchedKeyword = keywordRepository.findByKeywordNameContaining(word);
public List<KeywordGetResponse> searchKeywordsByCategory(String query, KeywordCategory keywordCategory) {
List<Keyword> searchedKeyword = keywordRepository.findByKeywordNameContaining(query);

List<Keyword> filteredKeywords = searchedKeyword.stream()
.filter(keyword -> keyword.getCategoryName().equals(keywordCategory))
Expand All @@ -32,22 +32,22 @@ public List<KeywordGetResponse> searchKeywordsByCategory(String word, KeywordCat
.collect(Collectors.toList());
}

public List<CategoryGetResponse> getCategorys(String word) { //TODO 반복적인 코드 줄이기
public List<CategoryGetResponse> getCategorys(String query) { //TODO 반복적인 코드 줄이기
CategoryGetResponse worldview = CategoryGetResponse.of(KeywordCategory.WORLDVIEW,
searchKeywordsByCategory(word, KeywordCategory.WORLDVIEW));
searchKeywordsByCategory(query, KeywordCategory.WORLDVIEW));
CategoryGetResponse material = CategoryGetResponse.of(KeywordCategory.MATERIAL,
searchKeywordsByCategory(word, KeywordCategory.MATERIAL));
searchKeywordsByCategory(query, KeywordCategory.MATERIAL));
CategoryGetResponse character = CategoryGetResponse.of(KeywordCategory.CHARACTER,
searchKeywordsByCategory(word, KeywordCategory.CHARACTER));
searchKeywordsByCategory(query, KeywordCategory.CHARACTER));
CategoryGetResponse relationship = CategoryGetResponse.of(KeywordCategory.RELATIONSHIP,
searchKeywordsByCategory(word, KeywordCategory.RELATIONSHIP));
searchKeywordsByCategory(query, KeywordCategory.RELATIONSHIP));
CategoryGetResponse vibe = CategoryGetResponse.of(KeywordCategory.VIBE,
searchKeywordsByCategory(word, KeywordCategory.VIBE));
searchKeywordsByCategory(query, KeywordCategory.VIBE));
return Arrays.asList(worldview, material, character, relationship, vibe);
}

public KeywordByCategoryGetResponse getAll(String word) { //TODO 함수 이름
List<CategoryGetResponse> categorys = getCategorys(word);
public KeywordByCategoryGetResponse getAll(String query) { //TODO 함수 이름
List<CategoryGetResponse> categorys = getCategorys(query);
return KeywordByCategoryGetResponse.of(categorys);
}
}

0 comments on commit ffc1a6d

Please sign in to comment.