diff --git a/src/main/java/umc/th/juinjang/controller/OAuthController.java b/src/main/java/umc/th/juinjang/api/auth/controller/OAuthController.java similarity index 87% rename from src/main/java/umc/th/juinjang/controller/OAuthController.java rename to src/main/java/umc/th/juinjang/api/auth/controller/OAuthController.java index 8085b852..1c3ef76b 100644 --- a/src/main/java/umc/th/juinjang/controller/OAuthController.java +++ b/src/main/java/umc/th/juinjang/api/auth/controller/OAuthController.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.controller; +package umc.th.juinjang.api.auth.controller; import io.micrometer.common.lang.Nullable; import jakarta.servlet.http.HttpServletRequest; @@ -8,23 +8,23 @@ import org.springframework.util.StringUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import umc.th.juinjang.apiPayload.ApiResponse; -import umc.th.juinjang.apiPayload.ExceptionHandler; -import umc.th.juinjang.apiPayload.code.status.SuccessStatus; -import umc.th.juinjang.model.dto.auth.LoginResponseDto; -import umc.th.juinjang.model.dto.auth.LoginResponseVersion2Dto; -import umc.th.juinjang.model.dto.auth.WithdrawReasonRequestDto; -import umc.th.juinjang.model.dto.auth.apple.AppleLoginRequestDto; -import umc.th.juinjang.model.dto.auth.apple.AppleSignUpRequestDto; -import umc.th.juinjang.model.dto.auth.apple.AppleSignUpRequestVersion2Dto; -import umc.th.juinjang.model.dto.auth.kakao.KakaoLoginRequestDto; -import umc.th.juinjang.model.dto.auth.kakao.KakaoSignUpRequestDto; -import umc.th.juinjang.model.dto.auth.kakao.KakaoSignUpRequestVersion2Dto; -import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.service.withdraw.WithdrawService; -import umc.th.juinjang.service.auth.OAuthService; - -import static umc.th.juinjang.apiPayload.code.status.ErrorStatus.*; +import umc.th.juinjang.api.dto.ApiResponse; +import umc.th.juinjang.common.ExceptionHandler; +import umc.th.juinjang.common.code.status.SuccessStatus; +import umc.th.juinjang.api.auth.service.response.LoginResponseDto; +import umc.th.juinjang.api.auth.service.response.LoginResponseVersion2Dto; +import umc.th.juinjang.api.auth.controller.request.WithdrawReasonRequestDto; +import umc.th.juinjang.api.auth.controller.request.AppleLoginRequestDto; +import umc.th.juinjang.api.auth.controller.request.AppleSignUpRequestDto; +import umc.th.juinjang.api.auth.controller.request.AppleSignUpRequestVersion2Dto; +import umc.th.juinjang.api.auth.controller.request.KakaoLoginRequestDto; +import umc.th.juinjang.api.auth.controller.request.KakaoSignUpRequestDto; +import umc.th.juinjang.api.auth.controller.request.KakaoSignUpRequestVersion2Dto; +import umc.th.juinjang.domain.member.model.Member; +import umc.th.juinjang.api.auth.service.WithdrawService; +import umc.th.juinjang.api.auth.service.OAuthService; + +import static umc.th.juinjang.common.code.status.ErrorStatus.*; @Slf4j @RestController diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleInfo.java b/src/main/java/umc/th/juinjang/api/auth/controller/request/AppleInfo.java similarity index 85% rename from src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleInfo.java rename to src/main/java/umc/th/juinjang/api/auth/controller/request/AppleInfo.java index 8f0cf017..8e0b6d2d 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleInfo.java +++ b/src/main/java/umc/th/juinjang/api/auth/controller/request/AppleInfo.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.auth.apple; +package umc.th.juinjang.api.auth.controller.request; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleLoginRequestDto.java b/src/main/java/umc/th/juinjang/api/auth/controller/request/AppleLoginRequestDto.java similarity index 86% rename from src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleLoginRequestDto.java rename to src/main/java/umc/th/juinjang/api/auth/controller/request/AppleLoginRequestDto.java index f867efd4..a44b8267 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleLoginRequestDto.java +++ b/src/main/java/umc/th/juinjang/api/auth/controller/request/AppleLoginRequestDto.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.auth.apple; +package umc.th.juinjang.api.auth.controller.request; import jakarta.validation.constraints.NotEmpty; import lombok.AccessLevel; diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleSignUpRequestDto.java b/src/main/java/umc/th/juinjang/api/auth/controller/request/AppleSignUpRequestDto.java similarity index 85% rename from src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleSignUpRequestDto.java rename to src/main/java/umc/th/juinjang/api/auth/controller/request/AppleSignUpRequestDto.java index 4dcf9d83..55b9da93 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleSignUpRequestDto.java +++ b/src/main/java/umc/th/juinjang/api/auth/controller/request/AppleSignUpRequestDto.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.auth.apple; +package umc.th.juinjang.api.auth.controller.request; import jakarta.validation.constraints.NotEmpty; import lombok.AccessLevel; diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleSignUpRequestVersion2Dto.java b/src/main/java/umc/th/juinjang/api/auth/controller/request/AppleSignUpRequestVersion2Dto.java similarity index 87% rename from src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleSignUpRequestVersion2Dto.java rename to src/main/java/umc/th/juinjang/api/auth/controller/request/AppleSignUpRequestVersion2Dto.java index 786e9bf8..0f48eb78 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleSignUpRequestVersion2Dto.java +++ b/src/main/java/umc/th/juinjang/api/auth/controller/request/AppleSignUpRequestVersion2Dto.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.auth.apple; +package umc.th.juinjang.api.auth.controller.request; import jakarta.validation.constraints.NotEmpty; import lombok.AccessLevel; diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleTokenRequest.java b/src/main/java/umc/th/juinjang/api/auth/controller/request/AppleTokenRequest.java similarity index 83% rename from src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleTokenRequest.java rename to src/main/java/umc/th/juinjang/api/auth/controller/request/AppleTokenRequest.java index a214dc59..9b44f6bd 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleTokenRequest.java +++ b/src/main/java/umc/th/juinjang/api/auth/controller/request/AppleTokenRequest.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.auth.apple; +package umc.th.juinjang.api.auth.controller.request; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/kakao/KakaoLoginRequestDto.java b/src/main/java/umc/th/juinjang/api/auth/controller/request/KakaoLoginRequestDto.java similarity index 85% rename from src/main/java/umc/th/juinjang/model/dto/auth/kakao/KakaoLoginRequestDto.java rename to src/main/java/umc/th/juinjang/api/auth/controller/request/KakaoLoginRequestDto.java index b5fed16e..b0edd626 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/kakao/KakaoLoginRequestDto.java +++ b/src/main/java/umc/th/juinjang/api/auth/controller/request/KakaoLoginRequestDto.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.auth.kakao; +package umc.th.juinjang.api.auth.controller.request; import jakarta.validation.constraints.NotEmpty; import lombok.AccessLevel; diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/kakao/KakaoSignUpRequestDto.java b/src/main/java/umc/th/juinjang/api/auth/controller/request/KakaoSignUpRequestDto.java similarity index 88% rename from src/main/java/umc/th/juinjang/model/dto/auth/kakao/KakaoSignUpRequestDto.java rename to src/main/java/umc/th/juinjang/api/auth/controller/request/KakaoSignUpRequestDto.java index dc1cc211..74a21922 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/kakao/KakaoSignUpRequestDto.java +++ b/src/main/java/umc/th/juinjang/api/auth/controller/request/KakaoSignUpRequestDto.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.auth.kakao; +package umc.th.juinjang.api.auth.controller.request; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/kakao/KakaoSignUpRequestVersion2Dto.java b/src/main/java/umc/th/juinjang/api/auth/controller/request/KakaoSignUpRequestVersion2Dto.java similarity index 88% rename from src/main/java/umc/th/juinjang/model/dto/auth/kakao/KakaoSignUpRequestVersion2Dto.java rename to src/main/java/umc/th/juinjang/api/auth/controller/request/KakaoSignUpRequestVersion2Dto.java index a3fe3057..6f555bcc 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/kakao/KakaoSignUpRequestVersion2Dto.java +++ b/src/main/java/umc/th/juinjang/api/auth/controller/request/KakaoSignUpRequestVersion2Dto.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.auth.kakao; +package umc.th.juinjang.api.auth.controller.request; import jakarta.validation.constraints.NotEmpty; import lombok.AccessLevel; diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/WithdrawReasonRequestDto.java b/src/main/java/umc/th/juinjang/api/auth/controller/request/WithdrawReasonRequestDto.java similarity index 84% rename from src/main/java/umc/th/juinjang/model/dto/auth/WithdrawReasonRequestDto.java rename to src/main/java/umc/th/juinjang/api/auth/controller/request/WithdrawReasonRequestDto.java index 1cfed88d..3afc37f1 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/WithdrawReasonRequestDto.java +++ b/src/main/java/umc/th/juinjang/api/auth/controller/request/WithdrawReasonRequestDto.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.auth; +package umc.th.juinjang.api.auth.controller.request; import jakarta.validation.constraints.NotEmpty; import lombok.AccessLevel; diff --git a/src/main/java/umc/th/juinjang/service/auth/OAuthService.java b/src/main/java/umc/th/juinjang/api/auth/service/OAuthService.java similarity index 92% rename from src/main/java/umc/th/juinjang/service/auth/OAuthService.java rename to src/main/java/umc/th/juinjang/api/auth/service/OAuthService.java index 6641f694..3084865e 100644 --- a/src/main/java/umc/th/juinjang/service/auth/OAuthService.java +++ b/src/main/java/umc/th/juinjang/api/auth/service/OAuthService.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.auth; +package umc.th.juinjang.api.auth.service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -7,31 +7,37 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Value; import org.springframework.transaction.annotation.Transactional; -import umc.th.juinjang.apiPayload.ExceptionHandler; -import umc.th.juinjang.apiPayload.exception.handler.MemberHandler; -import umc.th.juinjang.controller.KakaoUnlinkClient; +import umc.th.juinjang.api.auth.controller.request.AppleInfo; +import umc.th.juinjang.api.auth.controller.request.AppleLoginRequestDto; +import umc.th.juinjang.api.auth.controller.request.AppleSignUpRequestDto; +import umc.th.juinjang.api.auth.controller.request.AppleSignUpRequestVersion2Dto; +import umc.th.juinjang.auth.jwt.JwtService; +import umc.th.juinjang.common.ExceptionHandler; +import umc.th.juinjang.common.exception.handler.MemberHandler; import umc.th.juinjang.event.publisher.MemberEventPublisher; -import umc.th.juinjang.model.dto.auth.LoginResponseDto; -import umc.th.juinjang.model.dto.auth.LoginResponseVersion2Dto; -import umc.th.juinjang.model.dto.auth.TokenDto; -import umc.th.juinjang.model.dto.auth.apple.*; -import umc.th.juinjang.model.dto.auth.kakao.KakaoLoginRequestDto; -import umc.th.juinjang.model.dto.auth.kakao.KakaoSignUpRequestDto; -import umc.th.juinjang.model.dto.auth.kakao.KakaoSignUpRequestVersion2Dto; -import umc.th.juinjang.model.entity.Image; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.model.entity.Record; -import umc.th.juinjang.model.entity.enums.MemberProvider; -import umc.th.juinjang.repository.checklist.ChecklistAnswerRepository; -import umc.th.juinjang.repository.checklist.ReportRepository; -import umc.th.juinjang.repository.image.ImageRepository; -import umc.th.juinjang.repository.limjang.LimjangPriceRepository; -import umc.th.juinjang.repository.limjang.LimjangRepository; -import umc.th.juinjang.repository.limjang.MemberRepository; -import umc.th.juinjang.repository.limjang.ScrapRepository; -import umc.th.juinjang.repository.record.RecordRepository; -import umc.th.juinjang.service.external.S3Service; +import umc.th.juinjang.api.auth.service.response.LoginResponseDto; +import umc.th.juinjang.api.auth.service.response.LoginResponseVersion2Dto; +import umc.th.juinjang.auth.jwt.TokenDto; +import umc.th.juinjang.external.openfeign.apple.AppleClientSecretGenerator; +import umc.th.juinjang.external.openfeign.apple.AppleOAuthProvider; +import umc.th.juinjang.api.auth.controller.request.KakaoLoginRequestDto; +import umc.th.juinjang.api.auth.controller.request.KakaoSignUpRequestDto; +import umc.th.juinjang.api.auth.controller.request.KakaoSignUpRequestVersion2Dto; +import umc.th.juinjang.domain.image.model.Image; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.member.model.Member; +import umc.th.juinjang.domain.record.model.Record; +import umc.th.juinjang.domain.member.model.MemberProvider; +import umc.th.juinjang.domain.checklist.repository.ChecklistAnswerRepository; +import umc.th.juinjang.domain.report.repository.ReportRepository; +import umc.th.juinjang.domain.image.repository.ImageRepository; +import umc.th.juinjang.domain.limjang.repository.LimjangPriceRepository; +import umc.th.juinjang.domain.limjang.repository.LimjangRepository; +import umc.th.juinjang.domain.member.repository.MemberRepository; +import umc.th.juinjang.domain.scrap.repository.ScrapRepository; +import umc.th.juinjang.domain.record.repository.RecordRepository; +import umc.th.juinjang.external.openfeign.kakao.KakaoUnlinkClient; +import umc.th.juinjang.external.s3.S3Service; import java.time.LocalDateTime; import java.util.Collections; @@ -39,7 +45,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import static umc.th.juinjang.apiPayload.code.status.ErrorStatus.*; +import static umc.th.juinjang.common.code.status.ErrorStatus.*; @Slf4j @Service @@ -538,7 +544,8 @@ public LoginResponseVersion2Dto appleLoginVersion2(AppleLoginRequestDto appleLog } @Transactional - public LoginResponseVersion2Dto appleSignUpVersion2(AppleSignUpRequestVersion2Dto appleSignUpRequestDto) { + public LoginResponseVersion2Dto appleSignUpVersion2( + AppleSignUpRequestVersion2Dto appleSignUpRequestDto) { // email, sub값 추출 후 db에서 해당 email값 그리고 sub값을 가진 유저가 있는지 find // 1. 추출한 email, sub 값이 null이면 -> 잘못된 apple token // 2. db에서 각각 find한 회원 id가 다르면 에러 (올바르지 않은 정보) diff --git a/src/main/java/umc/th/juinjang/service/withdraw/WithdrawService.java b/src/main/java/umc/th/juinjang/api/auth/service/WithdrawService.java similarity index 72% rename from src/main/java/umc/th/juinjang/service/withdraw/WithdrawService.java rename to src/main/java/umc/th/juinjang/api/auth/service/WithdrawService.java index d39a1514..9039ece2 100644 --- a/src/main/java/umc/th/juinjang/service/withdraw/WithdrawService.java +++ b/src/main/java/umc/th/juinjang/api/auth/service/WithdrawService.java @@ -1,14 +1,14 @@ -package umc.th.juinjang.service.withdraw; +package umc.th.juinjang.api.auth.service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import umc.th.juinjang.apiPayload.ExceptionHandler; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.model.entity.Withdraw; -import umc.th.juinjang.model.entity.enums.WithdrawReason; -import umc.th.juinjang.repository.withdraw.WithdrawRepository; +import umc.th.juinjang.common.ExceptionHandler; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.domain.withdraw.model.Withdraw; +import umc.th.juinjang.domain.withdraw.model.WithdrawReason; +import umc.th.juinjang.domain.withdraw.repository.WithdrawRepository; import java.util.List; diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/LoginResponseDto.java b/src/main/java/umc/th/juinjang/api/auth/service/response/LoginResponseDto.java similarity index 90% rename from src/main/java/umc/th/juinjang/model/dto/auth/LoginResponseDto.java rename to src/main/java/umc/th/juinjang/api/auth/service/response/LoginResponseDto.java index 6b33ad38..b31340ba 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/LoginResponseDto.java +++ b/src/main/java/umc/th/juinjang/api/auth/service/response/LoginResponseDto.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.auth; +package umc.th.juinjang.api.auth.service.response; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/LoginResponseVersion2Dto.java b/src/main/java/umc/th/juinjang/api/auth/service/response/LoginResponseVersion2Dto.java similarity index 92% rename from src/main/java/umc/th/juinjang/model/dto/auth/LoginResponseVersion2Dto.java rename to src/main/java/umc/th/juinjang/api/auth/service/response/LoginResponseVersion2Dto.java index 4d31e5d1..e269e9ec 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/LoginResponseVersion2Dto.java +++ b/src/main/java/umc/th/juinjang/api/auth/service/response/LoginResponseVersion2Dto.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.auth; +package umc.th.juinjang.api.auth.service.response; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/umc/th/juinjang/controller/ChecklistController.java b/src/main/java/umc/th/juinjang/api/checklist/controller/ChecklistController.java similarity index 80% rename from src/main/java/umc/th/juinjang/controller/ChecklistController.java rename to src/main/java/umc/th/juinjang/api/checklist/controller/ChecklistController.java index 06b2d54a..1944b6ad 100644 --- a/src/main/java/umc/th/juinjang/controller/ChecklistController.java +++ b/src/main/java/umc/th/juinjang/api/checklist/controller/ChecklistController.java @@ -1,13 +1,16 @@ -package umc.th.juinjang.controller; +package umc.th.juinjang.api.checklist.controller; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import umc.th.juinjang.apiPayload.ApiResponse; -import umc.th.juinjang.model.dto.checklist.*; -import umc.th.juinjang.service.checklist.ChecklistCommandService; -import umc.th.juinjang.service.checklist.ChecklistQueryService; +import umc.th.juinjang.api.checklist.controller.request.ChecklistAnswerRequestDTO; +import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerAndReportResponseDTO; +import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerResponseDTO; +import umc.th.juinjang.api.checklist.service.response.ReportResponseDTO; +import umc.th.juinjang.api.dto.ApiResponse; +import umc.th.juinjang.api.checklist.service.ChecklistCommandService; +import umc.th.juinjang.api.checklist.service.ChecklistQueryService; import java.util.List; diff --git a/src/main/java/umc/th/juinjang/api/checklist/controller/ChecklistControllerV2.java b/src/main/java/umc/th/juinjang/api/checklist/controller/ChecklistControllerV2.java new file mode 100644 index 00000000..d9c809cb --- /dev/null +++ b/src/main/java/umc/th/juinjang/api/checklist/controller/ChecklistControllerV2.java @@ -0,0 +1,13 @@ +package umc.th.juinjang.api.checklist.controller; + +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api/v2") +@RequiredArgsConstructor +@Validated +public class ChecklistControllerV2 { + int test; +} diff --git a/src/main/java/umc/th/juinjang/model/dto/checklist/ChecklistAnswerRequestDTO.java b/src/main/java/umc/th/juinjang/api/checklist/controller/request/ChecklistAnswerRequestDTO.java similarity index 81% rename from src/main/java/umc/th/juinjang/model/dto/checklist/ChecklistAnswerRequestDTO.java rename to src/main/java/umc/th/juinjang/api/checklist/controller/request/ChecklistAnswerRequestDTO.java index c01f52f3..d0bb4763 100644 --- a/src/main/java/umc/th/juinjang/model/dto/checklist/ChecklistAnswerRequestDTO.java +++ b/src/main/java/umc/th/juinjang/api/checklist/controller/request/ChecklistAnswerRequestDTO.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.checklist; +package umc.th.juinjang.api.checklist.controller.request; import lombok.*; diff --git a/src/main/java/umc/th/juinjang/model/dto/checklist/ChecklistQuestionDTO.java b/src/main/java/umc/th/juinjang/api/checklist/controller/request/ChecklistQuestionDTO.java similarity index 94% rename from src/main/java/umc/th/juinjang/model/dto/checklist/ChecklistQuestionDTO.java rename to src/main/java/umc/th/juinjang/api/checklist/controller/request/ChecklistQuestionDTO.java index 0cb09dcf..e44ad620 100644 --- a/src/main/java/umc/th/juinjang/model/dto/checklist/ChecklistQuestionDTO.java +++ b/src/main/java/umc/th/juinjang/api/checklist/controller/request/ChecklistQuestionDTO.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.checklist; +package umc.th.juinjang.api.checklist.controller.request; import lombok.*; diff --git a/src/main/java/umc/th/juinjang/api/checklist/service/ChecklistCommandService.java b/src/main/java/umc/th/juinjang/api/checklist/service/ChecklistCommandService.java new file mode 100644 index 00000000..b85e7c87 --- /dev/null +++ b/src/main/java/umc/th/juinjang/api/checklist/service/ChecklistCommandService.java @@ -0,0 +1,10 @@ +package umc.th.juinjang.api.checklist.service; + +import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerAndReportResponseDTO; +import umc.th.juinjang.api.checklist.controller.request.ChecklistAnswerRequestDTO; + +import java.util.List; + +public interface ChecklistCommandService { + public ChecklistAnswerAndReportResponseDTO saveChecklistAnswerList(Long limjangId, List answerDtoList); +} diff --git a/src/main/java/umc/th/juinjang/service/checklist/ChecklistCommandServiceImpl.java b/src/main/java/umc/th/juinjang/api/checklist/service/ChecklistCommandServiceImpl.java similarity index 86% rename from src/main/java/umc/th/juinjang/service/checklist/ChecklistCommandServiceImpl.java rename to src/main/java/umc/th/juinjang/api/checklist/service/ChecklistCommandServiceImpl.java index 3b760313..5d20a8ae 100644 --- a/src/main/java/umc/th/juinjang/service/checklist/ChecklistCommandServiceImpl.java +++ b/src/main/java/umc/th/juinjang/api/checklist/service/ChecklistCommandServiceImpl.java @@ -1,25 +1,25 @@ -package umc.th.juinjang.service.checklist; +package umc.th.juinjang.api.checklist.service; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.ChecklistHandler; -import umc.th.juinjang.apiPayload.exception.handler.LimjangHandler; -import umc.th.juinjang.converter.checklist.ChecklistAnswerAndReportConverter; -import umc.th.juinjang.model.dto.checklist.ChecklistAnswerAndReportResponseDTO; -import umc.th.juinjang.model.dto.checklist.ChecklistAnswerRequestDTO; -import umc.th.juinjang.model.entity.ChecklistAnswer; -import umc.th.juinjang.model.entity.ChecklistQuestionShort; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Report; -import umc.th.juinjang.model.entity.enums.ChecklistQuestionCategory; -import umc.th.juinjang.model.entity.enums.ChecklistQuestionType; -import umc.th.juinjang.repository.checklist.ChecklistAnswerRepository; -import umc.th.juinjang.repository.checklist.ChecklistQuestionRepository; -import umc.th.juinjang.repository.checklist.ReportRepository; -import umc.th.juinjang.repository.limjang.LimjangRepository; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.common.exception.handler.ChecklistHandler; +import umc.th.juinjang.common.exception.handler.LimjangHandler; +import umc.th.juinjang.api.checklist.service.converter.ChecklistAnswerAndReportConverter; +import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerAndReportResponseDTO; +import umc.th.juinjang.api.checklist.controller.request.ChecklistAnswerRequestDTO; +import umc.th.juinjang.domain.checklist.model.ChecklistAnswer; +import umc.th.juinjang.domain.checklist.model.ChecklistQuestionShort; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.report.model.Report; +import umc.th.juinjang.domain.checklist.model.ChecklistQuestionCategory; +import umc.th.juinjang.domain.checklist.model.ChecklistQuestionType; +import umc.th.juinjang.domain.checklist.repository.ChecklistAnswerRepository; +import umc.th.juinjang.domain.checklist.repository.ChecklistQuestionRepository; +import umc.th.juinjang.domain.report.repository.ReportRepository; +import umc.th.juinjang.domain.limjang.repository.LimjangRepository; import java.util.List; import java.util.Map; diff --git a/src/main/java/umc/th/juinjang/service/checklist/ChecklistQueryService.java b/src/main/java/umc/th/juinjang/api/checklist/service/ChecklistQueryService.java similarity index 68% rename from src/main/java/umc/th/juinjang/service/checklist/ChecklistQueryService.java rename to src/main/java/umc/th/juinjang/api/checklist/service/ChecklistQueryService.java index e48a225d..3e5d3f22 100644 --- a/src/main/java/umc/th/juinjang/service/checklist/ChecklistQueryService.java +++ b/src/main/java/umc/th/juinjang/api/checklist/service/ChecklistQueryService.java @@ -1,7 +1,7 @@ -package umc.th.juinjang.service.checklist; +package umc.th.juinjang.api.checklist.service; -import umc.th.juinjang.model.dto.checklist.ChecklistAnswerResponseDTO; -import umc.th.juinjang.model.dto.checklist.ReportResponseDTO; +import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerResponseDTO; +import umc.th.juinjang.api.checklist.service.response.ReportResponseDTO; import java.util.List; diff --git a/src/main/java/umc/th/juinjang/service/checklist/ChecklistQueryServiceImpl.java b/src/main/java/umc/th/juinjang/api/checklist/service/ChecklistQueryServiceImpl.java similarity index 82% rename from src/main/java/umc/th/juinjang/service/checklist/ChecklistQueryServiceImpl.java rename to src/main/java/umc/th/juinjang/api/checklist/service/ChecklistQueryServiceImpl.java index 984c405f..bdf82e33 100644 --- a/src/main/java/umc/th/juinjang/service/checklist/ChecklistQueryServiceImpl.java +++ b/src/main/java/umc/th/juinjang/api/checklist/service/ChecklistQueryServiceImpl.java @@ -1,21 +1,21 @@ -package umc.th.juinjang.service.checklist; +package umc.th.juinjang.api.checklist.service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.ChecklistHandler; -import umc.th.juinjang.apiPayload.exception.handler.LimjangHandler; -import umc.th.juinjang.converter.checklist.ChecklistAnswerAndReportConverter; -import umc.th.juinjang.model.dto.checklist.ChecklistAnswerResponseDTO; -import umc.th.juinjang.model.dto.checklist.ReportResponseDTO; -import umc.th.juinjang.model.entity.ChecklistAnswer; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Report; -import umc.th.juinjang.repository.checklist.ChecklistAnswerRepository; -import umc.th.juinjang.repository.checklist.ChecklistQuestionRepository; -import umc.th.juinjang.repository.checklist.ReportRepository; -import umc.th.juinjang.repository.limjang.LimjangRepository; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.common.exception.handler.ChecklistHandler; +import umc.th.juinjang.common.exception.handler.LimjangHandler; +import umc.th.juinjang.api.checklist.service.converter.ChecklistAnswerAndReportConverter; +import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerResponseDTO; +import umc.th.juinjang.api.checklist.service.response.ReportResponseDTO; +import umc.th.juinjang.domain.checklist.model.ChecklistAnswer; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.report.model.Report; +import umc.th.juinjang.domain.checklist.repository.ChecklistAnswerRepository; +import umc.th.juinjang.domain.checklist.repository.ChecklistQuestionRepository; +import umc.th.juinjang.domain.report.repository.ReportRepository; +import umc.th.juinjang.domain.limjang.repository.LimjangRepository; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/umc/th/juinjang/converter/checklist/ChecklistAnswerAndReportConverter.java b/src/main/java/umc/th/juinjang/api/checklist/service/converter/ChecklistAnswerAndReportConverter.java similarity index 79% rename from src/main/java/umc/th/juinjang/converter/checklist/ChecklistAnswerAndReportConverter.java rename to src/main/java/umc/th/juinjang/api/checklist/service/converter/ChecklistAnswerAndReportConverter.java index 41bdde2a..cb49f556 100644 --- a/src/main/java/umc/th/juinjang/converter/checklist/ChecklistAnswerAndReportConverter.java +++ b/src/main/java/umc/th/juinjang/api/checklist/service/converter/ChecklistAnswerAndReportConverter.java @@ -1,13 +1,13 @@ -package umc.th.juinjang.converter.checklist; - -import umc.th.juinjang.converter.limjang.LimjangDetailConverter; -import umc.th.juinjang.model.dto.checklist.ChecklistAnswerAndReportResponseDTO; -import umc.th.juinjang.model.dto.checklist.ChecklistAnswerResponseDTO; -import umc.th.juinjang.model.dto.checklist.ReportResponseDTO; -import umc.th.juinjang.model.dto.limjang.response.LimjangDetailResponseDTO; -import umc.th.juinjang.model.entity.ChecklistAnswer; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Report; +package umc.th.juinjang.api.checklist.service.converter; + +import umc.th.juinjang.api.limjang.service.converter.LimjangDetailConverter; +import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerAndReportResponseDTO; +import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerResponseDTO; +import umc.th.juinjang.api.checklist.service.response.ReportResponseDTO; +import umc.th.juinjang.api.limjang.service.response.LimjangDetailResponseDTO; +import umc.th.juinjang.domain.checklist.model.ChecklistAnswer; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.report.model.Report; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/umc/th/juinjang/converter/checklist/ChecklistAnswerConverter.java b/src/main/java/umc/th/juinjang/api/checklist/service/converter/ChecklistAnswerConverter.java similarity index 76% rename from src/main/java/umc/th/juinjang/converter/checklist/ChecklistAnswerConverter.java rename to src/main/java/umc/th/juinjang/api/checklist/service/converter/ChecklistAnswerConverter.java index d0d6096b..1fb1f389 100644 --- a/src/main/java/umc/th/juinjang/converter/checklist/ChecklistAnswerConverter.java +++ b/src/main/java/umc/th/juinjang/api/checklist/service/converter/ChecklistAnswerConverter.java @@ -1,8 +1,7 @@ -package umc.th.juinjang.converter.checklist; +package umc.th.juinjang.api.checklist.service.converter; -import umc.th.juinjang.model.dto.checklist.ChecklistAnswerRequestDTO; -import umc.th.juinjang.model.dto.checklist.ChecklistAnswerResponseDTO; -import umc.th.juinjang.model.entity.ChecklistAnswer; +import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerResponseDTO; +import umc.th.juinjang.domain.checklist.model.ChecklistAnswer; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/umc/th/juinjang/converter/checklist/ChecklistQuestionConverter.java b/src/main/java/umc/th/juinjang/api/checklist/service/converter/ChecklistQuestionConverter.java similarity index 88% rename from src/main/java/umc/th/juinjang/converter/checklist/ChecklistQuestionConverter.java rename to src/main/java/umc/th/juinjang/api/checklist/service/converter/ChecklistQuestionConverter.java index 10b9f7a4..caae2d76 100644 --- a/src/main/java/umc/th/juinjang/converter/checklist/ChecklistQuestionConverter.java +++ b/src/main/java/umc/th/juinjang/api/checklist/service/converter/ChecklistQuestionConverter.java @@ -1,13 +1,6 @@ -package umc.th.juinjang.converter.checklist; +package umc.th.juinjang.api.checklist.service.converter; -import umc.th.juinjang.model.dto.checklist.ChecklistQuestionDTO; -import umc.th.juinjang.model.entity.ChecklistQuestionShort; - - -import java.util.List; -import java.util.stream.Collectors; - public class ChecklistQuestionConverter { // public static List toChecklistQuestionListDTO(List checklistQuestionShorts) { // return checklistQuestionShorts.stream() diff --git a/src/main/java/umc/th/juinjang/model/dto/checklist/ChecklistAnswerAndReportResponseDTO.java b/src/main/java/umc/th/juinjang/api/checklist/service/response/ChecklistAnswerAndReportResponseDTO.java similarity index 81% rename from src/main/java/umc/th/juinjang/model/dto/checklist/ChecklistAnswerAndReportResponseDTO.java rename to src/main/java/umc/th/juinjang/api/checklist/service/response/ChecklistAnswerAndReportResponseDTO.java index d9b5cddd..e8f599f6 100644 --- a/src/main/java/umc/th/juinjang/model/dto/checklist/ChecklistAnswerAndReportResponseDTO.java +++ b/src/main/java/umc/th/juinjang/api/checklist/service/response/ChecklistAnswerAndReportResponseDTO.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.checklist; +package umc.th.juinjang.api.checklist.service.response; import lombok.*; diff --git a/src/main/java/umc/th/juinjang/model/dto/checklist/ChecklistAnswerResponseDTO.java b/src/main/java/umc/th/juinjang/api/checklist/service/response/ChecklistAnswerResponseDTO.java similarity index 73% rename from src/main/java/umc/th/juinjang/model/dto/checklist/ChecklistAnswerResponseDTO.java rename to src/main/java/umc/th/juinjang/api/checklist/service/response/ChecklistAnswerResponseDTO.java index 0ddeb9f2..302ff064 100644 --- a/src/main/java/umc/th/juinjang/model/dto/checklist/ChecklistAnswerResponseDTO.java +++ b/src/main/java/umc/th/juinjang/api/checklist/service/response/ChecklistAnswerResponseDTO.java @@ -1,11 +1,10 @@ -package umc.th.juinjang.model.dto.checklist; +package umc.th.juinjang.api.checklist.service.response; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import umc.th.juinjang.model.entity.enums.ChecklistQuestionCategory; -import umc.th.juinjang.model.entity.enums.ChecklistQuestionType; +import umc.th.juinjang.domain.checklist.model.ChecklistQuestionType; public class ChecklistAnswerResponseDTO { @Builder diff --git a/src/main/java/umc/th/juinjang/model/dto/checklist/ReportResponseDTO.java b/src/main/java/umc/th/juinjang/api/checklist/service/response/ReportResponseDTO.java similarity index 82% rename from src/main/java/umc/th/juinjang/model/dto/checklist/ReportResponseDTO.java rename to src/main/java/umc/th/juinjang/api/checklist/service/response/ReportResponseDTO.java index 1446b09c..63ca7014 100644 --- a/src/main/java/umc/th/juinjang/model/dto/checklist/ReportResponseDTO.java +++ b/src/main/java/umc/th/juinjang/api/checklist/service/response/ReportResponseDTO.java @@ -1,7 +1,7 @@ -package umc.th.juinjang.model.dto.checklist; +package umc.th.juinjang.api.checklist.service.response; import lombok.*; -import umc.th.juinjang.model.dto.limjang.response.LimjangDetailResponseDTO; +import umc.th.juinjang.api.limjang.service.response.LimjangDetailResponseDTO; @AllArgsConstructor @Getter diff --git a/src/main/java/umc/th/juinjang/config/SwaggerConfig.java b/src/main/java/umc/th/juinjang/api/config/SwaggerConfig.java similarity index 97% rename from src/main/java/umc/th/juinjang/config/SwaggerConfig.java rename to src/main/java/umc/th/juinjang/api/config/SwaggerConfig.java index ff0f70d6..34157c05 100644 --- a/src/main/java/umc/th/juinjang/config/SwaggerConfig.java +++ b/src/main/java/umc/th/juinjang/api/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.config; +package umc.th.juinjang.api.config; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; diff --git a/src/main/java/umc/th/juinjang/apiPayload/ApiResponse.java b/src/main/java/umc/th/juinjang/api/dto/ApiResponse.java similarity index 87% rename from src/main/java/umc/th/juinjang/apiPayload/ApiResponse.java rename to src/main/java/umc/th/juinjang/api/dto/ApiResponse.java index fe905166..8842b041 100644 --- a/src/main/java/umc/th/juinjang/apiPayload/ApiResponse.java +++ b/src/main/java/umc/th/juinjang/api/dto/ApiResponse.java @@ -1,13 +1,13 @@ -package umc.th.juinjang.apiPayload; +package umc.th.juinjang.api.dto; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.AllArgsConstructor; import lombok.Getter; -import umc.th.juinjang.apiPayload.code.BaseCode; -import umc.th.juinjang.apiPayload.code.BaseErrorCode; -import umc.th.juinjang.apiPayload.code.status.SuccessStatus; +import umc.th.juinjang.common.code.BaseCode; +import umc.th.juinjang.common.code.BaseErrorCode; +import umc.th.juinjang.common.code.status.SuccessStatus; @Getter @AllArgsConstructor diff --git a/src/main/java/umc/th/juinjang/controller/ImageController.java b/src/main/java/umc/th/juinjang/api/image/controller/ImageController.java similarity index 84% rename from src/main/java/umc/th/juinjang/controller/ImageController.java rename to src/main/java/umc/th/juinjang/api/image/controller/ImageController.java index d19a0a3d..9dcaaa9e 100644 --- a/src/main/java/umc/th/juinjang/controller/ImageController.java +++ b/src/main/java/umc/th/juinjang/api/image/controller/ImageController.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.controller; +package umc.th.juinjang.api.image.controller; import io.swagger.v3.oas.annotations.Operation; import jakarta.validation.Valid; @@ -15,12 +15,12 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import umc.th.juinjang.apiPayload.ApiResponse; -import umc.th.juinjang.apiPayload.code.status.SuccessStatus; -import umc.th.juinjang.model.dto.image.ImageDeleteRequestDTO; -import umc.th.juinjang.model.dto.image.ImagesGetResponse; -import umc.th.juinjang.service.image.ImageCommandService; -import umc.th.juinjang.service.image.ImageQueryService; +import umc.th.juinjang.api.dto.ApiResponse; +import umc.th.juinjang.common.code.status.SuccessStatus; +import umc.th.juinjang.api.image.controller.request.ImageDeleteRequestDTO; +import umc.th.juinjang.api.image.service.response.ImagesGetResponse; +import umc.th.juinjang.api.image.service.ImageCommandService; +import umc.th.juinjang.api.image.service.ImageQueryService; @RestController @RequestMapping("/api/limjang/image") diff --git a/src/main/java/umc/th/juinjang/model/dto/image/ImageDeleteRequestDTO.java b/src/main/java/umc/th/juinjang/api/image/controller/request/ImageDeleteRequestDTO.java similarity index 80% rename from src/main/java/umc/th/juinjang/model/dto/image/ImageDeleteRequestDTO.java rename to src/main/java/umc/th/juinjang/api/image/controller/request/ImageDeleteRequestDTO.java index 11ce6b93..0a6a2e1b 100644 --- a/src/main/java/umc/th/juinjang/model/dto/image/ImageDeleteRequestDTO.java +++ b/src/main/java/umc/th/juinjang/api/image/controller/request/ImageDeleteRequestDTO.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.image; +package umc.th.juinjang.api.image.controller.request; import jakarta.validation.constraints.NotEmpty; import java.util.List; diff --git a/src/main/java/umc/th/juinjang/model/dto/image/ImageUploadRequestDTO.java b/src/main/java/umc/th/juinjang/api/image/controller/request/ImageUploadRequestDTO.java similarity index 88% rename from src/main/java/umc/th/juinjang/model/dto/image/ImageUploadRequestDTO.java rename to src/main/java/umc/th/juinjang/api/image/controller/request/ImageUploadRequestDTO.java index 28da1cd6..425cf973 100644 --- a/src/main/java/umc/th/juinjang/model/dto/image/ImageUploadRequestDTO.java +++ b/src/main/java/umc/th/juinjang/api/image/controller/request/ImageUploadRequestDTO.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.image; +package umc.th.juinjang.api.image.controller.request; import java.util.List; import lombok.AllArgsConstructor; diff --git a/src/main/java/umc/th/juinjang/service/image/ImageCommandService.java b/src/main/java/umc/th/juinjang/api/image/service/ImageCommandService.java similarity index 68% rename from src/main/java/umc/th/juinjang/service/image/ImageCommandService.java rename to src/main/java/umc/th/juinjang/api/image/service/ImageCommandService.java index d8529539..0c0c7156 100644 --- a/src/main/java/umc/th/juinjang/service/image/ImageCommandService.java +++ b/src/main/java/umc/th/juinjang/api/image/service/ImageCommandService.java @@ -1,8 +1,8 @@ -package umc.th.juinjang.service.image; +package umc.th.juinjang.api.image.service; import java.util.List; import org.springframework.web.multipart.MultipartFile; -import umc.th.juinjang.model.dto.image.ImageDeleteRequestDTO; +import umc.th.juinjang.api.image.controller.request.ImageDeleteRequestDTO; public interface ImageCommandService { void createImages(long limjangId, List images); diff --git a/src/main/java/umc/th/juinjang/service/image/ImageCommandServiceImpl.java b/src/main/java/umc/th/juinjang/api/image/service/ImageCommandServiceImpl.java similarity index 72% rename from src/main/java/umc/th/juinjang/service/image/ImageCommandServiceImpl.java rename to src/main/java/umc/th/juinjang/api/image/service/ImageCommandServiceImpl.java index 1c7ef02c..fb87f9bc 100644 --- a/src/main/java/umc/th/juinjang/service/image/ImageCommandServiceImpl.java +++ b/src/main/java/umc/th/juinjang/api/image/service/ImageCommandServiceImpl.java @@ -1,18 +1,18 @@ -package umc.th.juinjang.service.image; +package umc.th.juinjang.api.image.service; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.LimjangHandler; -import umc.th.juinjang.model.dto.image.ImageDeleteRequestDTO; -import umc.th.juinjang.model.entity.Image; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.repository.image.ImageRepository; -import umc.th.juinjang.repository.limjang.LimjangRepository; -import umc.th.juinjang.service.external.S3Service; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.common.exception.handler.LimjangHandler; +import umc.th.juinjang.api.image.controller.request.ImageDeleteRequestDTO; +import umc.th.juinjang.domain.image.model.Image; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.image.repository.ImageRepository; +import umc.th.juinjang.domain.limjang.repository.LimjangRepository; +import umc.th.juinjang.external.s3.S3Service; @Service @RequiredArgsConstructor diff --git a/src/main/java/umc/th/juinjang/api/image/service/ImageQueryService.java b/src/main/java/umc/th/juinjang/api/image/service/ImageQueryService.java new file mode 100644 index 00000000..fdfa0169 --- /dev/null +++ b/src/main/java/umc/th/juinjang/api/image/service/ImageQueryService.java @@ -0,0 +1,7 @@ +package umc.th.juinjang.api.image.service; + +import umc.th.juinjang.api.image.service.response.ImagesGetResponse; + +public interface ImageQueryService { + ImagesGetResponse getImageList(long limjangId); +} diff --git a/src/main/java/umc/th/juinjang/service/image/ImageQueryServiceImpl.java b/src/main/java/umc/th/juinjang/api/image/service/ImageQueryServiceImpl.java similarity index 65% rename from src/main/java/umc/th/juinjang/service/image/ImageQueryServiceImpl.java rename to src/main/java/umc/th/juinjang/api/image/service/ImageQueryServiceImpl.java index 148c9eae..874fabe7 100644 --- a/src/main/java/umc/th/juinjang/service/image/ImageQueryServiceImpl.java +++ b/src/main/java/umc/th/juinjang/api/image/service/ImageQueryServiceImpl.java @@ -1,17 +1,17 @@ -package umc.th.juinjang.service.image; +package umc.th.juinjang.api.image.service; import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.LimjangHandler; -import umc.th.juinjang.model.dto.image.ImagesGetResponse; -import umc.th.juinjang.model.entity.Image; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.repository.image.ImageRepository; -import umc.th.juinjang.repository.limjang.LimjangRepository; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.common.exception.handler.LimjangHandler; +import umc.th.juinjang.api.image.service.response.ImagesGetResponse; +import umc.th.juinjang.domain.image.model.Image; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.image.repository.ImageRepository; +import umc.th.juinjang.domain.limjang.repository.LimjangRepository; @Slf4j @Service diff --git a/src/main/java/umc/th/juinjang/model/dto/image/ImageListResponseDTO.java b/src/main/java/umc/th/juinjang/api/image/service/response/ImageListResponseDTO.java similarity index 89% rename from src/main/java/umc/th/juinjang/model/dto/image/ImageListResponseDTO.java rename to src/main/java/umc/th/juinjang/api/image/service/response/ImageListResponseDTO.java index 38040398..63ac8e92 100644 --- a/src/main/java/umc/th/juinjang/model/dto/image/ImageListResponseDTO.java +++ b/src/main/java/umc/th/juinjang/api/image/service/response/ImageListResponseDTO.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.image; +package umc.th.juinjang.api.image.service.response; import java.util.List; import lombok.AllArgsConstructor; diff --git a/src/main/java/umc/th/juinjang/model/dto/image/ImageUploadResponseDTO.java b/src/main/java/umc/th/juinjang/api/image/service/response/ImageUploadResponseDTO.java similarity index 86% rename from src/main/java/umc/th/juinjang/model/dto/image/ImageUploadResponseDTO.java rename to src/main/java/umc/th/juinjang/api/image/service/response/ImageUploadResponseDTO.java index b4ba5acf..ac9697f0 100644 --- a/src/main/java/umc/th/juinjang/model/dto/image/ImageUploadResponseDTO.java +++ b/src/main/java/umc/th/juinjang/api/image/service/response/ImageUploadResponseDTO.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.image; +package umc.th.juinjang.api.image.service.response; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/umc/th/juinjang/model/dto/image/ImagesGetResponse.java b/src/main/java/umc/th/juinjang/api/image/service/response/ImagesGetResponse.java similarity index 81% rename from src/main/java/umc/th/juinjang/model/dto/image/ImagesGetResponse.java rename to src/main/java/umc/th/juinjang/api/image/service/response/ImagesGetResponse.java index 95c08702..2b9b45a3 100644 --- a/src/main/java/umc/th/juinjang/model/dto/image/ImagesGetResponse.java +++ b/src/main/java/umc/th/juinjang/api/image/service/response/ImagesGetResponse.java @@ -1,7 +1,7 @@ -package umc.th.juinjang.model.dto.image; +package umc.th.juinjang.api.image.service.response; import java.util.List; -import umc.th.juinjang.model.entity.Image; +import umc.th.juinjang.domain.image.model.Image; public record ImagesGetResponse (List images) { record ImageResponse(Long imageId, String imageUrl) { diff --git a/src/main/java/umc/th/juinjang/controller/LimjangController.java b/src/main/java/umc/th/juinjang/api/limjang/controller/LimjangController.java similarity index 80% rename from src/main/java/umc/th/juinjang/controller/LimjangController.java rename to src/main/java/umc/th/juinjang/api/limjang/controller/LimjangController.java index 4cd407df..636f99d1 100644 --- a/src/main/java/umc/th/juinjang/controller/LimjangController.java +++ b/src/main/java/umc/th/juinjang/api/limjang/controller/LimjangController.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.controller; +package umc.th.juinjang.api.limjang.controller; import io.swagger.v3.oas.annotations.Operation; @@ -16,21 +16,21 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import umc.th.juinjang.apiPayload.ApiResponse; -import umc.th.juinjang.apiPayload.code.status.SuccessStatus; -import umc.th.juinjang.model.dto.limjang.enums.LimjangSortOptions; -import umc.th.juinjang.model.dto.limjang.request.LimjangPatchRequest; -import umc.th.juinjang.model.dto.limjang.request.LimjangPostRequest; -import umc.th.juinjang.model.dto.limjang.request.LimjangsDeleteRequest; -import umc.th.juinjang.model.dto.limjang.response.LimjangDetailGetResponse; -import umc.th.juinjang.model.dto.limjang.response.LimjangPostResponse; -import umc.th.juinjang.model.dto.limjang.response.LimjangsGetByKeywordResponse; -import umc.th.juinjang.model.dto.limjang.response.LimjangsGetResponse; -import umc.th.juinjang.model.dto.limjang.response.LimjangsMainGetResponse; -import umc.th.juinjang.model.dto.limjang.response.LimjangsMainGetVersion2Response; -import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.service.limjang.LimjangCommandService; -import umc.th.juinjang.service.limjang.LimjangQueryService; +import umc.th.juinjang.api.dto.ApiResponse; +import umc.th.juinjang.common.code.status.SuccessStatus; +import umc.th.juinjang.api.limjang.controller.parameter.LimjangSortOptions; +import umc.th.juinjang.api.limjang.controller.request.LimjangPatchRequest; +import umc.th.juinjang.api.limjang.controller.request.LimjangPostRequest; +import umc.th.juinjang.api.limjang.controller.request.LimjangsDeleteRequest; +import umc.th.juinjang.api.limjang.service.response.LimjangDetailGetResponse; +import umc.th.juinjang.api.limjang.service.response.LimjangPostResponse; +import umc.th.juinjang.api.limjang.service.response.LimjangsGetByKeywordResponse; +import umc.th.juinjang.api.limjang.service.response.LimjangsGetResponse; +import umc.th.juinjang.api.limjang.service.response.LimjangsMainGetResponse; +import umc.th.juinjang.api.limjang.service.response.LimjangsMainGetVersion2Response; +import umc.th.juinjang.domain.member.model.Member; +import umc.th.juinjang.api.limjang.service.LimjangCommandService; +import umc.th.juinjang.api.limjang.service.LimjangQueryService; @RestController @RequestMapping("/api/limjang") diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/enums/LimjangSortOptions.java b/src/main/java/umc/th/juinjang/api/limjang/controller/parameter/LimjangSortOptions.java similarity index 81% rename from src/main/java/umc/th/juinjang/model/dto/limjang/enums/LimjangSortOptions.java rename to src/main/java/umc/th/juinjang/api/limjang/controller/parameter/LimjangSortOptions.java index bc356c38..1dca3dc3 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/enums/LimjangSortOptions.java +++ b/src/main/java/umc/th/juinjang/api/limjang/controller/parameter/LimjangSortOptions.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.limjang.enums; +package umc.th.juinjang.api.limjang.controller.parameter; public enum LimjangSortOptions { UPDATED("UPDATED"), diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/request/LimjangPatchRequest.java b/src/main/java/umc/th/juinjang/api/limjang/controller/request/LimjangPatchRequest.java similarity index 85% rename from src/main/java/umc/th/juinjang/model/dto/limjang/request/LimjangPatchRequest.java rename to src/main/java/umc/th/juinjang/api/limjang/controller/request/LimjangPatchRequest.java index 793b0197..d7a4a655 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/request/LimjangPatchRequest.java +++ b/src/main/java/umc/th/juinjang/api/limjang/controller/request/LimjangPatchRequest.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.limjang.request; +package umc.th.juinjang.api.limjang.controller.request; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/request/LimjangPostRequest.java b/src/main/java/umc/th/juinjang/api/limjang/controller/request/LimjangPostRequest.java similarity index 73% rename from src/main/java/umc/th/juinjang/model/dto/limjang/request/LimjangPostRequest.java rename to src/main/java/umc/th/juinjang/api/limjang/controller/request/LimjangPostRequest.java index 8b32369e..fdb439bc 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/request/LimjangPostRequest.java +++ b/src/main/java/umc/th/juinjang/api/limjang/controller/request/LimjangPostRequest.java @@ -1,13 +1,13 @@ -package umc.th.juinjang.model.dto.limjang.request; +package umc.th.juinjang.api.limjang.controller.request; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import java.util.List; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.enums.LimjangPriceType; -import umc.th.juinjang.model.entity.enums.LimjangPropertyType; -import umc.th.juinjang.model.entity.enums.LimjangPurpose; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.limjang.model.LimjangPriceType; +import umc.th.juinjang.domain.limjang.model.LimjangPropertyType; +import umc.th.juinjang.domain.limjang.model.LimjangPurpose; public record LimjangPostRequest( @NotNull diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/request/LimjangUpdateRequestDTO.java b/src/main/java/umc/th/juinjang/api/limjang/controller/request/LimjangUpdateRequestDTO.java similarity index 71% rename from src/main/java/umc/th/juinjang/model/dto/limjang/request/LimjangUpdateRequestDTO.java rename to src/main/java/umc/th/juinjang/api/limjang/controller/request/LimjangUpdateRequestDTO.java index d0a0c444..252e8bad 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/request/LimjangUpdateRequestDTO.java +++ b/src/main/java/umc/th/juinjang/api/limjang/controller/request/LimjangUpdateRequestDTO.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.limjang.request; +package umc.th.juinjang.api.limjang.controller.request; import lombok.Getter; diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/request/LimjangsDeleteRequest.java b/src/main/java/umc/th/juinjang/api/limjang/controller/request/LimjangsDeleteRequest.java similarity index 73% rename from src/main/java/umc/th/juinjang/model/dto/limjang/request/LimjangsDeleteRequest.java rename to src/main/java/umc/th/juinjang/api/limjang/controller/request/LimjangsDeleteRequest.java index 10122f65..52962440 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/request/LimjangsDeleteRequest.java +++ b/src/main/java/umc/th/juinjang/api/limjang/controller/request/LimjangsDeleteRequest.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.limjang.request; +package umc.th.juinjang.api.limjang.controller.request; import jakarta.validation.constraints.NotEmpty; import java.util.List; diff --git a/src/main/java/umc/th/juinjang/api/limjang/service/LimjangCommandService.java b/src/main/java/umc/th/juinjang/api/limjang/service/LimjangCommandService.java new file mode 100644 index 00000000..14b900c5 --- /dev/null +++ b/src/main/java/umc/th/juinjang/api/limjang/service/LimjangCommandService.java @@ -0,0 +1,16 @@ +package umc.th.juinjang.api.limjang.service; + +import umc.th.juinjang.api.limjang.controller.request.LimjangPatchRequest; +import umc.th.juinjang.api.limjang.controller.request.LimjangPostRequest; +import umc.th.juinjang.api.limjang.controller.request.LimjangsDeleteRequest; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.member.model.Member; + +public interface LimjangCommandService { + + Limjang postLimjang(LimjangPostRequest request, Member member); + + void deleteLimjangs(LimjangsDeleteRequest deleteIds, Member member); + + void updateLimjang(Member member, long limjangId, LimjangPatchRequest request); +} diff --git a/src/main/java/umc/th/juinjang/service/limjang/LimjangCommandServiceImpl.java b/src/main/java/umc/th/juinjang/api/limjang/service/LimjangCommandServiceImpl.java similarity index 73% rename from src/main/java/umc/th/juinjang/service/limjang/LimjangCommandServiceImpl.java rename to src/main/java/umc/th/juinjang/api/limjang/service/LimjangCommandServiceImpl.java index 6778b4a2..44402c38 100644 --- a/src/main/java/umc/th/juinjang/service/limjang/LimjangCommandServiceImpl.java +++ b/src/main/java/umc/th/juinjang/api/limjang/service/LimjangCommandServiceImpl.java @@ -1,24 +1,24 @@ -package umc.th.juinjang.service.limjang; +package umc.th.juinjang.api.limjang.service; -import static umc.th.juinjang.service.limjang.LimjangPriceBridge.determineLimjangPrice; +import static umc.th.juinjang.api.limjang.service.LimjangPriceBridge.determineLimjangPrice; import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.LimjangHandler; -import umc.th.juinjang.apiPayload.exception.handler.MemberHandler; -import umc.th.juinjang.model.dto.limjang.request.LimjangPatchRequest; -import umc.th.juinjang.model.dto.limjang.request.LimjangPostRequest; -import umc.th.juinjang.model.dto.limjang.request.LimjangsDeleteRequest; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.LimjangPrice; -import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.model.entity.enums.LimjangPriceType; -import umc.th.juinjang.repository.limjang.LimjangRepository; -import umc.th.juinjang.repository.limjang.MemberRepository; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.common.exception.handler.LimjangHandler; +import umc.th.juinjang.common.exception.handler.MemberHandler; +import umc.th.juinjang.api.limjang.controller.request.LimjangPatchRequest; +import umc.th.juinjang.api.limjang.controller.request.LimjangPostRequest; +import umc.th.juinjang.api.limjang.controller.request.LimjangsDeleteRequest; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.limjang.model.LimjangPrice; +import umc.th.juinjang.domain.member.model.Member; +import umc.th.juinjang.domain.limjang.model.LimjangPriceType; +import umc.th.juinjang.domain.limjang.repository.LimjangRepository; +import umc.th.juinjang.domain.member.repository.MemberRepository; @Slf4j @Service diff --git a/src/main/java/umc/th/juinjang/service/limjang/LimjangPriceBridge.java b/src/main/java/umc/th/juinjang/api/limjang/service/LimjangPriceBridge.java similarity index 89% rename from src/main/java/umc/th/juinjang/service/limjang/LimjangPriceBridge.java rename to src/main/java/umc/th/juinjang/api/limjang/service/LimjangPriceBridge.java index 69f2c86b..9b5684b5 100644 --- a/src/main/java/umc/th/juinjang/service/limjang/LimjangPriceBridge.java +++ b/src/main/java/umc/th/juinjang/api/limjang/service/LimjangPriceBridge.java @@ -1,13 +1,13 @@ -package umc.th.juinjang.service.limjang; +package umc.th.juinjang.api.limjang.service; import java.util.ArrayList; import java.util.List; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.LimjangHandler; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.LimjangPrice; -import umc.th.juinjang.model.entity.enums.LimjangPriceType; -import umc.th.juinjang.model.entity.enums.LimjangPurpose; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.common.exception.handler.LimjangHandler; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.limjang.model.LimjangPrice; +import umc.th.juinjang.domain.limjang.model.LimjangPriceType; +import umc.th.juinjang.domain.limjang.model.LimjangPurpose; public class LimjangPriceBridge { public static LimjangPrice determineLimjangPrice(List priceList, Integer purpose, Integer priceType){ diff --git a/src/main/java/umc/th/juinjang/api/limjang/service/LimjangQueryService.java b/src/main/java/umc/th/juinjang/api/limjang/service/LimjangQueryService.java new file mode 100644 index 00000000..26ab09fd --- /dev/null +++ b/src/main/java/umc/th/juinjang/api/limjang/service/LimjangQueryService.java @@ -0,0 +1,23 @@ +package umc.th.juinjang.api.limjang.service; + +import umc.th.juinjang.api.limjang.service.response.LimjangDetailGetResponse; + +import umc.th.juinjang.api.limjang.controller.parameter.LimjangSortOptions; +import umc.th.juinjang.api.limjang.service.response.LimjangsGetByKeywordResponse; +import umc.th.juinjang.api.limjang.service.response.LimjangsGetResponse; +import umc.th.juinjang.api.limjang.service.response.LimjangsMainGetResponse; +import umc.th.juinjang.api.limjang.service.response.LimjangsMainGetVersion2Response; +import umc.th.juinjang.domain.member.model.Member; + +public interface LimjangQueryService { + + LimjangsGetResponse getLimjangTotalList(Member member, LimjangSortOptions sort); + + LimjangsMainGetResponse getLimjangsMain(Member member); + + LimjangsGetByKeywordResponse getLimjangSearchList(Member member, String keyword); + + LimjangDetailGetResponse getDetail(long id, Member member); + + LimjangsMainGetVersion2Response getLimjangsMainVersion2(Member member); +} diff --git a/src/main/java/umc/th/juinjang/service/limjang/LimjangQueryServiceImpl.java b/src/main/java/umc/th/juinjang/api/limjang/service/LimjangQueryServiceImpl.java similarity index 75% rename from src/main/java/umc/th/juinjang/service/limjang/LimjangQueryServiceImpl.java rename to src/main/java/umc/th/juinjang/api/limjang/service/LimjangQueryServiceImpl.java index 61b5f8d8..6f2f4dc6 100644 --- a/src/main/java/umc/th/juinjang/service/limjang/LimjangQueryServiceImpl.java +++ b/src/main/java/umc/th/juinjang/api/limjang/service/LimjangQueryServiceImpl.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.limjang; +package umc.th.juinjang.api.limjang.service; import java.util.HashSet; import java.util.List; @@ -9,20 +9,20 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.LimjangHandler; -import umc.th.juinjang.apiPayload.exception.handler.MemberHandler; -import umc.th.juinjang.model.dto.limjang.response.LimjangDetailGetResponse; -import umc.th.juinjang.model.dto.limjang.response.LimjangsGetByKeywordResponse; -import umc.th.juinjang.model.dto.limjang.response.LimjangsGetResponse; -import umc.th.juinjang.model.dto.limjang.response.LimjangsMainGetResponse; -import umc.th.juinjang.model.dto.limjang.response.LimjangsMainGetVersion2Response; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.model.dto.limjang.enums.LimjangSortOptions; -import umc.th.juinjang.repository.limjang.LimjangRepository; -import umc.th.juinjang.repository.limjang.MemberRepository; -import umc.th.juinjang.repository.limjang.ScrapRepository; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.common.exception.handler.LimjangHandler; +import umc.th.juinjang.common.exception.handler.MemberHandler; +import umc.th.juinjang.api.limjang.service.response.LimjangDetailGetResponse; +import umc.th.juinjang.api.limjang.service.response.LimjangsGetByKeywordResponse; +import umc.th.juinjang.api.limjang.service.response.LimjangsGetResponse; +import umc.th.juinjang.api.limjang.service.response.LimjangsMainGetResponse; +import umc.th.juinjang.api.limjang.service.response.LimjangsMainGetVersion2Response; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.member.model.Member; +import umc.th.juinjang.api.limjang.controller.parameter.LimjangSortOptions; +import umc.th.juinjang.domain.limjang.repository.LimjangRepository; +import umc.th.juinjang.domain.member.repository.MemberRepository; +import umc.th.juinjang.domain.scrap.repository.ScrapRepository; @Slf4j @Service diff --git a/src/main/java/umc/th/juinjang/service/limjang/LimjangSchedulerService.java b/src/main/java/umc/th/juinjang/api/limjang/service/LimjangSchedulerService.java similarity index 91% rename from src/main/java/umc/th/juinjang/service/limjang/LimjangSchedulerService.java rename to src/main/java/umc/th/juinjang/api/limjang/service/LimjangSchedulerService.java index 9961cd53..8abcf562 100644 --- a/src/main/java/umc/th/juinjang/service/limjang/LimjangSchedulerService.java +++ b/src/main/java/umc/th/juinjang/api/limjang/service/LimjangSchedulerService.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.limjang; +package umc.th.juinjang.api.limjang.service; import java.time.LocalDateTime; @@ -7,7 +7,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import umc.th.juinjang.repository.limjang.LimjangRepository; +import umc.th.juinjang.domain.limjang.repository.LimjangRepository; @Component @RequiredArgsConstructor diff --git a/src/main/java/umc/th/juinjang/converter/limjang/LimjangDetailConverter.java b/src/main/java/umc/th/juinjang/api/limjang/service/converter/LimjangDetailConverter.java similarity index 71% rename from src/main/java/umc/th/juinjang/converter/limjang/LimjangDetailConverter.java rename to src/main/java/umc/th/juinjang/api/limjang/service/converter/LimjangDetailConverter.java index 08efd522..f4fed15f 100644 --- a/src/main/java/umc/th/juinjang/converter/limjang/LimjangDetailConverter.java +++ b/src/main/java/umc/th/juinjang/api/limjang/service/converter/LimjangDetailConverter.java @@ -1,17 +1,17 @@ -package umc.th.juinjang.converter.limjang; +package umc.th.juinjang.api.limjang.service.converter; -import static umc.th.juinjang.service.limjang.LimjangPriceBridge.makePriceListVersion2; +import static umc.th.juinjang.api.limjang.service.LimjangPriceBridge.makePriceListVersion2; import java.util.Comparator; import java.util.List; -import umc.th.juinjang.model.dto.limjang.response.LimjangDetailResponseDTO; -import umc.th.juinjang.model.entity.enums.LimjangCheckListVersion; -import umc.th.juinjang.model.entity.Image; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.LimjangPrice; -import umc.th.juinjang.model.entity.enums.LimjangPriceType; -import umc.th.juinjang.model.entity.enums.LimjangPropertyType; -import umc.th.juinjang.model.entity.enums.LimjangPurpose; +import umc.th.juinjang.api.limjang.service.response.LimjangDetailResponseDTO; +import umc.th.juinjang.domain.checklist.model.LimjangCheckListVersion; +import umc.th.juinjang.domain.image.model.Image; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.limjang.model.LimjangPrice; +import umc.th.juinjang.domain.limjang.model.LimjangPriceType; +import umc.th.juinjang.domain.limjang.model.LimjangPropertyType; +import umc.th.juinjang.domain.limjang.model.LimjangPurpose; public class LimjangDetailConverter { diff --git a/src/main/java/umc/th/juinjang/converter/limjang/LimjangsMainGetResponseConverter.java b/src/main/java/umc/th/juinjang/api/limjang/service/converter/LimjangsMainGetResponseConverter.java similarity index 62% rename from src/main/java/umc/th/juinjang/converter/limjang/LimjangsMainGetResponseConverter.java rename to src/main/java/umc/th/juinjang/api/limjang/service/converter/LimjangsMainGetResponseConverter.java index 6e76a7b3..b8489696 100644 --- a/src/main/java/umc/th/juinjang/converter/limjang/LimjangsMainGetResponseConverter.java +++ b/src/main/java/umc/th/juinjang/api/limjang/service/converter/LimjangsMainGetResponseConverter.java @@ -1,12 +1,12 @@ -package umc.th.juinjang.converter.limjang; +package umc.th.juinjang.api.limjang.service.converter; -import static umc.th.juinjang.service.limjang.LimjangPriceBridge.getPriceToString; +import static umc.th.juinjang.api.limjang.service.LimjangPriceBridge.getPriceToString; import java.util.Optional; -import umc.th.juinjang.model.dto.limjang.response.LimjangsMainGetResponse.LimjangMainResponse; -import umc.th.juinjang.model.entity.Image; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Report; +import umc.th.juinjang.api.limjang.service.response.LimjangsMainGetResponse.LimjangMainResponse; +import umc.th.juinjang.domain.image.model.Image; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.report.model.Report; public class LimjangsMainGetResponseConverter { diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangDetailGetResponse.java b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangDetailGetResponse.java similarity index 78% rename from src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangDetailGetResponse.java rename to src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangDetailGetResponse.java index 8a59bdb3..63b8251b 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangDetailGetResponse.java +++ b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangDetailGetResponse.java @@ -1,13 +1,13 @@ -package umc.th.juinjang.model.dto.limjang.response; +package umc.th.juinjang.api.limjang.service.response; -import static umc.th.juinjang.service.limjang.LimjangPriceBridge.makePriceListVersion2; +import static umc.th.juinjang.api.limjang.service.LimjangPriceBridge.makePriceListVersion2; import java.time.LocalDateTime; import java.util.List; import lombok.Builder; -import umc.th.juinjang.model.entity.Image; -import umc.th.juinjang.model.entity.enums.LimjangCheckListVersion; -import umc.th.juinjang.model.entity.Limjang; +import umc.th.juinjang.domain.image.model.Image; +import umc.th.juinjang.domain.checklist.model.LimjangCheckListVersion; +import umc.th.juinjang.domain.limjang.model.Limjang; @Builder public record LimjangDetailGetResponse( diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangDetailResponseDTO.java b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangDetailResponseDTO.java similarity index 84% rename from src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangDetailResponseDTO.java rename to src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangDetailResponseDTO.java index 3f8fac01..0d2e1ab5 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangDetailResponseDTO.java +++ b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangDetailResponseDTO.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.limjang.response; +package umc.th.juinjang.api.limjang.service.response; import java.time.LocalDateTime; import java.util.List; @@ -6,7 +6,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import umc.th.juinjang.model.entity.enums.LimjangCheckListVersion; +import umc.th.juinjang.domain.checklist.model.LimjangCheckListVersion; public class LimjangDetailResponseDTO { diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangMemoResponseDTO.java b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangMemoResponseDTO.java similarity index 89% rename from src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangMemoResponseDTO.java rename to src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangMemoResponseDTO.java index 5ddf3df5..d58d5691 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangMemoResponseDTO.java +++ b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangMemoResponseDTO.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.limjang.response; +package umc.th.juinjang.api.limjang.service.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangPostResponse.java b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangPostResponse.java similarity index 70% rename from src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangPostResponse.java rename to src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangPostResponse.java index 489edb32..34f10b50 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangPostResponse.java +++ b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangPostResponse.java @@ -1,7 +1,7 @@ -package umc.th.juinjang.model.dto.limjang.response; +package umc.th.juinjang.api.limjang.service.response; import java.time.LocalDateTime; -import umc.th.juinjang.model.entity.Limjang; +import umc.th.juinjang.domain.limjang.model.Limjang; public record LimjangPostResponse(Long limjangId, LocalDateTime createdAt) { public static LimjangPostResponse of(Limjang limjang) { diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangTotalListResponseDTO.java b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangTotalListResponseDTO.java similarity index 93% rename from src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangTotalListResponseDTO.java rename to src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangTotalListResponseDTO.java index 4264fc3a..b9cf0ee3 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangTotalListResponseDTO.java +++ b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangTotalListResponseDTO.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.limjang.response; +package umc.th.juinjang.api.limjang.service.response; import java.util.List; import lombok.AllArgsConstructor; diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsGetByKeywordResponse.java b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangsGetByKeywordResponse.java similarity index 84% rename from src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsGetByKeywordResponse.java rename to src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangsGetByKeywordResponse.java index 95700608..fb4df30c 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsGetByKeywordResponse.java +++ b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangsGetByKeywordResponse.java @@ -1,11 +1,11 @@ -package umc.th.juinjang.model.dto.limjang.response; +package umc.th.juinjang.api.limjang.service.response; -import static umc.th.juinjang.service.limjang.LimjangPriceBridge.makePriceListVersion2; +import static umc.th.juinjang.api.limjang.service.LimjangPriceBridge.makePriceListVersion2; import java.util.List; import java.util.Map; -import umc.th.juinjang.model.entity.Image; -import umc.th.juinjang.model.entity.Limjang; +import umc.th.juinjang.domain.image.model.Image; +import umc.th.juinjang.domain.limjang.model.Limjang; public record LimjangsGetByKeywordResponse(List limjangList) { record LimjangByKeywordResponse( diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsGetResponse.java b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangsGetResponse.java similarity index 84% rename from src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsGetResponse.java rename to src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangsGetResponse.java index 2e0afcad..4f8b5e64 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsGetResponse.java +++ b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangsGetResponse.java @@ -1,13 +1,13 @@ -package umc.th.juinjang.model.dto.limjang.response; +package umc.th.juinjang.api.limjang.service.response; -import static umc.th.juinjang.service.limjang.LimjangPriceBridge.makePriceListVersion2; +import static umc.th.juinjang.api.limjang.service.LimjangPriceBridge.makePriceListVersion2; import java.util.List; import java.util.Map; import lombok.Builder; -import umc.th.juinjang.model.entity.Image; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.LimjangPrice; +import umc.th.juinjang.domain.image.model.Image; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.limjang.model.LimjangPrice; public record LimjangsGetResponse(List limjangList) { @Builder diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsMainGetResponse.java b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangsMainGetResponse.java similarity index 76% rename from src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsMainGetResponse.java rename to src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangsMainGetResponse.java index 86e286ee..493b5084 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsMainGetResponse.java +++ b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangsMainGetResponse.java @@ -1,8 +1,8 @@ -package umc.th.juinjang.model.dto.limjang.response; +package umc.th.juinjang.api.limjang.service.response; import java.util.List; -import umc.th.juinjang.converter.limjang.LimjangsMainGetResponseConverter; -import umc.th.juinjang.model.entity.Limjang; +import umc.th.juinjang.api.limjang.service.converter.LimjangsMainGetResponseConverter; +import umc.th.juinjang.domain.limjang.model.Limjang; public record LimjangsMainGetResponse( List recentUpdatedList diff --git a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsMainGetVersion2Response.java b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangsMainGetVersion2Response.java similarity index 84% rename from src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsMainGetVersion2Response.java rename to src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangsMainGetVersion2Response.java index 024bbd6b..afd83ee9 100644 --- a/src/main/java/umc/th/juinjang/model/dto/limjang/response/LimjangsMainGetVersion2Response.java +++ b/src/main/java/umc/th/juinjang/api/limjang/service/response/LimjangsMainGetVersion2Response.java @@ -1,10 +1,10 @@ -package umc.th.juinjang.model.dto.limjang.response; +package umc.th.juinjang.api.limjang.service.response; -import static umc.th.juinjang.service.limjang.LimjangPriceBridge.getPriceToString; +import static umc.th.juinjang.api.limjang.service.LimjangPriceBridge.getPriceToString; import java.util.List; import lombok.Builder; -import umc.th.juinjang.model.entity.Limjang; +import umc.th.juinjang.domain.limjang.model.Limjang; public record LimjangsMainGetVersion2Response(List recentUpdatedList) { @Builder diff --git a/src/main/java/umc/th/juinjang/controller/MemberController.java b/src/main/java/umc/th/juinjang/api/member/controller/MemberController.java similarity index 79% rename from src/main/java/umc/th/juinjang/controller/MemberController.java rename to src/main/java/umc/th/juinjang/api/member/controller/MemberController.java index c103563d..814c5dac 100644 --- a/src/main/java/umc/th/juinjang/controller/MemberController.java +++ b/src/main/java/umc/th/juinjang/api/member/controller/MemberController.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.controller; +package umc.th.juinjang.api.member.controller; import io.swagger.v3.oas.annotations.Operation; import jakarta.validation.Valid; @@ -7,16 +7,16 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import umc.th.juinjang.apiPayload.ApiResponse; -import umc.th.juinjang.apiPayload.ExceptionHandler; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.model.dto.member.MemberAgreeVersionPostRequest; -import umc.th.juinjang.model.dto.member.MemberRequestDto; -import umc.th.juinjang.model.dto.member.MemberResponseDto; -import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.service.member.MemberService; +import umc.th.juinjang.api.dto.ApiResponse; +import umc.th.juinjang.common.ExceptionHandler; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.api.member.controller.request.MemberAgreeVersionPostRequest; +import umc.th.juinjang.api.member.controller.request.MemberRequestDto; +import umc.th.juinjang.api.member.service.response.MemberResponseDto; +import umc.th.juinjang.domain.member.model.Member; +import umc.th.juinjang.api.member.service.MemberService; -import static umc.th.juinjang.apiPayload.code.status.ErrorStatus.NICKNAME_EMPTY; +import static umc.th.juinjang.common.code.status.ErrorStatus.NICKNAME_EMPTY; @RestController @RequestMapping("/api") diff --git a/src/main/java/umc/th/juinjang/model/dto/member/MemberAgreeVersionPostRequest.java b/src/main/java/umc/th/juinjang/api/member/controller/request/MemberAgreeVersionPostRequest.java similarity index 85% rename from src/main/java/umc/th/juinjang/model/dto/member/MemberAgreeVersionPostRequest.java rename to src/main/java/umc/th/juinjang/api/member/controller/request/MemberAgreeVersionPostRequest.java index 599ad67c..fce37983 100644 --- a/src/main/java/umc/th/juinjang/model/dto/member/MemberAgreeVersionPostRequest.java +++ b/src/main/java/umc/th/juinjang/api/member/controller/request/MemberAgreeVersionPostRequest.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.member; +package umc.th.juinjang.api.member.controller.request; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; diff --git a/src/main/java/umc/th/juinjang/model/dto/member/MemberRequestDto.java b/src/main/java/umc/th/juinjang/api/member/controller/request/MemberRequestDto.java similarity index 78% rename from src/main/java/umc/th/juinjang/model/dto/member/MemberRequestDto.java rename to src/main/java/umc/th/juinjang/api/member/controller/request/MemberRequestDto.java index 7d8edfe7..84d0c898 100644 --- a/src/main/java/umc/th/juinjang/model/dto/member/MemberRequestDto.java +++ b/src/main/java/umc/th/juinjang/api/member/controller/request/MemberRequestDto.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.member; +package umc.th.juinjang.api.member.controller.request; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/umc/th/juinjang/service/member/MemberService.java b/src/main/java/umc/th/juinjang/api/member/service/MemberService.java similarity index 84% rename from src/main/java/umc/th/juinjang/service/member/MemberService.java rename to src/main/java/umc/th/juinjang/api/member/service/MemberService.java index dfd0abb9..481291a3 100644 --- a/src/main/java/umc/th/juinjang/service/member/MemberService.java +++ b/src/main/java/umc/th/juinjang/api/member/service/MemberService.java @@ -1,6 +1,6 @@ -package umc.th.juinjang.service.member; +package umc.th.juinjang.api.member.service; -import static umc.th.juinjang.apiPayload.code.status.ErrorStatus.MEMBER_NOT_FOUND; +import static umc.th.juinjang.common.code.status.ErrorStatus.MEMBER_NOT_FOUND; import com.amazonaws.AmazonServiceException; import com.amazonaws.services.s3.AmazonS3Client; @@ -12,14 +12,14 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import umc.th.juinjang.apiPayload.ExceptionHandler; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.MemberHandler; -import umc.th.juinjang.model.dto.member.MemberAgreeVersionPostRequest; -import umc.th.juinjang.model.dto.member.MemberRequestDto; -import umc.th.juinjang.model.dto.member.MemberResponseDto; -import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.repository.limjang.MemberRepository; +import umc.th.juinjang.common.ExceptionHandler; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.common.exception.handler.MemberHandler; +import umc.th.juinjang.api.member.controller.request.MemberAgreeVersionPostRequest; +import umc.th.juinjang.api.member.controller.request.MemberRequestDto; +import umc.th.juinjang.api.member.service.response.MemberResponseDto; +import umc.th.juinjang.domain.member.model.Member; +import umc.th.juinjang.domain.member.repository.MemberRepository; import java.io.IOException; import java.util.UUID; diff --git a/src/main/java/umc/th/juinjang/model/dto/member/MemberResponseDto.java b/src/main/java/umc/th/juinjang/api/member/service/response/MemberResponseDto.java similarity index 91% rename from src/main/java/umc/th/juinjang/model/dto/member/MemberResponseDto.java rename to src/main/java/umc/th/juinjang/api/member/service/response/MemberResponseDto.java index 4fd4627c..a5c38b39 100644 --- a/src/main/java/umc/th/juinjang/model/dto/member/MemberResponseDto.java +++ b/src/main/java/umc/th/juinjang/api/member/service/response/MemberResponseDto.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.member; +package umc.th.juinjang.api.member.service.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/umc/th/juinjang/controller/RecordController.java b/src/main/java/umc/th/juinjang/api/record/controller/RecordController.java similarity index 89% rename from src/main/java/umc/th/juinjang/controller/RecordController.java rename to src/main/java/umc/th/juinjang/api/record/controller/RecordController.java index 0ddfb8fa..b9392a99 100644 --- a/src/main/java/umc/th/juinjang/controller/RecordController.java +++ b/src/main/java/umc/th/juinjang/api/record/controller/RecordController.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.controller; +package umc.th.juinjang.api.record.controller; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; @@ -7,13 +7,13 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import umc.th.juinjang.apiPayload.ApiResponse; -import umc.th.juinjang.model.dto.limjang.response.LimjangMemoResponseDTO; -import umc.th.juinjang.model.dto.limjang.request.LimjangUpdateRequestDTO; -import umc.th.juinjang.model.dto.record.RecordRequestDTO; -import umc.th.juinjang.model.dto.record.RecordResponseDTO; -import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.service.record.RecordService; +import umc.th.juinjang.api.dto.ApiResponse; +import umc.th.juinjang.api.limjang.service.response.LimjangMemoResponseDTO; +import umc.th.juinjang.api.limjang.controller.request.LimjangUpdateRequestDTO; +import umc.th.juinjang.api.record.controller.request.RecordRequestDTO; +import umc.th.juinjang.api.record.service.response.RecordResponseDTO; +import umc.th.juinjang.domain.member.model.Member; +import umc.th.juinjang.api.record.service.RecordService; import java.io.IOException; import java.util.List; diff --git a/src/main/java/umc/th/juinjang/model/dto/record/RecordRequestDTO.java b/src/main/java/umc/th/juinjang/api/record/controller/request/RecordRequestDTO.java similarity index 92% rename from src/main/java/umc/th/juinjang/model/dto/record/RecordRequestDTO.java rename to src/main/java/umc/th/juinjang/api/record/controller/request/RecordRequestDTO.java index 65b38be1..751e9835 100644 --- a/src/main/java/umc/th/juinjang/model/dto/record/RecordRequestDTO.java +++ b/src/main/java/umc/th/juinjang/api/record/controller/request/RecordRequestDTO.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.record; +package umc.th.juinjang.api.record.controller.request; import lombok.*; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/umc/th/juinjang/service/record/RecordService.java b/src/main/java/umc/th/juinjang/api/record/service/RecordService.java similarity index 88% rename from src/main/java/umc/th/juinjang/service/record/RecordService.java rename to src/main/java/umc/th/juinjang/api/record/service/RecordService.java index 61b93e35..6810c4f7 100644 --- a/src/main/java/umc/th/juinjang/service/record/RecordService.java +++ b/src/main/java/umc/th/juinjang/api/record/service/RecordService.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.record; +package umc.th.juinjang.api.record.service; import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.model.ObjectMetadata; @@ -8,19 +8,19 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import umc.th.juinjang.apiPayload.ExceptionHandler; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.LimjangHandler; -import umc.th.juinjang.converter.record.LimjangMemoConverter; -import umc.th.juinjang.converter.record.RecordConverter; -import umc.th.juinjang.model.dto.limjang.response.LimjangMemoResponseDTO; -import umc.th.juinjang.model.dto.record.RecordRequestDTO; -import umc.th.juinjang.model.dto.record.RecordResponseDTO; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.model.entity.Record; -import umc.th.juinjang.repository.limjang.LimjangRepository; -import umc.th.juinjang.repository.record.RecordRepository; +import umc.th.juinjang.common.ExceptionHandler; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.common.exception.handler.LimjangHandler; +import umc.th.juinjang.api.record.service.converter.LimjangMemoConverter; +import umc.th.juinjang.api.record.service.converter.RecordConverter; +import umc.th.juinjang.api.limjang.service.response.LimjangMemoResponseDTO; +import umc.th.juinjang.api.record.controller.request.RecordRequestDTO; +import umc.th.juinjang.api.record.service.response.RecordResponseDTO; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.member.model.Member; +import umc.th.juinjang.domain.record.model.Record; +import umc.th.juinjang.domain.limjang.repository.LimjangRepository; +import umc.th.juinjang.domain.record.repository.RecordRepository; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/src/main/java/umc/th/juinjang/converter/record/LimjangMemoConverter.java b/src/main/java/umc/th/juinjang/api/record/service/converter/LimjangMemoConverter.java similarity index 68% rename from src/main/java/umc/th/juinjang/converter/record/LimjangMemoConverter.java rename to src/main/java/umc/th/juinjang/api/record/service/converter/LimjangMemoConverter.java index e529b502..56990ae6 100644 --- a/src/main/java/umc/th/juinjang/converter/record/LimjangMemoConverter.java +++ b/src/main/java/umc/th/juinjang/api/record/service/converter/LimjangMemoConverter.java @@ -1,7 +1,7 @@ -package umc.th.juinjang.converter.record; +package umc.th.juinjang.api.record.service.converter; -import umc.th.juinjang.model.dto.limjang.response.LimjangMemoResponseDTO; -import umc.th.juinjang.model.entity.Limjang; +import umc.th.juinjang.api.limjang.service.response.LimjangMemoResponseDTO; +import umc.th.juinjang.domain.limjang.model.Limjang; public class LimjangMemoConverter { diff --git a/src/main/java/umc/th/juinjang/converter/record/RecordConverter.java b/src/main/java/umc/th/juinjang/api/record/service/converter/RecordConverter.java similarity index 85% rename from src/main/java/umc/th/juinjang/converter/record/RecordConverter.java rename to src/main/java/umc/th/juinjang/api/record/service/converter/RecordConverter.java index 9542a1d8..5131feec 100644 --- a/src/main/java/umc/th/juinjang/converter/record/RecordConverter.java +++ b/src/main/java/umc/th/juinjang/api/record/service/converter/RecordConverter.java @@ -1,9 +1,9 @@ -package umc.th.juinjang.converter.record; +package umc.th.juinjang.api.record.service.converter; -import umc.th.juinjang.model.dto.record.RecordRequestDTO; -import umc.th.juinjang.model.dto.record.RecordResponseDTO; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Record; +import umc.th.juinjang.api.record.controller.request.RecordRequestDTO; +import umc.th.juinjang.api.record.service.response.RecordResponseDTO; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.record.model.Record; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/umc/th/juinjang/model/dto/record/RecordResponseDTO.java b/src/main/java/umc/th/juinjang/api/record/service/response/RecordResponseDTO.java similarity index 94% rename from src/main/java/umc/th/juinjang/model/dto/record/RecordResponseDTO.java rename to src/main/java/umc/th/juinjang/api/record/service/response/RecordResponseDTO.java index ac31d6b1..8ba7d010 100644 --- a/src/main/java/umc/th/juinjang/model/dto/record/RecordResponseDTO.java +++ b/src/main/java/umc/th/juinjang/api/record/service/response/RecordResponseDTO.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.record; +package umc.th.juinjang.api.record.service.response; import lombok.*; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/umc/th/juinjang/controller/ScrapController.java b/src/main/java/umc/th/juinjang/api/scrap/controller/ScrapController.java similarity index 83% rename from src/main/java/umc/th/juinjang/controller/ScrapController.java rename to src/main/java/umc/th/juinjang/api/scrap/controller/ScrapController.java index a4586ecf..50e6aa42 100644 --- a/src/main/java/umc/th/juinjang/controller/ScrapController.java +++ b/src/main/java/umc/th/juinjang/api/scrap/controller/ScrapController.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.controller; +package umc.th.juinjang.api.scrap.controller; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; @@ -8,10 +8,10 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import umc.th.juinjang.apiPayload.ApiResponse; -import umc.th.juinjang.apiPayload.code.status.SuccessStatus; -import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.service.scrap.ScrapService; +import umc.th.juinjang.api.dto.ApiResponse; +import umc.th.juinjang.common.code.status.SuccessStatus; +import umc.th.juinjang.domain.member.model.Member; +import umc.th.juinjang.api.scrap.service.ScrapService; @RestController @RequestMapping("/api/limjangs/scraps") diff --git a/src/main/java/umc/th/juinjang/service/scrap/ScrapService.java b/src/main/java/umc/th/juinjang/api/scrap/service/ScrapService.java similarity index 59% rename from src/main/java/umc/th/juinjang/service/scrap/ScrapService.java rename to src/main/java/umc/th/juinjang/api/scrap/service/ScrapService.java index 6601a059..66b87716 100644 --- a/src/main/java/umc/th/juinjang/service/scrap/ScrapService.java +++ b/src/main/java/umc/th/juinjang/api/scrap/service/ScrapService.java @@ -1,6 +1,6 @@ -package umc.th.juinjang.service.scrap; +package umc.th.juinjang.api.scrap.service; -import umc.th.juinjang.model.entity.Member; +import umc.th.juinjang.domain.member.model.Member; public interface ScrapService { diff --git a/src/main/java/umc/th/juinjang/service/scrap/ScrapServiceImpl.java b/src/main/java/umc/th/juinjang/api/scrap/service/ScrapServiceImpl.java similarity index 77% rename from src/main/java/umc/th/juinjang/service/scrap/ScrapServiceImpl.java rename to src/main/java/umc/th/juinjang/api/scrap/service/ScrapServiceImpl.java index e3a682f8..c44679b6 100644 --- a/src/main/java/umc/th/juinjang/service/scrap/ScrapServiceImpl.java +++ b/src/main/java/umc/th/juinjang/api/scrap/service/ScrapServiceImpl.java @@ -1,18 +1,18 @@ -package umc.th.juinjang.service.scrap; +package umc.th.juinjang.api.scrap.service; import java.util.Optional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.LimjangHandler; -import umc.th.juinjang.apiPayload.exception.handler.ScrapHandler; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.model.entity.Scrap; -import umc.th.juinjang.repository.limjang.LimjangRepository; -import umc.th.juinjang.repository.limjang.ScrapRepository; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.common.exception.handler.LimjangHandler; +import umc.th.juinjang.common.exception.handler.ScrapHandler; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.member.model.Member; +import umc.th.juinjang.domain.scrap.model.Scrap; +import umc.th.juinjang.domain.limjang.repository.LimjangRepository; +import umc.th.juinjang.domain.scrap.repository.ScrapRepository; @Slf4j @Service diff --git a/src/main/java/umc/th/juinjang/apiPayload/ExceptionHandler.java b/src/main/java/umc/th/juinjang/apiPayload/ExceptionHandler.java deleted file mode 100644 index 3ab25bc5..00000000 --- a/src/main/java/umc/th/juinjang/apiPayload/ExceptionHandler.java +++ /dev/null @@ -1,10 +0,0 @@ -package umc.th.juinjang.apiPayload; - -import umc.th.juinjang.apiPayload.code.BaseErrorCode; -import umc.th.juinjang.apiPayload.exception.GeneralException; - -public class ExceptionHandler extends GeneralException { - public ExceptionHandler(BaseErrorCode code) { - super(code); - } -} diff --git a/src/main/java/umc/th/juinjang/apiPayload/exception/handler/ChecklistHandler.java b/src/main/java/umc/th/juinjang/apiPayload/exception/handler/ChecklistHandler.java deleted file mode 100644 index b23dbe04..00000000 --- a/src/main/java/umc/th/juinjang/apiPayload/exception/handler/ChecklistHandler.java +++ /dev/null @@ -1,10 +0,0 @@ -package umc.th.juinjang.apiPayload.exception.handler; - -import umc.th.juinjang.apiPayload.code.BaseErrorCode; -import umc.th.juinjang.apiPayload.exception.GeneralException; - -public class ChecklistHandler extends GeneralException { - public ChecklistHandler(BaseErrorCode code) { - super(code); - } -} diff --git a/src/main/java/umc/th/juinjang/apiPayload/exception/handler/LimjangHandler.java b/src/main/java/umc/th/juinjang/apiPayload/exception/handler/LimjangHandler.java deleted file mode 100644 index 76ace9d2..00000000 --- a/src/main/java/umc/th/juinjang/apiPayload/exception/handler/LimjangHandler.java +++ /dev/null @@ -1,10 +0,0 @@ -package umc.th.juinjang.apiPayload.exception.handler; - -import umc.th.juinjang.apiPayload.code.BaseErrorCode; -import umc.th.juinjang.apiPayload.exception.GeneralException; - -public class LimjangHandler extends GeneralException { - public LimjangHandler(BaseErrorCode code) { - super(code); - } -} diff --git a/src/main/java/umc/th/juinjang/apiPayload/exception/handler/MemberHandler.java b/src/main/java/umc/th/juinjang/apiPayload/exception/handler/MemberHandler.java deleted file mode 100644 index c0028963..00000000 --- a/src/main/java/umc/th/juinjang/apiPayload/exception/handler/MemberHandler.java +++ /dev/null @@ -1,11 +0,0 @@ -package umc.th.juinjang.apiPayload.exception.handler; - -import umc.th.juinjang.apiPayload.code.BaseErrorCode; -import umc.th.juinjang.apiPayload.exception.GeneralException; -import umc.th.juinjang.repository.limjang.MemberRepository; - -public class MemberHandler extends GeneralException { - public MemberHandler(BaseErrorCode code) { - super(code); - } -} diff --git a/src/main/java/umc/th/juinjang/apiPayload/exception/handler/S3Handler.java b/src/main/java/umc/th/juinjang/apiPayload/exception/handler/S3Handler.java deleted file mode 100644 index c1aab06b..00000000 --- a/src/main/java/umc/th/juinjang/apiPayload/exception/handler/S3Handler.java +++ /dev/null @@ -1,10 +0,0 @@ -package umc.th.juinjang.apiPayload.exception.handler; - -import umc.th.juinjang.apiPayload.code.BaseErrorCode; -import umc.th.juinjang.apiPayload.exception.GeneralException; - -public class S3Handler extends GeneralException { - public S3Handler(BaseErrorCode code) { - super(code); - } -} diff --git a/src/main/java/umc/th/juinjang/apiPayload/exception/handler/ScrapHandler.java b/src/main/java/umc/th/juinjang/apiPayload/exception/handler/ScrapHandler.java deleted file mode 100644 index 1321798a..00000000 --- a/src/main/java/umc/th/juinjang/apiPayload/exception/handler/ScrapHandler.java +++ /dev/null @@ -1,10 +0,0 @@ -package umc.th.juinjang.apiPayload.exception.handler; - -import umc.th.juinjang.apiPayload.code.BaseErrorCode; -import umc.th.juinjang.apiPayload.exception.GeneralException; - -public class ScrapHandler extends GeneralException { - public ScrapHandler(BaseErrorCode code) { - super(code); - } -} diff --git a/src/main/java/umc/th/juinjang/config/SecurityConfig.java b/src/main/java/umc/th/juinjang/auth/config/SecurityConfig.java similarity index 95% rename from src/main/java/umc/th/juinjang/config/SecurityConfig.java rename to src/main/java/umc/th/juinjang/auth/config/SecurityConfig.java index 766cb4c7..741f4eae 100644 --- a/src/main/java/umc/th/juinjang/config/SecurityConfig.java +++ b/src/main/java/umc/th/juinjang/auth/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.config; +package umc.th.juinjang.auth.config; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; @@ -16,9 +16,9 @@ import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; -import umc.th.juinjang.jwt.JwtAuthenticationFilter; -import umc.th.juinjang.jwt.JwtExceptionFilter; -import umc.th.juinjang.service.auth.JwtService; +import umc.th.juinjang.auth.jwt.JwtAuthenticationFilter; +import umc.th.juinjang.auth.jwt.JwtExceptionFilter; +import umc.th.juinjang.auth.jwt.JwtService; import java.util.Arrays; diff --git a/src/main/java/umc/th/juinjang/jwt/JwtAuthenticationFilter.java b/src/main/java/umc/th/juinjang/auth/jwt/JwtAuthenticationFilter.java similarity index 96% rename from src/main/java/umc/th/juinjang/jwt/JwtAuthenticationFilter.java rename to src/main/java/umc/th/juinjang/auth/jwt/JwtAuthenticationFilter.java index eec3e720..7772075f 100644 --- a/src/main/java/umc/th/juinjang/jwt/JwtAuthenticationFilter.java +++ b/src/main/java/umc/th/juinjang/auth/jwt/JwtAuthenticationFilter.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.jwt; +package umc.th.juinjang.auth.jwt; import io.jsonwebtoken.ExpiredJwtException; import jakarta.servlet.FilterChain; @@ -11,7 +11,6 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; -import umc.th.juinjang.service.auth.JwtService; import java.io.IOException; diff --git a/src/main/java/umc/th/juinjang/jwt/JwtExceptionFilter.java b/src/main/java/umc/th/juinjang/auth/jwt/JwtExceptionFilter.java similarity index 92% rename from src/main/java/umc/th/juinjang/jwt/JwtExceptionFilter.java rename to src/main/java/umc/th/juinjang/auth/jwt/JwtExceptionFilter.java index 63635af2..7ecc8ce3 100644 --- a/src/main/java/umc/th/juinjang/jwt/JwtExceptionFilter.java +++ b/src/main/java/umc/th/juinjang/auth/jwt/JwtExceptionFilter.java @@ -1,10 +1,9 @@ -package umc.th.juinjang.jwt; +package umc.th.juinjang.auth.jwt; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import io.jsonwebtoken.ExpiredJwtException; -import io.jsonwebtoken.JwtException; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -13,14 +12,13 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -import umc.th.juinjang.apiPayload.ExceptionHandler; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; +import umc.th.juinjang.common.ExceptionHandler; +import umc.th.juinjang.common.code.status.ErrorStatus; import java.io.IOException; import java.time.LocalDateTime; import java.util.HashMap; import java.util.Map; -import java.util.TooManyListenersException; @Slf4j @Component diff --git a/src/main/java/umc/th/juinjang/service/auth/JwtService.java b/src/main/java/umc/th/juinjang/auth/jwt/JwtService.java similarity index 92% rename from src/main/java/umc/th/juinjang/service/auth/JwtService.java rename to src/main/java/umc/th/juinjang/auth/jwt/JwtService.java index 26cb3d16..4b5a9965 100644 --- a/src/main/java/umc/th/juinjang/service/auth/JwtService.java +++ b/src/main/java/umc/th/juinjang/auth/jwt/JwtService.java @@ -1,6 +1,6 @@ -package umc.th.juinjang.service.auth; +package umc.th.juinjang.auth.jwt; -import static umc.th.juinjang.utils.LoggerProvider.registerUserId; +import static umc.th.juinjang.common.LoggerProvider.registerUserId; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -20,22 +20,18 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Service; -import umc.th.juinjang.apiPayload.ExceptionHandler; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.jwt.JwtAuthenticationFilter; -import umc.th.juinjang.model.dto.auth.TokenDto; -import umc.th.juinjang.model.dto.auth.apple.AppleClient; -import umc.th.juinjang.model.dto.auth.apple.AppleInfo; -import umc.th.juinjang.repository.limjang.MemberRepository; -import umc.th.juinjang.utils.ApplePublicKeyGenerator; -import umc.th.juinjang.utils.LoggerProvider; +import umc.th.juinjang.common.ExceptionHandler; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.external.openfeign.apple.AppleClient; +import umc.th.juinjang.api.auth.controller.request.AppleInfo; +import umc.th.juinjang.domain.member.repository.MemberRepository; +import umc.th.juinjang.external.openfeign.apple.ApplePublicKeyGenerator; @Service @RequiredArgsConstructor diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/TokenDto.java b/src/main/java/umc/th/juinjang/auth/jwt/TokenDto.java similarity index 81% rename from src/main/java/umc/th/juinjang/model/dto/auth/TokenDto.java rename to src/main/java/umc/th/juinjang/auth/jwt/TokenDto.java index e6fa2b39..108e7a47 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/TokenDto.java +++ b/src/main/java/umc/th/juinjang/auth/jwt/TokenDto.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.auth; +package umc.th.juinjang.auth.jwt; import lombok.Getter; diff --git a/src/main/java/umc/th/juinjang/service/auth/UserDetailServiceImpl.java b/src/main/java/umc/th/juinjang/auth/jwt/UserDetailServiceImpl.java similarity index 81% rename from src/main/java/umc/th/juinjang/service/auth/UserDetailServiceImpl.java rename to src/main/java/umc/th/juinjang/auth/jwt/UserDetailServiceImpl.java index edc681fb..76f0a325 100644 --- a/src/main/java/umc/th/juinjang/service/auth/UserDetailServiceImpl.java +++ b/src/main/java/umc/th/juinjang/auth/jwt/UserDetailServiceImpl.java @@ -1,16 +1,15 @@ -package umc.th.juinjang.service.auth; +package umc.th.juinjang.auth.jwt; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.coyote.BadRequestException; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; -import umc.th.juinjang.apiPayload.ExceptionHandler; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.repository.limjang.MemberRepository; +import umc.th.juinjang.common.ExceptionHandler; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.domain.member.repository.MemberRepository; @Slf4j @RequiredArgsConstructor diff --git a/src/main/java/umc/th/juinjang/common/ExceptionHandler.java b/src/main/java/umc/th/juinjang/common/ExceptionHandler.java new file mode 100644 index 00000000..2460bcb1 --- /dev/null +++ b/src/main/java/umc/th/juinjang/common/ExceptionHandler.java @@ -0,0 +1,10 @@ +package umc.th.juinjang.common; + +import umc.th.juinjang.common.code.BaseErrorCode; +import umc.th.juinjang.common.exception.GeneralException; + +public class ExceptionHandler extends GeneralException { + public ExceptionHandler(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/umc/th/juinjang/utils/LoggerProvider.java b/src/main/java/umc/th/juinjang/common/LoggerProvider.java similarity index 94% rename from src/main/java/umc/th/juinjang/utils/LoggerProvider.java rename to src/main/java/umc/th/juinjang/common/LoggerProvider.java index af68be00..72b51402 100644 --- a/src/main/java/umc/th/juinjang/utils/LoggerProvider.java +++ b/src/main/java/umc/th/juinjang/common/LoggerProvider.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.utils; +package umc.th.juinjang.common; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/umc/th/juinjang/apiPayload/code/BaseCode.java b/src/main/java/umc/th/juinjang/common/code/BaseCode.java similarity index 72% rename from src/main/java/umc/th/juinjang/apiPayload/code/BaseCode.java rename to src/main/java/umc/th/juinjang/common/code/BaseCode.java index 41ba8ffd..d4efa8b5 100644 --- a/src/main/java/umc/th/juinjang/apiPayload/code/BaseCode.java +++ b/src/main/java/umc/th/juinjang/common/code/BaseCode.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.apiPayload.code; +package umc.th.juinjang.common.code; public interface BaseCode { diff --git a/src/main/java/umc/th/juinjang/apiPayload/code/BaseErrorCode.java b/src/main/java/umc/th/juinjang/common/code/BaseErrorCode.java similarity index 75% rename from src/main/java/umc/th/juinjang/apiPayload/code/BaseErrorCode.java rename to src/main/java/umc/th/juinjang/common/code/BaseErrorCode.java index 6c4ac93e..cdf8d89c 100644 --- a/src/main/java/umc/th/juinjang/apiPayload/code/BaseErrorCode.java +++ b/src/main/java/umc/th/juinjang/common/code/BaseErrorCode.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.apiPayload.code; +package umc.th.juinjang.common.code; public interface BaseErrorCode { diff --git a/src/main/java/umc/th/juinjang/apiPayload/code/ErrorReasonDTO.java b/src/main/java/umc/th/juinjang/common/code/ErrorReasonDTO.java similarity index 89% rename from src/main/java/umc/th/juinjang/apiPayload/code/ErrorReasonDTO.java rename to src/main/java/umc/th/juinjang/common/code/ErrorReasonDTO.java index 01cafee4..8ed9e639 100644 --- a/src/main/java/umc/th/juinjang/apiPayload/code/ErrorReasonDTO.java +++ b/src/main/java/umc/th/juinjang/common/code/ErrorReasonDTO.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.apiPayload.code; +package umc.th.juinjang.common.code; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/umc/th/juinjang/apiPayload/code/ReasonDTO.java b/src/main/java/umc/th/juinjang/common/code/ReasonDTO.java similarity index 88% rename from src/main/java/umc/th/juinjang/apiPayload/code/ReasonDTO.java rename to src/main/java/umc/th/juinjang/common/code/ReasonDTO.java index dccf21a1..37d64d8d 100644 --- a/src/main/java/umc/th/juinjang/apiPayload/code/ReasonDTO.java +++ b/src/main/java/umc/th/juinjang/common/code/ReasonDTO.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.apiPayload.code; +package umc.th.juinjang.common.code; import lombok.Builder; diff --git a/src/main/java/umc/th/juinjang/apiPayload/code/status/ErrorStatus.java b/src/main/java/umc/th/juinjang/common/code/status/ErrorStatus.java similarity index 98% rename from src/main/java/umc/th/juinjang/apiPayload/code/status/ErrorStatus.java rename to src/main/java/umc/th/juinjang/common/code/status/ErrorStatus.java index 0a1d2c92..2147ded8 100644 --- a/src/main/java/umc/th/juinjang/apiPayload/code/status/ErrorStatus.java +++ b/src/main/java/umc/th/juinjang/common/code/status/ErrorStatus.java @@ -1,10 +1,10 @@ -package umc.th.juinjang.apiPayload.code.status; +package umc.th.juinjang.common.code.status; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; -import umc.th.juinjang.apiPayload.code.BaseErrorCode; -import umc.th.juinjang.apiPayload.code.ErrorReasonDTO; +import umc.th.juinjang.common.code.BaseErrorCode; +import umc.th.juinjang.common.code.ErrorReasonDTO; @Getter @AllArgsConstructor diff --git a/src/main/java/umc/th/juinjang/apiPayload/code/status/SuccessStatus.java b/src/main/java/umc/th/juinjang/common/code/status/SuccessStatus.java similarity index 92% rename from src/main/java/umc/th/juinjang/apiPayload/code/status/SuccessStatus.java rename to src/main/java/umc/th/juinjang/common/code/status/SuccessStatus.java index ddd8b8ec..eb65a3f9 100644 --- a/src/main/java/umc/th/juinjang/apiPayload/code/status/SuccessStatus.java +++ b/src/main/java/umc/th/juinjang/common/code/status/SuccessStatus.java @@ -1,10 +1,10 @@ -package umc.th.juinjang.apiPayload.code.status; +package umc.th.juinjang.common.code.status; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; -import umc.th.juinjang.apiPayload.code.BaseCode; -import umc.th.juinjang.apiPayload.code.ReasonDTO; +import umc.th.juinjang.common.code.BaseCode; +import umc.th.juinjang.common.code.ReasonDTO; @Getter @AllArgsConstructor diff --git a/src/main/java/umc/th/juinjang/apiPayload/exception/ExceptionAdvice.java b/src/main/java/umc/th/juinjang/common/exception/ExceptionAdvice.java similarity index 93% rename from src/main/java/umc/th/juinjang/apiPayload/exception/ExceptionAdvice.java rename to src/main/java/umc/th/juinjang/common/exception/ExceptionAdvice.java index 1ebd5ffc..7012a2d7 100644 --- a/src/main/java/umc/th/juinjang/apiPayload/exception/ExceptionAdvice.java +++ b/src/main/java/umc/th/juinjang/common/exception/ExceptionAdvice.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.apiPayload.exception; +package umc.th.juinjang.common.exception; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; @@ -6,7 +6,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatusCode; import org.springframework.http.ResponseEntity; -import org.springframework.lang.Nullable; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestController; @@ -14,13 +13,10 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.context.request.WebRequest; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; -import umc.th.juinjang.apiPayload.ApiResponse; -import umc.th.juinjang.apiPayload.code.ErrorReasonDTO; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.GeneralException; +import umc.th.juinjang.api.dto.ApiResponse; +import umc.th.juinjang.common.code.ErrorReasonDTO; +import umc.th.juinjang.common.code.status.ErrorStatus; import jakarta.validation.ConstraintViolationException; -import java.io.PrintWriter; -import java.io.StringWriter; import java.util.LinkedHashMap; import java.util.Map; import java.util.Optional; diff --git a/src/main/java/umc/th/juinjang/apiPayload/exception/GeneralException.java b/src/main/java/umc/th/juinjang/common/exception/GeneralException.java similarity index 70% rename from src/main/java/umc/th/juinjang/apiPayload/exception/GeneralException.java rename to src/main/java/umc/th/juinjang/common/exception/GeneralException.java index 98dd7beb..7c269fe1 100644 --- a/src/main/java/umc/th/juinjang/apiPayload/exception/GeneralException.java +++ b/src/main/java/umc/th/juinjang/common/exception/GeneralException.java @@ -1,9 +1,9 @@ -package umc.th.juinjang.apiPayload.exception; +package umc.th.juinjang.common.exception; import lombok.AllArgsConstructor; import lombok.Getter; -import umc.th.juinjang.apiPayload.code.BaseErrorCode; -import umc.th.juinjang.apiPayload.code.ErrorReasonDTO; +import umc.th.juinjang.common.code.BaseErrorCode; +import umc.th.juinjang.common.code.ErrorReasonDTO; @Getter @AllArgsConstructor diff --git a/src/main/java/umc/th/juinjang/common/exception/handler/ChecklistHandler.java b/src/main/java/umc/th/juinjang/common/exception/handler/ChecklistHandler.java new file mode 100644 index 00000000..6128abb6 --- /dev/null +++ b/src/main/java/umc/th/juinjang/common/exception/handler/ChecklistHandler.java @@ -0,0 +1,10 @@ +package umc.th.juinjang.common.exception.handler; + +import umc.th.juinjang.common.code.BaseErrorCode; +import umc.th.juinjang.common.exception.GeneralException; + +public class ChecklistHandler extends GeneralException { + public ChecklistHandler(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/umc/th/juinjang/common/exception/handler/LimjangHandler.java b/src/main/java/umc/th/juinjang/common/exception/handler/LimjangHandler.java new file mode 100644 index 00000000..c6a22796 --- /dev/null +++ b/src/main/java/umc/th/juinjang/common/exception/handler/LimjangHandler.java @@ -0,0 +1,10 @@ +package umc.th.juinjang.common.exception.handler; + +import umc.th.juinjang.common.code.BaseErrorCode; +import umc.th.juinjang.common.exception.GeneralException; + +public class LimjangHandler extends GeneralException { + public LimjangHandler(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/umc/th/juinjang/common/exception/handler/MemberHandler.java b/src/main/java/umc/th/juinjang/common/exception/handler/MemberHandler.java new file mode 100644 index 00000000..96076f6a --- /dev/null +++ b/src/main/java/umc/th/juinjang/common/exception/handler/MemberHandler.java @@ -0,0 +1,10 @@ +package umc.th.juinjang.common.exception.handler; + +import umc.th.juinjang.common.code.BaseErrorCode; +import umc.th.juinjang.common.exception.GeneralException; + +public class MemberHandler extends GeneralException { + public MemberHandler(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/umc/th/juinjang/common/exception/handler/S3Handler.java b/src/main/java/umc/th/juinjang/common/exception/handler/S3Handler.java new file mode 100644 index 00000000..09a67d33 --- /dev/null +++ b/src/main/java/umc/th/juinjang/common/exception/handler/S3Handler.java @@ -0,0 +1,10 @@ +package umc.th.juinjang.common.exception.handler; + +import umc.th.juinjang.common.code.BaseErrorCode; +import umc.th.juinjang.common.exception.GeneralException; + +public class S3Handler extends GeneralException { + public S3Handler(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/umc/th/juinjang/common/exception/handler/ScrapHandler.java b/src/main/java/umc/th/juinjang/common/exception/handler/ScrapHandler.java new file mode 100644 index 00000000..6efb3185 --- /dev/null +++ b/src/main/java/umc/th/juinjang/common/exception/handler/ScrapHandler.java @@ -0,0 +1,10 @@ +package umc.th.juinjang.common.exception.handler; + +import umc.th.juinjang.common.code.BaseErrorCode; +import umc.th.juinjang.common.exception.GeneralException; + +public class ScrapHandler extends GeneralException { + public ScrapHandler(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/umc/th/juinjang/validation/annotation/VaildPriceListSize.java b/src/main/java/umc/th/juinjang/common/validation/annotation/VaildPriceListSize.java similarity index 83% rename from src/main/java/umc/th/juinjang/validation/annotation/VaildPriceListSize.java rename to src/main/java/umc/th/juinjang/common/validation/annotation/VaildPriceListSize.java index 3805350a..b1bf15f5 100644 --- a/src/main/java/umc/th/juinjang/validation/annotation/VaildPriceListSize.java +++ b/src/main/java/umc/th/juinjang/common/validation/annotation/VaildPriceListSize.java @@ -1,9 +1,9 @@ -package umc.th.juinjang.validation.annotation; +package umc.th.juinjang.common.validation.annotation; import jakarta.validation.Constraint; import jakarta.validation.Payload; import java.lang.annotation.*; -import umc.th.juinjang.validation.validator.PriceListVaildation; +import umc.th.juinjang.common.validation.validator.PriceListVaildation; @Documented @Constraint(validatedBy = PriceListVaildation.class) diff --git a/src/main/java/umc/th/juinjang/validation/validator/PriceListVaildation.java b/src/main/java/umc/th/juinjang/common/validation/validator/PriceListVaildation.java similarity index 86% rename from src/main/java/umc/th/juinjang/validation/validator/PriceListVaildation.java rename to src/main/java/umc/th/juinjang/common/validation/validator/PriceListVaildation.java index 75c6cf40..e1209537 100644 --- a/src/main/java/umc/th/juinjang/validation/validator/PriceListVaildation.java +++ b/src/main/java/umc/th/juinjang/common/validation/validator/PriceListVaildation.java @@ -1,11 +1,11 @@ -package umc.th.juinjang.validation.validator; +package umc.th.juinjang.common.validation.validator; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import umc.th.juinjang.validation.annotation.VaildPriceListSize; +import umc.th.juinjang.common.validation.annotation.VaildPriceListSize; @Component @RequiredArgsConstructor diff --git a/src/main/java/umc/th/juinjang/controller/ChecklistControllerV2.java b/src/main/java/umc/th/juinjang/controller/ChecklistControllerV2.java deleted file mode 100644 index a8cebd49..00000000 --- a/src/main/java/umc/th/juinjang/controller/ChecklistControllerV2.java +++ /dev/null @@ -1,23 +0,0 @@ -package umc.th.juinjang.controller; - -import io.swagger.v3.oas.annotations.Operation; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import umc.th.juinjang.apiPayload.ApiResponse; -import umc.th.juinjang.model.dto.checklist.ChecklistAnswerAndReportResponseDTO; -import umc.th.juinjang.model.dto.checklist.ChecklistAnswerRequestDTO; -import umc.th.juinjang.model.dto.checklist.ChecklistAnswerResponseDTO; -import umc.th.juinjang.model.dto.checklist.ReportResponseDTO; -import umc.th.juinjang.service.checklist.ChecklistCommandService; -import umc.th.juinjang.service.checklist.ChecklistQueryService; - -import java.util.List; - -@RestController -@RequestMapping("/api/v2") -@RequiredArgsConstructor -@Validated -public class ChecklistControllerV2 { - int test; -} diff --git a/src/main/java/umc/th/juinjang/model/entity/ChecklistAnswer.java b/src/main/java/umc/th/juinjang/domain/checklist/model/ChecklistAnswer.java similarity index 86% rename from src/main/java/umc/th/juinjang/model/entity/ChecklistAnswer.java rename to src/main/java/umc/th/juinjang/domain/checklist/model/ChecklistAnswer.java index 4daecc3d..a3ac0c8e 100644 --- a/src/main/java/umc/th/juinjang/model/entity/ChecklistAnswer.java +++ b/src/main/java/umc/th/juinjang/domain/checklist/model/ChecklistAnswer.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.entity; +package umc.th.juinjang.domain.checklist.model; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -13,7 +13,8 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import umc.th.juinjang.model.entity.common.BaseEntity; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.common.BaseEntity; @Entity @Getter diff --git a/src/main/java/umc/th/juinjang/model/entity/enums/ChecklistQuestionCategory.java b/src/main/java/umc/th/juinjang/domain/checklist/model/ChecklistQuestionCategory.java similarity index 72% rename from src/main/java/umc/th/juinjang/model/entity/enums/ChecklistQuestionCategory.java rename to src/main/java/umc/th/juinjang/domain/checklist/model/ChecklistQuestionCategory.java index b2b97f64..415b3ff7 100644 --- a/src/main/java/umc/th/juinjang/model/entity/enums/ChecklistQuestionCategory.java +++ b/src/main/java/umc/th/juinjang/domain/checklist/model/ChecklistQuestionCategory.java @@ -1,9 +1,8 @@ -package umc.th.juinjang.model.entity.enums; +package umc.th.juinjang.domain.checklist.model; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.ChecklistHandler; -import umc.th.juinjang.apiPayload.exception.handler.LimjangHandler; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.common.exception.handler.ChecklistHandler; import java.util.Arrays; diff --git a/src/main/java/umc/th/juinjang/model/entity/ChecklistQuestionShort.java b/src/main/java/umc/th/juinjang/domain/checklist/model/ChecklistQuestionShort.java similarity index 74% rename from src/main/java/umc/th/juinjang/model/entity/ChecklistQuestionShort.java rename to src/main/java/umc/th/juinjang/domain/checklist/model/ChecklistQuestionShort.java index 3217cba3..9337e32f 100644 --- a/src/main/java/umc/th/juinjang/model/entity/ChecklistQuestionShort.java +++ b/src/main/java/umc/th/juinjang/domain/checklist/model/ChecklistQuestionShort.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.entity; +package umc.th.juinjang.domain.checklist.model; import jakarta.persistence.*; @@ -9,10 +9,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import umc.th.juinjang.model.entity.common.BaseEntity; -import umc.th.juinjang.model.entity.enums.ChecklistQuestionCategory; -import umc.th.juinjang.model.entity.enums.ChecklistQuestionType; -import umc.th.juinjang.model.entity.enums.LimjangPurpose; +import umc.th.juinjang.domain.common.BaseEntity; @Entity @Getter diff --git a/src/main/java/umc/th/juinjang/model/entity/enums/ChecklistQuestionType.java b/src/main/java/umc/th/juinjang/domain/checklist/model/ChecklistQuestionType.java similarity index 78% rename from src/main/java/umc/th/juinjang/model/entity/enums/ChecklistQuestionType.java rename to src/main/java/umc/th/juinjang/domain/checklist/model/ChecklistQuestionType.java index fffd52bb..c4726741 100644 --- a/src/main/java/umc/th/juinjang/model/entity/enums/ChecklistQuestionType.java +++ b/src/main/java/umc/th/juinjang/domain/checklist/model/ChecklistQuestionType.java @@ -1,7 +1,7 @@ -package umc.th.juinjang.model.entity.enums; +package umc.th.juinjang.domain.checklist.model; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.ChecklistHandler; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.common.exception.handler.ChecklistHandler; import java.util.Arrays; diff --git a/src/main/java/umc/th/juinjang/model/entity/enums/ChecklistQuestionVersion.java b/src/main/java/umc/th/juinjang/domain/checklist/model/ChecklistQuestionVersion.java similarity index 78% rename from src/main/java/umc/th/juinjang/model/entity/enums/ChecklistQuestionVersion.java rename to src/main/java/umc/th/juinjang/domain/checklist/model/ChecklistQuestionVersion.java index 28b6602d..d9ee43dc 100644 --- a/src/main/java/umc/th/juinjang/model/entity/enums/ChecklistQuestionVersion.java +++ b/src/main/java/umc/th/juinjang/domain/checklist/model/ChecklistQuestionVersion.java @@ -1,7 +1,7 @@ -package umc.th.juinjang.model.entity.enums; +package umc.th.juinjang.domain.checklist.model; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.ChecklistHandler; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.common.exception.handler.ChecklistHandler; import java.util.Arrays; diff --git a/src/main/java/umc/th/juinjang/model/entity/enums/LimjangCheckListVersion.java b/src/main/java/umc/th/juinjang/domain/checklist/model/LimjangCheckListVersion.java similarity index 68% rename from src/main/java/umc/th/juinjang/model/entity/enums/LimjangCheckListVersion.java rename to src/main/java/umc/th/juinjang/domain/checklist/model/LimjangCheckListVersion.java index 99af9f32..d2eb7810 100644 --- a/src/main/java/umc/th/juinjang/model/entity/enums/LimjangCheckListVersion.java +++ b/src/main/java/umc/th/juinjang/domain/checklist/model/LimjangCheckListVersion.java @@ -1,6 +1,8 @@ -package umc.th.juinjang.model.entity.enums; +package umc.th.juinjang.domain.checklist.model; -import umc.th.juinjang.model.entity.Limjang; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.limjang.model.LimjangPropertyType; +import umc.th.juinjang.domain.limjang.model.LimjangPurpose; public enum LimjangCheckListVersion { LIMJANG, diff --git a/src/main/java/umc/th/juinjang/repository/checklist/ChecklistAnswerRepository.java b/src/main/java/umc/th/juinjang/domain/checklist/repository/ChecklistAnswerRepository.java similarity index 81% rename from src/main/java/umc/th/juinjang/repository/checklist/ChecklistAnswerRepository.java rename to src/main/java/umc/th/juinjang/domain/checklist/repository/ChecklistAnswerRepository.java index 35c4c1d6..3f8fe06a 100644 --- a/src/main/java/umc/th/juinjang/repository/checklist/ChecklistAnswerRepository.java +++ b/src/main/java/umc/th/juinjang/domain/checklist/repository/ChecklistAnswerRepository.java @@ -1,12 +1,12 @@ -package umc.th.juinjang.repository.checklist; +package umc.th.juinjang.domain.checklist.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import umc.th.juinjang.model.entity.ChecklistAnswer; -import umc.th.juinjang.model.entity.Limjang; +import umc.th.juinjang.domain.checklist.model.ChecklistAnswer; +import umc.th.juinjang.domain.limjang.model.Limjang; import java.util.List; diff --git a/src/main/java/umc/th/juinjang/repository/checklist/ChecklistQuestionRepository.java b/src/main/java/umc/th/juinjang/domain/checklist/repository/ChecklistQuestionRepository.java similarity index 60% rename from src/main/java/umc/th/juinjang/repository/checklist/ChecklistQuestionRepository.java rename to src/main/java/umc/th/juinjang/domain/checklist/repository/ChecklistQuestionRepository.java index 1bcfa819..484aa466 100644 --- a/src/main/java/umc/th/juinjang/repository/checklist/ChecklistQuestionRepository.java +++ b/src/main/java/umc/th/juinjang/domain/checklist/repository/ChecklistQuestionRepository.java @@ -1,11 +1,7 @@ -package umc.th.juinjang.repository.checklist; +package umc.th.juinjang.domain.checklist.repository; import org.springframework.data.jpa.repository.JpaRepository; -import umc.th.juinjang.model.entity.ChecklistQuestionShort; -import umc.th.juinjang.model.entity.enums.ChecklistQuestionCategory; -import umc.th.juinjang.model.entity.enums.LimjangPurpose; - -import java.util.List; +import umc.th.juinjang.domain.checklist.model.ChecklistQuestionShort; public interface ChecklistQuestionRepository extends JpaRepository { // List findChecklistQuestionsByPurpose(LimjangPurpose purpose); diff --git a/src/main/java/umc/th/juinjang/model/entity/common/BaseEntity.java b/src/main/java/umc/th/juinjang/domain/common/BaseEntity.java similarity index 93% rename from src/main/java/umc/th/juinjang/model/entity/common/BaseEntity.java rename to src/main/java/umc/th/juinjang/domain/common/BaseEntity.java index a0f98e14..9e026aa9 100644 --- a/src/main/java/umc/th/juinjang/model/entity/common/BaseEntity.java +++ b/src/main/java/umc/th/juinjang/domain/common/BaseEntity.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.entity.common; +package umc.th.juinjang.domain.common; import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; diff --git a/src/main/java/umc/th/juinjang/model/entity/Image.java b/src/main/java/umc/th/juinjang/domain/image/model/Image.java similarity index 87% rename from src/main/java/umc/th/juinjang/model/entity/Image.java rename to src/main/java/umc/th/juinjang/domain/image/model/Image.java index 116f337f..126c5218 100644 --- a/src/main/java/umc/th/juinjang/model/entity/Image.java +++ b/src/main/java/umc/th/juinjang/domain/image/model/Image.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.entity; +package umc.th.juinjang.domain.image.model; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -14,7 +14,8 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import umc.th.juinjang.model.entity.common.BaseEntity; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.common.BaseEntity; @Entity @Getter diff --git a/src/main/java/umc/th/juinjang/repository/image/ImageRepository.java b/src/main/java/umc/th/juinjang/domain/image/repository/ImageRepository.java similarity index 75% rename from src/main/java/umc/th/juinjang/repository/image/ImageRepository.java rename to src/main/java/umc/th/juinjang/domain/image/repository/ImageRepository.java index 7896097b..7fbfaafc 100644 --- a/src/main/java/umc/th/juinjang/repository/image/ImageRepository.java +++ b/src/main/java/umc/th/juinjang/domain/image/repository/ImageRepository.java @@ -1,15 +1,13 @@ -package umc.th.juinjang.repository.image; +package umc.th.juinjang.domain.image.repository; import java.util.List; -import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import umc.th.juinjang.model.entity.Image; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Record; +import umc.th.juinjang.domain.image.model.Image; +import umc.th.juinjang.domain.limjang.model.Limjang; public interface ImageRepository extends JpaRepository { diff --git a/src/main/java/umc/th/juinjang/model/entity/Limjang.java b/src/main/java/umc/th/juinjang/domain/limjang/model/Limjang.java similarity index 90% rename from src/main/java/umc/th/juinjang/model/entity/Limjang.java rename to src/main/java/umc/th/juinjang/domain/limjang/model/Limjang.java index 74ead2d4..b7ce1837 100644 --- a/src/main/java/umc/th/juinjang/model/entity/Limjang.java +++ b/src/main/java/umc/th/juinjang/domain/limjang/model/Limjang.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.entity; +package umc.th.juinjang.domain.limjang.model; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; @@ -22,11 +22,12 @@ import lombok.NoArgsConstructor; import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.ColumnDefault; -import org.hibernate.annotations.Where; -import umc.th.juinjang.model.entity.common.BaseEntity; -import umc.th.juinjang.model.entity.enums.LimjangPropertyType; -import umc.th.juinjang.model.entity.enums.LimjangPriceType; -import umc.th.juinjang.model.entity.enums.LimjangPurpose; +import umc.th.juinjang.domain.checklist.model.ChecklistAnswer; +import umc.th.juinjang.domain.image.model.Image; +import umc.th.juinjang.domain.member.model.Member; +import umc.th.juinjang.domain.record.model.Record; +import umc.th.juinjang.domain.report.model.Report; +import umc.th.juinjang.domain.common.BaseEntity; @Entity @Getter diff --git a/src/main/java/umc/th/juinjang/model/entity/LimjangPrice.java b/src/main/java/umc/th/juinjang/domain/limjang/model/LimjangPrice.java similarity index 91% rename from src/main/java/umc/th/juinjang/model/entity/LimjangPrice.java rename to src/main/java/umc/th/juinjang/domain/limjang/model/LimjangPrice.java index 22ac2497..f140c46d 100644 --- a/src/main/java/umc/th/juinjang/model/entity/LimjangPrice.java +++ b/src/main/java/umc/th/juinjang/domain/limjang/model/LimjangPrice.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.entity; +package umc.th.juinjang.domain.limjang.model; import jakarta.persistence.*; import lombok.AccessLevel; @@ -6,7 +6,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import umc.th.juinjang.model.entity.common.BaseEntity; +import umc.th.juinjang.domain.common.BaseEntity; @Entity @Getter diff --git a/src/main/java/umc/th/juinjang/model/entity/enums/LimjangPriceType.java b/src/main/java/umc/th/juinjang/domain/limjang/model/LimjangPriceType.java similarity index 77% rename from src/main/java/umc/th/juinjang/model/entity/enums/LimjangPriceType.java rename to src/main/java/umc/th/juinjang/domain/limjang/model/LimjangPriceType.java index 7d97a1d3..a673a2bb 100644 --- a/src/main/java/umc/th/juinjang/model/entity/enums/LimjangPriceType.java +++ b/src/main/java/umc/th/juinjang/domain/limjang/model/LimjangPriceType.java @@ -1,8 +1,8 @@ -package umc.th.juinjang.model.entity.enums; +package umc.th.juinjang.domain.limjang.model; import java.util.Arrays; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.LimjangHandler; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.common.exception.handler.LimjangHandler; public enum LimjangPriceType { SALE(0), // 매매 diff --git a/src/main/java/umc/th/juinjang/model/entity/enums/LimjangPropertyType.java b/src/main/java/umc/th/juinjang/domain/limjang/model/LimjangPropertyType.java similarity index 73% rename from src/main/java/umc/th/juinjang/model/entity/enums/LimjangPropertyType.java rename to src/main/java/umc/th/juinjang/domain/limjang/model/LimjangPropertyType.java index 08a133a4..cf1b0bdf 100644 --- a/src/main/java/umc/th/juinjang/model/entity/enums/LimjangPropertyType.java +++ b/src/main/java/umc/th/juinjang/domain/limjang/model/LimjangPropertyType.java @@ -1,9 +1,8 @@ -package umc.th.juinjang.model.entity.enums; +package umc.th.juinjang.domain.limjang.model; import java.util.Arrays; -import umc.th.juinjang.apiPayload.code.BaseErrorCode; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.LimjangHandler; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.common.exception.handler.LimjangHandler; // 매물유형 public enum LimjangPropertyType { diff --git a/src/main/java/umc/th/juinjang/model/entity/enums/LimjangPurpose.java b/src/main/java/umc/th/juinjang/domain/limjang/model/LimjangPurpose.java similarity index 70% rename from src/main/java/umc/th/juinjang/model/entity/enums/LimjangPurpose.java rename to src/main/java/umc/th/juinjang/domain/limjang/model/LimjangPurpose.java index a013d5c2..432a817a 100644 --- a/src/main/java/umc/th/juinjang/model/entity/enums/LimjangPurpose.java +++ b/src/main/java/umc/th/juinjang/domain/limjang/model/LimjangPurpose.java @@ -1,9 +1,8 @@ -package umc.th.juinjang.model.entity.enums; +package umc.th.juinjang.domain.limjang.model; import java.util.Arrays; -import org.hibernate.sql.ComparisonRestriction.Operator; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.LimjangHandler; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.common.exception.handler.LimjangHandler; public enum LimjangPurpose { diff --git a/src/main/java/umc/th/juinjang/repository/limjang/dto/LimjangMainListDBResponsetDto.java b/src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangMainListDBResponsetDto.java similarity index 63% rename from src/main/java/umc/th/juinjang/repository/limjang/dto/LimjangMainListDBResponsetDto.java rename to src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangMainListDBResponsetDto.java index ef80c06f..711a87c0 100644 --- a/src/main/java/umc/th/juinjang/repository/limjang/dto/LimjangMainListDBResponsetDto.java +++ b/src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangMainListDBResponsetDto.java @@ -1,8 +1,8 @@ -package umc.th.juinjang.repository.limjang.dto; +package umc.th.juinjang.domain.limjang.repository; -import umc.th.juinjang.model.entity.Image; -import umc.th.juinjang.model.entity.LimjangPrice; -import umc.th.juinjang.model.entity.Report; +import umc.th.juinjang.domain.image.model.Image; +import umc.th.juinjang.domain.limjang.model.LimjangPrice; +import umc.th.juinjang.domain.report.model.Report; public record LimjangMainListDBResponsetDto( Long limjangId, diff --git a/src/main/java/umc/th/juinjang/repository/limjang/LimjangPriceRepository.java b/src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangPriceRepository.java similarity index 58% rename from src/main/java/umc/th/juinjang/repository/limjang/LimjangPriceRepository.java rename to src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangPriceRepository.java index c4ef9b73..8ed71426 100644 --- a/src/main/java/umc/th/juinjang/repository/limjang/LimjangPriceRepository.java +++ b/src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangPriceRepository.java @@ -1,12 +1,10 @@ -package umc.th.juinjang.repository.limjang; +package umc.th.juinjang.domain.limjang.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.LimjangPrice; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.limjang.model.LimjangPrice; public interface LimjangPriceRepository extends JpaRepository { diff --git a/src/main/java/umc/th/juinjang/repository/limjang/LimjangQueryDslRepository.java b/src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangQueryDslRepository.java similarity index 61% rename from src/main/java/umc/th/juinjang/repository/limjang/LimjangQueryDslRepository.java rename to src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangQueryDslRepository.java index c5250b63..faf4c94f 100644 --- a/src/main/java/umc/th/juinjang/repository/limjang/LimjangQueryDslRepository.java +++ b/src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangQueryDslRepository.java @@ -1,9 +1,9 @@ -package umc.th.juinjang.repository.limjang; +package umc.th.juinjang.domain.limjang.repository; import java.util.List; -import umc.th.juinjang.model.dto.limjang.enums.LimjangSortOptions; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Member; +import umc.th.juinjang.api.limjang.controller.parameter.LimjangSortOptions; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.member.model.Member; public interface LimjangQueryDslRepository { diff --git a/src/main/java/umc/th/juinjang/repository/limjang/LimjangQueryDslRepositoryImpl.java b/src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangQueryDslRepositoryImpl.java similarity index 83% rename from src/main/java/umc/th/juinjang/repository/limjang/LimjangQueryDslRepositoryImpl.java rename to src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangQueryDslRepositoryImpl.java index fcb3615e..73bff748 100644 --- a/src/main/java/umc/th/juinjang/repository/limjang/LimjangQueryDslRepositoryImpl.java +++ b/src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangQueryDslRepositoryImpl.java @@ -1,14 +1,11 @@ -package umc.th.juinjang.repository.limjang; +package umc.th.juinjang.domain.limjang.repository; import static com.querydsl.core.types.Order.DESC; -import static umc.th.juinjang.model.entity.QImage.image; -import static umc.th.juinjang.model.entity.QLimjang.limjang; -import static umc.th.juinjang.model.entity.QLimjangPrice.limjangPrice; -import static umc.th.juinjang.model.entity.QReport.report; -import static umc.th.juinjang.model.entity.QScrap.scrap; -import static com.querydsl.core.group.GroupBy.list; +import static umc.th.juinjang.domain.image.model.QImage.image; +import static umc.th.juinjang.domain.limjang.model.QLimjang.limjang; +import static umc.th.juinjang.domain.limjang.model.QLimjangPrice.limjangPrice; +import static umc.th.juinjang.domain.report.model.QReport.report; -import com.querydsl.core.types.Order; import com.querydsl.core.types.OrderSpecifier; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.core.types.dsl.Expressions; @@ -18,11 +15,9 @@ import jakarta.persistence.EntityManager; import java.util.ArrayList; import java.util.List; -import org.springframework.data.domain.Pageable; -import umc.th.juinjang.model.dto.limjang.enums.LimjangSortOptions; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.model.entity.QReport; +import umc.th.juinjang.api.limjang.controller.parameter.LimjangSortOptions; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.member.model.Member; public class LimjangQueryDslRepositoryImpl implements LimjangQueryDslRepository { private final JPAQueryFactory queryFactory; diff --git a/src/main/java/umc/th/juinjang/repository/limjang/LimjangRepository.java b/src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangRepository.java similarity index 94% rename from src/main/java/umc/th/juinjang/repository/limjang/LimjangRepository.java rename to src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangRepository.java index ae3b4a4a..3ad6e63a 100644 --- a/src/main/java/umc/th/juinjang/repository/limjang/LimjangRepository.java +++ b/src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangRepository.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.repository.limjang; +package umc.th.juinjang.domain.limjang.repository; import java.time.LocalDateTime; import java.util.List; @@ -9,8 +9,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Member; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.member.model.Member; @Repository public interface LimjangRepository extends JpaRepository, LimjangQueryDslRepository { diff --git a/src/main/java/umc/th/juinjang/model/entity/Member.java b/src/main/java/umc/th/juinjang/domain/member/model/Member.java similarity index 94% rename from src/main/java/umc/th/juinjang/model/entity/Member.java rename to src/main/java/umc/th/juinjang/domain/member/model/Member.java index 96792496..2f8e989c 100644 --- a/src/main/java/umc/th/juinjang/model/entity/Member.java +++ b/src/main/java/umc/th/juinjang/domain/member/model/Member.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.entity; +package umc.th.juinjang.domain.member.model; import jakarta.persistence.*; import java.time.LocalDateTime; @@ -12,8 +12,8 @@ import lombok.NoArgsConstructor; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; -import umc.th.juinjang.model.entity.common.BaseEntity; -import umc.th.juinjang.model.entity.enums.MemberProvider; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.common.BaseEntity; @Entity @Getter diff --git a/src/main/java/umc/th/juinjang/model/entity/enums/MemberProvider.java b/src/main/java/umc/th/juinjang/domain/member/model/MemberProvider.java similarity index 51% rename from src/main/java/umc/th/juinjang/model/entity/enums/MemberProvider.java rename to src/main/java/umc/th/juinjang/domain/member/model/MemberProvider.java index 329c94e0..dde7bcb7 100644 --- a/src/main/java/umc/th/juinjang/model/entity/enums/MemberProvider.java +++ b/src/main/java/umc/th/juinjang/domain/member/model/MemberProvider.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.entity.enums; +package umc.th.juinjang.domain.member.model; public enum MemberProvider { APPLE, KAKAO diff --git a/src/main/java/umc/th/juinjang/repository/limjang/MemberRepository.java b/src/main/java/umc/th/juinjang/domain/member/repository/MemberRepository.java similarity index 76% rename from src/main/java/umc/th/juinjang/repository/limjang/MemberRepository.java rename to src/main/java/umc/th/juinjang/domain/member/repository/MemberRepository.java index 8e584ca7..a1743cda 100644 --- a/src/main/java/umc/th/juinjang/repository/limjang/MemberRepository.java +++ b/src/main/java/umc/th/juinjang/domain/member/repository/MemberRepository.java @@ -1,8 +1,7 @@ -package umc.th.juinjang.repository.limjang; +package umc.th.juinjang.domain.member.repository; import org.springframework.data.jpa.repository.JpaRepository; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Member; +import umc.th.juinjang.domain.member.model.Member; import java.util.Optional; diff --git a/src/main/java/umc/th/juinjang/model/entity/Record.java b/src/main/java/umc/th/juinjang/domain/record/model/Record.java similarity index 89% rename from src/main/java/umc/th/juinjang/model/entity/Record.java rename to src/main/java/umc/th/juinjang/domain/record/model/Record.java index ea5fd983..f1fec918 100644 --- a/src/main/java/umc/th/juinjang/model/entity/Record.java +++ b/src/main/java/umc/th/juinjang/domain/record/model/Record.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.entity; +package umc.th.juinjang.domain.record.model; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -10,8 +10,8 @@ import jakarta.persistence.Lob; import jakarta.persistence.ManyToOne; import lombok.*; -import umc.th.juinjang.model.dto.record.RecordRequestDTO; -import umc.th.juinjang.model.entity.common.BaseEntity; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.common.BaseEntity; @Entity @Getter diff --git a/src/main/java/umc/th/juinjang/repository/record/RecordRepository.java b/src/main/java/umc/th/juinjang/domain/record/repository/RecordRepository.java similarity index 83% rename from src/main/java/umc/th/juinjang/repository/record/RecordRepository.java rename to src/main/java/umc/th/juinjang/domain/record/repository/RecordRepository.java index da4ad324..eabe5d21 100644 --- a/src/main/java/umc/th/juinjang/repository/record/RecordRepository.java +++ b/src/main/java/umc/th/juinjang/domain/record/repository/RecordRepository.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.repository.record; +package umc.th.juinjang.domain.record.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; @@ -6,9 +6,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import umc.th.juinjang.model.entity.Image; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Record; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.record.model.Record; import java.util.List; diff --git a/src/main/java/umc/th/juinjang/model/entity/Report.java b/src/main/java/umc/th/juinjang/domain/report/model/Report.java similarity index 88% rename from src/main/java/umc/th/juinjang/model/entity/Report.java rename to src/main/java/umc/th/juinjang/domain/report/model/Report.java index c1e52740..be04c64c 100644 --- a/src/main/java/umc/th/juinjang/model/entity/Report.java +++ b/src/main/java/umc/th/juinjang/domain/report/model/Report.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.entity; +package umc.th.juinjang.domain.report.model; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -8,10 +8,10 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToOne; -import java.util.Random; import lombok.*; -import umc.th.juinjang.model.entity.common.BaseEntity; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.common.BaseEntity; @Entity @Getter diff --git a/src/main/java/umc/th/juinjang/repository/checklist/ReportRepository.java b/src/main/java/umc/th/juinjang/domain/report/repository/ReportRepository.java similarity index 76% rename from src/main/java/umc/th/juinjang/repository/checklist/ReportRepository.java rename to src/main/java/umc/th/juinjang/domain/report/repository/ReportRepository.java index 6a1f8eb2..56b95582 100644 --- a/src/main/java/umc/th/juinjang/repository/checklist/ReportRepository.java +++ b/src/main/java/umc/th/juinjang/domain/report/repository/ReportRepository.java @@ -1,15 +1,13 @@ -package umc.th.juinjang.repository.checklist; +package umc.th.juinjang.domain.report.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import umc.th.juinjang.model.entity.ChecklistAnswer; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Report; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.report.model.Report; -import java.util.List; import java.util.Optional; public interface ReportRepository extends JpaRepository { diff --git a/src/main/java/umc/th/juinjang/model/entity/Scrap.java b/src/main/java/umc/th/juinjang/domain/scrap/model/Scrap.java similarity index 86% rename from src/main/java/umc/th/juinjang/model/entity/Scrap.java rename to src/main/java/umc/th/juinjang/domain/scrap/model/Scrap.java index d89d8eb3..2aa0aad1 100644 --- a/src/main/java/umc/th/juinjang/model/entity/Scrap.java +++ b/src/main/java/umc/th/juinjang/domain/scrap/model/Scrap.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.entity; +package umc.th.juinjang.domain.scrap.model; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -13,7 +13,8 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import umc.th.juinjang.model.entity.common.BaseEntity; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.common.BaseEntity; @Entity diff --git a/src/main/java/umc/th/juinjang/repository/limjang/ScrapRepository.java b/src/main/java/umc/th/juinjang/domain/scrap/repository/ScrapRepository.java similarity index 82% rename from src/main/java/umc/th/juinjang/repository/limjang/ScrapRepository.java rename to src/main/java/umc/th/juinjang/domain/scrap/repository/ScrapRepository.java index 38e81b87..48911cca 100644 --- a/src/main/java/umc/th/juinjang/repository/limjang/ScrapRepository.java +++ b/src/main/java/umc/th/juinjang/domain/scrap/repository/ScrapRepository.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.repository.limjang; +package umc.th.juinjang.domain.scrap.repository; import java.util.List; import java.util.Optional; @@ -7,8 +7,8 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Scrap; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.scrap.model.Scrap; public interface ScrapRepository extends JpaRepository { diff --git a/src/main/java/umc/th/juinjang/model/entity/Withdraw.java b/src/main/java/umc/th/juinjang/domain/withdraw/model/Withdraw.java similarity index 79% rename from src/main/java/umc/th/juinjang/model/entity/Withdraw.java rename to src/main/java/umc/th/juinjang/domain/withdraw/model/Withdraw.java index 28024dda..bc6280cb 100644 --- a/src/main/java/umc/th/juinjang/model/entity/Withdraw.java +++ b/src/main/java/umc/th/juinjang/domain/withdraw/model/Withdraw.java @@ -1,10 +1,9 @@ -package umc.th.juinjang.model.entity; +package umc.th.juinjang.domain.withdraw.model; import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.ColumnDefault; -import umc.th.juinjang.model.entity.common.BaseEntity; -import umc.th.juinjang.model.entity.enums.WithdrawReason; +import umc.th.juinjang.domain.common.BaseEntity; @Entity @Getter diff --git a/src/main/java/umc/th/juinjang/model/entity/enums/WithdrawReason.java b/src/main/java/umc/th/juinjang/domain/withdraw/model/WithdrawReason.java similarity index 89% rename from src/main/java/umc/th/juinjang/model/entity/enums/WithdrawReason.java rename to src/main/java/umc/th/juinjang/domain/withdraw/model/WithdrawReason.java index fa71cc53..ed5ce50b 100644 --- a/src/main/java/umc/th/juinjang/model/entity/enums/WithdrawReason.java +++ b/src/main/java/umc/th/juinjang/domain/withdraw/model/WithdrawReason.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.entity.enums; +package umc.th.juinjang.domain.withdraw.model; public enum WithdrawReason { diff --git a/src/main/java/umc/th/juinjang/repository/withdraw/WithdrawRepository.java b/src/main/java/umc/th/juinjang/domain/withdraw/repository/WithdrawRepository.java similarity index 59% rename from src/main/java/umc/th/juinjang/repository/withdraw/WithdrawRepository.java rename to src/main/java/umc/th/juinjang/domain/withdraw/repository/WithdrawRepository.java index 89ceec6f..d234014e 100644 --- a/src/main/java/umc/th/juinjang/repository/withdraw/WithdrawRepository.java +++ b/src/main/java/umc/th/juinjang/domain/withdraw/repository/WithdrawRepository.java @@ -1,8 +1,8 @@ -package umc.th.juinjang.repository.withdraw; +package umc.th.juinjang.domain.withdraw.repository; import org.springframework.data.jpa.repository.JpaRepository; -import umc.th.juinjang.model.entity.Withdraw; -import umc.th.juinjang.model.entity.enums.WithdrawReason; +import umc.th.juinjang.domain.withdraw.model.Withdraw; +import umc.th.juinjang.domain.withdraw.model.WithdrawReason; import java.util.Optional; diff --git a/src/main/java/umc/th/juinjang/event/SignUpEvent.java b/src/main/java/umc/th/juinjang/event/SignUpEvent.java index 83fb3707..8adecc64 100644 --- a/src/main/java/umc/th/juinjang/event/SignUpEvent.java +++ b/src/main/java/umc/th/juinjang/event/SignUpEvent.java @@ -1,6 +1,6 @@ package umc.th.juinjang.event; -import umc.th.juinjang.model.entity.enums.MemberProvider; +import umc.th.juinjang.domain.member.model.MemberProvider; public record SignUpEvent( MemberProvider memberProvider, diff --git a/src/main/java/umc/th/juinjang/event/publisher/ApplicationMemberEventPublisherAdapter.java b/src/main/java/umc/th/juinjang/event/publisher/ApplicationMemberEventPublisherAdapter.java index 661e4385..a0c84ead 100644 --- a/src/main/java/umc/th/juinjang/event/publisher/ApplicationMemberEventPublisherAdapter.java +++ b/src/main/java/umc/th/juinjang/event/publisher/ApplicationMemberEventPublisherAdapter.java @@ -4,7 +4,7 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Component; import umc.th.juinjang.event.SignUpEvent; -import umc.th.juinjang.model.entity.Member; +import umc.th.juinjang.domain.member.model.Member; @RequiredArgsConstructor @Component diff --git a/src/main/java/umc/th/juinjang/event/publisher/MemberEventPublisher.java b/src/main/java/umc/th/juinjang/event/publisher/MemberEventPublisher.java index cb570379..0ac43ae6 100644 --- a/src/main/java/umc/th/juinjang/event/publisher/MemberEventPublisher.java +++ b/src/main/java/umc/th/juinjang/event/publisher/MemberEventPublisher.java @@ -1,6 +1,6 @@ package umc.th.juinjang.event.publisher; -import umc.th.juinjang.model.entity.Member; +import umc.th.juinjang.domain.member.model.Member; public interface MemberEventPublisher { void publishSignUpEvent(Member member); diff --git a/src/main/java/umc/th/juinjang/event/subscriber/DiscordEventListener.java b/src/main/java/umc/th/juinjang/event/subscriber/DiscordEventListener.java index 0e33efc6..2be663e9 100644 --- a/src/main/java/umc/th/juinjang/event/subscriber/DiscordEventListener.java +++ b/src/main/java/umc/th/juinjang/event/subscriber/DiscordEventListener.java @@ -8,7 +8,7 @@ import org.springframework.transaction.event.TransactionPhase; import org.springframework.transaction.event.TransactionalEventListener; import umc.th.juinjang.event.SignUpEvent; -import umc.th.juinjang.external.discord.DiscordAlertProvider; +import umc.th.juinjang.external.openfeign.discord.DiscordAlertProvider; @Component @RequiredArgsConstructor diff --git a/src/main/java/umc/th/juinjang/config/FeignClientConfig.java b/src/main/java/umc/th/juinjang/external/openfeign/FeignClientConfig.java similarity index 86% rename from src/main/java/umc/th/juinjang/config/FeignClientConfig.java rename to src/main/java/umc/th/juinjang/external/openfeign/FeignClientConfig.java index 093a8f85..b4ddf7b8 100644 --- a/src/main/java/umc/th/juinjang/config/FeignClientConfig.java +++ b/src/main/java/umc/th/juinjang/external/openfeign/FeignClientConfig.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.config; +package umc.th.juinjang.external.openfeign; import org.springframework.cloud.openfeign.EnableFeignClients; diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleClient.java b/src/main/java/umc/th/juinjang/external/openfeign/apple/AppleClient.java similarity index 96% rename from src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleClient.java rename to src/main/java/umc/th/juinjang/external/openfeign/apple/AppleClient.java index 0370548f..915a231f 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleClient.java +++ b/src/main/java/umc/th/juinjang/external/openfeign/apple/AppleClient.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.auth.apple; +package umc.th.juinjang.external.openfeign.apple; import org.springframework.cloud.openfeign.FeignClient; diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleClientSecretGenerator.java b/src/main/java/umc/th/juinjang/external/openfeign/apple/AppleClientSecretGenerator.java similarity index 96% rename from src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleClientSecretGenerator.java rename to src/main/java/umc/th/juinjang/external/openfeign/apple/AppleClientSecretGenerator.java index b58c0e26..2d93b48e 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleClientSecretGenerator.java +++ b/src/main/java/umc/th/juinjang/external/openfeign/apple/AppleClientSecretGenerator.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.auth.apple; +package umc.th.juinjang.external.openfeign.apple; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleOAuthProvider.java b/src/main/java/umc/th/juinjang/external/openfeign/apple/AppleOAuthProvider.java similarity index 85% rename from src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleOAuthProvider.java rename to src/main/java/umc/th/juinjang/external/openfeign/apple/AppleOAuthProvider.java index 553733ae..9d417317 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleOAuthProvider.java +++ b/src/main/java/umc/th/juinjang/external/openfeign/apple/AppleOAuthProvider.java @@ -1,13 +1,13 @@ -package umc.th.juinjang.model.dto.auth.apple; +package umc.th.juinjang.external.openfeign.apple; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import umc.th.juinjang.apiPayload.exception.handler.MemberHandler; +import umc.th.juinjang.common.exception.handler.MemberHandler; -import static umc.th.juinjang.apiPayload.code.status.ErrorStatus.FAILED_TO_LOAD_PRIVATE_KEY; +import static umc.th.juinjang.common.code.status.ErrorStatus.FAILED_TO_LOAD_PRIVATE_KEY; @Component @RequiredArgsConstructor diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/apple/ApplePrivateKeyGenerator.java b/src/main/java/umc/th/juinjang/external/openfeign/apple/ApplePrivateKeyGenerator.java similarity index 97% rename from src/main/java/umc/th/juinjang/model/dto/auth/apple/ApplePrivateKeyGenerator.java rename to src/main/java/umc/th/juinjang/external/openfeign/apple/ApplePrivateKeyGenerator.java index 77d921c0..567afe2d 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/apple/ApplePrivateKeyGenerator.java +++ b/src/main/java/umc/th/juinjang/external/openfeign/apple/ApplePrivateKeyGenerator.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.auth.apple; +package umc.th.juinjang.external.openfeign.apple; import org.apache.commons.codec.binary.Base64; import org.springframework.core.io.ClassPathResource; diff --git a/src/main/java/umc/th/juinjang/utils/ApplePublicKeyGenerator.java b/src/main/java/umc/th/juinjang/external/openfeign/apple/ApplePublicKeyGenerator.java similarity index 85% rename from src/main/java/umc/th/juinjang/utils/ApplePublicKeyGenerator.java rename to src/main/java/umc/th/juinjang/external/openfeign/apple/ApplePublicKeyGenerator.java index 4d6c240a..758273ac 100644 --- a/src/main/java/umc/th/juinjang/utils/ApplePublicKeyGenerator.java +++ b/src/main/java/umc/th/juinjang/external/openfeign/apple/ApplePublicKeyGenerator.java @@ -1,13 +1,11 @@ -package umc.th.juinjang.utils; +package umc.th.juinjang.external.openfeign.apple; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import umc.th.juinjang.apiPayload.ExceptionHandler; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.model.dto.auth.apple.ApplePublicKeyResponse; +import umc.th.juinjang.common.ExceptionHandler; +import umc.th.juinjang.common.code.status.ErrorStatus; -import javax.naming.AuthenticationException; import java.math.BigInteger; import java.security.KeyFactory; import java.security.NoSuchAlgorithmException; @@ -16,7 +14,6 @@ import java.security.spec.RSAPublicKeySpec; import java.util.Base64; import java.util.Map; -import java.util.Optional; @Component @RequiredArgsConstructor diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/apple/ApplePublicKeyResponse.java b/src/main/java/umc/th/juinjang/external/openfeign/apple/ApplePublicKeyResponse.java similarity index 76% rename from src/main/java/umc/th/juinjang/model/dto/auth/apple/ApplePublicKeyResponse.java rename to src/main/java/umc/th/juinjang/external/openfeign/apple/ApplePublicKeyResponse.java index a19ab264..84771b69 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/apple/ApplePublicKeyResponse.java +++ b/src/main/java/umc/th/juinjang/external/openfeign/apple/ApplePublicKeyResponse.java @@ -1,12 +1,10 @@ -package umc.th.juinjang.model.dto.auth.apple; +package umc.th.juinjang.external.openfeign.apple; import lombok.Getter; -import umc.th.juinjang.apiPayload.ExceptionHandler; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; +import umc.th.juinjang.common.ExceptionHandler; +import umc.th.juinjang.common.code.status.ErrorStatus; -import javax.naming.AuthenticationException; import java.util.List; -import java.util.Optional; @Getter public class ApplePublicKeyResponse { diff --git a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleTokenResponse.java b/src/main/java/umc/th/juinjang/external/openfeign/apple/AppleTokenResponse.java similarity index 95% rename from src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleTokenResponse.java rename to src/main/java/umc/th/juinjang/external/openfeign/apple/AppleTokenResponse.java index 5a1d73fe..a07e844f 100644 --- a/src/main/java/umc/th/juinjang/model/dto/auth/apple/AppleTokenResponse.java +++ b/src/main/java/umc/th/juinjang/external/openfeign/apple/AppleTokenResponse.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.model.dto.auth.apple; +package umc.th.juinjang.external.openfeign.apple; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/umc/th/juinjang/external/discord/DiscordAlertProvider.java b/src/main/java/umc/th/juinjang/external/openfeign/discord/DiscordAlertProvider.java similarity index 82% rename from src/main/java/umc/th/juinjang/external/discord/DiscordAlertProvider.java rename to src/main/java/umc/th/juinjang/external/openfeign/discord/DiscordAlertProvider.java index 5e8c455b..06bf774f 100644 --- a/src/main/java/umc/th/juinjang/external/discord/DiscordAlertProvider.java +++ b/src/main/java/umc/th/juinjang/external/openfeign/discord/DiscordAlertProvider.java @@ -1,10 +1,10 @@ -package umc.th.juinjang.external.discord; +package umc.th.juinjang.external.openfeign.discord; import feign.FeignException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import umc.th.juinjang.external.discord.dto.DiscordAlert; +import umc.th.juinjang.external.openfeign.discord.dto.DiscordAlert; @RequiredArgsConstructor @Component diff --git a/src/main/java/umc/th/juinjang/external/discord/DiscordFeignClient.java b/src/main/java/umc/th/juinjang/external/openfeign/discord/DiscordFeignClient.java similarity index 78% rename from src/main/java/umc/th/juinjang/external/discord/DiscordFeignClient.java rename to src/main/java/umc/th/juinjang/external/openfeign/discord/DiscordFeignClient.java index 4bc8ed7f..aabf9b1b 100644 --- a/src/main/java/umc/th/juinjang/external/discord/DiscordFeignClient.java +++ b/src/main/java/umc/th/juinjang/external/openfeign/discord/DiscordFeignClient.java @@ -1,10 +1,10 @@ -package umc.th.juinjang.external.discord; +package umc.th.juinjang.external.openfeign.discord; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import umc.th.juinjang.external.discord.dto.DiscordAlert; +import umc.th.juinjang.external.openfeign.discord.dto.DiscordAlert; @FeignClient(name = "${discord.name}", url = "${discord.webhook-url}") public interface DiscordFeignClient { diff --git a/src/main/java/umc/th/juinjang/external/discord/StatusMessage.java b/src/main/java/umc/th/juinjang/external/openfeign/discord/StatusMessage.java similarity index 87% rename from src/main/java/umc/th/juinjang/external/discord/StatusMessage.java rename to src/main/java/umc/th/juinjang/external/openfeign/discord/StatusMessage.java index 26f98c86..7621eabc 100644 --- a/src/main/java/umc/th/juinjang/external/discord/StatusMessage.java +++ b/src/main/java/umc/th/juinjang/external/openfeign/discord/StatusMessage.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.external.discord; +package umc.th.juinjang.external.openfeign.discord; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/umc/th/juinjang/external/discord/dto/DiscordAlert.java b/src/main/java/umc/th/juinjang/external/openfeign/discord/dto/DiscordAlert.java similarity index 72% rename from src/main/java/umc/th/juinjang/external/discord/dto/DiscordAlert.java rename to src/main/java/umc/th/juinjang/external/openfeign/discord/dto/DiscordAlert.java index 842aa6d4..1a6b922b 100644 --- a/src/main/java/umc/th/juinjang/external/discord/dto/DiscordAlert.java +++ b/src/main/java/umc/th/juinjang/external/openfeign/discord/dto/DiscordAlert.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.external.discord.dto; +package umc.th.juinjang.external.openfeign.discord.dto; public record DiscordAlert(String content) { public static DiscordAlert createAlert(String content) { diff --git a/src/main/java/umc/th/juinjang/controller/KakaoUnlinkClient.java b/src/main/java/umc/th/juinjang/external/openfeign/kakao/KakaoUnlinkClient.java similarity index 93% rename from src/main/java/umc/th/juinjang/controller/KakaoUnlinkClient.java rename to src/main/java/umc/th/juinjang/external/openfeign/kakao/KakaoUnlinkClient.java index 7cc2faae..e9a379bc 100644 --- a/src/main/java/umc/th/juinjang/controller/KakaoUnlinkClient.java +++ b/src/main/java/umc/th/juinjang/external/openfeign/kakao/KakaoUnlinkClient.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.controller; +package umc.th.juinjang.external.openfeign.kakao; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/umc/th/juinjang/config/AWSS3Config.java b/src/main/java/umc/th/juinjang/external/s3/AWSS3Config.java similarity index 97% rename from src/main/java/umc/th/juinjang/config/AWSS3Config.java rename to src/main/java/umc/th/juinjang/external/s3/AWSS3Config.java index d32e2523..25822b97 100644 --- a/src/main/java/umc/th/juinjang/config/AWSS3Config.java +++ b/src/main/java/umc/th/juinjang/external/s3/AWSS3Config.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.config; +package umc.th.juinjang.external.s3; import ch.qos.logback.classic.Logger; import com.amazonaws.auth.AWSStaticCredentialsProvider; diff --git a/src/main/java/umc/th/juinjang/service/external/S3Service.java b/src/main/java/umc/th/juinjang/external/s3/S3Service.java similarity index 95% rename from src/main/java/umc/th/juinjang/service/external/S3Service.java rename to src/main/java/umc/th/juinjang/external/s3/S3Service.java index 90f997fc..71d6a62d 100644 --- a/src/main/java/umc/th/juinjang/service/external/S3Service.java +++ b/src/main/java/umc/th/juinjang/external/s3/S3Service.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.service.external; +package umc.th.juinjang.external.s3; import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.model.DeleteObjectRequest; @@ -6,7 +6,6 @@ import com.amazonaws.services.s3.model.PutObjectRequest; import java.io.File; import java.io.FileOutputStream; -import java.io.IOException; import java.io.InputStream; import java.net.URI; import java.util.Optional; @@ -18,8 +17,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import umc.th.juinjang.apiPayload.code.status.ErrorStatus; -import umc.th.juinjang.apiPayload.exception.handler.S3Handler; +import umc.th.juinjang.common.code.status.ErrorStatus; +import umc.th.juinjang.common.exception.handler.S3Handler; @Slf4j @RequiredArgsConstructor diff --git a/src/main/java/umc/th/juinjang/model/dto/TempRequest.java b/src/main/java/umc/th/juinjang/model/dto/TempRequest.java deleted file mode 100644 index 10acd71b..00000000 --- a/src/main/java/umc/th/juinjang/model/dto/TempRequest.java +++ /dev/null @@ -1,4 +0,0 @@ -package umc.th.juinjang.model.dto; - -public class TempRequest { -} diff --git a/src/main/java/umc/th/juinjang/model/dto/TempResponse.java b/src/main/java/umc/th/juinjang/model/dto/TempResponse.java deleted file mode 100644 index b70d7db9..00000000 --- a/src/main/java/umc/th/juinjang/model/dto/TempResponse.java +++ /dev/null @@ -1,24 +0,0 @@ -package umc.th.juinjang.model.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -public class TempResponse { - - @Builder - @Getter - @NoArgsConstructor - @AllArgsConstructor - public static class TempTestDTO{ - String testString; - } - @Builder - @Getter - @NoArgsConstructor - @AllArgsConstructor - public static class TempExceptionDTO{ - Integer flag; - } -} \ No newline at end of file diff --git a/src/main/java/umc/th/juinjang/model/entity/enums/ScrapActionType.java b/src/main/java/umc/th/juinjang/model/entity/enums/ScrapActionType.java deleted file mode 100644 index b78deba0..00000000 --- a/src/main/java/umc/th/juinjang/model/entity/enums/ScrapActionType.java +++ /dev/null @@ -1,8 +0,0 @@ -package umc.th.juinjang.model.entity.enums; - -public enum ScrapActionType { - - SCRAP, - UNSCRAP - -} diff --git a/src/main/java/umc/th/juinjang/config/ApiFilterConfig.java b/src/main/java/umc/th/juinjang/monitoring/ApiFilterConfig.java similarity index 96% rename from src/main/java/umc/th/juinjang/config/ApiFilterConfig.java rename to src/main/java/umc/th/juinjang/monitoring/ApiFilterConfig.java index e0ba5428..3f82e8df 100644 --- a/src/main/java/umc/th/juinjang/config/ApiFilterConfig.java +++ b/src/main/java/umc/th/juinjang/monitoring/ApiFilterConfig.java @@ -1,4 +1,4 @@ -package umc.th.juinjang.config; +package umc.th.juinjang.monitoring; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/umc/th/juinjang/monitoring/ApiLogGenerator.java b/src/main/java/umc/th/juinjang/monitoring/ApiLogGenerator.java index 2755f0e9..643368a3 100644 --- a/src/main/java/umc/th/juinjang/monitoring/ApiLogGenerator.java +++ b/src/main/java/umc/th/juinjang/monitoring/ApiLogGenerator.java @@ -1,6 +1,6 @@ package umc.th.juinjang.monitoring; -import static umc.th.juinjang.utils.LoggerProvider.getLogger; +import static umc.th.juinjang.common.LoggerProvider.getLogger; import org.slf4j.Logger; import org.slf4j.MDC; diff --git a/src/main/java/umc/th/juinjang/monitoring/ApiLogPrinter.java b/src/main/java/umc/th/juinjang/monitoring/ApiLogPrinter.java index bade2c7e..edf9b48b 100644 --- a/src/main/java/umc/th/juinjang/monitoring/ApiLogPrinter.java +++ b/src/main/java/umc/th/juinjang/monitoring/ApiLogPrinter.java @@ -1,6 +1,6 @@ package umc.th.juinjang.monitoring; -import static umc.th.juinjang.utils.LoggerProvider.getLogger; +import static umc.th.juinjang.common.LoggerProvider.getLogger; import org.slf4j.Logger; import org.springframework.stereotype.Component; diff --git a/src/main/java/umc/th/juinjang/monitoring/ApiLoggerFilter.java b/src/main/java/umc/th/juinjang/monitoring/ApiLoggerFilter.java index 3e2d6062..9a44943e 100644 --- a/src/main/java/umc/th/juinjang/monitoring/ApiLoggerFilter.java +++ b/src/main/java/umc/th/juinjang/monitoring/ApiLoggerFilter.java @@ -1,13 +1,11 @@ package umc.th.juinjang.monitoring; -import static umc.th.juinjang.utils.LoggerProvider.getLogger; -import static umc.th.juinjang.utils.LoggerProvider.registerRequestId; +import static umc.th.juinjang.common.LoggerProvider.getLogger; +import static umc.th.juinjang.common.LoggerProvider.registerRequestId; import jakarta.servlet.FilterChain; -import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.List; import java.util.UUID; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/umc/th/juinjang/service/checklist/ChecklistCommandService.java b/src/main/java/umc/th/juinjang/service/checklist/ChecklistCommandService.java deleted file mode 100644 index 8aeb1767..00000000 --- a/src/main/java/umc/th/juinjang/service/checklist/ChecklistCommandService.java +++ /dev/null @@ -1,10 +0,0 @@ -package umc.th.juinjang.service.checklist; - -import umc.th.juinjang.model.dto.checklist.ChecklistAnswerAndReportResponseDTO; -import umc.th.juinjang.model.dto.checklist.ChecklistAnswerRequestDTO; - -import java.util.List; - -public interface ChecklistCommandService { - public ChecklistAnswerAndReportResponseDTO saveChecklistAnswerList(Long limjangId, List answerDtoList); -} diff --git a/src/main/java/umc/th/juinjang/service/image/ImageQueryService.java b/src/main/java/umc/th/juinjang/service/image/ImageQueryService.java deleted file mode 100644 index f8a47039..00000000 --- a/src/main/java/umc/th/juinjang/service/image/ImageQueryService.java +++ /dev/null @@ -1,7 +0,0 @@ -package umc.th.juinjang.service.image; - -import umc.th.juinjang.model.dto.image.ImagesGetResponse; - -public interface ImageQueryService { - ImagesGetResponse getImageList(long limjangId); -} diff --git a/src/main/java/umc/th/juinjang/service/limjang/LimjangCommandService.java b/src/main/java/umc/th/juinjang/service/limjang/LimjangCommandService.java deleted file mode 100644 index 4515ac16..00000000 --- a/src/main/java/umc/th/juinjang/service/limjang/LimjangCommandService.java +++ /dev/null @@ -1,16 +0,0 @@ -package umc.th.juinjang.service.limjang; - -import umc.th.juinjang.model.dto.limjang.request.LimjangPatchRequest; -import umc.th.juinjang.model.dto.limjang.request.LimjangPostRequest; -import umc.th.juinjang.model.dto.limjang.request.LimjangsDeleteRequest; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Member; - -public interface LimjangCommandService { - - Limjang postLimjang(LimjangPostRequest request, Member member); - - void deleteLimjangs(LimjangsDeleteRequest deleteIds, Member member); - - void updateLimjang(Member member, long limjangId, LimjangPatchRequest request); -} diff --git a/src/main/java/umc/th/juinjang/service/limjang/LimjangQueryService.java b/src/main/java/umc/th/juinjang/service/limjang/LimjangQueryService.java deleted file mode 100644 index 112a1577..00000000 --- a/src/main/java/umc/th/juinjang/service/limjang/LimjangQueryService.java +++ /dev/null @@ -1,23 +0,0 @@ -package umc.th.juinjang.service.limjang; - -import umc.th.juinjang.model.dto.limjang.response.LimjangDetailGetResponse; - -import umc.th.juinjang.model.dto.limjang.enums.LimjangSortOptions; -import umc.th.juinjang.model.dto.limjang.response.LimjangsGetByKeywordResponse; -import umc.th.juinjang.model.dto.limjang.response.LimjangsGetResponse; -import umc.th.juinjang.model.dto.limjang.response.LimjangsMainGetResponse; -import umc.th.juinjang.model.dto.limjang.response.LimjangsMainGetVersion2Response; -import umc.th.juinjang.model.entity.Member; - -public interface LimjangQueryService { - - LimjangsGetResponse getLimjangTotalList(Member member, LimjangSortOptions sort); - - LimjangsMainGetResponse getLimjangsMain(Member member); - - LimjangsGetByKeywordResponse getLimjangSearchList(Member member, String keyword); - - LimjangDetailGetResponse getDetail(long id, Member member); - - LimjangsMainGetVersion2Response getLimjangsMainVersion2(Member member); -} diff --git a/src/test/java/umc/th/juinjang/repository/limjang/LimjangFixture.java b/src/test/java/umc/th/juinjang/repository/limjang/LimjangFixture.java index d9ccc6f3..8f69ef63 100644 --- a/src/test/java/umc/th/juinjang/repository/limjang/LimjangFixture.java +++ b/src/test/java/umc/th/juinjang/repository/limjang/LimjangFixture.java @@ -1,8 +1,8 @@ package umc.th.juinjang.repository.limjang; import java.time.LocalDateTime; -import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.model.entity.enums.MemberProvider; +import umc.th.juinjang.domain.member.model.Member; +import umc.th.juinjang.domain.member.model.MemberProvider; public class LimjangFixture { diff --git a/src/test/java/umc/th/juinjang/repository/limjang/LimjangQuerydslTest.java b/src/test/java/umc/th/juinjang/repository/limjang/LimjangQuerydslTest.java index 3d344ddf..6494bde5 100644 --- a/src/test/java/umc/th/juinjang/repository/limjang/LimjangQuerydslTest.java +++ b/src/test/java/umc/th/juinjang/repository/limjang/LimjangQuerydslTest.java @@ -13,11 +13,13 @@ import org.springframework.context.annotation.Import; import org.springframework.test.context.ActiveProfiles; import umc.th.juinjang.config.TestConfig; -import umc.th.juinjang.model.entity.Limjang; -import umc.th.juinjang.model.entity.Member; -import umc.th.juinjang.model.entity.enums.LimjangPriceType; -import umc.th.juinjang.model.entity.enums.LimjangPropertyType; -import umc.th.juinjang.model.entity.enums.LimjangPurpose; +import umc.th.juinjang.domain.limjang.model.Limjang; +import umc.th.juinjang.domain.limjang.repository.LimjangRepository; +import umc.th.juinjang.domain.member.model.Member; +import umc.th.juinjang.domain.limjang.model.LimjangPriceType; +import umc.th.juinjang.domain.limjang.model.LimjangPropertyType; +import umc.th.juinjang.domain.limjang.model.LimjangPurpose; +import umc.th.juinjang.domain.member.repository.MemberRepository; @DataJpaTest @ActiveProfiles("test")