Merge pull request #157 from Team-HMH/feat/#149-get-earned-point-api

feat: 받을 포인트 반환 api
Team-HMH · Jun 9, 2024 · 7b42e37 · 7b42e37
2 parents 23af87d + f224357
commit 7b42e37
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 9 deletions.
diff --git a/src/main/java/sopt/org/hmh/domain/point/controller/PointApi.java b/src/main/java/sopt/org/hmh/domain/point/controller/PointApi.java
@@ -10,6 +10,7 @@
 import sopt.org.hmh.domain.point.dto.request.ChallengeDateRequest;
 import sopt.org.hmh.domain.point.dto.response.ChallengePointStatusListResponse;
 import sopt.org.hmh.domain.point.dto.response.EarnPointResponse;
+import sopt.org.hmh.domain.point.dto.response.EarnedPointResponse;
 import sopt.org.hmh.domain.point.dto.response.UsagePointResponse;
 import sopt.org.hmh.domain.point.dto.response.UsePointResponse;
 import sopt.org.hmh.global.auth.jwt.JwtConstants;
@@ -85,4 +86,20 @@ ResponseEntity<BaseResponse<EarnPointResponse>> orderEarnPointAndChallengeEarned
                             description = "서버 내부 오류입니다.",
                             content = @Content)})
     ResponseEntity<BaseResponse<UsagePointResponse>> orderGetUsagePoint();
+
+    @Operation(
+            summary = "받을 포인트 받기 API",
+            responses = {
+                    @ApiResponse(
+                            responseCode = "200",
+                            description = "사용할 포인트 반환에 성공하였습니다."),
+                    @ApiResponse(
+                            responseCode = "400",
+                            description = "잘못된 요청입니다.",
+                            content = @Content),
+                    @ApiResponse(
+                            responseCode = "500",
+                            description = "서버 내부 오류입니다.",
+                            content = @Content)})
+    ResponseEntity<BaseResponse<EarnedPointResponse>> orderGetEarnedPoint();
 }
diff --git a/src/main/java/sopt/org/hmh/domain/point/controller/PointController.java b/src/main/java/sopt/org/hmh/domain/point/controller/PointController.java
@@ -7,6 +7,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import sopt.org.hmh.domain.challenge.domain.ChallengeConstants;
 import sopt.org.hmh.domain.point.dto.request.ChallengeDateRequest;
 import sopt.org.hmh.domain.point.dto.response.*;
 import sopt.org.hmh.domain.point.exception.PointSuccess;
@@ -57,12 +58,21 @@ public ResponseEntity<BaseResponse<EarnPointResponse>> orderEarnPointAndChalleng
                         pointFacade.earnPointAndChallengeEarned(userId, challengeDateRequest.challengeDate())));
     }
 
+    @Override
+    @GetMapping("/earn")
+    public ResponseEntity<BaseResponse<EarnedPointResponse>> orderGetEarnedPoint() {
+        return ResponseEntity
+                .status(PointSuccess.GET_EARNED_POINT_SUCCESS.getHttpStatus())
+                .body(BaseResponse.success(PointSuccess.GET_EARNED_POINT_SUCCESS,
+                        new EarnedPointResponse(ChallengeConstants.EARNED_POINT)));
+    }
+
     @Override
     @GetMapping("/use")
     public ResponseEntity<BaseResponse<UsagePointResponse>> orderGetUsagePoint() {
         return ResponseEntity
                 .status(PointSuccess.GET_USAGE_POINT_SUCCESS.getHttpStatus())
                 .body(BaseResponse.success(PointSuccess.GET_USAGE_POINT_SUCCESS,
-                        pointFacade.getUsagePoint()));
+                        new UsagePointResponse(ChallengeConstants.USAGE_POINT)));
     }
 }
diff --git a/src/main/java/sopt/org/hmh/domain/point/dto/response/EarnedPointResponse.java b/src/main/java/sopt/org/hmh/domain/point/dto/response/EarnedPointResponse.java
@@ -0,0 +1,6 @@
+package sopt.org.hmh.domain.point.dto.response;
+
+public record EarnedPointResponse(
+        Integer earnPoint
+) {
+}
diff --git a/src/main/java/sopt/org/hmh/domain/point/dto/response/UsagePointResponse.java b/src/main/java/sopt/org/hmh/domain/point/dto/response/UsagePointResponse.java
@@ -1,6 +1,7 @@
 package sopt.org.hmh.domain.point.dto.response;
 
 public record UsagePointResponse(
-   Integer usagePoint
+        Integer usagePoint
 ) {
+
 }
diff --git a/src/main/java/sopt/org/hmh/domain/point/exception/PointSuccess.java b/src/main/java/sopt/org/hmh/domain/point/exception/PointSuccess.java
@@ -10,6 +10,7 @@ public enum PointSuccess implements SuccessBase {
     POINT_USAGE_SUCCESS(HttpStatus.OK, "포인트 사용에 성공하였습니다"),
     POINT_EARN_SUCCESS(HttpStatus.OK, "포인트 받기에 성공하였습니다"),
     GET_USAGE_POINT_SUCCESS(HttpStatus.OK, "사용할 포인트 반환에 성공하였습니다"),
+    GET_EARNED_POINT_SUCCESS(HttpStatus.OK, "받을 포인트 반환에 성공하였습니다"),
     GET_CHALLENGE_POINT_STATUS_LIST_SUCCESS(HttpStatus.OK, "챌린지 포인트 수령 여부 리스트 조회에 성공하였습니다."),
     ;
 

diff --git a/src/main/java/sopt/org/hmh/domain/point/service/PointFacade.java b/src/main/java/sopt/org/hmh/domain/point/service/PointFacade.java
@@ -1,9 +1,7 @@
 package sopt.org.hmh.domain.point.service;
 
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -52,11 +50,6 @@ public EarnPointResponse earnPointAndChallengeEarned(Long userId, LocalDate chal
         );
     }
 
-    @Transactional(readOnly = true)
-    public UsagePointResponse getUsagePoint() {
-        return new UsagePointResponse(ChallengeConstants.USAGE_POINT);
-    }
-
     public ChallengePointStatusListResponse getChallengePointStatusList(Long userId) {
         Challenge challenge = challengeService.findCurrentChallengeByUserId(userId);
         List<ChallengePointStatusResponse> challengePointStatusResponseList =