From 66d149f60d6f6309157c0fcfa0712f54b183b938 Mon Sep 17 00:00:00 2001 From: JuHyeonPark Date: Sat, 27 Jan 2024 21:09:51 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20Trade=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Trade 도메인 분리 --- .../payment/entity/enums/TradeRole.java | 6 ---- .../product/service/ProductService.java | 6 ++-- .../controller/TradeController.java | 18 +++++------ .../dto/request/TradeSaveRequest.java | 6 ++-- .../response/ApprovalTradeInfoResponse.java | 6 ++-- .../response/ApprovalTradePageResponse.java | 2 +- .../ApprovalTradeSummaryResponse.java | 6 ++-- .../response/PurchaseTradeInfoResponse.java | 6 ++-- .../response/PurchaseTradePageResponse.java | 2 +- .../PurchaseTradeSummaryResponse.java | 6 ++-- .../dto/response/TradeIdResponse.java | 4 +-- .../{payment => trade}/entity/Trade.java | 10 +++--- .../domain/trade/entity/enums/TradeRole.java | 6 ++++ .../entity/enums/TradeStatus.java | 2 +- .../repository/TradeRepository.java | 6 ++-- .../service/TradeService.java | 32 +++++++++---------- 16 files changed, 62 insertions(+), 62 deletions(-) delete mode 100644 src/main/java/kr/co/fastcampus/yanabada/domain/payment/entity/enums/TradeRole.java rename src/main/java/kr/co/fastcampus/yanabada/domain/{payment => trade}/controller/TradeController.java (86%) rename src/main/java/kr/co/fastcampus/yanabada/domain/{payment => trade}/dto/request/TradeSaveRequest.java (91%) rename src/main/java/kr/co/fastcampus/yanabada/domain/{payment => trade}/dto/response/ApprovalTradeInfoResponse.java (87%) rename src/main/java/kr/co/fastcampus/yanabada/domain/{payment => trade}/dto/response/ApprovalTradePageResponse.java (92%) rename src/main/java/kr/co/fastcampus/yanabada/domain/{payment => trade}/dto/response/ApprovalTradeSummaryResponse.java (85%) rename src/main/java/kr/co/fastcampus/yanabada/domain/{payment => trade}/dto/response/PurchaseTradeInfoResponse.java (86%) rename src/main/java/kr/co/fastcampus/yanabada/domain/{payment => trade}/dto/response/PurchaseTradePageResponse.java (92%) rename src/main/java/kr/co/fastcampus/yanabada/domain/{payment => trade}/dto/response/PurchaseTradeSummaryResponse.java (87%) rename src/main/java/kr/co/fastcampus/yanabada/domain/{payment => trade}/dto/response/TradeIdResponse.java (66%) rename src/main/java/kr/co/fastcampus/yanabada/domain/{payment => trade}/entity/Trade.java (92%) create mode 100644 src/main/java/kr/co/fastcampus/yanabada/domain/trade/entity/enums/TradeRole.java rename src/main/java/kr/co/fastcampus/yanabada/domain/{payment => trade}/entity/enums/TradeStatus.java (53%) rename src/main/java/kr/co/fastcampus/yanabada/domain/{payment => trade}/repository/TradeRepository.java (86%) rename src/main/java/kr/co/fastcampus/yanabada/domain/{payment => trade}/service/TradeService.java (91%) 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 deleted file mode 100644 index 45948127..00000000 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/entity/enums/TradeRole.java +++ /dev/null @@ -1,6 +0,0 @@ -package kr.co.fastcampus.yanabada.domain.payment.entity.enums; - -public enum TradeRole { - SELLER, - BUYER -} 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 index 9ff781c6..d224da7e 100644 --- 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/src/main/java/kr/co/fastcampus/yanabada/domain/payment/controller/TradeController.java b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/controller/TradeController.java similarity index 86% rename from src/main/java/kr/co/fastcampus/yanabada/domain/payment/controller/TradeController.java rename to src/main/java/kr/co/fastcampus/yanabada/domain/trade/controller/TradeController.java index dfd2438f..127dd658 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/controller/TradeController.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/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/src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/request/TradeSaveRequest.java b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/request/TradeSaveRequest.java similarity index 91% rename from src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/request/TradeSaveRequest.java rename to src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/request/TradeSaveRequest.java index 337f3acd..a75787c6 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/request/TradeSaveRequest.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/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/src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/ApprovalTradeInfoResponse.java b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/response/ApprovalTradeInfoResponse.java similarity index 87% rename from src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/ApprovalTradeInfoResponse.java rename to src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/response/ApprovalTradeInfoResponse.java index 64345c11..a6615e26 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/ApprovalTradeInfoResponse.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/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/src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/ApprovalTradePageResponse.java b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/response/ApprovalTradePageResponse.java similarity index 92% rename from src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/ApprovalTradePageResponse.java rename to src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/response/ApprovalTradePageResponse.java index 0a3fbfda..5939d3a7 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/ApprovalTradePageResponse.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/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/src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/ApprovalTradeSummaryResponse.java b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/response/ApprovalTradeSummaryResponse.java similarity index 85% rename from src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/ApprovalTradeSummaryResponse.java rename to src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/response/ApprovalTradeSummaryResponse.java index 275fb0e9..1ce5a1ab 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/ApprovalTradeSummaryResponse.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/response/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/src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/PurchaseTradeInfoResponse.java b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/response/PurchaseTradeInfoResponse.java similarity index 86% rename from src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/PurchaseTradeInfoResponse.java rename to src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/response/PurchaseTradeInfoResponse.java index c0103526..a151273b 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/PurchaseTradeInfoResponse.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/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/src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/PurchaseTradePageResponse.java b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/response/PurchaseTradePageResponse.java similarity index 92% rename from src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/PurchaseTradePageResponse.java rename to src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/response/PurchaseTradePageResponse.java index 48db9147..f51d9244 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/PurchaseTradePageResponse.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/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/src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/PurchaseTradeSummaryResponse.java b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/response/PurchaseTradeSummaryResponse.java similarity index 87% rename from src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/PurchaseTradeSummaryResponse.java rename to src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/response/PurchaseTradeSummaryResponse.java index 79ff0031..8c3c0f22 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/PurchaseTradeSummaryResponse.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/response/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/src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/TradeIdResponse.java b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/response/TradeIdResponse.java similarity index 66% rename from src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/TradeIdResponse.java rename to src/main/java/kr/co/fastcampus/yanabada/domain/trade/dto/response/TradeIdResponse.java index ab6cf219..3065ca35 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/dto/response/TradeIdResponse.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/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/src/main/java/kr/co/fastcampus/yanabada/domain/payment/entity/Trade.java b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/entity/Trade.java similarity index 92% rename from src/main/java/kr/co/fastcampus/yanabada/domain/payment/entity/Trade.java rename to src/main/java/kr/co/fastcampus/yanabada/domain/trade/entity/Trade.java index 068c8972..05de0342 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/entity/Trade.java +++ b/src/main/java/kr/co/fastcampus/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 new file mode 100644 index 00000000..c82418ad --- /dev/null +++ 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/src/main/java/kr/co/fastcampus/yanabada/domain/payment/entity/enums/TradeStatus.java b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/entity/enums/TradeStatus.java similarity index 53% rename from src/main/java/kr/co/fastcampus/yanabada/domain/payment/entity/enums/TradeStatus.java rename to src/main/java/kr/co/fastcampus/yanabada/domain/trade/entity/enums/TradeStatus.java index d1d904be..29c6ed6b 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/entity/enums/TradeStatus.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/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/src/main/java/kr/co/fastcampus/yanabada/domain/payment/repository/TradeRepository.java b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/repository/TradeRepository.java similarity index 86% rename from src/main/java/kr/co/fastcampus/yanabada/domain/payment/repository/TradeRepository.java rename to src/main/java/kr/co/fastcampus/yanabada/domain/trade/repository/TradeRepository.java index d51741a8..4528a12a 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/repository/TradeRepository.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/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/src/main/java/kr/co/fastcampus/yanabada/domain/payment/service/TradeService.java b/src/main/java/kr/co/fastcampus/yanabada/domain/trade/service/TradeService.java similarity index 91% rename from src/main/java/kr/co/fastcampus/yanabada/domain/payment/service/TradeService.java rename to src/main/java/kr/co/fastcampus/yanabada/domain/trade/service/TradeService.java index 4562e266..313a14c9 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/payment/service/TradeService.java +++ b/src/main/java/kr/co/fastcampus/yanabada/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; From c5f6ccdc62ad978b4463f48608e83e5da7eb9404 Mon Sep 17 00:00:00 2001 From: JuHyeonPark Date: Sat, 27 Jan 2024 21:14:13 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EB=A1=9C=EA=B7=B8=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 불필요한 로그 제거 --- .../co/fastcampus/yanabada/common/jwt/filter/JwtAuthFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 8ddee208..c986cb13 100644 --- 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));