diff --git a/src/main/java/com/example/spot/legacy/domain/PostComment.java b/src/main/java/com/example/spot/comment/domain/PostComment.java similarity index 81% rename from src/main/java/com/example/spot/legacy/domain/PostComment.java rename to src/main/java/com/example/spot/comment/domain/PostComment.java index 635b61e1..e33e5cbb 100644 --- a/src/main/java/com/example/spot/legacy/domain/PostComment.java +++ b/src/main/java/com/example/spot/comment/domain/PostComment.java @@ -1,7 +1,9 @@ -package com.example.spot.legacy.domain; +package com.example.spot.comment.domain; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.member.domain.Member; +import com.example.spot.comment.domain.association.LikedPostComment; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.member.domain.Member; +import com.example.spot.post.domain.Post; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/spot/legacy/repository/PostCommentRepository.java b/src/main/java/com/example/spot/comment/domain/PostCommentRepository.java similarity index 56% rename from src/main/java/com/example/spot/legacy/repository/PostCommentRepository.java rename to src/main/java/com/example/spot/comment/domain/PostCommentRepository.java index 35cb2260..7a8134af 100644 --- a/src/main/java/com/example/spot/legacy/repository/PostCommentRepository.java +++ b/src/main/java/com/example/spot/comment/domain/PostCommentRepository.java @@ -1,7 +1,5 @@ -package com.example.spot.legacy.repository; +package com.example.spot.comment.domain; -import com.example.spot.legacy.domain.PostComment; -import com.example.spot.legacy.repository.querydsl.PostCommentRepositoryCustom; import org.springframework.data.jpa.repository.JpaRepository; public interface PostCommentRepository extends JpaRepository, PostCommentRepositoryCustom { diff --git a/src/main/java/com/example/spot/legacy/repository/querydsl/PostCommentRepositoryCustom.java b/src/main/java/com/example/spot/comment/domain/PostCommentRepositoryCustom.java similarity index 55% rename from src/main/java/com/example/spot/legacy/repository/querydsl/PostCommentRepositoryCustom.java rename to src/main/java/com/example/spot/comment/domain/PostCommentRepositoryCustom.java index 0e3567cb..88454821 100644 --- a/src/main/java/com/example/spot/legacy/repository/querydsl/PostCommentRepositoryCustom.java +++ b/src/main/java/com/example/spot/comment/domain/PostCommentRepositoryCustom.java @@ -1,6 +1,4 @@ -package com.example.spot.legacy.repository.querydsl; - -import com.example.spot.legacy.domain.PostComment; +package com.example.spot.comment.domain; import java.util.List; diff --git a/src/main/java/com/example/spot/legacy/domain/LikedPostComment.java b/src/main/java/com/example/spot/comment/domain/association/LikedPostComment.java similarity index 73% rename from src/main/java/com/example/spot/legacy/domain/LikedPostComment.java rename to src/main/java/com/example/spot/comment/domain/association/LikedPostComment.java index 883a6dcf..1d89cd21 100644 --- a/src/main/java/com/example/spot/legacy/domain/LikedPostComment.java +++ b/src/main/java/com/example/spot/comment/domain/association/LikedPostComment.java @@ -1,8 +1,9 @@ -package com.example.spot.legacy.domain; +package com.example.spot.comment.domain.association; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.member.domain.Member; +import com.example.spot.comment.domain.PostComment; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.member.domain.Member; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/spot/legacy/repository/LikedPostCommentRepository.java b/src/main/java/com/example/spot/comment/domain/association/LikedPostCommentRepository.java similarity index 89% rename from src/main/java/com/example/spot/legacy/repository/LikedPostCommentRepository.java rename to src/main/java/com/example/spot/comment/domain/association/LikedPostCommentRepository.java index 47301759..afd5d21a 100644 --- a/src/main/java/com/example/spot/legacy/repository/LikedPostCommentRepository.java +++ b/src/main/java/com/example/spot/comment/domain/association/LikedPostCommentRepository.java @@ -1,6 +1,5 @@ -package com.example.spot.legacy.repository; +package com.example.spot.comment.domain.association; -import com.example.spot.legacy.domain.LikedPostComment; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/com/example/spot/legacy/repository/querydsl/impl/PostCommentRepositoryImpl.java b/src/main/java/com/example/spot/comment/infrastructure/PostCommentRepositoryImpl.java similarity index 74% rename from src/main/java/com/example/spot/legacy/repository/querydsl/impl/PostCommentRepositoryImpl.java rename to src/main/java/com/example/spot/comment/infrastructure/PostCommentRepositoryImpl.java index b9b75bee..83b2332c 100644 --- a/src/main/java/com/example/spot/legacy/repository/querydsl/impl/PostCommentRepositoryImpl.java +++ b/src/main/java/com/example/spot/comment/infrastructure/PostCommentRepositoryImpl.java @@ -1,9 +1,10 @@ -package com.example.spot.legacy.repository.querydsl.impl; +package com.example.spot.comment.infrastructure; -import static com.example.spot.legacy.domain.QPostComment.*; -import com.example.spot.legacy.domain.PostComment; -import com.example.spot.legacy.repository.querydsl.PostCommentRepositoryCustom; +import static com.example.spot.comment.domain.QPostComment.*; + +import com.example.spot.comment.domain.PostComment; +import com.example.spot.comment.domain.PostCommentRepositoryCustom; import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/CommentCreateRequest.java b/src/main/java/com/example/spot/comment/presentation/dto/CommentCreateRequest.java similarity index 92% rename from src/main/java/com/example/spot/legacy/web/dto/post/CommentCreateRequest.java rename to src/main/java/com/example/spot/comment/presentation/dto/CommentCreateRequest.java index 828e1295..18f43afb 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/CommentCreateRequest.java +++ b/src/main/java/com/example/spot/comment/presentation/dto/CommentCreateRequest.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.comment.presentation.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/CommentCreateResponse.java b/src/main/java/com/example/spot/comment/presentation/dto/CommentCreateResponse.java similarity index 92% rename from src/main/java/com/example/spot/legacy/web/dto/post/CommentCreateResponse.java rename to src/main/java/com/example/spot/comment/presentation/dto/CommentCreateResponse.java index 9f8087ed..b54c4dff 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/CommentCreateResponse.java +++ b/src/main/java/com/example/spot/comment/presentation/dto/CommentCreateResponse.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.comment.presentation.dto; -import com.example.spot.legacy.domain.PostComment; +import com.example.spot.comment.domain.PostComment; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/CommentDetailResponse.java b/src/main/java/com/example/spot/comment/presentation/dto/CommentDetailResponse.java similarity index 97% rename from src/main/java/com/example/spot/legacy/web/dto/post/CommentDetailResponse.java rename to src/main/java/com/example/spot/comment/presentation/dto/CommentDetailResponse.java index 504cdea2..da93ae2b 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/CommentDetailResponse.java +++ b/src/main/java/com/example/spot/comment/presentation/dto/CommentDetailResponse.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.comment.presentation.dto; -import com.example.spot.legacy.domain.PostComment; +import com.example.spot.comment.domain.PostComment; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/CommentLikeResponse.java b/src/main/java/com/example/spot/comment/presentation/dto/CommentLikeResponse.java similarity index 94% rename from src/main/java/com/example/spot/legacy/web/dto/post/CommentLikeResponse.java rename to src/main/java/com/example/spot/comment/presentation/dto/CommentLikeResponse.java index 913d733d..220a500e 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/CommentLikeResponse.java +++ b/src/main/java/com/example/spot/comment/presentation/dto/CommentLikeResponse.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.comment.presentation.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AccessLevel; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/CommentResponse.java b/src/main/java/com/example/spot/comment/presentation/dto/CommentResponse.java similarity index 84% rename from src/main/java/com/example/spot/legacy/web/dto/post/CommentResponse.java rename to src/main/java/com/example/spot/comment/presentation/dto/CommentResponse.java index 2d797bcc..1a5f0540 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/CommentResponse.java +++ b/src/main/java/com/example/spot/comment/presentation/dto/CommentResponse.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.comment.presentation.dto; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/common/api/ApiResponse.java b/src/main/java/com/example/spot/common/api/ApiResponse.java similarity index 88% rename from src/main/java/com/example/spot/refactor/common/api/ApiResponse.java rename to src/main/java/com/example/spot/common/api/ApiResponse.java index 51582185..6243d2f2 100644 --- a/src/main/java/com/example/spot/refactor/common/api/ApiResponse.java +++ b/src/main/java/com/example/spot/common/api/ApiResponse.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.common.api; +package com.example.spot.common.api; -import com.example.spot.refactor.common.api.code.BaseCode; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.code.status.SuccessStatus; +import com.example.spot.common.api.code.BaseCode; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.code.status.SuccessStatus; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/src/main/java/com/example/spot/refactor/common/api/code/BaseCode.java b/src/main/java/com/example/spot/common/api/code/BaseCode.java similarity index 68% rename from src/main/java/com/example/spot/refactor/common/api/code/BaseCode.java rename to src/main/java/com/example/spot/common/api/code/BaseCode.java index 5082f992..4cf77dfb 100644 --- a/src/main/java/com/example/spot/refactor/common/api/code/BaseCode.java +++ b/src/main/java/com/example/spot/common/api/code/BaseCode.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.common.api.code; +package com.example.spot.common.api.code; public interface BaseCode { diff --git a/src/main/java/com/example/spot/refactor/common/api/code/BaseErrorCode.java b/src/main/java/com/example/spot/common/api/code/BaseErrorCode.java similarity index 71% rename from src/main/java/com/example/spot/refactor/common/api/code/BaseErrorCode.java rename to src/main/java/com/example/spot/common/api/code/BaseErrorCode.java index 820b2b8d..f67d09a8 100644 --- a/src/main/java/com/example/spot/refactor/common/api/code/BaseErrorCode.java +++ b/src/main/java/com/example/spot/common/api/code/BaseErrorCode.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.common.api.code; +package com.example.spot.common.api.code; public interface BaseErrorCode { diff --git a/src/main/java/com/example/spot/refactor/common/api/code/ErrorReasonDTO.java b/src/main/java/com/example/spot/common/api/code/ErrorReasonDTO.java similarity index 87% rename from src/main/java/com/example/spot/refactor/common/api/code/ErrorReasonDTO.java rename to src/main/java/com/example/spot/common/api/code/ErrorReasonDTO.java index 50d7eba0..ec328533 100644 --- a/src/main/java/com/example/spot/refactor/common/api/code/ErrorReasonDTO.java +++ b/src/main/java/com/example/spot/common/api/code/ErrorReasonDTO.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.common.api.code; +package com.example.spot.common.api.code; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/refactor/common/api/code/ReasonDTO.java b/src/main/java/com/example/spot/common/api/code/ReasonDTO.java similarity index 87% rename from src/main/java/com/example/spot/refactor/common/api/code/ReasonDTO.java rename to src/main/java/com/example/spot/common/api/code/ReasonDTO.java index 47da97ad..ccbd78a7 100644 --- a/src/main/java/com/example/spot/refactor/common/api/code/ReasonDTO.java +++ b/src/main/java/com/example/spot/common/api/code/ReasonDTO.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.common.api.code; +package com.example.spot.common.api.code; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/refactor/common/api/code/status/ErrorStatus.java b/src/main/java/com/example/spot/common/api/code/status/ErrorStatus.java similarity index 99% rename from src/main/java/com/example/spot/refactor/common/api/code/status/ErrorStatus.java rename to src/main/java/com/example/spot/common/api/code/status/ErrorStatus.java index d241aff8..3c48557e 100644 --- a/src/main/java/com/example/spot/refactor/common/api/code/status/ErrorStatus.java +++ b/src/main/java/com/example/spot/common/api/code/status/ErrorStatus.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.common.api.code.status; +package com.example.spot.common.api.code.status; -import com.example.spot.refactor.common.api.code.BaseErrorCode; -import com.example.spot.refactor.common.api.code.ErrorReasonDTO; +import com.example.spot.common.api.code.BaseErrorCode; +import com.example.spot.common.api.code.ErrorReasonDTO; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/example/spot/refactor/common/api/code/status/SuccessStatus.java b/src/main/java/com/example/spot/common/api/code/status/SuccessStatus.java similarity index 97% rename from src/main/java/com/example/spot/refactor/common/api/code/status/SuccessStatus.java rename to src/main/java/com/example/spot/common/api/code/status/SuccessStatus.java index 4a06e16a..7c5837dd 100644 --- a/src/main/java/com/example/spot/refactor/common/api/code/status/SuccessStatus.java +++ b/src/main/java/com/example/spot/common/api/code/status/SuccessStatus.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.common.api.code.status; +package com.example.spot.common.api.code.status; -import com.example.spot.refactor.common.api.code.BaseCode; -import com.example.spot.refactor.common.api.code.ReasonDTO; +import com.example.spot.common.api.code.BaseCode; +import com.example.spot.common.api.code.ReasonDTO; import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/example/spot/refactor/common/api/exception/ExceptionAdvice.java b/src/main/java/com/example/spot/common/api/exception/ExceptionAdvice.java similarity index 96% rename from src/main/java/com/example/spot/refactor/common/api/exception/ExceptionAdvice.java rename to src/main/java/com/example/spot/common/api/exception/ExceptionAdvice.java index 20fc8147..94efbb44 100644 --- a/src/main/java/com/example/spot/refactor/common/api/exception/ExceptionAdvice.java +++ b/src/main/java/com/example/spot/common/api/exception/ExceptionAdvice.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.common.api.exception; +package com.example.spot.common.api.exception; -import com.example.spot.refactor.common.api.ApiResponse; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.ApiResponse; +import com.example.spot.common.api.code.status.ErrorStatus; import io.sentry.Sentry; import jakarta.validation.ConstraintViolationException; import java.util.List; diff --git a/src/main/java/com/example/spot/refactor/common/api/exception/GeneralException.java b/src/main/java/com/example/spot/common/api/exception/GeneralException.java similarity index 68% rename from src/main/java/com/example/spot/refactor/common/api/exception/GeneralException.java rename to src/main/java/com/example/spot/common/api/exception/GeneralException.java index 2ced598c..9088608a 100644 --- a/src/main/java/com/example/spot/refactor/common/api/exception/GeneralException.java +++ b/src/main/java/com/example/spot/common/api/exception/GeneralException.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.common.api.exception; +package com.example.spot.common.api.exception; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.code.status.ErrorStatus; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/example/spot/common/api/exception/handler/MemberHandler.java b/src/main/java/com/example/spot/common/api/exception/handler/MemberHandler.java new file mode 100644 index 00000000..945a40db --- /dev/null +++ b/src/main/java/com/example/spot/common/api/exception/handler/MemberHandler.java @@ -0,0 +1,11 @@ +package com.example.spot.common.api.exception.handler; + +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.GeneralException; + +public class MemberHandler extends GeneralException { + + public MemberHandler(ErrorStatus code) { + super(code); + } +} diff --git a/src/main/java/com/example/spot/common/api/exception/handler/NotificationHandler.java b/src/main/java/com/example/spot/common/api/exception/handler/NotificationHandler.java new file mode 100644 index 00000000..902c7069 --- /dev/null +++ b/src/main/java/com/example/spot/common/api/exception/handler/NotificationHandler.java @@ -0,0 +1,11 @@ +package com.example.spot.common.api.exception.handler; + +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.GeneralException; + +public class NotificationHandler extends GeneralException { + + public NotificationHandler(ErrorStatus code) { + super(code); + } +} diff --git a/src/main/java/com/example/spot/common/api/exception/handler/PostHandler.java b/src/main/java/com/example/spot/common/api/exception/handler/PostHandler.java new file mode 100644 index 00000000..3f77edbe --- /dev/null +++ b/src/main/java/com/example/spot/common/api/exception/handler/PostHandler.java @@ -0,0 +1,11 @@ +package com.example.spot.common.api.exception.handler; + +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.GeneralException; + +public class PostHandler extends GeneralException { + + public PostHandler(ErrorStatus code) { + super(code); + } +} diff --git a/src/main/java/com/example/spot/common/api/exception/handler/S3Handler.java b/src/main/java/com/example/spot/common/api/exception/handler/S3Handler.java new file mode 100644 index 00000000..9a6ad0df --- /dev/null +++ b/src/main/java/com/example/spot/common/api/exception/handler/S3Handler.java @@ -0,0 +1,11 @@ +package com.example.spot.common.api.exception.handler; + +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.GeneralException; + +public class S3Handler extends GeneralException { + + public S3Handler(ErrorStatus code) { + super(code); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/spot/common/api/exception/handler/StudyHandler.java b/src/main/java/com/example/spot/common/api/exception/handler/StudyHandler.java new file mode 100644 index 00000000..1bc8e187 --- /dev/null +++ b/src/main/java/com/example/spot/common/api/exception/handler/StudyHandler.java @@ -0,0 +1,13 @@ +package com.example.spot.common.api.exception.handler; + +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.GeneralException; + +public class StudyHandler extends GeneralException { + + public StudyHandler(ErrorStatus status){ + super(status); + } + + +} diff --git a/src/main/java/com/example/spot/legacy/service/admin/AdminService.java b/src/main/java/com/example/spot/common/application/admin/AdminService.java similarity index 72% rename from src/main/java/com/example/spot/legacy/service/admin/AdminService.java rename to src/main/java/com/example/spot/common/application/admin/AdminService.java index 89105a38..86e40480 100644 --- a/src/main/java/com/example/spot/legacy/service/admin/AdminService.java +++ b/src/main/java/com/example/spot/common/application/admin/AdminService.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.service.admin; +package com.example.spot.common.application.admin; -import com.example.spot.legacy.web.dto.admin.AdminResponseDTO; +import com.example.spot.common.presentation.dto.admin.AdminResponseDTO; public interface AdminService { diff --git a/src/main/java/com/example/spot/legacy/service/admin/AdminServiceImpl.java b/src/main/java/com/example/spot/common/application/admin/AdminServiceImpl.java similarity index 76% rename from src/main/java/com/example/spot/legacy/service/admin/AdminServiceImpl.java rename to src/main/java/com/example/spot/common/application/admin/AdminServiceImpl.java index f9580de7..a32e50b5 100644 --- a/src/main/java/com/example/spot/legacy/service/admin/AdminServiceImpl.java +++ b/src/main/java/com/example/spot/common/application/admin/AdminServiceImpl.java @@ -1,12 +1,12 @@ -package com.example.spot.legacy.service.admin; - -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.member.domain.auth.RefreshTokenRepository; -import com.example.spot.refactor.common.security.utils.SecurityUtils; -import com.example.spot.legacy.web.dto.admin.AdminResponseDTO; +package com.example.spot.common.application.admin; + +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.handler.MemberHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.member.domain.auth.RefreshTokenRepository; +import com.example.spot.common.security.utils.SecurityUtils; +import com.example.spot.common.presentation.dto.admin.AdminResponseDTO; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/example/spot/legacy/service/message/MailService.java b/src/main/java/com/example/spot/common/application/message/MailService.java similarity index 81% rename from src/main/java/com/example/spot/legacy/service/message/MailService.java rename to src/main/java/com/example/spot/common/application/message/MailService.java index df45497a..11ab3c78 100644 --- a/src/main/java/com/example/spot/legacy/service/message/MailService.java +++ b/src/main/java/com/example/spot/common/application/message/MailService.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.service.message; +package com.example.spot.common.application.message; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/example/spot/legacy/service/message/MailServiceImpl.java b/src/main/java/com/example/spot/common/application/message/MailServiceImpl.java similarity index 92% rename from src/main/java/com/example/spot/legacy/service/message/MailServiceImpl.java rename to src/main/java/com/example/spot/common/application/message/MailServiceImpl.java index a8361c27..0f1d9681 100644 --- a/src/main/java/com/example/spot/legacy/service/message/MailServiceImpl.java +++ b/src/main/java/com/example/spot/common/application/message/MailServiceImpl.java @@ -1,7 +1,7 @@ -package com.example.spot.legacy.service.message; +package com.example.spot.common.application.message; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.handler.MemberHandler; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/example/spot/legacy/service/s3/S3ImageService.java b/src/main/java/com/example/spot/common/application/s3/S3ImageService.java similarity index 93% rename from src/main/java/com/example/spot/legacy/service/s3/S3ImageService.java rename to src/main/java/com/example/spot/common/application/s3/S3ImageService.java index 0406bbd5..ff2a50f2 100644 --- a/src/main/java/com/example/spot/legacy/service/s3/S3ImageService.java +++ b/src/main/java/com/example/spot/common/application/s3/S3ImageService.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.service.s3; +package com.example.spot.common.application.s3; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.model.CannedAccessControlList; @@ -6,10 +6,10 @@ import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; import com.amazonaws.util.IOUtils; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.handler.S3Handler; -import com.example.spot.legacy.web.dto.util.response.ImageResponse.ImageUploadResponse; -import com.example.spot.legacy.web.dto.util.response.ImageResponse.Images; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.handler.S3Handler; +import com.example.spot.common.presentation.dto.util.response.ImageResponse.ImageUploadResponse; +import com.example.spot.common.presentation.dto.util.response.ImageResponse.Images; import java.time.LocalDateTime; import java.util.ArrayList; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/common/config/ApiLoggingInterceptor.java b/src/main/java/com/example/spot/common/config/ApiLoggingInterceptor.java similarity index 95% rename from src/main/java/com/example/spot/refactor/common/config/ApiLoggingInterceptor.java rename to src/main/java/com/example/spot/common/config/ApiLoggingInterceptor.java index 924b8d88..6fac7bdc 100644 --- a/src/main/java/com/example/spot/refactor/common/config/ApiLoggingInterceptor.java +++ b/src/main/java/com/example/spot/common/config/ApiLoggingInterceptor.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.common.config; +package com.example.spot.common.config; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/example/spot/refactor/common/config/QuerydslConfig.java b/src/main/java/com/example/spot/common/config/QuerydslConfig.java similarity index 92% rename from src/main/java/com/example/spot/refactor/common/config/QuerydslConfig.java rename to src/main/java/com/example/spot/common/config/QuerydslConfig.java index 3bb4adf9..5788d623 100644 --- a/src/main/java/com/example/spot/refactor/common/config/QuerydslConfig.java +++ b/src/main/java/com/example/spot/common/config/QuerydslConfig.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.common.config; +package com.example.spot.common.config; import com.querydsl.jpa.impl.JPAQueryFactory; import jakarta.persistence.EntityManager; diff --git a/src/main/java/com/example/spot/refactor/common/config/RedisConfig.java b/src/main/java/com/example/spot/common/config/RedisConfig.java similarity index 98% rename from src/main/java/com/example/spot/refactor/common/config/RedisConfig.java rename to src/main/java/com/example/spot/common/config/RedisConfig.java index 3b8359d1..bd236f8f 100644 --- a/src/main/java/com/example/spot/refactor/common/config/RedisConfig.java +++ b/src/main/java/com/example/spot/common/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.common.config; +package com.example.spot.common.config; import com.querydsl.core.annotations.Config; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/common/config/RegionDataLoader.java b/src/main/java/com/example/spot/common/config/RegionDataLoader.java similarity index 90% rename from src/main/java/com/example/spot/refactor/common/config/RegionDataLoader.java rename to src/main/java/com/example/spot/common/config/RegionDataLoader.java index fbfdf324..16abf971 100644 --- a/src/main/java/com/example/spot/refactor/common/config/RegionDataLoader.java +++ b/src/main/java/com/example/spot/common/config/RegionDataLoader.java @@ -1,10 +1,10 @@ -package com.example.spot.refactor.common.config; +package com.example.spot.common.config; -import com.example.spot.refactor.study.domain.aggregate.Theme; -import com.example.spot.refactor.study.domain.enums.ThemeType; -import com.example.spot.refactor.study.domain.repository.RegionRepository; -import com.example.spot.refactor.study.domain.aggregate.Region; -import com.example.spot.refactor.study.domain.repository.ThemeRepository; +import com.example.spot.study.domain.aggregate.Theme; +import com.example.spot.study.domain.enums.ThemeType; +import com.example.spot.study.domain.repository.RegionRepository; +import com.example.spot.study.domain.aggregate.Region; +import com.example.spot.study.domain.repository.ThemeRepository; import java.io.IOException; import java.io.InputStreamReader; import java.util.ArrayList; diff --git a/src/main/java/com/example/spot/refactor/common/config/RestTemplateConfig.java b/src/main/java/com/example/spot/common/config/RestTemplateConfig.java similarity index 96% rename from src/main/java/com/example/spot/refactor/common/config/RestTemplateConfig.java rename to src/main/java/com/example/spot/common/config/RestTemplateConfig.java index 58d5466c..20dbcd04 100644 --- a/src/main/java/com/example/spot/refactor/common/config/RestTemplateConfig.java +++ b/src/main/java/com/example/spot/common/config/RestTemplateConfig.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.common.config; +package com.example.spot.common.config; import java.nio.charset.Charset; import org.springframework.boot.web.client.RestTemplateBuilder; diff --git a/src/main/java/com/example/spot/refactor/common/config/S3Config.java b/src/main/java/com/example/spot/common/config/S3Config.java similarity index 96% rename from src/main/java/com/example/spot/refactor/common/config/S3Config.java rename to src/main/java/com/example/spot/common/config/S3Config.java index fcfc0df2..b0a47388 100644 --- a/src/main/java/com/example/spot/refactor/common/config/S3Config.java +++ b/src/main/java/com/example/spot/common/config/S3Config.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.common.config; +package com.example.spot.common.config; import com.amazonaws.auth.AWSCredentials; import com.amazonaws.auth.AWSStaticCredentialsProvider; diff --git a/src/main/java/com/example/spot/refactor/common/config/SentryConfig.java b/src/main/java/com/example/spot/common/config/SentryConfig.java similarity index 93% rename from src/main/java/com/example/spot/refactor/common/config/SentryConfig.java rename to src/main/java/com/example/spot/common/config/SentryConfig.java index 74f592b3..ef66591a 100644 --- a/src/main/java/com/example/spot/refactor/common/config/SentryConfig.java +++ b/src/main/java/com/example/spot/common/config/SentryConfig.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.common.config; +package com.example.spot.common.config; import io.sentry.Sentry; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/com/example/spot/refactor/common/config/SwaggerConfig.java b/src/main/java/com/example/spot/common/config/SwaggerConfig.java similarity index 97% rename from src/main/java/com/example/spot/refactor/common/config/SwaggerConfig.java rename to src/main/java/com/example/spot/common/config/SwaggerConfig.java index 2b82801a..f3bfd1d1 100644 --- a/src/main/java/com/example/spot/refactor/common/config/SwaggerConfig.java +++ b/src/main/java/com/example/spot/common/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.common.config; +package com.example.spot.common.config; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.models.Components; diff --git a/src/main/java/com/example/spot/refactor/common/config/WebConfig.java b/src/main/java/com/example/spot/common/config/WebConfig.java similarity index 91% rename from src/main/java/com/example/spot/refactor/common/config/WebConfig.java rename to src/main/java/com/example/spot/common/config/WebConfig.java index 72e00a83..6bc57b9b 100644 --- a/src/main/java/com/example/spot/refactor/common/config/WebConfig.java +++ b/src/main/java/com/example/spot/common/config/WebConfig.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.common.config; +package com.example.spot.common.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/example/spot/refactor/common/config/WebSecurity.java b/src/main/java/com/example/spot/common/config/WebSecurity.java similarity index 91% rename from src/main/java/com/example/spot/refactor/common/config/WebSecurity.java rename to src/main/java/com/example/spot/common/config/WebSecurity.java index d4dabdc7..fff5d634 100644 --- a/src/main/java/com/example/spot/refactor/common/config/WebSecurity.java +++ b/src/main/java/com/example/spot/common/config/WebSecurity.java @@ -1,12 +1,12 @@ -package com.example.spot.refactor.common.config; +package com.example.spot.common.config; -import com.example.spot.refactor.common.security.filters.JwtAuthenticationFilter; -import com.example.spot.refactor.common.security.oauth.CustomOAuth2UserService; -import com.example.spot.refactor.common.security.oauth.CustomOAuthSuccessHandler; -import com.example.spot.refactor.common.security.utils.JwtTokenProvider; -import com.example.spot.refactor.member.application.MemberService; -import com.example.spot.refactor.member.application.UserDetailsServiceCustom; +import com.example.spot.common.security.filters.JwtAuthenticationFilter; +import com.example.spot.common.security.oauth.CustomOAuth2UserService; +import com.example.spot.common.security.oauth.CustomOAuthSuccessHandler; +import com.example.spot.common.security.utils.JwtTokenProvider; +import com.example.spot.member.application.MemberService; +import com.example.spot.member.application.UserDetailsServiceCustom; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/example/spot/refactor/common/entity/BaseEntity.java b/src/main/java/com/example/spot/common/entity/BaseEntity.java similarity index 92% rename from src/main/java/com/example/spot/refactor/common/entity/BaseEntity.java rename to src/main/java/com/example/spot/common/entity/BaseEntity.java index d73de0a0..df191dd0 100644 --- a/src/main/java/com/example/spot/refactor/common/entity/BaseEntity.java +++ b/src/main/java/com/example/spot/common/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.common.entity; +package com.example.spot.common.entity; import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; diff --git a/src/main/java/com/example/spot/legacy/validation/validator/ExistRegionValidator.java b/src/main/java/com/example/spot/common/infrastructure/ExistRegionValidator.java similarity index 82% rename from src/main/java/com/example/spot/legacy/validation/validator/ExistRegionValidator.java rename to src/main/java/com/example/spot/common/infrastructure/ExistRegionValidator.java index dd3f5314..b4acbb5a 100644 --- a/src/main/java/com/example/spot/legacy/validation/validator/ExistRegionValidator.java +++ b/src/main/java/com/example/spot/common/infrastructure/ExistRegionValidator.java @@ -1,8 +1,8 @@ -package com.example.spot.legacy.validation.validator; +package com.example.spot.common.infrastructure; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.study.domain.repository.RegionRepository; -import com.example.spot.legacy.validation.annotation.ExistRegion; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.study.domain.repository.RegionRepository; +import com.example.spot.common.presentation.validator.ExistRegion; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/src/main/java/com/example/spot/legacy/validation/validator/IntSizeValidator.java b/src/main/java/com/example/spot/common/infrastructure/IntSizeValidator.java similarity index 88% rename from src/main/java/com/example/spot/legacy/validation/validator/IntSizeValidator.java rename to src/main/java/com/example/spot/common/infrastructure/IntSizeValidator.java index 0970a9eb..1e546d85 100644 --- a/src/main/java/com/example/spot/legacy/validation/validator/IntSizeValidator.java +++ b/src/main/java/com/example/spot/common/infrastructure/IntSizeValidator.java @@ -1,7 +1,7 @@ -package com.example.spot.legacy.validation.validator; +package com.example.spot.common.infrastructure; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.legacy.validation.annotation.IntSize; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.presentation.validator.IntSize; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/legacy/validation/validator/LongSizeValidator.java b/src/main/java/com/example/spot/common/infrastructure/LongSizeValidator.java similarity index 88% rename from src/main/java/com/example/spot/legacy/validation/validator/LongSizeValidator.java rename to src/main/java/com/example/spot/common/infrastructure/LongSizeValidator.java index 8b9de492..3b8bb2b1 100644 --- a/src/main/java/com/example/spot/legacy/validation/validator/LongSizeValidator.java +++ b/src/main/java/com/example/spot/common/infrastructure/LongSizeValidator.java @@ -1,7 +1,7 @@ -package com.example.spot.legacy.validation.validator; +package com.example.spot.common.infrastructure; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.legacy.validation.annotation.LongSize; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.presentation.validator.LongSize; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/legacy/validation/validator/TextLengthValidator.java b/src/main/java/com/example/spot/common/infrastructure/TextLengthValidator.java similarity index 88% rename from src/main/java/com/example/spot/legacy/validation/validator/TextLengthValidator.java rename to src/main/java/com/example/spot/common/infrastructure/TextLengthValidator.java index 856deabf..0eece1c8 100644 --- a/src/main/java/com/example/spot/legacy/validation/validator/TextLengthValidator.java +++ b/src/main/java/com/example/spot/common/infrastructure/TextLengthValidator.java @@ -1,7 +1,7 @@ -package com.example.spot.legacy.validation.validator; +package com.example.spot.common.infrastructure; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.legacy.validation.annotation.TextLength; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.presentation.validator.TextLength; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/legacy/web/controller/AdminController.java b/src/main/java/com/example/spot/common/presentation/controller/AdminController.java similarity index 94% rename from src/main/java/com/example/spot/legacy/web/controller/AdminController.java rename to src/main/java/com/example/spot/common/presentation/controller/AdminController.java index d0e3e744..952732ca 100644 --- a/src/main/java/com/example/spot/legacy/web/controller/AdminController.java +++ b/src/main/java/com/example/spot/common/presentation/controller/AdminController.java @@ -1,11 +1,11 @@ -package com.example.spot.legacy.web.controller; +package com.example.spot.common.presentation.controller; -import com.example.spot.refactor.common.api.ApiResponse; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.code.status.SuccessStatus; -import com.example.spot.refactor.common.api.exception.GeneralException; -import com.example.spot.legacy.service.admin.AdminService; -import com.example.spot.legacy.web.dto.admin.AdminResponseDTO; +import com.example.spot.common.api.ApiResponse; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.code.status.SuccessStatus; +import com.example.spot.common.api.exception.GeneralException; +import com.example.spot.common.application.admin.AdminService; +import com.example.spot.common.presentation.dto.admin.AdminResponseDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/example/spot/legacy/web/controller/UtilController.java b/src/main/java/com/example/spot/common/presentation/controller/UtilController.java similarity index 83% rename from src/main/java/com/example/spot/legacy/web/controller/UtilController.java rename to src/main/java/com/example/spot/common/presentation/controller/UtilController.java index 67e56482..bada1e9e 100644 --- a/src/main/java/com/example/spot/legacy/web/controller/UtilController.java +++ b/src/main/java/com/example/spot/common/presentation/controller/UtilController.java @@ -1,10 +1,10 @@ -package com.example.spot.legacy.web.controller; +package com.example.spot.common.presentation.controller; -import com.example.spot.refactor.common.api.ApiResponse; -import com.example.spot.refactor.common.api.code.status.SuccessStatus; -import com.example.spot.legacy.service.s3.S3ImageService; -import com.example.spot.legacy.web.dto.util.response.ImageResponse; -import com.example.spot.legacy.web.dto.util.response.ImageResponse.ImageUploadResponse; +import com.example.spot.common.api.ApiResponse; +import com.example.spot.common.api.code.status.SuccessStatus; +import com.example.spot.common.application.s3.S3ImageService; +import com.example.spot.common.presentation.dto.util.response.ImageResponse; +import com.example.spot.common.presentation.dto.util.response.ImageResponse.ImageUploadResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import java.util.List; diff --git a/src/main/java/com/example/spot/legacy/web/dto/admin/AdminResponseDTO.java b/src/main/java/com/example/spot/common/presentation/dto/admin/AdminResponseDTO.java similarity index 92% rename from src/main/java/com/example/spot/legacy/web/dto/admin/AdminResponseDTO.java rename to src/main/java/com/example/spot/common/presentation/dto/admin/AdminResponseDTO.java index 5bca5e9a..4b18bbe0 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/admin/AdminResponseDTO.java +++ b/src/main/java/com/example/spot/common/presentation/dto/admin/AdminResponseDTO.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.web.dto.admin; +package com.example.spot.common.presentation.dto.admin; -import com.example.spot.refactor.member.domain.Member; +import com.example.spot.member.domain.Member; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/legacy/web/dto/util/response/ImageResponse.java b/src/main/java/com/example/spot/common/presentation/dto/util/response/ImageResponse.java similarity index 90% rename from src/main/java/com/example/spot/legacy/web/dto/util/response/ImageResponse.java rename to src/main/java/com/example/spot/common/presentation/dto/util/response/ImageResponse.java index 1e47de9d..b70264bc 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/util/response/ImageResponse.java +++ b/src/main/java/com/example/spot/common/presentation/dto/util/response/ImageResponse.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.web.dto.util.response; +package com.example.spot.common.presentation.dto.util.response; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/com/example/spot/legacy/validation/annotation/ExistRegion.java b/src/main/java/com/example/spot/common/presentation/validator/ExistRegion.java similarity index 83% rename from src/main/java/com/example/spot/legacy/validation/annotation/ExistRegion.java rename to src/main/java/com/example/spot/common/presentation/validator/ExistRegion.java index 26934371..1d85b8af 100644 --- a/src/main/java/com/example/spot/legacy/validation/annotation/ExistRegion.java +++ b/src/main/java/com/example/spot/common/presentation/validator/ExistRegion.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.validation.annotation; +package com.example.spot.common.presentation.validator; -import com.example.spot.legacy.validation.validator.ExistRegionValidator; +import com.example.spot.common.infrastructure.ExistRegionValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/com/example/spot/legacy/validation/annotation/IntSize.java b/src/main/java/com/example/spot/common/presentation/validator/IntSize.java similarity index 81% rename from src/main/java/com/example/spot/legacy/validation/annotation/IntSize.java rename to src/main/java/com/example/spot/common/presentation/validator/IntSize.java index 3f55436e..82e78e11 100644 --- a/src/main/java/com/example/spot/legacy/validation/annotation/IntSize.java +++ b/src/main/java/com/example/spot/common/presentation/validator/IntSize.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.validation.annotation; +package com.example.spot.common.presentation.validator; -import com.example.spot.legacy.validation.validator.IntSizeValidator; +import com.example.spot.common.infrastructure.IntSizeValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/com/example/spot/legacy/validation/annotation/LongSize.java b/src/main/java/com/example/spot/common/presentation/validator/LongSize.java similarity index 81% rename from src/main/java/com/example/spot/legacy/validation/annotation/LongSize.java rename to src/main/java/com/example/spot/common/presentation/validator/LongSize.java index a3b1ed97..7d07a0d5 100644 --- a/src/main/java/com/example/spot/legacy/validation/annotation/LongSize.java +++ b/src/main/java/com/example/spot/common/presentation/validator/LongSize.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.validation.annotation; +package com.example.spot.common.presentation.validator; -import com.example.spot.legacy.validation.validator.LongSizeValidator; +import com.example.spot.common.infrastructure.LongSizeValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/com/example/spot/legacy/validation/annotation/TextLength.java b/src/main/java/com/example/spot/common/presentation/validator/TextLength.java similarity index 81% rename from src/main/java/com/example/spot/legacy/validation/annotation/TextLength.java rename to src/main/java/com/example/spot/common/presentation/validator/TextLength.java index e418d8e1..1a15dcb0 100644 --- a/src/main/java/com/example/spot/legacy/validation/annotation/TextLength.java +++ b/src/main/java/com/example/spot/common/presentation/validator/TextLength.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.validation.annotation; +package com.example.spot.common.presentation.validator; -import com.example.spot.legacy.validation.validator.TextLengthValidator; +import com.example.spot.common.infrastructure.TextLengthValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/com/example/spot/refactor/common/scheduler/HotKeywordScheduler.java b/src/main/java/com/example/spot/common/scheduler/HotKeywordScheduler.java similarity index 97% rename from src/main/java/com/example/spot/refactor/common/scheduler/HotKeywordScheduler.java rename to src/main/java/com/example/spot/common/scheduler/HotKeywordScheduler.java index 78a39bd0..4d99a64c 100644 --- a/src/main/java/com/example/spot/refactor/common/scheduler/HotKeywordScheduler.java +++ b/src/main/java/com/example/spot/common/scheduler/HotKeywordScheduler.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.common.scheduler; +package com.example.spot.common.scheduler; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/src/main/java/com/example/spot/refactor/common/scheduler/MemberRemovalScheduler.java b/src/main/java/com/example/spot/common/scheduler/MemberRemovalScheduler.java similarity index 83% rename from src/main/java/com/example/spot/refactor/common/scheduler/MemberRemovalScheduler.java rename to src/main/java/com/example/spot/common/scheduler/MemberRemovalScheduler.java index 4522e5bb..add0791b 100644 --- a/src/main/java/com/example/spot/refactor/common/scheduler/MemberRemovalScheduler.java +++ b/src/main/java/com/example/spot/common/scheduler/MemberRemovalScheduler.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.common.scheduler; +package com.example.spot.common.scheduler; -import com.example.spot.legacy.service.admin.AdminService; -import com.example.spot.legacy.web.dto.admin.AdminResponseDTO; +import com.example.spot.common.application.admin.AdminService; +import com.example.spot.common.presentation.dto.admin.AdminResponseDTO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; diff --git a/src/main/java/com/example/spot/refactor/common/scheduler/PostSortCommentsScheduler.java b/src/main/java/com/example/spot/common/scheduler/PostSortCommentsScheduler.java similarity index 80% rename from src/main/java/com/example/spot/refactor/common/scheduler/PostSortCommentsScheduler.java rename to src/main/java/com/example/spot/common/scheduler/PostSortCommentsScheduler.java index 6dbed6b1..26a64d4a 100644 --- a/src/main/java/com/example/spot/refactor/common/scheduler/PostSortCommentsScheduler.java +++ b/src/main/java/com/example/spot/common/scheduler/PostSortCommentsScheduler.java @@ -1,9 +1,9 @@ -package com.example.spot.refactor.common.scheduler; +package com.example.spot.common.scheduler; -import com.example.spot.legacy.domain.Post; -import com.example.spot.legacy.domain.PostScheduleComments; -import com.example.spot.legacy.repository.PostRepository; -import com.example.spot.legacy.repository.PostScheduleCommentsRepository; +import com.example.spot.post.domain.Post; +import com.example.spot.post.domain.schedule.PostScheduleComments; +import com.example.spot.post.domain.PostRepository; +import com.example.spot.post.domain.schedule.PostScheduleCommentsRepository; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/spot/refactor/common/scheduler/PostSortLikesScheduler.java b/src/main/java/com/example/spot/common/scheduler/PostSortLikesScheduler.java similarity index 80% rename from src/main/java/com/example/spot/refactor/common/scheduler/PostSortLikesScheduler.java rename to src/main/java/com/example/spot/common/scheduler/PostSortLikesScheduler.java index 136dfa3f..e3a019f7 100644 --- a/src/main/java/com/example/spot/refactor/common/scheduler/PostSortLikesScheduler.java +++ b/src/main/java/com/example/spot/common/scheduler/PostSortLikesScheduler.java @@ -1,9 +1,9 @@ -package com.example.spot.refactor.common.scheduler; +package com.example.spot.common.scheduler; -import com.example.spot.legacy.domain.Post; -import com.example.spot.legacy.domain.PostScheduleLikes; -import com.example.spot.legacy.repository.PostRepository; -import com.example.spot.legacy.repository.PostScheduleLikesRepository; +import com.example.spot.post.domain.Post; +import com.example.spot.post.domain.schedule.PostScheduleLikes; +import com.example.spot.post.domain.PostRepository; +import com.example.spot.post.domain.schedule.PostScheduleLikesRepository; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/spot/refactor/common/scheduler/PostSortRealTimeScheduler.java b/src/main/java/com/example/spot/common/scheduler/PostSortRealTimeScheduler.java similarity index 81% rename from src/main/java/com/example/spot/refactor/common/scheduler/PostSortRealTimeScheduler.java rename to src/main/java/com/example/spot/common/scheduler/PostSortRealTimeScheduler.java index b0cbaa0e..410ab2f5 100644 --- a/src/main/java/com/example/spot/refactor/common/scheduler/PostSortRealTimeScheduler.java +++ b/src/main/java/com/example/spot/common/scheduler/PostSortRealTimeScheduler.java @@ -1,9 +1,9 @@ -package com.example.spot.refactor.common.scheduler; +package com.example.spot.common.scheduler; -import com.example.spot.legacy.domain.Post; -import com.example.spot.legacy.domain.PostScheduleRealTime; -import com.example.spot.legacy.repository.PostRepository; -import com.example.spot.legacy.repository.PostScheduleRealTimeRepository; +import com.example.spot.post.domain.Post; +import com.example.spot.post.domain.schedule.PostScheduleRealTime; +import com.example.spot.post.domain.PostRepository; +import com.example.spot.post.domain.schedule.PostScheduleRealTimeRepository; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/spot/refactor/common/security/filters/JwtAuthenticationFilter.java b/src/main/java/com/example/spot/common/security/filters/JwtAuthenticationFilter.java similarity index 91% rename from src/main/java/com/example/spot/refactor/common/security/filters/JwtAuthenticationFilter.java rename to src/main/java/com/example/spot/common/security/filters/JwtAuthenticationFilter.java index 7f830a3b..5908ecfc 100644 --- a/src/main/java/com/example/spot/refactor/common/security/filters/JwtAuthenticationFilter.java +++ b/src/main/java/com/example/spot/common/security/filters/JwtAuthenticationFilter.java @@ -1,10 +1,10 @@ -package com.example.spot.refactor.common.security.filters; +package com.example.spot.common.security.filters; -import com.example.spot.refactor.common.api.exception.GeneralException; -import com.example.spot.refactor.member.domain.auth.TempUserDetails; -import com.example.spot.refactor.member.application.MemberService; -import com.example.spot.refactor.common.security.utils.JwtTokenProvider; -import com.example.spot.refactor.member.application.UserDetailsServiceCustom; +import com.example.spot.common.api.exception.GeneralException; +import com.example.spot.member.domain.auth.TempUserDetails; +import com.example.spot.member.application.MemberService; +import com.example.spot.common.security.utils.JwtTokenProvider; +import com.example.spot.member.application.UserDetailsServiceCustom; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/example/spot/refactor/common/security/oauth/CustomOAuth2UserService.java b/src/main/java/com/example/spot/common/security/oauth/CustomOAuth2UserService.java similarity index 81% rename from src/main/java/com/example/spot/refactor/common/security/oauth/CustomOAuth2UserService.java rename to src/main/java/com/example/spot/common/security/oauth/CustomOAuth2UserService.java index 5b113c32..c8ccf45c 100644 --- a/src/main/java/com/example/spot/refactor/common/security/oauth/CustomOAuth2UserService.java +++ b/src/main/java/com/example/spot/common/security/oauth/CustomOAuth2UserService.java @@ -1,16 +1,16 @@ -package com.example.spot.refactor.common.security.oauth; +package com.example.spot.common.security.oauth; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.GeneralException; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.member.domain.enums.Carrier; -import com.example.spot.refactor.member.domain.enums.LoginType; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.common.security.utils.MemberUtils; -import com.example.spot.refactor.member.application.MemberService; -import com.example.spot.refactor.common.security.oauth.adpter.CustomOAuth2User; -import com.example.spot.refactor.common.security.oauth.adpter.OAuth2UserInfo; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.GeneralException; +import com.example.spot.common.api.exception.handler.MemberHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.member.domain.enums.Carrier; +import com.example.spot.member.domain.enums.LoginType; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.common.security.utils.MemberUtils; +import com.example.spot.member.application.MemberService; +import com.example.spot.common.security.oauth.adpter.CustomOAuth2User; +import com.example.spot.common.security.oauth.adpter.OAuth2UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService; import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest; diff --git a/src/main/java/com/example/spot/refactor/common/security/oauth/CustomOAuthSuccessHandler.java b/src/main/java/com/example/spot/common/security/oauth/CustomOAuthSuccessHandler.java similarity index 75% rename from src/main/java/com/example/spot/refactor/common/security/oauth/CustomOAuthSuccessHandler.java rename to src/main/java/com/example/spot/common/security/oauth/CustomOAuthSuccessHandler.java index 7d0bcf1f..5bb09f83 100644 --- a/src/main/java/com/example/spot/refactor/common/security/oauth/CustomOAuthSuccessHandler.java +++ b/src/main/java/com/example/spot/common/security/oauth/CustomOAuthSuccessHandler.java @@ -1,17 +1,17 @@ -package com.example.spot.refactor.common.security.oauth; +package com.example.spot.common.security.oauth; -import com.example.spot.refactor.common.api.ApiResponse; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.code.status.SuccessStatus; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.common.security.utils.JwtTokenProvider; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.SocialLoginSignInDTO; -import com.example.spot.refactor.common.security.oauth.adpter.CustomOAuth2User; -import com.example.spot.refactor.common.security.oauth.adpter.google.GoogleUserInfo; -import com.example.spot.refactor.member.presentation.dto.token.TokenResponseDTO; +import com.example.spot.common.api.ApiResponse; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.code.status.SuccessStatus; +import com.example.spot.common.api.exception.handler.MemberHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.common.security.utils.JwtTokenProvider; +import com.example.spot.member.presentation.dto.MemberResponseDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO.SocialLoginSignInDTO; +import com.example.spot.common.security.oauth.adpter.CustomOAuth2User; +import com.example.spot.common.security.oauth.adpter.google.GoogleUserInfo; +import com.example.spot.member.presentation.dto.token.TokenResponseDTO; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/example/spot/refactor/common/security/oauth/OAuthUserInfoFactory.java b/src/main/java/com/example/spot/common/security/oauth/OAuthUserInfoFactory.java similarity index 60% rename from src/main/java/com/example/spot/refactor/common/security/oauth/OAuthUserInfoFactory.java rename to src/main/java/com/example/spot/common/security/oauth/OAuthUserInfoFactory.java index 78af95f3..619de3d0 100644 --- a/src/main/java/com/example/spot/refactor/common/security/oauth/OAuthUserInfoFactory.java +++ b/src/main/java/com/example/spot/common/security/oauth/OAuthUserInfoFactory.java @@ -1,9 +1,9 @@ -package com.example.spot.refactor.common.security.oauth; +package com.example.spot.common.security.oauth; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; -import com.example.spot.refactor.common.security.oauth.adpter.google.GoogleUserInfo; -import com.example.spot.refactor.common.security.oauth.adpter.OAuth2UserInfo; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.handler.MemberHandler; +import com.example.spot.common.security.oauth.adpter.google.GoogleUserInfo; +import com.example.spot.common.security.oauth.adpter.OAuth2UserInfo; import lombok.extern.slf4j.Slf4j; import java.util.Map; diff --git a/src/main/java/com/example/spot/refactor/common/security/oauth/adpter/CustomOAuth2User.java b/src/main/java/com/example/spot/common/security/oauth/adpter/CustomOAuth2User.java similarity index 89% rename from src/main/java/com/example/spot/refactor/common/security/oauth/adpter/CustomOAuth2User.java rename to src/main/java/com/example/spot/common/security/oauth/adpter/CustomOAuth2User.java index f6259bbd..1d2ca8e7 100644 --- a/src/main/java/com/example/spot/refactor/common/security/oauth/adpter/CustomOAuth2User.java +++ b/src/main/java/com/example/spot/common/security/oauth/adpter/CustomOAuth2User.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.common.security.oauth.adpter; +package com.example.spot.common.security.oauth.adpter; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.member.domain.enums.LoginType; +import com.example.spot.member.domain.Member; +import com.example.spot.member.domain.enums.LoginType; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/com/example/spot/refactor/common/security/oauth/adpter/OAuth2UserInfo.java b/src/main/java/com/example/spot/common/security/oauth/adpter/OAuth2UserInfo.java similarity index 76% rename from src/main/java/com/example/spot/refactor/common/security/oauth/adpter/OAuth2UserInfo.java rename to src/main/java/com/example/spot/common/security/oauth/adpter/OAuth2UserInfo.java index fb3a1ff9..0ecdef21 100644 --- a/src/main/java/com/example/spot/refactor/common/security/oauth/adpter/OAuth2UserInfo.java +++ b/src/main/java/com/example/spot/common/security/oauth/adpter/OAuth2UserInfo.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.common.security.oauth.adpter; +package com.example.spot.common.security.oauth.adpter; /** * 추후 Spring Security OAuth2로 사용시 해당 interface를 구현하시면 됩니다. diff --git a/src/main/java/com/example/spot/refactor/common/security/oauth/adpter/google/GoogleUserInfo.java b/src/main/java/com/example/spot/common/security/oauth/adpter/google/GoogleUserInfo.java similarity index 84% rename from src/main/java/com/example/spot/refactor/common/security/oauth/adpter/google/GoogleUserInfo.java rename to src/main/java/com/example/spot/common/security/oauth/adpter/google/GoogleUserInfo.java index 17163018..0bb08c0f 100644 --- a/src/main/java/com/example/spot/refactor/common/security/oauth/adpter/google/GoogleUserInfo.java +++ b/src/main/java/com/example/spot/common/security/oauth/adpter/google/GoogleUserInfo.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.common.security.oauth.adpter.google; +package com.example.spot.common.security.oauth.adpter.google; -import com.example.spot.refactor.common.security.oauth.adpter.OAuth2UserInfo; +import com.example.spot.common.security.oauth.adpter.OAuth2UserInfo; import lombok.RequiredArgsConstructor; import java.util.Map; diff --git a/src/main/java/com/example/spot/refactor/common/security/utils/JwtTokenProvider.java b/src/main/java/com/example/spot/common/security/utils/JwtTokenProvider.java similarity index 95% rename from src/main/java/com/example/spot/refactor/common/security/utils/JwtTokenProvider.java rename to src/main/java/com/example/spot/common/security/utils/JwtTokenProvider.java index 54668d45..da5c85a8 100644 --- a/src/main/java/com/example/spot/refactor/common/security/utils/JwtTokenProvider.java +++ b/src/main/java/com/example/spot/common/security/utils/JwtTokenProvider.java @@ -1,9 +1,9 @@ -package com.example.spot.refactor.common.security.utils; +package com.example.spot.common.security.utils; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.GeneralException; -import com.example.spot.refactor.member.presentation.dto.token.TokenResponseDTO; -import com.example.spot.refactor.member.presentation.dto.token.TokenResponseDTO.TokenDTO; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.GeneralException; +import com.example.spot.member.presentation.dto.token.TokenResponseDTO; +import com.example.spot.member.presentation.dto.token.TokenResponseDTO.TokenDTO; import io.jsonwebtoken.*; import io.jsonwebtoken.security.Keys; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/com/example/spot/refactor/common/security/utils/MemberUtils.java b/src/main/java/com/example/spot/common/security/utils/MemberUtils.java similarity index 93% rename from src/main/java/com/example/spot/refactor/common/security/utils/MemberUtils.java rename to src/main/java/com/example/spot/common/security/utils/MemberUtils.java index eaf23e66..b9dcbc9d 100644 --- a/src/main/java/com/example/spot/refactor/common/security/utils/MemberUtils.java +++ b/src/main/java/com/example/spot/common/security/utils/MemberUtils.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.common.security.utils; +package com.example.spot.common.security.utils; import java.util.Random; diff --git a/src/main/java/com/example/spot/refactor/common/security/utils/RSAUtils.java b/src/main/java/com/example/spot/common/security/utils/RSAUtils.java similarity index 94% rename from src/main/java/com/example/spot/refactor/common/security/utils/RSAUtils.java rename to src/main/java/com/example/spot/common/security/utils/RSAUtils.java index ef73fe72..5ad03058 100644 --- a/src/main/java/com/example/spot/refactor/common/security/utils/RSAUtils.java +++ b/src/main/java/com/example/spot/common/security/utils/RSAUtils.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.common.security.utils; +package com.example.spot.common.security.utils; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; -import com.example.spot.refactor.member.domain.auth.RsaKey; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.handler.MemberHandler; +import com.example.spot.member.domain.auth.RsaKey; import org.springframework.stereotype.Component; import javax.crypto.Cipher; diff --git a/src/main/java/com/example/spot/refactor/common/security/utils/SecurityUtils.java b/src/main/java/com/example/spot/common/security/utils/SecurityUtils.java similarity index 93% rename from src/main/java/com/example/spot/refactor/common/security/utils/SecurityUtils.java rename to src/main/java/com/example/spot/common/security/utils/SecurityUtils.java index 95749b43..18117a7b 100644 --- a/src/main/java/com/example/spot/refactor/common/security/utils/SecurityUtils.java +++ b/src/main/java/com/example/spot/common/security/utils/SecurityUtils.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.common.security.utils; +package com.example.spot.common.security.utils; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.GeneralException; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.GeneralException; import java.util.Objects; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/src/main/java/com/example/spot/legacy/domain/enums/JwtValidationType.java b/src/main/java/com/example/spot/legacy/domain/enums/JwtValidationType.java deleted file mode 100644 index 59d7d905..00000000 --- a/src/main/java/com/example/spot/legacy/domain/enums/JwtValidationType.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.example.spot.legacy.domain.enums; - -public enum JwtValidationType { - VALID_JWT, - INVALID_JWT_TOKEN, - EXPIRED_JWT_TOKEN, - UNSUPPORTED_JWT_TOKEN, - EMPTY_JWT_TOKEN - -} diff --git a/src/main/java/com/example/spot/refactor/member/application/MemberService.java b/src/main/java/com/example/spot/member/application/MemberService.java similarity index 69% rename from src/main/java/com/example/spot/refactor/member/application/MemberService.java rename to src/main/java/com/example/spot/member/application/MemberService.java index c84fd9ee..8306481d 100644 --- a/src/main/java/com/example/spot/refactor/member/application/MemberService.java +++ b/src/main/java/com/example/spot/member/application/MemberService.java @@ -1,13 +1,13 @@ -package com.example.spot.refactor.member.application; +package com.example.spot.member.application; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.member.presentation.dto.MemberRequestDTO.MemberInfoListDTO; -import com.example.spot.refactor.member.presentation.dto.MemberRequestDTO.MemberReasonDTO; -import com.example.spot.refactor.member.presentation.dto.MemberRequestDTO.MemberRegionDTO; -import com.example.spot.refactor.member.presentation.dto.MemberRequestDTO.MemberThemeDTO; -import com.example.spot.refactor.member.presentation.dto.MemberRequestDTO.MemberUpdateDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO; +import com.example.spot.member.domain.Member; +import com.example.spot.member.presentation.dto.MemberRequestDTO.MemberInfoListDTO; +import com.example.spot.member.presentation.dto.MemberRequestDTO.MemberReasonDTO; +import com.example.spot.member.presentation.dto.MemberRequestDTO.MemberRegionDTO; +import com.example.spot.member.presentation.dto.MemberRequestDTO.MemberThemeDTO; +import com.example.spot.member.presentation.dto.MemberRequestDTO.MemberUpdateDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO; import com.fasterxml.jackson.core.JsonProcessingException; import java.io.IOException; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/src/main/java/com/example/spot/refactor/member/application/MemberServiceImpl.java b/src/main/java/com/example/spot/member/application/MemberServiceImpl.java similarity index 88% rename from src/main/java/com/example/spot/refactor/member/application/MemberServiceImpl.java rename to src/main/java/com/example/spot/member/application/MemberServiceImpl.java index dc367dc5..b41b7b89 100644 --- a/src/main/java/com/example/spot/refactor/member/application/MemberServiceImpl.java +++ b/src/main/java/com/example/spot/member/application/MemberServiceImpl.java @@ -1,33 +1,33 @@ -package com.example.spot.refactor.member.application; - -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.GeneralException; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; -import com.example.spot.refactor.member.domain.association.StudyJoinReason; -import com.example.spot.refactor.member.domain.enums.Gender; -import com.example.spot.refactor.member.domain.enums.LoginType; -import com.example.spot.legacy.domain.enums.Reason; -import com.example.spot.refactor.member.domain.enums.Status; -import com.example.spot.refactor.study.domain.enums.ThemeType; -import com.example.spot.refactor.member.domain.association.StudyJoinReasonRepository; -import com.example.spot.refactor.common.security.utils.JwtTokenProvider; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.member.presentation.dto.MemberRequestDTO; -import com.example.spot.refactor.member.presentation.dto.MemberRequestDTO.MemberReasonDTO; -import com.example.spot.refactor.member.domain.auth.CustomUserDetails; -import com.example.spot.refactor.member.domain.auth.RefreshToken; -import com.example.spot.refactor.member.domain.auth.RefreshTokenRepository; -import com.example.spot.refactor.member.application.auth.KaKaoOAuthService; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.MemberRegionDTO.RegionDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.MemberSignInDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.MemberStudyReasonDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.MemberTestDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.SocialLoginSignInDTO; -import com.example.spot.refactor.member.presentation.dto.kakao.KaKaoOAuthToken.KaKaoOAuthTokenDTO; -import com.example.spot.refactor.member.presentation.dto.kakao.KaKaoUser; -import com.example.spot.refactor.member.presentation.dto.token.TokenResponseDTO.TokenDTO; +package com.example.spot.member.application; + +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.GeneralException; +import com.example.spot.common.api.exception.handler.MemberHandler; +import com.example.spot.member.domain.association.StudyJoinReason; +import com.example.spot.member.domain.enums.Gender; +import com.example.spot.member.domain.enums.LoginType; +import com.example.spot.member.domain.enums.Reason; +import com.example.spot.member.domain.enums.Status; +import com.example.spot.study.domain.enums.ThemeType; +import com.example.spot.member.domain.association.StudyJoinReasonRepository; +import com.example.spot.common.security.utils.JwtTokenProvider; +import com.example.spot.member.domain.Member; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.member.presentation.dto.MemberRequestDTO; +import com.example.spot.member.presentation.dto.MemberRequestDTO.MemberReasonDTO; +import com.example.spot.member.domain.auth.CustomUserDetails; +import com.example.spot.member.domain.auth.RefreshToken; +import com.example.spot.member.domain.auth.RefreshTokenRepository; +import com.example.spot.member.application.auth.KaKaoOAuthService; +import com.example.spot.member.presentation.dto.MemberResponseDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO.MemberRegionDTO.RegionDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO.MemberSignInDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO.MemberStudyReasonDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO.MemberTestDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO.SocialLoginSignInDTO; +import com.example.spot.member.presentation.dto.kakao.KaKaoOAuthToken.KaKaoOAuthTokenDTO; +import com.example.spot.member.presentation.dto.kakao.KaKaoUser; +import com.example.spot.member.presentation.dto.token.TokenResponseDTO.TokenDTO; import com.fasterxml.jackson.core.JsonProcessingException; import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; @@ -42,18 +42,18 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UsernameNotFoundException; -import com.example.spot.refactor.study.domain.aggregate.Region; -import com.example.spot.refactor.study.domain.aggregate.Theme; -import com.example.spot.refactor.member.domain.association.MemberTheme; -import com.example.spot.refactor.member.domain.association.PreferredRegion; -import com.example.spot.refactor.member.domain.association.MemberThemeRepository; -import com.example.spot.refactor.member.domain.association.PreferredRegionRepository; -import com.example.spot.refactor.study.domain.repository.RegionRepository; -import com.example.spot.refactor.study.domain.repository.ThemeRepository; -import com.example.spot.refactor.member.presentation.dto.MemberRequestDTO.MemberInfoListDTO; -import com.example.spot.refactor.member.presentation.dto.MemberRequestDTO.MemberRegionDTO; -import com.example.spot.refactor.member.presentation.dto.MemberRequestDTO.MemberThemeDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.MemberUpdateDTO; +import com.example.spot.study.domain.aggregate.Region; +import com.example.spot.study.domain.aggregate.Theme; +import com.example.spot.member.domain.association.MemberTheme; +import com.example.spot.member.domain.association.PreferredRegion; +import com.example.spot.member.domain.association.MemberThemeRepository; +import com.example.spot.member.domain.association.PreferredRegionRepository; +import com.example.spot.study.domain.repository.RegionRepository; +import com.example.spot.study.domain.repository.ThemeRepository; +import com.example.spot.member.presentation.dto.MemberRequestDTO.MemberInfoListDTO; +import com.example.spot.member.presentation.dto.MemberRequestDTO.MemberRegionDTO; +import com.example.spot.member.presentation.dto.MemberRequestDTO.MemberThemeDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO.MemberUpdateDTO; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/example/spot/refactor/member/application/UserDetailsServiceCustom.java b/src/main/java/com/example/spot/member/application/UserDetailsServiceCustom.java similarity index 73% rename from src/main/java/com/example/spot/refactor/member/application/UserDetailsServiceCustom.java rename to src/main/java/com/example/spot/member/application/UserDetailsServiceCustom.java index 68fbd4d5..e6f181eb 100644 --- a/src/main/java/com/example/spot/refactor/member/application/UserDetailsServiceCustom.java +++ b/src/main/java/com/example/spot/member/application/UserDetailsServiceCustom.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.member.application; +package com.example.spot.member.application; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/src/main/java/com/example/spot/refactor/member/application/UserDetailsServiceCustomImpl.java b/src/main/java/com/example/spot/member/application/UserDetailsServiceCustomImpl.java similarity index 86% rename from src/main/java/com/example/spot/refactor/member/application/UserDetailsServiceCustomImpl.java rename to src/main/java/com/example/spot/member/application/UserDetailsServiceCustomImpl.java index a5b4350c..e74ea52a 100644 --- a/src/main/java/com/example/spot/refactor/member/application/UserDetailsServiceCustomImpl.java +++ b/src/main/java/com/example/spot/member/application/UserDetailsServiceCustomImpl.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.member.application; +package com.example.spot.member.application; -import com.example.spot.refactor.member.domain.auth.TempUserDetails; +import com.example.spot.member.domain.auth.TempUserDetails; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/com/example/spot/refactor/member/application/auth/AuthService.java b/src/main/java/com/example/spot/member/application/auth/AuthService.java similarity index 68% rename from src/main/java/com/example/spot/refactor/member/application/auth/AuthService.java rename to src/main/java/com/example/spot/member/application/auth/AuthService.java index 4e5431b4..38e7741b 100644 --- a/src/main/java/com/example/spot/refactor/member/application/auth/AuthService.java +++ b/src/main/java/com/example/spot/member/application/auth/AuthService.java @@ -1,14 +1,14 @@ -package com.example.spot.refactor.member.application.auth; - -import com.example.spot.refactor.member.presentation.dto.MemberRequestDTO.SignUpDetailDTO; -import com.example.spot.refactor.member.presentation.dto.rsa.Rsa; -import com.example.spot.refactor.member.presentation.dto.MemberRequestDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.SocialLoginSignInDTO; -import com.example.spot.refactor.member.presentation.dto.naver.NaverCallback; -import com.example.spot.refactor.member.presentation.dto.naver.NaverOAuthToken; -import com.example.spot.refactor.member.presentation.dto.token.TokenResponseDTO; -import com.example.spot.refactor.member.presentation.dto.token.TokenResponseDTO.TokenDTO; +package com.example.spot.member.application.auth; + +import com.example.spot.member.presentation.dto.MemberRequestDTO.SignUpDetailDTO; +import com.example.spot.member.presentation.dto.rsa.Rsa; +import com.example.spot.member.presentation.dto.MemberRequestDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO.SocialLoginSignInDTO; +import com.example.spot.member.presentation.dto.naver.NaverCallback; +import com.example.spot.member.presentation.dto.naver.NaverOAuthToken; +import com.example.spot.member.presentation.dto.token.TokenResponseDTO; +import com.example.spot.member.presentation.dto.token.TokenResponseDTO.TokenDTO; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/example/spot/refactor/member/application/auth/AuthServiceImpl.java b/src/main/java/com/example/spot/member/application/auth/AuthServiceImpl.java similarity index 91% rename from src/main/java/com/example/spot/refactor/member/application/auth/AuthServiceImpl.java rename to src/main/java/com/example/spot/member/application/auth/AuthServiceImpl.java index 6dd2ac52..99902940 100644 --- a/src/main/java/com/example/spot/refactor/member/application/auth/AuthServiceImpl.java +++ b/src/main/java/com/example/spot/member/application/auth/AuthServiceImpl.java @@ -1,42 +1,42 @@ -package com.example.spot.refactor.member.application.auth; - - -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.GeneralException; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.member.domain.auth.RsaKey; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.refactor.member.domain.association.MemberThemeRepository; -import com.example.spot.refactor.member.domain.association.PreferredRegionRepository; -import com.example.spot.refactor.member.domain.association.StudyJoinReasonRepository; -import com.example.spot.refactor.member.presentation.dto.MemberRequestDTO.SignUpDetailDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.CheckMemberDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.NicknameDuplicateDTO; -import com.example.spot.refactor.member.presentation.dto.rsa.Rsa; -import com.example.spot.refactor.member.domain.auth.RefreshToken; -import com.example.spot.refactor.member.domain.auth.VerificationCode; -import com.example.spot.refactor.member.domain.enums.Carrier; -import com.example.spot.refactor.member.domain.enums.Gender; -import com.example.spot.refactor.member.domain.enums.LoginType; -import com.example.spot.refactor.member.domain.enums.Status; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.member.domain.auth.RefreshTokenRepository; -import com.example.spot.legacy.repository.rsa.RSAKeyRepository; -import com.example.spot.refactor.member.domain.auth.verification.VerificationCodeRepository; -import com.example.spot.refactor.common.security.utils.JwtTokenProvider; -import com.example.spot.refactor.common.security.utils.MemberUtils; -import com.example.spot.refactor.common.security.utils.RSAUtils; -import com.example.spot.refactor.member.presentation.dto.MemberRequestDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO; -import com.example.spot.refactor.common.security.utils.SecurityUtils; -import com.example.spot.legacy.service.message.MailService; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.SocialLoginSignInDTO; -import com.example.spot.refactor.member.presentation.dto.naver.NaverCallback; -import com.example.spot.refactor.member.presentation.dto.naver.NaverMember; -import com.example.spot.refactor.member.presentation.dto.naver.NaverOAuthToken; -import com.example.spot.refactor.member.presentation.dto.token.TokenResponseDTO; -import com.example.spot.refactor.member.presentation.dto.token.TokenResponseDTO.TokenDTO; +package com.example.spot.member.application.auth; + + +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.GeneralException; +import com.example.spot.common.api.exception.handler.MemberHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.member.domain.auth.RsaKey; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.member.domain.association.MemberThemeRepository; +import com.example.spot.member.domain.association.PreferredRegionRepository; +import com.example.spot.member.domain.association.StudyJoinReasonRepository; +import com.example.spot.member.presentation.dto.MemberRequestDTO.SignUpDetailDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO.CheckMemberDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO.NicknameDuplicateDTO; +import com.example.spot.member.presentation.dto.rsa.Rsa; +import com.example.spot.member.domain.auth.RefreshToken; +import com.example.spot.member.domain.auth.VerificationCode; +import com.example.spot.member.domain.enums.Carrier; +import com.example.spot.member.domain.enums.Gender; +import com.example.spot.member.domain.enums.LoginType; +import com.example.spot.member.domain.enums.Status; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.member.domain.auth.RefreshTokenRepository; +import com.example.spot.member.domain.rsa.RSAKeyRepository; +import com.example.spot.member.domain.auth.verification.VerificationCodeRepository; +import com.example.spot.common.security.utils.JwtTokenProvider; +import com.example.spot.common.security.utils.MemberUtils; +import com.example.spot.common.security.utils.RSAUtils; +import com.example.spot.member.presentation.dto.MemberRequestDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO; +import com.example.spot.common.security.utils.SecurityUtils; +import com.example.spot.common.application.message.MailService; +import com.example.spot.member.presentation.dto.MemberResponseDTO.SocialLoginSignInDTO; +import com.example.spot.member.presentation.dto.naver.NaverCallback; +import com.example.spot.member.presentation.dto.naver.NaverMember; +import com.example.spot.member.presentation.dto.naver.NaverOAuthToken; +import com.example.spot.member.presentation.dto.token.TokenResponseDTO; +import com.example.spot.member.presentation.dto.token.TokenResponseDTO.TokenDTO; import java.security.PrivateKey; import java.security.SecureRandom; diff --git a/src/main/java/com/example/spot/refactor/member/application/auth/KaKaoOAuthService.java b/src/main/java/com/example/spot/member/application/auth/KaKaoOAuthService.java similarity index 94% rename from src/main/java/com/example/spot/refactor/member/application/auth/KaKaoOAuthService.java rename to src/main/java/com/example/spot/member/application/auth/KaKaoOAuthService.java index e28833d7..b161bee8 100644 --- a/src/main/java/com/example/spot/refactor/member/application/auth/KaKaoOAuthService.java +++ b/src/main/java/com/example/spot/member/application/auth/KaKaoOAuthService.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.member.application.auth; +package com.example.spot.member.application.auth; -import com.example.spot.refactor.member.presentation.dto.kakao.KaKaoOAuthToken; -import com.example.spot.refactor.member.presentation.dto.kakao.KaKaoOAuthToken.KaKaoOAuthTokenDTO; -import com.example.spot.refactor.member.presentation.dto.kakao.KaKaoUser; +import com.example.spot.member.presentation.dto.kakao.KaKaoOAuthToken; +import com.example.spot.member.presentation.dto.kakao.KaKaoOAuthToken.KaKaoOAuthTokenDTO; +import com.example.spot.member.presentation.dto.kakao.KaKaoUser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.HashMap; diff --git a/src/main/java/com/example/spot/refactor/member/application/auth/NaverOAuthService.java b/src/main/java/com/example/spot/member/application/auth/NaverOAuthService.java similarity index 94% rename from src/main/java/com/example/spot/refactor/member/application/auth/NaverOAuthService.java rename to src/main/java/com/example/spot/member/application/auth/NaverOAuthService.java index 1e5f9b93..c9abbde6 100644 --- a/src/main/java/com/example/spot/refactor/member/application/auth/NaverOAuthService.java +++ b/src/main/java/com/example/spot/member/application/auth/NaverOAuthService.java @@ -1,10 +1,10 @@ -package com.example.spot.refactor.member.application.auth; +package com.example.spot.member.application.auth; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; -import com.example.spot.refactor.member.presentation.dto.naver.NaverCallback; -import com.example.spot.refactor.member.presentation.dto.naver.NaverMember; -import com.example.spot.refactor.member.presentation.dto.naver.NaverOAuthToken; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.handler.MemberHandler; +import com.example.spot.member.presentation.dto.naver.NaverCallback; +import com.example.spot.member.presentation.dto.naver.NaverMember; +import com.example.spot.member.presentation.dto.naver.NaverOAuthToken; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/example/spot/refactor/member/domain/Member.java b/src/main/java/com/example/spot/member/domain/Member.java similarity index 87% rename from src/main/java/com/example/spot/refactor/member/domain/Member.java rename to src/main/java/com/example/spot/member/domain/Member.java index 71d829f4..60896dc4 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/Member.java +++ b/src/main/java/com/example/spot/member/domain/Member.java @@ -1,28 +1,34 @@ -package com.example.spot.refactor.member.domain; - -import com.example.spot.legacy.domain.*; -import com.example.spot.refactor.schedule.domain.Schedule; -import com.example.spot.refactor.schedule.domain.aggregate.Quiz; -import com.example.spot.refactor.story.domain.Story; -import com.example.spot.refactor.story.domain.aggregate.LikedStoryComment; -import com.example.spot.refactor.story.domain.aggregate.LikedStory; -import com.example.spot.refactor.member.domain.association.StudyJoinReason; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.member.domain.enums.Carrier; -import com.example.spot.refactor.member.domain.enums.Gender; -import com.example.spot.refactor.member.domain.enums.LoginType; -import com.example.spot.refactor.member.domain.enums.Status; -import com.example.spot.refactor.schedule.domain.aggregate.QuizSubmission; -import com.example.spot.legacy.domain.mapping.MemberScrap; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.member.domain.association.MemberTheme; -import com.example.spot.refactor.todo.domain.ToDo; -import com.example.spot.refactor.vote.domain.Vote; -import com.example.spot.refactor.vote.domain.aggregate.VoteParticipant; -import com.example.spot.refactor.member.domain.association.PreferredRegion; -import com.example.spot.refactor.member.domain.association.PreferredStudy; -import com.example.spot.refactor.story.domain.aggregate.StoryComment; -import com.example.spot.refactor.member.presentation.dto.MemberRequestDTO.MemberUpdateDTO; +package com.example.spot.member.domain; + +import com.example.spot.comment.domain.PostComment; +import com.example.spot.comment.domain.association.LikedPostComment; +import com.example.spot.notification.domain.Notification; +import com.example.spot.post.domain.Post; +import com.example.spot.post.domain.association.LikedPost; +import com.example.spot.report.domain.MemberReport; +import com.example.spot.report.domain.PostReport; +import com.example.spot.schedule.domain.Schedule; +import com.example.spot.schedule.domain.aggregate.Quiz; +import com.example.spot.story.domain.Story; +import com.example.spot.story.domain.aggregate.LikedStoryComment; +import com.example.spot.story.domain.aggregate.LikedStory; +import com.example.spot.member.domain.association.StudyJoinReason; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.member.domain.enums.Carrier; +import com.example.spot.member.domain.enums.Gender; +import com.example.spot.member.domain.enums.LoginType; +import com.example.spot.member.domain.enums.Status; +import com.example.spot.schedule.domain.aggregate.QuizSubmission; +import com.example.spot.post.domain.association.MemberScrap; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.member.domain.association.MemberTheme; +import com.example.spot.todo.domain.ToDo; +import com.example.spot.vote.domain.Vote; +import com.example.spot.vote.domain.aggregate.VoteParticipant; +import com.example.spot.member.domain.association.PreferredRegion; +import com.example.spot.member.domain.association.PreferredStudy; +import com.example.spot.story.domain.aggregate.StoryComment; +import com.example.spot.member.presentation.dto.MemberRequestDTO.MemberUpdateDTO; import jakarta.persistence.*; import java.util.ArrayList; diff --git a/src/main/java/com/example/spot/refactor/member/domain/MemberRepository.java b/src/main/java/com/example/spot/member/domain/MemberRepository.java similarity index 87% rename from src/main/java/com/example/spot/refactor/member/domain/MemberRepository.java rename to src/main/java/com/example/spot/member/domain/MemberRepository.java index cab2858b..2c1562d7 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/MemberRepository.java +++ b/src/main/java/com/example/spot/member/domain/MemberRepository.java @@ -1,10 +1,10 @@ -package com.example.spot.refactor.member.domain; +package com.example.spot.member.domain; import java.time.LocalDateTime; import java.util.List; import java.util.Optional; -import com.example.spot.refactor.member.domain.enums.LoginType; +import com.example.spot.member.domain.enums.LoginType; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/refactor/member/domain/association/MemberTheme.java b/src/main/java/com/example/spot/member/domain/association/MemberTheme.java similarity index 79% rename from src/main/java/com/example/spot/refactor/member/domain/association/MemberTheme.java rename to src/main/java/com/example/spot/member/domain/association/MemberTheme.java index 7bafdc5f..20e439b6 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/association/MemberTheme.java +++ b/src/main/java/com/example/spot/member/domain/association/MemberTheme.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.member.domain.association; +package com.example.spot.member.domain.association; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.study.domain.aggregate.Theme; -import com.example.spot.refactor.common.entity.BaseEntity; +import com.example.spot.member.domain.Member; +import com.example.spot.study.domain.aggregate.Theme; +import com.example.spot.common.entity.BaseEntity; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/member/domain/association/MemberThemeRepository.java b/src/main/java/com/example/spot/member/domain/association/MemberThemeRepository.java similarity index 87% rename from src/main/java/com/example/spot/refactor/member/domain/association/MemberThemeRepository.java rename to src/main/java/com/example/spot/member/domain/association/MemberThemeRepository.java index 0695751b..41008620 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/association/MemberThemeRepository.java +++ b/src/main/java/com/example/spot/member/domain/association/MemberThemeRepository.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.member.domain.association; +package com.example.spot.member.domain.association; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/example/spot/refactor/member/domain/association/PreferredRegion.java b/src/main/java/com/example/spot/member/domain/association/PreferredRegion.java similarity index 78% rename from src/main/java/com/example/spot/refactor/member/domain/association/PreferredRegion.java rename to src/main/java/com/example/spot/member/domain/association/PreferredRegion.java index b9132dac..ccc8eee5 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/association/PreferredRegion.java +++ b/src/main/java/com/example/spot/member/domain/association/PreferredRegion.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.member.domain.association; +package com.example.spot.member.domain.association; -import com.example.spot.refactor.study.domain.aggregate.Region; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.common.entity.BaseEntity; +import com.example.spot.study.domain.aggregate.Region; +import com.example.spot.member.domain.Member; +import com.example.spot.common.entity.BaseEntity; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/member/domain/association/PreferredRegionRepository.java b/src/main/java/com/example/spot/member/domain/association/PreferredRegionRepository.java similarity index 86% rename from src/main/java/com/example/spot/refactor/member/domain/association/PreferredRegionRepository.java rename to src/main/java/com/example/spot/member/domain/association/PreferredRegionRepository.java index 9d3b91bf..bf37c2a5 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/association/PreferredRegionRepository.java +++ b/src/main/java/com/example/spot/member/domain/association/PreferredRegionRepository.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.member.domain.association; +package com.example.spot.member.domain.association; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/example/spot/refactor/member/domain/association/PreferredStudy.java b/src/main/java/com/example/spot/member/domain/association/PreferredStudy.java similarity index 79% rename from src/main/java/com/example/spot/refactor/member/domain/association/PreferredStudy.java rename to src/main/java/com/example/spot/member/domain/association/PreferredStudy.java index bdb90cba..d856355f 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/association/PreferredStudy.java +++ b/src/main/java/com/example/spot/member/domain/association/PreferredStudy.java @@ -1,9 +1,9 @@ -package com.example.spot.refactor.member.domain.association; +package com.example.spot.member.domain.association; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.study.domain.enums.StudyLikeStatus; -import com.example.spot.refactor.study.domain.Study; +import com.example.spot.member.domain.Member; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.study.domain.enums.StudyLikeStatus; +import com.example.spot.study.domain.Study; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/member/domain/association/PreferredStudyRepository.java b/src/main/java/com/example/spot/member/domain/association/PreferredStudyRepository.java similarity index 82% rename from src/main/java/com/example/spot/refactor/member/domain/association/PreferredStudyRepository.java rename to src/main/java/com/example/spot/member/domain/association/PreferredStudyRepository.java index 55766299..d6d8979b 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/association/PreferredStudyRepository.java +++ b/src/main/java/com/example/spot/member/domain/association/PreferredStudyRepository.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.member.domain.association; +package com.example.spot.member.domain.association; -import com.example.spot.refactor.study.domain.enums.StudyLikeStatus; +import com.example.spot.study.domain.enums.StudyLikeStatus; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/example/spot/refactor/member/domain/association/StudyJoinReason.java b/src/main/java/com/example/spot/member/domain/association/StudyJoinReason.java similarity index 81% rename from src/main/java/com/example/spot/refactor/member/domain/association/StudyJoinReason.java rename to src/main/java/com/example/spot/member/domain/association/StudyJoinReason.java index fb2067c1..9edf69d3 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/association/StudyJoinReason.java +++ b/src/main/java/com/example/spot/member/domain/association/StudyJoinReason.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.member.domain.association; +package com.example.spot.member.domain.association; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.member.domain.Member; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.member.domain.Member; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/src/main/java/com/example/spot/refactor/member/domain/association/StudyJoinReasonRepository.java b/src/main/java/com/example/spot/member/domain/association/StudyJoinReasonRepository.java similarity index 80% rename from src/main/java/com/example/spot/refactor/member/domain/association/StudyJoinReasonRepository.java rename to src/main/java/com/example/spot/member/domain/association/StudyJoinReasonRepository.java index 6cc336c1..7d93ab4a 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/association/StudyJoinReasonRepository.java +++ b/src/main/java/com/example/spot/member/domain/association/StudyJoinReasonRepository.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.member.domain.association; +package com.example.spot.member.domain.association; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/example/spot/refactor/member/domain/auth/CustomUserDetails.java b/src/main/java/com/example/spot/member/domain/auth/CustomUserDetails.java similarity index 96% rename from src/main/java/com/example/spot/refactor/member/domain/auth/CustomUserDetails.java rename to src/main/java/com/example/spot/member/domain/auth/CustomUserDetails.java index 330a7d05..675d4113 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/auth/CustomUserDetails.java +++ b/src/main/java/com/example/spot/member/domain/auth/CustomUserDetails.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.member.domain.auth; +package com.example.spot.member.domain.auth; import java.util.Collection; import lombok.AccessLevel; diff --git a/src/main/java/com/example/spot/refactor/member/domain/auth/RefreshToken.java b/src/main/java/com/example/spot/member/domain/auth/RefreshToken.java similarity index 86% rename from src/main/java/com/example/spot/refactor/member/domain/auth/RefreshToken.java rename to src/main/java/com/example/spot/member/domain/auth/RefreshToken.java index 24079817..f95f38f3 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/auth/RefreshToken.java +++ b/src/main/java/com/example/spot/member/domain/auth/RefreshToken.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.member.domain.auth; +package com.example.spot.member.domain.auth; -import com.example.spot.refactor.common.entity.BaseEntity; +import com.example.spot.common.entity.BaseEntity; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; diff --git a/src/main/java/com/example/spot/refactor/member/domain/auth/RefreshTokenRepository.java b/src/main/java/com/example/spot/member/domain/auth/RefreshTokenRepository.java similarity index 90% rename from src/main/java/com/example/spot/refactor/member/domain/auth/RefreshTokenRepository.java rename to src/main/java/com/example/spot/member/domain/auth/RefreshTokenRepository.java index 9faafd8b..d8aa85df 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/auth/RefreshTokenRepository.java +++ b/src/main/java/com/example/spot/member/domain/auth/RefreshTokenRepository.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.member.domain.auth; +package com.example.spot.member.domain.auth; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/example/spot/refactor/member/domain/auth/RsaKey.java b/src/main/java/com/example/spot/member/domain/auth/RsaKey.java similarity index 84% rename from src/main/java/com/example/spot/refactor/member/domain/auth/RsaKey.java rename to src/main/java/com/example/spot/member/domain/auth/RsaKey.java index 8025c3a2..acebabf1 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/auth/RsaKey.java +++ b/src/main/java/com/example/spot/member/domain/auth/RsaKey.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.member.domain.auth; +package com.example.spot.member.domain.auth; -import com.example.spot.refactor.common.entity.BaseEntity; +import com.example.spot.common.entity.BaseEntity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/spot/refactor/member/domain/auth/TempUserDetails.java b/src/main/java/com/example/spot/member/domain/auth/TempUserDetails.java similarity index 95% rename from src/main/java/com/example/spot/refactor/member/domain/auth/TempUserDetails.java rename to src/main/java/com/example/spot/member/domain/auth/TempUserDetails.java index 8b6a2fca..9ff7f07a 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/auth/TempUserDetails.java +++ b/src/main/java/com/example/spot/member/domain/auth/TempUserDetails.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.member.domain.auth; +package com.example.spot.member.domain.auth; import lombok.*; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/com/example/spot/refactor/member/domain/auth/VerificationCode.java b/src/main/java/com/example/spot/member/domain/auth/VerificationCode.java similarity index 90% rename from src/main/java/com/example/spot/refactor/member/domain/auth/VerificationCode.java rename to src/main/java/com/example/spot/member/domain/auth/VerificationCode.java index ea994c1e..0893e5fe 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/auth/VerificationCode.java +++ b/src/main/java/com/example/spot/member/domain/auth/VerificationCode.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.member.domain.auth; +package com.example.spot.member.domain.auth; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/refactor/member/domain/auth/verification/VerificationCodeRepository.java b/src/main/java/com/example/spot/member/domain/auth/verification/VerificationCodeRepository.java similarity index 54% rename from src/main/java/com/example/spot/refactor/member/domain/auth/verification/VerificationCodeRepository.java rename to src/main/java/com/example/spot/member/domain/auth/verification/VerificationCodeRepository.java index b65239ba..2b9cbef5 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/auth/verification/VerificationCodeRepository.java +++ b/src/main/java/com/example/spot/member/domain/auth/verification/VerificationCodeRepository.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.member.domain.auth.verification; +package com.example.spot.member.domain.auth.verification; -import com.example.spot.refactor.member.domain.auth.VerificationCode; -import com.example.spot.refactor.member.presentation.dto.token.TokenResponseDTO; +import com.example.spot.member.domain.auth.VerificationCode; +import com.example.spot.member.presentation.dto.token.TokenResponseDTO; public interface VerificationCodeRepository { diff --git a/src/main/java/com/example/spot/refactor/member/domain/auth/verification/VerificationCodeRepositoryImpl.java b/src/main/java/com/example/spot/member/domain/auth/verification/VerificationCodeRepositoryImpl.java similarity index 88% rename from src/main/java/com/example/spot/refactor/member/domain/auth/verification/VerificationCodeRepositoryImpl.java rename to src/main/java/com/example/spot/member/domain/auth/verification/VerificationCodeRepositoryImpl.java index ed142236..4fd69ee9 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/auth/verification/VerificationCodeRepositoryImpl.java +++ b/src/main/java/com/example/spot/member/domain/auth/verification/VerificationCodeRepositoryImpl.java @@ -1,9 +1,9 @@ -package com.example.spot.refactor.member.domain.auth.verification; +package com.example.spot.member.domain.auth.verification; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; -import com.example.spot.refactor.member.domain.auth.VerificationCode; -import com.example.spot.refactor.member.presentation.dto.token.TokenResponseDTO; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.handler.MemberHandler; +import com.example.spot.member.domain.auth.VerificationCode; +import com.example.spot.member.presentation.dto.token.TokenResponseDTO; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/member/domain/enums/Carrier.java b/src/main/java/com/example/spot/member/domain/enums/Carrier.java new file mode 100644 index 00000000..c4b4d02d --- /dev/null +++ b/src/main/java/com/example/spot/member/domain/enums/Carrier.java @@ -0,0 +1,5 @@ +package com.example.spot.member.domain.enums; + +public enum Carrier { + KT, SKT, LG, NONE +} diff --git a/src/main/java/com/example/spot/member/domain/enums/Gender.java b/src/main/java/com/example/spot/member/domain/enums/Gender.java new file mode 100644 index 00000000..4700bee6 --- /dev/null +++ b/src/main/java/com/example/spot/member/domain/enums/Gender.java @@ -0,0 +1,6 @@ +package com.example.spot.member.domain.enums; + +public enum Gender { + MALE, FEMALE, UNKNOWN + +} diff --git a/src/main/java/com/example/spot/refactor/member/domain/enums/LoginType.java b/src/main/java/com/example/spot/member/domain/enums/LoginType.java similarity index 56% rename from src/main/java/com/example/spot/refactor/member/domain/enums/LoginType.java rename to src/main/java/com/example/spot/member/domain/enums/LoginType.java index 0b8d52f0..6a3331c4 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/enums/LoginType.java +++ b/src/main/java/com/example/spot/member/domain/enums/LoginType.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.member.domain.enums; +package com.example.spot.member.domain.enums; public enum LoginType { NORMAL, diff --git a/src/main/java/com/example/spot/legacy/domain/enums/Reason.java b/src/main/java/com/example/spot/member/domain/enums/Reason.java similarity index 79% rename from src/main/java/com/example/spot/legacy/domain/enums/Reason.java rename to src/main/java/com/example/spot/member/domain/enums/Reason.java index f41636c0..dbca1da3 100644 --- a/src/main/java/com/example/spot/legacy/domain/enums/Reason.java +++ b/src/main/java/com/example/spot/member/domain/enums/Reason.java @@ -1,7 +1,7 @@ -package com.example.spot.legacy.domain.enums; +package com.example.spot.member.domain.enums; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.GeneralException; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.GeneralException; public enum Reason { 꾸준한_학습_습관이_필요해요(1), diff --git a/src/main/java/com/example/spot/member/domain/enums/Status.java b/src/main/java/com/example/spot/member/domain/enums/Status.java new file mode 100644 index 00000000..d18c9b30 --- /dev/null +++ b/src/main/java/com/example/spot/member/domain/enums/Status.java @@ -0,0 +1,5 @@ +package com.example.spot.member.domain.enums; + +public enum Status { + ON, OFF +} diff --git a/src/main/java/com/example/spot/legacy/repository/rsa/RSAKeyRepository.java b/src/main/java/com/example/spot/member/domain/rsa/RSAKeyRepository.java similarity index 73% rename from src/main/java/com/example/spot/legacy/repository/rsa/RSAKeyRepository.java rename to src/main/java/com/example/spot/member/domain/rsa/RSAKeyRepository.java index 0e6ea83f..4959855d 100644 --- a/src/main/java/com/example/spot/legacy/repository/rsa/RSAKeyRepository.java +++ b/src/main/java/com/example/spot/member/domain/rsa/RSAKeyRepository.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.repository.rsa; +package com.example.spot.member.domain.rsa; -import com.example.spot.refactor.member.domain.auth.RsaKey; +import com.example.spot.member.domain.auth.RsaKey; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/refactor/member/domain/validation/annotation/ExistMember.java b/src/main/java/com/example/spot/member/domain/validation/annotation/ExistMember.java similarity index 80% rename from src/main/java/com/example/spot/refactor/member/domain/validation/annotation/ExistMember.java rename to src/main/java/com/example/spot/member/domain/validation/annotation/ExistMember.java index 03c33e23..3c8acc65 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/validation/annotation/ExistMember.java +++ b/src/main/java/com/example/spot/member/domain/validation/annotation/ExistMember.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.member.domain.validation.annotation; +package com.example.spot.member.domain.validation.annotation; import jakarta.validation.Constraint; import jakarta.validation.Payload; @@ -8,7 +8,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.example.spot.refactor.member.domain.validation.validator.ExistMemberValidator; +import com.example.spot.member.domain.validation.validator.ExistMemberValidator; @Documented @Constraint(validatedBy = ExistMemberValidator.class) diff --git a/src/main/java/com/example/spot/refactor/member/domain/validation/validator/ExistMemberValidator.java b/src/main/java/com/example/spot/member/domain/validation/validator/ExistMemberValidator.java similarity index 81% rename from src/main/java/com/example/spot/refactor/member/domain/validation/validator/ExistMemberValidator.java rename to src/main/java/com/example/spot/member/domain/validation/validator/ExistMemberValidator.java index 291e5358..03d8d300 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/validation/validator/ExistMemberValidator.java +++ b/src/main/java/com/example/spot/member/domain/validation/validator/ExistMemberValidator.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.member.domain.validation.validator; +package com.example.spot.member.domain.validation.validator; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.member.domain.validation.annotation.ExistMember; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.member.domain.validation.annotation.ExistMember; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/src/main/java/com/example/spot/refactor/member/domain/validation/validator/MemberValidator.java b/src/main/java/com/example/spot/member/domain/validation/validator/MemberValidator.java similarity index 71% rename from src/main/java/com/example/spot/refactor/member/domain/validation/validator/MemberValidator.java rename to src/main/java/com/example/spot/member/domain/validation/validator/MemberValidator.java index 5dc3f23d..45679d38 100644 --- a/src/main/java/com/example/spot/refactor/member/domain/validation/validator/MemberValidator.java +++ b/src/main/java/com/example/spot/member/domain/validation/validator/MemberValidator.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.member.domain.validation.validator; +package com.example.spot.member.domain.validation.validator; -import com.example.spot.refactor.common.security.utils.JwtTokenProvider; +import com.example.spot.common.security.utils.JwtTokenProvider; public class MemberValidator { private static JwtTokenProvider jwtTokenProvider; diff --git a/src/main/java/com/example/spot/refactor/member/presentation/controller/AuthController.java b/src/main/java/com/example/spot/member/presentation/controller/AuthController.java similarity index 94% rename from src/main/java/com/example/spot/refactor/member/presentation/controller/AuthController.java rename to src/main/java/com/example/spot/member/presentation/controller/AuthController.java index 381de30a..9220cce7 100644 --- a/src/main/java/com/example/spot/refactor/member/presentation/controller/AuthController.java +++ b/src/main/java/com/example/spot/member/presentation/controller/AuthController.java @@ -1,19 +1,19 @@ -package com.example.spot.refactor.member.presentation.controller; +package com.example.spot.member.presentation.controller; -import com.example.spot.refactor.common.api.ApiResponse; -import com.example.spot.refactor.common.api.code.status.SuccessStatus; -import com.example.spot.refactor.common.security.utils.SecurityUtils; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.NicknameDuplicateDTO; -import com.example.spot.refactor.member.presentation.dto.rsa.Rsa; -import com.example.spot.refactor.member.application.auth.AuthService; -import com.example.spot.legacy.validation.annotation.TextLength; -import com.example.spot.refactor.member.presentation.dto.MemberRequestDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.SocialLoginSignInDTO; -import com.example.spot.refactor.member.presentation.dto.naver.NaverCallback; -import com.example.spot.refactor.member.presentation.dto.naver.NaverOAuthToken; -import com.example.spot.refactor.member.presentation.dto.token.TokenResponseDTO; -import com.example.spot.refactor.member.presentation.dto.token.TokenResponseDTO.TokenDTO; +import com.example.spot.common.api.ApiResponse; +import com.example.spot.common.api.code.status.SuccessStatus; +import com.example.spot.common.security.utils.SecurityUtils; +import com.example.spot.member.presentation.dto.MemberResponseDTO.NicknameDuplicateDTO; +import com.example.spot.member.presentation.dto.rsa.Rsa; +import com.example.spot.member.application.auth.AuthService; +import com.example.spot.common.presentation.validator.TextLength; +import com.example.spot.member.presentation.dto.MemberRequestDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO.SocialLoginSignInDTO; +import com.example.spot.member.presentation.dto.naver.NaverCallback; +import com.example.spot.member.presentation.dto.naver.NaverOAuthToken; +import com.example.spot.member.presentation.dto.token.TokenResponseDTO; +import com.example.spot.member.presentation.dto.token.TokenResponseDTO.TokenDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/example/spot/refactor/member/presentation/controller/MemberController.java b/src/main/java/com/example/spot/member/presentation/controller/MemberController.java similarity index 93% rename from src/main/java/com/example/spot/refactor/member/presentation/controller/MemberController.java rename to src/main/java/com/example/spot/member/presentation/controller/MemberController.java index 800f2bf3..5606930a 100644 --- a/src/main/java/com/example/spot/refactor/member/presentation/controller/MemberController.java +++ b/src/main/java/com/example/spot/member/presentation/controller/MemberController.java @@ -1,18 +1,18 @@ -package com.example.spot.refactor.member.presentation.controller; +package com.example.spot.member.presentation.controller; -import com.example.spot.refactor.common.api.ApiResponse; -import com.example.spot.refactor.common.api.code.status.SuccessStatus; +import com.example.spot.common.api.ApiResponse; +import com.example.spot.common.api.code.status.SuccessStatus; -import com.example.spot.refactor.common.security.utils.SecurityUtils; -import com.example.spot.refactor.member.application.MemberService; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.MemberRegionDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.MemberStudyReasonDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.MemberTestDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.SocialLoginSignInDTO; +import com.example.spot.common.security.utils.SecurityUtils; +import com.example.spot.member.application.MemberService; +import com.example.spot.member.presentation.dto.MemberResponseDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO.MemberRegionDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO.MemberStudyReasonDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO.MemberTestDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO.SocialLoginSignInDTO; import com.fasterxml.jackson.core.JsonProcessingException; -import com.example.spot.refactor.member.presentation.dto.MemberRequestDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO.MemberUpdateDTO; +import com.example.spot.member.presentation.dto.MemberRequestDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO.MemberUpdateDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Content; @@ -36,7 +36,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import static com.example.spot.refactor.member.presentation.dto.google.GoogleExampleResponse.EXAMPLE_RESPONSE; +import static com.example.spot.member.presentation.dto.google.GoogleExampleResponse.EXAMPLE_RESPONSE; @RestController @RequestMapping("/spot") diff --git a/src/main/java/com/example/spot/refactor/member/presentation/dto/MemberRequestDTO.java b/src/main/java/com/example/spot/member/presentation/dto/MemberRequestDTO.java similarity index 90% rename from src/main/java/com/example/spot/refactor/member/presentation/dto/MemberRequestDTO.java rename to src/main/java/com/example/spot/member/presentation/dto/MemberRequestDTO.java index 9568310b..4a2d0d54 100644 --- a/src/main/java/com/example/spot/refactor/member/presentation/dto/MemberRequestDTO.java +++ b/src/main/java/com/example/spot/member/presentation/dto/MemberRequestDTO.java @@ -1,9 +1,9 @@ -package com.example.spot.refactor.member.presentation.dto; +package com.example.spot.member.presentation.dto; -import com.example.spot.refactor.member.domain.enums.Carrier; -import com.example.spot.refactor.member.domain.enums.Gender; -import com.example.spot.refactor.study.domain.enums.ThemeType; -import com.example.spot.legacy.validation.annotation.TextLength; +import com.example.spot.member.domain.enums.Carrier; +import com.example.spot.member.domain.enums.Gender; +import com.example.spot.study.domain.enums.ThemeType; +import com.example.spot.common.presentation.validator.TextLength; import jakarta.validation.constraints.AssertTrue; import java.time.LocalDate; diff --git a/src/main/java/com/example/spot/refactor/member/presentation/dto/MemberResponseDTO.java b/src/main/java/com/example/spot/member/presentation/dto/MemberResponseDTO.java similarity index 94% rename from src/main/java/com/example/spot/refactor/member/presentation/dto/MemberResponseDTO.java rename to src/main/java/com/example/spot/member/presentation/dto/MemberResponseDTO.java index 137ba17f..dd1dbde2 100644 --- a/src/main/java/com/example/spot/refactor/member/presentation/dto/MemberResponseDTO.java +++ b/src/main/java/com/example/spot/member/presentation/dto/MemberResponseDTO.java @@ -1,10 +1,10 @@ -package com.example.spot.refactor.member.presentation.dto; +package com.example.spot.member.presentation.dto; -import com.example.spot.refactor.member.domain.enums.LoginType; -import com.example.spot.legacy.domain.enums.Reason; -import com.example.spot.refactor.study.domain.enums.ThemeType; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.member.presentation.dto.token.TokenResponseDTO.TokenDTO; +import com.example.spot.member.domain.enums.LoginType; +import com.example.spot.member.domain.enums.Reason; +import com.example.spot.study.domain.enums.ThemeType; +import com.example.spot.member.domain.Member; +import com.example.spot.member.presentation.dto.token.TokenResponseDTO.TokenDTO; import lombok.*; import java.util.List; diff --git a/src/main/java/com/example/spot/refactor/member/presentation/dto/google/GoogleExampleResponse.java b/src/main/java/com/example/spot/member/presentation/dto/google/GoogleExampleResponse.java similarity index 91% rename from src/main/java/com/example/spot/refactor/member/presentation/dto/google/GoogleExampleResponse.java rename to src/main/java/com/example/spot/member/presentation/dto/google/GoogleExampleResponse.java index c27e290a..e784087b 100644 --- a/src/main/java/com/example/spot/refactor/member/presentation/dto/google/GoogleExampleResponse.java +++ b/src/main/java/com/example/spot/member/presentation/dto/google/GoogleExampleResponse.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.member.presentation.dto.google; +package com.example.spot.member.presentation.dto.google; public class GoogleExampleResponse { diff --git a/src/main/java/com/example/spot/refactor/member/presentation/dto/kakao/KaKaoOAuthToken.java b/src/main/java/com/example/spot/member/presentation/dto/kakao/KaKaoOAuthToken.java similarity index 87% rename from src/main/java/com/example/spot/refactor/member/presentation/dto/kakao/KaKaoOAuthToken.java rename to src/main/java/com/example/spot/member/presentation/dto/kakao/KaKaoOAuthToken.java index 2ef577f6..bc0822ba 100644 --- a/src/main/java/com/example/spot/refactor/member/presentation/dto/kakao/KaKaoOAuthToken.java +++ b/src/main/java/com/example/spot/member/presentation/dto/kakao/KaKaoOAuthToken.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.member.presentation.dto.kakao; +package com.example.spot.member.presentation.dto.kakao; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/spot/refactor/member/presentation/dto/kakao/KaKaoUser.java b/src/main/java/com/example/spot/member/presentation/dto/kakao/KaKaoUser.java similarity index 83% rename from src/main/java/com/example/spot/refactor/member/presentation/dto/kakao/KaKaoUser.java rename to src/main/java/com/example/spot/member/presentation/dto/kakao/KaKaoUser.java index 935fd967..79904b08 100644 --- a/src/main/java/com/example/spot/refactor/member/presentation/dto/kakao/KaKaoUser.java +++ b/src/main/java/com/example/spot/member/presentation/dto/kakao/KaKaoUser.java @@ -1,9 +1,9 @@ -package com.example.spot.refactor.member.presentation.dto.kakao; +package com.example.spot.member.presentation.dto.kakao; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.member.domain.enums.Carrier; -import com.example.spot.refactor.member.domain.enums.LoginType; -import com.example.spot.refactor.common.security.utils.MemberUtils; +import com.example.spot.member.domain.Member; +import com.example.spot.member.domain.enums.Carrier; +import com.example.spot.member.domain.enums.LoginType; +import com.example.spot.common.security.utils.MemberUtils; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.time.LocalDate; diff --git a/src/main/java/com/example/spot/refactor/member/presentation/dto/naver/NaverCallback.java b/src/main/java/com/example/spot/member/presentation/dto/naver/NaverCallback.java similarity index 91% rename from src/main/java/com/example/spot/refactor/member/presentation/dto/naver/NaverCallback.java rename to src/main/java/com/example/spot/member/presentation/dto/naver/NaverCallback.java index b572d75d..ca1f4353 100644 --- a/src/main/java/com/example/spot/refactor/member/presentation/dto/naver/NaverCallback.java +++ b/src/main/java/com/example/spot/member/presentation/dto/naver/NaverCallback.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.member.presentation.dto.naver; +package com.example.spot.member.presentation.dto.naver; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/example/spot/refactor/member/presentation/dto/naver/NaverMember.java b/src/main/java/com/example/spot/member/presentation/dto/naver/NaverMember.java similarity index 97% rename from src/main/java/com/example/spot/refactor/member/presentation/dto/naver/NaverMember.java rename to src/main/java/com/example/spot/member/presentation/dto/naver/NaverMember.java index 05c1c68e..af4d444f 100644 --- a/src/main/java/com/example/spot/refactor/member/presentation/dto/naver/NaverMember.java +++ b/src/main/java/com/example/spot/member/presentation/dto/naver/NaverMember.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.member.presentation.dto.naver; +package com.example.spot.member.presentation.dto.naver; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/example/spot/refactor/member/presentation/dto/naver/NaverOAuthToken.java b/src/main/java/com/example/spot/member/presentation/dto/naver/NaverOAuthToken.java similarity index 98% rename from src/main/java/com/example/spot/refactor/member/presentation/dto/naver/NaverOAuthToken.java rename to src/main/java/com/example/spot/member/presentation/dto/naver/NaverOAuthToken.java index 2deeee51..01c554a0 100644 --- a/src/main/java/com/example/spot/refactor/member/presentation/dto/naver/NaverOAuthToken.java +++ b/src/main/java/com/example/spot/member/presentation/dto/naver/NaverOAuthToken.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.member.presentation.dto.naver; +package com.example.spot.member.presentation.dto.naver; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/com/example/spot/refactor/member/presentation/dto/rsa/Rsa.java b/src/main/java/com/example/spot/member/presentation/dto/rsa/Rsa.java similarity index 91% rename from src/main/java/com/example/spot/refactor/member/presentation/dto/rsa/Rsa.java rename to src/main/java/com/example/spot/member/presentation/dto/rsa/Rsa.java index 8cb5993d..34e68948 100644 --- a/src/main/java/com/example/spot/refactor/member/presentation/dto/rsa/Rsa.java +++ b/src/main/java/com/example/spot/member/presentation/dto/rsa/Rsa.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.member.presentation.dto.rsa; +package com.example.spot.member.presentation.dto.rsa; import lombok.*; diff --git a/src/main/java/com/example/spot/refactor/member/presentation/dto/token/TokenResponseDTO.java b/src/main/java/com/example/spot/member/presentation/dto/token/TokenResponseDTO.java similarity index 87% rename from src/main/java/com/example/spot/refactor/member/presentation/dto/token/TokenResponseDTO.java rename to src/main/java/com/example/spot/member/presentation/dto/token/TokenResponseDTO.java index 44badeba..d21dfec1 100644 --- a/src/main/java/com/example/spot/refactor/member/presentation/dto/token/TokenResponseDTO.java +++ b/src/main/java/com/example/spot/member/presentation/dto/token/TokenResponseDTO.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.member.presentation.dto.token; +package com.example.spot.member.presentation.dto.token; import lombok.*; diff --git a/src/main/java/com/example/spot/legacy/service/notification/NotificationCommandService.java b/src/main/java/com/example/spot/notification/application/notification/NotificationCommandService.java similarity index 61% rename from src/main/java/com/example/spot/legacy/service/notification/NotificationCommandService.java rename to src/main/java/com/example/spot/notification/application/notification/NotificationCommandService.java index 9a240287..ac7c5e06 100644 --- a/src/main/java/com/example/spot/legacy/service/notification/NotificationCommandService.java +++ b/src/main/java/com/example/spot/notification/application/notification/NotificationCommandService.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.service.notification; +package com.example.spot.notification.application.notification; -import com.example.spot.legacy.web.dto.notification.NotificationResponseDTO.NotificationProcessDTO; +import com.example.spot.notification.presentation.dto.notification.NotificationResponseDTO.NotificationProcessDTO; public interface NotificationCommandService { diff --git a/src/main/java/com/example/spot/legacy/service/notification/NotificationCommandServiceImpl.java b/src/main/java/com/example/spot/notification/application/notification/NotificationCommandServiceImpl.java similarity index 85% rename from src/main/java/com/example/spot/legacy/service/notification/NotificationCommandServiceImpl.java rename to src/main/java/com/example/spot/notification/application/notification/NotificationCommandServiceImpl.java index dfab39fe..3fa26680 100644 --- a/src/main/java/com/example/spot/legacy/service/notification/NotificationCommandServiceImpl.java +++ b/src/main/java/com/example/spot/notification/application/notification/NotificationCommandServiceImpl.java @@ -1,18 +1,18 @@ -package com.example.spot.legacy.service.notification; - -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.GeneralException; -import com.example.spot.legacy.domain.Notification; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.legacy.domain.enums.NotifyType; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.legacy.web.dto.notification.NotificationResponseDTO.NotificationProcessDTO; +package com.example.spot.notification.application.notification; + +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.GeneralException; +import com.example.spot.notification.domain.Notification; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.notification.domain.enums.NotifyType; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.notification.presentation.dto.notification.NotificationResponseDTO.NotificationProcessDTO; import java.util.Objects; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import com.example.spot.legacy.repository.NotificationRepository; +import com.example.spot.notification.domain.NotificationRepository; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/example/spot/legacy/service/notification/NotificationQueryService.java b/src/main/java/com/example/spot/notification/application/notification/NotificationQueryService.java similarity index 55% rename from src/main/java/com/example/spot/legacy/service/notification/NotificationQueryService.java rename to src/main/java/com/example/spot/notification/application/notification/NotificationQueryService.java index 691a2ec4..69079a81 100644 --- a/src/main/java/com/example/spot/legacy/service/notification/NotificationQueryService.java +++ b/src/main/java/com/example/spot/notification/application/notification/NotificationQueryService.java @@ -1,7 +1,7 @@ -package com.example.spot.legacy.service.notification; +package com.example.spot.notification.application.notification; -import com.example.spot.legacy.web.dto.notification.NotificationResponseDTO.NotificationListDTO; -import com.example.spot.legacy.web.dto.notification.NotificationResponseDTO.StudyNotificationListDTO; +import com.example.spot.notification.presentation.dto.notification.NotificationResponseDTO.NotificationListDTO; +import com.example.spot.notification.presentation.dto.notification.NotificationResponseDTO.StudyNotificationListDTO; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/example/spot/legacy/service/notification/NotificationQueryServiceImpl.java b/src/main/java/com/example/spot/notification/application/notification/NotificationQueryServiceImpl.java similarity index 84% rename from src/main/java/com/example/spot/legacy/service/notification/NotificationQueryServiceImpl.java rename to src/main/java/com/example/spot/notification/application/notification/NotificationQueryServiceImpl.java index 3773ced7..1ee4fe96 100644 --- a/src/main/java/com/example/spot/legacy/service/notification/NotificationQueryServiceImpl.java +++ b/src/main/java/com/example/spot/notification/application/notification/NotificationQueryServiceImpl.java @@ -1,13 +1,13 @@ -package com.example.spot.legacy.service.notification; - -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.GeneralException; -import com.example.spot.legacy.domain.Notification; -import com.example.spot.legacy.domain.enums.NotifyType; -import com.example.spot.legacy.web.dto.notification.NotificationResponseDTO.NotificationListDTO; -import com.example.spot.legacy.web.dto.notification.NotificationResponseDTO.NotificationListDTO.NotificationDTO; -import com.example.spot.legacy.web.dto.notification.NotificationResponseDTO.StudyNotificationListDTO; -import com.example.spot.legacy.web.dto.notification.NotificationResponseDTO.StudyNotificationListDTO.StudyNotificationDTO; +package com.example.spot.notification.application.notification; + +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.GeneralException; +import com.example.spot.notification.domain.Notification; +import com.example.spot.notification.domain.enums.NotifyType; +import com.example.spot.notification.presentation.dto.notification.NotificationResponseDTO.NotificationListDTO; +import com.example.spot.notification.presentation.dto.notification.NotificationResponseDTO.NotificationListDTO.NotificationDTO; +import com.example.spot.notification.presentation.dto.notification.NotificationResponseDTO.StudyNotificationListDTO; +import com.example.spot.notification.presentation.dto.notification.NotificationResponseDTO.StudyNotificationListDTO.StudyNotificationDTO; import java.util.ArrayList; import java.util.List; @@ -15,7 +15,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import com.example.spot.legacy.repository.NotificationRepository; +import com.example.spot.notification.domain.NotificationRepository; import org.springframework.transaction.annotation.Transactional; @Service diff --git a/src/main/java/com/example/spot/legacy/domain/Notification.java b/src/main/java/com/example/spot/notification/domain/Notification.java similarity index 82% rename from src/main/java/com/example/spot/legacy/domain/Notification.java rename to src/main/java/com/example/spot/notification/domain/Notification.java index 2d994265..7454ff4d 100644 --- a/src/main/java/com/example/spot/legacy/domain/Notification.java +++ b/src/main/java/com/example/spot/notification/domain/Notification.java @@ -1,9 +1,9 @@ -package com.example.spot.legacy.domain; +package com.example.spot.notification.domain; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.legacy.domain.enums.NotifyType; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.member.domain.Member; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.notification.domain.enums.NotifyType; +import com.example.spot.study.domain.Study; +import com.example.spot.member.domain.Member; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/src/main/java/com/example/spot/legacy/repository/NotificationRepository.java b/src/main/java/com/example/spot/notification/domain/NotificationRepository.java similarity index 82% rename from src/main/java/com/example/spot/legacy/repository/NotificationRepository.java rename to src/main/java/com/example/spot/notification/domain/NotificationRepository.java index 75eb265f..69f50130 100644 --- a/src/main/java/com/example/spot/legacy/repository/NotificationRepository.java +++ b/src/main/java/com/example/spot/notification/domain/NotificationRepository.java @@ -1,14 +1,12 @@ -package com.example.spot.legacy.repository; +package com.example.spot.notification.domain; -import com.example.spot.legacy.domain.enums.NotifyType; +import com.example.spot.notification.domain.enums.NotifyType; import java.util.Optional; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import com.example.spot.legacy.domain.Notification; - import java.util.List; @Repository diff --git a/src/main/java/com/example/spot/legacy/domain/enums/NotifyType.java b/src/main/java/com/example/spot/notification/domain/enums/NotifyType.java similarity index 66% rename from src/main/java/com/example/spot/legacy/domain/enums/NotifyType.java rename to src/main/java/com/example/spot/notification/domain/enums/NotifyType.java index 88dcb432..23c203a1 100644 --- a/src/main/java/com/example/spot/legacy/domain/enums/NotifyType.java +++ b/src/main/java/com/example/spot/notification/domain/enums/NotifyType.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.domain.enums; +package com.example.spot.notification.domain.enums; public enum NotifyType { ANNOUNCEMENT, SCHEDULE_UPDATE ,TO_DO_UPDATE, POPULAR_POST, STUDY_APPLY diff --git a/src/main/java/com/example/spot/legacy/web/controller/NotificationController.java b/src/main/java/com/example/spot/notification/presentation/controller/NotificationController.java similarity index 83% rename from src/main/java/com/example/spot/legacy/web/controller/NotificationController.java rename to src/main/java/com/example/spot/notification/presentation/controller/NotificationController.java index 1eae886c..8b3e468c 100644 --- a/src/main/java/com/example/spot/legacy/web/controller/NotificationController.java +++ b/src/main/java/com/example/spot/notification/presentation/controller/NotificationController.java @@ -1,15 +1,15 @@ -package com.example.spot.legacy.web.controller; +package com.example.spot.notification.presentation.controller; -import com.example.spot.refactor.common.api.ApiResponse; -import com.example.spot.refactor.common.api.code.status.SuccessStatus; -import com.example.spot.refactor.common.security.utils.SecurityUtils; -import com.example.spot.legacy.web.dto.notification.NotificationResponseDTO; -import com.example.spot.legacy.service.notification.NotificationCommandService; -import com.example.spot.legacy.service.notification.NotificationQueryService; +import com.example.spot.common.api.ApiResponse; +import com.example.spot.common.api.code.status.SuccessStatus; +import com.example.spot.common.security.utils.SecurityUtils; +import com.example.spot.notification.presentation.dto.notification.NotificationResponseDTO; +import com.example.spot.notification.application.notification.NotificationCommandService; +import com.example.spot.notification.application.notification.NotificationQueryService; -import com.example.spot.legacy.web.dto.notification.NotificationResponseDTO.NotificationListDTO; -import com.example.spot.legacy.web.dto.notification.NotificationResponseDTO.NotificationProcessDTO; -import com.example.spot.legacy.web.dto.notification.NotificationResponseDTO.StudyNotificationListDTO; +import com.example.spot.notification.presentation.dto.notification.NotificationResponseDTO.NotificationListDTO; +import com.example.spot.notification.presentation.dto.notification.NotificationResponseDTO.NotificationProcessDTO; +import com.example.spot.notification.presentation.dto.notification.NotificationResponseDTO.StudyNotificationListDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/example/spot/legacy/web/dto/notification/NotificationRequestDTO.java b/src/main/java/com/example/spot/notification/presentation/dto/notification/NotificationRequestDTO.java similarity index 90% rename from src/main/java/com/example/spot/legacy/web/dto/notification/NotificationRequestDTO.java rename to src/main/java/com/example/spot/notification/presentation/dto/notification/NotificationRequestDTO.java index 71860ac8..789e77f8 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/notification/NotificationRequestDTO.java +++ b/src/main/java/com/example/spot/notification/presentation/dto/notification/NotificationRequestDTO.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.web.dto.notification; +package com.example.spot.notification.presentation.dto.notification; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/example/spot/legacy/web/dto/notification/NotificationResponseDTO.java b/src/main/java/com/example/spot/notification/presentation/dto/notification/NotificationResponseDTO.java similarity index 92% rename from src/main/java/com/example/spot/legacy/web/dto/notification/NotificationResponseDTO.java rename to src/main/java/com/example/spot/notification/presentation/dto/notification/NotificationResponseDTO.java index 49e9d130..ace0d9ab 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/notification/NotificationResponseDTO.java +++ b/src/main/java/com/example/spot/notification/presentation/dto/notification/NotificationResponseDTO.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.web.dto.notification; +package com.example.spot.notification.presentation.dto.notification; -import com.example.spot.legacy.domain.enums.NotifyType; +import com.example.spot.notification.domain.enums.NotifyType; import java.util.List; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/spot/legacy/service/post/LikedPostCommentQueryService.java b/src/main/java/com/example/spot/post/application/LikedPostCommentQueryService.java similarity index 85% rename from src/main/java/com/example/spot/legacy/service/post/LikedPostCommentQueryService.java rename to src/main/java/com/example/spot/post/application/LikedPostCommentQueryService.java index 77949a2a..f4b9f69f 100644 --- a/src/main/java/com/example/spot/legacy/service/post/LikedPostCommentQueryService.java +++ b/src/main/java/com/example/spot/post/application/LikedPostCommentQueryService.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.service.post; +package com.example.spot.post.application; public interface LikedPostCommentQueryService { long countByPostCommentIdAndIsLikedTrue(Long postCommentId); diff --git a/src/main/java/com/example/spot/legacy/service/post/LikedPostCommentQueryServiceImpl.java b/src/main/java/com/example/spot/post/application/LikedPostCommentQueryServiceImpl.java similarity index 89% rename from src/main/java/com/example/spot/legacy/service/post/LikedPostCommentQueryServiceImpl.java rename to src/main/java/com/example/spot/post/application/LikedPostCommentQueryServiceImpl.java index 32cce670..a0590638 100644 --- a/src/main/java/com/example/spot/legacy/service/post/LikedPostCommentQueryServiceImpl.java +++ b/src/main/java/com/example/spot/post/application/LikedPostCommentQueryServiceImpl.java @@ -1,11 +1,11 @@ -package com.example.spot.legacy.service.post; +package com.example.spot.post.application; -import com.example.spot.legacy.repository.LikedPostCommentRepository; +import com.example.spot.comment.domain.association.LikedPostCommentRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import static com.example.spot.refactor.common.security.utils.SecurityUtils.getCurrentUserId; +import static com.example.spot.common.security.utils.SecurityUtils.getCurrentUserId; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/example/spot/legacy/service/post/LikedPostQueryService.java b/src/main/java/com/example/spot/post/application/LikedPostQueryService.java similarity index 74% rename from src/main/java/com/example/spot/legacy/service/post/LikedPostQueryService.java rename to src/main/java/com/example/spot/post/application/LikedPostQueryService.java index b2c3cf87..b6c2d895 100644 --- a/src/main/java/com/example/spot/legacy/service/post/LikedPostQueryService.java +++ b/src/main/java/com/example/spot/post/application/LikedPostQueryService.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.service.post; +package com.example.spot.post.application; public interface LikedPostQueryService { long countByPostId(Long postId); diff --git a/src/main/java/com/example/spot/legacy/service/post/LikedPostQueryServiceImpl.java b/src/main/java/com/example/spot/post/application/LikedPostQueryServiceImpl.java similarity index 83% rename from src/main/java/com/example/spot/legacy/service/post/LikedPostQueryServiceImpl.java rename to src/main/java/com/example/spot/post/application/LikedPostQueryServiceImpl.java index 464b6fb3..a4f55573 100644 --- a/src/main/java/com/example/spot/legacy/service/post/LikedPostQueryServiceImpl.java +++ b/src/main/java/com/example/spot/post/application/LikedPostQueryServiceImpl.java @@ -1,11 +1,11 @@ -package com.example.spot.legacy.service.post; +package com.example.spot.post.application; -import com.example.spot.legacy.repository.LikedPostRepository; +import com.example.spot.post.domain.association.LikedPostRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import static com.example.spot.refactor.common.security.utils.SecurityUtils.getCurrentUserId; +import static com.example.spot.common.security.utils.SecurityUtils.getCurrentUserId; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/example/spot/legacy/service/post/PostCommandService.java b/src/main/java/com/example/spot/post/application/PostCommandService.java similarity index 65% rename from src/main/java/com/example/spot/legacy/service/post/PostCommandService.java rename to src/main/java/com/example/spot/post/application/PostCommandService.java index cdf21738..5ee24f7c 100644 --- a/src/main/java/com/example/spot/legacy/service/post/PostCommandService.java +++ b/src/main/java/com/example/spot/post/application/PostCommandService.java @@ -1,16 +1,16 @@ -package com.example.spot.legacy.service.post; - -import com.example.spot.legacy.web.dto.post.CommentCreateRequest; -import com.example.spot.legacy.web.dto.post.CommentCreateResponse; -import com.example.spot.legacy.web.dto.post.CommentLikeResponse; -import com.example.spot.legacy.web.dto.post.PostCreateRequest; -import com.example.spot.legacy.web.dto.post.PostCreateResponse; -import com.example.spot.legacy.web.dto.post.PostLikeResponse; -import com.example.spot.legacy.web.dto.post.PostReportResponse; -import com.example.spot.legacy.web.dto.post.PostUpdateRequest; -import com.example.spot.legacy.web.dto.post.ScrapAllDeleteRequest; -import com.example.spot.legacy.web.dto.post.ScrapPostResponse; -import com.example.spot.legacy.web.dto.post.ScrapsPostDeleteResponse; +package com.example.spot.post.application; + +import com.example.spot.comment.presentation.dto.CommentCreateRequest; +import com.example.spot.comment.presentation.dto.CommentCreateResponse; +import com.example.spot.comment.presentation.dto.CommentLikeResponse; +import com.example.spot.post.presentation.dto.PostCreateRequest; +import com.example.spot.post.presentation.dto.PostCreateResponse; +import com.example.spot.post.presentation.dto.PostLikeResponse; +import com.example.spot.report.presentation.dto.PostReportResponse; +import com.example.spot.post.presentation.dto.PostUpdateRequest; +import com.example.spot.post.presentation.dto.ScrapAllDeleteRequest; +import com.example.spot.post.presentation.dto.ScrapPostResponse; +import com.example.spot.post.presentation.dto.ScrapsPostDeleteResponse; public interface PostCommandService { diff --git a/src/main/java/com/example/spot/legacy/service/post/PostCommandServiceImpl.java b/src/main/java/com/example/spot/post/application/PostCommandServiceImpl.java similarity index 91% rename from src/main/java/com/example/spot/legacy/service/post/PostCommandServiceImpl.java rename to src/main/java/com/example/spot/post/application/PostCommandServiceImpl.java index 92d9df42..db6c555c 100644 --- a/src/main/java/com/example/spot/legacy/service/post/PostCommandServiceImpl.java +++ b/src/main/java/com/example/spot/post/application/PostCommandServiceImpl.java @@ -1,38 +1,38 @@ -package com.example.spot.legacy.service.post; - -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; -import com.example.spot.refactor.common.api.exception.handler.PostHandler; -import com.example.spot.legacy.domain.LikedPost; -import com.example.spot.legacy.domain.LikedPostComment; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.legacy.domain.Post; -import com.example.spot.legacy.domain.PostComment; -import com.example.spot.legacy.domain.PostReport; -import com.example.spot.legacy.domain.enums.Board; -import com.example.spot.legacy.domain.enums.PostStatus; -import com.example.spot.legacy.domain.mapping.MemberScrap; -import com.example.spot.legacy.repository.LikedPostCommentRepository; -import com.example.spot.legacy.repository.LikedPostRepository; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.legacy.repository.MemberScrapRepository; -import com.example.spot.legacy.repository.PostCommentRepository; -import com.example.spot.legacy.repository.PostReportRepository; -import com.example.spot.legacy.repository.PostRepository; -import com.example.spot.legacy.web.dto.post.CommentCreateRequest; -import com.example.spot.legacy.web.dto.post.CommentCreateResponse; -import com.example.spot.legacy.web.dto.post.CommentLikeResponse; -import com.example.spot.legacy.web.dto.post.PostCreateRequest; -import com.example.spot.legacy.web.dto.post.PostCreateResponse; -import com.example.spot.legacy.web.dto.post.PostLikeResponse; -import com.example.spot.legacy.web.dto.post.PostReportResponse; -import com.example.spot.legacy.web.dto.post.PostUpdateRequest; -import com.example.spot.legacy.web.dto.post.ScrapAllDeleteRequest; -import com.example.spot.legacy.web.dto.post.ScrapPostResponse; -import com.example.spot.legacy.web.dto.post.ScrapsPostDeleteResponse; -import com.example.spot.legacy.service.s3.S3ImageService; -import com.example.spot.legacy.web.dto.util.response.ImageResponse.ImageUploadResponse; -import com.example.spot.legacy.web.dto.util.response.ImageResponse.Images; +package com.example.spot.post.application; + +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.handler.MemberHandler; +import com.example.spot.common.api.exception.handler.PostHandler; +import com.example.spot.post.domain.association.LikedPost; +import com.example.spot.comment.domain.association.LikedPostComment; +import com.example.spot.member.domain.Member; +import com.example.spot.post.domain.Post; +import com.example.spot.comment.domain.PostComment; +import com.example.spot.report.domain.PostReport; +import com.example.spot.post.domain.enums.Board; +import com.example.spot.post.domain.enums.PostStatus; +import com.example.spot.post.domain.association.MemberScrap; +import com.example.spot.comment.domain.association.LikedPostCommentRepository; +import com.example.spot.post.domain.association.LikedPostRepository; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.post.domain.association.MemberScrapRepository; +import com.example.spot.comment.domain.PostCommentRepository; +import com.example.spot.report.domain.PostReportRepository; +import com.example.spot.post.domain.PostRepository; +import com.example.spot.comment.presentation.dto.CommentCreateRequest; +import com.example.spot.comment.presentation.dto.CommentCreateResponse; +import com.example.spot.comment.presentation.dto.CommentLikeResponse; +import com.example.spot.post.presentation.dto.PostCreateRequest; +import com.example.spot.post.presentation.dto.PostCreateResponse; +import com.example.spot.post.presentation.dto.PostLikeResponse; +import com.example.spot.report.presentation.dto.PostReportResponse; +import com.example.spot.post.presentation.dto.PostUpdateRequest; +import com.example.spot.post.presentation.dto.ScrapAllDeleteRequest; +import com.example.spot.post.presentation.dto.ScrapPostResponse; +import com.example.spot.post.presentation.dto.ScrapsPostDeleteResponse; +import com.example.spot.common.application.s3.S3ImageService; +import com.example.spot.common.presentation.dto.util.response.ImageResponse.ImageUploadResponse; +import com.example.spot.common.presentation.dto.util.response.ImageResponse.Images; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,7 +41,7 @@ import org.springframework.web.multipart.MultipartFile; -import static com.example.spot.refactor.common.security.utils.SecurityUtils.getCurrentUserId; +import static com.example.spot.common.security.utils.SecurityUtils.getCurrentUserId; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/example/spot/legacy/service/post/PostQueryService.java b/src/main/java/com/example/spot/post/application/PostQueryService.java similarity index 54% rename from src/main/java/com/example/spot/legacy/service/post/PostQueryService.java rename to src/main/java/com/example/spot/post/application/PostQueryService.java index 7e3a8b03..0b0c52d5 100644 --- a/src/main/java/com/example/spot/legacy/service/post/PostQueryService.java +++ b/src/main/java/com/example/spot/post/application/PostQueryService.java @@ -1,11 +1,11 @@ -package com.example.spot.legacy.service.post; - -import com.example.spot.legacy.web.dto.post.CommentResponse; -import com.example.spot.legacy.web.dto.post.PostAnnouncementResponse; -import com.example.spot.legacy.web.dto.post.PostBest5Response; -import com.example.spot.legacy.web.dto.post.PostPagingResponse; -import com.example.spot.legacy.web.dto.post.PostRepresentativeResponse; -import com.example.spot.legacy.web.dto.post.PostSingleResponse; +package com.example.spot.post.application; + +import com.example.spot.comment.presentation.dto.CommentResponse; +import com.example.spot.post.presentation.controller.PostAnnouncementResponse; +import com.example.spot.post.presentation.dto.PostBest5Response; +import com.example.spot.post.presentation.dto.PostPagingResponse; +import com.example.spot.post.presentation.dto.PostRepresentativeResponse; +import com.example.spot.post.presentation.dto.PostSingleResponse; import org.springframework.data.domain.Pageable; public interface PostQueryService { diff --git a/src/main/java/com/example/spot/legacy/service/post/PostQueryServiceImpl.java b/src/main/java/com/example/spot/post/application/PostQueryServiceImpl.java similarity index 90% rename from src/main/java/com/example/spot/legacy/service/post/PostQueryServiceImpl.java rename to src/main/java/com/example/spot/post/application/PostQueryServiceImpl.java index 7c7e73f6..51713c03 100644 --- a/src/main/java/com/example/spot/legacy/service/post/PostQueryServiceImpl.java +++ b/src/main/java/com/example/spot/post/application/PostQueryServiceImpl.java @@ -1,26 +1,26 @@ -package com.example.spot.legacy.service.post; - -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.handler.PostHandler; -import com.example.spot.legacy.domain.Post; -import com.example.spot.legacy.domain.PostComment; -import com.example.spot.legacy.domain.enums.Board; -import com.example.spot.legacy.domain.enums.PostStatus; -import com.example.spot.legacy.domain.mapping.MemberScrap; -import com.example.spot.legacy.repository.MemberScrapRepository; -import com.example.spot.legacy.repository.PostCommentRepository; -import com.example.spot.legacy.repository.PostReportRepository; -import com.example.spot.legacy.repository.PostRepository; -import com.example.spot.legacy.web.dto.post.CommentDetailResponse; -import com.example.spot.legacy.web.dto.post.CommentResponse; -import com.example.spot.legacy.web.dto.post.PostAnnouncementResponse; -import com.example.spot.legacy.web.dto.post.PostBest5DetailResponse; -import com.example.spot.legacy.web.dto.post.PostBest5Response; -import com.example.spot.legacy.web.dto.post.PostPagingDetailResponse; -import com.example.spot.legacy.web.dto.post.PostPagingResponse; -import com.example.spot.legacy.web.dto.post.PostRepresentativeDetailResponse; -import com.example.spot.legacy.web.dto.post.PostRepresentativeResponse; -import com.example.spot.legacy.web.dto.post.PostSingleResponse; +package com.example.spot.post.application; + +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.handler.PostHandler; +import com.example.spot.post.domain.Post; +import com.example.spot.comment.domain.PostComment; +import com.example.spot.post.domain.enums.Board; +import com.example.spot.post.domain.enums.PostStatus; +import com.example.spot.post.domain.association.MemberScrap; +import com.example.spot.post.domain.association.MemberScrapRepository; +import com.example.spot.comment.domain.PostCommentRepository; +import com.example.spot.report.domain.PostReportRepository; +import com.example.spot.post.domain.PostRepository; +import com.example.spot.comment.presentation.dto.CommentDetailResponse; +import com.example.spot.comment.presentation.dto.CommentResponse; +import com.example.spot.post.presentation.controller.PostAnnouncementResponse; +import com.example.spot.post.presentation.dto.PostBest5DetailResponse; +import com.example.spot.post.presentation.dto.PostBest5Response; +import com.example.spot.post.presentation.dto.PostPagingDetailResponse; +import com.example.spot.post.presentation.dto.PostPagingResponse; +import com.example.spot.post.presentation.dto.PostRepresentativeDetailResponse; +import com.example.spot.post.presentation.dto.PostRepresentativeResponse; +import com.example.spot.post.presentation.dto.PostSingleResponse; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Page; @@ -31,7 +31,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import static com.example.spot.refactor.common.security.utils.SecurityUtils.getCurrentUserId; +import static com.example.spot.common.security.utils.SecurityUtils.getCurrentUserId; @Service diff --git a/src/main/java/com/example/spot/legacy/domain/Post.java b/src/main/java/com/example/spot/post/domain/Post.java similarity index 84% rename from src/main/java/com/example/spot/legacy/domain/Post.java rename to src/main/java/com/example/spot/post/domain/Post.java index 45fc346f..e7af2087 100644 --- a/src/main/java/com/example/spot/legacy/domain/Post.java +++ b/src/main/java/com/example/spot/post/domain/Post.java @@ -1,10 +1,14 @@ -package com.example.spot.legacy.domain; - -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.legacy.domain.enums.Board; -import com.example.spot.legacy.domain.mapping.MemberScrap; -import com.example.spot.legacy.web.dto.post.PostUpdateRequest; -import com.example.spot.refactor.member.domain.Member; +package com.example.spot.post.domain; + +import com.example.spot.post.domain.association.LikedPost; +import com.example.spot.comment.domain.PostComment; +import com.example.spot.post.domain.association.PostImage; +import com.example.spot.report.domain.PostReport; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.post.domain.enums.Board; +import com.example.spot.post.domain.association.MemberScrap; +import com.example.spot.post.presentation.dto.PostUpdateRequest; +import com.example.spot.member.domain.Member; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/spot/legacy/repository/PostRepository.java b/src/main/java/com/example/spot/post/domain/PostRepository.java similarity index 55% rename from src/main/java/com/example/spot/legacy/repository/PostRepository.java rename to src/main/java/com/example/spot/post/domain/PostRepository.java index 56df880e..bc83d918 100644 --- a/src/main/java/com/example/spot/legacy/repository/PostRepository.java +++ b/src/main/java/com/example/spot/post/domain/PostRepository.java @@ -1,8 +1,7 @@ -package com.example.spot.legacy.repository; +package com.example.spot.post.domain; + +import com.example.spot.post.domain.enums.Board; -import com.example.spot.legacy.domain.Post; -import com.example.spot.legacy.domain.enums.Board; -import com.example.spot.legacy.repository.querydsl.PostRepositoryCustom; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; @@ -10,10 +9,8 @@ public interface PostRepository extends JpaRepository, PostRepositoryCustom { // 정렬 Page findByBoardAndPostReportListIsEmptyOrderByCreatedAtDesc(Board board, Pageable pageable); - Page findByBoardAndPostReportListIsEmpty(Board board, Pageable pageable); // 정렬 조건 필요 Page findByPostReportListIsEmptyOrderByCreatedAtDesc(Pageable pageable); - Page findByPostReportListIsEmpty(Pageable pageable); // 모든 게시글 조회 } diff --git a/src/main/java/com/example/spot/legacy/repository/querydsl/PostRepositoryCustom.java b/src/main/java/com/example/spot/post/domain/PostRepositoryCustom.java similarity index 87% rename from src/main/java/com/example/spot/legacy/repository/querydsl/PostRepositoryCustom.java rename to src/main/java/com/example/spot/post/domain/PostRepositoryCustom.java index 65e37ec4..50953af4 100644 --- a/src/main/java/com/example/spot/legacy/repository/querydsl/PostRepositoryCustom.java +++ b/src/main/java/com/example/spot/post/domain/PostRepositoryCustom.java @@ -1,6 +1,4 @@ -package com.example.spot.legacy.repository.querydsl; - -import com.example.spot.legacy.domain.Post; +package com.example.spot.post.domain; import java.util.List; diff --git a/src/main/java/com/example/spot/legacy/domain/LikedPost.java b/src/main/java/com/example/spot/post/domain/association/LikedPost.java similarity index 71% rename from src/main/java/com/example/spot/legacy/domain/LikedPost.java rename to src/main/java/com/example/spot/post/domain/association/LikedPost.java index 56932f5d..8c9a30aa 100644 --- a/src/main/java/com/example/spot/legacy/domain/LikedPost.java +++ b/src/main/java/com/example/spot/post/domain/association/LikedPost.java @@ -1,7 +1,8 @@ -package com.example.spot.legacy.domain; +package com.example.spot.post.domain.association; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.member.domain.Member; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.member.domain.Member; +import com.example.spot.post.domain.Post; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/spot/legacy/repository/LikedPostRepository.java b/src/main/java/com/example/spot/post/domain/association/LikedPostRepository.java similarity index 83% rename from src/main/java/com/example/spot/legacy/repository/LikedPostRepository.java rename to src/main/java/com/example/spot/post/domain/association/LikedPostRepository.java index a47fb97f..c1a305cc 100644 --- a/src/main/java/com/example/spot/legacy/repository/LikedPostRepository.java +++ b/src/main/java/com/example/spot/post/domain/association/LikedPostRepository.java @@ -1,6 +1,5 @@ -package com.example.spot.legacy.repository; +package com.example.spot.post.domain.association; -import com.example.spot.legacy.domain.LikedPost; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/com/example/spot/legacy/domain/mapping/MemberScrap.java b/src/main/java/com/example/spot/post/domain/association/MemberScrap.java similarity index 69% rename from src/main/java/com/example/spot/legacy/domain/mapping/MemberScrap.java rename to src/main/java/com/example/spot/post/domain/association/MemberScrap.java index aea87b5e..de5a84a3 100644 --- a/src/main/java/com/example/spot/legacy/domain/mapping/MemberScrap.java +++ b/src/main/java/com/example/spot/post/domain/association/MemberScrap.java @@ -1,8 +1,8 @@ -package com.example.spot.legacy.domain.mapping; +package com.example.spot.post.domain.association; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.legacy.domain.Post; -import com.example.spot.refactor.common.entity.BaseEntity; +import com.example.spot.member.domain.Member; +import com.example.spot.post.domain.Post; +import com.example.spot.common.entity.BaseEntity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/spot/legacy/repository/MemberScrapRepository.java b/src/main/java/com/example/spot/post/domain/association/MemberScrapRepository.java similarity index 87% rename from src/main/java/com/example/spot/legacy/repository/MemberScrapRepository.java rename to src/main/java/com/example/spot/post/domain/association/MemberScrapRepository.java index 662a3495..bdf2b330 100644 --- a/src/main/java/com/example/spot/legacy/repository/MemberScrapRepository.java +++ b/src/main/java/com/example/spot/post/domain/association/MemberScrapRepository.java @@ -1,7 +1,7 @@ -package com.example.spot.legacy.repository; +package com.example.spot.post.domain.association; + +import com.example.spot.post.domain.enums.Board; -import com.example.spot.legacy.domain.enums.Board; -import com.example.spot.legacy.domain.mapping.MemberScrap; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/example/spot/legacy/domain/PostImage.java b/src/main/java/com/example/spot/post/domain/association/PostImage.java similarity index 73% rename from src/main/java/com/example/spot/legacy/domain/PostImage.java rename to src/main/java/com/example/spot/post/domain/association/PostImage.java index 1cc3c2a6..04d4958e 100644 --- a/src/main/java/com/example/spot/legacy/domain/PostImage.java +++ b/src/main/java/com/example/spot/post/domain/association/PostImage.java @@ -1,6 +1,8 @@ -package com.example.spot.legacy.domain; +package com.example.spot.post.domain.association; + +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.post.domain.Post; -import com.example.spot.refactor.common.entity.BaseEntity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/spot/legacy/domain/enums/Board.java b/src/main/java/com/example/spot/post/domain/enums/Board.java similarity index 76% rename from src/main/java/com/example/spot/legacy/domain/enums/Board.java rename to src/main/java/com/example/spot/post/domain/enums/Board.java index e6b1f3dd..d73dc957 100644 --- a/src/main/java/com/example/spot/legacy/domain/enums/Board.java +++ b/src/main/java/com/example/spot/post/domain/enums/Board.java @@ -1,7 +1,7 @@ -package com.example.spot.legacy.domain.enums; +package com.example.spot.post.domain.enums; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.handler.PostHandler; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.handler.PostHandler; import lombok.Getter; @Getter diff --git a/src/main/java/com/example/spot/legacy/domain/enums/PostStatus.java b/src/main/java/com/example/spot/post/domain/enums/PostStatus.java similarity index 57% rename from src/main/java/com/example/spot/legacy/domain/enums/PostStatus.java rename to src/main/java/com/example/spot/post/domain/enums/PostStatus.java index 0dc550e1..cfd302ce 100644 --- a/src/main/java/com/example/spot/legacy/domain/enums/PostStatus.java +++ b/src/main/java/com/example/spot/post/domain/enums/PostStatus.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.domain.enums; +package com.example.spot.post.domain.enums; public enum PostStatus { 신고접수, 정상, 삭제 diff --git a/src/main/java/com/example/spot/legacy/domain/PostScheduleComments.java b/src/main/java/com/example/spot/post/domain/schedule/PostScheduleComments.java similarity index 87% rename from src/main/java/com/example/spot/legacy/domain/PostScheduleComments.java rename to src/main/java/com/example/spot/post/domain/schedule/PostScheduleComments.java index da3e67e5..c8a9759a 100644 --- a/src/main/java/com/example/spot/legacy/domain/PostScheduleComments.java +++ b/src/main/java/com/example/spot/post/domain/schedule/PostScheduleComments.java @@ -1,6 +1,8 @@ -package com.example.spot.legacy.domain; +package com.example.spot.post.domain.schedule; + +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.post.domain.Post; -import com.example.spot.refactor.common.entity.BaseEntity; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; diff --git a/src/main/java/com/example/spot/legacy/repository/PostScheduleCommentsRepository.java b/src/main/java/com/example/spot/post/domain/schedule/PostScheduleCommentsRepository.java similarity index 61% rename from src/main/java/com/example/spot/legacy/repository/PostScheduleCommentsRepository.java rename to src/main/java/com/example/spot/post/domain/schedule/PostScheduleCommentsRepository.java index 6db57ad5..5d464bb2 100644 --- a/src/main/java/com/example/spot/legacy/repository/PostScheduleCommentsRepository.java +++ b/src/main/java/com/example/spot/post/domain/schedule/PostScheduleCommentsRepository.java @@ -1,6 +1,5 @@ -package com.example.spot.legacy.repository; +package com.example.spot.post.domain.schedule; -import com.example.spot.legacy.domain.PostScheduleComments; import org.springframework.data.jpa.repository.JpaRepository; public interface PostScheduleCommentsRepository extends JpaRepository { diff --git a/src/main/java/com/example/spot/legacy/domain/PostScheduleLikes.java b/src/main/java/com/example/spot/post/domain/schedule/PostScheduleLikes.java similarity index 88% rename from src/main/java/com/example/spot/legacy/domain/PostScheduleLikes.java rename to src/main/java/com/example/spot/post/domain/schedule/PostScheduleLikes.java index f0ae296b..2e7ecaad 100644 --- a/src/main/java/com/example/spot/legacy/domain/PostScheduleLikes.java +++ b/src/main/java/com/example/spot/post/domain/schedule/PostScheduleLikes.java @@ -1,6 +1,8 @@ -package com.example.spot.legacy.domain; +package com.example.spot.post.domain.schedule; + +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.post.domain.Post; -import com.example.spot.refactor.common.entity.BaseEntity; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; diff --git a/src/main/java/com/example/spot/legacy/repository/PostScheduleLikesRepository.java b/src/main/java/com/example/spot/post/domain/schedule/PostScheduleLikesRepository.java similarity index 61% rename from src/main/java/com/example/spot/legacy/repository/PostScheduleLikesRepository.java rename to src/main/java/com/example/spot/post/domain/schedule/PostScheduleLikesRepository.java index e050e239..52145bef 100644 --- a/src/main/java/com/example/spot/legacy/repository/PostScheduleLikesRepository.java +++ b/src/main/java/com/example/spot/post/domain/schedule/PostScheduleLikesRepository.java @@ -1,6 +1,5 @@ -package com.example.spot.legacy.repository; +package com.example.spot.post.domain.schedule; -import com.example.spot.legacy.domain.PostScheduleLikes; import org.springframework.data.jpa.repository.JpaRepository; public interface PostScheduleLikesRepository extends JpaRepository { diff --git a/src/main/java/com/example/spot/legacy/domain/PostScheduleRealTime.java b/src/main/java/com/example/spot/post/domain/schedule/PostScheduleRealTime.java similarity index 89% rename from src/main/java/com/example/spot/legacy/domain/PostScheduleRealTime.java rename to src/main/java/com/example/spot/post/domain/schedule/PostScheduleRealTime.java index 835e8ce9..242e7eee 100644 --- a/src/main/java/com/example/spot/legacy/domain/PostScheduleRealTime.java +++ b/src/main/java/com/example/spot/post/domain/schedule/PostScheduleRealTime.java @@ -1,6 +1,8 @@ -package com.example.spot.legacy.domain; +package com.example.spot.post.domain.schedule; + +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.post.domain.Post; -import com.example.spot.refactor.common.entity.BaseEntity; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; diff --git a/src/main/java/com/example/spot/legacy/repository/PostScheduleRealTimeRepository.java b/src/main/java/com/example/spot/post/domain/schedule/PostScheduleRealTimeRepository.java similarity index 61% rename from src/main/java/com/example/spot/legacy/repository/PostScheduleRealTimeRepository.java rename to src/main/java/com/example/spot/post/domain/schedule/PostScheduleRealTimeRepository.java index 5dadce8f..73a36e2a 100644 --- a/src/main/java/com/example/spot/legacy/repository/PostScheduleRealTimeRepository.java +++ b/src/main/java/com/example/spot/post/domain/schedule/PostScheduleRealTimeRepository.java @@ -1,6 +1,5 @@ -package com.example.spot.legacy.repository; +package com.example.spot.post.domain.schedule; -import com.example.spot.legacy.domain.PostScheduleRealTime; import org.springframework.data.jpa.repository.JpaRepository; public interface PostScheduleRealTimeRepository extends JpaRepository { diff --git a/src/main/java/com/example/spot/legacy/validation/validator/ExistPostValidator.java b/src/main/java/com/example/spot/post/infrastructure/ExistPostValidator.java similarity index 82% rename from src/main/java/com/example/spot/legacy/validation/validator/ExistPostValidator.java rename to src/main/java/com/example/spot/post/infrastructure/ExistPostValidator.java index f89b155a..e837903f 100644 --- a/src/main/java/com/example/spot/legacy/validation/validator/ExistPostValidator.java +++ b/src/main/java/com/example/spot/post/infrastructure/ExistPostValidator.java @@ -1,8 +1,8 @@ -package com.example.spot.legacy.validation.validator; +package com.example.spot.post.infrastructure; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.legacy.repository.PostRepository; -import com.example.spot.legacy.validation.annotation.ExistPost; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.post.domain.PostRepository; +import com.example.spot.post.presentation.validator.ExistPost; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/src/main/java/com/example/spot/legacy/repository/querydsl/impl/PostRepositoryImpl.java b/src/main/java/com/example/spot/post/infrastructure/PostRepositoryImpl.java similarity index 89% rename from src/main/java/com/example/spot/legacy/repository/querydsl/impl/PostRepositoryImpl.java rename to src/main/java/com/example/spot/post/infrastructure/PostRepositoryImpl.java index 29e04745..746114ad 100644 --- a/src/main/java/com/example/spot/legacy/repository/querydsl/impl/PostRepositoryImpl.java +++ b/src/main/java/com/example/spot/post/infrastructure/PostRepositoryImpl.java @@ -1,11 +1,11 @@ -package com.example.spot.legacy.repository.querydsl.impl; +package com.example.spot.post.infrastructure; -import com.example.spot.legacy.domain.Post; -import com.example.spot.legacy.domain.QLikedPost; -import com.example.spot.legacy.domain.QPost; -import com.example.spot.legacy.domain.QPostComment; -import com.example.spot.legacy.domain.enums.Board; -import com.example.spot.legacy.repository.querydsl.PostRepositoryCustom; +import com.example.spot.comment.domain.QPostComment; +import com.example.spot.post.domain.Post; +import com.example.spot.post.domain.QPost; +import com.example.spot.post.domain.association.QLikedPost; +import com.example.spot.post.domain.enums.Board; +import com.example.spot.post.domain.PostRepositoryCustom; import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; @@ -15,6 +15,9 @@ import java.util.List; import java.util.Map; +import org.springframework.stereotype.Component; + +@Component @RequiredArgsConstructor public class PostRepositoryImpl implements PostRepositoryCustom { diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/PostAnnouncementResponse.java b/src/main/java/com/example/spot/post/presentation/controller/PostAnnouncementResponse.java similarity index 65% rename from src/main/java/com/example/spot/legacy/web/dto/post/PostAnnouncementResponse.java rename to src/main/java/com/example/spot/post/presentation/controller/PostAnnouncementResponse.java index fc88ce3a..7e5210e5 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/PostAnnouncementResponse.java +++ b/src/main/java/com/example/spot/post/presentation/controller/PostAnnouncementResponse.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.controller; import lombok.AllArgsConstructor; import lombok.Builder; @@ -6,6 +6,8 @@ import java.util.List; +import com.example.spot.post.presentation.dto.PostBest5DetailResponse; + @Builder @Getter @AllArgsConstructor diff --git a/src/main/java/com/example/spot/legacy/web/controller/PostController.java b/src/main/java/com/example/spot/post/presentation/controller/PostController.java similarity index 92% rename from src/main/java/com/example/spot/legacy/web/controller/PostController.java rename to src/main/java/com/example/spot/post/presentation/controller/PostController.java index d89ecefe..73290afe 100644 --- a/src/main/java/com/example/spot/legacy/web/controller/PostController.java +++ b/src/main/java/com/example/spot/post/presentation/controller/PostController.java @@ -1,28 +1,27 @@ -package com.example.spot.legacy.web.controller; +package com.example.spot.post.presentation.controller; -import com.example.spot.refactor.common.api.ApiResponse; -import com.example.spot.refactor.common.api.code.status.SuccessStatus; -import com.example.spot.refactor.common.security.utils.SecurityUtils; -import com.example.spot.legacy.service.post.PostCommandService; -import com.example.spot.legacy.service.post.PostQueryService; -import com.example.spot.legacy.validation.annotation.ExistPost; -import com.example.spot.legacy.web.dto.post.CommentCreateRequest; -import com.example.spot.legacy.web.dto.post.CommentCreateResponse; -import com.example.spot.legacy.web.dto.post.CommentLikeResponse; -import com.example.spot.legacy.web.dto.post.CommentResponse; -import com.example.spot.legacy.web.dto.post.PostAnnouncementResponse; -import com.example.spot.legacy.web.dto.post.PostBest5Response; -import com.example.spot.legacy.web.dto.post.PostCreateRequest; -import com.example.spot.legacy.web.dto.post.PostCreateResponse; -import com.example.spot.legacy.web.dto.post.PostLikeResponse; -import com.example.spot.legacy.web.dto.post.PostPagingResponse; -import com.example.spot.legacy.web.dto.post.PostReportResponse; -import com.example.spot.legacy.web.dto.post.PostRepresentativeResponse; -import com.example.spot.legacy.web.dto.post.PostSingleResponse; -import com.example.spot.legacy.web.dto.post.PostUpdateRequest; -import com.example.spot.legacy.web.dto.post.ScrapAllDeleteRequest; -import com.example.spot.legacy.web.dto.post.ScrapPostResponse; -import com.example.spot.legacy.web.dto.post.ScrapsPostDeleteResponse; +import com.example.spot.common.api.ApiResponse; +import com.example.spot.common.api.code.status.SuccessStatus; +import com.example.spot.common.security.utils.SecurityUtils; +import com.example.spot.post.application.PostCommandService; +import com.example.spot.post.application.PostQueryService; +import com.example.spot.post.presentation.validator.ExistPost; +import com.example.spot.comment.presentation.dto.CommentCreateRequest; +import com.example.spot.comment.presentation.dto.CommentCreateResponse; +import com.example.spot.comment.presentation.dto.CommentLikeResponse; +import com.example.spot.comment.presentation.dto.CommentResponse; +import com.example.spot.post.presentation.dto.PostBest5Response; +import com.example.spot.post.presentation.dto.PostCreateRequest; +import com.example.spot.post.presentation.dto.PostCreateResponse; +import com.example.spot.post.presentation.dto.PostLikeResponse; +import com.example.spot.post.presentation.dto.PostPagingResponse; +import com.example.spot.report.presentation.dto.PostReportResponse; +import com.example.spot.post.presentation.dto.PostRepresentativeResponse; +import com.example.spot.post.presentation.dto.PostSingleResponse; +import com.example.spot.post.presentation.dto.PostUpdateRequest; +import com.example.spot.post.presentation.dto.ScrapAllDeleteRequest; +import com.example.spot.post.presentation.dto.ScrapPostResponse; +import com.example.spot.post.presentation.dto.ScrapsPostDeleteResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/PostBest5DetailResponse.java b/src/main/java/com/example/spot/post/presentation/dto/PostBest5DetailResponse.java similarity index 92% rename from src/main/java/com/example/spot/legacy/web/dto/post/PostBest5DetailResponse.java rename to src/main/java/com/example/spot/post/presentation/dto/PostBest5DetailResponse.java index 08039737..d552470d 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/PostBest5DetailResponse.java +++ b/src/main/java/com/example/spot/post/presentation/dto/PostBest5DetailResponse.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.dto; -import com.example.spot.legacy.domain.Post; +import com.example.spot.post.domain.Post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/PostBest5Response.java b/src/main/java/com/example/spot/post/presentation/dto/PostBest5Response.java similarity index 93% rename from src/main/java/com/example/spot/legacy/web/dto/post/PostBest5Response.java rename to src/main/java/com/example/spot/post/presentation/dto/PostBest5Response.java index 7243b328..f9e2b778 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/PostBest5Response.java +++ b/src/main/java/com/example/spot/post/presentation/dto/PostBest5Response.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AccessLevel; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/PostBoard5Response.java b/src/main/java/com/example/spot/post/presentation/dto/PostBoard5Response.java similarity index 89% rename from src/main/java/com/example/spot/legacy/web/dto/post/PostBoard5Response.java rename to src/main/java/com/example/spot/post/presentation/dto/PostBoard5Response.java index f68b2fb4..d049443c 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/PostBoard5Response.java +++ b/src/main/java/com/example/spot/post/presentation/dto/PostBoard5Response.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.dto; -import com.example.spot.legacy.domain.enums.Board; +import com.example.spot.post.domain.enums.Board; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/PostCreateRequest.java b/src/main/java/com/example/spot/post/presentation/dto/PostCreateRequest.java similarity index 92% rename from src/main/java/com/example/spot/legacy/web/dto/post/PostCreateRequest.java rename to src/main/java/com/example/spot/post/presentation/dto/PostCreateRequest.java index 46c711ce..2ef17de3 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/PostCreateRequest.java +++ b/src/main/java/com/example/spot/post/presentation/dto/PostCreateRequest.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.dto; -import com.example.spot.legacy.domain.enums.Board; +import com.example.spot.post.domain.enums.Board; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/PostCreateResponse.java b/src/main/java/com/example/spot/post/presentation/dto/PostCreateResponse.java similarity index 88% rename from src/main/java/com/example/spot/legacy/web/dto/post/PostCreateResponse.java rename to src/main/java/com/example/spot/post/presentation/dto/PostCreateResponse.java index 7cd8a89c..5d68e57a 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/PostCreateResponse.java +++ b/src/main/java/com/example/spot/post/presentation/dto/PostCreateResponse.java @@ -1,7 +1,7 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.dto; -import com.example.spot.legacy.domain.Post; -import com.example.spot.legacy.domain.enums.Board; +import com.example.spot.post.domain.Post; +import com.example.spot.post.domain.enums.Board; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/PostHomeResponse.java b/src/main/java/com/example/spot/post/presentation/dto/PostHomeResponse.java similarity index 87% rename from src/main/java/com/example/spot/legacy/web/dto/post/PostHomeResponse.java rename to src/main/java/com/example/spot/post/presentation/dto/PostHomeResponse.java index 1634b5ff..fee920a7 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/PostHomeResponse.java +++ b/src/main/java/com/example/spot/post/presentation/dto/PostHomeResponse.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.dto; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/PostLikeRequest.java b/src/main/java/com/example/spot/post/presentation/dto/PostLikeRequest.java similarity index 87% rename from src/main/java/com/example/spot/legacy/web/dto/post/PostLikeRequest.java rename to src/main/java/com/example/spot/post/presentation/dto/PostLikeRequest.java index 0c07bbc4..cc759f86 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/PostLikeRequest.java +++ b/src/main/java/com/example/spot/post/presentation/dto/PostLikeRequest.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/PostLikeResponse.java b/src/main/java/com/example/spot/post/presentation/dto/PostLikeResponse.java similarity index 88% rename from src/main/java/com/example/spot/legacy/web/dto/post/PostLikeResponse.java rename to src/main/java/com/example/spot/post/presentation/dto/PostLikeResponse.java index da6cab58..ccd415c1 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/PostLikeResponse.java +++ b/src/main/java/com/example/spot/post/presentation/dto/PostLikeResponse.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/PostPagingDetailResponse.java b/src/main/java/com/example/spot/post/presentation/dto/PostPagingDetailResponse.java similarity index 96% rename from src/main/java/com/example/spot/legacy/web/dto/post/PostPagingDetailResponse.java rename to src/main/java/com/example/spot/post/presentation/dto/PostPagingDetailResponse.java index aae36ba4..5b367827 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/PostPagingDetailResponse.java +++ b/src/main/java/com/example/spot/post/presentation/dto/PostPagingDetailResponse.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.dto; -import com.example.spot.legacy.domain.Post; +import com.example.spot.post.domain.Post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/PostPagingResponse.java b/src/main/java/com/example/spot/post/presentation/dto/PostPagingResponse.java similarity index 96% rename from src/main/java/com/example/spot/legacy/web/dto/post/PostPagingResponse.java rename to src/main/java/com/example/spot/post/presentation/dto/PostPagingResponse.java index 42ed7988..527aa036 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/PostPagingResponse.java +++ b/src/main/java/com/example/spot/post/presentation/dto/PostPagingResponse.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/PostRepresentativeDetailResponse.java b/src/main/java/com/example/spot/post/presentation/dto/PostRepresentativeDetailResponse.java similarity index 91% rename from src/main/java/com/example/spot/legacy/web/dto/post/PostRepresentativeDetailResponse.java rename to src/main/java/com/example/spot/post/presentation/dto/PostRepresentativeDetailResponse.java index bd1b4471..88bdb518 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/PostRepresentativeDetailResponse.java +++ b/src/main/java/com/example/spot/post/presentation/dto/PostRepresentativeDetailResponse.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.dto; -import com.example.spot.legacy.domain.Post; +import com.example.spot.post.domain.Post; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/PostRepresentativeResponse.java b/src/main/java/com/example/spot/post/presentation/dto/PostRepresentativeResponse.java similarity index 83% rename from src/main/java/com/example/spot/legacy/web/dto/post/PostRepresentativeResponse.java rename to src/main/java/com/example/spot/post/presentation/dto/PostRepresentativeResponse.java index 5a4a6a5e..a548ae69 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/PostRepresentativeResponse.java +++ b/src/main/java/com/example/spot/post/presentation/dto/PostRepresentativeResponse.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/PostSingleResponse.java b/src/main/java/com/example/spot/post/presentation/dto/PostSingleResponse.java similarity index 95% rename from src/main/java/com/example/spot/legacy/web/dto/post/PostSingleResponse.java rename to src/main/java/com/example/spot/post/presentation/dto/PostSingleResponse.java index 9afddb2d..f53693df 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/PostSingleResponse.java +++ b/src/main/java/com/example/spot/post/presentation/dto/PostSingleResponse.java @@ -1,7 +1,8 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.dto; -import com.example.spot.legacy.domain.Post; -import com.example.spot.legacy.domain.enums.Board; +import com.example.spot.comment.presentation.dto.CommentResponse; +import com.example.spot.post.domain.Post; +import com.example.spot.post.domain.enums.Board; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/PostUpdateRequest.java b/src/main/java/com/example/spot/post/presentation/dto/PostUpdateRequest.java similarity index 91% rename from src/main/java/com/example/spot/legacy/web/dto/post/PostUpdateRequest.java rename to src/main/java/com/example/spot/post/presentation/dto/PostUpdateRequest.java index cd36b09d..a0782458 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/PostUpdateRequest.java +++ b/src/main/java/com/example/spot/post/presentation/dto/PostUpdateRequest.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.dto; -import com.example.spot.legacy.domain.enums.Board; +import com.example.spot.post.domain.enums.Board; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/ScrapAllDeleteRequest.java b/src/main/java/com/example/spot/post/presentation/dto/ScrapAllDeleteRequest.java similarity index 88% rename from src/main/java/com/example/spot/legacy/web/dto/post/ScrapAllDeleteRequest.java rename to src/main/java/com/example/spot/post/presentation/dto/ScrapAllDeleteRequest.java index d05c568f..2aca730b 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/ScrapAllDeleteRequest.java +++ b/src/main/java/com/example/spot/post/presentation/dto/ScrapAllDeleteRequest.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/ScrapPostResponse.java b/src/main/java/com/example/spot/post/presentation/dto/ScrapPostResponse.java similarity index 88% rename from src/main/java/com/example/spot/legacy/web/dto/post/ScrapPostResponse.java rename to src/main/java/com/example/spot/post/presentation/dto/ScrapPostResponse.java index 2ca9633f..60c5b11f 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/ScrapPostResponse.java +++ b/src/main/java/com/example/spot/post/presentation/dto/ScrapPostResponse.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/ScrapsPostDeleteResponse.java b/src/main/java/com/example/spot/post/presentation/dto/ScrapsPostDeleteResponse.java similarity index 85% rename from src/main/java/com/example/spot/legacy/web/dto/post/ScrapsPostDeleteResponse.java rename to src/main/java/com/example/spot/post/presentation/dto/ScrapsPostDeleteResponse.java index 971e1399..a607dba3 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/ScrapsPostDeleteResponse.java +++ b/src/main/java/com/example/spot/post/presentation/dto/ScrapsPostDeleteResponse.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.post.presentation.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/spot/legacy/validation/annotation/ExistPost.java b/src/main/java/com/example/spot/post/presentation/validator/ExistPost.java similarity index 83% rename from src/main/java/com/example/spot/legacy/validation/annotation/ExistPost.java rename to src/main/java/com/example/spot/post/presentation/validator/ExistPost.java index 8335665c..da1fbccf 100644 --- a/src/main/java/com/example/spot/legacy/validation/annotation/ExistPost.java +++ b/src/main/java/com/example/spot/post/presentation/validator/ExistPost.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.validation.annotation; +package com.example.spot.post.presentation.validator; -import com.example.spot.legacy.validation.validator.ExistPostValidator; +import com.example.spot.post.infrastructure.ExistPostValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/com/example/spot/refactor/common/api/exception/handler/MemberHandler.java b/src/main/java/com/example/spot/refactor/common/api/exception/handler/MemberHandler.java deleted file mode 100644 index d2c42d80..00000000 --- a/src/main/java/com/example/spot/refactor/common/api/exception/handler/MemberHandler.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.spot.refactor.common.api.exception.handler; - -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.GeneralException; - -public class MemberHandler extends GeneralException { - - public MemberHandler(ErrorStatus code) { - super(code); - } -} diff --git a/src/main/java/com/example/spot/refactor/common/api/exception/handler/NotificationHandler.java b/src/main/java/com/example/spot/refactor/common/api/exception/handler/NotificationHandler.java deleted file mode 100644 index c551aada..00000000 --- a/src/main/java/com/example/spot/refactor/common/api/exception/handler/NotificationHandler.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.spot.refactor.common.api.exception.handler; - -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.GeneralException; - -public class NotificationHandler extends GeneralException { - - public NotificationHandler(ErrorStatus code) { - super(code); - } -} diff --git a/src/main/java/com/example/spot/refactor/common/api/exception/handler/PostHandler.java b/src/main/java/com/example/spot/refactor/common/api/exception/handler/PostHandler.java deleted file mode 100644 index 8a9c3104..00000000 --- a/src/main/java/com/example/spot/refactor/common/api/exception/handler/PostHandler.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.spot.refactor.common.api.exception.handler; - -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.GeneralException; - -public class PostHandler extends GeneralException { - - public PostHandler(ErrorStatus code) { - super(code); - } -} diff --git a/src/main/java/com/example/spot/refactor/common/api/exception/handler/S3Handler.java b/src/main/java/com/example/spot/refactor/common/api/exception/handler/S3Handler.java deleted file mode 100644 index cb3f0c4c..00000000 --- a/src/main/java/com/example/spot/refactor/common/api/exception/handler/S3Handler.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.spot.refactor.common.api.exception.handler; - -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.GeneralException; - -public class S3Handler extends GeneralException { - - public S3Handler(ErrorStatus code) { - super(code); - } -} \ No newline at end of file diff --git a/src/main/java/com/example/spot/refactor/common/api/exception/handler/StudyHandler.java b/src/main/java/com/example/spot/refactor/common/api/exception/handler/StudyHandler.java deleted file mode 100644 index d538fc67..00000000 --- a/src/main/java/com/example/spot/refactor/common/api/exception/handler/StudyHandler.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.spot.refactor.common.api.exception.handler; - -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.GeneralException; - -public class StudyHandler extends GeneralException { - - public StudyHandler(ErrorStatus status){ - super(status); - } - - -} diff --git a/src/main/java/com/example/spot/refactor/member/domain/enums/Carrier.java b/src/main/java/com/example/spot/refactor/member/domain/enums/Carrier.java deleted file mode 100644 index 40e7e782..00000000 --- a/src/main/java/com/example/spot/refactor/member/domain/enums/Carrier.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.spot.refactor.member.domain.enums; - -public enum Carrier { - KT, SKT, LG, NONE -} diff --git a/src/main/java/com/example/spot/refactor/member/domain/enums/Gender.java b/src/main/java/com/example/spot/refactor/member/domain/enums/Gender.java deleted file mode 100644 index d958b873..00000000 --- a/src/main/java/com/example/spot/refactor/member/domain/enums/Gender.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.example.spot.refactor.member.domain.enums; - -public enum Gender { - MALE, FEMALE, UNKNOWN - -} diff --git a/src/main/java/com/example/spot/refactor/member/domain/enums/Status.java b/src/main/java/com/example/spot/refactor/member/domain/enums/Status.java deleted file mode 100644 index 69358094..00000000 --- a/src/main/java/com/example/spot/refactor/member/domain/enums/Status.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.spot.refactor.member.domain.enums; - -public enum Status { - ON, OFF -} diff --git a/src/main/java/com/example/spot/refactor/study/domain/enums/StudyLikeStatus.java b/src/main/java/com/example/spot/refactor/study/domain/enums/StudyLikeStatus.java deleted file mode 100644 index f00944e9..00000000 --- a/src/main/java/com/example/spot/refactor/study/domain/enums/StudyLikeStatus.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.example.spot.refactor.study.domain.enums; - -public enum StudyLikeStatus { - LIKE, DISLIKE -} diff --git a/src/main/java/com/example/spot/refactor/vote/domain/validation/annotation/ExistVote.java b/src/main/java/com/example/spot/refactor/vote/domain/validation/annotation/ExistVote.java deleted file mode 100644 index 27100b96..00000000 --- a/src/main/java/com/example/spot/refactor/vote/domain/validation/annotation/ExistVote.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.spot.refactor.vote.domain.validation.annotation; - -public @interface ExistVote { -} diff --git a/src/main/java/com/example/spot/legacy/domain/MemberReport.java b/src/main/java/com/example/spot/report/domain/MemberReport.java similarity index 82% rename from src/main/java/com/example/spot/legacy/domain/MemberReport.java rename to src/main/java/com/example/spot/report/domain/MemberReport.java index 87ff4a78..b938f755 100644 --- a/src/main/java/com/example/spot/legacy/domain/MemberReport.java +++ b/src/main/java/com/example/spot/report/domain/MemberReport.java @@ -1,8 +1,8 @@ -package com.example.spot.legacy.domain; +package com.example.spot.report.domain; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.legacy.domain.enums.ReportStatus; -import com.example.spot.refactor.member.domain.Member; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.report.domain.enums.ReportStatus; +import com.example.spot.member.domain.Member; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/spot/legacy/repository/MemberReportRepository.java b/src/main/java/com/example/spot/report/domain/MemberReportRepository.java similarity index 68% rename from src/main/java/com/example/spot/legacy/repository/MemberReportRepository.java rename to src/main/java/com/example/spot/report/domain/MemberReportRepository.java index 355a6717..0c488924 100644 --- a/src/main/java/com/example/spot/legacy/repository/MemberReportRepository.java +++ b/src/main/java/com/example/spot/report/domain/MemberReportRepository.java @@ -1,6 +1,5 @@ -package com.example.spot.legacy.repository; +package com.example.spot.report.domain; -import com.example.spot.legacy.domain.MemberReport; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/legacy/domain/PostReport.java b/src/main/java/com/example/spot/report/domain/PostReport.java similarity index 75% rename from src/main/java/com/example/spot/legacy/domain/PostReport.java rename to src/main/java/com/example/spot/report/domain/PostReport.java index 54f5c440..3b31172f 100644 --- a/src/main/java/com/example/spot/legacy/domain/PostReport.java +++ b/src/main/java/com/example/spot/report/domain/PostReport.java @@ -1,8 +1,9 @@ -package com.example.spot.legacy.domain; +package com.example.spot.report.domain; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.legacy.domain.enums.PostStatus; -import com.example.spot.refactor.member.domain.Member; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.post.domain.enums.PostStatus; +import com.example.spot.member.domain.Member; +import com.example.spot.post.domain.Post; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/src/main/java/com/example/spot/legacy/repository/PostReportRepository.java b/src/main/java/com/example/spot/report/domain/PostReportRepository.java similarity index 70% rename from src/main/java/com/example/spot/legacy/repository/PostReportRepository.java rename to src/main/java/com/example/spot/report/domain/PostReportRepository.java index 6ba25ebe..522e0424 100644 --- a/src/main/java/com/example/spot/legacy/repository/PostReportRepository.java +++ b/src/main/java/com/example/spot/report/domain/PostReportRepository.java @@ -1,7 +1,6 @@ -package com.example.spot.legacy.repository; +package com.example.spot.report.domain; -import com.example.spot.legacy.domain.PostReport; -import com.example.spot.legacy.domain.enums.PostStatus; +import com.example.spot.post.domain.enums.PostStatus; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/legacy/domain/enums/ReportStatus.java b/src/main/java/com/example/spot/report/domain/enums/ReportStatus.java similarity index 55% rename from src/main/java/com/example/spot/legacy/domain/enums/ReportStatus.java rename to src/main/java/com/example/spot/report/domain/enums/ReportStatus.java index f3eefa71..70b39e26 100644 --- a/src/main/java/com/example/spot/legacy/domain/enums/ReportStatus.java +++ b/src/main/java/com/example/spot/report/domain/enums/ReportStatus.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.domain.enums; +package com.example.spot.report.domain.enums; public enum ReportStatus { IN_PROGRESS, COMPLETED diff --git a/src/main/java/com/example/spot/legacy/web/dto/post/PostReportResponse.java b/src/main/java/com/example/spot/report/presentation/dto/PostReportResponse.java similarity index 92% rename from src/main/java/com/example/spot/legacy/web/dto/post/PostReportResponse.java rename to src/main/java/com/example/spot/report/presentation/dto/PostReportResponse.java index 6a96465d..9eea899b 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/post/PostReportResponse.java +++ b/src/main/java/com/example/spot/report/presentation/dto/PostReportResponse.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.web.dto.post; +package com.example.spot.report.presentation.dto; import java.time.LocalDateTime; diff --git a/src/main/java/com/example/spot/refactor/schedule/domain/Schedule.java b/src/main/java/com/example/spot/schedule/domain/Schedule.java similarity index 85% rename from src/main/java/com/example/spot/refactor/schedule/domain/Schedule.java rename to src/main/java/com/example/spot/schedule/domain/Schedule.java index 6db1fd78..cb2fc039 100644 --- a/src/main/java/com/example/spot/refactor/schedule/domain/Schedule.java +++ b/src/main/java/com/example/spot/schedule/domain/Schedule.java @@ -1,10 +1,10 @@ -package com.example.spot.refactor.schedule.domain; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.schedule.domain.aggregate.Quiz; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.schedule.domain.enums.SchedulePeriod; -import com.example.spot.refactor.study.presentation.dto.request.ScheduleRequestDTO; +package com.example.spot.schedule.domain; +import com.example.spot.member.domain.Member; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.schedule.domain.aggregate.Quiz; +import com.example.spot.study.domain.Study; +import com.example.spot.schedule.domain.enums.SchedulePeriod; +import com.example.spot.study.presentation.dto.request.ScheduleRequestDTO; import jakarta.persistence.*; import java.time.LocalDateTime; diff --git a/src/main/java/com/example/spot/refactor/schedule/domain/ScheduleRepository.java b/src/main/java/com/example/spot/schedule/domain/ScheduleRepository.java similarity index 91% rename from src/main/java/com/example/spot/refactor/schedule/domain/ScheduleRepository.java rename to src/main/java/com/example/spot/schedule/domain/ScheduleRepository.java index a82cb6df..03e2ae63 100644 --- a/src/main/java/com/example/spot/refactor/schedule/domain/ScheduleRepository.java +++ b/src/main/java/com/example/spot/schedule/domain/ScheduleRepository.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.schedule.domain; +package com.example.spot.schedule.domain; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/example/spot/refactor/schedule/domain/aggregate/Quiz.java b/src/main/java/com/example/spot/schedule/domain/aggregate/Quiz.java similarity index 92% rename from src/main/java/com/example/spot/refactor/schedule/domain/aggregate/Quiz.java rename to src/main/java/com/example/spot/schedule/domain/aggregate/Quiz.java index 82c224a4..11906e88 100644 --- a/src/main/java/com/example/spot/refactor/schedule/domain/aggregate/Quiz.java +++ b/src/main/java/com/example/spot/schedule/domain/aggregate/Quiz.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.schedule.domain.aggregate; +package com.example.spot.schedule.domain.aggregate; -import com.example.spot.refactor.member.domain.Member; +import com.example.spot.member.domain.Member; -import com.example.spot.refactor.schedule.domain.Schedule; +import com.example.spot.schedule.domain.Schedule; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/spot/refactor/schedule/domain/aggregate/QuizSubmission.java b/src/main/java/com/example/spot/schedule/domain/aggregate/QuizSubmission.java similarity index 83% rename from src/main/java/com/example/spot/refactor/schedule/domain/aggregate/QuizSubmission.java rename to src/main/java/com/example/spot/schedule/domain/aggregate/QuizSubmission.java index 003209d2..86c3b5ec 100644 --- a/src/main/java/com/example/spot/refactor/schedule/domain/aggregate/QuizSubmission.java +++ b/src/main/java/com/example/spot/schedule/domain/aggregate/QuizSubmission.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.schedule.domain.aggregate; +package com.example.spot.schedule.domain.aggregate; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.common.entity.BaseEntity; +import com.example.spot.member.domain.Member; +import com.example.spot.common.entity.BaseEntity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/example/spot/refactor/schedule/domain/enums/SchedulePeriod.java b/src/main/java/com/example/spot/schedule/domain/enums/SchedulePeriod.java similarity index 56% rename from src/main/java/com/example/spot/refactor/schedule/domain/enums/SchedulePeriod.java rename to src/main/java/com/example/spot/schedule/domain/enums/SchedulePeriod.java index 850772e3..d527e8d3 100644 --- a/src/main/java/com/example/spot/refactor/schedule/domain/enums/SchedulePeriod.java +++ b/src/main/java/com/example/spot/schedule/domain/enums/SchedulePeriod.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.schedule.domain.enums; +package com.example.spot.schedule.domain.enums; public enum SchedulePeriod { NONE, DAILY, WEEKLY, BIWEEKLY, MONTHLY diff --git a/src/main/java/com/example/spot/refactor/schedule/domain/repository/QuizRepository.java b/src/main/java/com/example/spot/schedule/domain/repository/QuizRepository.java similarity index 74% rename from src/main/java/com/example/spot/refactor/schedule/domain/repository/QuizRepository.java rename to src/main/java/com/example/spot/schedule/domain/repository/QuizRepository.java index b2d21e54..d1af47de 100644 --- a/src/main/java/com/example/spot/refactor/schedule/domain/repository/QuizRepository.java +++ b/src/main/java/com/example/spot/schedule/domain/repository/QuizRepository.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.schedule.domain.repository; +package com.example.spot.schedule.domain.repository; -import com.example.spot.refactor.schedule.domain.aggregate.Quiz; +import com.example.spot.schedule.domain.aggregate.Quiz; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/refactor/schedule/domain/repository/QuizSubmissionRepository.java b/src/main/java/com/example/spot/schedule/domain/repository/QuizSubmissionRepository.java similarity index 72% rename from src/main/java/com/example/spot/refactor/schedule/domain/repository/QuizSubmissionRepository.java rename to src/main/java/com/example/spot/schedule/domain/repository/QuizSubmissionRepository.java index 9e9ffee5..775e8cad 100644 --- a/src/main/java/com/example/spot/refactor/schedule/domain/repository/QuizSubmissionRepository.java +++ b/src/main/java/com/example/spot/schedule/domain/repository/QuizSubmissionRepository.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.schedule.domain.repository; +package com.example.spot.schedule.domain.repository; -import com.example.spot.refactor.schedule.domain.aggregate.QuizSubmission; +import com.example.spot.schedule.domain.aggregate.QuizSubmission; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/refactor/schedule/domain/validation/annotation/ExistQuiz.java b/src/main/java/com/example/spot/schedule/domain/validation/annotation/ExistQuiz.java similarity index 74% rename from src/main/java/com/example/spot/refactor/schedule/domain/validation/annotation/ExistQuiz.java rename to src/main/java/com/example/spot/schedule/domain/validation/annotation/ExistQuiz.java index e048e31a..a08133f8 100644 --- a/src/main/java/com/example/spot/refactor/schedule/domain/validation/annotation/ExistQuiz.java +++ b/src/main/java/com/example/spot/schedule/domain/validation/annotation/ExistQuiz.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.schedule.domain.validation.annotation; +package com.example.spot.schedule.domain.validation.annotation; -import com.example.spot.refactor.schedule.domain.validation.validator.ExistQuizValidator; +import com.example.spot.schedule.domain.validation.validator.ExistQuizValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/com/example/spot/refactor/schedule/domain/validation/annotation/ExistSchedule.java b/src/main/java/com/example/spot/schedule/domain/validation/annotation/ExistSchedule.java similarity index 74% rename from src/main/java/com/example/spot/refactor/schedule/domain/validation/annotation/ExistSchedule.java rename to src/main/java/com/example/spot/schedule/domain/validation/annotation/ExistSchedule.java index 12b84f1c..8142a227 100644 --- a/src/main/java/com/example/spot/refactor/schedule/domain/validation/annotation/ExistSchedule.java +++ b/src/main/java/com/example/spot/schedule/domain/validation/annotation/ExistSchedule.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.schedule.domain.validation.annotation; +package com.example.spot.schedule.domain.validation.annotation; -import com.example.spot.refactor.schedule.domain.validation.validator.ExistScheduleValidator; +import com.example.spot.schedule.domain.validation.validator.ExistScheduleValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/com/example/spot/refactor/schedule/domain/validation/validator/ExistQuizValidator.java b/src/main/java/com/example/spot/schedule/domain/validation/validator/ExistQuizValidator.java similarity index 79% rename from src/main/java/com/example/spot/refactor/schedule/domain/validation/validator/ExistQuizValidator.java rename to src/main/java/com/example/spot/schedule/domain/validation/validator/ExistQuizValidator.java index 37efd3eb..de98aa91 100644 --- a/src/main/java/com/example/spot/refactor/schedule/domain/validation/validator/ExistQuizValidator.java +++ b/src/main/java/com/example/spot/schedule/domain/validation/validator/ExistQuizValidator.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.schedule.domain.validation.validator; +package com.example.spot.schedule.domain.validation.validator; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.schedule.domain.repository.QuizRepository; -import com.example.spot.refactor.schedule.domain.validation.annotation.ExistQuiz; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.schedule.domain.repository.QuizRepository; +import com.example.spot.schedule.domain.validation.annotation.ExistQuiz; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/schedule/domain/validation/validator/ExistScheduleValidator.java b/src/main/java/com/example/spot/schedule/domain/validation/validator/ExistScheduleValidator.java similarity index 79% rename from src/main/java/com/example/spot/refactor/schedule/domain/validation/validator/ExistScheduleValidator.java rename to src/main/java/com/example/spot/schedule/domain/validation/validator/ExistScheduleValidator.java index c5536447..c5e398df 100644 --- a/src/main/java/com/example/spot/refactor/schedule/domain/validation/validator/ExistScheduleValidator.java +++ b/src/main/java/com/example/spot/schedule/domain/validation/validator/ExistScheduleValidator.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.schedule.domain.validation.validator; +package com.example.spot.schedule.domain.validation.validator; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.schedule.domain.ScheduleRepository; -import com.example.spot.refactor.schedule.domain.validation.annotation.ExistSchedule; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.schedule.domain.ScheduleRepository; +import com.example.spot.schedule.domain.validation.annotation.ExistSchedule; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/story/domain/Story.java b/src/main/java/com/example/spot/story/domain/Story.java similarity index 85% rename from src/main/java/com/example/spot/refactor/story/domain/Story.java rename to src/main/java/com/example/spot/story/domain/Story.java index 22d7f482..7301946a 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/Story.java +++ b/src/main/java/com/example/spot/story/domain/Story.java @@ -1,14 +1,14 @@ -package com.example.spot.refactor.story.domain; - -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.story.domain.aggregate.LikedStory; -import com.example.spot.refactor.story.domain.aggregate.StoryComment; -import com.example.spot.refactor.story.domain.aggregate.StoryImage; -import com.example.spot.refactor.story.domain.aggregate.StoryReport; -import com.example.spot.refactor.story.domain.enums.StoryCategory; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.study.presentation.dto.request.StudyPostRequestDTO; +package com.example.spot.story.domain; + +import com.example.spot.member.domain.Member; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.story.domain.aggregate.LikedStory; +import com.example.spot.story.domain.aggregate.StoryComment; +import com.example.spot.story.domain.aggregate.StoryImage; +import com.example.spot.story.domain.aggregate.StoryReport; +import com.example.spot.story.domain.enums.StoryCategory; +import com.example.spot.study.domain.Study; +import com.example.spot.study.presentation.dto.request.StudyPostRequestDTO; import jakarta.persistence.*; import java.time.LocalDateTime; diff --git a/src/main/java/com/example/spot/refactor/story/domain/StoryRepository.java b/src/main/java/com/example/spot/story/domain/StoryRepository.java similarity index 85% rename from src/main/java/com/example/spot/refactor/story/domain/StoryRepository.java rename to src/main/java/com/example/spot/story/domain/StoryRepository.java index 9199ef8f..0616b72c 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/StoryRepository.java +++ b/src/main/java/com/example/spot/story/domain/StoryRepository.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.story.domain; +package com.example.spot.story.domain; -import com.example.spot.refactor.story.domain.enums.StoryCategory; +import com.example.spot.story.domain.enums.StoryCategory; import java.util.Optional; diff --git a/src/main/java/com/example/spot/refactor/story/domain/StoryRepositoryCustom.java b/src/main/java/com/example/spot/story/domain/StoryRepositoryCustom.java similarity index 82% rename from src/main/java/com/example/spot/refactor/story/domain/StoryRepositoryCustom.java rename to src/main/java/com/example/spot/story/domain/StoryRepositoryCustom.java index 7ebd53cd..8128e302 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/StoryRepositoryCustom.java +++ b/src/main/java/com/example/spot/story/domain/StoryRepositoryCustom.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.story.domain; +package com.example.spot.story.domain; -import com.example.spot.refactor.story.domain.enums.StoryCategory; +import com.example.spot.story.domain.enums.StoryCategory; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/example/spot/refactor/story/domain/StoryRepositoryCustomImpl.java b/src/main/java/com/example/spot/story/domain/StoryRepositoryCustomImpl.java similarity index 91% rename from src/main/java/com/example/spot/refactor/story/domain/StoryRepositoryCustomImpl.java rename to src/main/java/com/example/spot/story/domain/StoryRepositoryCustomImpl.java index 416b768e..e709e488 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/StoryRepositoryCustomImpl.java +++ b/src/main/java/com/example/spot/story/domain/StoryRepositoryCustomImpl.java @@ -1,7 +1,6 @@ -package com.example.spot.refactor.story.domain; +package com.example.spot.story.domain; -import com.example.spot.refactor.story.domain.QStory; -import com.example.spot.refactor.story.domain.enums.StoryCategory; +import com.example.spot.story.domain.enums.StoryCategory; import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/story/domain/aggregate/LikedStory.java b/src/main/java/com/example/spot/story/domain/aggregate/LikedStory.java similarity index 80% rename from src/main/java/com/example/spot/refactor/story/domain/aggregate/LikedStory.java rename to src/main/java/com/example/spot/story/domain/aggregate/LikedStory.java index 504149af..0737fdf9 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/aggregate/LikedStory.java +++ b/src/main/java/com/example/spot/story/domain/aggregate/LikedStory.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.story.domain.aggregate; +package com.example.spot.story.domain.aggregate; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.story.domain.Story; +import com.example.spot.member.domain.Member; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.story.domain.Story; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/example/spot/refactor/story/domain/aggregate/LikedStoryComment.java b/src/main/java/com/example/spot/story/domain/aggregate/LikedStoryComment.java similarity index 82% rename from src/main/java/com/example/spot/refactor/story/domain/aggregate/LikedStoryComment.java rename to src/main/java/com/example/spot/story/domain/aggregate/LikedStoryComment.java index ab0c8352..da2ebcd3 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/aggregate/LikedStoryComment.java +++ b/src/main/java/com/example/spot/story/domain/aggregate/LikedStoryComment.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.story.domain.aggregate; +package com.example.spot.story.domain.aggregate; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.common.entity.BaseEntity; +import com.example.spot.member.domain.Member; +import com.example.spot.common.entity.BaseEntity; import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/example/spot/refactor/story/domain/aggregate/StoryComment.java b/src/main/java/com/example/spot/story/domain/aggregate/StoryComment.java similarity index 91% rename from src/main/java/com/example/spot/refactor/story/domain/aggregate/StoryComment.java rename to src/main/java/com/example/spot/story/domain/aggregate/StoryComment.java index 393d3a25..c8088eaf 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/aggregate/StoryComment.java +++ b/src/main/java/com/example/spot/story/domain/aggregate/StoryComment.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.story.domain.aggregate; +package com.example.spot.story.domain.aggregate; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.story.domain.Story; +import com.example.spot.member.domain.Member; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.story.domain.Story; import jakarta.persistence.*; import java.util.ArrayList; diff --git a/src/main/java/com/example/spot/refactor/story/domain/aggregate/StoryImage.java b/src/main/java/com/example/spot/story/domain/aggregate/StoryImage.java similarity index 83% rename from src/main/java/com/example/spot/refactor/story/domain/aggregate/StoryImage.java rename to src/main/java/com/example/spot/story/domain/aggregate/StoryImage.java index 93f074a1..862c9bef 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/aggregate/StoryImage.java +++ b/src/main/java/com/example/spot/story/domain/aggregate/StoryImage.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.story.domain.aggregate; +package com.example.spot.story.domain.aggregate; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.story.domain.Story; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.story.domain.Story; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/src/main/java/com/example/spot/refactor/story/domain/aggregate/StoryReport.java b/src/main/java/com/example/spot/story/domain/aggregate/StoryReport.java similarity index 87% rename from src/main/java/com/example/spot/refactor/story/domain/aggregate/StoryReport.java rename to src/main/java/com/example/spot/story/domain/aggregate/StoryReport.java index 902d0661..ffdbc912 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/aggregate/StoryReport.java +++ b/src/main/java/com/example/spot/story/domain/aggregate/StoryReport.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.story.domain.aggregate; +package com.example.spot.story.domain.aggregate; -import com.example.spot.refactor.story.domain.Story; +import com.example.spot.story.domain.Story; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/com/example/spot/refactor/story/domain/enums/StoryCategory.java b/src/main/java/com/example/spot/story/domain/enums/StoryCategory.java similarity index 61% rename from src/main/java/com/example/spot/refactor/story/domain/enums/StoryCategory.java rename to src/main/java/com/example/spot/story/domain/enums/StoryCategory.java index bbe9f9a8..7572d7e9 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/enums/StoryCategory.java +++ b/src/main/java/com/example/spot/story/domain/enums/StoryCategory.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.story.domain.enums; +package com.example.spot.story.domain.enums; public enum StoryCategory { WELCOME, INFO_SHARING, STUDY_REVIEW, FREE_TALK, QNA diff --git a/src/main/java/com/example/spot/refactor/story/domain/enums/StoryCategoryQuery.java b/src/main/java/com/example/spot/story/domain/enums/StoryCategoryQuery.java similarity index 73% rename from src/main/java/com/example/spot/refactor/story/domain/enums/StoryCategoryQuery.java rename to src/main/java/com/example/spot/story/domain/enums/StoryCategoryQuery.java index 14652db2..b2aabb5a 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/enums/StoryCategoryQuery.java +++ b/src/main/java/com/example/spot/story/domain/enums/StoryCategoryQuery.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.story.domain.enums; +package com.example.spot.story.domain.enums; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.handler.StudyHandler; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.handler.StudyHandler; public enum StoryCategoryQuery { diff --git a/src/main/java/com/example/spot/refactor/story/domain/repository/LikedStoryCommentRepository.java b/src/main/java/com/example/spot/story/domain/repository/LikedStoryCommentRepository.java similarity index 77% rename from src/main/java/com/example/spot/refactor/story/domain/repository/LikedStoryCommentRepository.java rename to src/main/java/com/example/spot/story/domain/repository/LikedStoryCommentRepository.java index 16d58e12..8e90f078 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/repository/LikedStoryCommentRepository.java +++ b/src/main/java/com/example/spot/story/domain/repository/LikedStoryCommentRepository.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.story.domain.repository; +package com.example.spot.story.domain.repository; -import com.example.spot.refactor.story.domain.aggregate.LikedStoryComment; +import com.example.spot.story.domain.aggregate.LikedStoryComment; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/refactor/story/domain/repository/LikedStoryRepository.java b/src/main/java/com/example/spot/story/domain/repository/LikedStoryRepository.java similarity index 77% rename from src/main/java/com/example/spot/refactor/story/domain/repository/LikedStoryRepository.java rename to src/main/java/com/example/spot/story/domain/repository/LikedStoryRepository.java index b1eb5aee..255948db 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/repository/LikedStoryRepository.java +++ b/src/main/java/com/example/spot/story/domain/repository/LikedStoryRepository.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.story.domain.repository; +package com.example.spot.story.domain.repository; -import com.example.spot.refactor.story.domain.aggregate.LikedStory; +import com.example.spot.story.domain.aggregate.LikedStory; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/refactor/story/domain/repository/StoryCommentRepository.java b/src/main/java/com/example/spot/story/domain/repository/StoryCommentRepository.java similarity index 76% rename from src/main/java/com/example/spot/refactor/story/domain/repository/StoryCommentRepository.java rename to src/main/java/com/example/spot/story/domain/repository/StoryCommentRepository.java index 3f699ff8..1ab6dfac 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/repository/StoryCommentRepository.java +++ b/src/main/java/com/example/spot/story/domain/repository/StoryCommentRepository.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.story.domain.repository; +package com.example.spot.story.domain.repository; -import com.example.spot.refactor.story.domain.aggregate.StoryComment; +import com.example.spot.story.domain.aggregate.StoryComment; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/refactor/story/domain/repository/StoryImageRepository.java b/src/main/java/com/example/spot/story/domain/repository/StoryImageRepository.java similarity index 82% rename from src/main/java/com/example/spot/refactor/story/domain/repository/StoryImageRepository.java rename to src/main/java/com/example/spot/story/domain/repository/StoryImageRepository.java index 2b0df99f..987d5d4c 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/repository/StoryImageRepository.java +++ b/src/main/java/com/example/spot/story/domain/repository/StoryImageRepository.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.story.domain.repository; +package com.example.spot.story.domain.repository; -import com.example.spot.refactor.story.domain.aggregate.StoryImage; +import com.example.spot.story.domain.aggregate.StoryImage; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/example/spot/refactor/story/domain/repository/StoryReportRepository.java b/src/main/java/com/example/spot/story/domain/repository/StoryReportRepository.java similarity index 66% rename from src/main/java/com/example/spot/refactor/story/domain/repository/StoryReportRepository.java rename to src/main/java/com/example/spot/story/domain/repository/StoryReportRepository.java index f7f55ef4..12c5dad0 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/repository/StoryReportRepository.java +++ b/src/main/java/com/example/spot/story/domain/repository/StoryReportRepository.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.story.domain.repository; +package com.example.spot.story.domain.repository; -import com.example.spot.refactor.story.domain.aggregate.StoryReport; +import com.example.spot.story.domain.aggregate.StoryReport; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/refactor/story/domain/validation/annotation/ExistLikedStoryComment.java b/src/main/java/com/example/spot/story/domain/validation/annotation/ExistLikedStoryComment.java similarity index 75% rename from src/main/java/com/example/spot/refactor/story/domain/validation/annotation/ExistLikedStoryComment.java rename to src/main/java/com/example/spot/story/domain/validation/annotation/ExistLikedStoryComment.java index 80c4acb3..2bafb63f 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/validation/annotation/ExistLikedStoryComment.java +++ b/src/main/java/com/example/spot/story/domain/validation/annotation/ExistLikedStoryComment.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.story.domain.validation.annotation; +package com.example.spot.story.domain.validation.annotation; -import com.example.spot.refactor.story.domain.validation.validator.ExistLikedStoryCommentValidator; +import com.example.spot.story.domain.validation.validator.ExistLikedStoryCommentValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/com/example/spot/refactor/story/domain/validation/annotation/ExistStory.java b/src/main/java/com/example/spot/story/domain/validation/annotation/ExistStory.java similarity index 75% rename from src/main/java/com/example/spot/refactor/story/domain/validation/annotation/ExistStory.java rename to src/main/java/com/example/spot/story/domain/validation/annotation/ExistStory.java index 48e226ba..ac531b9d 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/validation/annotation/ExistStory.java +++ b/src/main/java/com/example/spot/story/domain/validation/annotation/ExistStory.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.story.domain.validation.annotation; +package com.example.spot.story.domain.validation.annotation; -import com.example.spot.refactor.story.domain.validation.validator.ExistStoryValidator; +import com.example.spot.story.domain.validation.validator.ExistStoryValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/com/example/spot/refactor/story/domain/validation/annotation/ExistStoryComment.java b/src/main/java/com/example/spot/story/domain/validation/annotation/ExistStoryComment.java similarity index 75% rename from src/main/java/com/example/spot/refactor/story/domain/validation/annotation/ExistStoryComment.java rename to src/main/java/com/example/spot/story/domain/validation/annotation/ExistStoryComment.java index d790661d..3412a0c9 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/validation/annotation/ExistStoryComment.java +++ b/src/main/java/com/example/spot/story/domain/validation/annotation/ExistStoryComment.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.story.domain.validation.annotation; +package com.example.spot.story.domain.validation.annotation; -import com.example.spot.refactor.story.domain.validation.validator.ExistStoryCommentValidator; +import com.example.spot.story.domain.validation.validator.ExistStoryCommentValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/src/main/java/com/example/spot/refactor/story/domain/validation/validator/ExistLikedStoryCommentValidator.java b/src/main/java/com/example/spot/story/domain/validation/validator/ExistLikedStoryCommentValidator.java similarity index 80% rename from src/main/java/com/example/spot/refactor/story/domain/validation/validator/ExistLikedStoryCommentValidator.java rename to src/main/java/com/example/spot/story/domain/validation/validator/ExistLikedStoryCommentValidator.java index 7e466e5f..52b7120a 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/validation/validator/ExistLikedStoryCommentValidator.java +++ b/src/main/java/com/example/spot/story/domain/validation/validator/ExistLikedStoryCommentValidator.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.story.domain.validation.validator; +package com.example.spot.story.domain.validation.validator; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.story.domain.repository.LikedStoryCommentRepository; -import com.example.spot.refactor.story.domain.validation.annotation.ExistLikedStoryComment; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.story.domain.repository.LikedStoryCommentRepository; +import com.example.spot.story.domain.validation.annotation.ExistLikedStoryComment; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/story/domain/validation/validator/ExistStoryCommentValidator.java b/src/main/java/com/example/spot/story/domain/validation/validator/ExistStoryCommentValidator.java similarity index 80% rename from src/main/java/com/example/spot/refactor/story/domain/validation/validator/ExistStoryCommentValidator.java rename to src/main/java/com/example/spot/story/domain/validation/validator/ExistStoryCommentValidator.java index 33f049fe..dd91344a 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/validation/validator/ExistStoryCommentValidator.java +++ b/src/main/java/com/example/spot/story/domain/validation/validator/ExistStoryCommentValidator.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.story.domain.validation.validator; +package com.example.spot.story.domain.validation.validator; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.story.domain.repository.StoryCommentRepository; -import com.example.spot.refactor.story.domain.validation.annotation.ExistStoryComment; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.story.domain.repository.StoryCommentRepository; +import com.example.spot.story.domain.validation.annotation.ExistStoryComment; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/story/domain/validation/validator/ExistStoryValidator.java b/src/main/java/com/example/spot/story/domain/validation/validator/ExistStoryValidator.java similarity index 81% rename from src/main/java/com/example/spot/refactor/story/domain/validation/validator/ExistStoryValidator.java rename to src/main/java/com/example/spot/story/domain/validation/validator/ExistStoryValidator.java index 80d30c5a..76203e83 100644 --- a/src/main/java/com/example/spot/refactor/story/domain/validation/validator/ExistStoryValidator.java +++ b/src/main/java/com/example/spot/story/domain/validation/validator/ExistStoryValidator.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.story.domain.validation.validator; +package com.example.spot.story.domain.validation.validator; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.story.domain.StoryRepository; -import com.example.spot.refactor.story.domain.validation.annotation.ExistStory; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.story.domain.StoryRepository; +import com.example.spot.story.domain.validation.annotation.ExistStory; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/study/application/MemberStudyCommandService.java b/src/main/java/com/example/spot/study/application/MemberStudyCommandService.java similarity index 65% rename from src/main/java/com/example/spot/refactor/study/application/MemberStudyCommandService.java rename to src/main/java/com/example/spot/study/application/MemberStudyCommandService.java index 56777182..e7c5d9e1 100644 --- a/src/main/java/com/example/spot/refactor/study/application/MemberStudyCommandService.java +++ b/src/main/java/com/example/spot/study/application/MemberStudyCommandService.java @@ -1,21 +1,21 @@ -package com.example.spot.refactor.study.application; - -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO; -import com.example.spot.refactor.study.presentation.dto.request.ScheduleRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyHostWithdrawRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyMemberReportDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyQuizRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyVoteRequestDTO; -import com.example.spot.refactor.study.presentation.dto.response.ScheduleResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostResDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyQuizResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyTerminationResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyVoteResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyWithdrawalResponseDTO; -import com.example.spot.refactor.study.presentation.dto.request.ToDoListRequestDTO; -import com.example.spot.refactor.study.presentation.dto.response.ToDoListResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.ToDoListResponseDTO.ToDoListCreateResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyApplyResponseDTO; +package com.example.spot.study.application; + +import com.example.spot.member.presentation.dto.MemberResponseDTO; +import com.example.spot.study.presentation.dto.request.ScheduleRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyHostWithdrawRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyMemberReportDTO; +import com.example.spot.study.presentation.dto.request.StudyQuizRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyVoteRequestDTO; +import com.example.spot.study.presentation.dto.response.ScheduleResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyPostResDTO; +import com.example.spot.study.presentation.dto.response.StudyQuizResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyTerminationResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyVoteResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyWithdrawalResponseDTO; +import com.example.spot.study.presentation.dto.request.ToDoListRequestDTO; +import com.example.spot.study.presentation.dto.response.ToDoListResponseDTO; +import com.example.spot.study.presentation.dto.response.ToDoListResponseDTO.ToDoListCreateResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyApplyResponseDTO; import jakarta.validation.Valid; import java.time.LocalDate; diff --git a/src/main/java/com/example/spot/refactor/study/application/MemberStudyCommandServiceImpl.java b/src/main/java/com/example/spot/study/application/MemberStudyCommandServiceImpl.java similarity index 92% rename from src/main/java/com/example/spot/refactor/study/application/MemberStudyCommandServiceImpl.java rename to src/main/java/com/example/spot/study/application/MemberStudyCommandServiceImpl.java index a6f1c5af..a62438dc 100644 --- a/src/main/java/com/example/spot/refactor/study/application/MemberStudyCommandServiceImpl.java +++ b/src/main/java/com/example/spot/study/application/MemberStudyCommandServiceImpl.java @@ -1,63 +1,63 @@ -package com.example.spot.refactor.study.application; - -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.GeneralException; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; -import com.example.spot.refactor.common.api.exception.handler.StudyHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.legacy.domain.MemberReport; -import com.example.spot.legacy.domain.Notification; -import com.example.spot.refactor.schedule.domain.*; -import com.example.spot.refactor.schedule.domain.aggregate.Quiz; -import com.example.spot.refactor.schedule.domain.aggregate.QuizSubmission; -import com.example.spot.refactor.schedule.domain.repository.QuizRepository; -import com.example.spot.refactor.schedule.domain.repository.QuizSubmissionRepository; -import com.example.spot.refactor.schedule.domain.ScheduleRepository; -import com.example.spot.refactor.story.domain.Story; -import com.example.spot.refactor.story.domain.aggregate.StoryReport; -import com.example.spot.refactor.todo.domain.ToDo; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.legacy.domain.enums.NotifyType; -import com.example.spot.refactor.member.domain.enums.Status; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.vote.domain.*; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.legacy.repository.MemberReportRepository; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.legacy.repository.NotificationRepository; -import com.example.spot.refactor.story.domain.repository.StoryReportRepository; -import com.example.spot.refactor.story.domain.StoryRepository; -import com.example.spot.refactor.study.domain.StudyRepository; -import com.example.spot.refactor.todo.domain.ToDoRepository; -import com.example.spot.refactor.study.presentation.dto.request.ScheduleRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyHostWithdrawRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyMemberReportDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyQuizRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyVoteRequestDTO; -import com.example.spot.refactor.study.presentation.dto.response.ScheduleResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostResDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyQuizResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyTerminationResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyVoteResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyWithdrawalResponseDTO; -import com.example.spot.refactor.common.security.utils.SecurityUtils; -import com.example.spot.legacy.service.s3.S3ImageService; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO; -import com.example.spot.refactor.study.presentation.dto.request.ToDoListRequestDTO.ToDoListCreateDTO; -import com.example.spot.refactor.study.presentation.dto.response.ToDoListResponseDTO.ToDoListCreateResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.ToDoListResponseDTO.ToDoListUpdateResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyWithdrawalResponseDTO.WithdrawalDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyApplyResponseDTO; +package com.example.spot.study.application; + +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.GeneralException; +import com.example.spot.common.api.exception.handler.MemberHandler; +import com.example.spot.common.api.exception.handler.StudyHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.report.domain.MemberReport; +import com.example.spot.notification.domain.Notification; +import com.example.spot.schedule.domain.Schedule; +import com.example.spot.schedule.domain.aggregate.Quiz; +import com.example.spot.schedule.domain.aggregate.QuizSubmission; +import com.example.spot.schedule.domain.repository.QuizRepository; +import com.example.spot.schedule.domain.repository.QuizSubmissionRepository; +import com.example.spot.schedule.domain.ScheduleRepository; +import com.example.spot.story.domain.Story; +import com.example.spot.story.domain.aggregate.StoryReport; +import com.example.spot.todo.domain.ToDo; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.notification.domain.enums.NotifyType; +import com.example.spot.member.domain.enums.Status; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.Study; +import com.example.spot.report.domain.MemberReportRepository; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.notification.domain.NotificationRepository; +import com.example.spot.story.domain.repository.StoryReportRepository; +import com.example.spot.story.domain.StoryRepository; +import com.example.spot.study.domain.StudyRepository; +import com.example.spot.todo.domain.ToDoRepository; +import com.example.spot.study.presentation.dto.request.ScheduleRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyHostWithdrawRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyMemberReportDTO; +import com.example.spot.study.presentation.dto.request.StudyQuizRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyVoteRequestDTO; +import com.example.spot.study.presentation.dto.response.ScheduleResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyPostResDTO; +import com.example.spot.study.presentation.dto.response.StudyQuizResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyTerminationResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyVoteResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyWithdrawalResponseDTO; +import com.example.spot.common.security.utils.SecurityUtils; +import com.example.spot.common.application.s3.S3ImageService; +import com.example.spot.member.presentation.dto.MemberResponseDTO; +import com.example.spot.study.presentation.dto.request.ToDoListRequestDTO.ToDoListCreateDTO; +import com.example.spot.study.presentation.dto.response.ToDoListResponseDTO.ToDoListCreateResponseDTO; +import com.example.spot.study.presentation.dto.response.ToDoListResponseDTO.ToDoListUpdateResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyWithdrawalResponseDTO.WithdrawalDTO; +import com.example.spot.study.presentation.dto.response.StudyApplyResponseDTO; import java.time.LocalDate; import java.util.Objects; -import com.example.spot.refactor.vote.domain.aggregate.VoteOption; -import com.example.spot.refactor.vote.domain.aggregate.VoteParticipant; -import com.example.spot.refactor.vote.domain.repository.VoteOptionRepository; -import com.example.spot.refactor.vote.domain.repository.VoteParticipantRepository; -import com.example.spot.refactor.vote.domain.VoteRepository; +import com.example.spot.vote.domain.Vote; +import com.example.spot.vote.domain.aggregate.VoteOption; +import com.example.spot.vote.domain.aggregate.VoteParticipant; +import com.example.spot.vote.domain.repository.VoteOptionRepository; +import com.example.spot.vote.domain.repository.VoteParticipantRepository; +import com.example.spot.vote.domain.VoteRepository; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/spot/refactor/study/application/MemberStudyQueryService.java b/src/main/java/com/example/spot/study/application/MemberStudyQueryService.java similarity index 72% rename from src/main/java/com/example/spot/refactor/study/application/MemberStudyQueryService.java rename to src/main/java/com/example/spot/study/application/MemberStudyQueryService.java index 8b0b8e00..fb9a19ba 100644 --- a/src/main/java/com/example/spot/refactor/study/application/MemberStudyQueryService.java +++ b/src/main/java/com/example/spot/study/application/MemberStudyQueryService.java @@ -1,17 +1,17 @@ -package com.example.spot.refactor.study.application; +package com.example.spot.study.application; -import com.example.spot.refactor.study.presentation.dto.response.ToDoListResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.ScheduleResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyImageResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyMemberResDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyQuizResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyVoteResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyMemberResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyScheduleResponseDTO; +import com.example.spot.study.presentation.dto.response.ToDoListResponseDTO; +import com.example.spot.study.presentation.dto.response.ScheduleResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyImageResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyMemberResDTO; +import com.example.spot.study.presentation.dto.response.StudyQuizResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyVoteResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyMemberResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyPostResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyScheduleResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyMemberResponseDTO.StudyApplicantDTO; +import com.example.spot.study.presentation.dto.response.StudyMemberResponseDTO.StudyApplicantDTO; import java.time.LocalDate; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/example/spot/refactor/study/application/MemberStudyQueryServiceImpl.java b/src/main/java/com/example/spot/study/application/MemberStudyQueryServiceImpl.java similarity index 92% rename from src/main/java/com/example/spot/refactor/study/application/MemberStudyQueryServiceImpl.java rename to src/main/java/com/example/spot/study/application/MemberStudyQueryServiceImpl.java index a972471e..3ae1e882 100644 --- a/src/main/java/com/example/spot/refactor/study/application/MemberStudyQueryServiceImpl.java +++ b/src/main/java/com/example/spot/study/application/MemberStudyQueryServiceImpl.java @@ -1,50 +1,50 @@ -package com.example.spot.refactor.study.application; - -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; -import com.example.spot.refactor.common.api.exception.handler.StudyHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.schedule.domain.*; -import com.example.spot.refactor.schedule.domain.aggregate.Quiz; -import com.example.spot.refactor.schedule.domain.aggregate.QuizSubmission; -import com.example.spot.refactor.schedule.domain.repository.QuizRepository; -import com.example.spot.refactor.schedule.domain.repository.QuizSubmissionRepository; -import com.example.spot.refactor.schedule.domain.ScheduleRepository; -import com.example.spot.refactor.story.domain.Story; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.refactor.schedule.domain.enums.SchedulePeriod; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.todo.domain.ToDo; -import com.example.spot.refactor.vote.domain.*; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.refactor.story.domain.StoryRepository; -import com.example.spot.refactor.study.domain.StudyRepository; -import com.example.spot.refactor.todo.domain.ToDoRepository; -import com.example.spot.refactor.study.presentation.dto.response.ScheduleResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyImageResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyMemberResDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyQuizResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyVoteResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyMemberResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyScheduleResponseDTO; - -import com.example.spot.refactor.common.security.utils.SecurityUtils; -import com.example.spot.refactor.study.presentation.dto.response.ToDoListResponseDTO.ToDoListSearchResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.ToDoListResponseDTO.ToDoListSearchResponseDTO.ToDoListDTO; - -import com.example.spot.refactor.study.presentation.dto.response.StudyMemberResponseDTO.StudyApplicantDTO; -import com.example.spot.refactor.vote.domain.aggregate.VoteOption; -import com.example.spot.refactor.vote.domain.repository.VoteOptionRepository; -import com.example.spot.refactor.vote.domain.repository.VoteParticipantRepository; -import com.example.spot.refactor.vote.domain.VoteRepository; +package com.example.spot.study.application; + +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.handler.MemberHandler; +import com.example.spot.common.api.exception.handler.StudyHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.schedule.domain.Schedule; +import com.example.spot.schedule.domain.aggregate.Quiz; +import com.example.spot.schedule.domain.aggregate.QuizSubmission; +import com.example.spot.schedule.domain.repository.QuizRepository; +import com.example.spot.schedule.domain.repository.QuizSubmissionRepository; +import com.example.spot.schedule.domain.ScheduleRepository; +import com.example.spot.story.domain.Story; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.schedule.domain.enums.SchedulePeriod; +import com.example.spot.study.domain.Study; +import com.example.spot.todo.domain.ToDo; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.story.domain.StoryRepository; +import com.example.spot.study.domain.StudyRepository; +import com.example.spot.todo.domain.ToDoRepository; +import com.example.spot.study.presentation.dto.response.ScheduleResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyImageResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyMemberResDTO; +import com.example.spot.study.presentation.dto.response.StudyQuizResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyVoteResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyMemberResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyPostResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyScheduleResponseDTO; + +import com.example.spot.common.security.utils.SecurityUtils; +import com.example.spot.study.presentation.dto.response.ToDoListResponseDTO.ToDoListSearchResponseDTO; +import com.example.spot.study.presentation.dto.response.ToDoListResponseDTO.ToDoListSearchResponseDTO.ToDoListDTO; + +import com.example.spot.study.presentation.dto.response.StudyMemberResponseDTO.StudyApplicantDTO; +import com.example.spot.vote.domain.Vote; +import com.example.spot.vote.domain.aggregate.VoteOption; +import com.example.spot.vote.domain.repository.VoteOptionRepository; +import com.example.spot.vote.domain.repository.VoteParticipantRepository; +import com.example.spot.vote.domain.VoteRepository; import lombok.RequiredArgsConstructor; -import com.example.spot.refactor.common.api.exception.GeneralException; -import com.example.spot.refactor.study.presentation.dto.response.StudyMemberResponseDTO.StudyApplyMemberDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyMemberResponseDTO.StudyMemberDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyScheduleResponseDTO.StudyScheduleDTO; +import com.example.spot.common.api.exception.GeneralException; +import com.example.spot.study.presentation.dto.response.StudyMemberResponseDTO.StudyApplyMemberDTO; +import com.example.spot.study.presentation.dto.response.StudyMemberResponseDTO.StudyMemberDTO; +import com.example.spot.study.presentation.dto.response.StudyScheduleResponseDTO.StudyScheduleDTO; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; diff --git a/src/main/java/com/example/spot/refactor/study/application/StudyCommandService.java b/src/main/java/com/example/spot/study/application/StudyCommandService.java similarity index 55% rename from src/main/java/com/example/spot/refactor/study/application/StudyCommandService.java rename to src/main/java/com/example/spot/study/application/StudyCommandService.java index a5fcaf53..ee5737a3 100644 --- a/src/main/java/com/example/spot/refactor/study/application/StudyCommandService.java +++ b/src/main/java/com/example/spot/study/application/StudyCommandService.java @@ -1,10 +1,10 @@ -package com.example.spot.refactor.study.application; +package com.example.spot.study.application; -import com.example.spot.refactor.study.presentation.dto.request.StudyJoinRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyRegisterRequestDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyJoinResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyLikeResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyRegisterResponseDTO; +import com.example.spot.study.presentation.dto.request.StudyJoinRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyRegisterRequestDTO; +import com.example.spot.study.presentation.dto.response.StudyJoinResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyLikeResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyRegisterResponseDTO; public interface StudyCommandService { diff --git a/src/main/java/com/example/spot/refactor/study/application/StudyCommandServiceImpl.java b/src/main/java/com/example/spot/study/application/StudyCommandServiceImpl.java similarity index 83% rename from src/main/java/com/example/spot/refactor/study/application/StudyCommandServiceImpl.java rename to src/main/java/com/example/spot/study/application/StudyCommandServiceImpl.java index 1b0cf2ee..cc8d01f2 100644 --- a/src/main/java/com/example/spot/refactor/study/application/StudyCommandServiceImpl.java +++ b/src/main/java/com/example/spot/study/application/StudyCommandServiceImpl.java @@ -1,35 +1,35 @@ -package com.example.spot.refactor.study.application; - -import com.example.spot.refactor.study.domain.aggregate.StudyRegion; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; -import com.example.spot.refactor.common.api.exception.handler.StudyHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.study.domain.aggregate.Region; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.aggregate.Theme; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.refactor.member.domain.enums.Status; -import com.example.spot.refactor.study.domain.enums.StudyLikeStatus; -import com.example.spot.refactor.study.domain.enums.StudyState; -import com.example.spot.refactor.member.domain.association.PreferredStudy; -import com.example.spot.refactor.study.domain.aggregate.StudyTheme; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.refactor.member.domain.association.PreferredStudyRepository; -import com.example.spot.refactor.study.domain.repository.RegionRepository; -import com.example.spot.refactor.study.domain.repository.StudyRegionRepository; -import com.example.spot.refactor.study.domain.StudyRepository; -import com.example.spot.refactor.study.domain.repository.StudyThemeRepository; -import com.example.spot.refactor.study.domain.repository.ThemeRepository; -import com.example.spot.refactor.common.security.utils.SecurityUtils; -import com.example.spot.refactor.study.presentation.dto.request.StudyJoinRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyRegisterRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyRegisterRequestDTO.RegisterDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyJoinResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyLikeResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyRegisterResponseDTO; +package com.example.spot.study.application; + +import com.example.spot.study.domain.aggregate.StudyRegion; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.handler.MemberHandler; +import com.example.spot.common.api.exception.handler.StudyHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.study.domain.aggregate.Region; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.aggregate.Theme; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.member.domain.enums.Status; +import com.example.spot.study.domain.enums.StudyLikeStatus; +import com.example.spot.study.domain.enums.StudyState; +import com.example.spot.member.domain.association.PreferredStudy; +import com.example.spot.study.domain.aggregate.StudyTheme; +import com.example.spot.study.domain.Study; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.member.domain.association.PreferredStudyRepository; +import com.example.spot.study.domain.repository.RegionRepository; +import com.example.spot.study.domain.repository.StudyRegionRepository; +import com.example.spot.study.domain.StudyRepository; +import com.example.spot.study.domain.repository.StudyThemeRepository; +import com.example.spot.study.domain.repository.ThemeRepository; +import com.example.spot.common.security.utils.SecurityUtils; +import com.example.spot.study.presentation.dto.request.StudyJoinRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyRegisterRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyRegisterRequestDTO.RegisterDTO; +import com.example.spot.study.presentation.dto.response.StudyJoinResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyLikeResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyRegisterResponseDTO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/example/spot/refactor/study/application/StudyPostCommandService.java b/src/main/java/com/example/spot/study/application/StudyPostCommandService.java similarity index 82% rename from src/main/java/com/example/spot/refactor/study/application/StudyPostCommandService.java rename to src/main/java/com/example/spot/study/application/StudyPostCommandService.java index fde77abb..ce696120 100644 --- a/src/main/java/com/example/spot/refactor/study/application/StudyPostCommandService.java +++ b/src/main/java/com/example/spot/study/application/StudyPostCommandService.java @@ -1,9 +1,9 @@ -package com.example.spot.refactor.study.application; +package com.example.spot.study.application; -import com.example.spot.refactor.study.presentation.dto.request.StudyPostCommentRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyPostRequestDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostCommentResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostResDTO; +import com.example.spot.study.presentation.dto.request.StudyPostCommentRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyPostRequestDTO; +import com.example.spot.study.presentation.dto.response.StudyPostCommentResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyPostResDTO; public interface StudyPostCommandService { diff --git a/src/main/java/com/example/spot/refactor/study/application/StudyPostCommandServiceImpl.java b/src/main/java/com/example/spot/study/application/StudyPostCommandServiceImpl.java similarity index 94% rename from src/main/java/com/example/spot/refactor/study/application/StudyPostCommandServiceImpl.java rename to src/main/java/com/example/spot/study/application/StudyPostCommandServiceImpl.java index 8fbeddbb..a78184cb 100644 --- a/src/main/java/com/example/spot/refactor/study/application/StudyPostCommandServiceImpl.java +++ b/src/main/java/com/example/spot/study/application/StudyPostCommandServiceImpl.java @@ -1,28 +1,35 @@ -package com.example.spot.refactor.study.application; - -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; -import com.example.spot.refactor.common.api.exception.handler.StudyHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.legacy.domain.Notification; -import com.example.spot.refactor.story.domain.Story; -import com.example.spot.refactor.story.domain.StoryRepository; -import com.example.spot.refactor.story.domain.aggregate.*; -import com.example.spot.refactor.story.domain.repository.*; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.legacy.domain.enums.NotifyType; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.legacy.repository.NotificationRepository; -import com.example.spot.refactor.study.domain.StudyRepository; -import com.example.spot.refactor.common.security.utils.SecurityUtils; -import com.example.spot.legacy.service.s3.S3ImageService; -import com.example.spot.refactor.study.presentation.dto.request.StudyPostCommentRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyPostRequestDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostCommentResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostResDTO; +package com.example.spot.study.application; + +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.handler.MemberHandler; +import com.example.spot.common.api.exception.handler.StudyHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.notification.domain.Notification; +import com.example.spot.story.domain.Story; +import com.example.spot.story.domain.StoryRepository; +import com.example.spot.story.domain.aggregate.LikedStory; +import com.example.spot.story.domain.aggregate.LikedStoryComment; +import com.example.spot.story.domain.aggregate.StoryComment; +import com.example.spot.story.domain.aggregate.StoryImage; +import com.example.spot.story.domain.repository.LikedStoryCommentRepository; +import com.example.spot.story.domain.repository.LikedStoryRepository; +import com.example.spot.story.domain.repository.StoryCommentRepository; +import com.example.spot.story.domain.repository.StoryImageRepository; +import com.example.spot.story.domain.repository.StoryReportRepository; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.notification.domain.enums.NotifyType; +import com.example.spot.study.domain.Study; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.notification.domain.NotificationRepository; +import com.example.spot.study.domain.StudyRepository; +import com.example.spot.common.security.utils.SecurityUtils; +import com.example.spot.common.application.s3.S3ImageService; +import com.example.spot.study.presentation.dto.request.StudyPostCommentRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyPostRequestDTO; +import com.example.spot.study.presentation.dto.response.StudyPostCommentResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyPostResDTO; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/example/spot/refactor/study/application/StudyPostQueryService.java b/src/main/java/com/example/spot/study/application/StudyPostQueryService.java similarity index 64% rename from src/main/java/com/example/spot/refactor/study/application/StudyPostQueryService.java rename to src/main/java/com/example/spot/study/application/StudyPostQueryService.java index c2ddc257..094cdd4c 100644 --- a/src/main/java/com/example/spot/refactor/study/application/StudyPostQueryService.java +++ b/src/main/java/com/example/spot/study/application/StudyPostQueryService.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.study.application; +package com.example.spot.study.application; -import com.example.spot.refactor.story.domain.enums.StoryCategoryQuery; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostCommentResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostResDTO; +import com.example.spot.story.domain.enums.StoryCategoryQuery; +import com.example.spot.study.presentation.dto.response.StudyPostCommentResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyPostResDTO; import org.springframework.data.domain.PageRequest; public interface StudyPostQueryService { diff --git a/src/main/java/com/example/spot/refactor/study/application/StudyPostQueryServiceImpl.java b/src/main/java/com/example/spot/study/application/StudyPostQueryServiceImpl.java similarity index 86% rename from src/main/java/com/example/spot/refactor/study/application/StudyPostQueryServiceImpl.java rename to src/main/java/com/example/spot/study/application/StudyPostQueryServiceImpl.java index d58ca221..9974b350 100644 --- a/src/main/java/com/example/spot/refactor/study/application/StudyPostQueryServiceImpl.java +++ b/src/main/java/com/example/spot/study/application/StudyPostQueryServiceImpl.java @@ -1,24 +1,24 @@ -package com.example.spot.refactor.study.application; - -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; -import com.example.spot.refactor.common.api.exception.handler.StudyHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.story.domain.Story; -import com.example.spot.refactor.story.domain.enums.StoryCategory; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.refactor.story.domain.enums.StoryCategoryQuery; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.story.domain.aggregate.StoryComment; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.refactor.story.domain.repository.LikedStoryRepository; -import com.example.spot.refactor.story.domain.repository.StoryCommentRepository; -import com.example.spot.refactor.story.domain.StoryRepository; -import com.example.spot.refactor.study.domain.StudyRepository; -import com.example.spot.refactor.common.security.utils.SecurityUtils; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostCommentResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostResDTO; +package com.example.spot.study.application; + +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.handler.MemberHandler; +import com.example.spot.common.api.exception.handler.StudyHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.story.domain.Story; +import com.example.spot.story.domain.enums.StoryCategory; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.story.domain.enums.StoryCategoryQuery; +import com.example.spot.study.domain.Study; +import com.example.spot.story.domain.aggregate.StoryComment; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.story.domain.repository.LikedStoryRepository; +import com.example.spot.story.domain.repository.StoryCommentRepository; +import com.example.spot.story.domain.StoryRepository; +import com.example.spot.study.domain.StudyRepository; +import com.example.spot.common.security.utils.SecurityUtils; +import com.example.spot.study.presentation.dto.response.StudyPostCommentResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyPostResDTO; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.PageRequest; diff --git a/src/main/java/com/example/spot/refactor/study/application/StudyQueryService.java b/src/main/java/com/example/spot/study/application/StudyQueryService.java similarity index 79% rename from src/main/java/com/example/spot/refactor/study/application/StudyQueryService.java rename to src/main/java/com/example/spot/study/application/StudyQueryService.java index 68a12462..c74cdf21 100644 --- a/src/main/java/com/example/spot/refactor/study/application/StudyQueryService.java +++ b/src/main/java/com/example/spot/study/application/StudyQueryService.java @@ -1,13 +1,13 @@ -package com.example.spot.refactor.study.application; - -import com.example.spot.refactor.study.domain.enums.StudySortBy; -import com.example.spot.refactor.study.domain.enums.ThemeType; -import com.example.spot.legacy.web.dto.search.SearchRequestStudyDTO; -import com.example.spot.legacy.web.dto.search.SearchRequestStudyWithThemeDTO; -import com.example.spot.legacy.web.dto.search.SearchResponseDTO.HotKeywordDTO; -import com.example.spot.legacy.web.dto.search.SearchResponseDTO.MyPageDTO; -import com.example.spot.legacy.web.dto.search.SearchResponseDTO.StudyPreviewDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyInfoResponseDTO; +package com.example.spot.study.application; + +import com.example.spot.study.domain.enums.StudySortBy; +import com.example.spot.study.domain.enums.ThemeType; +import com.example.spot.study.presentation.dto.request.SearchRequestStudyDTO; +import com.example.spot.study.presentation.dto.request.SearchRequestStudyWithThemeDTO; +import com.example.spot.study.presentation.dto.response.SearchResponseDTO.HotKeywordDTO; +import com.example.spot.study.presentation.dto.response.SearchResponseDTO.MyPageDTO; +import com.example.spot.study.presentation.dto.response.SearchResponseDTO.StudyPreviewDTO; +import com.example.spot.study.presentation.dto.response.StudyInfoResponseDTO; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/example/spot/refactor/study/application/StudyQueryServiceImpl.java b/src/main/java/com/example/spot/study/application/StudyQueryServiceImpl.java similarity index 93% rename from src/main/java/com/example/spot/refactor/study/application/StudyQueryServiceImpl.java rename to src/main/java/com/example/spot/study/application/StudyQueryServiceImpl.java index 34fdb4f5..5e89066a 100644 --- a/src/main/java/com/example/spot/refactor/study/application/StudyQueryServiceImpl.java +++ b/src/main/java/com/example/spot/study/application/StudyQueryServiceImpl.java @@ -1,44 +1,44 @@ -package com.example.spot.refactor.study.application; - -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.common.api.exception.GeneralException; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; -import com.example.spot.refactor.common.api.exception.handler.StudyHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.study.domain.aggregate.Region; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.aggregate.Theme; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.refactor.member.domain.enums.Gender; -import com.example.spot.refactor.member.domain.enums.Status; -import com.example.spot.refactor.study.domain.enums.StudyLikeStatus; -import com.example.spot.refactor.study.domain.enums.StudySortBy; -import com.example.spot.refactor.study.domain.enums.ThemeType; -import com.example.spot.refactor.member.domain.association.MemberTheme; -import com.example.spot.refactor.member.domain.association.PreferredRegion; -import com.example.spot.refactor.member.domain.association.PreferredStudy; -import com.example.spot.refactor.study.domain.aggregate.StudyRegion; -import com.example.spot.refactor.study.domain.aggregate.StudyTheme; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.refactor.member.domain.association.MemberThemeRepository; -import com.example.spot.refactor.member.domain.association.PreferredRegionRepository; -import com.example.spot.refactor.member.domain.association.PreferredStudyRepository; -import com.example.spot.refactor.study.domain.repository.RegionRepository; -import com.example.spot.refactor.study.domain.repository.StudyRegionRepository; -import com.example.spot.refactor.study.domain.StudyRepository; -import com.example.spot.refactor.study.domain.repository.StudyThemeRepository; -import com.example.spot.refactor.study.domain.repository.ThemeRepository; -import com.example.spot.refactor.common.security.utils.SecurityUtils; -import com.example.spot.legacy.web.dto.search.SearchRequestStudyDTO; -import com.example.spot.legacy.web.dto.search.SearchRequestStudyWithThemeDTO; -import com.example.spot.legacy.web.dto.search.SearchResponseDTO; -import com.example.spot.legacy.web.dto.search.SearchResponseDTO.HotKeywordDTO; -import com.example.spot.legacy.web.dto.search.SearchResponseDTO.MyPageDTO; -import com.example.spot.legacy.web.dto.search.SearchResponseDTO.SearchStudyDTO; -import com.example.spot.legacy.web.dto.search.SearchResponseDTO.StudyPreviewDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyInfoResponseDTO; +package com.example.spot.study.application; + +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.common.api.exception.GeneralException; +import com.example.spot.common.api.exception.handler.MemberHandler; +import com.example.spot.common.api.exception.handler.StudyHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.study.domain.aggregate.Region; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.aggregate.Theme; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.member.domain.enums.Gender; +import com.example.spot.member.domain.enums.Status; +import com.example.spot.study.domain.enums.StudyLikeStatus; +import com.example.spot.study.domain.enums.StudySortBy; +import com.example.spot.study.domain.enums.ThemeType; +import com.example.spot.member.domain.association.MemberTheme; +import com.example.spot.member.domain.association.PreferredRegion; +import com.example.spot.member.domain.association.PreferredStudy; +import com.example.spot.study.domain.aggregate.StudyRegion; +import com.example.spot.study.domain.aggregate.StudyTheme; +import com.example.spot.study.domain.Study; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.member.domain.association.MemberThemeRepository; +import com.example.spot.member.domain.association.PreferredRegionRepository; +import com.example.spot.member.domain.association.PreferredStudyRepository; +import com.example.spot.study.domain.repository.RegionRepository; +import com.example.spot.study.domain.repository.StudyRegionRepository; +import com.example.spot.study.domain.StudyRepository; +import com.example.spot.study.domain.repository.StudyThemeRepository; +import com.example.spot.study.domain.repository.ThemeRepository; +import com.example.spot.common.security.utils.SecurityUtils; +import com.example.spot.study.presentation.dto.request.SearchRequestStudyDTO; +import com.example.spot.study.presentation.dto.request.SearchRequestStudyWithThemeDTO; +import com.example.spot.study.presentation.dto.response.SearchResponseDTO; +import com.example.spot.study.presentation.dto.response.SearchResponseDTO.HotKeywordDTO; +import com.example.spot.study.presentation.dto.response.SearchResponseDTO.MyPageDTO; +import com.example.spot.study.presentation.dto.response.SearchResponseDTO.SearchStudyDTO; +import com.example.spot.study.presentation.dto.response.SearchResponseDTO.StudyPreviewDTO; +import com.example.spot.study.presentation.dto.response.StudyInfoResponseDTO; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/com/example/spot/refactor/study/domain/Study.java b/src/main/java/com/example/spot/study/domain/Study.java similarity index 87% rename from src/main/java/com/example/spot/refactor/study/domain/Study.java rename to src/main/java/com/example/spot/study/domain/Study.java index c78016d8..330c67c9 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/Study.java +++ b/src/main/java/com/example/spot/study/domain/Study.java @@ -1,18 +1,18 @@ -package com.example.spot.refactor.study.domain; - -import com.example.spot.legacy.domain.Notification; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.member.domain.enums.Gender; -import com.example.spot.refactor.member.domain.enums.Status; -import com.example.spot.refactor.schedule.domain.Schedule; -import com.example.spot.refactor.story.domain.Story; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.aggregate.StudyRegion; -import com.example.spot.refactor.study.domain.aggregate.StudyTheme; -import com.example.spot.refactor.todo.domain.ToDo; -import com.example.spot.refactor.vote.domain.Vote; -import com.example.spot.refactor.study.domain.enums.StudyState; -import com.example.spot.refactor.member.domain.association.PreferredStudy; +package com.example.spot.study.domain; + +import com.example.spot.notification.domain.Notification; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.member.domain.enums.Gender; +import com.example.spot.member.domain.enums.Status; +import com.example.spot.schedule.domain.Schedule; +import com.example.spot.story.domain.Story; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.aggregate.StudyRegion; +import com.example.spot.study.domain.aggregate.StudyTheme; +import com.example.spot.todo.domain.ToDo; +import com.example.spot.vote.domain.Vote; +import com.example.spot.study.domain.enums.StudyState; +import com.example.spot.member.domain.association.PreferredStudy; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/spot/refactor/study/domain/StudyRepository.java b/src/main/java/com/example/spot/study/domain/StudyRepository.java similarity index 91% rename from src/main/java/com/example/spot/refactor/study/domain/StudyRepository.java rename to src/main/java/com/example/spot/study/domain/StudyRepository.java index 7d8976ca..d1ed2b21 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/StudyRepository.java +++ b/src/main/java/com/example/spot/study/domain/StudyRepository.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.study.domain; +package com.example.spot.study.domain; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/example/spot/refactor/study/domain/StudyRepositoryCustom.java b/src/main/java/com/example/spot/study/domain/StudyRepositoryCustom.java similarity index 86% rename from src/main/java/com/example/spot/refactor/study/domain/StudyRepositoryCustom.java rename to src/main/java/com/example/spot/study/domain/StudyRepositoryCustom.java index ecc8d599..9ee345ba 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/StudyRepositoryCustom.java +++ b/src/main/java/com/example/spot/study/domain/StudyRepositoryCustom.java @@ -1,10 +1,10 @@ -package com.example.spot.refactor.study.domain; +package com.example.spot.study.domain; -import com.example.spot.refactor.member.domain.enums.Status; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.enums.StudySortBy; -import com.example.spot.refactor.study.domain.aggregate.StudyRegion; -import com.example.spot.refactor.study.domain.aggregate.StudyTheme; +import com.example.spot.member.domain.enums.Status; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.enums.StudySortBy; +import com.example.spot.study.domain.aggregate.StudyRegion; +import com.example.spot.study.domain.aggregate.StudyTheme; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/example/spot/refactor/study/domain/StudyRepositoryCustomImpl.java b/src/main/java/com/example/spot/study/domain/StudyRepositoryCustomImpl.java similarity index 95% rename from src/main/java/com/example/spot/refactor/study/domain/StudyRepositoryCustomImpl.java rename to src/main/java/com/example/spot/study/domain/StudyRepositoryCustomImpl.java index 69e84a70..47479eb0 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/StudyRepositoryCustomImpl.java +++ b/src/main/java/com/example/spot/study/domain/StudyRepositoryCustomImpl.java @@ -1,17 +1,17 @@ -package com.example.spot.refactor.study.domain; - -import static com.example.spot.refactor.study.domain.QStudy.*; - -import com.example.spot.refactor.study.domain.aggregate.Region; -import com.example.spot.refactor.study.domain.aggregate.StudyRegion; -import com.example.spot.refactor.member.domain.enums.Gender; -import com.example.spot.refactor.member.domain.enums.Status; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.enums.StudySortBy; -import com.example.spot.refactor.study.domain.enums.StudyState; -import com.example.spot.refactor.study.domain.enums.ThemeType; -import com.example.spot.refactor.study.domain.aggregate.StudyTheme; -import com.example.spot.refactor.study.domain.QStudy; +package com.example.spot.study.domain; + + +import static com.example.spot.study.domain.QStudy.*; + +import com.example.spot.study.domain.aggregate.Region; +import com.example.spot.study.domain.aggregate.StudyRegion; +import com.example.spot.member.domain.enums.Gender; +import com.example.spot.member.domain.enums.Status; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.enums.StudySortBy; +import com.example.spot.study.domain.enums.StudyState; +import com.example.spot.study.domain.enums.ThemeType; +import com.example.spot.study.domain.aggregate.StudyTheme; import com.querydsl.core.BooleanBuilder; import com.querydsl.jpa.impl.JPAQuery; import com.querydsl.jpa.impl.JPAQueryFactory; diff --git a/src/main/java/com/example/spot/refactor/study/domain/aggregate/Region.java b/src/main/java/com/example/spot/study/domain/aggregate/Region.java similarity index 87% rename from src/main/java/com/example/spot/refactor/study/domain/aggregate/Region.java rename to src/main/java/com/example/spot/study/domain/aggregate/Region.java index cc92c4b2..ca10c1be 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/aggregate/Region.java +++ b/src/main/java/com/example/spot/study/domain/aggregate/Region.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.study.domain.aggregate; +package com.example.spot.study.domain.aggregate; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.member.domain.association.PreferredRegion; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.member.domain.association.PreferredRegion; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/study/domain/aggregate/StudyMember.java b/src/main/java/com/example/spot/study/domain/aggregate/StudyMember.java similarity index 83% rename from src/main/java/com/example/spot/refactor/study/domain/aggregate/StudyMember.java rename to src/main/java/com/example/spot/study/domain/aggregate/StudyMember.java index b552936f..835d07ba 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/aggregate/StudyMember.java +++ b/src/main/java/com/example/spot/study/domain/aggregate/StudyMember.java @@ -1,9 +1,9 @@ -package com.example.spot.refactor.study.domain.aggregate; +package com.example.spot.study.domain.aggregate; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; +import com.example.spot.member.domain.Member; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.study.domain.Study; +import com.example.spot.study.domain.enums.StudyApplicationStatus; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/spot/refactor/study/domain/aggregate/StudyRegion.java b/src/main/java/com/example/spot/study/domain/aggregate/StudyRegion.java similarity index 85% rename from src/main/java/com/example/spot/refactor/study/domain/aggregate/StudyRegion.java rename to src/main/java/com/example/spot/study/domain/aggregate/StudyRegion.java index f6899696..167f0c50 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/aggregate/StudyRegion.java +++ b/src/main/java/com/example/spot/study/domain/aggregate/StudyRegion.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.study.domain.aggregate; +package com.example.spot.study.domain.aggregate; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.study.domain.Study; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.study.domain.Study; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/example/spot/refactor/study/domain/aggregate/StudyTheme.java b/src/main/java/com/example/spot/study/domain/aggregate/StudyTheme.java similarity index 85% rename from src/main/java/com/example/spot/refactor/study/domain/aggregate/StudyTheme.java rename to src/main/java/com/example/spot/study/domain/aggregate/StudyTheme.java index d54a2bca..2f91d062 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/aggregate/StudyTheme.java +++ b/src/main/java/com/example/spot/study/domain/aggregate/StudyTheme.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.study.domain.aggregate; +package com.example.spot.study.domain.aggregate; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.study.domain.Study; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.study.domain.Study; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/spot/refactor/study/domain/aggregate/Theme.java b/src/main/java/com/example/spot/study/domain/aggregate/Theme.java similarity index 85% rename from src/main/java/com/example/spot/refactor/study/domain/aggregate/Theme.java rename to src/main/java/com/example/spot/study/domain/aggregate/Theme.java index 45d704ce..4e295dc6 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/aggregate/Theme.java +++ b/src/main/java/com/example/spot/study/domain/aggregate/Theme.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.study.domain.aggregate; +package com.example.spot.study.domain.aggregate; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.study.domain.enums.ThemeType; -import com.example.spot.refactor.member.domain.association.MemberTheme; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.study.domain.enums.ThemeType; +import com.example.spot.member.domain.association.MemberTheme; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/study/domain/enums/StudyApplicationStatus.java b/src/main/java/com/example/spot/study/domain/enums/StudyApplicationStatus.java similarity index 78% rename from src/main/java/com/example/spot/refactor/study/domain/enums/StudyApplicationStatus.java rename to src/main/java/com/example/spot/study/domain/enums/StudyApplicationStatus.java index 855c5426..7843284a 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/enums/StudyApplicationStatus.java +++ b/src/main/java/com/example/spot/study/domain/enums/StudyApplicationStatus.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.study.domain.enums; +package com.example.spot.study.domain.enums; public enum StudyApplicationStatus { APPLIED, // 신청 승인 대기 diff --git a/src/main/java/com/example/spot/study/domain/enums/StudyLikeStatus.java b/src/main/java/com/example/spot/study/domain/enums/StudyLikeStatus.java new file mode 100644 index 00000000..6f4d8750 --- /dev/null +++ b/src/main/java/com/example/spot/study/domain/enums/StudyLikeStatus.java @@ -0,0 +1,5 @@ +package com.example.spot.study.domain.enums; + +public enum StudyLikeStatus { + LIKE, DISLIKE +} diff --git a/src/main/java/com/example/spot/refactor/study/domain/enums/StudySortBy.java b/src/main/java/com/example/spot/study/domain/enums/StudySortBy.java similarity index 57% rename from src/main/java/com/example/spot/refactor/study/domain/enums/StudySortBy.java rename to src/main/java/com/example/spot/study/domain/enums/StudySortBy.java index 47932e62..878b38db 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/enums/StudySortBy.java +++ b/src/main/java/com/example/spot/study/domain/enums/StudySortBy.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.study.domain.enums; +package com.example.spot.study.domain.enums; public enum StudySortBy { ALL, RECRUITING, COMPLETED, HIT, LIKED diff --git a/src/main/java/com/example/spot/refactor/study/domain/enums/StudyState.java b/src/main/java/com/example/spot/study/domain/enums/StudyState.java similarity index 52% rename from src/main/java/com/example/spot/refactor/study/domain/enums/StudyState.java rename to src/main/java/com/example/spot/study/domain/enums/StudyState.java index 9186f40c..ee2a49f1 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/enums/StudyState.java +++ b/src/main/java/com/example/spot/study/domain/enums/StudyState.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.study.domain.enums; +package com.example.spot.study.domain.enums; public enum StudyState { RECRUITING, COMPLETED, BEFORE diff --git a/src/main/java/com/example/spot/refactor/study/domain/enums/ThemeType.java b/src/main/java/com/example/spot/study/domain/enums/ThemeType.java similarity index 73% rename from src/main/java/com/example/spot/refactor/study/domain/enums/ThemeType.java rename to src/main/java/com/example/spot/study/domain/enums/ThemeType.java index 99626768..27b4d624 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/enums/ThemeType.java +++ b/src/main/java/com/example/spot/study/domain/enums/ThemeType.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.study.domain.enums; +package com.example.spot.study.domain.enums; public enum ThemeType { 어학, 자격증, 취업, 시사뉴스, 자율학습, 토론, 프로젝트, 공모전, 전공및진로학습, 기타 diff --git a/src/main/java/com/example/spot/refactor/study/domain/repository/RegionRepository.java b/src/main/java/com/example/spot/study/domain/repository/RegionRepository.java similarity index 71% rename from src/main/java/com/example/spot/refactor/study/domain/repository/RegionRepository.java rename to src/main/java/com/example/spot/study/domain/repository/RegionRepository.java index 5a3c2763..80054ece 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/repository/RegionRepository.java +++ b/src/main/java/com/example/spot/study/domain/repository/RegionRepository.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.study.domain.repository; +package com.example.spot.study.domain.repository; -import com.example.spot.refactor.study.domain.aggregate.Region; +import com.example.spot.study.domain.aggregate.Region; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/refactor/study/domain/repository/StudyMemberRepository.java b/src/main/java/com/example/spot/study/domain/repository/StudyMemberRepository.java similarity index 85% rename from src/main/java/com/example/spot/refactor/study/domain/repository/StudyMemberRepository.java rename to src/main/java/com/example/spot/study/domain/repository/StudyMemberRepository.java index fccf9e8a..d5f2b922 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/repository/StudyMemberRepository.java +++ b/src/main/java/com/example/spot/study/domain/repository/StudyMemberRepository.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.study.domain.repository; +package com.example.spot.study.domain.repository; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.refactor.member.domain.enums.Status; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.member.domain.enums.Status; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/refactor/study/domain/repository/StudyRegionRepository.java b/src/main/java/com/example/spot/study/domain/repository/StudyRegionRepository.java similarity index 63% rename from src/main/java/com/example/spot/refactor/study/domain/repository/StudyRegionRepository.java rename to src/main/java/com/example/spot/study/domain/repository/StudyRegionRepository.java index 2efbf7c5..82955bf8 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/repository/StudyRegionRepository.java +++ b/src/main/java/com/example/spot/study/domain/repository/StudyRegionRepository.java @@ -1,9 +1,9 @@ -package com.example.spot.refactor.study.domain.repository; +package com.example.spot.study.domain.repository; import java.util.List; -import com.example.spot.refactor.study.domain.aggregate.Region; -import com.example.spot.refactor.study.domain.aggregate.StudyRegion; +import com.example.spot.study.domain.aggregate.Region; +import com.example.spot.study.domain.aggregate.StudyRegion; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/refactor/study/domain/repository/StudyThemeRepository.java b/src/main/java/com/example/spot/study/domain/repository/StudyThemeRepository.java similarity index 62% rename from src/main/java/com/example/spot/refactor/study/domain/repository/StudyThemeRepository.java rename to src/main/java/com/example/spot/study/domain/repository/StudyThemeRepository.java index df369b95..6f4088fe 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/repository/StudyThemeRepository.java +++ b/src/main/java/com/example/spot/study/domain/repository/StudyThemeRepository.java @@ -1,9 +1,9 @@ -package com.example.spot.refactor.study.domain.repository; +package com.example.spot.study.domain.repository; import java.util.List; -import com.example.spot.refactor.study.domain.aggregate.StudyTheme; -import com.example.spot.refactor.study.domain.aggregate.Theme; +import com.example.spot.study.domain.aggregate.StudyTheme; +import com.example.spot.study.domain.aggregate.Theme; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/refactor/study/domain/repository/ThemeRepository.java b/src/main/java/com/example/spot/study/domain/repository/ThemeRepository.java similarity index 64% rename from src/main/java/com/example/spot/refactor/study/domain/repository/ThemeRepository.java rename to src/main/java/com/example/spot/study/domain/repository/ThemeRepository.java index c9cce2f7..f5ef6c60 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/repository/ThemeRepository.java +++ b/src/main/java/com/example/spot/study/domain/repository/ThemeRepository.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.study.domain.repository; +package com.example.spot.study.domain.repository; -import com.example.spot.refactor.study.domain.aggregate.Theme; -import com.example.spot.refactor.study.domain.enums.ThemeType; +import com.example.spot.study.domain.aggregate.Theme; +import com.example.spot.study.domain.enums.ThemeType; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/refactor/study/domain/validation/annotation/ExistStudy.java b/src/main/java/com/example/spot/study/domain/validation/annotation/ExistStudy.java similarity index 80% rename from src/main/java/com/example/spot/refactor/study/domain/validation/annotation/ExistStudy.java rename to src/main/java/com/example/spot/study/domain/validation/annotation/ExistStudy.java index 2ce68888..41c240b2 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/validation/annotation/ExistStudy.java +++ b/src/main/java/com/example/spot/study/domain/validation/annotation/ExistStudy.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.study.domain.validation.annotation; +package com.example.spot.study.domain.validation.annotation; -import com.example.spot.refactor.study.domain.validation.validator.ExistStudyValidator; +import com.example.spot.study.domain.validation.validator.ExistStudyValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; import java.lang.annotation.Documented; diff --git a/src/main/java/com/example/spot/refactor/study/domain/validation/annotation/ExistTheme.java b/src/main/java/com/example/spot/study/domain/validation/annotation/ExistTheme.java similarity index 80% rename from src/main/java/com/example/spot/refactor/study/domain/validation/annotation/ExistTheme.java rename to src/main/java/com/example/spot/study/domain/validation/annotation/ExistTheme.java index e3daeb78..41c2f701 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/validation/annotation/ExistTheme.java +++ b/src/main/java/com/example/spot/study/domain/validation/annotation/ExistTheme.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.study.domain.validation.annotation; +package com.example.spot.study.domain.validation.annotation; -import com.example.spot.refactor.study.domain.validation.validator.ExistThemeValidator; +import com.example.spot.study.domain.validation.validator.ExistThemeValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; import java.lang.annotation.Documented; diff --git a/src/main/java/com/example/spot/refactor/study/domain/validation/validator/ExistStudyValidator.java b/src/main/java/com/example/spot/study/domain/validation/validator/ExistStudyValidator.java similarity index 78% rename from src/main/java/com/example/spot/refactor/study/domain/validation/validator/ExistStudyValidator.java rename to src/main/java/com/example/spot/study/domain/validation/validator/ExistStudyValidator.java index e99888c7..db2de813 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/validation/validator/ExistStudyValidator.java +++ b/src/main/java/com/example/spot/study/domain/validation/validator/ExistStudyValidator.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.study.domain.validation.validator; +package com.example.spot.study.domain.validation.validator; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.study.domain.StudyRepository; -import com.example.spot.refactor.study.domain.validation.annotation.ExistStudy; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.study.domain.StudyRepository; +import com.example.spot.study.domain.validation.annotation.ExistStudy; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/study/domain/validation/validator/ExistThemeValidator.java b/src/main/java/com/example/spot/study/domain/validation/validator/ExistThemeValidator.java similarity index 81% rename from src/main/java/com/example/spot/refactor/study/domain/validation/validator/ExistThemeValidator.java rename to src/main/java/com/example/spot/study/domain/validation/validator/ExistThemeValidator.java index 88008047..85fdf915 100644 --- a/src/main/java/com/example/spot/refactor/study/domain/validation/validator/ExistThemeValidator.java +++ b/src/main/java/com/example/spot/study/domain/validation/validator/ExistThemeValidator.java @@ -1,9 +1,9 @@ -package com.example.spot.refactor.study.domain.validation.validator; +package com.example.spot.study.domain.validation.validator; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.study.domain.enums.ThemeType; -import com.example.spot.refactor.study.domain.repository.ThemeRepository; -import com.example.spot.refactor.study.domain.validation.annotation.ExistTheme; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.study.domain.enums.ThemeType; +import com.example.spot.study.domain.repository.ThemeRepository; +import com.example.spot.study.domain.validation.annotation.ExistTheme; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import java.util.Objects; diff --git a/src/main/java/com/example/spot/legacy/web/controller/SearchController.java b/src/main/java/com/example/spot/study/presentation/controller/SearchController.java similarity index 96% rename from src/main/java/com/example/spot/legacy/web/controller/SearchController.java rename to src/main/java/com/example/spot/study/presentation/controller/SearchController.java index f4334c1a..32474ba4 100644 --- a/src/main/java/com/example/spot/legacy/web/controller/SearchController.java +++ b/src/main/java/com/example/spot/study/presentation/controller/SearchController.java @@ -1,17 +1,17 @@ -package com.example.spot.legacy.web.controller; - -import com.example.spot.refactor.common.api.ApiResponse; -import com.example.spot.refactor.common.api.code.status.SuccessStatus; -import com.example.spot.refactor.study.domain.enums.StudySortBy; -import com.example.spot.refactor.study.domain.enums.ThemeType; -import com.example.spot.refactor.common.security.utils.SecurityUtils; -import com.example.spot.refactor.study.application.StudyCommandService; -import com.example.spot.refactor.study.application.StudyQueryService; -import com.example.spot.legacy.web.dto.search.SearchRequestStudyDTO; -import com.example.spot.legacy.web.dto.search.SearchRequestStudyWithThemeDTO; -import com.example.spot.legacy.web.dto.search.SearchResponseDTO.HotKeywordDTO; -import com.example.spot.legacy.web.dto.search.SearchResponseDTO.MyPageDTO; -import com.example.spot.legacy.web.dto.search.SearchResponseDTO.StudyPreviewDTO; +package com.example.spot.study.presentation.controller; + +import com.example.spot.common.api.ApiResponse; +import com.example.spot.common.api.code.status.SuccessStatus; +import com.example.spot.study.domain.enums.StudySortBy; +import com.example.spot.study.domain.enums.ThemeType; +import com.example.spot.common.security.utils.SecurityUtils; +import com.example.spot.study.application.StudyCommandService; +import com.example.spot.study.application.StudyQueryService; +import com.example.spot.study.presentation.dto.request.SearchRequestStudyDTO; +import com.example.spot.study.presentation.dto.request.SearchRequestStudyWithThemeDTO; +import com.example.spot.study.presentation.dto.response.SearchResponseDTO.HotKeywordDTO; +import com.example.spot.study.presentation.dto.response.SearchResponseDTO.MyPageDTO; +import com.example.spot.study.presentation.dto.response.SearchResponseDTO.StudyPreviewDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.security.SecurityRequirement; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/controller/StudyController.java b/src/main/java/com/example/spot/study/presentation/controller/StudyController.java similarity index 83% rename from src/main/java/com/example/spot/refactor/study/presentation/controller/StudyController.java rename to src/main/java/com/example/spot/study/presentation/controller/StudyController.java index d9929bb8..b9665f85 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/controller/StudyController.java +++ b/src/main/java/com/example/spot/study/presentation/controller/StudyController.java @@ -1,17 +1,17 @@ -package com.example.spot.refactor.study.presentation.controller; +package com.example.spot.study.presentation.controller; -import com.example.spot.refactor.common.api.ApiResponse; -import com.example.spot.refactor.common.api.code.status.SuccessStatus; -import com.example.spot.refactor.common.security.utils.SecurityUtils; -import com.example.spot.refactor.study.application.StudyCommandService; -import com.example.spot.refactor.study.application.StudyQueryService; -import com.example.spot.refactor.study.domain.validation.annotation.ExistStudy; -import com.example.spot.refactor.study.presentation.dto.request.StudyJoinRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyRegisterRequestDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyInfoResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyJoinResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyLikeResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyRegisterResponseDTO; +import com.example.spot.common.api.ApiResponse; +import com.example.spot.common.api.code.status.SuccessStatus; +import com.example.spot.common.security.utils.SecurityUtils; +import com.example.spot.study.application.StudyCommandService; +import com.example.spot.study.application.StudyQueryService; +import com.example.spot.study.domain.validation.annotation.ExistStudy; +import com.example.spot.study.presentation.dto.request.StudyJoinRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyRegisterRequestDTO; +import com.example.spot.study.presentation.dto.response.StudyInfoResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyJoinResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyLikeResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyRegisterResponseDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/controller/StudyMemberController.java b/src/main/java/com/example/spot/study/presentation/controller/StudyMemberController.java similarity index 93% rename from src/main/java/com/example/spot/refactor/study/presentation/controller/StudyMemberController.java rename to src/main/java/com/example/spot/study/presentation/controller/StudyMemberController.java index 41ecb5ab..50c976f3 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/controller/StudyMemberController.java +++ b/src/main/java/com/example/spot/study/presentation/controller/StudyMemberController.java @@ -1,40 +1,40 @@ -package com.example.spot.refactor.study.presentation.controller; - -import com.example.spot.refactor.common.api.ApiResponse; -import com.example.spot.refactor.common.api.code.status.SuccessStatus; -import com.example.spot.refactor.study.application.MemberStudyCommandService; -import com.example.spot.refactor.study.application.MemberStudyQueryService; -import com.example.spot.refactor.member.domain.validation.annotation.ExistMember; -import com.example.spot.refactor.schedule.domain.validation.annotation.ExistSchedule; -import com.example.spot.refactor.study.domain.validation.annotation.ExistStudy; -import com.example.spot.refactor.story.domain.validation.annotation.ExistStory; -import com.example.spot.refactor.todo.domain.validation.annotation.ExistToDo; -import com.example.spot.refactor.vote.domain.validation.annotation.ExistVote; -import com.example.spot.legacy.validation.annotation.IntSize; -import com.example.spot.legacy.validation.annotation.TextLength; -import com.example.spot.refactor.study.presentation.dto.request.ScheduleRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyHostWithdrawRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyMemberReportDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyQuizRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyVoteRequestDTO; -import com.example.spot.refactor.study.presentation.dto.response.ScheduleResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyImageResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyMemberResDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostResDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyQuizResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyTerminationResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyVoteResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyWithdrawalResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyApplyResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostResponseDTO; -import com.example.spot.refactor.member.presentation.dto.MemberResponseDTO; -import com.example.spot.refactor.study.presentation.dto.request.ToDoListRequestDTO; -import com.example.spot.refactor.study.presentation.dto.response.ToDoListResponseDTO.ToDoListCreateResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.ToDoListResponseDTO.ToDoListSearchResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.ToDoListResponseDTO.ToDoListUpdateResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyMemberResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyMemberResponseDTO.StudyApplicantDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyScheduleResponseDTO; +package com.example.spot.study.presentation.controller; + +import com.example.spot.common.api.ApiResponse; +import com.example.spot.common.api.code.status.SuccessStatus; +import com.example.spot.study.application.MemberStudyCommandService; +import com.example.spot.study.application.MemberStudyQueryService; +import com.example.spot.member.domain.validation.annotation.ExistMember; +import com.example.spot.schedule.domain.validation.annotation.ExistSchedule; +import com.example.spot.study.domain.validation.annotation.ExistStudy; +import com.example.spot.story.domain.validation.annotation.ExistStory; +import com.example.spot.todo.domain.validation.annotation.ExistToDo; +import com.example.spot.vote.domain.validation.annotation.ExistVote; +import com.example.spot.common.presentation.validator.IntSize; +import com.example.spot.common.presentation.validator.TextLength; +import com.example.spot.study.presentation.dto.request.ScheduleRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyHostWithdrawRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyMemberReportDTO; +import com.example.spot.study.presentation.dto.request.StudyQuizRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyVoteRequestDTO; +import com.example.spot.study.presentation.dto.response.ScheduleResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyImageResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyMemberResDTO; +import com.example.spot.study.presentation.dto.response.StudyPostResDTO; +import com.example.spot.study.presentation.dto.response.StudyQuizResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyTerminationResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyVoteResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyWithdrawalResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyApplyResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyPostResponseDTO; +import com.example.spot.member.presentation.dto.MemberResponseDTO; +import com.example.spot.study.presentation.dto.request.ToDoListRequestDTO; +import com.example.spot.study.presentation.dto.response.ToDoListResponseDTO.ToDoListCreateResponseDTO; +import com.example.spot.study.presentation.dto.response.ToDoListResponseDTO.ToDoListSearchResponseDTO; +import com.example.spot.study.presentation.dto.response.ToDoListResponseDTO.ToDoListUpdateResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyMemberResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyMemberResponseDTO.StudyApplicantDTO; +import com.example.spot.study.presentation.dto.response.StudyScheduleResponseDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/controller/StudyPostController.java b/src/main/java/com/example/spot/study/presentation/controller/StudyPostController.java similarity index 94% rename from src/main/java/com/example/spot/refactor/study/presentation/controller/StudyPostController.java rename to src/main/java/com/example/spot/study/presentation/controller/StudyPostController.java index d296fea9..418c9dfc 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/controller/StudyPostController.java +++ b/src/main/java/com/example/spot/study/presentation/controller/StudyPostController.java @@ -1,18 +1,18 @@ -package com.example.spot.refactor.study.presentation.controller; +package com.example.spot.study.presentation.controller; -import com.example.spot.refactor.common.api.ApiResponse; -import com.example.spot.refactor.common.api.code.status.SuccessStatus; -import com.example.spot.refactor.story.domain.enums.StoryCategoryQuery; -import com.example.spot.legacy.service.s3.S3ImageService; -import com.example.spot.refactor.study.application.StudyPostCommandService; -import com.example.spot.refactor.study.application.StudyPostQueryService; -import com.example.spot.refactor.study.domain.validation.annotation.ExistStudy; -import com.example.spot.refactor.story.domain.validation.annotation.ExistStory; -import com.example.spot.refactor.story.domain.validation.annotation.ExistStoryComment; -import com.example.spot.refactor.study.presentation.dto.request.StudyPostCommentRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyPostRequestDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostCommentResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostResDTO; +import com.example.spot.common.api.ApiResponse; +import com.example.spot.common.api.code.status.SuccessStatus; +import com.example.spot.story.domain.enums.StoryCategoryQuery; +import com.example.spot.common.application.s3.S3ImageService; +import com.example.spot.study.application.StudyPostCommandService; +import com.example.spot.study.application.StudyPostQueryService; +import com.example.spot.study.domain.validation.annotation.ExistStudy; +import com.example.spot.story.domain.validation.annotation.ExistStory; +import com.example.spot.story.domain.validation.annotation.ExistStoryComment; +import com.example.spot.study.presentation.dto.request.StudyPostCommentRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyPostRequestDTO; +import com.example.spot.study.presentation.dto.response.StudyPostCommentResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyPostResDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/src/main/java/com/example/spot/legacy/web/dto/search/BaseSearchRequestStudyDTO.java b/src/main/java/com/example/spot/study/presentation/dto/request/BaseSearchRequestStudyDTO.java similarity index 96% rename from src/main/java/com/example/spot/legacy/web/dto/search/BaseSearchRequestStudyDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/request/BaseSearchRequestStudyDTO.java index daf77172..fd40e967 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/search/BaseSearchRequestStudyDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/request/BaseSearchRequestStudyDTO.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.web.dto.search; +package com.example.spot.study.presentation.dto.request; -import com.example.spot.refactor.member.domain.enums.Gender; +import com.example.spot.member.domain.enums.Gender; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.AssertTrue; import jakarta.validation.constraints.Max; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/ScheduleRequestDTO.java b/src/main/java/com/example/spot/study/presentation/dto/request/ScheduleRequestDTO.java similarity index 76% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/request/ScheduleRequestDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/request/ScheduleRequestDTO.java index 7f0a8d23..f6404ed5 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/ScheduleRequestDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/request/ScheduleRequestDTO.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.study.presentation.dto.request; +package com.example.spot.study.presentation.dto.request; -import com.example.spot.refactor.schedule.domain.enums.SchedulePeriod; -import com.example.spot.legacy.validation.annotation.TextLength; +import com.example.spot.schedule.domain.enums.SchedulePeriod; +import com.example.spot.common.presentation.validator.TextLength; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/legacy/web/dto/search/SearchRequestStudyDTO.java b/src/main/java/com/example/spot/study/presentation/dto/request/SearchRequestStudyDTO.java similarity index 81% rename from src/main/java/com/example/spot/legacy/web/dto/search/SearchRequestStudyDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/request/SearchRequestStudyDTO.java index 8dbe4cd2..d74068ef 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/search/SearchRequestStudyDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/request/SearchRequestStudyDTO.java @@ -1,4 +1,4 @@ -package com.example.spot.legacy.web.dto.search; +package com.example.spot.study.presentation.dto.request; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/example/spot/legacy/web/dto/search/SearchRequestStudyWithThemeDTO.java b/src/main/java/com/example/spot/study/presentation/dto/request/SearchRequestStudyWithThemeDTO.java similarity index 81% rename from src/main/java/com/example/spot/legacy/web/dto/search/SearchRequestStudyWithThemeDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/request/SearchRequestStudyWithThemeDTO.java index 2c38e755..1bd6e701 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/search/SearchRequestStudyWithThemeDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/request/SearchRequestStudyWithThemeDTO.java @@ -1,6 +1,6 @@ -package com.example.spot.legacy.web.dto.search; +package com.example.spot.study.presentation.dto.request; -import com.example.spot.refactor.study.domain.enums.ThemeType; +import com.example.spot.study.domain.enums.ThemeType; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyHostWithdrawRequestDTO.java b/src/main/java/com/example/spot/study/presentation/dto/request/StudyHostWithdrawRequestDTO.java similarity index 78% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyHostWithdrawRequestDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/request/StudyHostWithdrawRequestDTO.java index c3442fd9..d5d4d3d0 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyHostWithdrawRequestDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/request/StudyHostWithdrawRequestDTO.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.study.presentation.dto.request; +package com.example.spot.study.presentation.dto.request; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyJoinRequestDTO.java b/src/main/java/com/example/spot/study/presentation/dto/request/StudyJoinRequestDTO.java similarity index 73% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyJoinRequestDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/request/StudyJoinRequestDTO.java index ae3eff3c..06be5d70 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyJoinRequestDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/request/StudyJoinRequestDTO.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.study.presentation.dto.request; +package com.example.spot.study.presentation.dto.request; -import com.example.spot.legacy.validation.annotation.TextLength; +import com.example.spot.common.presentation.validator.TextLength; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyMemberReportDTO.java b/src/main/java/com/example/spot/study/presentation/dto/request/StudyMemberReportDTO.java similarity index 65% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyMemberReportDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/request/StudyMemberReportDTO.java index bc75b41c..ef267a86 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyMemberReportDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/request/StudyMemberReportDTO.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.study.presentation.dto.request; +package com.example.spot.study.presentation.dto.request; -import com.example.spot.legacy.validation.annotation.TextLength; +import com.example.spot.common.presentation.validator.TextLength; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyPostCommentRequestDTO.java b/src/main/java/com/example/spot/study/presentation/dto/request/StudyPostCommentRequestDTO.java similarity index 75% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyPostCommentRequestDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/request/StudyPostCommentRequestDTO.java index 53e49d3e..1aee8ab2 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyPostCommentRequestDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/request/StudyPostCommentRequestDTO.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.study.presentation.dto.request; +package com.example.spot.study.presentation.dto.request; -import com.example.spot.legacy.validation.annotation.TextLength; +import com.example.spot.common.presentation.validator.TextLength; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyPostRequestDTO.java b/src/main/java/com/example/spot/study/presentation/dto/request/StudyPostRequestDTO.java similarity index 84% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyPostRequestDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/request/StudyPostRequestDTO.java index 0e571cc9..557334fa 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyPostRequestDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/request/StudyPostRequestDTO.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.study.presentation.dto.request; +package com.example.spot.study.presentation.dto.request; -import com.example.spot.refactor.story.domain.enums.StoryCategory; -import com.example.spot.legacy.validation.annotation.TextLength; +import com.example.spot.story.domain.enums.StoryCategory; +import com.example.spot.common.presentation.validator.TextLength; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyQuizRequestDTO.java b/src/main/java/com/example/spot/study/presentation/dto/request/StudyQuizRequestDTO.java similarity index 84% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyQuizRequestDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/request/StudyQuizRequestDTO.java index a32b61a7..3ed655e4 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyQuizRequestDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/request/StudyQuizRequestDTO.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.study.presentation.dto.request; +package com.example.spot.study.presentation.dto.request; -import com.example.spot.legacy.validation.annotation.TextLength; +import com.example.spot.common.presentation.validator.TextLength; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyRegisterRequestDTO.java b/src/main/java/com/example/spot/study/presentation/dto/request/StudyRegisterRequestDTO.java similarity index 72% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyRegisterRequestDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/request/StudyRegisterRequestDTO.java index b09f057e..9327f4bf 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyRegisterRequestDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/request/StudyRegisterRequestDTO.java @@ -1,10 +1,10 @@ -package com.example.spot.refactor.study.presentation.dto.request; +package com.example.spot.study.presentation.dto.request; -import com.example.spot.refactor.member.domain.enums.Gender; -import com.example.spot.refactor.study.domain.enums.ThemeType; -import com.example.spot.legacy.validation.annotation.IntSize; -import com.example.spot.legacy.validation.annotation.LongSize; -import com.example.spot.legacy.validation.annotation.TextLength; +import com.example.spot.member.domain.enums.Gender; +import com.example.spot.study.domain.enums.ThemeType; +import com.example.spot.common.presentation.validator.IntSize; +import com.example.spot.common.presentation.validator.LongSize; +import com.example.spot.common.presentation.validator.TextLength; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyVoteRequestDTO.java b/src/main/java/com/example/spot/study/presentation/dto/request/StudyVoteRequestDTO.java similarity index 90% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyVoteRequestDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/request/StudyVoteRequestDTO.java index 635269d6..c079b667 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/StudyVoteRequestDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/request/StudyVoteRequestDTO.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.study.presentation.dto.request; +package com.example.spot.study.presentation.dto.request; -import com.example.spot.legacy.validation.annotation.TextLength; +import com.example.spot.common.presentation.validator.TextLength; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/ToDoListRequestDTO.java b/src/main/java/com/example/spot/study/presentation/dto/request/ToDoListRequestDTO.java similarity index 85% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/request/ToDoListRequestDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/request/ToDoListRequestDTO.java index 297938bd..a04d558a 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/request/ToDoListRequestDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/request/ToDoListRequestDTO.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.study.presentation.dto.request; +package com.example.spot.study.presentation.dto.request; import java.time.LocalDate; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/ScheduleResponseDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/ScheduleResponseDTO.java similarity index 92% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/ScheduleResponseDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/ScheduleResponseDTO.java index 0f05a8d3..d74f0018 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/ScheduleResponseDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/ScheduleResponseDTO.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; -import com.example.spot.refactor.schedule.domain.Schedule; -import com.example.spot.refactor.schedule.domain.enums.SchedulePeriod; -import com.example.spot.refactor.study.domain.Study; +import com.example.spot.schedule.domain.Schedule; +import com.example.spot.schedule.domain.enums.SchedulePeriod; +import com.example.spot.study.domain.Study; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/legacy/web/dto/search/SearchResponseDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/SearchResponseDTO.java similarity index 84% rename from src/main/java/com/example/spot/legacy/web/dto/search/SearchResponseDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/SearchResponseDTO.java index efbc6c6a..4c638445 100644 --- a/src/main/java/com/example/spot/legacy/web/dto/search/SearchResponseDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/SearchResponseDTO.java @@ -1,15 +1,15 @@ -package com.example.spot.legacy.web.dto.search; +package com.example.spot.study.presentation.dto.response; -import com.example.spot.refactor.study.domain.aggregate.Region; -import com.example.spot.refactor.study.domain.aggregate.StudyRegion; -import com.example.spot.refactor.study.domain.aggregate.Theme; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.refactor.study.domain.enums.StudyLikeStatus; -import com.example.spot.refactor.study.domain.enums.StudyState; -import com.example.spot.refactor.study.domain.enums.ThemeType; -import com.example.spot.refactor.member.domain.association.PreferredStudy; -import com.example.spot.refactor.study.domain.aggregate.StudyTheme; -import com.example.spot.refactor.study.domain.Study; +import com.example.spot.study.domain.aggregate.Region; +import com.example.spot.study.domain.aggregate.StudyRegion; +import com.example.spot.study.domain.aggregate.Theme; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.study.domain.enums.StudyLikeStatus; +import com.example.spot.study.domain.enums.StudyState; +import com.example.spot.study.domain.enums.ThemeType; +import com.example.spot.member.domain.association.PreferredStudy; +import com.example.spot.study.domain.aggregate.StudyTheme; +import com.example.spot.study.domain.Study; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyApplyResponseDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/StudyApplyResponseDTO.java similarity index 69% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyApplyResponseDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/StudyApplyResponseDTO.java index 1d02df3d..2cfd8ad9 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyApplyResponseDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/StudyApplyResponseDTO.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; +import com.example.spot.study.domain.enums.StudyApplicationStatus; import java.time.LocalDateTime; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyImageResponseDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/StudyImageResponseDTO.java similarity index 90% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyImageResponseDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/StudyImageResponseDTO.java index b599027c..15a0dcae 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyImageResponseDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/StudyImageResponseDTO.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; -import com.example.spot.refactor.story.domain.aggregate.StoryImage; +import com.example.spot.story.domain.aggregate.StoryImage; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyInfoResponseDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/StudyInfoResponseDTO.java similarity index 91% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyInfoResponseDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/StudyInfoResponseDTO.java index 2aa8b101..7d21e80e 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyInfoResponseDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/StudyInfoResponseDTO.java @@ -1,10 +1,10 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.refactor.member.domain.enums.Gender; -import com.example.spot.refactor.study.domain.enums.ThemeType; -import com.example.spot.refactor.study.domain.Study; +import com.example.spot.member.domain.Member; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.member.domain.enums.Gender; +import com.example.spot.study.domain.enums.ThemeType; +import com.example.spot.study.domain.Study; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyJoinResponseDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/StudyJoinResponseDTO.java similarity index 87% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyJoinResponseDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/StudyJoinResponseDTO.java index 96d7a470..a8a42c39 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyJoinResponseDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/StudyJoinResponseDTO.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.study.domain.Study; +import com.example.spot.member.domain.Member; +import com.example.spot.study.domain.Study; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyLikeResponseDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/StudyLikeResponseDTO.java similarity index 73% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyLikeResponseDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/StudyLikeResponseDTO.java index 8c51017e..7d5c0310 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyLikeResponseDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/StudyLikeResponseDTO.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; -import com.example.spot.refactor.study.domain.enums.StudyLikeStatus; -import com.example.spot.refactor.member.domain.association.PreferredStudy; +import com.example.spot.study.domain.enums.StudyLikeStatus; +import com.example.spot.member.domain.association.PreferredStudy; import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyMemberResDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/StudyMemberResDTO.java similarity index 90% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyMemberResDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/StudyMemberResDTO.java index 9df37b81..99b3ba35 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyMemberResDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/StudyMemberResDTO.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; -import com.example.spot.refactor.member.domain.Member; +import com.example.spot.member.domain.Member; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyMemberResponseDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/StudyMemberResponseDTO.java similarity index 94% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyMemberResponseDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/StudyMemberResponseDTO.java index 4c13ce96..19bc2e3f 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyMemberResponseDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/StudyMemberResponseDTO.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; import java.util.List; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyPostCommentResponseDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/StudyPostCommentResponseDTO.java similarity index 95% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyPostCommentResponseDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/StudyPostCommentResponseDTO.java index 4f381f77..e7a8f5e6 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyPostCommentResponseDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/StudyPostCommentResponseDTO.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.story.domain.aggregate.LikedStoryComment; -import com.example.spot.refactor.story.domain.aggregate.StoryComment; +import com.example.spot.member.domain.Member; +import com.example.spot.story.domain.aggregate.LikedStoryComment; +import com.example.spot.story.domain.aggregate.StoryComment; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyPostResDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/StudyPostResDTO.java similarity index 94% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyPostResDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/StudyPostResDTO.java index fce8cf46..7d23ad32 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyPostResDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/StudyPostResDTO.java @@ -1,9 +1,9 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.story.domain.Story; -import com.example.spot.refactor.story.domain.enums.StoryCategory; -import com.example.spot.refactor.story.domain.aggregate.StoryImage; +import com.example.spot.member.domain.Member; +import com.example.spot.story.domain.Story; +import com.example.spot.story.domain.enums.StoryCategory; +import com.example.spot.story.domain.aggregate.StoryImage; import lombok.*; import java.time.LocalDateTime; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyPostResponseDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/StudyPostResponseDTO.java similarity index 79% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyPostResponseDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/StudyPostResponseDTO.java index 0cc4f62a..a2ad28f2 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyPostResponseDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/StudyPostResponseDTO.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyQuizResponseDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/StudyQuizResponseDTO.java similarity index 91% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyQuizResponseDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/StudyQuizResponseDTO.java index bca7fd32..495a1934 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyQuizResponseDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/StudyQuizResponseDTO.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; -import com.example.spot.refactor.schedule.domain.aggregate.Quiz; -import com.example.spot.refactor.schedule.domain.aggregate.QuizSubmission; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; +import com.example.spot.schedule.domain.aggregate.Quiz; +import com.example.spot.schedule.domain.aggregate.QuizSubmission; +import com.example.spot.study.domain.aggregate.StudyMember; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyRegisterResponseDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/StudyRegisterResponseDTO.java similarity index 84% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyRegisterResponseDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/StudyRegisterResponseDTO.java index 29986ea0..0845b32d 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyRegisterResponseDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/StudyRegisterResponseDTO.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; -import com.example.spot.refactor.study.domain.Study; +import com.example.spot.study.domain.Study; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyScheduleResponseDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/StudyScheduleResponseDTO.java similarity index 94% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyScheduleResponseDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/StudyScheduleResponseDTO.java index 25936fc8..bc66ab6b 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyScheduleResponseDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/StudyScheduleResponseDTO.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; import java.time.LocalDateTime; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyTerminationResponseDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/StudyTerminationResponseDTO.java similarity index 79% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyTerminationResponseDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/StudyTerminationResponseDTO.java index 417a7aa1..be58c7c1 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyTerminationResponseDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/StudyTerminationResponseDTO.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; -import com.example.spot.refactor.member.domain.enums.Status; -import com.example.spot.refactor.study.domain.Study; +import com.example.spot.member.domain.enums.Status; +import com.example.spot.study.domain.Study; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyVoteResponseDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/StudyVoteResponseDTO.java similarity index 96% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyVoteResponseDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/StudyVoteResponseDTO.java index fba19ff1..688c585d 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyVoteResponseDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/StudyVoteResponseDTO.java @@ -1,9 +1,9 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.vote.domain.Vote; -import com.example.spot.refactor.vote.domain.aggregate.VoteParticipant; -import com.example.spot.refactor.vote.domain.aggregate.VoteOption; +import com.example.spot.member.domain.Member; +import com.example.spot.vote.domain.Vote; +import com.example.spot.vote.domain.aggregate.VoteParticipant; +import com.example.spot.vote.domain.aggregate.VoteOption; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyWithdrawalResponseDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/StudyWithdrawalResponseDTO.java similarity index 81% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyWithdrawalResponseDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/StudyWithdrawalResponseDTO.java index 58031958..7c221b1a 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/StudyWithdrawalResponseDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/StudyWithdrawalResponseDTO.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.study.domain.Study; +import com.example.spot.member.domain.Member; +import com.example.spot.study.domain.Study; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/ToDoListResponseDTO.java b/src/main/java/com/example/spot/study/presentation/dto/response/ToDoListResponseDTO.java similarity index 96% rename from src/main/java/com/example/spot/refactor/study/presentation/dto/response/ToDoListResponseDTO.java rename to src/main/java/com/example/spot/study/presentation/dto/response/ToDoListResponseDTO.java index b727a602..2c96365c 100644 --- a/src/main/java/com/example/spot/refactor/study/presentation/dto/response/ToDoListResponseDTO.java +++ b/src/main/java/com/example/spot/study/presentation/dto/response/ToDoListResponseDTO.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.study.presentation.dto.response; +package com.example.spot.study.presentation.dto.response; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/src/main/java/com/example/spot/refactor/todo/domain/ToDo.java b/src/main/java/com/example/spot/todo/domain/ToDo.java similarity index 87% rename from src/main/java/com/example/spot/refactor/todo/domain/ToDo.java rename to src/main/java/com/example/spot/todo/domain/ToDo.java index cae4d8e7..167f502a 100644 --- a/src/main/java/com/example/spot/refactor/todo/domain/ToDo.java +++ b/src/main/java/com/example/spot/todo/domain/ToDo.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.todo.domain; +package com.example.spot.todo.domain; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.study.domain.Study; +import com.example.spot.member.domain.Member; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.study.domain.Study; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/src/main/java/com/example/spot/refactor/todo/domain/ToDoRepository.java b/src/main/java/com/example/spot/todo/domain/ToDoRepository.java similarity index 90% rename from src/main/java/com/example/spot/refactor/todo/domain/ToDoRepository.java rename to src/main/java/com/example/spot/todo/domain/ToDoRepository.java index 0b6ca7a1..71474865 100644 --- a/src/main/java/com/example/spot/refactor/todo/domain/ToDoRepository.java +++ b/src/main/java/com/example/spot/todo/domain/ToDoRepository.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.todo.domain; +package com.example.spot.todo.domain; import java.time.LocalDate; import java.util.List; diff --git a/src/main/java/com/example/spot/refactor/todo/domain/validation/annotation/ExistToDo.java b/src/main/java/com/example/spot/todo/domain/validation/annotation/ExistToDo.java similarity index 80% rename from src/main/java/com/example/spot/refactor/todo/domain/validation/annotation/ExistToDo.java rename to src/main/java/com/example/spot/todo/domain/validation/annotation/ExistToDo.java index b9a4dd80..18e74f32 100644 --- a/src/main/java/com/example/spot/refactor/todo/domain/validation/annotation/ExistToDo.java +++ b/src/main/java/com/example/spot/todo/domain/validation/annotation/ExistToDo.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.todo.domain.validation.annotation; +package com.example.spot.todo.domain.validation.annotation; -import com.example.spot.refactor.todo.domain.validation.validator.ExistToDoValidator; +import com.example.spot.todo.domain.validation.validator.ExistToDoValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; import java.lang.annotation.Documented; diff --git a/src/main/java/com/example/spot/refactor/todo/domain/validation/validator/ExistToDoValidator.java b/src/main/java/com/example/spot/todo/domain/validation/validator/ExistToDoValidator.java similarity index 81% rename from src/main/java/com/example/spot/refactor/todo/domain/validation/validator/ExistToDoValidator.java rename to src/main/java/com/example/spot/todo/domain/validation/validator/ExistToDoValidator.java index 05051214..1c1517b9 100644 --- a/src/main/java/com/example/spot/refactor/todo/domain/validation/validator/ExistToDoValidator.java +++ b/src/main/java/com/example/spot/todo/domain/validation/validator/ExistToDoValidator.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.todo.domain.validation.validator; +package com.example.spot.todo.domain.validation.validator; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.todo.domain.ToDoRepository; -import com.example.spot.refactor.todo.domain.validation.annotation.ExistToDo; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.todo.domain.ToDoRepository; +import com.example.spot.todo.domain.validation.annotation.ExistToDo; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/spot/refactor/vote/domain/Vote.java b/src/main/java/com/example/spot/vote/domain/Vote.java similarity index 87% rename from src/main/java/com/example/spot/refactor/vote/domain/Vote.java rename to src/main/java/com/example/spot/vote/domain/Vote.java index 5f505afd..2a8fa0da 100644 --- a/src/main/java/com/example/spot/refactor/vote/domain/Vote.java +++ b/src/main/java/com/example/spot/vote/domain/Vote.java @@ -1,9 +1,9 @@ -package com.example.spot.refactor.vote.domain; +package com.example.spot.vote.domain; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.vote.domain.aggregate.VoteOption; +import com.example.spot.member.domain.Member; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.study.domain.Study; +import com.example.spot.vote.domain.aggregate.VoteOption; import jakarta.persistence.*; import java.time.LocalDateTime; diff --git a/src/main/java/com/example/spot/refactor/vote/domain/VoteRepository.java b/src/main/java/com/example/spot/vote/domain/VoteRepository.java similarity index 93% rename from src/main/java/com/example/spot/refactor/vote/domain/VoteRepository.java rename to src/main/java/com/example/spot/vote/domain/VoteRepository.java index 966cfe44..dfce334b 100644 --- a/src/main/java/com/example/spot/refactor/vote/domain/VoteRepository.java +++ b/src/main/java/com/example/spot/vote/domain/VoteRepository.java @@ -1,4 +1,4 @@ -package com.example.spot.refactor.vote.domain; +package com.example.spot.vote.domain; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/refactor/vote/domain/aggregate/VoteOption.java b/src/main/java/com/example/spot/vote/domain/aggregate/VoteOption.java similarity index 91% rename from src/main/java/com/example/spot/refactor/vote/domain/aggregate/VoteOption.java rename to src/main/java/com/example/spot/vote/domain/aggregate/VoteOption.java index 77203041..16eac517 100644 --- a/src/main/java/com/example/spot/refactor/vote/domain/aggregate/VoteOption.java +++ b/src/main/java/com/example/spot/vote/domain/aggregate/VoteOption.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.vote.domain.aggregate; -import com.example.spot.refactor.common.entity.BaseEntity; -import com.example.spot.refactor.vote.domain.Vote; +package com.example.spot.vote.domain.aggregate; +import com.example.spot.common.entity.BaseEntity; +import com.example.spot.vote.domain.Vote; import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/src/main/java/com/example/spot/refactor/vote/domain/aggregate/VoteParticipant.java b/src/main/java/com/example/spot/vote/domain/aggregate/VoteParticipant.java similarity index 84% rename from src/main/java/com/example/spot/refactor/vote/domain/aggregate/VoteParticipant.java rename to src/main/java/com/example/spot/vote/domain/aggregate/VoteParticipant.java index 79aac084..415f3f83 100644 --- a/src/main/java/com/example/spot/refactor/vote/domain/aggregate/VoteParticipant.java +++ b/src/main/java/com/example/spot/vote/domain/aggregate/VoteParticipant.java @@ -1,7 +1,7 @@ -package com.example.spot.refactor.vote.domain.aggregate; +package com.example.spot.vote.domain.aggregate; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.common.entity.BaseEntity; +import com.example.spot.member.domain.Member; +import com.example.spot.common.entity.BaseEntity; import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/example/spot/refactor/vote/domain/repository/VoteOptionRepository.java b/src/main/java/com/example/spot/vote/domain/repository/VoteOptionRepository.java similarity index 75% rename from src/main/java/com/example/spot/refactor/vote/domain/repository/VoteOptionRepository.java rename to src/main/java/com/example/spot/vote/domain/repository/VoteOptionRepository.java index e9f6c50c..7d01696d 100644 --- a/src/main/java/com/example/spot/refactor/vote/domain/repository/VoteOptionRepository.java +++ b/src/main/java/com/example/spot/vote/domain/repository/VoteOptionRepository.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.vote.domain.repository; +package com.example.spot.vote.domain.repository; -import com.example.spot.refactor.vote.domain.aggregate.VoteOption; +import com.example.spot.vote.domain.aggregate.VoteOption; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/refactor/vote/domain/repository/VoteParticipantRepository.java b/src/main/java/com/example/spot/vote/domain/repository/VoteParticipantRepository.java similarity index 77% rename from src/main/java/com/example/spot/refactor/vote/domain/repository/VoteParticipantRepository.java rename to src/main/java/com/example/spot/vote/domain/repository/VoteParticipantRepository.java index 16cd8c8e..fe204a16 100644 --- a/src/main/java/com/example/spot/refactor/vote/domain/repository/VoteParticipantRepository.java +++ b/src/main/java/com/example/spot/vote/domain/repository/VoteParticipantRepository.java @@ -1,6 +1,6 @@ -package com.example.spot.refactor.vote.domain.repository; +package com.example.spot.vote.domain.repository; -import com.example.spot.refactor.vote.domain.aggregate.VoteParticipant; +import com.example.spot.vote.domain.aggregate.VoteParticipant; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/spot/vote/domain/validation/annotation/ExistVote.java b/src/main/java/com/example/spot/vote/domain/validation/annotation/ExistVote.java new file mode 100644 index 00000000..b2a1d369 --- /dev/null +++ b/src/main/java/com/example/spot/vote/domain/validation/annotation/ExistVote.java @@ -0,0 +1,4 @@ +package com.example.spot.vote.domain.validation.annotation; + +public @interface ExistVote { +} diff --git a/src/main/java/com/example/spot/refactor/vote/domain/validation/validator/ExistVoteValidator.java b/src/main/java/com/example/spot/vote/domain/validation/validator/ExistVoteValidator.java similarity index 81% rename from src/main/java/com/example/spot/refactor/vote/domain/validation/validator/ExistVoteValidator.java rename to src/main/java/com/example/spot/vote/domain/validation/validator/ExistVoteValidator.java index 9696cc6c..f9846777 100644 --- a/src/main/java/com/example/spot/refactor/vote/domain/validation/validator/ExistVoteValidator.java +++ b/src/main/java/com/example/spot/vote/domain/validation/validator/ExistVoteValidator.java @@ -1,8 +1,8 @@ -package com.example.spot.refactor.vote.domain.validation.validator; +package com.example.spot.vote.domain.validation.validator; -import com.example.spot.refactor.common.api.code.status.ErrorStatus; -import com.example.spot.refactor.vote.domain.VoteRepository; -import com.example.spot.refactor.vote.domain.validation.annotation.ExistVote; +import com.example.spot.common.api.code.status.ErrorStatus; +import com.example.spot.vote.domain.VoteRepository; +import com.example.spot.vote.domain.validation.annotation.ExistVote; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import lombok.RequiredArgsConstructor; diff --git a/src/test/java/com/example/spot/service/notification/NotificationCommandServiceTest.java b/src/test/java/com/example/spot/service/notification/NotificationCommandServiceTest.java index f7f777dc..cff57317 100644 --- a/src/test/java/com/example/spot/service/notification/NotificationCommandServiceTest.java +++ b/src/test/java/com/example/spot/service/notification/NotificationCommandServiceTest.java @@ -6,17 +6,17 @@ import static org.mockito.BDDMockito.*; import static org.mockito.Mockito.when; -import com.example.spot.refactor.common.api.exception.GeneralException; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.legacy.domain.Notification; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.legacy.domain.enums.NotifyType; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.legacy.repository.NotificationRepository; -import com.example.spot.legacy.service.notification.NotificationCommandServiceImpl; -import com.example.spot.legacy.web.dto.notification.NotificationResponseDTO.NotificationProcessDTO; +import com.example.spot.common.api.exception.GeneralException; +import com.example.spot.member.domain.Member; +import com.example.spot.notification.domain.Notification; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.notification.domain.enums.NotifyType; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.Study; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.notification.domain.NotificationRepository; +import com.example.spot.notification.application.notification.NotificationCommandServiceImpl; +import com.example.spot.notification.presentation.dto.notification.NotificationResponseDTO.NotificationProcessDTO; import java.util.Optional; diff --git a/src/test/java/com/example/spot/service/notification/NotificationQueryServiceTest.java b/src/test/java/com/example/spot/service/notification/NotificationQueryServiceTest.java index 9e556fbe..19d3c645 100644 --- a/src/test/java/com/example/spot/service/notification/NotificationQueryServiceTest.java +++ b/src/test/java/com/example/spot/service/notification/NotificationQueryServiceTest.java @@ -7,15 +7,15 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.when; -import com.example.spot.refactor.common.api.exception.GeneralException; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.legacy.domain.Notification; -import com.example.spot.legacy.domain.enums.NotifyType; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.legacy.repository.NotificationRepository; -import com.example.spot.legacy.service.notification.NotificationQueryServiceImpl; -import com.example.spot.legacy.web.dto.notification.NotificationResponseDTO.NotificationListDTO; -import com.example.spot.legacy.web.dto.notification.NotificationResponseDTO.StudyNotificationListDTO; +import com.example.spot.common.api.exception.GeneralException; +import com.example.spot.member.domain.Member; +import com.example.spot.notification.domain.Notification; +import com.example.spot.notification.domain.enums.NotifyType; +import com.example.spot.study.domain.Study; +import com.example.spot.notification.domain.NotificationRepository; +import com.example.spot.notification.application.notification.NotificationQueryServiceImpl; +import com.example.spot.notification.presentation.dto.notification.NotificationResponseDTO.NotificationListDTO; +import com.example.spot.notification.presentation.dto.notification.NotificationResponseDTO.StudyNotificationListDTO; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/example/spot/service/post/PostCommandServiceTest.java b/src/test/java/com/example/spot/service/post/PostCommandServiceTest.java index 4fb2a7bb..9087bd0e 100644 --- a/src/test/java/com/example/spot/service/post/PostCommandServiceTest.java +++ b/src/test/java/com/example/spot/service/post/PostCommandServiceTest.java @@ -1,35 +1,35 @@ package com.example.spot.service.post; -import com.example.spot.refactor.common.api.exception.handler.PostHandler; -import com.example.spot.legacy.domain.LikedPost; -import com.example.spot.legacy.domain.LikedPostComment; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.legacy.domain.Post; -import com.example.spot.legacy.domain.PostComment; -import com.example.spot.legacy.domain.PostReport; -import com.example.spot.legacy.domain.enums.Board; -import com.example.spot.legacy.domain.mapping.MemberScrap; -import com.example.spot.legacy.repository.LikedPostCommentRepository; -import com.example.spot.legacy.repository.LikedPostRepository; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.legacy.repository.MemberScrapRepository; -import com.example.spot.legacy.repository.PostCommentRepository; -import com.example.spot.legacy.repository.PostReportRepository; -import com.example.spot.legacy.repository.PostRepository; -import com.example.spot.legacy.service.post.LikedPostCommentQueryService; -import com.example.spot.legacy.service.post.LikedPostQueryService; -import com.example.spot.legacy.service.post.PostCommandServiceImpl; -import com.example.spot.legacy.web.dto.post.CommentCreateRequest; -import com.example.spot.legacy.web.dto.post.CommentCreateResponse; -import com.example.spot.legacy.web.dto.post.CommentLikeResponse; -import com.example.spot.legacy.web.dto.post.PostCreateRequest; -import com.example.spot.legacy.web.dto.post.PostCreateResponse; -import com.example.spot.legacy.web.dto.post.PostLikeResponse; -import com.example.spot.legacy.web.dto.post.PostReportResponse; -import com.example.spot.legacy.web.dto.post.PostUpdateRequest; -import com.example.spot.legacy.web.dto.post.ScrapAllDeleteRequest; -import com.example.spot.legacy.web.dto.post.ScrapPostResponse; -import com.example.spot.legacy.web.dto.post.ScrapsPostDeleteResponse; +import com.example.spot.common.api.exception.handler.PostHandler; +import com.example.spot.post.domain.association.LikedPost; +import com.example.spot.comment.domain.association.LikedPostComment; +import com.example.spot.member.domain.Member; +import com.example.spot.post.domain.Post; +import com.example.spot.comment.domain.PostComment; +import com.example.spot.report.domain.PostReport; +import com.example.spot.post.domain.enums.Board; +import com.example.spot.post.domain.association.MemberScrap; +import com.example.spot.comment.domain.association.LikedPostCommentRepository; +import com.example.spot.post.domain.association.LikedPostRepository; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.post.domain.association.MemberScrapRepository; +import com.example.spot.comment.domain.PostCommentRepository; +import com.example.spot.report.domain.PostReportRepository; +import com.example.spot.post.domain.PostRepository; +import com.example.spot.post.application.LikedPostCommentQueryService; +import com.example.spot.post.application.LikedPostQueryService; +import com.example.spot.post.application.PostCommandServiceImpl; +import com.example.spot.comment.presentation.dto.CommentCreateRequest; +import com.example.spot.comment.presentation.dto.CommentCreateResponse; +import com.example.spot.comment.presentation.dto.CommentLikeResponse; +import com.example.spot.post.presentation.dto.PostCreateRequest; +import com.example.spot.post.presentation.dto.PostCreateResponse; +import com.example.spot.post.presentation.dto.PostLikeResponse; +import com.example.spot.report.presentation.dto.PostReportResponse; +import com.example.spot.post.presentation.dto.PostUpdateRequest; +import com.example.spot.post.presentation.dto.ScrapAllDeleteRequest; +import com.example.spot.post.presentation.dto.ScrapPostResponse; +import com.example.spot.post.presentation.dto.ScrapsPostDeleteResponse; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/example/spot/service/post/PostQueryServiceTest.java b/src/test/java/com/example/spot/service/post/PostQueryServiceTest.java index c8f02909..256a67a5 100644 --- a/src/test/java/com/example/spot/service/post/PostQueryServiceTest.java +++ b/src/test/java/com/example/spot/service/post/PostQueryServiceTest.java @@ -1,30 +1,30 @@ package com.example.spot.service.post; -import com.example.spot.refactor.common.api.exception.handler.PostHandler; -import com.example.spot.legacy.domain.LikedPost; -import com.example.spot.legacy.domain.LikedPostComment; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.legacy.domain.Post; -import com.example.spot.legacy.domain.PostComment; -import com.example.spot.legacy.domain.enums.Board; -import com.example.spot.legacy.domain.enums.PostStatus; -import com.example.spot.legacy.domain.mapping.MemberScrap; -import com.example.spot.legacy.repository.LikedPostCommentRepository; -import com.example.spot.legacy.repository.LikedPostRepository; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.legacy.repository.MemberScrapRepository; -import com.example.spot.legacy.repository.PostCommentRepository; -import com.example.spot.legacy.repository.PostReportRepository; -import com.example.spot.legacy.repository.PostRepository; -import com.example.spot.legacy.service.post.LikedPostCommentQueryService; -import com.example.spot.legacy.service.post.LikedPostQueryService; -import com.example.spot.legacy.service.post.PostQueryServiceImpl; -import com.example.spot.legacy.web.dto.post.CommentResponse; -import com.example.spot.legacy.web.dto.post.PostAnnouncementResponse; -import com.example.spot.legacy.web.dto.post.PostBest5Response; -import com.example.spot.legacy.web.dto.post.PostPagingResponse; -import com.example.spot.legacy.web.dto.post.PostRepresentativeResponse; -import com.example.spot.legacy.web.dto.post.PostSingleResponse; +import com.example.spot.common.api.exception.handler.PostHandler; +import com.example.spot.post.domain.association.LikedPost; +import com.example.spot.comment.domain.association.LikedPostComment; +import com.example.spot.member.domain.Member; +import com.example.spot.post.domain.Post; +import com.example.spot.comment.domain.PostComment; +import com.example.spot.post.domain.enums.Board; +import com.example.spot.post.domain.enums.PostStatus; +import com.example.spot.post.domain.association.MemberScrap; +import com.example.spot.comment.domain.association.LikedPostCommentRepository; +import com.example.spot.post.domain.association.LikedPostRepository; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.post.domain.association.MemberScrapRepository; +import com.example.spot.comment.domain.PostCommentRepository; +import com.example.spot.report.domain.PostReportRepository; +import com.example.spot.post.domain.PostRepository; +import com.example.spot.post.application.LikedPostCommentQueryService; +import com.example.spot.post.application.LikedPostQueryService; +import com.example.spot.post.application.PostQueryServiceImpl; +import com.example.spot.comment.presentation.dto.CommentResponse; +import com.example.spot.post.presentation.controller.PostAnnouncementResponse; +import com.example.spot.post.presentation.dto.PostBest5Response; +import com.example.spot.post.presentation.dto.PostPagingResponse; +import com.example.spot.post.presentation.dto.PostRepresentativeResponse; +import com.example.spot.post.presentation.dto.PostSingleResponse; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/example/spot/service/study/StudyCommandServiceTest.java b/src/test/java/com/example/spot/service/study/StudyCommandServiceTest.java index ffab6be1..df0280fc 100644 --- a/src/test/java/com/example/spot/service/study/StudyCommandServiceTest.java +++ b/src/test/java/com/example/spot/service/study/StudyCommandServiceTest.java @@ -4,30 +4,30 @@ import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; -import com.example.spot.refactor.study.domain.aggregate.StudyRegion; -import com.example.spot.refactor.common.api.exception.handler.StudyHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.study.domain.aggregate.Region; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.aggregate.Theme; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.refactor.member.domain.enums.Gender; -import com.example.spot.refactor.study.domain.enums.StudyState; -import com.example.spot.refactor.study.domain.enums.ThemeType; -import com.example.spot.refactor.study.domain.aggregate.StudyTheme; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.refactor.study.domain.repository.RegionRepository; -import com.example.spot.refactor.study.domain.repository.StudyRegionRepository; -import com.example.spot.refactor.study.domain.StudyRepository; -import com.example.spot.refactor.study.domain.repository.StudyThemeRepository; -import com.example.spot.refactor.study.domain.repository.ThemeRepository; -import com.example.spot.refactor.study.application.StudyCommandServiceImpl; -import com.example.spot.refactor.study.presentation.dto.request.StudyJoinRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyRegisterRequestDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyJoinResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyRegisterResponseDTO; +import com.example.spot.study.domain.aggregate.StudyRegion; +import com.example.spot.common.api.exception.handler.StudyHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.study.domain.aggregate.Region; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.aggregate.Theme; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.member.domain.enums.Gender; +import com.example.spot.study.domain.enums.StudyState; +import com.example.spot.study.domain.enums.ThemeType; +import com.example.spot.study.domain.aggregate.StudyTheme; +import com.example.spot.study.domain.Study; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.study.domain.repository.RegionRepository; +import com.example.spot.study.domain.repository.StudyRegionRepository; +import com.example.spot.study.domain.StudyRepository; +import com.example.spot.study.domain.repository.StudyThemeRepository; +import com.example.spot.study.domain.repository.ThemeRepository; +import com.example.spot.study.application.StudyCommandServiceImpl; +import com.example.spot.study.presentation.dto.request.StudyJoinRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyRegisterRequestDTO; +import com.example.spot.study.presentation.dto.response.StudyJoinResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyRegisterResponseDTO; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/spot/service/study/StudyQueryServiceTest.java b/src/test/java/com/example/spot/service/study/StudyQueryServiceTest.java index ba785744..8c0f11d8 100644 --- a/src/test/java/com/example/spot/service/study/StudyQueryServiceTest.java +++ b/src/test/java/com/example/spot/service/study/StudyQueryServiceTest.java @@ -9,37 +9,40 @@ import static org.mockito.Mockito.when; import static org.mockito.internal.verification.VerificationModeFactory.times; -import com.example.spot.refactor.study.domain.aggregate.StudyRegion; -import com.example.spot.refactor.common.api.exception.handler.MemberHandler; -import com.example.spot.refactor.common.api.exception.handler.StudyHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.study.domain.aggregate.Region; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.aggregate.Theme; -import com.example.spot.refactor.study.domain.enums.*; -import com.example.spot.refactor.member.domain.enums.Gender; -import com.example.spot.refactor.member.domain.enums.Status; -import com.example.spot.refactor.study.domain.enums.ThemeType; -import com.example.spot.refactor.member.domain.association.MemberTheme; -import com.example.spot.refactor.member.domain.association.PreferredRegion; -import com.example.spot.refactor.member.domain.association.PreferredStudy; -import com.example.spot.refactor.study.domain.aggregate.StudyTheme; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.refactor.member.domain.association.MemberThemeRepository; -import com.example.spot.refactor.member.domain.association.PreferredRegionRepository; -import com.example.spot.refactor.member.domain.association.PreferredStudyRepository; -import com.example.spot.refactor.study.domain.repository.StudyRegionRepository; -import com.example.spot.refactor.study.domain.StudyRepository; -import com.example.spot.refactor.study.domain.repository.StudyThemeRepository; -import com.example.spot.refactor.study.domain.repository.ThemeRepository; -import com.example.spot.refactor.study.application.StudyQueryServiceImpl; -import com.example.spot.legacy.web.dto.search.SearchRequestStudyDTO; -import com.example.spot.legacy.web.dto.search.SearchRequestStudyWithThemeDTO; -import com.example.spot.legacy.web.dto.search.SearchResponseDTO.MyPageDTO; -import com.example.spot.legacy.web.dto.search.SearchResponseDTO.StudyPreviewDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyInfoResponseDTO.StudyInfoDTO; +import com.example.spot.study.domain.aggregate.StudyRegion; +import com.example.spot.common.api.exception.handler.MemberHandler; +import com.example.spot.common.api.exception.handler.StudyHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.study.domain.aggregate.Region; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.aggregate.Theme; +import com.example.spot.member.domain.enums.Gender; +import com.example.spot.member.domain.enums.Status; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.study.domain.enums.StudyLikeStatus; +import com.example.spot.study.domain.enums.StudySortBy; +import com.example.spot.study.domain.enums.StudyState; +import com.example.spot.study.domain.enums.ThemeType; +import com.example.spot.member.domain.association.MemberTheme; +import com.example.spot.member.domain.association.PreferredRegion; +import com.example.spot.member.domain.association.PreferredStudy; +import com.example.spot.study.domain.aggregate.StudyTheme; +import com.example.spot.study.domain.Study; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.member.domain.association.MemberThemeRepository; +import com.example.spot.member.domain.association.PreferredRegionRepository; +import com.example.spot.member.domain.association.PreferredStudyRepository; +import com.example.spot.study.domain.repository.StudyRegionRepository; +import com.example.spot.study.domain.StudyRepository; +import com.example.spot.study.domain.repository.StudyThemeRepository; +import com.example.spot.study.domain.repository.ThemeRepository; +import com.example.spot.study.application.StudyQueryServiceImpl; +import com.example.spot.study.presentation.dto.request.SearchRequestStudyDTO; +import com.example.spot.study.presentation.dto.request.SearchRequestStudyWithThemeDTO; +import com.example.spot.study.presentation.dto.response.SearchResponseDTO.MyPageDTO; +import com.example.spot.study.presentation.dto.response.SearchResponseDTO.StudyPreviewDTO; +import com.example.spot.study.presentation.dto.response.StudyInfoResponseDTO.StudyInfoDTO; import java.util.Collections; import java.util.HashMap; import java.util.List; diff --git a/src/test/java/com/example/spot/service/study/studymember/StudyMemberCommandServiceTest.java b/src/test/java/com/example/spot/service/study/studymember/StudyMemberCommandServiceTest.java index 4888d6b9..ce3c08c8 100644 --- a/src/test/java/com/example/spot/service/study/studymember/StudyMemberCommandServiceTest.java +++ b/src/test/java/com/example/spot/service/study/studymember/StudyMemberCommandServiceTest.java @@ -7,27 +7,27 @@ import static org.mockito.BDDMockito.*; import static org.mockito.Mockito.when; -import com.example.spot.refactor.common.api.exception.handler.StudyHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.todo.domain.ToDo; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.refactor.member.domain.enums.Status; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.refactor.study.domain.StudyRepository; -import com.example.spot.refactor.todo.domain.ToDoRepository; -import com.example.spot.refactor.study.application.MemberStudyCommandServiceImpl; -import com.example.spot.refactor.study.presentation.dto.request.ToDoListRequestDTO.ToDoListCreateDTO; -import com.example.spot.refactor.study.presentation.dto.response.ToDoListResponseDTO.ToDoListCreateResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.ToDoListResponseDTO.ToDoListUpdateResponseDTO; +import com.example.spot.common.api.exception.handler.StudyHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.todo.domain.ToDo; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.member.domain.enums.Status; +import com.example.spot.study.domain.Study; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.study.domain.StudyRepository; +import com.example.spot.todo.domain.ToDoRepository; +import com.example.spot.study.application.MemberStudyCommandServiceImpl; +import com.example.spot.study.presentation.dto.request.ToDoListRequestDTO.ToDoListCreateDTO; +import com.example.spot.study.presentation.dto.response.ToDoListResponseDTO.ToDoListCreateResponseDTO; +import com.example.spot.study.presentation.dto.response.ToDoListResponseDTO.ToDoListUpdateResponseDTO; import java.time.LocalDate; import java.util.Collections; import java.util.Optional; -import com.example.spot.refactor.study.presentation.dto.response.StudyTerminationResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyWithdrawalResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyTerminationResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyWithdrawalResponseDTO; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/spot/service/study/studymember/StudyMemberQueryServiceTest.java b/src/test/java/com/example/spot/service/study/studymember/StudyMemberQueryServiceTest.java index 551f7d1a..fcfde847 100644 --- a/src/test/java/com/example/spot/service/study/studymember/StudyMemberQueryServiceTest.java +++ b/src/test/java/com/example/spot/service/study/studymember/StudyMemberQueryServiceTest.java @@ -1,27 +1,27 @@ package com.example.spot.service.study.studymember; -import com.example.spot.refactor.common.api.exception.GeneralException; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.story.domain.Story; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.schedule.domain.Schedule; -import com.example.spot.refactor.todo.domain.ToDo; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.refactor.story.domain.enums.StoryCategory; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.refactor.schedule.domain.ScheduleRepository; -import com.example.spot.refactor.story.domain.StoryRepository; -import com.example.spot.refactor.todo.domain.ToDoRepository; -import com.example.spot.refactor.common.security.utils.SecurityUtils; -import com.example.spot.refactor.study.application.MemberStudyQueryServiceImpl; -import com.example.spot.refactor.study.presentation.dto.response.ToDoListResponseDTO.ToDoListSearchResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyMemberResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyMemberResponseDTO.StudyApplicantDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyMemberResponseDTO.StudyApplyMemberDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyScheduleResponseDTO; +import com.example.spot.common.api.exception.GeneralException; +import com.example.spot.member.domain.Member; +import com.example.spot.story.domain.Story; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.schedule.domain.Schedule; +import com.example.spot.todo.domain.ToDo; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.story.domain.enums.StoryCategory; +import com.example.spot.study.domain.Study; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.schedule.domain.ScheduleRepository; +import com.example.spot.story.domain.StoryRepository; +import com.example.spot.todo.domain.ToDoRepository; +import com.example.spot.common.security.utils.SecurityUtils; +import com.example.spot.study.application.MemberStudyQueryServiceImpl; +import com.example.spot.study.presentation.dto.response.ToDoListResponseDTO.ToDoListSearchResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyMemberResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyMemberResponseDTO.StudyApplicantDTO; +import com.example.spot.study.presentation.dto.response.StudyMemberResponseDTO.StudyApplyMemberDTO; +import com.example.spot.study.presentation.dto.response.StudyPostResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyScheduleResponseDTO; import java.time.LocalDate; import java.util.Collections; import java.util.List; diff --git a/src/test/java/com/example/spot/service/study/studypost/StoryCommandServiceTest.java b/src/test/java/com/example/spot/service/study/studypost/StoryCommandServiceTest.java index a678d8f2..5c1d019c 100644 --- a/src/test/java/com/example/spot/service/study/studypost/StoryCommandServiceTest.java +++ b/src/test/java/com/example/spot/service/study/studypost/StoryCommandServiceTest.java @@ -1,29 +1,33 @@ package com.example.spot.service.study.studypost; -import com.example.spot.refactor.common.api.exception.handler.StudyHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.legacy.domain.Notification; -import com.example.spot.refactor.story.domain.Story; -import com.example.spot.refactor.story.domain.StoryRepository; -import com.example.spot.refactor.story.domain.aggregate.LikedStory; -import com.example.spot.refactor.story.domain.aggregate.LikedStoryComment; -import com.example.spot.refactor.story.domain.aggregate.StoryComment; -import com.example.spot.refactor.story.domain.repository.*; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.refactor.member.domain.enums.Gender; -import com.example.spot.refactor.story.domain.enums.StoryCategory; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.legacy.repository.NotificationRepository; -import com.example.spot.refactor.study.domain.StudyRepository; -import com.example.spot.refactor.study.application.StudyPostCommandServiceImpl; -import com.example.spot.legacy.service.s3.S3ImageService; -import com.example.spot.refactor.study.presentation.dto.request.StudyPostCommentRequestDTO; -import com.example.spot.refactor.study.presentation.dto.request.StudyPostRequestDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostCommentResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostResDTO; +import com.example.spot.common.api.exception.handler.StudyHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.notification.domain.Notification; +import com.example.spot.story.domain.Story; +import com.example.spot.story.domain.StoryRepository; +import com.example.spot.story.domain.aggregate.LikedStory; +import com.example.spot.story.domain.aggregate.LikedStoryComment; +import com.example.spot.story.domain.aggregate.StoryComment; +import com.example.spot.story.domain.repository.LikedStoryCommentRepository; +import com.example.spot.story.domain.repository.LikedStoryRepository; +import com.example.spot.story.domain.repository.StoryCommentRepository; +import com.example.spot.story.domain.repository.StoryImageRepository; +import com.example.spot.story.domain.repository.StoryReportRepository; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.member.domain.enums.Gender; +import com.example.spot.story.domain.enums.StoryCategory; +import com.example.spot.study.domain.Study; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.notification.domain.NotificationRepository; +import com.example.spot.study.domain.StudyRepository; +import com.example.spot.study.application.StudyPostCommandServiceImpl; +import com.example.spot.common.application.s3.S3ImageService; +import com.example.spot.study.presentation.dto.request.StudyPostCommentRequestDTO; +import com.example.spot.study.presentation.dto.request.StudyPostRequestDTO; +import com.example.spot.study.presentation.dto.response.StudyPostCommentResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyPostResDTO; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/spot/service/study/studypost/StoryQueryServiceTest.java b/src/test/java/com/example/spot/service/study/studypost/StoryQueryServiceTest.java index 2de02303..1101e204 100644 --- a/src/test/java/com/example/spot/service/study/studypost/StoryQueryServiceTest.java +++ b/src/test/java/com/example/spot/service/study/studypost/StoryQueryServiceTest.java @@ -1,26 +1,26 @@ package com.example.spot.service.study.studypost; -import com.example.spot.refactor.common.api.exception.handler.StudyHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.story.domain.Story; -import com.example.spot.refactor.story.domain.aggregate.LikedStory; -import com.example.spot.refactor.story.domain.aggregate.LikedStoryComment; -import com.example.spot.refactor.story.domain.aggregate.StoryComment; -import com.example.spot.refactor.story.domain.enums.StoryCategory; -import com.example.spot.refactor.story.domain.repository.LikedStoryRepository; -import com.example.spot.refactor.story.domain.repository.StoryCommentRepository; -import com.example.spot.refactor.story.domain.StoryRepository; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.refactor.member.domain.enums.Gender; -import com.example.spot.refactor.story.domain.enums.StoryCategoryQuery; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.refactor.study.domain.StudyRepository; -import com.example.spot.refactor.study.application.StudyPostQueryServiceImpl; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostCommentResponseDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyPostResDTO; +import com.example.spot.common.api.exception.handler.StudyHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.story.domain.Story; +import com.example.spot.story.domain.aggregate.LikedStory; +import com.example.spot.story.domain.aggregate.LikedStoryComment; +import com.example.spot.story.domain.aggregate.StoryComment; +import com.example.spot.story.domain.enums.StoryCategory; +import com.example.spot.story.domain.repository.LikedStoryRepository; +import com.example.spot.story.domain.repository.StoryCommentRepository; +import com.example.spot.story.domain.StoryRepository; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.member.domain.enums.Gender; +import com.example.spot.story.domain.enums.StoryCategoryQuery; +import com.example.spot.study.domain.Study; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.study.domain.StudyRepository; +import com.example.spot.study.application.StudyPostQueryServiceImpl; +import com.example.spot.study.presentation.dto.response.StudyPostCommentResponseDTO; +import com.example.spot.study.presentation.dto.response.StudyPostResDTO; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/spot/service/study/studyschedule/StudyAttendanceCommandServiceTest.java b/src/test/java/com/example/spot/service/study/studyschedule/StudyAttendanceCommandServiceTest.java index 826c504b..47b0ee99 100644 --- a/src/test/java/com/example/spot/service/study/studyschedule/StudyAttendanceCommandServiceTest.java +++ b/src/test/java/com/example/spot/service/study/studyschedule/StudyAttendanceCommandServiceTest.java @@ -1,23 +1,23 @@ package com.example.spot.service.study.studyschedule; -import com.example.spot.refactor.common.api.exception.handler.StudyHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.schedule.domain.*; -import com.example.spot.refactor.schedule.domain.aggregate.Quiz; -import com.example.spot.refactor.schedule.domain.aggregate.QuizSubmission; -import com.example.spot.refactor.schedule.domain.repository.QuizRepository; -import com.example.spot.refactor.schedule.domain.repository.QuizSubmissionRepository; -import com.example.spot.refactor.schedule.domain.ScheduleRepository; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.refactor.member.domain.enums.Gender; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.refactor.study.domain.StudyRepository; -import com.example.spot.refactor.study.application.MemberStudyCommandServiceImpl; -import com.example.spot.refactor.study.presentation.dto.request.StudyQuizRequestDTO; -import com.example.spot.refactor.study.presentation.dto.response.StudyQuizResponseDTO; +import com.example.spot.common.api.exception.handler.StudyHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.schedule.domain.Schedule; +import com.example.spot.schedule.domain.aggregate.Quiz; +import com.example.spot.schedule.domain.aggregate.QuizSubmission; +import com.example.spot.schedule.domain.repository.QuizRepository; +import com.example.spot.schedule.domain.repository.QuizSubmissionRepository; +import com.example.spot.schedule.domain.ScheduleRepository; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.member.domain.enums.Gender; +import com.example.spot.study.domain.Study; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.study.domain.StudyRepository; +import com.example.spot.study.application.MemberStudyCommandServiceImpl; +import com.example.spot.study.presentation.dto.request.StudyQuizRequestDTO; +import com.example.spot.study.presentation.dto.response.StudyQuizResponseDTO; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/spot/service/study/studyschedule/StudyAttendanceQueryServiceTest.java b/src/test/java/com/example/spot/service/study/studyschedule/StudyAttendanceQueryServiceTest.java index 9d778629..7c90e95c 100644 --- a/src/test/java/com/example/spot/service/study/studyschedule/StudyAttendanceQueryServiceTest.java +++ b/src/test/java/com/example/spot/service/study/studyschedule/StudyAttendanceQueryServiceTest.java @@ -1,22 +1,22 @@ package com.example.spot.service.study.studyschedule; -import com.example.spot.refactor.common.api.exception.handler.StudyHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.schedule.domain.*; -import com.example.spot.refactor.schedule.domain.aggregate.Quiz; -import com.example.spot.refactor.schedule.domain.aggregate.QuizSubmission; -import com.example.spot.refactor.schedule.domain.repository.QuizRepository; -import com.example.spot.refactor.schedule.domain.repository.QuizSubmissionRepository; -import com.example.spot.refactor.schedule.domain.ScheduleRepository; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.refactor.member.domain.enums.Gender; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.refactor.study.domain.StudyRepository; -import com.example.spot.refactor.study.application.MemberStudyQueryServiceImpl; -import com.example.spot.refactor.study.presentation.dto.response.StudyQuizResponseDTO; +import com.example.spot.common.api.exception.handler.StudyHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.schedule.domain.Schedule; +import com.example.spot.schedule.domain.aggregate.Quiz; +import com.example.spot.schedule.domain.aggregate.QuizSubmission; +import com.example.spot.schedule.domain.repository.QuizRepository; +import com.example.spot.schedule.domain.repository.QuizSubmissionRepository; +import com.example.spot.schedule.domain.ScheduleRepository; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.member.domain.enums.Gender; +import com.example.spot.study.domain.Study; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.study.domain.StudyRepository; +import com.example.spot.study.application.MemberStudyQueryServiceImpl; +import com.example.spot.study.presentation.dto.response.StudyQuizResponseDTO; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/spot/service/study/studyschedule/StudyScheduleCommandServiceTest.java b/src/test/java/com/example/spot/service/study/studyschedule/StudyScheduleCommandServiceTest.java index 6f17fb71..9d855074 100644 --- a/src/test/java/com/example/spot/service/study/studyschedule/StudyScheduleCommandServiceTest.java +++ b/src/test/java/com/example/spot/service/study/studyschedule/StudyScheduleCommandServiceTest.java @@ -1,22 +1,22 @@ package com.example.spot.service.study.studyschedule; -import com.example.spot.refactor.common.api.exception.handler.StudyHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.legacy.domain.Notification; -import com.example.spot.refactor.schedule.domain.Schedule; -import com.example.spot.refactor.schedule.domain.enums.SchedulePeriod; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.refactor.member.domain.enums.Gender; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.legacy.repository.NotificationRepository; -import com.example.spot.refactor.schedule.domain.ScheduleRepository; -import com.example.spot.refactor.study.domain.StudyRepository; -import com.example.spot.refactor.study.application.MemberStudyCommandServiceImpl; -import com.example.spot.refactor.study.presentation.dto.request.ScheduleRequestDTO; -import com.example.spot.refactor.study.presentation.dto.response.ScheduleResponseDTO; +import com.example.spot.common.api.exception.handler.StudyHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.notification.domain.Notification; +import com.example.spot.schedule.domain.Schedule; +import com.example.spot.schedule.domain.enums.SchedulePeriod; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.member.domain.enums.Gender; +import com.example.spot.study.domain.Study; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.notification.domain.NotificationRepository; +import com.example.spot.schedule.domain.ScheduleRepository; +import com.example.spot.study.domain.StudyRepository; +import com.example.spot.study.application.MemberStudyCommandServiceImpl; +import com.example.spot.study.presentation.dto.request.ScheduleRequestDTO; +import com.example.spot.study.presentation.dto.response.ScheduleResponseDTO; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/example/spot/service/study/studyschedule/StudyScheduleQueryServiceTest.java b/src/test/java/com/example/spot/service/study/studyschedule/StudyScheduleQueryServiceTest.java index a8694a3f..56478d32 100644 --- a/src/test/java/com/example/spot/service/study/studyschedule/StudyScheduleQueryServiceTest.java +++ b/src/test/java/com/example/spot/service/study/studyschedule/StudyScheduleQueryServiceTest.java @@ -1,19 +1,19 @@ package com.example.spot.service.study.studyschedule; -import com.example.spot.refactor.common.api.exception.handler.StudyHandler; -import com.example.spot.refactor.member.domain.Member; -import com.example.spot.refactor.schedule.domain.Schedule; -import com.example.spot.refactor.schedule.domain.enums.SchedulePeriod; -import com.example.spot.refactor.study.domain.enums.StudyApplicationStatus; -import com.example.spot.refactor.member.domain.enums.Gender; -import com.example.spot.refactor.study.domain.aggregate.StudyMember; -import com.example.spot.refactor.study.domain.Study; -import com.example.spot.refactor.member.domain.MemberRepository; -import com.example.spot.refactor.study.domain.repository.StudyMemberRepository; -import com.example.spot.refactor.schedule.domain.ScheduleRepository; -import com.example.spot.refactor.study.domain.StudyRepository; -import com.example.spot.refactor.study.application.MemberStudyQueryServiceImpl; -import com.example.spot.refactor.study.presentation.dto.response.ScheduleResponseDTO; +import com.example.spot.common.api.exception.handler.StudyHandler; +import com.example.spot.member.domain.Member; +import com.example.spot.schedule.domain.Schedule; +import com.example.spot.schedule.domain.enums.SchedulePeriod; +import com.example.spot.study.domain.enums.StudyApplicationStatus; +import com.example.spot.member.domain.enums.Gender; +import com.example.spot.study.domain.aggregate.StudyMember; +import com.example.spot.study.domain.Study; +import com.example.spot.member.domain.MemberRepository; +import com.example.spot.study.domain.repository.StudyMemberRepository; +import com.example.spot.schedule.domain.ScheduleRepository; +import com.example.spot.study.domain.StudyRepository; +import com.example.spot.study.application.MemberStudyQueryServiceImpl; +import com.example.spot.study.presentation.dto.response.ScheduleResponseDTO; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test;