[Feat]: api 변경 1차

KNU-HAEDAL · May 30, 2024 · 1e85b83 · 1e85b83
1 parent 363aaf5
commit 1e85b83
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 13 deletions.
diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/PagingResponse.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/PagingResponse.java
@@ -9,6 +9,7 @@
 @Builder
 public record PagingResponse<T>(
         Integer totalPage,
+        Boolean hasNext,
         List<T> data
 ) {
 
@@ -22,6 +23,7 @@ public static <Entity, Model> PagingResponse<Model> from(
     ) {
         return PagingResponse.<Model>builder()
                 .totalPage(page.getTotalPages())
+                .hasNext(page.hasNext())
                 .data(page.getContent().stream().map(converter).toList())
                 .build();
 

diff --git a/...suni-api-server/app/src/main/java/org/haedal/zzansuni/controller/auth/AuthController.java b/...suni-api-server/app/src/main/java/org/haedal/zzansuni/controller/auth/AuthController.java
@@ -21,7 +21,7 @@ public ApiResponse<AuthRes.LoginResponse> oauth2(@RequestBody @Valid AuthReq.OAu
         return ApiResponse.success(
                 new AuthRes.LoginResponse("accessToken", "refresh", new UserRes.UserInfoDto(
                         1L, "nickname", "profileImageUrl", "email",
-                        new UserRes.TierDto("tier", 100, 50)
+                        new UserRes.TierInfoDto("tier", 100, 50)
                 )));
     }
 

diff --git a/...erver/app/src/main/java/org/haedal/zzansuni/controller/challenge/ChallengeController.java b/...erver/app/src/main/java/org/haedal/zzansuni/controller/challenge/ChallengeController.java
@@ -63,7 +63,7 @@ public ApiResponse<PagingResponse<ChallengeRes.ChallengeDto>> getChallengeShorts
     }
 
     @Operation(summary = "진행중인 챌린지 조회", description = "진행중인 챌린지 조회한다.")
-    @GetMapping("/api/challenges/currents")
+    @GetMapping("/api/user/challenges/currents")
     public ApiResponse<PagingResponse<ChallengeRes.ChallengeCurrentDto>> getChallengeCurrentsPaging(
             @Valid PagingRequest pagingRequest,
             @AuthenticationPrincipal JwtUser jwtUser
@@ -72,7 +72,7 @@ public ApiResponse<PagingResponse<ChallengeRes.ChallengeCurrentDto>> getChalleng
     }
 
     @Operation(summary = "완료한 챌린지 조회", description = "완료한 챌린지 페이징 조회한다.")
-    @GetMapping("/api/challenges/completes")
+    @GetMapping("/api/user/challenges/completes")
     public ApiResponse<PagingResponse<ChallengeRes.ChallengeCompleteDto>> getChallengeCompletesPaging(
             @Valid PagingRequest pagingRequest,
             @AuthenticationPrincipal JwtUser jwtUser

diff --git a/...i-api-server/app/src/main/java/org/haedal/zzansuni/controller/challenge/ChallengeRes.java b/...i-api-server/app/src/main/java/org/haedal/zzansuni/controller/challenge/ChallengeRes.java
@@ -34,7 +34,8 @@ public record ChallengeDetailDto(
             LocalDate endDate,
             ChallengeCategory category,
             /////
-            List<String> imageUrl,
+            Integer maxDifficulty,
+            List<String> imageUrls,
             List<ChallengeDifficultyDto> difficulties
     ) {
     }

diff --git a/...n/java/org/haedal/zzansuni/controller/challenge/interact/ChallengeInteractController.java b/...n/java/org/haedal/zzansuni/controller/challenge/interact/ChallengeInteractController.java
@@ -16,11 +16,11 @@
 @RestController
 public class ChallengeInteractController {
 
-    @Operation(summary = "챌린지 참여", description = "챌린지에 참여한다.")
+    @Operation(summary = "챌린지 인증", description = "챌린지에 인증한다.")
     @PostMapping("/api/challenges/{challengeId}/verification")
     public ApiResponse<ChallengeInteractRes.ChallengeVerificationResponse> challengeVerification(
             @PathVariable Long challengeId,
-            @RequestPart("content") ChallengeInteractReq.ChallengeVerificationRequest request,
+            @RequestPart("body") ChallengeInteractReq.ChallengeVerificationRequest request,
             @RequestPart("image") MultipartFile image
     ) {
         throw new RuntimeException("Not implemented");
@@ -47,9 +47,8 @@ public ApiResponse<ChallengeInteractRes.ChallengeRecordResponse> getChallengeRec
     }
 
     @Operation(summary = "챌린지 기록 상세 조회", description = "챌린지 기록 상세를 조회한다.")
-    @GetMapping("/api/challenges/{challengeId}/record/{recordId}")
+    @GetMapping("/api/challenges/record/{recordId}")
     public ApiResponse<ChallengeInteractRes.ChallengeRecordDetailDto> getChallengeRecordDetail(
-            @PathVariable Long challengeId,
             @PathVariable Long recordId,
             @AuthenticationPrincipal JwtUser jwtUser
     ) {

diff --git a/...src/main/java/org/haedal/zzansuni/controller/challenge/interact/ChallengeInteractRes.java b/...src/main/java/org/haedal/zzansuni/controller/challenge/interact/ChallengeInteractRes.java
@@ -21,7 +21,7 @@ public record ChallengeRecordResponse(
             Integer successCount,
             LocalDate startDate,
             LocalDate endDate,
-            List<Long> recordDetailIds
+            List<Long> recordIds
     ) {
     }
 

diff --git a/...suni-api-server/app/src/main/java/org/haedal/zzansuni/controller/user/UserController.java b/...suni-api-server/app/src/main/java/org/haedal/zzansuni/controller/user/UserController.java
@@ -28,7 +28,7 @@ public ApiResponse<UserRes.UserInfoDto> getUserInfo(
     ) {
         return ApiResponse.success(
                 new UserRes.UserInfoDto(1L, "nickname", "profileImageUrl", "email",
-                        new UserRes.TierDto("tier", 100, 50)
+                        new UserRes.TierInfoDto("tier", 100, 50)
                 )
         );
     }

diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/user/UserRes.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/user/UserRes.java
@@ -12,7 +12,7 @@ public record UserInfoDto(
             String nickname,
             String profileImageUrl,
             String email,
-            TierDto tier
+            TierInfoDto tierInfo
     ) {
     }
 
@@ -21,12 +21,12 @@ public record UserDto(
             Long id,
             String nickname,
             String profileImageUrl,
-            TierDto tier
+            TierInfoDto tier
     ) {
     }
 
     @Builder
-    public record TierDto(
+    public record TierInfoDto(
             String tier,
             Integer totalExp,
             Integer currentExp