[#199, #198] 환불 API 작성, Payment 도메인 수정

server/src/main/java/com/example/tyfserver/common/config/CommonConfig.java

@@ -1,9 +1,6 @@
 package com.example.tyfserver.common.config;
 
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.multipart.MultipartResolver;
-import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewResolverRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

server/src/main/java/com/example/tyfserver/common/util/S3Connector.java

@@ -2,7 +2,6 @@
 
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.model.PutObjectRequest;
-import com.amazonaws.util.Base64;
 import com.example.tyfserver.common.exception.S3FileNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;

server/src/main/java/com/example/tyfserver/donation/controller/DonationController.java

@@ -6,7 +6,7 @@
 import com.example.tyfserver.donation.exception.DonationMessageRequestException;
 import com.example.tyfserver.donation.exception.DonationRequestException;
 import com.example.tyfserver.donation.service.DonationService;
-import com.example.tyfserver.payment.dto.PaymentRequest;
+import com.example.tyfserver.payment.dto.PaymentCompleteRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -25,11 +25,11 @@ public class DonationController {
     private final DonationService donationService;
 
     @PostMapping
-    public ResponseEntity<DonationResponse> createDonation(@Valid @RequestBody PaymentRequest paymentRequest, BindingResult result) {
+    public ResponseEntity<DonationResponse> createDonation(@Valid @RequestBody PaymentCompleteRequest paymentCompleteRequest, BindingResult result) {
         if (result.hasErrors()) {
             throw new DonationRequestException();
         }
-        return ResponseEntity.status(HttpStatus.CREATED).body(donationService.createDonation(paymentRequest));
+        return ResponseEntity.status(HttpStatus.CREATED).body(donationService.createDonation(paymentCompleteRequest));
     }
 
     @PostMapping("/{donationId}/messages")

server/src/main/java/com/example/tyfserver/donation/service/DonationService.java

@@ -9,7 +9,7 @@
 import com.example.tyfserver.member.exception.MemberNotFoundException;
 import com.example.tyfserver.member.repository.MemberRepository;
 import com.example.tyfserver.payment.domain.Payment;
-import com.example.tyfserver.payment.dto.PaymentRequest;
+import com.example.tyfserver.payment.dto.PaymentCompleteRequest;
 import com.example.tyfserver.payment.service.PaymentService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
@@ -28,8 +28,8 @@ public class DonationService {
     private final MemberRepository memberRepository;
     private final PaymentService paymentService;
 
-    public DonationResponse createDonation(PaymentRequest paymentRequest) {
-        Payment payment = paymentService.completePayment(paymentRequest);
+    public DonationResponse createDonation(PaymentCompleteRequest paymentCompleteRequest) {
+        Payment payment = paymentService.completePayment(paymentCompleteRequest);
         Donation donation = new Donation(payment);
         Member member = memberRepository.findByPageName(payment.getPageName())
                 .orElseThrow(MemberNotFoundException::new);

server/src/main/java/com/example/tyfserver/member/controller/MemberController.java

@@ -8,7 +8,6 @@
 import com.example.tyfserver.member.exception.PageNameValidationRequestException;
 import com.example.tyfserver.member.service.MemberService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;

server/src/main/java/com/example/tyfserver/member/service/MemberService.java

@@ -80,7 +80,7 @@ public void updateNickName(LoginMember loginMember, String nickName) {
 
     private Member findMember(Long id) {
         return memberRepository.findById(id)
-            .orElseThrow(MemberNotFoundException::new);
+                .orElseThrow(MemberNotFoundException::new);
     }
 
     private void deleteProfile(Member member) {

server/src/main/java/com/example/tyfserver/payment/controller/PaymentController.java

@@ -1,9 +1,11 @@
 package com.example.tyfserver.payment.controller;
 
-import com.example.tyfserver.payment.dto.PaymentSaveRequest;
-import com.example.tyfserver.payment.dto.PaymentSaveResponse;
-import com.example.tyfserver.payment.exception.PaymentRequestException;
-import com.example.tyfserver.payment.exception.PaymentSaveRequestException;
+import com.example.tyfserver.payment.dto.PaymentCancelRequest;
+import com.example.tyfserver.payment.dto.PaymentCancelResponse;
+import com.example.tyfserver.payment.dto.PaymentPendingRequest;
+import com.example.tyfserver.payment.dto.PaymentPendingResponse;
+import com.example.tyfserver.payment.exception.PaymentCancelRequestException;
+import com.example.tyfserver.payment.exception.PaymentPendingRequestException;
 import com.example.tyfserver.payment.service.PaymentService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -23,13 +25,23 @@ public class PaymentController {
     private final PaymentService paymentService;
 
     @PostMapping
-    public ResponseEntity<PaymentSaveResponse> payment(@Valid @RequestBody PaymentSaveRequest paymentSaveRequest, BindingResult result) {
+    public ResponseEntity<PaymentPendingResponse> payment(@Valid @RequestBody PaymentPendingRequest paymentPendingRequest, BindingResult result) {
+        if (result.hasErrors()) {
+            throw new PaymentPendingRequestException();
+        }
+
+        PaymentPendingResponse response = paymentService.createPayment(paymentPendingRequest);
+        return ResponseEntity.ok(response);
+    }
 
+    // todo 환불시 이메일 인증 필요
+    @PostMapping("/cancel")
+    public ResponseEntity<PaymentCancelResponse> cancelPayment(@Valid @RequestBody PaymentCancelRequest paymentCancelRequest, BindingResult result) {
         if (result.hasErrors()) {
-            throw new PaymentSaveRequestException();
+            throw new PaymentCancelRequestException();
         }
 
-        PaymentSaveResponse response = paymentService.createPayment(paymentSaveRequest);
+        PaymentCancelResponse response = paymentService.cancelPayment(paymentCancelRequest);
         return ResponseEntity.ok(response);
     }
 }

server/src/main/java/com/example/tyfserver/payment/domain/Payment.java

@@ -2,14 +2,14 @@
 
 import com.example.tyfserver.common.domain.BaseTimeEntity;
 import com.example.tyfserver.payment.exception.IllegalPaymentInfoException;
-import com.example.tyfserver.payment.exception.PaymentRequestException;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import java.util.UUID;
 
-import static com.example.tyfserver.payment.exception.PaymentRequestException.*;
+import static com.example.tyfserver.payment.exception.IllegalPaymentInfoException.*;
 
 @Entity
 @Getter
@@ -33,15 +33,35 @@ public class Payment extends BaseTimeEntity {
 
     private String impUid;
 
-    public Payment(Long id, Long amount, String email, String pageName) {
+    private UUID merchantUid;
+
+    @PrePersist
+    protected void onCreate() {
+        merchantUid = UUID.randomUUID();
+    }
+
+    public Payment(Long id, Long amount, String email, String pageName, UUID merchantUid) {
         this.id = id;
         this.amount = amount;
         this.email = email;
         this.pageName = pageName;
+        this.merchantUid = merchantUid;
+    }
+
+    public Payment(Long amount, String email, String pageName, UUID merchantUid) {
+        this(null, amount, email, pageName, merchantUid);
+    }
+
+    public Payment(Long id, Long amount, String email, String pageName) {
+        this(id, amount, email, pageName, null);
     }
 
     public Payment(Long amount, String email, String pageName) {
-        this(null, amount, email, pageName);
+        this(null, amount, email, pageName, null);
+    }
+
+    public void updateStatus(PaymentStatus paymentStatus) {
+        this.status = paymentStatus;
     }
 
     public void complete(PaymentInfo paymentInfo) {
@@ -50,21 +70,32 @@ public void complete(PaymentInfo paymentInfo) {
         this.status = PaymentStatus.PAID;
     }
 
-    public void updateStatus(PaymentStatus paymentStatus) {
-        this.status = paymentStatus;
-    }
-
     private void validatePaymentComplete(PaymentInfo paymentInfo) {
         if (!PaymentStatus.isPaid(paymentInfo.getStatus())) {
             updateStatus(paymentInfo.getStatus());
-            throw IllegalPaymentInfoException.from(IllegalPaymentInfoException.ERROR_CODE_NOT_PAID, paymentInfo.getModule());
+            throw IllegalPaymentInfoException.from(ERROR_CODE_NOT_PAID, paymentInfo.getModule());
+        }
+
+        validatePaymentInfo(paymentInfo);
+    }
+
+    public void cancel(PaymentInfo paymentInfo) {
+        validatePaymentCancel(paymentInfo);
+        this.impUid = paymentInfo.getImpUid();
+        this.status = PaymentStatus.CANCELLED;
+    }
+
+    private void validatePaymentCancel(PaymentInfo paymentInfo) {
+        if (!PaymentStatus.isCancelled(paymentInfo.getStatus())) {
+            updateStatus(paymentInfo.getStatus());
+            throw IllegalPaymentInfoException.from(ERROR_CODE_NOT_CANCELLED, paymentInfo.getModule());
         }
 
         validatePaymentInfo(paymentInfo);
     }
 
     private void validatePaymentInfo(PaymentInfo paymentInfo) {
-        if (!id.equals(paymentInfo.getMerchantId())) {
+        if (!merchantUid.equals(paymentInfo.getMerchantUid())) {
             updateStatus(PaymentStatus.INVALID);
             throw IllegalPaymentInfoException.from(ERROR_CODE_INVALID_MERCHANT_ID, paymentInfo.getModule());
         }
@@ -76,7 +107,7 @@ private void validatePaymentInfo(PaymentInfo paymentInfo) {
 
         if (!pageName.equals(paymentInfo.getPageName())) {
             updateStatus(PaymentStatus.INVALID);
-            throw IllegalPaymentInfoException.from(ERROR_INVALID_CREATOR, paymentInfo.getModule());
+            throw IllegalPaymentInfoException.from(ERROR_CODE_INVALID_CREATOR, paymentInfo.getModule());
         }
     }
 }

server/src/main/java/com/example/tyfserver/payment/domain/PaymentInfo.java

@@ -1,19 +1,20 @@
 package com.example.tyfserver.payment.domain;
 
-import com.example.tyfserver.payment.util.IamPortPaymentServiceConnector;
 import lombok.Getter;
 
+import java.util.UUID;
+
 @Getter
 public class PaymentInfo {
-    private Long merchantId;
+    private UUID merchantUid;
     private PaymentStatus status;
     private Long amount;
     private String pageName;
     private String impUid;
     private String module;
 
-    public PaymentInfo(Long merchantId, PaymentStatus status, Long amount, String pageName, String impUid, String module) {
-        this.merchantId = merchantId;
+    public PaymentInfo(UUID merchantUid, PaymentStatus status, Long amount, String pageName, String impUid, String module) {
+        this.merchantUid = merchantUid;
         this.status = status;
         this.amount = amount;
         this.pageName = pageName;

server/src/main/java/com/example/tyfserver/payment/domain/PaymentServiceConnector.java

@@ -1,7 +1,10 @@
 package com.example.tyfserver.payment.domain;
 
-import com.example.tyfserver.payment.dto.PaymentRequest;
+import java.util.UUID;
 
 public interface PaymentServiceConnector {
-    PaymentInfo requestPaymentInfo(PaymentRequest paymentRequest);
+
+    PaymentInfo requestPaymentInfo(UUID merchantUid);
+
+    PaymentInfo requestPaymentCancel(UUID merchantUid);
 }

server/src/main/java/com/example/tyfserver/payment/domain/PaymentStatus.java

@@ -11,9 +11,10 @@ public enum PaymentStatus {
     }
 
     public static boolean isPaid(PaymentStatus paymentStatus) {
-        if (paymentStatus.equals(PAID)) {
-            return true;
-        }
-        return false;
+        return paymentStatus.equals(PAID);
+    }
+
+    public static boolean isCancelled(PaymentStatus paymentStatus) {
+        return paymentStatus.equals(CANCELLED);
     }
 }

server/src/main/java/com/example/tyfserver/payment/dto/IamPortPaymentInfo.java

@@ -12,7 +12,7 @@ public class IamPortPaymentInfo {
     public IamPortPaymentInfo(Response response) {
         this.response = response;
     }
-    
+
     @NoArgsConstructor
     @Getter
     public class Response {

server/src/main/java/com/example/tyfserver/payment/dto/PaymentCancelRequest.java

@@ -0,0 +1,21 @@
+package com.example.tyfserver.payment.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class PaymentCancelRequest {
+
+    @NotBlank
+    @JsonDeserialize
+    private String merchantUid;
+
+    public PaymentCancelRequest(String merchantUid) {
+        this.merchantUid = merchantUid;
+    }
+}

server/src/main/java/com/example/tyfserver/payment/dto/PaymentCancelResponse.java

@@ -0,0 +1,18 @@
+package com.example.tyfserver.payment.dto;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.UUID;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class PaymentCancelResponse {
+
+    private UUID merchantUid;
+
+    public PaymentCancelResponse(UUID merchantUid) {
+        this.merchantUid = merchantUid;
+    }
+}

server/src/main/java/com/example/tyfserver/payment/dto/PaymentRequest.java → server/src/main/java/com/example/tyfserver/payment/dto/PaymentCompleteRequest.java

@@ -1,22 +1,26 @@
 package com.example.tyfserver.payment.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.UUID;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class PaymentRequest {
+public class PaymentCompleteRequest {
 
     @NotBlank
     private String impUid;
+
     @NotNull
-    private Long merchantUid;
+    @JsonDeserialize
+    private UUID merchantUid;
 
-    public PaymentRequest(String impUid, Long merchantUid) {
+    public PaymentCompleteRequest(String impUid, UUID merchantUid) {
         this.impUid = impUid;
         this.merchantUid = merchantUid;
     }