Merge pull request #236 from Yanabada/feature/235

Trade 도메인 분리
Yanabada · Jan 27, 2024 · dbc1dcf · dbc1dcf
2 parents 9cd9407 + c5f6ccd
commit dbc1dcf
Show file tree

Hide file tree

Showing 17 changed files with 63 additions and 63 deletions.
diff --git a/src/main/java/kr/co/fastcampus/yanabada/common/jwt/filter/JwtAuthFilter.java b/src/main/java/kr/co/fastcampus/yanabada/common/jwt/filter/JwtAuthFilter.java
@@ -55,7 +55,7 @@ protected void doFilterInternal(
             /* 로그아웃 된 토큰 사용 */
             throw new TokenNotExistAtCacheException();
         }
-        System.out.println("token3 = " + token);
+
         try {
             Member findMember = memberRepository
                 .getMember(email, ProviderType.valueOf(provider));

diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/entity/enums/TradeRole.java b/src/main/java/kr/co/fastcampus/yanabada/domain/payment/entity/enums/TradeRole.java
diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/product/service/ProductService.java b/src/main/java/kr/co/fastcampus/yanabada/domain/product/service/ProductService.java
@@ -33,12 +33,9 @@
 import kr.co.fastcampus.yanabada.domain.order.entity.enums.PaymentType;
 import kr.co.fastcampus.yanabada.domain.order.repository.OrderRepository;
 import kr.co.fastcampus.yanabada.domain.payment.entity.AdminPayment;
-import kr.co.fastcampus.yanabada.domain.payment.entity.Trade;
 import kr.co.fastcampus.yanabada.domain.payment.entity.YanoljaPay;
 import kr.co.fastcampus.yanabada.domain.payment.entity.YanoljaPayHistory;
-import kr.co.fastcampus.yanabada.domain.payment.entity.enums.TradeStatus;
 import kr.co.fastcampus.yanabada.domain.payment.repository.AdminPaymentRepository;
-import kr.co.fastcampus.yanabada.domain.payment.repository.TradeRepository;
 import kr.co.fastcampus.yanabada.domain.payment.repository.YanoljaPayHistoryRepository;
 import kr.co.fastcampus.yanabada.domain.payment.repository.YanoljaPayRepository;
 import kr.co.fastcampus.yanabada.domain.product.dto.request.ProductPatchRequest;
@@ -52,6 +49,9 @@
 import kr.co.fastcampus.yanabada.domain.product.entity.Product;
 import kr.co.fastcampus.yanabada.domain.product.entity.enums.ProductStatus;
 import kr.co.fastcampus.yanabada.domain.product.repository.ProductRepository;
+import kr.co.fastcampus.yanabada.domain.trade.entity.Trade;
+import kr.co.fastcampus.yanabada.domain.trade.entity.enums.TradeStatus;
+import kr.co.fastcampus.yanabada.domain.trade.repository.TradeRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

diff --git a/...n/payment/controller/TradeController.java → ...ain/trade/controller/TradeController.java b/...n/payment/controller/TradeController.java → ...ain/trade/controller/TradeController.java
@@ -1,15 +1,15 @@
-package kr.co.fastcampus.yanabada.domain.payment.controller;
+package kr.co.fastcampus.yanabada.domain.trade.controller;
 
 import kr.co.fastcampus.yanabada.common.response.ResponseBody;
 import kr.co.fastcampus.yanabada.common.security.PrincipalDetails;
-import kr.co.fastcampus.yanabada.domain.payment.dto.request.TradeSaveRequest;
-import kr.co.fastcampus.yanabada.domain.payment.dto.response.ApprovalTradeInfoResponse;
-import kr.co.fastcampus.yanabada.domain.payment.dto.response.ApprovalTradePageResponse;
-import kr.co.fastcampus.yanabada.domain.payment.dto.response.PurchaseTradeInfoResponse;
-import kr.co.fastcampus.yanabada.domain.payment.dto.response.PurchaseTradePageResponse;
-import kr.co.fastcampus.yanabada.domain.payment.dto.response.TradeIdResponse;
-import kr.co.fastcampus.yanabada.domain.payment.entity.enums.TradeStatus;
-import kr.co.fastcampus.yanabada.domain.payment.service.TradeService;
+import kr.co.fastcampus.yanabada.domain.trade.dto.request.TradeSaveRequest;
+import kr.co.fastcampus.yanabada.domain.trade.dto.response.ApprovalTradeInfoResponse;
+import kr.co.fastcampus.yanabada.domain.trade.dto.response.ApprovalTradePageResponse;
+import kr.co.fastcampus.yanabada.domain.trade.dto.response.PurchaseTradeInfoResponse;
+import kr.co.fastcampus.yanabada.domain.trade.dto.response.PurchaseTradePageResponse;
+import kr.co.fastcampus.yanabada.domain.trade.dto.response.TradeIdResponse;
+import kr.co.fastcampus.yanabada.domain.trade.entity.enums.TradeStatus;
+import kr.co.fastcampus.yanabada.domain.trade.service.TradeService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Pageable;

diff --git a/...payment/dto/request/TradeSaveRequest.java → ...n/trade/dto/request/TradeSaveRequest.java b/...payment/dto/request/TradeSaveRequest.java → ...n/trade/dto/request/TradeSaveRequest.java
@@ -1,4 +1,4 @@
-package kr.co.fastcampus.yanabada.domain.payment.dto.request;
+package kr.co.fastcampus.yanabada.domain.trade.dto.request;
 
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -9,8 +9,8 @@
 import kr.co.fastcampus.yanabada.common.utils.PayFeeCalculator;
 import kr.co.fastcampus.yanabada.domain.member.entity.Member;
 import kr.co.fastcampus.yanabada.domain.order.entity.enums.PaymentType;
-import kr.co.fastcampus.yanabada.domain.payment.entity.Trade;
-import kr.co.fastcampus.yanabada.domain.payment.entity.enums.TradeStatus;
+import kr.co.fastcampus.yanabada.domain.trade.entity.Trade;
+import kr.co.fastcampus.yanabada.domain.trade.entity.enums.TradeStatus;
 import kr.co.fastcampus.yanabada.domain.product.entity.Product;
 
 public record TradeSaveRequest(

diff --git a/...o/response/ApprovalTradeInfoResponse.java → ...o/response/ApprovalTradeInfoResponse.java b/...o/response/ApprovalTradeInfoResponse.java → ...o/response/ApprovalTradeInfoResponse.java
@@ -1,10 +1,10 @@
-package kr.co.fastcampus.yanabada.domain.payment.dto.response;
+package kr.co.fastcampus.yanabada.domain.trade.dto.response;
 
 import java.time.LocalDateTime;
 import kr.co.fastcampus.yanabada.domain.accommodation.entity.Accommodation;
 import kr.co.fastcampus.yanabada.domain.accommodation.entity.Room;
-import kr.co.fastcampus.yanabada.domain.payment.entity.Trade;
-import kr.co.fastcampus.yanabada.domain.payment.entity.enums.TradeStatus;
+import kr.co.fastcampus.yanabada.domain.trade.entity.Trade;
+import kr.co.fastcampus.yanabada.domain.trade.entity.enums.TradeStatus;
 import kr.co.fastcampus.yanabada.domain.product.entity.Product;
 import lombok.Builder;
 

diff --git a/...o/response/ApprovalTradePageResponse.java → ...o/response/ApprovalTradePageResponse.java b/...o/response/ApprovalTradePageResponse.java → ...o/response/ApprovalTradePageResponse.java
@@ -1,4 +1,4 @@
-package kr.co.fastcampus.yanabada.domain.payment.dto.response;
+package kr.co.fastcampus.yanabada.domain.trade.dto.response;
 
 import java.util.List;
 import lombok.Builder;

diff --git a/...esponse/ApprovalTradeSummaryResponse.java → ...esponse/ApprovalTradeSummaryResponse.java b/...esponse/ApprovalTradeSummaryResponse.java → ...esponse/ApprovalTradeSummaryResponse.java
@@ -1,9 +1,9 @@
-package kr.co.fastcampus.yanabada.domain.payment.dto.response;
+package kr.co.fastcampus.yanabada.domain.trade.dto.response;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.time.LocalDateTime;
-import kr.co.fastcampus.yanabada.domain.payment.entity.Trade;
-import kr.co.fastcampus.yanabada.domain.payment.entity.enums.TradeStatus;
+import kr.co.fastcampus.yanabada.domain.trade.entity.Trade;
+import kr.co.fastcampus.yanabada.domain.trade.entity.enums.TradeStatus;
 import lombok.Builder;
 
 @Builder

diff --git a/...o/response/PurchaseTradeInfoResponse.java → ...o/response/PurchaseTradeInfoResponse.java b/...o/response/PurchaseTradeInfoResponse.java → ...o/response/PurchaseTradeInfoResponse.java
@@ -1,9 +1,9 @@
-package kr.co.fastcampus.yanabada.domain.payment.dto.response;
+package kr.co.fastcampus.yanabada.domain.trade.dto.response;
 
 import java.time.LocalDateTime;
 import kr.co.fastcampus.yanabada.domain.order.entity.enums.PaymentType;
-import kr.co.fastcampus.yanabada.domain.payment.entity.Trade;
-import kr.co.fastcampus.yanabada.domain.payment.entity.enums.TradeStatus;
+import kr.co.fastcampus.yanabada.domain.trade.entity.Trade;
+import kr.co.fastcampus.yanabada.domain.trade.entity.enums.TradeStatus;
 import kr.co.fastcampus.yanabada.domain.product.dto.response.ProductSummaryResponse;
 import kr.co.fastcampus.yanabada.domain.product.entity.Product;
 import lombok.Builder;

diff --git a/...o/response/PurchaseTradePageResponse.java → ...o/response/PurchaseTradePageResponse.java b/...o/response/PurchaseTradePageResponse.java → ...o/response/PurchaseTradePageResponse.java
@@ -1,4 +1,4 @@
-package kr.co.fastcampus.yanabada.domain.payment.dto.response;
+package kr.co.fastcampus.yanabada.domain.trade.dto.response;
 
 import java.util.List;
 import lombok.Builder;

diff --git a/...esponse/PurchaseTradeSummaryResponse.java → ...esponse/PurchaseTradeSummaryResponse.java b/...esponse/PurchaseTradeSummaryResponse.java → ...esponse/PurchaseTradeSummaryResponse.java
@@ -1,10 +1,10 @@
-package kr.co.fastcampus.yanabada.domain.payment.dto.response;
+package kr.co.fastcampus.yanabada.domain.trade.dto.response;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import kr.co.fastcampus.yanabada.domain.payment.entity.Trade;
-import kr.co.fastcampus.yanabada.domain.payment.entity.enums.TradeStatus;
+import kr.co.fastcampus.yanabada.domain.trade.entity.Trade;
+import kr.co.fastcampus.yanabada.domain.trade.entity.enums.TradeStatus;
 import lombok.Builder;
 
 

diff --git a/...payment/dto/response/TradeIdResponse.java → ...n/trade/dto/response/TradeIdResponse.java b/...payment/dto/response/TradeIdResponse.java → ...n/trade/dto/response/TradeIdResponse.java
@@ -1,6 +1,6 @@
-package kr.co.fastcampus.yanabada.domain.payment.dto.response;
+package kr.co.fastcampus.yanabada.domain.trade.dto.response;
 
-import kr.co.fastcampus.yanabada.domain.payment.entity.Trade;
+import kr.co.fastcampus.yanabada.domain.trade.entity.Trade;
 import lombok.Builder;
 
 @Builder

diff --git a/...yanabada/domain/payment/entity/Trade.java → ...s/yanabada/domain/trade/entity/Trade.java b/...yanabada/domain/payment/entity/Trade.java → ...s/yanabada/domain/trade/entity/Trade.java
@@ -1,8 +1,8 @@
-package kr.co.fastcampus.yanabada.domain.payment.entity;
+package kr.co.fastcampus.yanabada.domain.trade.entity;
 
-import static kr.co.fastcampus.yanabada.domain.payment.entity.enums.TradeStatus.CANCELED;
-import static kr.co.fastcampus.yanabada.domain.payment.entity.enums.TradeStatus.COMPLETED;
-import static kr.co.fastcampus.yanabada.domain.payment.entity.enums.TradeStatus.REJECTED;
+import static kr.co.fastcampus.yanabada.domain.trade.entity.enums.TradeStatus.CANCELED;
+import static kr.co.fastcampus.yanabada.domain.trade.entity.enums.TradeStatus.COMPLETED;
+import static kr.co.fastcampus.yanabada.domain.trade.entity.enums.TradeStatus.REJECTED;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -19,7 +19,7 @@
 import kr.co.fastcampus.yanabada.common.baseentity.BaseEntity;
 import kr.co.fastcampus.yanabada.domain.member.entity.Member;
 import kr.co.fastcampus.yanabada.domain.order.entity.enums.PaymentType;
-import kr.co.fastcampus.yanabada.domain.payment.entity.enums.TradeStatus;
+import kr.co.fastcampus.yanabada.domain.trade.entity.enums.TradeStatus;
 import kr.co.fastcampus.yanabada.domain.product.entity.Product;
 import lombok.AccessLevel;
 import lombok.Getter;

diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/trade/entity/enums/TradeRole.java b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/entity/enums/TradeRole.java
@@ -0,0 +1,6 @@
+package kr.co.fastcampus.yanabada.domain.trade.entity.enums;
+
+public enum TradeRole {
+    SELLER,
+    BUYER
+}
diff --git a/...ain/payment/entity/enums/TradeStatus.java → ...omain/trade/entity/enums/TradeStatus.java b/...ain/payment/entity/enums/TradeStatus.java → ...omain/trade/entity/enums/TradeStatus.java
@@ -1,4 +1,4 @@
-package kr.co.fastcampus.yanabada.domain.payment.entity.enums;
+package kr.co.fastcampus.yanabada.domain.trade.entity.enums;
 
 public enum TradeStatus {
     WAITING, COMPLETED, CANCELED, REJECTED

diff --git a/...n/payment/repository/TradeRepository.java → ...ain/trade/repository/TradeRepository.java b/...n/payment/repository/TradeRepository.java → ...ain/trade/repository/TradeRepository.java
@@ -1,12 +1,12 @@
-package kr.co.fastcampus.yanabada.domain.payment.repository;
+package kr.co.fastcampus.yanabada.domain.trade.repository;
 
 import java.util.List;
 import java.util.Optional;
 import kr.co.fastcampus.yanabada.common.exception.TradeNotFoundException;
 import kr.co.fastcampus.yanabada.domain.member.entity.Member;
-import kr.co.fastcampus.yanabada.domain.payment.entity.Trade;
-import kr.co.fastcampus.yanabada.domain.payment.entity.enums.TradeStatus;
 import kr.co.fastcampus.yanabada.domain.product.entity.Product;
+import kr.co.fastcampus.yanabada.domain.trade.entity.Trade;
+import kr.co.fastcampus.yanabada.domain.trade.entity.enums.TradeStatus;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

diff --git a/.../domain/payment/service/TradeService.java → ...da/domain/trade/service/TradeService.java b/.../domain/payment/service/TradeService.java → ...da/domain/trade/service/TradeService.java
@@ -1,14 +1,14 @@
-package kr.co.fastcampus.yanabada.domain.payment.service;
+package kr.co.fastcampus.yanabada.domain.trade.service;
 
 import static kr.co.fastcampus.yanabada.domain.order.entity.enums.PaymentType.YANOLJA_PAY;
 import static kr.co.fastcampus.yanabada.domain.payment.entity.enums.ContentsType.PURCHASE;
 import static kr.co.fastcampus.yanabada.domain.payment.entity.enums.ContentsType.REFUND;
 import static kr.co.fastcampus.yanabada.domain.payment.entity.enums.ContentsType.SALE;
-import static kr.co.fastcampus.yanabada.domain.payment.entity.enums.TradeRole.BUYER;
-import static kr.co.fastcampus.yanabada.domain.payment.entity.enums.TradeRole.SELLER;
-import static kr.co.fastcampus.yanabada.domain.payment.entity.enums.TradeStatus.WAITING;
 import static kr.co.fastcampus.yanabada.domain.payment.entity.enums.TransactionType.DEPOSIT;
 import static kr.co.fastcampus.yanabada.domain.payment.entity.enums.TransactionType.WITHDRAW;
+import static kr.co.fastcampus.yanabada.domain.trade.entity.enums.TradeRole.BUYER;
+import static kr.co.fastcampus.yanabada.domain.trade.entity.enums.TradeRole.SELLER;
+import static kr.co.fastcampus.yanabada.domain.trade.entity.enums.TradeStatus.WAITING;
 
 import java.time.LocalDateTime;
 import java.util.Objects;
@@ -30,27 +30,27 @@
 import kr.co.fastcampus.yanabada.domain.order.entity.enums.OrderStatus;
 import kr.co.fastcampus.yanabada.domain.order.entity.enums.PaymentType;
 import kr.co.fastcampus.yanabada.domain.order.repository.OrderRepository;
-import kr.co.fastcampus.yanabada.domain.payment.dto.request.TradeSaveRequest;
-import kr.co.fastcampus.yanabada.domain.payment.dto.response.ApprovalTradeInfoResponse;
-import kr.co.fastcampus.yanabada.domain.payment.dto.response.ApprovalTradePageResponse;
-import kr.co.fastcampus.yanabada.domain.payment.dto.response.ApprovalTradeSummaryResponse;
-import kr.co.fastcampus.yanabada.domain.payment.dto.response.PurchaseTradeInfoResponse;
-import kr.co.fastcampus.yanabada.domain.payment.dto.response.PurchaseTradePageResponse;
-import kr.co.fastcampus.yanabada.domain.payment.dto.response.PurchaseTradeSummaryResponse;
-import kr.co.fastcampus.yanabada.domain.payment.dto.response.TradeIdResponse;
 import kr.co.fastcampus.yanabada.domain.payment.entity.AdminPayment;
-import kr.co.fastcampus.yanabada.domain.payment.entity.Trade;
 import kr.co.fastcampus.yanabada.domain.payment.entity.YanoljaPay;
 import kr.co.fastcampus.yanabada.domain.payment.entity.YanoljaPayHistory;
-import kr.co.fastcampus.yanabada.domain.payment.entity.enums.TradeRole;
-import kr.co.fastcampus.yanabada.domain.payment.entity.enums.TradeStatus;
 import kr.co.fastcampus.yanabada.domain.payment.repository.AdminPaymentRepository;
-import kr.co.fastcampus.yanabada.domain.payment.repository.TradeRepository;
 import kr.co.fastcampus.yanabada.domain.payment.repository.YanoljaPayHistoryRepository;
 import kr.co.fastcampus.yanabada.domain.payment.repository.YanoljaPayRepository;
 import kr.co.fastcampus.yanabada.domain.product.entity.Product;
 import kr.co.fastcampus.yanabada.domain.product.entity.enums.ProductStatus;
 import kr.co.fastcampus.yanabada.domain.product.repository.ProductRepository;
+import kr.co.fastcampus.yanabada.domain.trade.dto.request.TradeSaveRequest;
+import kr.co.fastcampus.yanabada.domain.trade.dto.response.ApprovalTradeInfoResponse;
+import kr.co.fastcampus.yanabada.domain.trade.dto.response.ApprovalTradePageResponse;
+import kr.co.fastcampus.yanabada.domain.trade.dto.response.ApprovalTradeSummaryResponse;
+import kr.co.fastcampus.yanabada.domain.trade.dto.response.PurchaseTradeInfoResponse;
+import kr.co.fastcampus.yanabada.domain.trade.dto.response.PurchaseTradePageResponse;
+import kr.co.fastcampus.yanabada.domain.trade.dto.response.PurchaseTradeSummaryResponse;
+import kr.co.fastcampus.yanabada.domain.trade.dto.response.TradeIdResponse;
+import kr.co.fastcampus.yanabada.domain.trade.entity.Trade;
+import kr.co.fastcampus.yanabada.domain.trade.entity.enums.TradeRole;
+import kr.co.fastcampus.yanabada.domain.trade.entity.enums.TradeStatus;
+import kr.co.fastcampus.yanabada.domain.trade.repository.TradeRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;