From d63cc2c9625b08229459a05417e77469e7b7449a Mon Sep 17 00:00:00 2001 From: welshimeat Date: Wed, 28 Apr 2021 01:17:22 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20[#3]=20Controller,=20Service=20?= =?UTF-8?q?=EC=9D=BC=EA=B4=80=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Moira/config/logging/LoggerInterceptor.java | 2 ++ .../{homeController.java => HomeController.java} | 2 +- .../JwtController.java} | 12 ++++++------ .../{security => jwt}/dto/LoginRequestDto.java | 2 +- .../{security => jwt}/dto/LoginResponseDto.java | 2 +- .../{user => myPage}/MyPageController.java | 6 +++--- .../dto}/AppliedProjectInfoResponseDto.java | 2 +- .../dto}/HashtagResponseDto.java | 2 +- .../dto}/LikedProjectResponseDto.java | 3 +-- .../dto}/LikedUserPoolResponseDto.java | 2 +- .../myPage => myPage/dto}/MyPageResponseDto.java | 2 +- .../dto}/WrittenProjectInfoResponseDto.java | 2 +- .../MyPageEditController.java | 7 +++---- .../dto}/MyPageEditHashtagRequestDto.java | 2 +- .../dto}/MyPageEditHashtagResponseDto.java | 4 ++-- .../dto}/MyPageEditIntroductionRequestDto.java | 2 +- .../dto}/MyPageEditIntroductionResponseDto.java | 2 +- .../dto}/MyPageEditNicknameRequestDto.java | 2 +- .../dto}/MyPageEditNicknameResponseDto.java | 2 +- .../dto}/MyPageEditPositionInfoDto.java | 2 +- .../dto}/MyPageEditPositionRequestDto.java | 2 +- .../dto}/MyPageEditPositionResponseDto.java | 2 +- .../dto}/MyPageEditResponseDto.java | 4 ++-- .../MyProjectController.java | 8 ++++---- .../dto}/MyProjectResponseDTO.java | 2 +- .../dto}/MyProjectTeammateResponseDTO.java | 2 +- .../dto}/MyProjectsResponseDTO.java | 2 +- .../controller/project/ProjectController.java | 1 - .../{project => }/ProjectModifyRequestDTO.java | 2 +- .../ProjectModifyStatusRequestDTO.java | 2 +- .../ProjectPositionCategoryDTO.java | 2 +- .../dto/{project => }/ProjectRequestDTO.java | 4 +--- .../dto/{project => }/ProjectResponseDTO.java | 2 +- .../dto/{project => }/ProjectsResponseDTO.java | 2 +- .../ProjectApplyController.java | 9 ++++++--- .../dto}/ProjectApplicantsResponseDTO.java | 2 +- .../dto}/ProjectApplyModifyStatusRequestDTO.java | 2 +- .../dto}/ProjectApplyRequestDTO.java | 2 +- .../dto}/ProjectApplyResponseDTO.java | 4 ++-- .../ProjectCommentController.java | 8 ++++---- .../dto}/ProjectCommentRequestDTO.java | 2 +- .../dto}/ProjectCommentResponseDTO.java | 2 +- .../controller/report/ReportController.java | 2 -- .../ReviewController.java} | 16 ++++++++-------- .../dto/ComplimentMarkDto.java | 2 +- .../dto/UserReviewAddRequestDto.java | 2 +- .../dto/UserReviewAddResponseDto.java | 2 +- .../dto/UserReviewDetailResponseDto.java | 2 +- .../dto/UserReviewResponseDto.java | 2 +- .../{user => signup}/SignupController.java | 12 ++++++------ .../dto}/PositionCategoryResponseDto.java | 2 +- .../dto}/PositionResponseDto.java | 2 +- .../signup => signup/dto}/SignupRequestDto.java | 2 +- .../signup => signup/dto}/SignupResponseDto.java | 4 ++-- .../dto/UserPoolDetailProfileResponseDto.java | 4 +--- .../Moira/domain/position/UserPosition.java | 2 +- src/main/java/MakeUs/Moira/domain/user/User.java | 7 +++---- .../MakeUs/Moira/domain/user/UserHistory.java | 4 ++-- .../Moira/domain/userHistory/UserHistory.java | 4 ++-- .../Moira/domain/userReview/UserReview.java | 2 +- .../java/MakeUs/Moira/exception/ErrorCode.java | 2 +- .../MakeUs/Moira/service/alarm/AlarmService.java | 2 +- .../Moira/service/hashtag/HashTagService.java | 2 +- .../CustomUserDetailService.java | 2 +- .../LoginService.java => jwt/JwtService.java} | 8 ++++---- .../service/{user => myPage}/MyPageService.java | 4 ++-- .../{user => myPageEdit}/MyPageEditService.java | 7 ++----- .../{project => myProject}/MyProjectService.java | 9 ++++----- .../Moira/service/position/PositionService.java | 4 ++-- .../Moira/service/project/ProjectService.java | 5 +---- .../ProjectApplyService.java | 10 +++++----- .../ProjectCommentService.java | 6 +++--- .../ReviewService.java} | 12 ++++++------ .../MakeUs/Moira/service/user/UserService.java | 7 +++---- 74 files changed, 135 insertions(+), 148 deletions(-) rename src/main/java/MakeUs/Moira/controller/home/{homeController.java => HomeController.java} (99%) rename src/main/java/MakeUs/Moira/controller/{security/LoginController.java => jwt/JwtController.java} (81%) rename src/main/java/MakeUs/Moira/controller/{security => jwt}/dto/LoginRequestDto.java (93%) rename src/main/java/MakeUs/Moira/controller/{security => jwt}/dto/LoginResponseDto.java (92%) rename src/main/java/MakeUs/Moira/controller/{user => myPage}/MyPageController.java (98%) rename src/main/java/MakeUs/Moira/controller/{user/dto/myPage => myPage/dto}/AppliedProjectInfoResponseDto.java (98%) rename src/main/java/MakeUs/Moira/controller/{user/dto/myPage => myPage/dto}/HashtagResponseDto.java (95%) rename src/main/java/MakeUs/Moira/controller/{user/dto/myPage => myPage/dto}/LikedProjectResponseDto.java (97%) rename src/main/java/MakeUs/Moira/controller/{user/dto/myPage => myPage/dto}/LikedUserPoolResponseDto.java (96%) rename src/main/java/MakeUs/Moira/controller/{user/dto/myPage => myPage/dto}/MyPageResponseDto.java (95%) rename src/main/java/MakeUs/Moira/controller/{user/dto/myPage => myPage/dto}/WrittenProjectInfoResponseDto.java (95%) rename src/main/java/MakeUs/Moira/controller/{user => myPageEdit}/MyPageEditController.java (97%) rename src/main/java/MakeUs/Moira/controller/{user/dto/myPageEdit => myPageEdit/dto}/MyPageEditHashtagRequestDto.java (76%) rename src/main/java/MakeUs/Moira/controller/{user/dto/myPageEdit => myPageEdit/dto}/MyPageEditHashtagResponseDto.java (80%) rename src/main/java/MakeUs/Moira/controller/{user/dto/myPageEdit => myPageEdit/dto}/MyPageEditIntroductionRequestDto.java (74%) rename src/main/java/MakeUs/Moira/controller/{user/dto/myPageEdit => myPageEdit/dto}/MyPageEditIntroductionResponseDto.java (88%) rename src/main/java/MakeUs/Moira/controller/{user/dto/myPageEdit => myPageEdit/dto}/MyPageEditNicknameRequestDto.java (72%) rename src/main/java/MakeUs/Moira/controller/{user/dto/myPageEdit => myPageEdit/dto}/MyPageEditNicknameResponseDto.java (86%) rename src/main/java/MakeUs/Moira/controller/{user/dto/myPageEdit => myPageEdit/dto}/MyPageEditPositionInfoDto.java (93%) rename src/main/java/MakeUs/Moira/controller/{user/dto/myPageEdit => myPageEdit/dto}/MyPageEditPositionRequestDto.java (72%) rename src/main/java/MakeUs/Moira/controller/{user/dto/myPageEdit => myPageEdit/dto}/MyPageEditPositionResponseDto.java (89%) rename src/main/java/MakeUs/Moira/controller/{user/dto/myPageEdit => myPageEdit/dto}/MyPageEditResponseDto.java (97%) rename src/main/java/MakeUs/Moira/controller/{project => myProject}/MyProjectController.java (92%) rename src/main/java/MakeUs/Moira/controller/{project/dto/myProject => myProject/dto}/MyProjectResponseDTO.java (95%) rename src/main/java/MakeUs/Moira/controller/{project/dto/myProject => myProject/dto}/MyProjectTeammateResponseDTO.java (94%) rename src/main/java/MakeUs/Moira/controller/{project/dto/myProject => myProject/dto}/MyProjectsResponseDTO.java (94%) rename src/main/java/MakeUs/Moira/controller/project/dto/{project => }/ProjectModifyRequestDTO.java (92%) rename src/main/java/MakeUs/Moira/controller/project/dto/{project => }/ProjectModifyStatusRequestDTO.java (91%) rename src/main/java/MakeUs/Moira/controller/project/dto/{project => }/ProjectPositionCategoryDTO.java (94%) rename src/main/java/MakeUs/Moira/controller/project/dto/{project => }/ProjectRequestDTO.java (93%) rename src/main/java/MakeUs/Moira/controller/project/dto/{project => }/ProjectResponseDTO.java (97%) rename src/main/java/MakeUs/Moira/controller/project/dto/{project => }/ProjectsResponseDTO.java (95%) rename src/main/java/MakeUs/Moira/controller/{project => projectApply}/ProjectApplyController.java (92%) rename src/main/java/MakeUs/Moira/controller/{project/dto/projectApply => projectApply/dto}/ProjectApplicantsResponseDTO.java (94%) rename src/main/java/MakeUs/Moira/controller/{project/dto/projectApply => projectApply/dto}/ProjectApplyModifyStatusRequestDTO.java (89%) rename src/main/java/MakeUs/Moira/controller/{project/dto/projectApply => projectApply/dto}/ProjectApplyRequestDTO.java (91%) rename src/main/java/MakeUs/Moira/controller/{project/dto/projectApply => projectApply/dto}/ProjectApplyResponseDTO.java (94%) rename src/main/java/MakeUs/Moira/controller/{project => projectComment}/ProjectCommentController.java (93%) rename src/main/java/MakeUs/Moira/controller/{project/dto/projectComment => projectComment/dto}/ProjectCommentRequestDTO.java (87%) rename src/main/java/MakeUs/Moira/controller/{project/dto/projectComment => projectComment/dto}/ProjectCommentResponseDTO.java (95%) rename src/main/java/MakeUs/Moira/controller/{userReview/UserReviewController.java => review/ReviewController.java} (90%) rename src/main/java/MakeUs/Moira/controller/{userReview => review}/dto/ComplimentMarkDto.java (92%) rename src/main/java/MakeUs/Moira/controller/{userReview => review}/dto/UserReviewAddRequestDto.java (94%) rename src/main/java/MakeUs/Moira/controller/{userReview => review}/dto/UserReviewAddResponseDto.java (95%) rename src/main/java/MakeUs/Moira/controller/{userReview => review}/dto/UserReviewDetailResponseDto.java (94%) rename src/main/java/MakeUs/Moira/controller/{userReview => review}/dto/UserReviewResponseDto.java (97%) rename src/main/java/MakeUs/Moira/controller/{user => signup}/SignupController.java (94%) rename src/main/java/MakeUs/Moira/controller/{user/dto/signup => signup/dto}/PositionCategoryResponseDto.java (88%) rename src/main/java/MakeUs/Moira/controller/{user/dto/signup => signup/dto}/PositionResponseDto.java (87%) rename src/main/java/MakeUs/Moira/controller/{user/dto/signup => signup/dto}/SignupRequestDto.java (94%) rename src/main/java/MakeUs/Moira/controller/{user/dto/signup => signup/dto}/SignupResponseDto.java (87%) rename src/main/java/MakeUs/Moira/service/{security => jwt}/CustomUserDetailService.java (95%) rename src/main/java/MakeUs/Moira/service/{security/LoginService.java => jwt/JwtService.java} (93%) rename src/main/java/MakeUs/Moira/service/{user => myPage}/MyPageService.java (98%) rename src/main/java/MakeUs/Moira/service/{user => myPageEdit}/MyPageEditService.java (95%) rename src/main/java/MakeUs/Moira/service/{project => myProject}/MyProjectService.java (96%) rename src/main/java/MakeUs/Moira/service/{project => projectApply}/ProjectApplyService.java (98%) rename src/main/java/MakeUs/Moira/service/{project => projectComment}/ProjectCommentService.java (97%) rename src/main/java/MakeUs/Moira/service/{userReview/UserReviewService.java => review/ReviewService.java} (93%) diff --git a/src/main/java/MakeUs/Moira/config/logging/LoggerInterceptor.java b/src/main/java/MakeUs/Moira/config/logging/LoggerInterceptor.java index 8de467a..40bd13f 100644 --- a/src/main/java/MakeUs/Moira/config/logging/LoggerInterceptor.java +++ b/src/main/java/MakeUs/Moira/config/logging/LoggerInterceptor.java @@ -1,5 +1,6 @@ package MakeUs.Moira.config.logging; +import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -10,6 +11,7 @@ import javax.servlet.http.HttpServletResponse; @Component +@Slf4j public class LoggerInterceptor implements HandlerInterceptor { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/src/main/java/MakeUs/Moira/controller/home/homeController.java b/src/main/java/MakeUs/Moira/controller/home/HomeController.java similarity index 99% rename from src/main/java/MakeUs/Moira/controller/home/homeController.java rename to src/main/java/MakeUs/Moira/controller/home/HomeController.java index a901f86..c208885 100644 --- a/src/main/java/MakeUs/Moira/controller/home/homeController.java +++ b/src/main/java/MakeUs/Moira/controller/home/HomeController.java @@ -22,7 +22,7 @@ @Api(tags = {"1.홈"}) @RequiredArgsConstructor @RestController -public class homeController { +public class HomeController { private final HomeService homeService; private final ResponseService responseService; diff --git a/src/main/java/MakeUs/Moira/controller/security/LoginController.java b/src/main/java/MakeUs/Moira/controller/jwt/JwtController.java similarity index 81% rename from src/main/java/MakeUs/Moira/controller/security/LoginController.java rename to src/main/java/MakeUs/Moira/controller/jwt/JwtController.java index a656acc..4edb730 100644 --- a/src/main/java/MakeUs/Moira/controller/security/LoginController.java +++ b/src/main/java/MakeUs/Moira/controller/jwt/JwtController.java @@ -1,10 +1,10 @@ -package MakeUs.Moira.controller.security; +package MakeUs.Moira.controller.jwt; -import MakeUs.Moira.controller.security.dto.LoginRequestDto; -import MakeUs.Moira.controller.security.dto.LoginResponseDto; +import MakeUs.Moira.controller.jwt.dto.LoginRequestDto; +import MakeUs.Moira.controller.jwt.dto.LoginResponseDto; import MakeUs.Moira.response.ResponseService; import MakeUs.Moira.response.model.SingleResult; -import MakeUs.Moira.service.security.LoginService; +import MakeUs.Moira.service.jwt.JwtService; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; @@ -18,9 +18,9 @@ @Api(tags = {"1. 로그인"}) @RequiredArgsConstructor @RestController -public class LoginController { +public class JwtController { - private final LoginService loginService; + private final JwtService loginService; private final ResponseService responseService; private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/src/main/java/MakeUs/Moira/controller/security/dto/LoginRequestDto.java b/src/main/java/MakeUs/Moira/controller/jwt/dto/LoginRequestDto.java similarity index 93% rename from src/main/java/MakeUs/Moira/controller/security/dto/LoginRequestDto.java rename to src/main/java/MakeUs/Moira/controller/jwt/dto/LoginRequestDto.java index 91e5fee..28e2a62 100644 --- a/src/main/java/MakeUs/Moira/controller/security/dto/LoginRequestDto.java +++ b/src/main/java/MakeUs/Moira/controller/jwt/dto/LoginRequestDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.security.dto; +package MakeUs.Moira.controller.jwt.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/MakeUs/Moira/controller/security/dto/LoginResponseDto.java b/src/main/java/MakeUs/Moira/controller/jwt/dto/LoginResponseDto.java similarity index 92% rename from src/main/java/MakeUs/Moira/controller/security/dto/LoginResponseDto.java rename to src/main/java/MakeUs/Moira/controller/jwt/dto/LoginResponseDto.java index db5bce8..fc84bf9 100644 --- a/src/main/java/MakeUs/Moira/controller/security/dto/LoginResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/jwt/dto/LoginResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.security.dto; +package MakeUs.Moira.controller.jwt.dto; import lombok.*; diff --git a/src/main/java/MakeUs/Moira/controller/user/MyPageController.java b/src/main/java/MakeUs/Moira/controller/myPage/MyPageController.java similarity index 98% rename from src/main/java/MakeUs/Moira/controller/user/MyPageController.java rename to src/main/java/MakeUs/Moira/controller/myPage/MyPageController.java index 2181f8a..51dc88a 100644 --- a/src/main/java/MakeUs/Moira/controller/user/MyPageController.java +++ b/src/main/java/MakeUs/Moira/controller/myPage/MyPageController.java @@ -1,11 +1,11 @@ -package MakeUs.Moira.controller.user; +package MakeUs.Moira.controller.myPage; import MakeUs.Moira.config.security.JwtTokenProvider; -import MakeUs.Moira.controller.user.dto.myPage.*; +import MakeUs.Moira.controller.myPage.dto.*; import MakeUs.Moira.response.ResponseService; import MakeUs.Moira.response.model.ListResult; import MakeUs.Moira.response.model.SingleResult; -import MakeUs.Moira.service.user.MyPageService; +import MakeUs.Moira.service.myPage.MyPageService; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/myPage/AppliedProjectInfoResponseDto.java b/src/main/java/MakeUs/Moira/controller/myPage/dto/AppliedProjectInfoResponseDto.java similarity index 98% rename from src/main/java/MakeUs/Moira/controller/user/dto/myPage/AppliedProjectInfoResponseDto.java rename to src/main/java/MakeUs/Moira/controller/myPage/dto/AppliedProjectInfoResponseDto.java index 5ad6112..dfe0a08 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/myPage/AppliedProjectInfoResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPage/dto/AppliedProjectInfoResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.user.dto.myPage; +package MakeUs.Moira.controller.myPage.dto; import MakeUs.Moira.domain.project.Project; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/myPage/HashtagResponseDto.java b/src/main/java/MakeUs/Moira/controller/myPage/dto/HashtagResponseDto.java similarity index 95% rename from src/main/java/MakeUs/Moira/controller/user/dto/myPage/HashtagResponseDto.java rename to src/main/java/MakeUs/Moira/controller/myPage/dto/HashtagResponseDto.java index fe90eb5..5002420 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/myPage/HashtagResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPage/dto/HashtagResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.user.dto.myPage; +package MakeUs.Moira.controller.myPage.dto; import MakeUs.Moira.domain.project.ProjectHashtag; import MakeUs.Moira.domain.user.UserHashtag; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/myPage/LikedProjectResponseDto.java b/src/main/java/MakeUs/Moira/controller/myPage/dto/LikedProjectResponseDto.java similarity index 97% rename from src/main/java/MakeUs/Moira/controller/user/dto/myPage/LikedProjectResponseDto.java rename to src/main/java/MakeUs/Moira/controller/myPage/dto/LikedProjectResponseDto.java index 6e818cb..a96a31e 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/myPage/LikedProjectResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPage/dto/LikedProjectResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.user.dto.myPage; +package MakeUs.Moira.controller.myPage.dto; @@ -9,7 +9,6 @@ import lombok.Getter; import lombok.ToString; -import java.time.LocalDate; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; import java.util.List; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/myPage/LikedUserPoolResponseDto.java b/src/main/java/MakeUs/Moira/controller/myPage/dto/LikedUserPoolResponseDto.java similarity index 96% rename from src/main/java/MakeUs/Moira/controller/user/dto/myPage/LikedUserPoolResponseDto.java rename to src/main/java/MakeUs/Moira/controller/myPage/dto/LikedUserPoolResponseDto.java index b6bb651..de4fc41 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/myPage/LikedUserPoolResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPage/dto/LikedUserPoolResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.user.dto.myPage; +package MakeUs.Moira.controller.myPage.dto; import MakeUs.Moira.domain.userPool.UserPool; import lombok.Getter; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/myPage/MyPageResponseDto.java b/src/main/java/MakeUs/Moira/controller/myPage/dto/MyPageResponseDto.java similarity index 95% rename from src/main/java/MakeUs/Moira/controller/user/dto/myPage/MyPageResponseDto.java rename to src/main/java/MakeUs/Moira/controller/myPage/dto/MyPageResponseDto.java index e3f73b7..bef0376 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/myPage/MyPageResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPage/dto/MyPageResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.user.dto.myPage; +package MakeUs.Moira.controller.myPage.dto; import MakeUs.Moira.domain.user.User; import lombok.Getter; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/myPage/WrittenProjectInfoResponseDto.java b/src/main/java/MakeUs/Moira/controller/myPage/dto/WrittenProjectInfoResponseDto.java similarity index 95% rename from src/main/java/MakeUs/Moira/controller/user/dto/myPage/WrittenProjectInfoResponseDto.java rename to src/main/java/MakeUs/Moira/controller/myPage/dto/WrittenProjectInfoResponseDto.java index bf8cff8..5246cc3 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/myPage/WrittenProjectInfoResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPage/dto/WrittenProjectInfoResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.user.dto.myPage; +package MakeUs.Moira.controller.myPage.dto; import MakeUs.Moira.domain.project.Project; diff --git a/src/main/java/MakeUs/Moira/controller/user/MyPageEditController.java b/src/main/java/MakeUs/Moira/controller/myPageEdit/MyPageEditController.java similarity index 97% rename from src/main/java/MakeUs/Moira/controller/user/MyPageEditController.java rename to src/main/java/MakeUs/Moira/controller/myPageEdit/MyPageEditController.java index 60984af..24d0aa0 100644 --- a/src/main/java/MakeUs/Moira/controller/user/MyPageEditController.java +++ b/src/main/java/MakeUs/Moira/controller/myPageEdit/MyPageEditController.java @@ -1,14 +1,13 @@ -package MakeUs.Moira.controller.user; +package MakeUs.Moira.controller.myPageEdit; import MakeUs.Moira.config.security.JwtTokenProvider; -import MakeUs.Moira.controller.user.dto.myPage.HashtagResponseDto; -import MakeUs.Moira.controller.user.dto.myPageEdit.*; +import MakeUs.Moira.controller.myPageEdit.dto.*; import MakeUs.Moira.response.ResponseService; import MakeUs.Moira.response.model.ListResult; import MakeUs.Moira.response.model.SingleResult; -import MakeUs.Moira.service.user.MyPageEditService; +import MakeUs.Moira.service.myPageEdit.MyPageEditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditHashtagRequestDto.java b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditHashtagRequestDto.java similarity index 76% rename from src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditHashtagRequestDto.java rename to src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditHashtagRequestDto.java index 32ff8c1..4922ef7 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditHashtagRequestDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditHashtagRequestDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.user.dto.myPageEdit; +package MakeUs.Moira.controller.myPageEdit.dto; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditHashtagResponseDto.java b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditHashtagResponseDto.java similarity index 80% rename from src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditHashtagResponseDto.java rename to src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditHashtagResponseDto.java index 15fac2b..dd2e192 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditHashtagResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditHashtagResponseDto.java @@ -1,6 +1,6 @@ -package MakeUs.Moira.controller.user.dto.myPageEdit; +package MakeUs.Moira.controller.myPageEdit.dto; -import MakeUs.Moira.controller.user.dto.myPage.HashtagResponseDto; +import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto; import lombok.Builder; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditIntroductionRequestDto.java b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditIntroductionRequestDto.java similarity index 74% rename from src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditIntroductionRequestDto.java rename to src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditIntroductionRequestDto.java index db06f1b..124557f 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditIntroductionRequestDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditIntroductionRequestDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.user.dto.myPageEdit; +package MakeUs.Moira.controller.myPageEdit.dto; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditIntroductionResponseDto.java b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditIntroductionResponseDto.java similarity index 88% rename from src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditIntroductionResponseDto.java rename to src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditIntroductionResponseDto.java index 7f7dae3..e155556 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditIntroductionResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditIntroductionResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.user.dto.myPageEdit; +package MakeUs.Moira.controller.myPageEdit.dto; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditNicknameRequestDto.java b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditNicknameRequestDto.java similarity index 72% rename from src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditNicknameRequestDto.java rename to src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditNicknameRequestDto.java index e972c8e..87f55c5 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditNicknameRequestDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditNicknameRequestDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.user.dto.myPageEdit; +package MakeUs.Moira.controller.myPageEdit.dto; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditNicknameResponseDto.java b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditNicknameResponseDto.java similarity index 86% rename from src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditNicknameResponseDto.java rename to src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditNicknameResponseDto.java index 2025fbf..6381a43 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditNicknameResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditNicknameResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.user.dto.myPageEdit; +package MakeUs.Moira.controller.myPageEdit.dto; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditPositionInfoDto.java b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditPositionInfoDto.java similarity index 93% rename from src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditPositionInfoDto.java rename to src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditPositionInfoDto.java index 13dda31..a565fa4 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditPositionInfoDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditPositionInfoDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.user.dto.myPageEdit; +package MakeUs.Moira.controller.myPageEdit.dto; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditPositionRequestDto.java b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditPositionRequestDto.java similarity index 72% rename from src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditPositionRequestDto.java rename to src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditPositionRequestDto.java index c957ae7..2a7c5d0 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditPositionRequestDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditPositionRequestDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.user.dto.myPageEdit; +package MakeUs.Moira.controller.myPageEdit.dto; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditPositionResponseDto.java b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditPositionResponseDto.java similarity index 89% rename from src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditPositionResponseDto.java rename to src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditPositionResponseDto.java index 4ff7fd8..ccbd007 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditPositionResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditPositionResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.user.dto.myPageEdit; +package MakeUs.Moira.controller.myPageEdit.dto; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditResponseDto.java b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditResponseDto.java similarity index 97% rename from src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditResponseDto.java rename to src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditResponseDto.java index 699674b..81567e0 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/myPageEdit/MyPageEditResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/myPageEdit/dto/MyPageEditResponseDto.java @@ -1,7 +1,7 @@ -package MakeUs.Moira.controller.user.dto.myPageEdit; +package MakeUs.Moira.controller.myPageEdit.dto; -import MakeUs.Moira.controller.user.dto.myPage.HashtagResponseDto; +import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto; import MakeUs.Moira.controller.userPortfolio.userAward.dto.UserAwardResponseDto; import MakeUs.Moira.controller.userPortfolio.userCareer.dto.UserCareerResponseDto; import MakeUs.Moira.controller.userPortfolio.userLicense.dto.UserLicenseResponseDto; diff --git a/src/main/java/MakeUs/Moira/controller/project/MyProjectController.java b/src/main/java/MakeUs/Moira/controller/myProject/MyProjectController.java similarity index 92% rename from src/main/java/MakeUs/Moira/controller/project/MyProjectController.java rename to src/main/java/MakeUs/Moira/controller/myProject/MyProjectController.java index de16796..25afc45 100644 --- a/src/main/java/MakeUs/Moira/controller/project/MyProjectController.java +++ b/src/main/java/MakeUs/Moira/controller/myProject/MyProjectController.java @@ -1,13 +1,13 @@ -package MakeUs.Moira.controller.project; +package MakeUs.Moira.controller.myProject; import MakeUs.Moira.config.security.JwtTokenProvider; -import MakeUs.Moira.controller.project.dto.myProject.MyProjectResponseDTO; -import MakeUs.Moira.controller.project.dto.myProject.MyProjectsResponseDTO; +import MakeUs.Moira.controller.myProject.dto.MyProjectResponseDTO; +import MakeUs.Moira.controller.myProject.dto.MyProjectsResponseDTO; import MakeUs.Moira.domain.user.UserProjectStatus; import MakeUs.Moira.response.ResponseService; import MakeUs.Moira.response.model.ListResult; import MakeUs.Moira.response.model.SingleResult; -import MakeUs.Moira.service.project.MyProjectService; +import MakeUs.Moira.service.myProject.MyProjectService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/myProject/MyProjectResponseDTO.java b/src/main/java/MakeUs/Moira/controller/myProject/dto/MyProjectResponseDTO.java similarity index 95% rename from src/main/java/MakeUs/Moira/controller/project/dto/myProject/MyProjectResponseDTO.java rename to src/main/java/MakeUs/Moira/controller/myProject/dto/MyProjectResponseDTO.java index 897091e..ce23a42 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/myProject/MyProjectResponseDTO.java +++ b/src/main/java/MakeUs/Moira/controller/myProject/dto/MyProjectResponseDTO.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.project.dto.myProject; +package MakeUs.Moira.controller.myProject.dto; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/myProject/MyProjectTeammateResponseDTO.java b/src/main/java/MakeUs/Moira/controller/myProject/dto/MyProjectTeammateResponseDTO.java similarity index 94% rename from src/main/java/MakeUs/Moira/controller/project/dto/myProject/MyProjectTeammateResponseDTO.java rename to src/main/java/MakeUs/Moira/controller/myProject/dto/MyProjectTeammateResponseDTO.java index da64c4d..5d895e3 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/myProject/MyProjectTeammateResponseDTO.java +++ b/src/main/java/MakeUs/Moira/controller/myProject/dto/MyProjectTeammateResponseDTO.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.project.dto.myProject; +package MakeUs.Moira.controller.myProject.dto; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/myProject/MyProjectsResponseDTO.java b/src/main/java/MakeUs/Moira/controller/myProject/dto/MyProjectsResponseDTO.java similarity index 94% rename from src/main/java/MakeUs/Moira/controller/project/dto/myProject/MyProjectsResponseDTO.java rename to src/main/java/MakeUs/Moira/controller/myProject/dto/MyProjectsResponseDTO.java index 5164fdd..7ce9a05 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/myProject/MyProjectsResponseDTO.java +++ b/src/main/java/MakeUs/Moira/controller/myProject/dto/MyProjectsResponseDTO.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.project.dto.myProject; +package MakeUs.Moira.controller.myProject.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/MakeUs/Moira/controller/project/ProjectController.java b/src/main/java/MakeUs/Moira/controller/project/ProjectController.java index b45649a..104beea 100644 --- a/src/main/java/MakeUs/Moira/controller/project/ProjectController.java +++ b/src/main/java/MakeUs/Moira/controller/project/ProjectController.java @@ -2,7 +2,6 @@ import MakeUs.Moira.config.security.JwtTokenProvider; import MakeUs.Moira.controller.project.dto.*; -import MakeUs.Moira.controller.project.dto.project.*; import MakeUs.Moira.response.ResponseService; import MakeUs.Moira.response.model.CommonResult; import MakeUs.Moira.response.model.ListResult; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectModifyRequestDTO.java b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectModifyRequestDTO.java similarity index 92% rename from src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectModifyRequestDTO.java rename to src/main/java/MakeUs/Moira/controller/project/dto/ProjectModifyRequestDTO.java index c356551..37d0c5f 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectModifyRequestDTO.java +++ b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectModifyRequestDTO.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.project.dto.project; +package MakeUs.Moira.controller.project.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectModifyStatusRequestDTO.java b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectModifyStatusRequestDTO.java similarity index 91% rename from src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectModifyStatusRequestDTO.java rename to src/main/java/MakeUs/Moira/controller/project/dto/ProjectModifyStatusRequestDTO.java index 15eeb89..a6f346e 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectModifyStatusRequestDTO.java +++ b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectModifyStatusRequestDTO.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.project.dto.project; +package MakeUs.Moira.controller.project.dto; import MakeUs.Moira.domain.project.ProjectStatus; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectPositionCategoryDTO.java b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectPositionCategoryDTO.java similarity index 94% rename from src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectPositionCategoryDTO.java rename to src/main/java/MakeUs/Moira/controller/project/dto/ProjectPositionCategoryDTO.java index f0a124b..e6ae89d 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectPositionCategoryDTO.java +++ b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectPositionCategoryDTO.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.project.dto.project; +package MakeUs.Moira.controller.project.dto; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectRequestDTO.java b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectRequestDTO.java similarity index 93% rename from src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectRequestDTO.java rename to src/main/java/MakeUs/Moira/controller/project/dto/ProjectRequestDTO.java index da12fdd..e587b1d 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectRequestDTO.java +++ b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectRequestDTO.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.project.dto.project; +package MakeUs.Moira.controller.project.dto; import MakeUs.Moira.domain.project.projectDetail.ProjectDuration; import MakeUs.Moira.domain.project.projectDetail.ProjectLocalType; @@ -8,8 +8,6 @@ import lombok.Setter; import lombok.ToString; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.List; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectResponseDTO.java b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectResponseDTO.java similarity index 97% rename from src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectResponseDTO.java rename to src/main/java/MakeUs/Moira/controller/project/dto/ProjectResponseDTO.java index 7309443..4f31d9a 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectResponseDTO.java +++ b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectResponseDTO.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.project.dto.project; +package MakeUs.Moira.controller.project.dto; import MakeUs.Moira.domain.project.projectDetail.ProjectDuration; import MakeUs.Moira.domain.project.projectDetail.ProjectLocalType; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectsResponseDTO.java b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectsResponseDTO.java similarity index 95% rename from src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectsResponseDTO.java rename to src/main/java/MakeUs/Moira/controller/project/dto/ProjectsResponseDTO.java index bd315da..08f2c25 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/project/ProjectsResponseDTO.java +++ b/src/main/java/MakeUs/Moira/controller/project/dto/ProjectsResponseDTO.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.project.dto.project; +package MakeUs.Moira.controller.project.dto; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/MakeUs/Moira/controller/project/ProjectApplyController.java b/src/main/java/MakeUs/Moira/controller/projectApply/ProjectApplyController.java similarity index 92% rename from src/main/java/MakeUs/Moira/controller/project/ProjectApplyController.java rename to src/main/java/MakeUs/Moira/controller/projectApply/ProjectApplyController.java index b1a4eee..f13dbab 100644 --- a/src/main/java/MakeUs/Moira/controller/project/ProjectApplyController.java +++ b/src/main/java/MakeUs/Moira/controller/projectApply/ProjectApplyController.java @@ -1,12 +1,15 @@ -package MakeUs.Moira.controller.project; +package MakeUs.Moira.controller.projectApply; import MakeUs.Moira.config.security.JwtTokenProvider; -import MakeUs.Moira.controller.project.dto.projectApply.*; +import MakeUs.Moira.controller.projectApply.dto.ProjectApplicantsResponseDTO; +import MakeUs.Moira.controller.projectApply.dto.ProjectApplyModifyStatusRequestDTO; +import MakeUs.Moira.controller.projectApply.dto.ProjectApplyRequestDTO; +import MakeUs.Moira.controller.projectApply.dto.ProjectApplyResponseDTO; import MakeUs.Moira.response.ResponseService; import MakeUs.Moira.response.model.CommonResult; import MakeUs.Moira.response.model.ListResult; import MakeUs.Moira.response.model.SingleResult; -import MakeUs.Moira.service.project.ProjectApplyService; +import MakeUs.Moira.service.projectApply.ProjectApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/projectApply/ProjectApplicantsResponseDTO.java b/src/main/java/MakeUs/Moira/controller/projectApply/dto/ProjectApplicantsResponseDTO.java similarity index 94% rename from src/main/java/MakeUs/Moira/controller/project/dto/projectApply/ProjectApplicantsResponseDTO.java rename to src/main/java/MakeUs/Moira/controller/projectApply/dto/ProjectApplicantsResponseDTO.java index 2f36bcd..bab3f34 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/projectApply/ProjectApplicantsResponseDTO.java +++ b/src/main/java/MakeUs/Moira/controller/projectApply/dto/ProjectApplicantsResponseDTO.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.project.dto.projectApply; +package MakeUs.Moira.controller.projectApply.dto; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/projectApply/ProjectApplyModifyStatusRequestDTO.java b/src/main/java/MakeUs/Moira/controller/projectApply/dto/ProjectApplyModifyStatusRequestDTO.java similarity index 89% rename from src/main/java/MakeUs/Moira/controller/project/dto/projectApply/ProjectApplyModifyStatusRequestDTO.java rename to src/main/java/MakeUs/Moira/controller/projectApply/dto/ProjectApplyModifyStatusRequestDTO.java index c1c4149..987b0ec 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/projectApply/ProjectApplyModifyStatusRequestDTO.java +++ b/src/main/java/MakeUs/Moira/controller/projectApply/dto/ProjectApplyModifyStatusRequestDTO.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.project.dto.projectApply; +package MakeUs.Moira.controller.projectApply.dto; import MakeUs.Moira.domain.project.projectApply.ProjectApplyStatus; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/projectApply/ProjectApplyRequestDTO.java b/src/main/java/MakeUs/Moira/controller/projectApply/dto/ProjectApplyRequestDTO.java similarity index 91% rename from src/main/java/MakeUs/Moira/controller/project/dto/projectApply/ProjectApplyRequestDTO.java rename to src/main/java/MakeUs/Moira/controller/projectApply/dto/ProjectApplyRequestDTO.java index a5bff77..3259695 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/projectApply/ProjectApplyRequestDTO.java +++ b/src/main/java/MakeUs/Moira/controller/projectApply/dto/ProjectApplyRequestDTO.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.project.dto.projectApply; +package MakeUs.Moira.controller.projectApply.dto; import MakeUs.Moira.domain.userPortfolio.UserPortfolioType; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/projectApply/ProjectApplyResponseDTO.java b/src/main/java/MakeUs/Moira/controller/projectApply/dto/ProjectApplyResponseDTO.java similarity index 94% rename from src/main/java/MakeUs/Moira/controller/project/dto/projectApply/ProjectApplyResponseDTO.java rename to src/main/java/MakeUs/Moira/controller/projectApply/dto/ProjectApplyResponseDTO.java index 67763ca..c188e96 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/projectApply/ProjectApplyResponseDTO.java +++ b/src/main/java/MakeUs/Moira/controller/projectApply/dto/ProjectApplyResponseDTO.java @@ -1,7 +1,7 @@ -package MakeUs.Moira.controller.project.dto.projectApply; +package MakeUs.Moira.controller.projectApply.dto; -import MakeUs.Moira.controller.user.dto.myPage.HashtagResponseDto; +import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto; import MakeUs.Moira.controller.userPortfolio.userAward.dto.UserAwardResponseDto; import MakeUs.Moira.controller.userPortfolio.userCareer.dto.UserCareerResponseDto; import MakeUs.Moira.controller.userPortfolio.userLicense.dto.UserLicenseResponseDto; diff --git a/src/main/java/MakeUs/Moira/controller/project/ProjectCommentController.java b/src/main/java/MakeUs/Moira/controller/projectComment/ProjectCommentController.java similarity index 93% rename from src/main/java/MakeUs/Moira/controller/project/ProjectCommentController.java rename to src/main/java/MakeUs/Moira/controller/projectComment/ProjectCommentController.java index 7ccded6..77dc2dc 100644 --- a/src/main/java/MakeUs/Moira/controller/project/ProjectCommentController.java +++ b/src/main/java/MakeUs/Moira/controller/projectComment/ProjectCommentController.java @@ -1,13 +1,13 @@ -package MakeUs.Moira.controller.project; +package MakeUs.Moira.controller.projectComment; import MakeUs.Moira.config.security.JwtTokenProvider; -import MakeUs.Moira.controller.project.dto.projectComment.ProjectCommentRequestDTO; -import MakeUs.Moira.controller.project.dto.projectComment.ProjectCommentResponseDTO; +import MakeUs.Moira.controller.projectComment.dto.ProjectCommentRequestDTO; +import MakeUs.Moira.controller.projectComment.dto.ProjectCommentResponseDTO; import MakeUs.Moira.response.ResponseService; import MakeUs.Moira.response.model.CommonResult; import MakeUs.Moira.response.model.ListResult; import MakeUs.Moira.response.model.SingleResult; -import MakeUs.Moira.service.project.ProjectCommentService; +import MakeUs.Moira.service.projectComment.ProjectCommentService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/projectComment/ProjectCommentRequestDTO.java b/src/main/java/MakeUs/Moira/controller/projectComment/dto/ProjectCommentRequestDTO.java similarity index 87% rename from src/main/java/MakeUs/Moira/controller/project/dto/projectComment/ProjectCommentRequestDTO.java rename to src/main/java/MakeUs/Moira/controller/projectComment/dto/ProjectCommentRequestDTO.java index e0fb5fe..14c4d07 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/projectComment/ProjectCommentRequestDTO.java +++ b/src/main/java/MakeUs/Moira/controller/projectComment/dto/ProjectCommentRequestDTO.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.project.dto.projectComment; +package MakeUs.Moira.controller.projectComment.dto; import io.swagger.annotations.ApiModelProperty; import lombok.*; diff --git a/src/main/java/MakeUs/Moira/controller/project/dto/projectComment/ProjectCommentResponseDTO.java b/src/main/java/MakeUs/Moira/controller/projectComment/dto/ProjectCommentResponseDTO.java similarity index 95% rename from src/main/java/MakeUs/Moira/controller/project/dto/projectComment/ProjectCommentResponseDTO.java rename to src/main/java/MakeUs/Moira/controller/projectComment/dto/ProjectCommentResponseDTO.java index 67eed96..ee10a11 100644 --- a/src/main/java/MakeUs/Moira/controller/project/dto/projectComment/ProjectCommentResponseDTO.java +++ b/src/main/java/MakeUs/Moira/controller/projectComment/dto/ProjectCommentResponseDTO.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.project.dto.projectComment; +package MakeUs.Moira.controller.projectComment.dto; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/MakeUs/Moira/controller/report/ReportController.java b/src/main/java/MakeUs/Moira/controller/report/ReportController.java index d9f2fe5..26975eb 100644 --- a/src/main/java/MakeUs/Moira/controller/report/ReportController.java +++ b/src/main/java/MakeUs/Moira/controller/report/ReportController.java @@ -2,9 +2,7 @@ import MakeUs.Moira.config.security.JwtTokenProvider; -import MakeUs.Moira.controller.project.dto.project.ProjectRequestDTO; import MakeUs.Moira.controller.report.dto.ReportRequestDTO; -import MakeUs.Moira.domain.report.ReportRepo; import MakeUs.Moira.response.ResponseService; import MakeUs.Moira.response.model.CommonResult; import MakeUs.Moira.service.report.ReportService; diff --git a/src/main/java/MakeUs/Moira/controller/userReview/UserReviewController.java b/src/main/java/MakeUs/Moira/controller/review/ReviewController.java similarity index 90% rename from src/main/java/MakeUs/Moira/controller/userReview/UserReviewController.java rename to src/main/java/MakeUs/Moira/controller/review/ReviewController.java index dd259e9..80a8037 100644 --- a/src/main/java/MakeUs/Moira/controller/userReview/UserReviewController.java +++ b/src/main/java/MakeUs/Moira/controller/review/ReviewController.java @@ -1,17 +1,17 @@ -package MakeUs.Moira.controller.userReview; +package MakeUs.Moira.controller.review; import MakeUs.Moira.config.security.JwtTokenProvider; -import MakeUs.Moira.controller.userReview.dto.UserReviewAddRequestDto; -import MakeUs.Moira.controller.userReview.dto.UserReviewAddResponseDto; -import MakeUs.Moira.controller.userReview.dto.UserReviewDetailResponseDto; -import MakeUs.Moira.controller.userReview.dto.UserReviewResponseDto; +import MakeUs.Moira.controller.review.dto.UserReviewAddRequestDto; +import MakeUs.Moira.controller.review.dto.UserReviewAddResponseDto; +import MakeUs.Moira.controller.review.dto.UserReviewDetailResponseDto; +import MakeUs.Moira.controller.review.dto.UserReviewResponseDto; import MakeUs.Moira.response.ResponseService; import MakeUs.Moira.response.model.ListResult; import MakeUs.Moira.response.model.SingleResult; import MakeUs.Moira.service.alarm.AlarmService; -import MakeUs.Moira.service.userReview.UserReviewService; +import MakeUs.Moira.service.review.ReviewService; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; @@ -25,9 +25,9 @@ @Api(tags = {"5.유저 리뷰"}) @RequiredArgsConstructor @RestController -public class UserReviewController { +public class ReviewController { - private final UserReviewService userReviewService; + private final ReviewService userReviewService; private final ResponseService responseService; private final AlarmService alarmService; private final JwtTokenProvider jwtTokenProvider; diff --git a/src/main/java/MakeUs/Moira/controller/userReview/dto/ComplimentMarkDto.java b/src/main/java/MakeUs/Moira/controller/review/dto/ComplimentMarkDto.java similarity index 92% rename from src/main/java/MakeUs/Moira/controller/userReview/dto/ComplimentMarkDto.java rename to src/main/java/MakeUs/Moira/controller/review/dto/ComplimentMarkDto.java index fe30328..80e5847 100644 --- a/src/main/java/MakeUs/Moira/controller/userReview/dto/ComplimentMarkDto.java +++ b/src/main/java/MakeUs/Moira/controller/review/dto/ComplimentMarkDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.userReview.dto; +package MakeUs.Moira.controller.review.dto; import MakeUs.Moira.domain.userReview.UserReviewComplimentMark; import lombok.Getter; diff --git a/src/main/java/MakeUs/Moira/controller/userReview/dto/UserReviewAddRequestDto.java b/src/main/java/MakeUs/Moira/controller/review/dto/UserReviewAddRequestDto.java similarity index 94% rename from src/main/java/MakeUs/Moira/controller/userReview/dto/UserReviewAddRequestDto.java rename to src/main/java/MakeUs/Moira/controller/review/dto/UserReviewAddRequestDto.java index 5ca2a11..19cc3f5 100644 --- a/src/main/java/MakeUs/Moira/controller/userReview/dto/UserReviewAddRequestDto.java +++ b/src/main/java/MakeUs/Moira/controller/review/dto/UserReviewAddRequestDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.userReview.dto; +package MakeUs.Moira.controller.review.dto; import MakeUs.Moira.domain.userReview.UserReview; import lombok.Getter; diff --git a/src/main/java/MakeUs/Moira/controller/userReview/dto/UserReviewAddResponseDto.java b/src/main/java/MakeUs/Moira/controller/review/dto/UserReviewAddResponseDto.java similarity index 95% rename from src/main/java/MakeUs/Moira/controller/userReview/dto/UserReviewAddResponseDto.java rename to src/main/java/MakeUs/Moira/controller/review/dto/UserReviewAddResponseDto.java index 87031f1..bd916e3 100644 --- a/src/main/java/MakeUs/Moira/controller/userReview/dto/UserReviewAddResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/review/dto/UserReviewAddResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.userReview.dto; +package MakeUs.Moira.controller.review.dto; import MakeUs.Moira.domain.userReview.UserReview; import lombok.Getter; diff --git a/src/main/java/MakeUs/Moira/controller/userReview/dto/UserReviewDetailResponseDto.java b/src/main/java/MakeUs/Moira/controller/review/dto/UserReviewDetailResponseDto.java similarity index 94% rename from src/main/java/MakeUs/Moira/controller/userReview/dto/UserReviewDetailResponseDto.java rename to src/main/java/MakeUs/Moira/controller/review/dto/UserReviewDetailResponseDto.java index 679a0bd..6d40b63 100644 --- a/src/main/java/MakeUs/Moira/controller/userReview/dto/UserReviewDetailResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/review/dto/UserReviewDetailResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.userReview.dto; +package MakeUs.Moira.controller.review.dto; import lombok.Builder; diff --git a/src/main/java/MakeUs/Moira/controller/userReview/dto/UserReviewResponseDto.java b/src/main/java/MakeUs/Moira/controller/review/dto/UserReviewResponseDto.java similarity index 97% rename from src/main/java/MakeUs/Moira/controller/userReview/dto/UserReviewResponseDto.java rename to src/main/java/MakeUs/Moira/controller/review/dto/UserReviewResponseDto.java index 71a537a..5e07fd7 100644 --- a/src/main/java/MakeUs/Moira/controller/userReview/dto/UserReviewResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/review/dto/UserReviewResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.userReview.dto; +package MakeUs.Moira.controller.review.dto; import MakeUs.Moira.controller.userPool.dto.ComplimentMarkWithCountDto; import MakeUs.Moira.domain.AuditorEntity; diff --git a/src/main/java/MakeUs/Moira/controller/user/SignupController.java b/src/main/java/MakeUs/Moira/controller/signup/SignupController.java similarity index 94% rename from src/main/java/MakeUs/Moira/controller/user/SignupController.java rename to src/main/java/MakeUs/Moira/controller/signup/SignupController.java index d149337..7635dd7 100644 --- a/src/main/java/MakeUs/Moira/controller/user/SignupController.java +++ b/src/main/java/MakeUs/Moira/controller/signup/SignupController.java @@ -1,12 +1,12 @@ -package MakeUs.Moira.controller.user; +package MakeUs.Moira.controller.signup; import MakeUs.Moira.config.security.JwtTokenProvider; -import MakeUs.Moira.controller.user.dto.signup.SignupRequestDto; -import MakeUs.Moira.controller.user.dto.myPage.HashtagResponseDto; -import MakeUs.Moira.controller.user.dto.signup.PositionCategoryResponseDto; -import MakeUs.Moira.controller.user.dto.signup.PositionResponseDto; -import MakeUs.Moira.controller.user.dto.signup.SignupResponseDto; +import MakeUs.Moira.controller.signup.dto.SignupRequestDto; +import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto; +import MakeUs.Moira.controller.signup.dto.PositionCategoryResponseDto; +import MakeUs.Moira.controller.signup.dto.PositionResponseDto; +import MakeUs.Moira.controller.signup.dto.SignupResponseDto; import MakeUs.Moira.response.ResponseService; import MakeUs.Moira.response.model.CommonResult; import MakeUs.Moira.response.model.ListResult; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/signup/PositionCategoryResponseDto.java b/src/main/java/MakeUs/Moira/controller/signup/dto/PositionCategoryResponseDto.java similarity index 88% rename from src/main/java/MakeUs/Moira/controller/user/dto/signup/PositionCategoryResponseDto.java rename to src/main/java/MakeUs/Moira/controller/signup/dto/PositionCategoryResponseDto.java index ddddc1a..fe37add 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/signup/PositionCategoryResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/signup/dto/PositionCategoryResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.user.dto.signup; +package MakeUs.Moira.controller.signup.dto; import lombok.Builder; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/signup/PositionResponseDto.java b/src/main/java/MakeUs/Moira/controller/signup/dto/PositionResponseDto.java similarity index 87% rename from src/main/java/MakeUs/Moira/controller/user/dto/signup/PositionResponseDto.java rename to src/main/java/MakeUs/Moira/controller/signup/dto/PositionResponseDto.java index 0b60743..9472cfe 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/signup/PositionResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/signup/dto/PositionResponseDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.user.dto.signup; +package MakeUs.Moira.controller.signup.dto; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/signup/SignupRequestDto.java b/src/main/java/MakeUs/Moira/controller/signup/dto/SignupRequestDto.java similarity index 94% rename from src/main/java/MakeUs/Moira/controller/user/dto/signup/SignupRequestDto.java rename to src/main/java/MakeUs/Moira/controller/signup/dto/SignupRequestDto.java index 168cae6..21958d1 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/signup/SignupRequestDto.java +++ b/src/main/java/MakeUs/Moira/controller/signup/dto/SignupRequestDto.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.controller.user.dto.signup; +package MakeUs.Moira.controller.signup.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/MakeUs/Moira/controller/user/dto/signup/SignupResponseDto.java b/src/main/java/MakeUs/Moira/controller/signup/dto/SignupResponseDto.java similarity index 87% rename from src/main/java/MakeUs/Moira/controller/user/dto/signup/SignupResponseDto.java rename to src/main/java/MakeUs/Moira/controller/signup/dto/SignupResponseDto.java index ce54250..dc6ec0e 100644 --- a/src/main/java/MakeUs/Moira/controller/user/dto/signup/SignupResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/signup/dto/SignupResponseDto.java @@ -1,6 +1,6 @@ -package MakeUs.Moira.controller.user.dto.signup; +package MakeUs.Moira.controller.signup.dto; -import MakeUs.Moira.controller.user.dto.myPage.HashtagResponseDto; +import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto; import lombok.Builder; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/MakeUs/Moira/controller/userPool/dto/UserPoolDetailProfileResponseDto.java b/src/main/java/MakeUs/Moira/controller/userPool/dto/UserPoolDetailProfileResponseDto.java index e281cac..dda822a 100644 --- a/src/main/java/MakeUs/Moira/controller/userPool/dto/UserPoolDetailProfileResponseDto.java +++ b/src/main/java/MakeUs/Moira/controller/userPool/dto/UserPoolDetailProfileResponseDto.java @@ -1,14 +1,12 @@ package MakeUs.Moira.controller.userPool.dto; -import MakeUs.Moira.controller.user.dto.myPage.HashtagResponseDto; +import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto; import MakeUs.Moira.controller.userPortfolio.userAward.dto.UserAwardResponseDto; import MakeUs.Moira.controller.userPortfolio.userCareer.dto.UserCareerResponseDto; import MakeUs.Moira.controller.userPortfolio.userLicense.dto.UserLicenseResponseDto; import MakeUs.Moira.controller.userPortfolio.userLink.dto.UserLinkResponseDto; import MakeUs.Moira.controller.userPortfolio.userSchool.dto.UserSchoolResponseDto; -import MakeUs.Moira.domain.userPool.UserPool; import MakeUs.Moira.domain.userPortfolio.UserPortfolio; -import MakeUs.Moira.domain.userPortfolio.userCareer.UserCareer; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/MakeUs/Moira/domain/position/UserPosition.java b/src/main/java/MakeUs/Moira/domain/position/UserPosition.java index f3cd7da..f0262ef 100644 --- a/src/main/java/MakeUs/Moira/domain/position/UserPosition.java +++ b/src/main/java/MakeUs/Moira/domain/position/UserPosition.java @@ -1,6 +1,6 @@ package MakeUs.Moira.domain.position; -import MakeUs.Moira.controller.user.dto.myPageEdit.MyPageEditPositionInfoDto; +import MakeUs.Moira.controller.myPageEdit.dto.MyPageEditPositionInfoDto; import lombok.Getter; import javax.persistence.*; diff --git a/src/main/java/MakeUs/Moira/domain/user/User.java b/src/main/java/MakeUs/Moira/domain/user/User.java index b2fb10b..9805597 100644 --- a/src/main/java/MakeUs/Moira/domain/user/User.java +++ b/src/main/java/MakeUs/Moira/domain/user/User.java @@ -1,9 +1,8 @@ package MakeUs.Moira.domain.user; -import MakeUs.Moira.controller.security.dto.LoginResponseDto; -import MakeUs.Moira.controller.user.dto.myPageEdit.MyPageEditIntroductionResponseDto; -import MakeUs.Moira.controller.user.dto.myPageEdit.MyPageEditNicknameResponseDto; -import MakeUs.Moira.controller.user.dto.myPageEdit.MyPageEditPositionResponseDto; +import MakeUs.Moira.controller.myPageEdit.dto.MyPageEditIntroductionResponseDto; +import MakeUs.Moira.controller.myPageEdit.dto.MyPageEditNicknameResponseDto; +import MakeUs.Moira.controller.myPageEdit.dto.MyPageEditPositionResponseDto; import MakeUs.Moira.domain.position.UserPosition; import MakeUs.Moira.domain.userPool.UserPool; import MakeUs.Moira.domain.userPortfolio.UserPortfolio; diff --git a/src/main/java/MakeUs/Moira/domain/user/UserHistory.java b/src/main/java/MakeUs/Moira/domain/user/UserHistory.java index 7adc4bf..e003369 100644 --- a/src/main/java/MakeUs/Moira/domain/user/UserHistory.java +++ b/src/main/java/MakeUs/Moira/domain/user/UserHistory.java @@ -1,7 +1,7 @@ package MakeUs.Moira.domain.user; -import MakeUs.Moira.controller.user.dto.myPage.HashtagResponseDto; -import MakeUs.Moira.controller.user.dto.myPageEdit.MyPageEditHashtagResponseDto; +import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto; +import MakeUs.Moira.controller.myPageEdit.dto.MyPageEditHashtagResponseDto; import MakeUs.Moira.domain.club.ClubLike; import MakeUs.Moira.domain.inquiry.Inquiry; import MakeUs.Moira.domain.project.ProjectLike; diff --git a/src/main/java/MakeUs/Moira/domain/userHistory/UserHistory.java b/src/main/java/MakeUs/Moira/domain/userHistory/UserHistory.java index 4142535..01f5742 100644 --- a/src/main/java/MakeUs/Moira/domain/userHistory/UserHistory.java +++ b/src/main/java/MakeUs/Moira/domain/userHistory/UserHistory.java @@ -1,7 +1,7 @@ package MakeUs.Moira.domain.userHistory; -import MakeUs.Moira.controller.user.dto.myPage.HashtagResponseDto; -import MakeUs.Moira.controller.user.dto.myPageEdit.MyPageEditHashtagResponseDto; +import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto; +import MakeUs.Moira.controller.myPageEdit.dto.MyPageEditHashtagResponseDto; import MakeUs.Moira.domain.club.ClubLike; import MakeUs.Moira.domain.inquiry.Inquiry; import MakeUs.Moira.domain.projectLike.ProjectLike; diff --git a/src/main/java/MakeUs/Moira/domain/userReview/UserReview.java b/src/main/java/MakeUs/Moira/domain/userReview/UserReview.java index c53fa39..48ef522 100644 --- a/src/main/java/MakeUs/Moira/domain/userReview/UserReview.java +++ b/src/main/java/MakeUs/Moira/domain/userReview/UserReview.java @@ -1,7 +1,7 @@ package MakeUs.Moira.domain.userReview; import MakeUs.Moira.controller.userPool.dto.UserPoolDetailReviewDetailResponseDto; -import MakeUs.Moira.controller.userReview.dto.UserReviewDetailResponseDto; +import MakeUs.Moira.controller.review.dto.UserReviewDetailResponseDto; import MakeUs.Moira.domain.AuditorEntity; import MakeUs.Moira.domain.user.User; import MakeUs.Moira.domain.user.UserProject; diff --git a/src/main/java/MakeUs/Moira/exception/ErrorCode.java b/src/main/java/MakeUs/Moira/exception/ErrorCode.java index 75e2e0b..c953ad5 100644 --- a/src/main/java/MakeUs/Moira/exception/ErrorCode.java +++ b/src/main/java/MakeUs/Moira/exception/ErrorCode.java @@ -47,7 +47,7 @@ public enum ErrorCode { NON_EXIST_FILE_NAME(470, "존재하지 않는 파일 이름"), NON_EXIST_PROJECT_LEADER(471, "존재하지 않는 팀장"), - NON_EXIST_PROJECT_APPLY(472, "존재하지 않는 지원서") + NON_EXIST_PROJECT_APPLY(472, "존재하지 않는 지원서"); private final int code; diff --git a/src/main/java/MakeUs/Moira/service/alarm/AlarmService.java b/src/main/java/MakeUs/Moira/service/alarm/AlarmService.java index 0cd33a2..9461c94 100644 --- a/src/main/java/MakeUs/Moira/service/alarm/AlarmService.java +++ b/src/main/java/MakeUs/Moira/service/alarm/AlarmService.java @@ -6,7 +6,7 @@ import MakeUs.Moira.advice.exception.CustomException; import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.controller.chat.dto.ChatMessageSendResponseDto; -import MakeUs.Moira.controller.userReview.dto.UserReviewAddResponseDto; +import MakeUs.Moira.controller.review.dto.UserReviewAddResponseDto; import MakeUs.Moira.domain.chat.ChatRoom; import MakeUs.Moira.domain.chat.ChatRoomRepo; import MakeUs.Moira.domain.user.User; diff --git a/src/main/java/MakeUs/Moira/service/hashtag/HashTagService.java b/src/main/java/MakeUs/Moira/service/hashtag/HashTagService.java index 791b5e8..e7d4f18 100644 --- a/src/main/java/MakeUs/Moira/service/hashtag/HashTagService.java +++ b/src/main/java/MakeUs/Moira/service/hashtag/HashTagService.java @@ -1,7 +1,7 @@ package MakeUs.Moira.service.hashtag; import MakeUs.Moira.domain.hashtag.HashtagRepo; -import MakeUs.Moira.controller.user.dto.myPage.HashtagResponseDto; +import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/MakeUs/Moira/service/security/CustomUserDetailService.java b/src/main/java/MakeUs/Moira/service/jwt/CustomUserDetailService.java similarity index 95% rename from src/main/java/MakeUs/Moira/service/security/CustomUserDetailService.java rename to src/main/java/MakeUs/Moira/service/jwt/CustomUserDetailService.java index 73fc752..248a388 100644 --- a/src/main/java/MakeUs/Moira/service/security/CustomUserDetailService.java +++ b/src/main/java/MakeUs/Moira/service/jwt/CustomUserDetailService.java @@ -1,4 +1,4 @@ -package MakeUs.Moira.service.security; +package MakeUs.Moira.service.jwt; import MakeUs.Moira.advice.exception.CustomException; import MakeUs.Moira.advice.exception.ErrorCode; diff --git a/src/main/java/MakeUs/Moira/service/security/LoginService.java b/src/main/java/MakeUs/Moira/service/jwt/JwtService.java similarity index 93% rename from src/main/java/MakeUs/Moira/service/security/LoginService.java rename to src/main/java/MakeUs/Moira/service/jwt/JwtService.java index 4527001..1cc038e 100644 --- a/src/main/java/MakeUs/Moira/service/security/LoginService.java +++ b/src/main/java/MakeUs/Moira/service/jwt/JwtService.java @@ -1,9 +1,9 @@ -package MakeUs.Moira.service.security; +package MakeUs.Moira.service.jwt; import MakeUs.Moira.config.security.JwtTokenProvider; -import MakeUs.Moira.controller.security.dto.LoginRequestDto; -import MakeUs.Moira.controller.security.dto.LoginResponseDto; +import MakeUs.Moira.controller.jwt.dto.LoginRequestDto; +import MakeUs.Moira.controller.jwt.dto.LoginResponseDto; import MakeUs.Moira.domain.security.token.TokenProvider; import MakeUs.Moira.domain.security.token.TokenProviderFactory; import MakeUs.Moira.domain.user.*; @@ -16,7 +16,7 @@ @RequiredArgsConstructor @Service -public class LoginService { +public class JwtService { private final UserRepo userRepo; private final JwtTokenProvider jwtTokenProvider; diff --git a/src/main/java/MakeUs/Moira/service/user/MyPageService.java b/src/main/java/MakeUs/Moira/service/myPage/MyPageService.java similarity index 98% rename from src/main/java/MakeUs/Moira/service/user/MyPageService.java rename to src/main/java/MakeUs/Moira/service/myPage/MyPageService.java index 0a3c141..2771990 100644 --- a/src/main/java/MakeUs/Moira/service/user/MyPageService.java +++ b/src/main/java/MakeUs/Moira/service/myPage/MyPageService.java @@ -1,9 +1,9 @@ -package MakeUs.Moira.service.user; +package MakeUs.Moira.service.myPage; import MakeUs.Moira.advice.exception.CustomException; import MakeUs.Moira.advice.exception.ErrorCode; -import MakeUs.Moira.controller.user.dto.myPage.*; +import MakeUs.Moira.controller.myPage.dto.*; import MakeUs.Moira.domain.AuditorEntity; import MakeUs.Moira.domain.project.Project; import MakeUs.Moira.domain.project.ProjectLike; diff --git a/src/main/java/MakeUs/Moira/service/user/MyPageEditService.java b/src/main/java/MakeUs/Moira/service/myPageEdit/MyPageEditService.java similarity index 95% rename from src/main/java/MakeUs/Moira/service/user/MyPageEditService.java rename to src/main/java/MakeUs/Moira/service/myPageEdit/MyPageEditService.java index 7b581b1..3550a1e 100644 --- a/src/main/java/MakeUs/Moira/service/user/MyPageEditService.java +++ b/src/main/java/MakeUs/Moira/service/myPageEdit/MyPageEditService.java @@ -1,14 +1,11 @@ -package MakeUs.Moira.service.user; +package MakeUs.Moira.service.myPageEdit; import MakeUs.Moira.advice.exception.CustomException; import MakeUs.Moira.advice.exception.ErrorCode; -import MakeUs.Moira.controller.user.dto.myPageEdit.*; +import MakeUs.Moira.controller.myPageEdit.dto.*; import MakeUs.Moira.domain.hashtag.HashtagRepo; import MakeUs.Moira.domain.position.PositionRepo; import MakeUs.Moira.domain.position.UserPosition; -import MakeUs.Moira.domain.project.Project; -import MakeUs.Moira.domain.project.ProjectRepo; -import MakeUs.Moira.domain.project.projectDetail.ProjectDetail; import MakeUs.Moira.domain.user.*; import MakeUs.Moira.domain.userPortfolio.UserPortfolio; import MakeUs.Moira.service.S3Service; diff --git a/src/main/java/MakeUs/Moira/service/project/MyProjectService.java b/src/main/java/MakeUs/Moira/service/myProject/MyProjectService.java similarity index 96% rename from src/main/java/MakeUs/Moira/service/project/MyProjectService.java rename to src/main/java/MakeUs/Moira/service/myProject/MyProjectService.java index c69ed2f..1156ec5 100644 --- a/src/main/java/MakeUs/Moira/service/project/MyProjectService.java +++ b/src/main/java/MakeUs/Moira/service/myProject/MyProjectService.java @@ -1,13 +1,12 @@ -package MakeUs.Moira.service.project; +package MakeUs.Moira.service.myProject; import MakeUs.Moira.advice.exception.CustomException; import MakeUs.Moira.advice.exception.ErrorCode; -import MakeUs.Moira.controller.project.dto.myProject.MyProjectResponseDTO; -import MakeUs.Moira.controller.project.dto.myProject.MyProjectTeammateResponseDTO; -import MakeUs.Moira.controller.project.dto.myProject.MyProjectsResponseDTO; +import MakeUs.Moira.controller.myProject.dto.MyProjectResponseDTO; +import MakeUs.Moira.controller.myProject.dto.MyProjectTeammateResponseDTO; +import MakeUs.Moira.controller.myProject.dto.MyProjectsResponseDTO; import MakeUs.Moira.domain.project.Project; import MakeUs.Moira.domain.project.ProjectRepo; -import MakeUs.Moira.domain.project.projectApply.ProjectApplyRepo; import MakeUs.Moira.domain.user.*; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/MakeUs/Moira/service/position/PositionService.java b/src/main/java/MakeUs/Moira/service/position/PositionService.java index e01ee54..8eee248 100644 --- a/src/main/java/MakeUs/Moira/service/position/PositionService.java +++ b/src/main/java/MakeUs/Moira/service/position/PositionService.java @@ -2,8 +2,8 @@ import MakeUs.Moira.domain.position.PositionCategoryRepo; import MakeUs.Moira.domain.position.PositionRepo; -import MakeUs.Moira.controller.user.dto.signup.PositionCategoryResponseDto; -import MakeUs.Moira.controller.user.dto.signup.PositionResponseDto; +import MakeUs.Moira.controller.signup.dto.PositionCategoryResponseDto; +import MakeUs.Moira.controller.signup.dto.PositionResponseDto; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/MakeUs/Moira/service/project/ProjectService.java b/src/main/java/MakeUs/Moira/service/project/ProjectService.java index c4e3803..45616e1 100644 --- a/src/main/java/MakeUs/Moira/service/project/ProjectService.java +++ b/src/main/java/MakeUs/Moira/service/project/ProjectService.java @@ -2,8 +2,7 @@ import MakeUs.Moira.advice.exception.ErrorCode; import MakeUs.Moira.advice.exception.CustomException; -import MakeUs.Moira.controller.project.dto.ProjectMemberResponseDto; -import MakeUs.Moira.controller.project.dto.project.*; +import MakeUs.Moira.controller.project.dto.*; import MakeUs.Moira.domain.hashtag.Hashtag; import MakeUs.Moira.domain.hashtag.HashtagRepo; import MakeUs.Moira.domain.position.PositionCategory; @@ -13,8 +12,6 @@ import MakeUs.Moira.domain.user.*; import MakeUs.Moira.service.S3Service; import lombok.RequiredArgsConstructor; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.FilenameUtils; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; diff --git a/src/main/java/MakeUs/Moira/service/project/ProjectApplyService.java b/src/main/java/MakeUs/Moira/service/projectApply/ProjectApplyService.java similarity index 98% rename from src/main/java/MakeUs/Moira/service/project/ProjectApplyService.java rename to src/main/java/MakeUs/Moira/service/projectApply/ProjectApplyService.java index 91de29f..b036922 100644 --- a/src/main/java/MakeUs/Moira/service/project/ProjectApplyService.java +++ b/src/main/java/MakeUs/Moira/service/projectApply/ProjectApplyService.java @@ -1,11 +1,11 @@ -package MakeUs.Moira.service.project; +package MakeUs.Moira.service.projectApply; import MakeUs.Moira.advice.exception.CustomException; import MakeUs.Moira.advice.exception.ErrorCode; -import MakeUs.Moira.controller.project.dto.projectApply.ProjectApplicantsResponseDTO; -import MakeUs.Moira.controller.project.dto.projectApply.ProjectApplyRequestDTO; -import MakeUs.Moira.controller.project.dto.projectApply.ProjectApplyResponseDTO; -import MakeUs.Moira.controller.user.dto.myPage.HashtagResponseDto; +import MakeUs.Moira.controller.projectApply.dto.ProjectApplicantsResponseDTO; +import MakeUs.Moira.controller.projectApply.dto.ProjectApplyRequestDTO; +import MakeUs.Moira.controller.projectApply.dto.ProjectApplyResponseDTO; +import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto; import MakeUs.Moira.domain.project.Project; import MakeUs.Moira.domain.project.ProjectRepo; import MakeUs.Moira.domain.project.projectApply.*; diff --git a/src/main/java/MakeUs/Moira/service/project/ProjectCommentService.java b/src/main/java/MakeUs/Moira/service/projectComment/ProjectCommentService.java similarity index 97% rename from src/main/java/MakeUs/Moira/service/project/ProjectCommentService.java rename to src/main/java/MakeUs/Moira/service/projectComment/ProjectCommentService.java index 4a50fec..f29615a 100644 --- a/src/main/java/MakeUs/Moira/service/project/ProjectCommentService.java +++ b/src/main/java/MakeUs/Moira/service/projectComment/ProjectCommentService.java @@ -1,9 +1,9 @@ -package MakeUs.Moira.service.project; +package MakeUs.Moira.service.projectComment; import MakeUs.Moira.advice.exception.CustomException; import MakeUs.Moira.advice.exception.ErrorCode; -import MakeUs.Moira.controller.project.dto.projectComment.ProjectCommentRequestDTO; -import MakeUs.Moira.controller.project.dto.projectComment.ProjectCommentResponseDTO; +import MakeUs.Moira.controller.projectComment.dto.ProjectCommentRequestDTO; +import MakeUs.Moira.controller.projectComment.dto.ProjectCommentResponseDTO; import MakeUs.Moira.domain.project.Project; import MakeUs.Moira.domain.project.ProjectRepo; import MakeUs.Moira.domain.project.projectDetail.ProjectComment; diff --git a/src/main/java/MakeUs/Moira/service/userReview/UserReviewService.java b/src/main/java/MakeUs/Moira/service/review/ReviewService.java similarity index 93% rename from src/main/java/MakeUs/Moira/service/userReview/UserReviewService.java rename to src/main/java/MakeUs/Moira/service/review/ReviewService.java index 5357826..a8c6b58 100644 --- a/src/main/java/MakeUs/Moira/service/userReview/UserReviewService.java +++ b/src/main/java/MakeUs/Moira/service/review/ReviewService.java @@ -1,12 +1,12 @@ -package MakeUs.Moira.service.userReview; +package MakeUs.Moira.service.review; import MakeUs.Moira.controller.userPool.dto.ComplimentMarkWithCountDto; import MakeUs.Moira.advice.exception.CustomException; import MakeUs.Moira.advice.exception.ErrorCode; -import MakeUs.Moira.controller.userReview.dto.UserReviewAddRequestDto; -import MakeUs.Moira.controller.userReview.dto.UserReviewAddResponseDto; -import MakeUs.Moira.controller.userReview.dto.UserReviewDetailResponseDto; -import MakeUs.Moira.controller.userReview.dto.UserReviewResponseDto; +import MakeUs.Moira.controller.review.dto.UserReviewAddRequestDto; +import MakeUs.Moira.controller.review.dto.UserReviewAddResponseDto; +import MakeUs.Moira.controller.review.dto.UserReviewDetailResponseDto; +import MakeUs.Moira.controller.review.dto.UserReviewResponseDto; import MakeUs.Moira.domain.AuditorEntity; import MakeUs.Moira.domain.complimentMark.ComplimentMarkInfo; import MakeUs.Moira.domain.complimentMark.ComplimentMarkInfoRepo; @@ -26,7 +26,7 @@ @RequiredArgsConstructor @Service -public class UserReviewService { +public class ReviewService { private final UserRepo userRepo; private final UserProjectRepo userProjectRepo; diff --git a/src/main/java/MakeUs/Moira/service/user/UserService.java b/src/main/java/MakeUs/Moira/service/user/UserService.java index c374d63..b34d9d5 100644 --- a/src/main/java/MakeUs/Moira/service/user/UserService.java +++ b/src/main/java/MakeUs/Moira/service/user/UserService.java @@ -3,9 +3,9 @@ import MakeUs.Moira.advice.exception.CustomException; import MakeUs.Moira.advice.exception.ErrorCode; -import MakeUs.Moira.controller.user.dto.myPage.HashtagResponseDto; -import MakeUs.Moira.controller.user.dto.signup.PositionResponseDto; -import MakeUs.Moira.controller.user.dto.signup.SignupResponseDto; +import MakeUs.Moira.controller.myPage.dto.HashtagResponseDto; +import MakeUs.Moira.controller.signup.dto.PositionResponseDto; +import MakeUs.Moira.controller.signup.dto.SignupResponseDto; import MakeUs.Moira.domain.hashtag.Hashtag; import MakeUs.Moira.domain.hashtag.HashtagRepo; import MakeUs.Moira.domain.position.PositionRepo; @@ -16,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.concurrent.ExecutionException; import java.util.stream.Collectors;