Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 브랜치 병합 - Trade 도메인 분리 #237

Merged
merged 3 commits into from
Jan 27, 2024
Merged

Release 브랜치 병합 - Trade 도메인 분리 #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66d149f
refactor: Trade 도메인 분리
Programmer-may Jan 27, 2024
c5f6ccd
refactor: 불필요한 로그 제거
Programmer-may Jan 27, 2024
dbc1dcf
Merge pull request #236 from Yanabada/feature/235
Programmer-may Jan 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/kr/co/fastcampus/yanabada/common/jwt/filter/JwtAuthFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ protected void doFilterInternal(
/* 로그아웃 된 토큰 사용 */
throw new TokenNotExistAtCacheException();
}
System.out.println("token3 = " + token);

try {
Member findMember = memberRepository
.getMember(email, ProviderType.valueOf(provider));
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/kr/co/fastcampus/yanabada/domain/payment/entity/enums/TradeRole.java
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/main/java/kr/co/fastcampus/yanabada/domain/product/service/ProductService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions ...n/payment/controller/TradeController.java → ...ain/trade/controller/TradeController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...payment/dto/request/TradeSaveRequest.java → ...n/trade/dto/request/TradeSaveRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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(
Expand Down
6 changes: 3 additions & 3 deletions ...o/response/ApprovalTradeInfoResponse.java → ...o/response/ApprovalTradeInfoResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...o/response/ApprovalTradePageResponse.java → ...o/response/ApprovalTradePageResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...esponse/ApprovalTradeSummaryResponse.java → ...esponse/ApprovalTradeSummaryResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...o/response/PurchaseTradeInfoResponse.java → ...o/response/PurchaseTradeInfoResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...o/response/PurchaseTradePageResponse.java → ...o/response/PurchaseTradePageResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...esponse/PurchaseTradeSummaryResponse.java → ...esponse/PurchaseTradeSummaryResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;


Expand Down
4 changes: 2 additions & 2 deletions ...payment/dto/response/TradeIdResponse.java → ...n/trade/dto/response/TradeIdResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions ...yanabada/domain/payment/entity/Trade.java → ...s/yanabada/domain/trade/entity/Trade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/kr/co/fastcampus/yanabada/domain/trade/entity/enums/TradeRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package kr.co.fastcampus.yanabada.domain.trade.entity.enums;

public enum TradeRole {
SELLER,
BUYER
}
2 changes: 1 addition & 1 deletion ...ain/payment/entity/enums/TradeStatus.java → ...omain/trade/entity/enums/TradeStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...n/payment/repository/TradeRepository.java → ...ain/trade/repository/TradeRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
32 changes: 16 additions & 16 deletions .../domain/payment/service/TradeService.java → ...da/domain/trade/service/TradeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
Loading