Member Entity 명칭 수정

Api/src/main/java/picasso/server/api/HomeController.java

@@ -19,15 +19,5 @@ public class HomeController {
     public String index() {
         return "index";
     }
-
-    @GetMapping("/payment-test")
-    public String payment() {
-        return "exchange";
-    }
-
-    @ResponseBody
-    @PostMapping("/payment-test")
-    public void sample(@RequestBody Map<String, String> map) throws Exception {
-        map.forEach((key, value) -> log.info("key >>> {}, value >>> {}", key, value));
-    }
+
 }

Api/src/main/java/picasso/server/api/exchange/controller/PaymentController.java

@@ -0,0 +1,40 @@
+package picasso.server.api.exchange.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import picasso.server.api.exchange.model.request.PostCreatePaymentRequest;
+import picasso.server.api.exchange.service.PaymentService;
+import picasso.server.api.user.service.UserService;
+import picasso.server.domain.domains.member.entity.User;
+
+import java.util.Optional;
+
+@Slf4j
+@RequestMapping("/exchange")
+@RequiredArgsConstructor
+@Controller
+public class PaymentController {
+
+  private final PaymentService paymentService;
+  private final UserService userService;
+
+  @GetMapping("/payment")
+  public String paymentForm() {
+    return "exchange";
+  }
+
+  @ResponseBody
+  @PostMapping("/payment")
+  public void createPayment(@RequestBody PostCreatePaymentRequest body) {
+    log.info("{} {} {} {} {} {}", body.getPayResult(), body.getUserId(), body.getMerchantUid(), body.getProductName(), body.getPgProvider(), body.getPaidAmount());
+    paymentService.savePaymentHistory(body);
+    Optional<User> user = userService.findUserById(body.getUserId());
+    user.ifPresent(u -> u.updatePoint(body.getPaidAmount()));
+  }
+}

Api/src/main/java/picasso/server/api/exchange/model/request/PostCreatePaymentRequest.java

@@ -0,0 +1,15 @@
+package picasso.server.api.exchange.model.request;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class PostCreatePaymentRequest {
+  private Boolean payResult;
+  private Long userId;
+  private String merchantUid;
+  private String productName;
+  private String pgProvider;
+  private Long paidAmount;
+}

Api/src/main/java/picasso/server/api/exchange/service/PaymentService.java

@@ -0,0 +1,32 @@
+package picasso.server.api.exchange.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import picasso.server.api.exchange.model.request.PostCreatePaymentRequest;
+import picasso.server.api.exchange.validator.PaymentValidator;
+import picasso.server.domain.domains.items.PGName;
+import picasso.server.domain.domains.items.PaymentHistory;
+import picasso.server.domain.domains.repository.PaymentHistoryRepository;
+
+@Service
+@RequiredArgsConstructor
+public class PaymentService {
+
+  private final PaymentHistoryRepository paymentHistoryRepository;
+  private final PaymentValidator paymentValidator;
+
+  public void savePaymentHistory(PostCreatePaymentRequest request) {
+    paymentValidator.isFailedPayment(request.getPayResult());
+    paymentValidator.isPaymentExists(request.getMerchantUid());
+
+    PaymentHistory payment = PaymentHistory.builder()
+            .pgName(request.getPgProvider().equals("kakaopay") ? PGName.KAKAO : PGName.TOSS)
+            .productName(request.getProductName())
+            .merchantUid(request.getMerchantUid())
+            .amount(request.getPaidAmount())
+            .userId(request.getUserId())
+            .build();
+
+    paymentHistoryRepository.save(payment);
+  }
+}

Api/src/main/java/picasso/server/api/exchange/util/ExchangeUtils.java

@@ -3,16 +3,16 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 import picasso.server.domain.domains.items.PaymentHistory;
-import picasso.server.domain.domains.repository.ExchangeRepository;
+import picasso.server.domain.domains.repository.PaymentHistoryRepository;
 
 @RequiredArgsConstructor
 public class ExchangeUtils {
 
-  private final ExchangeRepository exchangeRepository;
+  private final PaymentHistoryRepository paymentHistoryRepository;
 
   @Transactional
   public void save(PaymentHistory paymentHistory) {
-    exchangeRepository.save(paymentHistory);
+    paymentHistoryRepository.save(paymentHistory);
   }
 
 

Api/src/main/java/picasso/server/api/exchange/validator/PaymentValidator.java

@@ -0,0 +1,30 @@
+package picasso.server.api.exchange.validator;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import picasso.server.api.exchange.model.request.PostCreatePaymentRequest;
+import picasso.server.common.annotation.Validator;
+import picasso.server.common.exception.PaymentAlreadyExistsException;
+import picasso.server.common.exception.PaymentFailedException;
+import picasso.server.domain.domains.repository.PaymentHistoryRepository;
+
+@Slf4j
+@Validator
+@RequiredArgsConstructor
+public class PaymentValidator {
+
+  private final PaymentHistoryRepository paymentHistoryRepository;
+
+  public void isPaymentExists(String merchantUid) {
+    paymentHistoryRepository.findPaymentHistoryByMerchantUid(merchantUid).ifPresent(
+      paymentHistory -> {
+        throw PaymentAlreadyExistsException.EXCEPTION;}
+    );
+  }
+
+  public void isFailedPayment(Boolean payResult) {
+    if (!payResult) {
+      throw PaymentFailedException.EXCEPTION;
+    }
+  }
+}

Api/src/main/java/picasso/server/api/member/controller/AuthController.java → Api/src/main/java/picasso/server/api/user/controller/AuthController.java

@@ -1,22 +1,25 @@
-package picasso.server.api.member.controller;
+package picasso.server.api.user.controller;
 
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import picasso.server.api.member.service.UserService;
+import org.springframework.web.bind.annotation.ResponseBody;
+import picasso.server.api.user.service.UserService;
 import picasso.server.domain.domains.member.entity.User;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
 
 @Controller
-@RequestMapping("/member")
+@RequestMapping("/user")
 public class AuthController {
 
   {
@@ -64,4 +67,15 @@ public String logout(HttpSession session) throws Exception {
     session.invalidate();
     return "redirect:/";
   }
+
+
+  // TODO: 테스트용 Controller 입니다. 추후 삭제 혹은 변경이 필요합니다.
+  @ResponseBody
+  @PostMapping("/session-info")
+  public Map<String, Long> paymentSessionInfoRtn(HttpSession session) {
+    User temp = (User)session.getAttribute("loginUser");
+    return new HashMap<String, Long>(){{
+      put("userId", 1L);
+    }};
+  }
 }

Api/src/main/java/picasso/server/api/member/service/UserService.java → Api/src/main/java/picasso/server/api/user/service/UserService.java

@@ -1,5 +1,5 @@
 
-package picasso.server.api.member.service;
+package picasso.server.api.user.service;
 //
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
@@ -38,11 +38,10 @@ public Optional<User> findUserByEmailAndPassword(String email, String password)
   }
 
   public Optional<User> findUserByNickname(String nickname) {
-    return userRepository.findByNickname(nickname);
+    return userRepository.findByNickName(nickname);
   }
 
   public void deleteUserById(Long id) {
     userRepository.deleteById(id);
   }
-
 }