Merge pull request #113 from team-Ollie/develop

[develop] 챌린지 검색 반환값 수정
team-Ollie · Jul 2, 2024 · cd1f935 · cd1f935
2 parents 5b68321 + 48a42c3
commit cd1f935
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/main/java/ollie/wecare/challenge/controller/ChallengeController.java b/src/main/java/ollie/wecare/challenge/controller/ChallengeController.java
@@ -26,33 +26,32 @@ public class ChallengeController {
 
     // 참여 중인 챌린지 목록 조회
     @GetMapping
-    public BaseResponse<List<GetChallengesRes>> getMyChallenges() throws BaseException {
+    public BaseResponse<List<GetChallengesRes>> getMyChallenges() {
         return challengeService.getMyChallenges(authService.getUserIdx());
     }
 
     // [관리자] 관리자가 생성한 챌린지 목록 조회
     @GetMapping("/admin")
-    public BaseResponse<List<GetChallengesAdminRes>> getMyChallengesAdmin() throws BaseException {
+    public BaseResponse<List<GetChallengesAdminRes>> getMyChallengesAdmin() {
         return challengeService.getMyChallengesAdmin(authService.getUserIdx());
     }
 
     // [관리자] 챌린지 상세 조회
     @GetMapping("/admin/{challengeIdx}")
-    public BaseResponse<List<GetChallengeAdminRes>> getMyChallengeAdmin(@PathVariable(value = "challengeIdx") Long challengeIdx) throws BaseException {
+    public BaseResponse<List<GetChallengeAdminRes>> getMyChallengeAdmin(@PathVariable(value = "challengeIdx") Long challengeIdx) {
         return challengeService.getMyChallengeAdmin(authService.getUserIdx(), challengeIdx);
     }
 
     // 챌린지 인증코드 발급
     @PostMapping("/attendance/{challengeIdx}")
     public BaseResponse<GetAttendanceCodeReq> getAttendanceCode(@PathVariable(value = "challengeIdx") Long challengeIdx) {
         return new BaseResponse<>(challengeService.getAttendanceCode(challengeIdx));
-
     }
 
     // 챌린지 인증
     //TODO : PathVariable로 변경
     @PostMapping("/attendance")
-    public BaseResponse<String> attendChallenge(@RequestBody AttendChallengeReq attendChallengeReq) throws BaseException {
+    public BaseResponse<String> attendChallenge(@RequestBody AttendChallengeReq attendChallengeReq) {
         challengeService.attendChallenge(attendChallengeReq);
         return new BaseResponse<>(SUCCESS);
     }
@@ -65,14 +64,14 @@ public BaseResponse<ChallengeDetailResponse> getChallengeDetail(@PathVariable Lo
 
     // 새로운 챌린지 참여
     @PostMapping("/participation")
-    public BaseResponse<String> participateChallenge(@RequestBody PostChallengeReq postChallengeReq) throws BaseException {
+    public BaseResponse<String> participateChallenge(@RequestBody PostChallengeReq postChallengeReq) {
         challengeService.participateChallenge(postChallengeReq);
         return new BaseResponse<>(SUCCESS);
     }
 
     // 챌린지 검색
     @GetMapping("/search")
-    public BaseResponse<List<SearchChallengeRes>> getChallenges(@RequestParam(value = "searchWord", defaultValue = "", required = false) String searchWord)throws BaseException {
+    public BaseResponse<List<SearchChallengeRes>> getChallenges(@RequestParam(value = "searchWord", defaultValue = "", required = false) String searchWord) throws BaseException {
         return new BaseResponse<>(challengeService.getChallenges(searchWord));
     }
 

diff --git a/src/main/java/ollie/wecare/challenge/service/ChallengeService.java b/src/main/java/ollie/wecare/challenge/service/ChallengeService.java
@@ -122,11 +122,17 @@ public void participateChallenge(PostChallengeReq postChallengeReq) throws BaseE
      * */
     public List<SearchChallengeRes> getChallenges(String searchWord) {
         User user = userService.getUserWithValidation();
-        List<Challenge> challenges = challengeRepository.findByNameContainingAndParticipantsNotContaining(searchWord, user);
-        return challenges.stream()
-                .distinct()
-                .map(SearchChallengeRes::fromChallenge)
-                .toList();
+        if (searchWord.equals("")) {
+            return challengeRepository.findAll().stream()
+                    .map(SearchChallengeRes::fromChallenge)
+                    .toList();
+        } else {
+            List<Challenge> challenges = challengeRepository.findByNameContainingAndParticipantsNotContaining(searchWord, user);
+            return challenges.stream()
+                    .distinct()
+                    .map(SearchChallengeRes::fromChallenge)
+                    .toList();
+        }
     }
 
     // 챌린지 상세 조회