Merge pull request #88 from AR-TTUBEOG/refactor/87

[Refactor] 응답형식 리팩토링
AR-TTUBEOG · Mar 10, 2024 · d68d231 · d68d231
2 parents 566237d + 1e611fe
commit d68d231
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/src/main/java/com/ttubeog/domain/benefit/application/BenefitService.java b/src/main/java/com/ttubeog/domain/benefit/application/BenefitService.java
@@ -41,7 +41,7 @@ public class BenefitService {
 
     //게임 성공 후 혜택 저장
     @Transactional
-    public ResponseEntity<?> saveBenefit(HttpServletRequest request, Long benefitId) throws JsonProcessingException {
+    public ApiResponse saveBenefit(HttpServletRequest request, Long benefitId) throws JsonProcessingException {
         Long memberId = jwtTokenProvider.getMemberId(request);
         Member member = memberRepository.findById(memberId).orElseThrow(InvalidMemberException::new);
         Benefit benefit = benefitRepository.findById(benefitId).orElseThrow(NonExistentBenefitException::new);
@@ -73,18 +73,13 @@ public ResponseEntity<?> saveBenefit(HttpServletRequest request, Long benefitId)
                 .createdAt(memberBenefit.getCreatedAt())
                 .build();
 
-        ApiResponse apiResponse = ApiResponse.builder()
-                .check(true)
-                .information(saveBenefitRes)
-                .build();
-
-        return ResponseEntity.ok(apiResponse);
+        return new ApiResponse(true, saveBenefitRes);
     }
 
 
     //혜택 사용
     @Transactional
-    public ResponseEntity<?> useBenefit(HttpServletRequest request, Long benefitId) throws JsonProcessingException {
+    public ApiResponse useBenefit(HttpServletRequest request, Long benefitId) throws JsonProcessingException {
         Long memberId = jwtTokenProvider.getMemberId(request);
         Member member = memberRepository.findById(memberId).orElseThrow(InvalidMemberException::new);
         Benefit benefit = benefitRepository.findById(benefitId).orElseThrow(NonExistentBenefitException::new);
@@ -112,16 +107,11 @@ public ResponseEntity<?> useBenefit(HttpServletRequest request, Long benefitId)
                 .type(benefit.getType())
                 .build();
 
-        ApiResponse apiResponse = ApiResponse.builder()
-                .check(true)
-                .information(saveBenefitRes)
-                .build();
-
-        return ResponseEntity.ok(apiResponse);
+        return new ApiResponse(true, saveBenefitRes);
     }
 
     //혜택 조회(사용 가능, 사용 완료, 만료 혜택 모두 조회)
-    public ResponseEntity<?> findMyBenefit(HttpServletRequest request, Integer page) throws JsonProcessingException {
+    public ApiResponse findMyBenefit(HttpServletRequest request, Integer page) throws JsonProcessingException {
         Long memberId = jwtTokenProvider.getMemberId(request);
         Member member = memberRepository.findById(memberId).orElseThrow(InvalidMemberException::new);
 
@@ -141,12 +131,7 @@ public ResponseEntity<?> findMyBenefit(HttpServletRequest request, Integer page)
                         .build()
         ).toList();
 
-        ApiResponse apiResponse = ApiResponse.builder()
-                .check(true)
-                .information(saveBenefitRes)
-                .build();
-
-        return ResponseEntity.ok(apiResponse);
+        return new ApiResponse(true, saveBenefitRes);
     }
 
     //한달지나면 expired true로 만들기

diff --git a/src/main/java/com/ttubeog/domain/benefit/presentation/BenefitController.java b/src/main/java/com/ttubeog/domain/benefit/presentation/BenefitController.java
@@ -34,7 +34,7 @@ public ResponseEntity<?> saveBenefit(
             HttpServletRequest request,
             @PathVariable(value = "benefitId") Long benefitId
     ) throws JsonProcessingException {
-        return benefitService.saveBenefit(request, benefitId);
+        return ResponseEntity.ok(benefitService.saveBenefit(request, benefitId));
     }
 
     //혜택 사용
@@ -48,7 +48,7 @@ public ResponseEntity<?> useBenefit(
             HttpServletRequest request,
             @PathVariable(value = "benefitId") Long benefitId
     ) throws JsonProcessingException {
-        return benefitService.useBenefit(request, benefitId);
+        return ResponseEntity.ok(benefitService.useBenefit(request, benefitId));
     }
 
     //혜택 조회
@@ -62,6 +62,6 @@ public ResponseEntity<?> findMyBenefit(
             HttpServletRequest request,
             @RequestParam(name = "page") Integer page
     ) throws JsonProcessingException {
-        return benefitService.findMyBenefit(request, page);
+        return ResponseEntity.ok(benefitService.findMyBenefit(request, page));
     }
 }