From d4980c5365848552487421e8fe02713dc2cf0e36 Mon Sep 17 00:00:00 2001 From: WoeunJung Date: Mon, 16 Oct 2023 21:56:45 +0900 Subject: [PATCH] refactor: quotation folder move to main MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - match 폴더에 있던 quotation 폴더 옮김 --- .../kakao/sunsuwedding/{match => }/Quotation/Quotation.java | 2 +- .../{match => }/Quotation/QuotationDTOConverter.java | 2 +- .../{match => }/Quotation/QuotationJPARepository.java | 2 +- .../{match => }/Quotation/QuotationRequest.java | 2 +- .../{match => }/Quotation/QuotationResponse.java | 2 +- .../{match => }/Quotation/QuotationRestController.java | 2 +- .../{match => }/Quotation/QuotationService.java | 2 +- .../sunsuwedding/{match => }/Quotation/QuotationStatus.java | 2 +- .../com/kakao/sunsuwedding/_core/utils/PriceCalculator.java | 4 ++-- .../com/kakao/sunsuwedding/match/MatchRestController.java | 1 - .../java/com/kakao/sunsuwedding/match/MatchService.java | 6 +++--- .../kakao/sunsuwedding/portfolio/PortfolioDTOConverter.java | 2 +- .../com/kakao/sunsuwedding/portfolio/PortfolioService.java | 4 ++-- .../sunsuwedding/quotation/QuotationRepositoryTest.java | 6 +++--- .../sunsuwedding/quotation/QuotationRestControllerTest.java | 2 +- 15 files changed, 20 insertions(+), 21 deletions(-) rename sunsu-wedding/src/main/java/com/kakao/sunsuwedding/{match => }/Quotation/Quotation.java (98%) rename sunsu-wedding/src/main/java/com/kakao/sunsuwedding/{match => }/Quotation/QuotationDTOConverter.java (91%) rename sunsu-wedding/src/main/java/com/kakao/sunsuwedding/{match => }/Quotation/QuotationJPARepository.java (92%) rename sunsu-wedding/src/main/java/com/kakao/sunsuwedding/{match => }/Quotation/QuotationRequest.java (96%) rename sunsu-wedding/src/main/java/com/kakao/sunsuwedding/{match => }/Quotation/QuotationResponse.java (91%) rename sunsu-wedding/src/main/java/com/kakao/sunsuwedding/{match => }/Quotation/QuotationRestController.java (98%) rename sunsu-wedding/src/main/java/com/kakao/sunsuwedding/{match => }/Quotation/QuotationService.java (99%) rename sunsu-wedding/src/main/java/com/kakao/sunsuwedding/{match => }/Quotation/QuotationStatus.java (83%) diff --git a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/Quotation.java b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/Quotation.java similarity index 98% rename from sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/Quotation.java rename to sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/Quotation.java index 4696f332..58d2b9a3 100644 --- a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/Quotation.java +++ b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/Quotation.java @@ -1,4 +1,4 @@ -package com.kakao.sunsuwedding.match.Quotation; +package com.kakao.sunsuwedding.Quotation; import com.kakao.sunsuwedding.match.Match; import jakarta.persistence.*; diff --git a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationDTOConverter.java b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationDTOConverter.java similarity index 91% rename from sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationDTOConverter.java rename to sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationDTOConverter.java index b739602a..8a9eb581 100644 --- a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationDTOConverter.java +++ b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationDTOConverter.java @@ -1,4 +1,4 @@ -package com.kakao.sunsuwedding.match.Quotation; +package com.kakao.sunsuwedding.Quotation; import java.util.List; diff --git a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationJPARepository.java b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationJPARepository.java similarity index 92% rename from sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationJPARepository.java rename to sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationJPARepository.java index b7b311d1..32b38ad8 100644 --- a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationJPARepository.java +++ b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationJPARepository.java @@ -1,4 +1,4 @@ -package com.kakao.sunsuwedding.match.Quotation; +package com.kakao.sunsuwedding.Quotation; import com.kakao.sunsuwedding.match.Match; import org.springframework.data.jpa.repository.EntityGraph; diff --git a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationRequest.java b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationRequest.java similarity index 96% rename from sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationRequest.java rename to sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationRequest.java index c5db6422..7e748248 100644 --- a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationRequest.java +++ b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationRequest.java @@ -1,4 +1,4 @@ -package com.kakao.sunsuwedding.match.Quotation; +package com.kakao.sunsuwedding.Quotation; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; diff --git a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationResponse.java b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationResponse.java similarity index 91% rename from sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationResponse.java rename to sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationResponse.java index 9fc25834..5a6b320e 100644 --- a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationResponse.java +++ b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationResponse.java @@ -1,4 +1,4 @@ -package com.kakao.sunsuwedding.match.Quotation; +package com.kakao.sunsuwedding.Quotation; import java.time.LocalDateTime; import java.util.List; diff --git a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationRestController.java b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationRestController.java similarity index 98% rename from sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationRestController.java rename to sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationRestController.java index 87572a36..88cc0411 100644 --- a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationRestController.java +++ b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationRestController.java @@ -1,4 +1,4 @@ -package com.kakao.sunsuwedding.match.Quotation; +package com.kakao.sunsuwedding.Quotation; import com.kakao.sunsuwedding._core.security.CustomUserDetails; import com.kakao.sunsuwedding._core.utils.ApiUtils; diff --git a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationService.java b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationService.java similarity index 99% rename from sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationService.java rename to sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationService.java index eb026666..860a1d6e 100644 --- a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationService.java +++ b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationService.java @@ -1,4 +1,4 @@ -package com.kakao.sunsuwedding.match.Quotation; +package com.kakao.sunsuwedding.Quotation; import com.kakao.sunsuwedding._core.errors.BaseException; import com.kakao.sunsuwedding._core.errors.exception.ForbiddenException; diff --git a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationStatus.java b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationStatus.java similarity index 83% rename from sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationStatus.java rename to sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationStatus.java index d7d4bb9f..18fc07d0 100644 --- a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/Quotation/QuotationStatus.java +++ b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/Quotation/QuotationStatus.java @@ -1,4 +1,4 @@ -package com.kakao.sunsuwedding.match.Quotation; +package com.kakao.sunsuwedding.Quotation; import lombok.RequiredArgsConstructor; diff --git a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/_core/utils/PriceCalculator.java b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/_core/utils/PriceCalculator.java index 342df2a9..8bf8eb23 100644 --- a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/_core/utils/PriceCalculator.java +++ b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/_core/utils/PriceCalculator.java @@ -2,8 +2,8 @@ import com.kakao.sunsuwedding.match.Match; import com.kakao.sunsuwedding.match.MatchStatus; -import com.kakao.sunsuwedding.match.Quotation.Quotation; -import com.kakao.sunsuwedding.match.Quotation.QuotationStatus; +import com.kakao.sunsuwedding.Quotation.Quotation; +import com.kakao.sunsuwedding.Quotation.QuotationStatus; import com.kakao.sunsuwedding.portfolio.PortfolioResponse; import java.util.List; diff --git a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/MatchRestController.java b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/MatchRestController.java index c4cd5581..29580151 100644 --- a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/MatchRestController.java +++ b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/MatchRestController.java @@ -2,7 +2,6 @@ import com.kakao.sunsuwedding._core.security.CustomUserDetails; import com.kakao.sunsuwedding._core.utils.ApiUtils; -import com.kakao.sunsuwedding.match.Quotation.QuotationRequest; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; diff --git a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/MatchService.java b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/MatchService.java index 989d56d9..0f9ccfa3 100644 --- a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/MatchService.java +++ b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/match/MatchService.java @@ -5,9 +5,9 @@ import com.kakao.sunsuwedding._core.errors.exception.ForbiddenException; import com.kakao.sunsuwedding._core.errors.exception.NotFoundException; import com.kakao.sunsuwedding._core.utils.PriceCalculator; -import com.kakao.sunsuwedding.match.Quotation.Quotation; -import com.kakao.sunsuwedding.match.Quotation.QuotationJPARepository; -import com.kakao.sunsuwedding.match.Quotation.QuotationStatus; +import com.kakao.sunsuwedding.Quotation.Quotation; +import com.kakao.sunsuwedding.Quotation.QuotationJPARepository; +import com.kakao.sunsuwedding.Quotation.QuotationStatus; import com.kakao.sunsuwedding.portfolio.PortfolioService; import com.kakao.sunsuwedding.user.constant.Role; import com.kakao.sunsuwedding.user.couple.Couple; diff --git a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/portfolio/PortfolioDTOConverter.java b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/portfolio/PortfolioDTOConverter.java index 0dae652c..47df0ed3 100644 --- a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/portfolio/PortfolioDTOConverter.java +++ b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/portfolio/PortfolioDTOConverter.java @@ -2,7 +2,7 @@ import com.kakao.sunsuwedding._core.utils.PriceCalculator; import com.kakao.sunsuwedding.match.Match; -import com.kakao.sunsuwedding.match.Quotation.Quotation; +import com.kakao.sunsuwedding.Quotation.Quotation; import com.kakao.sunsuwedding.portfolio.price.PriceItem; import com.kakao.sunsuwedding.user.planner.Planner; diff --git a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/portfolio/PortfolioService.java b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/portfolio/PortfolioService.java index 62d80e48..7226bcc9 100644 --- a/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/portfolio/PortfolioService.java +++ b/sunsu-wedding/src/main/java/com/kakao/sunsuwedding/portfolio/PortfolioService.java @@ -6,8 +6,8 @@ import com.kakao.sunsuwedding._core.errors.exception.NotFoundException; import com.kakao.sunsuwedding.match.Match; import com.kakao.sunsuwedding.match.MatchJPARepository; -import com.kakao.sunsuwedding.match.Quotation.Quotation; -import com.kakao.sunsuwedding.match.Quotation.QuotationJPARepository; +import com.kakao.sunsuwedding.Quotation.Quotation; +import com.kakao.sunsuwedding.Quotation.QuotationJPARepository; import com.kakao.sunsuwedding.portfolio.cursor.CursorRequest; import com.kakao.sunsuwedding.portfolio.cursor.PageCursor; import com.kakao.sunsuwedding.portfolio.image.ImageEncoder; diff --git a/sunsu-wedding/src/test/java/com/kakao/sunsuwedding/quotation/QuotationRepositoryTest.java b/sunsu-wedding/src/test/java/com/kakao/sunsuwedding/quotation/QuotationRepositoryTest.java index 3bd74343..782ae6c1 100644 --- a/sunsu-wedding/src/test/java/com/kakao/sunsuwedding/quotation/QuotationRepositoryTest.java +++ b/sunsu-wedding/src/test/java/com/kakao/sunsuwedding/quotation/QuotationRepositoryTest.java @@ -1,8 +1,8 @@ package com.kakao.sunsuwedding.quotation; -import com.kakao.sunsuwedding.match.Quotation.Quotation; -import com.kakao.sunsuwedding.match.Quotation.QuotationJPARepository; -import com.kakao.sunsuwedding.match.Quotation.QuotationStatus; +import com.kakao.sunsuwedding.Quotation.Quotation; +import com.kakao.sunsuwedding.Quotation.QuotationJPARepository; +import com.kakao.sunsuwedding.Quotation.QuotationStatus; import jakarta.persistence.EntityManager; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/sunsu-wedding/src/test/java/com/kakao/sunsuwedding/quotation/QuotationRestControllerTest.java b/sunsu-wedding/src/test/java/com/kakao/sunsuwedding/quotation/QuotationRestControllerTest.java index 2d01f780..2cc13c49 100644 --- a/sunsu-wedding/src/test/java/com/kakao/sunsuwedding/quotation/QuotationRestControllerTest.java +++ b/sunsu-wedding/src/test/java/com/kakao/sunsuwedding/quotation/QuotationRestControllerTest.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.kakao.sunsuwedding._core.security.JWTProvider; import com.kakao.sunsuwedding._core.security.SecurityConfig; -import com.kakao.sunsuwedding.match.Quotation.QuotationRequest; +import com.kakao.sunsuwedding.Quotation.QuotationRequest; import com.kakao.sunsuwedding.user.UserRequest; import com.kakao.sunsuwedding.user.UserService; import com.kakao.sunsuwedding.user.token.TokenDTO;