Merge pull request #47 from StudyFlexUMC5th/yeeun2

Fix: 메인페이지 api baseresponse적용
StudyFlexUMC5th · Jan 14, 2024 · f4257ff · f4257ff
2 parents e170d8f + e2a87ac
commit f4257ff
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/src/main/java/com/umc/StudyFlexBE/controller/StudyController.java b/src/main/java/com/umc/StudyFlexBE/controller/StudyController.java
@@ -68,20 +68,32 @@ public BaseResponse<?> participation(@PathVariable Long study_id){
         }
     }
     @GetMapping("/latest")
-    public ResponseEntity<List<StudyMainPageResponseDto>> getLatestStudies() {
-        List<StudyMainPageResponseDto> latestStudies = studyService.getLatestStudies();
-        return ResponseEntity.ok(latestStudies);
+    public BaseResponse<?> getLatestStudies() {
+        try {
+            List<StudyMainPageResponseDto> latestStudies = studyService.getLatestStudies();
+            return new BaseResponse<>(BaseResponseStatus.SUCCESS, latestStudies);
+        }catch (BaseException e){
+            return  new BaseResponse<>(e.getStatus());
+        }
     }
 
     @GetMapping("/open")
-    public ResponseEntity<List<StudyMainPageResponseDto>> getOpenStudies() {
-        List<StudyMainPageResponseDto> openStudies = studyService.getOpenStudies();
-        return ResponseEntity.ok(openStudies);
+    public BaseResponse<?> getOpenStudies() {
+        try {
+            List<StudyMainPageResponseDto> openStudies = studyService.getOpenStudies();
+            return new BaseResponse<>(BaseResponseStatus.SUCCESS, openStudies);
+        }catch (BaseException e){
+            return  new BaseResponse<>(e.getStatus());
+        }
     }
     @GetMapping("/ranking")
-    public ResponseEntity<List<StudyMainPageResponseDto>> getStudyRanking() {
-        List<StudyMainPageResponseDto> rankedStudies = studyService.getRankedStudies();
-        return ResponseEntity.ok(rankedStudies);
+    public BaseResponse<?> getStudyRanking() {
+        try{
+            List<StudyMainPageResponseDto> rankedStudies = studyService.getRankedStudies();
+            return new BaseResponse<>(BaseResponseStatus.SUCCESS, rankedStudies);
+        }catch (BaseException e){
+            return new BaseResponse<>(e.getStatus());
+        }
     }
 
     @PostMapping("/{study_id}/postNotice")