Merge pull request #171 from prgrms-web-devcourse-final-project/refactor#169

[Refactor]: 코드 리팩토링 -1

Author: dlawhd

src/main/java/com/backend/domain/cash/controller/ApiV1CashController.java

@@ -1,12 +1,12 @@
 package com.backend.domain.cash.controller;
 
-import com.backend.domain.cash.dto.CashResponse;
-import com.backend.domain.cash.dto.CashTransactionResponse;
-import com.backend.domain.cash.dto.CashTransactionsResponse;
+import com.backend.domain.cash.dto.response.CashResponse;
+import com.backend.domain.cash.dto.response.CashTransactionResponse;
+import com.backend.domain.cash.dto.response.CashTransactionsResponse;
 import com.backend.domain.cash.service.CashService;
 import com.backend.domain.member.entity.Member;
-import com.backend.domain.member.repository.MemberRepository;
 import com.backend.domain.member.service.MemberService;
+import com.backend.global.response.RsData;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -19,29 +19,29 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/v1")
+@RequestMapping("/api/v1/cash")
 @Tag(name = "Cash", description = "돈 관련 API")
 public class ApiV1CashController {
 
     private final MemberService memberService;
     private final CashService cashService;
 
-    @GetMapping("/cash")
+    @GetMapping
     @Operation(summary = "내 지갑 잔액 조회", description = "지갑이 없으면 404를 반환합니다.")
     @Transactional(readOnly = true)
-    public CashResponse getMyCash(@AuthenticationPrincipal User user) {
+    public RsData<CashResponse> getMyCash(@AuthenticationPrincipal User user) {
         if (user == null) {
             throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.");
         }
-
         Member actor = memberService.findMemberByEmail(user.getUsername());
-        return cashService.getMyCashResponse(actor); // 컨트롤러는 위임만
+        CashResponse data = cashService.getMyCashResponse(actor);
+        return RsData.ok("지갑 잔액이 조회되었습니다.", data);
     }
 
-    @GetMapping("/cash/transactions")
-    @Operation(summary = "내 원장 목록(입금/출금)", description = "지갑 미생성 시 404 반환, 페이지네이션 추가")
+    @GetMapping("/transactions")
+    @Operation(summary = "내 원장 목록(입금/출금)", description = "지갑 미생성 시 404 반환")
     @Transactional(readOnly = true)
-    public CashTransactionsResponse getMyTransactions(
+    public RsData<CashTransactionsResponse> getMyTransactions(
             @AuthenticationPrincipal User user,
             @RequestParam(defaultValue = "1") int page,
             @RequestParam(defaultValue = "20") int size
@@ -50,19 +50,20 @@ public CashTransactionsResponse getMyTransactions(
             throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.");
         }
         Member actor = memberService.findMemberByEmail(user.getUsername());
-        return cashService.getMyTransactions(actor, page, size);
+        CashTransactionsResponse data = cashService.getMyTransactions(actor, page, size);
+        return RsData.ok("지갑 원장 목록이 조회되었습니다.", data);
     }
 
-    // 단건 상세..
-    @GetMapping("/cash/transactions/{transactionId}")
+    @GetMapping("/transactions/{transactionId}")
     @Operation(summary = "내 원장 단건 상세")
     @Transactional(readOnly = true)
-    public CashTransactionResponse getMyTransactionDetail(
+    public RsData<CashTransactionResponse> getMyTransactionDetail(
             @AuthenticationPrincipal User user,
             @PathVariable Long transactionId
     ) {
         if (user == null) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.");
         Member actor = memberService.findMemberByEmail(user.getUsername());
-        return cashService.getMyTransactionDetail(actor, transactionId);
+        CashTransactionResponse data = cashService.getMyTransactionDetail(actor, transactionId);
+        return RsData.ok("지갑 원장 상세가 조회되었습니다.", data);
     }
 }

src/main/java/com/backend/domain/cash/controller/ApiV1CashMockController.java

@@ -1,4 +1,4 @@
-package com.backend.domain.cash.dto;
+package com.backend.domain.cash.dto.response;
 
 import lombok.Builder;
 import lombok.Getter;

src/main/java/com/backend/domain/cash/dto/CashResponse.java renamed to src/main/java/com/backend/domain/cash/dto/response/CashResponse.java

@@ -1,4 +1,4 @@
-package com.backend.domain.cash.dto;
+package com.backend.domain.cash.dto.response;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;

src/main/java/com/backend/domain/cash/dto/CashTransactionItemResponse.java renamed to src/main/java/com/backend/domain/cash/dto/response/CashTransactionItemResponse.java

@@ -1,4 +1,4 @@
-package com.backend.domain.cash.dto;
+package com.backend.domain.cash.dto.response;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;

src/main/java/com/backend/domain/cash/dto/CashTransactionResponse.java renamed to src/main/java/com/backend/domain/cash/dto/response/CashTransactionResponse.java

@@ -1,4 +1,4 @@
-package com.backend.domain.cash.dto;
+package com.backend.domain.cash.dto.response;
 
 import lombok.Builder;
 import lombok.Getter;

src/main/java/com/backend/domain/cash/dto/CashTransactionsResponse.java renamed to src/main/java/com/backend/domain/cash/dto/response/CashTransactionsResponse.java

@@ -3,10 +3,10 @@
 import com.backend.domain.bid.repository.BidRepository;
 import com.backend.domain.cash.enums.CashTxType;
 import com.backend.domain.cash.enums.RelatedType;
-import com.backend.domain.cash.dto.CashResponse;
-import com.backend.domain.cash.dto.CashTransactionItemResponse;
-import com.backend.domain.cash.dto.CashTransactionResponse;
-import com.backend.domain.cash.dto.CashTransactionsResponse;
+import com.backend.domain.cash.dto.response.CashResponse;
+import com.backend.domain.cash.dto.response.CashTransactionItemResponse;
+import com.backend.domain.cash.dto.response.CashTransactionResponse;
+import com.backend.domain.cash.dto.response.CashTransactionsResponse;
 import com.backend.domain.cash.entity.Cash;
 import com.backend.domain.cash.entity.CashTransaction;
 import com.backend.domain.cash.repository.CashRepository;
@@ -176,15 +176,17 @@ public CashTransaction withdraw(Member member, long amount,
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "잔액이 부족합니다.");
          }
 
+        long delta = -Math.abs(amount);    // 출금은 음수로 저장..
+        long newBalance = current + delta; // = current - amount
+
         // 잔액 차감..
-        long newBalance = current - amount;
         cash.setBalance(newBalance);
 
         // 원장(WITHDRAW) 한 줄 추가..
         var tx = CashTransaction.builder()
                 .cash(cash)
                 .type(CashTxType.WITHDRAW)  // 출금..
-                .amount(amount)             // 항상 양수로 저장..
+                .amount(delta)              // 음수로 저장..
                 .balanceAfter(newBalance)   // 이 줄 반영 후 잔액..
                 .relatedType(relatedType)   // 돈이 왜 빠졌는지..
                 .relatedId(relatedId)       // 관련 ID (예: bidId)..

src/main/java/com/backend/domain/cash/service/CashService.java

@@ -2,9 +2,15 @@
 
 import com.backend.domain.member.entity.Member;
 import com.backend.domain.member.service.MemberService;
-import com.backend.domain.payment.dto.*;
+import com.backend.domain.payment.dto.request.PaymentRequest;
+import com.backend.domain.payment.dto.request.TossIssueBillingKeyRequest;
+import com.backend.domain.payment.dto.response.MyPaymentResponse;
+import com.backend.domain.payment.dto.response.MyPaymentsResponse;
+import com.backend.domain.payment.dto.response.PaymentResponse;
+import com.backend.domain.payment.dto.response.TossIssueBillingKeyResponse;
 import com.backend.domain.payment.service.PaymentService;
 import com.backend.domain.payment.service.TossBillingClientService;
+import com.backend.global.response.RsData;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -26,56 +32,61 @@ public class ApiV1PaymentController {
     private final PaymentService paymentService;
     private final TossBillingClientService tossBillingClientService;
 
+    // 공통: 인증 사용자(Member) 가져오기..
+    private Member getActor(User user) {
+        if (user == null) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.");
+        return memberService.findMemberByEmail(user.getUsername());
+    }
+
     @PostMapping
     @Operation(summary="지갑 충전 요청", description="idempotencyKey로 중복 충전 방지, 일단은 idempotencyKey 아무키로 등록해주세요!.")
-    public PaymentResponse charge(
+    public RsData<PaymentResponse> charge(
             @AuthenticationPrincipal User user,
             @RequestBody @Valid PaymentRequest req
     ) {
-        if (user == null) {
-            throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.");
-        }
-
-        Member actor = memberService.findMemberByEmail(user.getUsername());
-
-        return paymentService.charge(actor, req);
+        Member actor = getActor(user);
+        PaymentResponse data = paymentService.charge(actor, req);
+        return RsData.created("지갑 충전이 완료되었습니다.", data);
     }
 
     @PostMapping("/toss/issue-billing-key")
-    public TossIssueBillingKeyResponse issueBillingKey(
+    @Operation(summary="토스 빌링키 발급", description="카드/계좌 등록용 빌링키를 발급합니다.")
+    public RsData<TossIssueBillingKeyResponse> issueBillingKey(
             @AuthenticationPrincipal User user,
             @RequestBody TossIssueBillingKeyRequest req
     ) {
-        if (user == null) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
+        Member me = getActor(user);
+        String customerKey = "user-" + me.getId();
+        TossIssueBillingKeyResponse data = tossBillingClientService.issueBillingKey(customerKey, req.getAuthKey());
 
-        Member me = memberService.findMemberByEmail(user.getUsername());
-        String customerKey = "user-" + me.getId();   // ★ 프런트 값 무시하고 서버에서 생성
-
-        return tossBillingClientService.issueBillingKey(customerKey, req.getAuthKey());
+        return RsData.ok("빌링키가 발급되었습니다.", data);
     }
 
     @GetMapping("/me")
+    @Operation(summary="내 결제 내역")
     @Transactional(readOnly = true)
-    public MyPaymentsResponse getMyPayments(
+    public RsData<MyPaymentsResponse> getMyPayments(
             @AuthenticationPrincipal User user,
             @RequestParam(defaultValue = "1") int page,
             @RequestParam(defaultValue = "20") int size
     ) {
-        if (user == null) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.");
-        Member actor = memberService.findMemberByEmail(user.getUsername());
-        return paymentService.getMyPayments(actor, page, size); //
+        Member actor = getActor(user);
+        MyPaymentsResponse data = paymentService.getMyPayments(actor, page, size);
+
+        return RsData.ok("내 결제 내역이 조회되었습니다.", data);
     }
 
     @GetMapping("/me/{paymentId}")
     @Operation(summary = "내 결제 단건 상세")
     @Transactional(readOnly = true)
-    public MyPaymentResponse getMyPaymentDetail(
+    public RsData<MyPaymentResponse> getMyPaymentDetail(
             @AuthenticationPrincipal User user,
             @PathVariable Long paymentId
     ) {
-        if (user == null) throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.");
-        Member actor = memberService.findMemberByEmail(user.getUsername());
-        return paymentService.getMyPaymentDetail(actor, paymentId);
+        Member actor =  getActor(user);
+        MyPaymentResponse data = paymentService.getMyPaymentDetail(actor, paymentId);
+
+        return RsData.ok("결제 상세가 조회되었습니다.", data);
     }
 
 }