From d45f75f38a8865564d2637dcba1b3a2d82e64741 Mon Sep 17 00:00:00 2001 From: Jeyong Date: Mon, 24 Mar 2025 19:36:59 +0900 Subject: [PATCH 1/8] =?UTF-8?q?{docs}=20.gitignore=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1718a99..c4e38ba 100644 --- a/.gitignore +++ b/.gitignore @@ -49,5 +49,4 @@ MathCaptain/weakness.trace.db *.trace.db ### Secret key ### -MathCaptain/weakness/src/main/resources/application.yml -MathCaptain/weakness/src/main/resources/application-jwt.yml +MathCaptain/weakness/src/main/resources/application.properties From 937c211e47fe764dde62e731ffbbfb560f1378a9 Mon Sep 17 00:00:00 2001 From: Jeyong Date: Tue, 25 Mar 2025 21:48:57 +0900 Subject: [PATCH 2/8] =?UTF-8?q?{refactor}=20@CreatedDate=20=EC=96=B4?= =?UTF-8?q?=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EB=B0=8F=20=EA=B8=B0=EB=B3=B8=EA=B0=92=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/MathCaptain/weakness/Group/domain/Group.java | 3 ++- .../weakness/Notification/domain/Notification.java | 2 ++ .../weakness/Recruitment/domain/Comment.java | 11 ++++------- .../java/MathCaptain/weakness/User/domain/Users.java | 9 --------- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/domain/Group.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/domain/Group.java index d2440ef..f5f883b 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/domain/Group.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/domain/Group.java @@ -9,6 +9,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import org.springframework.data.annotation.CreatedDate; import java.time.DayOfWeek; import java.time.LocalDate; @@ -53,6 +54,7 @@ public class Group { @Column(name = "hashtag") private List hashtags; + @CreatedDate private LocalDate createDate; private String groupImageUrl; @@ -69,7 +71,6 @@ public class Group { @PrePersist protected void onCreate() { - this.createDate = LocalDate.now(); if (this.weeklyGoalAchieveMap == null) { this.weeklyGoalAchieveMap = new EnumMap<>(DayOfWeek.class); diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Notification/domain/Notification.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Notification/domain/Notification.java index dc1c342..f52640b 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Notification/domain/Notification.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Notification/domain/Notification.java @@ -8,6 +8,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import org.springframework.data.annotation.CreatedDate; import java.time.LocalDateTime; @@ -24,6 +25,7 @@ public class Notification { private String sender; + @CreatedDate private LocalDateTime createdAt; private String contents; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/domain/Comment.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/domain/Comment.java index 0fde4ce..dbc4217 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/domain/Comment.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/domain/Comment.java @@ -4,6 +4,8 @@ import MathCaptain.weakness.User.domain.Users; import jakarta.persistence.*; import lombok.*; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; import java.time.LocalDateTime; @@ -29,19 +31,14 @@ public class Comment { @Column(nullable = false, length = 1000) private String content; + @CreatedDate @Column(nullable = false) private LocalDateTime commentTime; @Column(nullable = false) + @LastModifiedDate private LocalDateTime lastModifiedTime; - // 기본값 설정 - @PrePersist - protected void onCreate() { - this.commentTime = LocalDateTime.now(); - this.lastModifiedTime = LocalDateTime.now(); - } - //==수정==// public void updateContent(String content) { if (content != null && !content.equals(this.content)) { diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/domain/Users.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/domain/Users.java index 52a90d4..724c4a6 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/domain/Users.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/domain/Users.java @@ -64,15 +64,6 @@ public void destroyRefreshToken() { this.refreshToken = null; } - //== 패스워드 암호화 ==// - public void encodePassword(PasswordEncoder passwordEncoder){ - this.password = passwordEncoder.encode(password); - } - - public boolean matchPassword(PasswordEncoder passwordEncoder, String checkPassword) { - return passwordEncoder.matches(checkPassword, getPassword()); - } - @PrePersist protected void onCreate() { this.userPoint = 0L; From 3ac0e51dcc884d76bcb6fc6cc54f4aaf56fa3698 Mon Sep 17 00:00:00 2001 From: Jeyong Date: Tue, 25 Mar 2025 22:27:37 +0900 Subject: [PATCH 3/8] =?UTF-8?q?{style}=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/MathCaptain/weakness/TestInit.java | 30 ++++++++-------- .../Group/Login/LoginFailureHandler.java | 2 +- .../Login/LoginSuccessJWTProvideHandler.java | 17 ++++------ .../Login/LoginUserArgumentResolver.java | 6 ++-- .../Group/controller/GroupController.java | 31 +++++++---------- .../Group/controller/GroupJoinController.java | 15 ++++---- .../dto/request/GroupCreateRequestDto.java | 4 +-- .../dto/request/GroupJoinRequestDto.java | 2 +- .../dto/request/GroupSearchRequestDto.java | 2 +- .../dto/request/GroupUpdateRequestDto.java | 2 +- .../dto/response/GroupDetailResponseDto.java | 4 +-- .../dto/response/GroupJoinResponseDto.java | 2 +- .../response/GroupMemberListResponseDto.java | 4 +-- .../Group/dto/response/GroupResponseDto.java | 4 +-- .../dto/response/RelationResponseDto.java | 6 ++-- .../response/UserGroupCardResponseDto.java | 4 +-- .../domain => domain/Group/entity}/Group.java | 9 +++-- .../entity}/RelationBetweenUserAndGroup.java | 8 ++--- .../Group/enums/CategoryStatus.java | 2 +- .../{ => domain}/Group/enums/GroupRole.java | 2 +- .../Group/enums/RequestStatus.java | 2 +- .../Group/repository/GroupRepository.java | 8 ++--- .../Group/repository/RelationRepository.java | 12 +++---- .../Group/service/GroupJoinService.java | 20 +++++------ .../Group/service/GroupService.java | 34 +++++++++---------- .../Group/service/RelationService.java | 28 +++++++-------- .../controller/NotificationController.java | 6 ++-- .../Notification/domain/Notification.java | 2 +- .../repository/NotificationRepository.java | 4 +-- .../service/NotificationService.java | 28 +++++++-------- .../Ranking/controller/RankingController.java | 6 ++-- .../dto/response/GroupRankingResponseDto.java | 2 +- .../Ranking/service/RankingService.java | 8 ++--- .../Record/controller/RecordController.java | 13 ++++--- .../dto/request/recordEndRequestDto.java | 2 +- .../dto/request/recordStartRequestDto.java | 2 +- .../dto/response/recordStartResponseDto.java | 2 +- .../response/recordSummaryResponseDto.java | 2 +- .../Record/entity}/ActivityRecord.java | 7 ++-- .../Record/repository/RecordRepository.java | 8 ++--- .../Record/service/RecordService.java | 24 ++++++------- .../controller/RecruitmentController.java | 20 +++++------ .../dto/request/CreateCommentRequestDto.java | 2 +- .../request/CreateRecruitmentRequestDto.java | 3 +- .../dto/request/UpdateCommentRequestDto.java | 2 +- .../request/UpdateRecruitmentRequestDto.java | 4 +-- .../dto/response/CommentResponseDto.java | 2 +- .../dto/response/CommentSuccessDto.java | 2 +- .../RecruitmentCreateResponseDto.java | 2 +- .../RecruitmentDetailResponseDto.java | 6 ++-- .../dto/response/RecruitmentResponseDto.java | 6 ++-- .../dto/response/RecruitmentSuccessDto.java | 2 +- .../Recruitment/entity}/Comment.java | 6 ++-- .../Recruitment/entity}/Recruitment.java | 12 +++---- .../Recruitment/enums/RecruitmentStatus.java | 2 +- .../repository/CommentRepository.java | 7 ++-- .../repository/RecruitmentRepository.java | 4 +-- .../Recruitment/service/CommentService.java | 25 ++++++-------- .../service/RecruitmentService.java | 27 ++++++++------- .../User/controller/FindPwdController.java | 7 +--- .../User/controller/UserController.java | 16 ++++----- .../User/dto/request/FindEmailRequestDto.java | 2 +- .../User/dto/request/FindPwdRequestDto.java | 2 +- .../User/dto/request/SaveUserRequestDto.java | 2 +- .../dto/request/UpdateUserRequestDto.java | 2 +- .../dto/request/UserDeleteRequestDto.java | 2 +- .../User/dto/response/ChangePwdDto.java | 2 +- .../dto/response/FindEmailResponseDto.java | 2 +- .../dto/response/UserCardResponseDto.java | 6 ++-- .../User/dto/response/UserResponseDto.java | 6 ++-- .../User/entity}/UserDetailsImpl.java | 2 +- .../domain => domain/User/entity}/Users.java | 18 +++++----- .../User/enums/TierThresholds.java | 2 +- .../{ => domain}/User/enums/Tiers.java | 2 +- .../User/repository/UserRepository.java | 4 +-- .../User/service/UserDetailsServiceImpl.java | 8 ++--- .../User/service/UserService.java | 26 +++++++------- .../global/Scheduler/GoalResetScheduler.java | 8 ++--- .../Scheduler/WeeklyGoalResetScheduler.java | 4 +-- .../{Security => auth}/AuthController.java | 8 ++--- .../filter/GroupRoleFilter.java | 23 ++++++------- ...nUsernamePasswordAuthenticationFilter.java | 2 +- .../JwtAuthenticationProcessingFilter.java | 10 +++--- .../{Security => auth}/jwt/JwtService.java | 2 +- .../jwt/JwtServiceImpl.java | 7 ++-- .../{Security => config}/SecurityConfig.java | 28 +++++++-------- .../weakness/global/config/WebConfig.java | 2 +- 87 files changed, 339 insertions(+), 376 deletions(-) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/Login/LoginFailureHandler.java (94%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/Login/LoginSuccessJWTProvideHandler.java (80%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/Login/LoginUserArgumentResolver.java (91%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/controller/GroupController.java (75%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/controller/GroupJoinController.java (86%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/dto/request/GroupCreateRequestDto.java (90%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/dto/request/GroupJoinRequestDto.java (82%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/dto/request/GroupSearchRequestDto.java (85%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/dto/request/GroupUpdateRequestDto.java (93%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/dto/response/GroupDetailResponseDto.java (84%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/dto/response/GroupJoinResponseDto.java (85%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/dto/response/GroupMemberListResponseDto.java (82%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/dto/response/GroupResponseDto.java (82%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/dto/response/RelationResponseDto.java (66%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/dto/response/UserGroupCardResponseDto.java (80%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{Group/domain => domain/Group/entity}/Group.java (94%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{Group/domain => domain/Group/entity}/RelationBetweenUserAndGroup.java (93%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/enums/CategoryStatus.java (58%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/enums/GroupRole.java (50%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/enums/RequestStatus.java (63%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/repository/GroupRepository.java (76%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/repository/RelationRepository.java (88%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/service/GroupJoinService.java (87%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/service/GroupService.java (91%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Group/service/RelationService.java (88%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Notification/controller/NotificationController.java (86%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Notification/domain/Notification.java (91%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Notification/repository/NotificationRepository.java (63%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Notification/service/NotificationService.java (90%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Ranking/controller/RankingController.java (81%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Ranking/dto/response/GroupRankingResponseDto.java (78%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Ranking/service/RankingService.java (85%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Record/controller/RecordController.java (67%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Record/dto/request/recordEndRequestDto.java (82%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Record/dto/request/recordStartRequestDto.java (80%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Record/dto/response/recordStartResponseDto.java (77%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Record/dto/response/recordSummaryResponseDto.java (92%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{Record/domain => domain/Record/entity}/ActivityRecord.java (91%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Record/repository/RecordRepository.java (87%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Record/service/RecordService.java (92%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Recruitment/controller/RecruitmentController.java (82%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Recruitment/dto/request/CreateCommentRequestDto.java (86%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Recruitment/dto/request/CreateRecruitmentRequestDto.java (87%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Recruitment/dto/request/UpdateCommentRequestDto.java (87%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Recruitment/dto/request/UpdateRecruitmentRequestDto.java (88%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Recruitment/dto/response/CommentResponseDto.java (82%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Recruitment/dto/response/CommentSuccessDto.java (71%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Recruitment/dto/response/RecruitmentCreateResponseDto.java (77%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Recruitment/dto/response/RecruitmentDetailResponseDto.java (71%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Recruitment/dto/response/RecruitmentResponseDto.java (68%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Recruitment/dto/response/RecruitmentSuccessDto.java (68%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{Recruitment/domain => domain/Recruitment/entity}/Comment.java (87%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{Recruitment/domain => domain/Recruitment/entity}/Recruitment.java (86%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Recruitment/enums/RecruitmentStatus.java (62%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Recruitment/repository/CommentRepository.java (58%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Recruitment/repository/RecruitmentRepository.java (77%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Recruitment/service/CommentService.java (81%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/Recruitment/service/RecruitmentService.java (86%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/User/controller/FindPwdController.java (59%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/User/controller/UserController.java (82%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/User/dto/request/FindEmailRequestDto.java (91%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/User/dto/request/FindPwdRequestDto.java (90%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/User/dto/request/SaveUserRequestDto.java (95%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/User/dto/request/UpdateUserRequestDto.java (94%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/User/dto/request/UserDeleteRequestDto.java (64%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/User/dto/response/ChangePwdDto.java (84%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/User/dto/response/FindEmailResponseDto.java (69%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/User/dto/response/UserCardResponseDto.java (60%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/User/dto/response/UserResponseDto.java (64%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{User/domain => domain/User/entity}/UserDetailsImpl.java (95%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{User/domain => domain/User/entity}/Users.java (87%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/User/enums/TierThresholds.java (90%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/User/enums/Tiers.java (66%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/User/repository/UserRepository.java (85%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/User/service/UserDetailsServiceImpl.java (76%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/{ => domain}/User/service/UserService.java (89%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/{Security => auth}/AuthController.java (59%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/{Security => auth}/filter/GroupRoleFilter.java (92%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/{Security => auth}/filter/JsonUsernamePasswordAuthenticationFilter.java (98%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/{Security => auth}/filter/JwtAuthenticationProcessingFilter.java (94%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/{Security => auth}/jwt/JwtService.java (95%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/{Security => auth}/jwt/JwtServiceImpl.java (96%) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/{Security => config}/SecurityConfig.java (87%) diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/TestInit.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/TestInit.java index d18466b..6dd400d 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/TestInit.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/TestInit.java @@ -1,20 +1,20 @@ package MathCaptain.weakness; -import MathCaptain.weakness.Group.domain.Group; -import MathCaptain.weakness.Group.domain.RelationBetweenUserAndGroup; -import MathCaptain.weakness.Group.enums.CategoryStatus; -import MathCaptain.weakness.Group.enums.GroupRole; -import MathCaptain.weakness.Group.repository.GroupRepository; -import MathCaptain.weakness.Group.repository.RelationRepository; -import MathCaptain.weakness.Record.domain.ActivityRecord; -import MathCaptain.weakness.Record.repository.RecordRepository; -import MathCaptain.weakness.Recruitment.domain.Comment; -import MathCaptain.weakness.Recruitment.domain.Recruitment; -import MathCaptain.weakness.Recruitment.enums.RecruitmentStatus; -import MathCaptain.weakness.Recruitment.repository.CommentRepository; -import MathCaptain.weakness.Recruitment.repository.RecruitmentRepository; -import MathCaptain.weakness.User.domain.Users; -import MathCaptain.weakness.User.repository.UserRepository; +import MathCaptain.weakness.domain.Group.entity.Group; +import MathCaptain.weakness.domain.Group.entity.RelationBetweenUserAndGroup; +import MathCaptain.weakness.domain.Group.enums.CategoryStatus; +import MathCaptain.weakness.domain.Group.enums.GroupRole; +import MathCaptain.weakness.domain.Group.repository.GroupRepository; +import MathCaptain.weakness.domain.Group.repository.RelationRepository; +import MathCaptain.weakness.domain.Record.entity.ActivityRecord; +import MathCaptain.weakness.domain.Record.repository.RecordRepository; +import MathCaptain.weakness.domain.Recruitment.entity.Comment; +import MathCaptain.weakness.domain.Recruitment.entity.Recruitment; +import MathCaptain.weakness.domain.Recruitment.enums.RecruitmentStatus; +import MathCaptain.weakness.domain.Recruitment.repository.CommentRepository; +import MathCaptain.weakness.domain.Recruitment.repository.RecruitmentRepository; +import MathCaptain.weakness.domain.User.entity.Users; +import MathCaptain.weakness.domain.User.repository.UserRepository; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/Login/LoginFailureHandler.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/Login/LoginFailureHandler.java similarity index 94% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/Login/LoginFailureHandler.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/Login/LoginFailureHandler.java index cac2fad..3fb039b 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/Login/LoginFailureHandler.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/Login/LoginFailureHandler.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Group.Login; +package MathCaptain.weakness.domain.Group.Login; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/Login/LoginSuccessJWTProvideHandler.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/Login/LoginSuccessJWTProvideHandler.java similarity index 80% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/Login/LoginSuccessJWTProvideHandler.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/Login/LoginSuccessJWTProvideHandler.java index 64b2e45..8ed64e9 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/Login/LoginSuccessJWTProvideHandler.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/Login/LoginSuccessJWTProvideHandler.java @@ -1,11 +1,9 @@ -package MathCaptain.weakness.Group.Login; - -import MathCaptain.weakness.Group.dto.response.GroupResponseDto; -import MathCaptain.weakness.Group.repository.RelationRepository; -import MathCaptain.weakness.Group.service.GroupService; -import MathCaptain.weakness.global.Api.ApiResponse; -import MathCaptain.weakness.global.Security.jwt.JwtService; -import MathCaptain.weakness.User.repository.UserRepository; +package MathCaptain.weakness.domain.Group.Login; + +import MathCaptain.weakness.domain.Group.repository.RelationRepository; +import MathCaptain.weakness.domain.Group.service.GroupService; +import MathCaptain.weakness.global.auth.jwt.JwtService; +import MathCaptain.weakness.domain.User.repository.UserRepository; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -13,14 +11,11 @@ import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler; -import org.springframework.web.servlet.view.RedirectView; import java.io.IOException; -import java.util.List; @Slf4j @RequiredArgsConstructor diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/Login/LoginUserArgumentResolver.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/Login/LoginUserArgumentResolver.java similarity index 91% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/Login/LoginUserArgumentResolver.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/Login/LoginUserArgumentResolver.java index 596b014..0c3dcab 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/Login/LoginUserArgumentResolver.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/Login/LoginUserArgumentResolver.java @@ -1,7 +1,7 @@ -package MathCaptain.weakness.Group.Login; +package MathCaptain.weakness.domain.Group.Login; -import MathCaptain.weakness.User.domain.UserDetailsImpl; -import MathCaptain.weakness.User.domain.Users; +import MathCaptain.weakness.domain.User.entity.UserDetailsImpl; +import MathCaptain.weakness.domain.User.entity.Users; import MathCaptain.weakness.global.annotation.LoginUser; import org.springframework.core.MethodParameter; import org.springframework.security.core.Authentication; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/controller/GroupController.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/controller/GroupController.java similarity index 75% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/controller/GroupController.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/controller/GroupController.java index b733695..6644700 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/controller/GroupController.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/controller/GroupController.java @@ -1,21 +1,16 @@ -package MathCaptain.weakness.Group.controller; - -import MathCaptain.weakness.Group.dto.request.GroupJoinRequestDto; -import MathCaptain.weakness.Group.dto.request.GroupSearchRequestDto; -import MathCaptain.weakness.Group.dto.request.GroupUpdateRequestDto; -import MathCaptain.weakness.Group.dto.response.GroupDetailResponseDto; -import MathCaptain.weakness.Group.dto.response.GroupMemberListResponseDto; -import MathCaptain.weakness.Group.dto.response.GroupResponseDto; -import MathCaptain.weakness.Group.dto.response.RelationResponseDto; -import MathCaptain.weakness.Group.enums.RequestStatus; -import MathCaptain.weakness.Group.service.GroupJoinService; -import MathCaptain.weakness.Notification.service.NotificationService; -import MathCaptain.weakness.User.domain.UserDetailsImpl; -import MathCaptain.weakness.User.domain.Users; -import MathCaptain.weakness.User.dto.response.UserResponseDto; -import MathCaptain.weakness.Group.service.GroupService; -import MathCaptain.weakness.Group.dto.request.GroupCreateRequestDto; -import MathCaptain.weakness.Group.service.RelationService; +package MathCaptain.weakness.domain.Group.controller; + +import MathCaptain.weakness.domain.Group.dto.request.GroupSearchRequestDto; +import MathCaptain.weakness.domain.Group.dto.request.GroupUpdateRequestDto; +import MathCaptain.weakness.domain.Group.dto.response.GroupDetailResponseDto; +import MathCaptain.weakness.domain.Group.dto.response.GroupMemberListResponseDto; +import MathCaptain.weakness.domain.Group.dto.response.GroupResponseDto; +import MathCaptain.weakness.domain.Group.dto.response.RelationResponseDto; +import MathCaptain.weakness.domain.User.entity.Users; +import MathCaptain.weakness.domain.User.dto.response.UserResponseDto; +import MathCaptain.weakness.domain.Group.service.GroupService; +import MathCaptain.weakness.domain.Group.dto.request.GroupCreateRequestDto; +import MathCaptain.weakness.domain.Group.service.RelationService; import MathCaptain.weakness.global.Api.ApiResponse; import MathCaptain.weakness.global.annotation.LoginUser; import jakarta.servlet.http.HttpServletResponse; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/controller/GroupJoinController.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/controller/GroupJoinController.java similarity index 86% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/controller/GroupJoinController.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/controller/GroupJoinController.java index af60ead..4610b5f 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/controller/GroupJoinController.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/controller/GroupJoinController.java @@ -1,12 +1,11 @@ -package MathCaptain.weakness.Group.controller; +package MathCaptain.weakness.domain.Group.controller; -import MathCaptain.weakness.Group.dto.request.GroupJoinRequestDto; -import MathCaptain.weakness.Group.enums.RequestStatus; -import MathCaptain.weakness.Group.service.GroupJoinService; -import MathCaptain.weakness.Group.service.GroupService; -import MathCaptain.weakness.Group.service.RelationService; -import MathCaptain.weakness.Notification.service.NotificationService; -import MathCaptain.weakness.User.domain.Users; +import MathCaptain.weakness.domain.Group.dto.request.GroupJoinRequestDto; +import MathCaptain.weakness.domain.Group.enums.RequestStatus; +import MathCaptain.weakness.domain.Group.service.GroupJoinService; +import MathCaptain.weakness.domain.Group.service.RelationService; +import MathCaptain.weakness.domain.Notification.service.NotificationService; +import MathCaptain.weakness.domain.User.entity.Users; import MathCaptain.weakness.global.Api.ApiResponse; import MathCaptain.weakness.global.annotation.LoginUser; import jakarta.validation.Valid; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/request/GroupCreateRequestDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/request/GroupCreateRequestDto.java similarity index 90% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/request/GroupCreateRequestDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/request/GroupCreateRequestDto.java index 7c803a1..e4dec86 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/request/GroupCreateRequestDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/request/GroupCreateRequestDto.java @@ -1,6 +1,6 @@ -package MathCaptain.weakness.Group.dto.request; +package MathCaptain.weakness.domain.Group.dto.request; -import MathCaptain.weakness.Group.enums.CategoryStatus; +import MathCaptain.weakness.domain.Group.enums.CategoryStatus; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Builder; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/request/GroupJoinRequestDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/request/GroupJoinRequestDto.java similarity index 82% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/request/GroupJoinRequestDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/request/GroupJoinRequestDto.java index ef7a2fd..b39ae60 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/request/GroupJoinRequestDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/request/GroupJoinRequestDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Group.dto.request; +package MathCaptain.weakness.domain.Group.dto.request; import jakarta.validation.constraints.NotNull; import lombok.Builder; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/request/GroupSearchRequestDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/request/GroupSearchRequestDto.java similarity index 85% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/request/GroupSearchRequestDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/request/GroupSearchRequestDto.java index 7893377..1334f62 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/request/GroupSearchRequestDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/request/GroupSearchRequestDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Group.dto.request; +package MathCaptain.weakness.domain.Group.dto.request; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/request/GroupUpdateRequestDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/request/GroupUpdateRequestDto.java similarity index 93% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/request/GroupUpdateRequestDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/request/GroupUpdateRequestDto.java index 2b42fe6..aa97641 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/request/GroupUpdateRequestDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/request/GroupUpdateRequestDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Group.dto.request; +package MathCaptain.weakness.domain.Group.dto.request; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/GroupDetailResponseDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/GroupDetailResponseDto.java similarity index 84% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/GroupDetailResponseDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/GroupDetailResponseDto.java index d57cd43..da1b1a1 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/GroupDetailResponseDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/GroupDetailResponseDto.java @@ -1,6 +1,6 @@ -package MathCaptain.weakness.Group.dto.response; +package MathCaptain.weakness.domain.Group.dto.response; -import MathCaptain.weakness.Group.enums.CategoryStatus; +import MathCaptain.weakness.domain.Group.enums.CategoryStatus; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/GroupJoinResponseDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/GroupJoinResponseDto.java similarity index 85% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/GroupJoinResponseDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/GroupJoinResponseDto.java index 7f98501..65f083b 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/GroupJoinResponseDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/GroupJoinResponseDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Group.dto.response; +package MathCaptain.weakness.domain.Group.dto.response; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/GroupMemberListResponseDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/GroupMemberListResponseDto.java similarity index 82% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/GroupMemberListResponseDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/GroupMemberListResponseDto.java index 2079951..9da38ed 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/GroupMemberListResponseDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/GroupMemberListResponseDto.java @@ -1,6 +1,6 @@ -package MathCaptain.weakness.Group.dto.response; +package MathCaptain.weakness.domain.Group.dto.response; -import MathCaptain.weakness.Group.enums.GroupRole; +import MathCaptain.weakness.domain.Group.enums.GroupRole; import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/GroupResponseDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/GroupResponseDto.java similarity index 82% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/GroupResponseDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/GroupResponseDto.java index 4daaedf..f694b07 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/GroupResponseDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/GroupResponseDto.java @@ -1,6 +1,6 @@ -package MathCaptain.weakness.Group.dto.response; +package MathCaptain.weakness.domain.Group.dto.response; -import MathCaptain.weakness.Group.enums.CategoryStatus; +import MathCaptain.weakness.domain.Group.enums.CategoryStatus; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/RelationResponseDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/RelationResponseDto.java similarity index 66% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/RelationResponseDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/RelationResponseDto.java index bf41aa3..7ea9d42 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/RelationResponseDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/RelationResponseDto.java @@ -1,7 +1,7 @@ -package MathCaptain.weakness.Group.dto.response; +package MathCaptain.weakness.domain.Group.dto.response; -import MathCaptain.weakness.Group.enums.GroupRole; -import MathCaptain.weakness.User.dto.response.UserResponseDto; +import MathCaptain.weakness.domain.Group.enums.GroupRole; +import MathCaptain.weakness.domain.User.dto.response.UserResponseDto; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/UserGroupCardResponseDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/UserGroupCardResponseDto.java similarity index 80% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/UserGroupCardResponseDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/UserGroupCardResponseDto.java index 980f6d4..1e859e5 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/dto/response/UserGroupCardResponseDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/dto/response/UserGroupCardResponseDto.java @@ -1,6 +1,6 @@ -package MathCaptain.weakness.Group.dto.response; +package MathCaptain.weakness.domain.Group.dto.response; -import MathCaptain.weakness.Group.enums.GroupRole; +import MathCaptain.weakness.domain.Group.enums.GroupRole; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/domain/Group.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/entity/Group.java similarity index 94% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/domain/Group.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/entity/Group.java index f5f883b..9183989 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/domain/Group.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/entity/Group.java @@ -1,9 +1,8 @@ -package MathCaptain.weakness.Group.domain; +package MathCaptain.weakness.domain.Group.entity; -import MathCaptain.weakness.Group.dto.request.GroupUpdateRequestDto; -import MathCaptain.weakness.Group.enums.CategoryStatus; -import MathCaptain.weakness.Recruitment.domain.Recruitment; -import MathCaptain.weakness.User.domain.Users; +import MathCaptain.weakness.domain.Group.dto.request.GroupUpdateRequestDto; +import MathCaptain.weakness.domain.Group.enums.CategoryStatus; +import MathCaptain.weakness.domain.Recruitment.entity.Recruitment; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/domain/RelationBetweenUserAndGroup.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/entity/RelationBetweenUserAndGroup.java similarity index 93% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/domain/RelationBetweenUserAndGroup.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/entity/RelationBetweenUserAndGroup.java index ac3e72e..3d1a2e6 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/domain/RelationBetweenUserAndGroup.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/entity/RelationBetweenUserAndGroup.java @@ -1,8 +1,8 @@ -package MathCaptain.weakness.Group.domain; +package MathCaptain.weakness.domain.Group.entity; -import MathCaptain.weakness.Group.enums.GroupRole; -import MathCaptain.weakness.Group.enums.RequestStatus; -import MathCaptain.weakness.User.domain.Users; +import MathCaptain.weakness.domain.Group.enums.GroupRole; +import MathCaptain.weakness.domain.Group.enums.RequestStatus; +import MathCaptain.weakness.domain.User.entity.Users; import jakarta.persistence.*; import lombok.*; import org.hibernate.validator.constraints.Range; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/enums/CategoryStatus.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/enums/CategoryStatus.java similarity index 58% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/enums/CategoryStatus.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/enums/CategoryStatus.java index 0b20ef8..462c5a3 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/enums/CategoryStatus.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/enums/CategoryStatus.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Group.enums; +package MathCaptain.weakness.domain.Group.enums; public enum CategoryStatus { FITNESS, diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/enums/GroupRole.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/enums/GroupRole.java similarity index 50% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/enums/GroupRole.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/enums/GroupRole.java index 39b5ed0..4995603 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/enums/GroupRole.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/enums/GroupRole.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Group.enums; +package MathCaptain.weakness.domain.Group.enums; public enum GroupRole { LEADER, diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/enums/RequestStatus.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/enums/RequestStatus.java similarity index 63% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/enums/RequestStatus.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/enums/RequestStatus.java index 1d178fd..4f15199 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/enums/RequestStatus.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/enums/RequestStatus.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Group.enums; +package MathCaptain.weakness.domain.Group.enums; public enum RequestStatus { WAITING, diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/repository/GroupRepository.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/repository/GroupRepository.java similarity index 76% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/repository/GroupRepository.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/repository/GroupRepository.java index d1547c2..9715b9a 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/repository/GroupRepository.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/repository/GroupRepository.java @@ -1,9 +1,7 @@ -package MathCaptain.weakness.Group.repository; +package MathCaptain.weakness.domain.Group.repository; -import MathCaptain.weakness.Group.domain.Group; -import MathCaptain.weakness.Group.enums.CategoryStatus; -import jakarta.validation.constraints.NotNull; -import org.hibernate.validator.constraints.Range; +import MathCaptain.weakness.domain.Group.entity.Group; +import MathCaptain.weakness.domain.Group.enums.CategoryStatus; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/repository/RelationRepository.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/repository/RelationRepository.java similarity index 88% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/repository/RelationRepository.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/repository/RelationRepository.java index e28301e..63ed896 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/repository/RelationRepository.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/repository/RelationRepository.java @@ -1,10 +1,10 @@ -package MathCaptain.weakness.Group.repository; +package MathCaptain.weakness.domain.Group.repository; -import MathCaptain.weakness.Group.domain.Group; -import MathCaptain.weakness.Group.domain.RelationBetweenUserAndGroup; -import MathCaptain.weakness.Group.enums.GroupRole; -import MathCaptain.weakness.Group.enums.RequestStatus; -import MathCaptain.weakness.User.domain.Users; +import MathCaptain.weakness.domain.Group.entity.Group; +import MathCaptain.weakness.domain.Group.entity.RelationBetweenUserAndGroup; +import MathCaptain.weakness.domain.Group.enums.GroupRole; +import MathCaptain.weakness.domain.Group.enums.RequestStatus; +import MathCaptain.weakness.domain.User.entity.Users; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/service/GroupJoinService.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/service/GroupJoinService.java similarity index 87% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/service/GroupJoinService.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/service/GroupJoinService.java index dc79473..ab00319 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/service/GroupJoinService.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/service/GroupJoinService.java @@ -1,13 +1,13 @@ -package MathCaptain.weakness.Group.service; - -import MathCaptain.weakness.Group.domain.Group; -import MathCaptain.weakness.Group.domain.RelationBetweenUserAndGroup; -import MathCaptain.weakness.Group.dto.request.GroupJoinRequestDto; -import MathCaptain.weakness.Group.dto.response.GroupJoinResponseDto; -import MathCaptain.weakness.Group.enums.RequestStatus; -import MathCaptain.weakness.Group.repository.GroupRepository; -import MathCaptain.weakness.Group.repository.RelationRepository; -import MathCaptain.weakness.User.domain.Users; +package MathCaptain.weakness.domain.Group.service; + +import MathCaptain.weakness.domain.Group.entity.Group; +import MathCaptain.weakness.domain.Group.entity.RelationBetweenUserAndGroup; +import MathCaptain.weakness.domain.Group.dto.request.GroupJoinRequestDto; +import MathCaptain.weakness.domain.Group.dto.response.GroupJoinResponseDto; +import MathCaptain.weakness.domain.Group.enums.RequestStatus; +import MathCaptain.weakness.domain.Group.repository.GroupRepository; +import MathCaptain.weakness.domain.Group.repository.RelationRepository; +import MathCaptain.weakness.domain.User.entity.Users; import MathCaptain.weakness.global.Api.ApiResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/service/GroupService.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/service/GroupService.java similarity index 91% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/service/GroupService.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/service/GroupService.java index a1384cb..5ad455a 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/service/GroupService.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/service/GroupService.java @@ -1,20 +1,20 @@ -package MathCaptain.weakness.Group.service; - -import MathCaptain.weakness.Group.domain.Group; -import MathCaptain.weakness.Group.domain.RelationBetweenUserAndGroup; -import MathCaptain.weakness.Group.dto.request.GroupCreateRequestDto; -import MathCaptain.weakness.Group.dto.request.GroupJoinRequestDto; -import MathCaptain.weakness.Group.dto.request.GroupUpdateRequestDto; -import MathCaptain.weakness.Group.dto.response.GroupDetailResponseDto; -import MathCaptain.weakness.Group.dto.response.GroupResponseDto; -import MathCaptain.weakness.Group.dto.response.UserGroupCardResponseDto; -import MathCaptain.weakness.Group.enums.CategoryStatus; -import MathCaptain.weakness.Record.repository.RecordRepository; -import MathCaptain.weakness.Record.service.RecordService; -import MathCaptain.weakness.User.dto.response.UserResponseDto; -import MathCaptain.weakness.Group.repository.GroupRepository; -import MathCaptain.weakness.Group.repository.RelationRepository; -import MathCaptain.weakness.User.domain.Users; +package MathCaptain.weakness.domain.Group.service; + +import MathCaptain.weakness.domain.Group.entity.Group; +import MathCaptain.weakness.domain.Group.entity.RelationBetweenUserAndGroup; +import MathCaptain.weakness.domain.Group.dto.request.GroupCreateRequestDto; +import MathCaptain.weakness.domain.Group.dto.request.GroupJoinRequestDto; +import MathCaptain.weakness.domain.Group.dto.request.GroupUpdateRequestDto; +import MathCaptain.weakness.domain.Group.dto.response.GroupDetailResponseDto; +import MathCaptain.weakness.domain.Group.dto.response.GroupResponseDto; +import MathCaptain.weakness.domain.Group.dto.response.UserGroupCardResponseDto; +import MathCaptain.weakness.domain.Group.enums.CategoryStatus; +import MathCaptain.weakness.domain.Record.repository.RecordRepository; +import MathCaptain.weakness.domain.Record.service.RecordService; +import MathCaptain.weakness.domain.User.dto.response.UserResponseDto; +import MathCaptain.weakness.domain.Group.repository.GroupRepository; +import MathCaptain.weakness.domain.Group.repository.RelationRepository; +import MathCaptain.weakness.domain.User.entity.Users; import MathCaptain.weakness.global.Api.ApiResponse; import MathCaptain.weakness.global.exception.DuplicatedException; import MathCaptain.weakness.global.exception.ResourceNotFoundException; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/service/RelationService.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/service/RelationService.java similarity index 88% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/service/RelationService.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/service/RelationService.java index 93a0ef7..d456552 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Group/service/RelationService.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Group/service/RelationService.java @@ -1,17 +1,17 @@ -package MathCaptain.weakness.Group.service; - -import MathCaptain.weakness.Group.domain.Group; -import MathCaptain.weakness.Group.domain.RelationBetweenUserAndGroup; -import MathCaptain.weakness.Group.dto.request.GroupJoinRequestDto; -import MathCaptain.weakness.Group.dto.response.GroupMemberListResponseDto; -import MathCaptain.weakness.Group.dto.response.GroupResponseDto; -import MathCaptain.weakness.Group.dto.response.RelationResponseDto; -import MathCaptain.weakness.Group.repository.GroupRepository; -import MathCaptain.weakness.Record.repository.RecordRepository; -import MathCaptain.weakness.User.dto.response.UserResponseDto; -import MathCaptain.weakness.Group.enums.GroupRole; -import MathCaptain.weakness.Group.repository.RelationRepository; -import MathCaptain.weakness.User.domain.Users; +package MathCaptain.weakness.domain.Group.service; + +import MathCaptain.weakness.domain.Group.entity.Group; +import MathCaptain.weakness.domain.Group.entity.RelationBetweenUserAndGroup; +import MathCaptain.weakness.domain.Group.dto.request.GroupJoinRequestDto; +import MathCaptain.weakness.domain.Group.dto.response.GroupMemberListResponseDto; +import MathCaptain.weakness.domain.Group.dto.response.GroupResponseDto; +import MathCaptain.weakness.domain.Group.dto.response.RelationResponseDto; +import MathCaptain.weakness.domain.Group.repository.GroupRepository; +import MathCaptain.weakness.domain.Record.repository.RecordRepository; +import MathCaptain.weakness.domain.User.dto.response.UserResponseDto; +import MathCaptain.weakness.domain.Group.enums.GroupRole; +import MathCaptain.weakness.domain.Group.repository.RelationRepository; +import MathCaptain.weakness.domain.User.entity.Users; import MathCaptain.weakness.global.Api.ApiResponse; import MathCaptain.weakness.global.exception.ResourceNotFoundException; import lombok.RequiredArgsConstructor; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Notification/controller/NotificationController.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/controller/NotificationController.java similarity index 86% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Notification/controller/NotificationController.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/controller/NotificationController.java index 736a98d..ae8c79e 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Notification/controller/NotificationController.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/controller/NotificationController.java @@ -1,7 +1,7 @@ -package MathCaptain.weakness.Notification.controller; +package MathCaptain.weakness.domain.Notification.controller; -import MathCaptain.weakness.Notification.service.NotificationService; -import MathCaptain.weakness.User.domain.Users; +import MathCaptain.weakness.domain.Notification.service.NotificationService; +import MathCaptain.weakness.domain.User.entity.Users; import MathCaptain.weakness.global.Api.ApiResponse; import MathCaptain.weakness.global.annotation.LoginUser; import lombok.RequiredArgsConstructor; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Notification/domain/Notification.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/domain/Notification.java similarity index 91% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Notification/domain/Notification.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/domain/Notification.java index f52640b..69afe9c 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Notification/domain/Notification.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/domain/Notification.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Notification.domain; +package MathCaptain.weakness.domain.Notification.domain; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Notification/repository/NotificationRepository.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/repository/NotificationRepository.java similarity index 63% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Notification/repository/NotificationRepository.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/repository/NotificationRepository.java index 35ed3e4..9958b2f 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Notification/repository/NotificationRepository.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/repository/NotificationRepository.java @@ -1,6 +1,6 @@ -package MathCaptain.weakness.Notification.repository; +package MathCaptain.weakness.domain.Notification.repository; -import MathCaptain.weakness.Notification.domain.Notification; +import MathCaptain.weakness.domain.Notification.domain.Notification; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Notification/service/NotificationService.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/service/NotificationService.java similarity index 90% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Notification/service/NotificationService.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/service/NotificationService.java index 90d44cd..0dd8513 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Notification/service/NotificationService.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/service/NotificationService.java @@ -1,17 +1,17 @@ -package MathCaptain.weakness.Notification.service; - -import MathCaptain.weakness.Group.domain.Group; -import MathCaptain.weakness.Group.domain.RelationBetweenUserAndGroup; -import MathCaptain.weakness.Group.repository.GroupRepository; -import MathCaptain.weakness.Group.repository.RelationRepository; -import MathCaptain.weakness.Notification.controller.NotificationController; -import MathCaptain.weakness.Notification.domain.Notification; -import MathCaptain.weakness.Notification.repository.NotificationRepository; -import MathCaptain.weakness.Recruitment.domain.Comment; -import MathCaptain.weakness.Recruitment.domain.Recruitment; -import MathCaptain.weakness.Recruitment.repository.CommentRepository; -import MathCaptain.weakness.Recruitment.repository.RecruitmentRepository; -import MathCaptain.weakness.User.domain.Users; +package MathCaptain.weakness.domain.Notification.service; + +import MathCaptain.weakness.domain.Group.entity.Group; +import MathCaptain.weakness.domain.Group.entity.RelationBetweenUserAndGroup; +import MathCaptain.weakness.domain.Group.repository.GroupRepository; +import MathCaptain.weakness.domain.Group.repository.RelationRepository; +import MathCaptain.weakness.domain.Notification.controller.NotificationController; +import MathCaptain.weakness.domain.Notification.domain.Notification; +import MathCaptain.weakness.domain.Notification.repository.NotificationRepository; +import MathCaptain.weakness.domain.Recruitment.entity.Comment; +import MathCaptain.weakness.domain.Recruitment.entity.Recruitment; +import MathCaptain.weakness.domain.Recruitment.repository.CommentRepository; +import MathCaptain.weakness.domain.Recruitment.repository.RecruitmentRepository; +import MathCaptain.weakness.domain.User.entity.Users; import MathCaptain.weakness.global.Api.ApiResponse; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Ranking/controller/RankingController.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Ranking/controller/RankingController.java similarity index 81% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Ranking/controller/RankingController.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Ranking/controller/RankingController.java index ca70501..75b2ab3 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Ranking/controller/RankingController.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Ranking/controller/RankingController.java @@ -1,7 +1,7 @@ -package MathCaptain.weakness.Ranking.controller; +package MathCaptain.weakness.domain.Ranking.controller; -import MathCaptain.weakness.Ranking.dto.response.GroupRankingResponseDto; -import MathCaptain.weakness.Ranking.service.RankingService; +import MathCaptain.weakness.domain.Ranking.dto.response.GroupRankingResponseDto; +import MathCaptain.weakness.domain.Ranking.service.RankingService; import MathCaptain.weakness.global.Api.ApiResponse; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Ranking/dto/response/GroupRankingResponseDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Ranking/dto/response/GroupRankingResponseDto.java similarity index 78% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Ranking/dto/response/GroupRankingResponseDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Ranking/dto/response/GroupRankingResponseDto.java index 549762c..351416f 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Ranking/dto/response/GroupRankingResponseDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Ranking/dto/response/GroupRankingResponseDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Ranking.dto.response; +package MathCaptain.weakness.domain.Ranking.dto.response; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Ranking/service/RankingService.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Ranking/service/RankingService.java similarity index 85% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Ranking/service/RankingService.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Ranking/service/RankingService.java index 3715b41..59846b9 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Ranking/service/RankingService.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Ranking/service/RankingService.java @@ -1,8 +1,8 @@ -package MathCaptain.weakness.Ranking.service; +package MathCaptain.weakness.domain.Ranking.service; -import MathCaptain.weakness.Group.domain.Group; -import MathCaptain.weakness.Group.repository.GroupRepository; -import MathCaptain.weakness.Ranking.dto.response.GroupRankingResponseDto; +import MathCaptain.weakness.domain.Group.entity.Group; +import MathCaptain.weakness.domain.Group.repository.GroupRepository; +import MathCaptain.weakness.domain.Ranking.dto.response.GroupRankingResponseDto; import lombok.Builder; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/controller/RecordController.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/controller/RecordController.java similarity index 67% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/controller/RecordController.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/controller/RecordController.java index eeffa1c..f536389 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/controller/RecordController.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/controller/RecordController.java @@ -1,11 +1,10 @@ -package MathCaptain.weakness.Record.controller; +package MathCaptain.weakness.domain.Record.controller; -import MathCaptain.weakness.Record.dto.request.recordEndRequestDto; -import MathCaptain.weakness.Record.dto.request.recordStartRequestDto; -import MathCaptain.weakness.Record.dto.response.recordStartResponseDto; -import MathCaptain.weakness.Record.dto.response.recordSummaryResponseDto; -import MathCaptain.weakness.Record.service.RecordService; -import MathCaptain.weakness.User.domain.Users; +import MathCaptain.weakness.domain.Record.dto.request.recordEndRequestDto; +import MathCaptain.weakness.domain.Record.dto.response.recordStartResponseDto; +import MathCaptain.weakness.domain.Record.dto.response.recordSummaryResponseDto; +import MathCaptain.weakness.domain.Record.service.RecordService; +import MathCaptain.weakness.domain.User.entity.Users; import MathCaptain.weakness.global.Api.ApiResponse; import MathCaptain.weakness.global.annotation.LoginUser; import lombok.RequiredArgsConstructor; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/dto/request/recordEndRequestDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/dto/request/recordEndRequestDto.java similarity index 82% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/dto/request/recordEndRequestDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/dto/request/recordEndRequestDto.java index a24ab5b..7f3c06f 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/dto/request/recordEndRequestDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/dto/request/recordEndRequestDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Record.dto.request; +package MathCaptain.weakness.domain.Record.dto.request; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/dto/request/recordStartRequestDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/dto/request/recordStartRequestDto.java similarity index 80% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/dto/request/recordStartRequestDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/dto/request/recordStartRequestDto.java index f36caa7..7dc5a0f 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/dto/request/recordStartRequestDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/dto/request/recordStartRequestDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Record.dto.request; +package MathCaptain.weakness.domain.Record.dto.request; import jakarta.validation.constraints.NotNull; import lombok.Builder; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/dto/response/recordStartResponseDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/dto/response/recordStartResponseDto.java similarity index 77% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/dto/response/recordStartResponseDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/dto/response/recordStartResponseDto.java index a88ca50..1dd59b7 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/dto/response/recordStartResponseDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/dto/response/recordStartResponseDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Record.dto.response; +package MathCaptain.weakness.domain.Record.dto.response; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/dto/response/recordSummaryResponseDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/dto/response/recordSummaryResponseDto.java similarity index 92% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/dto/response/recordSummaryResponseDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/dto/response/recordSummaryResponseDto.java index 114c969..f36039a 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/dto/response/recordSummaryResponseDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/dto/response/recordSummaryResponseDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Record.dto.response; +package MathCaptain.weakness.domain.Record.dto.response; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/domain/ActivityRecord.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/entity/ActivityRecord.java similarity index 91% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/domain/ActivityRecord.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/entity/ActivityRecord.java index ccfe952..86c19ed 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/domain/ActivityRecord.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/entity/ActivityRecord.java @@ -1,7 +1,7 @@ -package MathCaptain.weakness.Record.domain; +package MathCaptain.weakness.domain.Record.entity; -import MathCaptain.weakness.Group.domain.Group; -import MathCaptain.weakness.User.domain.Users; +import MathCaptain.weakness.domain.Group.entity.Group; +import MathCaptain.weakness.domain.User.entity.Users; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Builder; @@ -10,7 +10,6 @@ import org.hibernate.validator.constraints.Range; import java.time.DayOfWeek; -import java.time.Duration; import java.time.LocalDateTime; @Getter diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/repository/RecordRepository.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/repository/RecordRepository.java similarity index 87% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/repository/RecordRepository.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/repository/RecordRepository.java index 44ff08a..d4d870d 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/repository/RecordRepository.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/repository/RecordRepository.java @@ -1,8 +1,8 @@ -package MathCaptain.weakness.Record.repository; +package MathCaptain.weakness.domain.Record.repository; -import MathCaptain.weakness.Group.domain.Group; -import MathCaptain.weakness.Record.domain.ActivityRecord; -import MathCaptain.weakness.User.domain.Users; +import MathCaptain.weakness.domain.Group.entity.Group; +import MathCaptain.weakness.domain.Record.entity.ActivityRecord; +import MathCaptain.weakness.domain.User.entity.Users; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/service/RecordService.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/service/RecordService.java similarity index 92% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/service/RecordService.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/service/RecordService.java index 552d1af..6dd40de 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Record/service/RecordService.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/service/RecordService.java @@ -1,15 +1,15 @@ -package MathCaptain.weakness.Record.service; - -import MathCaptain.weakness.Group.domain.Group; -import MathCaptain.weakness.Group.domain.RelationBetweenUserAndGroup; -import MathCaptain.weakness.Group.repository.GroupRepository; -import MathCaptain.weakness.Group.repository.RelationRepository; -import MathCaptain.weakness.Record.domain.ActivityRecord; -import MathCaptain.weakness.Record.dto.request.recordEndRequestDto; -import MathCaptain.weakness.Record.dto.response.recordStartResponseDto; -import MathCaptain.weakness.Record.dto.response.recordSummaryResponseDto; -import MathCaptain.weakness.Record.repository.RecordRepository; -import MathCaptain.weakness.User.domain.Users; +package MathCaptain.weakness.domain.Record.service; + +import MathCaptain.weakness.domain.Group.entity.Group; +import MathCaptain.weakness.domain.Group.entity.RelationBetweenUserAndGroup; +import MathCaptain.weakness.domain.Group.repository.GroupRepository; +import MathCaptain.weakness.domain.Group.repository.RelationRepository; +import MathCaptain.weakness.domain.Record.entity.ActivityRecord; +import MathCaptain.weakness.domain.Record.dto.request.recordEndRequestDto; +import MathCaptain.weakness.domain.Record.dto.response.recordStartResponseDto; +import MathCaptain.weakness.domain.Record.dto.response.recordSummaryResponseDto; +import MathCaptain.weakness.domain.Record.repository.RecordRepository; +import MathCaptain.weakness.domain.User.entity.Users; import MathCaptain.weakness.global.PointSet; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/controller/RecruitmentController.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/controller/RecruitmentController.java similarity index 82% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/controller/RecruitmentController.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/controller/RecruitmentController.java index 8888a02..9d114d3 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/controller/RecruitmentController.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/controller/RecruitmentController.java @@ -1,14 +1,14 @@ -package MathCaptain.weakness.Recruitment.controller; +package MathCaptain.weakness.domain.Recruitment.controller; -import MathCaptain.weakness.Notification.service.NotificationService; -import MathCaptain.weakness.Recruitment.dto.request.CreateCommentRequestDto; -import MathCaptain.weakness.Recruitment.dto.request.CreateRecruitmentRequestDto; -import MathCaptain.weakness.Recruitment.dto.request.UpdateCommentRequestDto; -import MathCaptain.weakness.Recruitment.dto.request.UpdateRecruitmentRequestDto; -import MathCaptain.weakness.Recruitment.dto.response.*; -import MathCaptain.weakness.Recruitment.service.CommentService; -import MathCaptain.weakness.Recruitment.service.RecruitmentService; -import MathCaptain.weakness.User.domain.Users; +import MathCaptain.weakness.domain.Notification.service.NotificationService; +import MathCaptain.weakness.domain.Recruitment.dto.request.CreateCommentRequestDto; +import MathCaptain.weakness.domain.Recruitment.dto.request.CreateRecruitmentRequestDto; +import MathCaptain.weakness.domain.Recruitment.dto.request.UpdateCommentRequestDto; +import MathCaptain.weakness.domain.Recruitment.dto.request.UpdateRecruitmentRequestDto; +import MathCaptain.weakness.domain.Recruitment.dto.response.*; +import MathCaptain.weakness.domain.Recruitment.service.CommentService; +import MathCaptain.weakness.domain.Recruitment.service.RecruitmentService; +import MathCaptain.weakness.domain.User.entity.Users; import MathCaptain.weakness.global.Api.ApiResponse; import MathCaptain.weakness.global.annotation.LoginUser; import jakarta.validation.Valid; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/request/CreateCommentRequestDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/request/CreateCommentRequestDto.java similarity index 86% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/request/CreateCommentRequestDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/request/CreateCommentRequestDto.java index 88e4b09..62bb70c 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/request/CreateCommentRequestDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/request/CreateCommentRequestDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Recruitment.dto.request; +package MathCaptain.weakness.domain.Recruitment.dto.request; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/request/CreateRecruitmentRequestDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/request/CreateRecruitmentRequestDto.java similarity index 87% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/request/CreateRecruitmentRequestDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/request/CreateRecruitmentRequestDto.java index d9e12d3..e066410 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/request/CreateRecruitmentRequestDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/request/CreateRecruitmentRequestDto.java @@ -1,6 +1,5 @@ -package MathCaptain.weakness.Recruitment.dto.request; +package MathCaptain.weakness.domain.Recruitment.dto.request; -import MathCaptain.weakness.Group.enums.CategoryStatus; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/request/UpdateCommentRequestDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/request/UpdateCommentRequestDto.java similarity index 87% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/request/UpdateCommentRequestDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/request/UpdateCommentRequestDto.java index 1f43dc7..9793686 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/request/UpdateCommentRequestDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/request/UpdateCommentRequestDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Recruitment.dto.request; +package MathCaptain.weakness.domain.Recruitment.dto.request; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/request/UpdateRecruitmentRequestDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/request/UpdateRecruitmentRequestDto.java similarity index 88% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/request/UpdateRecruitmentRequestDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/request/UpdateRecruitmentRequestDto.java index a3e60a6..697240a 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/request/UpdateRecruitmentRequestDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/request/UpdateRecruitmentRequestDto.java @@ -1,6 +1,6 @@ -package MathCaptain.weakness.Recruitment.dto.request; +package MathCaptain.weakness.domain.Recruitment.dto.request; -import MathCaptain.weakness.Recruitment.enums.RecruitmentStatus; +import MathCaptain.weakness.domain.Recruitment.enums.RecruitmentStatus; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/CommentResponseDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/CommentResponseDto.java similarity index 82% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/CommentResponseDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/CommentResponseDto.java index cbf6033..1626d27 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/CommentResponseDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/CommentResponseDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Recruitment.dto.response; +package MathCaptain.weakness.domain.Recruitment.dto.response; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/CommentSuccessDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/CommentSuccessDto.java similarity index 71% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/CommentSuccessDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/CommentSuccessDto.java index b2c2ef7..d86e185 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/CommentSuccessDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/CommentSuccessDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Recruitment.dto.response; +package MathCaptain.weakness.domain.Recruitment.dto.response; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/RecruitmentCreateResponseDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/RecruitmentCreateResponseDto.java similarity index 77% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/RecruitmentCreateResponseDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/RecruitmentCreateResponseDto.java index 5572575..0464db7 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/RecruitmentCreateResponseDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/RecruitmentCreateResponseDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Recruitment.dto.response; +package MathCaptain.weakness.domain.Recruitment.dto.response; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/RecruitmentDetailResponseDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/RecruitmentDetailResponseDto.java similarity index 71% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/RecruitmentDetailResponseDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/RecruitmentDetailResponseDto.java index 2fbe123..0b5be20 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/RecruitmentDetailResponseDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/RecruitmentDetailResponseDto.java @@ -1,7 +1,7 @@ -package MathCaptain.weakness.Recruitment.dto.response; +package MathCaptain.weakness.domain.Recruitment.dto.response; -import MathCaptain.weakness.Group.enums.CategoryStatus; -import MathCaptain.weakness.Recruitment.enums.RecruitmentStatus; +import MathCaptain.weakness.domain.Group.enums.CategoryStatus; +import MathCaptain.weakness.domain.Recruitment.enums.RecruitmentStatus; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/RecruitmentResponseDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/RecruitmentResponseDto.java similarity index 68% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/RecruitmentResponseDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/RecruitmentResponseDto.java index 5554f68..0c9d3da 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/RecruitmentResponseDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/RecruitmentResponseDto.java @@ -1,7 +1,7 @@ -package MathCaptain.weakness.Recruitment.dto.response; +package MathCaptain.weakness.domain.Recruitment.dto.response; -import MathCaptain.weakness.Group.enums.CategoryStatus; -import MathCaptain.weakness.Recruitment.enums.RecruitmentStatus; +import MathCaptain.weakness.domain.Group.enums.CategoryStatus; +import MathCaptain.weakness.domain.Recruitment.enums.RecruitmentStatus; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/RecruitmentSuccessDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/RecruitmentSuccessDto.java similarity index 68% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/RecruitmentSuccessDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/RecruitmentSuccessDto.java index 5ad2475..9055d2c 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/dto/response/RecruitmentSuccessDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/dto/response/RecruitmentSuccessDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Recruitment.dto.response; +package MathCaptain.weakness.domain.Recruitment.dto.response; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/domain/Comment.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/entity/Comment.java similarity index 87% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/domain/Comment.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/entity/Comment.java index dbc4217..9ca3430 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/domain/Comment.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/entity/Comment.java @@ -1,7 +1,7 @@ -package MathCaptain.weakness.Recruitment.domain; +package MathCaptain.weakness.domain.Recruitment.entity; -import MathCaptain.weakness.Recruitment.dto.request.UpdateCommentRequestDto; -import MathCaptain.weakness.User.domain.Users; +import MathCaptain.weakness.domain.Recruitment.dto.request.UpdateCommentRequestDto; +import MathCaptain.weakness.domain.User.entity.Users; import jakarta.persistence.*; import lombok.*; import org.springframework.data.annotation.CreatedDate; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/domain/Recruitment.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/entity/Recruitment.java similarity index 86% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/domain/Recruitment.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/entity/Recruitment.java index 83cb183..76f4abf 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/domain/Recruitment.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/entity/Recruitment.java @@ -1,10 +1,10 @@ -package MathCaptain.weakness.Recruitment.domain; +package MathCaptain.weakness.domain.Recruitment.entity; -import MathCaptain.weakness.Group.domain.Group; -import MathCaptain.weakness.Group.enums.CategoryStatus; -import MathCaptain.weakness.Recruitment.dto.request.UpdateRecruitmentRequestDto; -import MathCaptain.weakness.Recruitment.enums.RecruitmentStatus; -import MathCaptain.weakness.User.domain.Users; +import MathCaptain.weakness.domain.Group.entity.Group; +import MathCaptain.weakness.domain.Group.enums.CategoryStatus; +import MathCaptain.weakness.domain.Recruitment.dto.request.UpdateRecruitmentRequestDto; +import MathCaptain.weakness.domain.Recruitment.enums.RecruitmentStatus; +import MathCaptain.weakness.domain.User.entity.Users; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; import lombok.*; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/enums/RecruitmentStatus.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/enums/RecruitmentStatus.java similarity index 62% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/enums/RecruitmentStatus.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/enums/RecruitmentStatus.java index b6502ba..ad493e7 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/enums/RecruitmentStatus.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/enums/RecruitmentStatus.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.Recruitment.enums; +package MathCaptain.weakness.domain.Recruitment.enums; public enum RecruitmentStatus { // 모집중, 모집종료 diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/repository/CommentRepository.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/repository/CommentRepository.java similarity index 58% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/repository/CommentRepository.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/repository/CommentRepository.java index 8da94a3..d98c300 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/repository/CommentRepository.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/repository/CommentRepository.java @@ -1,12 +1,11 @@ -package MathCaptain.weakness.Recruitment.repository; +package MathCaptain.weakness.domain.Recruitment.repository; -import MathCaptain.weakness.Recruitment.domain.Comment; -import MathCaptain.weakness.Recruitment.domain.Recruitment; +import MathCaptain.weakness.domain.Recruitment.entity.Comment; +import MathCaptain.weakness.domain.Recruitment.entity.Recruitment; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import java.util.List; -import java.util.Optional; @Repository public interface CommentRepository extends JpaRepository { diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/repository/RecruitmentRepository.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/repository/RecruitmentRepository.java similarity index 77% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/repository/RecruitmentRepository.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/repository/RecruitmentRepository.java index 30eafcb..a664e5c 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/repository/RecruitmentRepository.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/repository/RecruitmentRepository.java @@ -1,6 +1,6 @@ -package MathCaptain.weakness.Recruitment.repository; +package MathCaptain.weakness.domain.Recruitment.repository; -import MathCaptain.weakness.Recruitment.domain.Recruitment; +import MathCaptain.weakness.domain.Recruitment.entity.Recruitment; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/service/CommentService.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/service/CommentService.java similarity index 81% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/service/CommentService.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/service/CommentService.java index ff263e2..c7f6a52 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/service/CommentService.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/service/CommentService.java @@ -1,23 +1,20 @@ -package MathCaptain.weakness.Recruitment.service; - -import MathCaptain.weakness.Recruitment.domain.Comment; -import MathCaptain.weakness.Recruitment.domain.Recruitment; -import MathCaptain.weakness.Recruitment.dto.request.CreateCommentRequestDto; -import MathCaptain.weakness.Recruitment.dto.request.UpdateCommentRequestDto; -import MathCaptain.weakness.Recruitment.dto.response.CommentResponseDto; -import MathCaptain.weakness.Recruitment.dto.response.CommentSuccessDto; -import MathCaptain.weakness.Recruitment.repository.CommentRepository; -import MathCaptain.weakness.Recruitment.repository.RecruitmentRepository; -import MathCaptain.weakness.User.domain.Users; -import MathCaptain.weakness.User.repository.UserRepository; +package MathCaptain.weakness.domain.Recruitment.service; + +import MathCaptain.weakness.domain.Recruitment.entity.Comment; +import MathCaptain.weakness.domain.Recruitment.entity.Recruitment; +import MathCaptain.weakness.domain.Recruitment.dto.request.CreateCommentRequestDto; +import MathCaptain.weakness.domain.Recruitment.dto.request.UpdateCommentRequestDto; +import MathCaptain.weakness.domain.Recruitment.dto.response.CommentResponseDto; +import MathCaptain.weakness.domain.Recruitment.dto.response.CommentSuccessDto; +import MathCaptain.weakness.domain.Recruitment.repository.CommentRepository; +import MathCaptain.weakness.domain.Recruitment.repository.RecruitmentRepository; +import MathCaptain.weakness.domain.User.entity.Users; import MathCaptain.weakness.global.Api.ApiResponse; -import MathCaptain.weakness.global.Security.jwt.JwtService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; import java.util.List; @Slf4j diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/service/RecruitmentService.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/service/RecruitmentService.java similarity index 86% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/service/RecruitmentService.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/service/RecruitmentService.java index 85901f4..d34a79e 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/Recruitment/service/RecruitmentService.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/service/RecruitmentService.java @@ -1,16 +1,17 @@ -package MathCaptain.weakness.Recruitment.service; - -import MathCaptain.weakness.Group.domain.Group; -import MathCaptain.weakness.Group.domain.RelationBetweenUserAndGroup; -import MathCaptain.weakness.Group.enums.GroupRole; -import MathCaptain.weakness.Group.repository.GroupRepository; -import MathCaptain.weakness.Group.repository.RelationRepository; -import MathCaptain.weakness.Recruitment.domain.Recruitment; -import MathCaptain.weakness.Recruitment.dto.request.CreateRecruitmentRequestDto; -import MathCaptain.weakness.Recruitment.dto.request.UpdateRecruitmentRequestDto; -import MathCaptain.weakness.Recruitment.dto.response.*; -import MathCaptain.weakness.Recruitment.repository.RecruitmentRepository; -import MathCaptain.weakness.User.domain.Users; +package MathCaptain.weakness.domain.Recruitment.service; + +import MathCaptain.weakness.domain.Group.entity.Group; +import MathCaptain.weakness.domain.Group.entity.RelationBetweenUserAndGroup; +import MathCaptain.weakness.domain.Group.enums.GroupRole; +import MathCaptain.weakness.domain.Group.repository.GroupRepository; +import MathCaptain.weakness.domain.Group.repository.RelationRepository; +import MathCaptain.weakness.domain.Recruitment.dto.response.*; +import MathCaptain.weakness.domain.Recruitment.entity.Recruitment; +import MathCaptain.weakness.domain.Recruitment.dto.request.CreateRecruitmentRequestDto; +import MathCaptain.weakness.domain.Recruitment.dto.request.UpdateRecruitmentRequestDto; +import MathCaptain.weakness.domain.Recruitment.dto.response.*; +import MathCaptain.weakness.domain.Recruitment.repository.RecruitmentRepository; +import MathCaptain.weakness.domain.User.entity.Users; import MathCaptain.weakness.global.Api.ApiResponse; import MathCaptain.weakness.global.exception.ResourceNotFoundException; import lombok.RequiredArgsConstructor; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/controller/FindPwdController.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/controller/FindPwdController.java similarity index 59% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/controller/FindPwdController.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/controller/FindPwdController.java index 28fca8f..92c7cb7 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/controller/FindPwdController.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/controller/FindPwdController.java @@ -1,10 +1,5 @@ -package MathCaptain.weakness.User.controller; +package MathCaptain.weakness.domain.User.controller; -import MathCaptain.weakness.User.dto.request.FindPwdRequestDto; -import MathCaptain.weakness.User.dto.response.ChangePwdDto; -import MathCaptain.weakness.User.service.UserService; -import MathCaptain.weakness.global.Api.ApiResponse; -import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/controller/UserController.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/controller/UserController.java similarity index 82% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/controller/UserController.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/controller/UserController.java index 7a299ff..da6786f 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/controller/UserController.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/controller/UserController.java @@ -1,18 +1,16 @@ -package MathCaptain.weakness.User.controller; +package MathCaptain.weakness.domain.User.controller; -import MathCaptain.weakness.User.domain.Users; -import MathCaptain.weakness.User.dto.request.*; -import MathCaptain.weakness.User.dto.response.ChangePwdDto; -import MathCaptain.weakness.User.dto.response.UserCardResponseDto; -import MathCaptain.weakness.User.dto.response.UserResponseDto; -import MathCaptain.weakness.User.service.UserService; +import MathCaptain.weakness.domain.User.dto.request.*; +import MathCaptain.weakness.domain.User.entity.Users; +import MathCaptain.weakness.domain.User.dto.response.ChangePwdDto; +import MathCaptain.weakness.domain.User.dto.response.UserCardResponseDto; +import MathCaptain.weakness.domain.User.dto.response.UserResponseDto; +import MathCaptain.weakness.domain.User.service.UserService; import MathCaptain.weakness.global.Api.ApiResponse; import MathCaptain.weakness.global.annotation.LoginUser; import jakarta.validation.Valid; -import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @Slf4j diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/request/FindEmailRequestDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/FindEmailRequestDto.java similarity index 91% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/request/FindEmailRequestDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/FindEmailRequestDto.java index 2cef581..c2c75a0 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/request/FindEmailRequestDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/FindEmailRequestDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.User.dto.request; +package MathCaptain.weakness.domain.User.dto.request; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/request/FindPwdRequestDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/FindPwdRequestDto.java similarity index 90% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/request/FindPwdRequestDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/FindPwdRequestDto.java index 0094701..6e0a560 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/request/FindPwdRequestDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/FindPwdRequestDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.User.dto.request; +package MathCaptain.weakness.domain.User.dto.request; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotNull; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/request/SaveUserRequestDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/SaveUserRequestDto.java similarity index 95% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/request/SaveUserRequestDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/SaveUserRequestDto.java index 8c74ad6..f8d2086 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/request/SaveUserRequestDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/SaveUserRequestDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.User.dto.request; +package MathCaptain.weakness.domain.User.dto.request; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotNull; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/request/UpdateUserRequestDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/UpdateUserRequestDto.java similarity index 94% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/request/UpdateUserRequestDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/UpdateUserRequestDto.java index 95dc3df..9f924d9 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/request/UpdateUserRequestDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/UpdateUserRequestDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.User.dto.request; +package MathCaptain.weakness.domain.User.dto.request; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotNull; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/request/UserDeleteRequestDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/UserDeleteRequestDto.java similarity index 64% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/request/UserDeleteRequestDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/UserDeleteRequestDto.java index 85514fb..7df53a6 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/request/UserDeleteRequestDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/request/UserDeleteRequestDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.User.dto.request; +package MathCaptain.weakness.domain.User.dto.request; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/response/ChangePwdDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/response/ChangePwdDto.java similarity index 84% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/response/ChangePwdDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/response/ChangePwdDto.java index ef945d6..6e94256 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/response/ChangePwdDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/response/ChangePwdDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.User.dto.response; +package MathCaptain.weakness.domain.User.dto.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/response/FindEmailResponseDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/response/FindEmailResponseDto.java similarity index 69% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/response/FindEmailResponseDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/response/FindEmailResponseDto.java index ce146c7..4e2751d 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/response/FindEmailResponseDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/response/FindEmailResponseDto.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.User.dto.response; +package MathCaptain.weakness.domain.User.dto.response; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/response/UserCardResponseDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/response/UserCardResponseDto.java similarity index 60% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/response/UserCardResponseDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/response/UserCardResponseDto.java index 976588f..40d9942 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/response/UserCardResponseDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/response/UserCardResponseDto.java @@ -1,7 +1,7 @@ -package MathCaptain.weakness.User.dto.response; +package MathCaptain.weakness.domain.User.dto.response; -import MathCaptain.weakness.Group.dto.response.UserGroupCardResponseDto; -import MathCaptain.weakness.User.enums.Tiers; +import MathCaptain.weakness.domain.Group.dto.response.UserGroupCardResponseDto; +import MathCaptain.weakness.domain.User.enums.Tiers; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/response/UserResponseDto.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/response/UserResponseDto.java similarity index 64% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/response/UserResponseDto.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/response/UserResponseDto.java index b6c0ef1..45f11f3 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/dto/response/UserResponseDto.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/dto/response/UserResponseDto.java @@ -1,7 +1,7 @@ -package MathCaptain.weakness.User.dto.response; +package MathCaptain.weakness.domain.User.dto.response; -import MathCaptain.weakness.Group.dto.response.GroupResponseDto; -import MathCaptain.weakness.User.enums.Tiers; +import MathCaptain.weakness.domain.Group.dto.response.GroupResponseDto; +import MathCaptain.weakness.domain.User.enums.Tiers; import lombok.Builder; import lombok.Data; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/domain/UserDetailsImpl.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/entity/UserDetailsImpl.java similarity index 95% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/domain/UserDetailsImpl.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/entity/UserDetailsImpl.java index 8571503..dcda516 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/domain/UserDetailsImpl.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/entity/UserDetailsImpl.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.User.domain; +package MathCaptain.weakness.domain.User.entity; import lombok.Getter; import org.springframework.security.core.GrantedAuthority; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/domain/Users.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/entity/Users.java similarity index 87% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/domain/Users.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/entity/Users.java index 724c4a6..ecd111a 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/domain/Users.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/entity/Users.java @@ -1,18 +1,16 @@ -package MathCaptain.weakness.User.domain; - -import MathCaptain.weakness.Group.domain.Group; -import MathCaptain.weakness.Group.domain.RelationBetweenUserAndGroup; -import MathCaptain.weakness.Recruitment.domain.Comment; -import MathCaptain.weakness.Recruitment.domain.Recruitment; -import MathCaptain.weakness.User.dto.request.UpdateUserRequestDto; -import MathCaptain.weakness.User.enums.TierThresholds; -import MathCaptain.weakness.User.enums.Tiers; +package MathCaptain.weakness.domain.User.entity; + +import MathCaptain.weakness.domain.Group.entity.RelationBetweenUserAndGroup; +import MathCaptain.weakness.domain.Recruitment.entity.Comment; +import MathCaptain.weakness.domain.Recruitment.entity.Recruitment; +import MathCaptain.weakness.domain.User.dto.request.UpdateUserRequestDto; +import MathCaptain.weakness.domain.User.enums.TierThresholds; +import MathCaptain.weakness.domain.User.enums.Tiers; import jakarta.persistence.*; import lombok.*; import org.hibernate.validator.constraints.Range; import org.springframework.security.crypto.password.PasswordEncoder; -import java.time.LocalDate; import java.util.List; @Entity diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/enums/TierThresholds.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/enums/TierThresholds.java similarity index 90% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/enums/TierThresholds.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/enums/TierThresholds.java index 2cca163..9c4f49e 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/enums/TierThresholds.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/enums/TierThresholds.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.User.enums; +package MathCaptain.weakness.domain.User.enums; public class TierThresholds { public static final long BRONZE = 0; // 기본값 diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/enums/Tiers.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/enums/Tiers.java similarity index 66% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/enums/Tiers.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/enums/Tiers.java index 14b0de0..e1c9421 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/enums/Tiers.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/enums/Tiers.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.User.enums; +package MathCaptain.weakness.domain.User.enums; public enum Tiers { BRONZE, diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/repository/UserRepository.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/repository/UserRepository.java similarity index 85% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/repository/UserRepository.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/repository/UserRepository.java index af6f2d8..3fb7043 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/repository/UserRepository.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/repository/UserRepository.java @@ -1,6 +1,6 @@ -package MathCaptain.weakness.User.repository; +package MathCaptain.weakness.domain.User.repository; -import MathCaptain.weakness.User.domain.Users; +import MathCaptain.weakness.domain.User.entity.Users; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/service/UserDetailsServiceImpl.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/service/UserDetailsServiceImpl.java similarity index 76% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/service/UserDetailsServiceImpl.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/service/UserDetailsServiceImpl.java index 16dd867..5b5d0ef 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/service/UserDetailsServiceImpl.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/service/UserDetailsServiceImpl.java @@ -1,8 +1,8 @@ -package MathCaptain.weakness.User.service; +package MathCaptain.weakness.domain.User.service; -import MathCaptain.weakness.User.domain.UserDetailsImpl; -import MathCaptain.weakness.User.repository.UserRepository; -import MathCaptain.weakness.User.domain.Users; +import MathCaptain.weakness.domain.User.entity.UserDetailsImpl; +import MathCaptain.weakness.domain.User.repository.UserRepository; +import MathCaptain.weakness.domain.User.entity.Users; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/service/UserService.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/service/UserService.java similarity index 89% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/service/UserService.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/service/UserService.java index d7ee967..b87a3be 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/User/service/UserService.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/User/service/UserService.java @@ -1,16 +1,16 @@ -package MathCaptain.weakness.User.service; - -import MathCaptain.weakness.Group.dto.response.GroupResponseDto; -import MathCaptain.weakness.Group.dto.response.UserGroupCardResponseDto; -import MathCaptain.weakness.Group.repository.RelationRepository; -import MathCaptain.weakness.Group.service.GroupService; -import MathCaptain.weakness.User.dto.request.*; -import MathCaptain.weakness.User.dto.response.ChangePwdDto; -import MathCaptain.weakness.User.dto.response.FindEmailResponseDto; -import MathCaptain.weakness.User.dto.response.UserCardResponseDto; -import MathCaptain.weakness.User.dto.response.UserResponseDto; -import MathCaptain.weakness.User.repository.UserRepository; -import MathCaptain.weakness.User.domain.Users; +package MathCaptain.weakness.domain.User.service; + +import MathCaptain.weakness.domain.Group.dto.response.GroupResponseDto; +import MathCaptain.weakness.domain.Group.dto.response.UserGroupCardResponseDto; +import MathCaptain.weakness.domain.Group.repository.RelationRepository; +import MathCaptain.weakness.domain.Group.service.GroupService; +import MathCaptain.weakness.domain.User.dto.request.*; +import MathCaptain.weakness.domain.User.dto.response.ChangePwdDto; +import MathCaptain.weakness.domain.User.dto.response.FindEmailResponseDto; +import MathCaptain.weakness.domain.User.dto.response.UserCardResponseDto; +import MathCaptain.weakness.domain.User.dto.response.UserResponseDto; +import MathCaptain.weakness.domain.User.repository.UserRepository; +import MathCaptain.weakness.domain.User.entity.Users; import MathCaptain.weakness.global.Api.ApiResponse; import MathCaptain.weakness.global.Mail.MailService; import MathCaptain.weakness.global.exception.AuthorizationException; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Scheduler/GoalResetScheduler.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Scheduler/GoalResetScheduler.java index e4bfd0f..20f4dce 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Scheduler/GoalResetScheduler.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Scheduler/GoalResetScheduler.java @@ -1,9 +1,9 @@ package MathCaptain.weakness.global.Scheduler; -import MathCaptain.weakness.Group.domain.Group; -import MathCaptain.weakness.Group.domain.RelationBetweenUserAndGroup; -import MathCaptain.weakness.Group.repository.GroupRepository; -import MathCaptain.weakness.Group.repository.RelationRepository; +import MathCaptain.weakness.domain.Group.entity.Group; +import MathCaptain.weakness.domain.Group.entity.RelationBetweenUserAndGroup; +import MathCaptain.weakness.domain.Group.repository.GroupRepository; +import MathCaptain.weakness.domain.Group.repository.RelationRepository; import MathCaptain.weakness.global.PointSet; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Scheduler/WeeklyGoalResetScheduler.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Scheduler/WeeklyGoalResetScheduler.java index d46825c..b28e5f9 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Scheduler/WeeklyGoalResetScheduler.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Scheduler/WeeklyGoalResetScheduler.java @@ -1,7 +1,7 @@ package MathCaptain.weakness.global.Scheduler; -import MathCaptain.weakness.Group.domain.Group; -import MathCaptain.weakness.Group.repository.GroupRepository; +import MathCaptain.weakness.domain.Group.entity.Group; +import MathCaptain.weakness.domain.Group.repository.GroupRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/AuthController.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/AuthController.java similarity index 59% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/AuthController.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/AuthController.java index c6f6e5a..39cd5ac 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/AuthController.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/AuthController.java @@ -1,11 +1,9 @@ -package MathCaptain.weakness.global.Security; +package MathCaptain.weakness.global.auth; -import MathCaptain.weakness.User.repository.UserRepository; -import MathCaptain.weakness.global.Api.ApiResponse; -import MathCaptain.weakness.global.Security.jwt.JwtService; +import MathCaptain.weakness.domain.User.repository.UserRepository; +import MathCaptain.weakness.global.auth.jwt.JwtService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; @RestController diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/filter/GroupRoleFilter.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/filter/GroupRoleFilter.java similarity index 92% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/filter/GroupRoleFilter.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/filter/GroupRoleFilter.java index 1737155..b26db30 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/filter/GroupRoleFilter.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/filter/GroupRoleFilter.java @@ -1,22 +1,19 @@ -package MathCaptain.weakness.global.Security.filter; - -import MathCaptain.weakness.Group.domain.RelationBetweenUserAndGroup; -import MathCaptain.weakness.Group.enums.GroupRole; -import MathCaptain.weakness.Group.repository.RelationRepository; -import MathCaptain.weakness.Recruitment.domain.Comment; -import MathCaptain.weakness.Recruitment.domain.Recruitment; -import MathCaptain.weakness.Recruitment.repository.CommentRepository; -import MathCaptain.weakness.Recruitment.repository.RecruitmentRepository; -import MathCaptain.weakness.User.domain.Users; -import MathCaptain.weakness.User.repository.UserRepository; -import MathCaptain.weakness.global.Api.ApiResponse; +package MathCaptain.weakness.global.auth.filter; + +import MathCaptain.weakness.domain.Group.entity.RelationBetweenUserAndGroup; +import MathCaptain.weakness.domain.Group.enums.GroupRole; +import MathCaptain.weakness.domain.Group.repository.RelationRepository; +import MathCaptain.weakness.domain.Recruitment.entity.Comment; +import MathCaptain.weakness.domain.Recruitment.repository.CommentRepository; +import MathCaptain.weakness.domain.Recruitment.repository.RecruitmentRepository; +import MathCaptain.weakness.domain.User.entity.Users; +import MathCaptain.weakness.domain.User.repository.UserRepository; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/filter/JsonUsernamePasswordAuthenticationFilter.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/filter/JsonUsernamePasswordAuthenticationFilter.java similarity index 98% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/filter/JsonUsernamePasswordAuthenticationFilter.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/filter/JsonUsernamePasswordAuthenticationFilter.java index 1bcc319..0c11a91 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/filter/JsonUsernamePasswordAuthenticationFilter.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/filter/JsonUsernamePasswordAuthenticationFilter.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.global.Security.filter; +package MathCaptain.weakness.global.auth.filter; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.ServletException; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/filter/JwtAuthenticationProcessingFilter.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/filter/JwtAuthenticationProcessingFilter.java similarity index 94% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/filter/JwtAuthenticationProcessingFilter.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/filter/JwtAuthenticationProcessingFilter.java index b4b834e..0826d09 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/filter/JwtAuthenticationProcessingFilter.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/filter/JwtAuthenticationProcessingFilter.java @@ -1,9 +1,9 @@ -package MathCaptain.weakness.global.Security.filter; +package MathCaptain.weakness.global.auth.filter; -import MathCaptain.weakness.User.domain.UserDetailsImpl; -import MathCaptain.weakness.User.repository.UserRepository; -import MathCaptain.weakness.User.domain.Users; -import MathCaptain.weakness.global.Security.jwt.JwtService; +import MathCaptain.weakness.domain.User.entity.UserDetailsImpl; +import MathCaptain.weakness.domain.User.repository.UserRepository; +import MathCaptain.weakness.domain.User.entity.Users; +import MathCaptain.weakness.global.auth.jwt.JwtService; import MathCaptain.weakness.global.exception.AuthorizationException; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/jwt/JwtService.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/jwt/JwtService.java similarity index 95% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/jwt/JwtService.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/jwt/JwtService.java index dcb4802..b93db47 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/jwt/JwtService.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/jwt/JwtService.java @@ -1,4 +1,4 @@ -package MathCaptain.weakness.global.Security.jwt; +package MathCaptain.weakness.global.auth.jwt; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/jwt/JwtServiceImpl.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/jwt/JwtServiceImpl.java similarity index 96% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/jwt/JwtServiceImpl.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/jwt/JwtServiceImpl.java index 037fc11..a07d854 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/jwt/JwtServiceImpl.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/auth/jwt/JwtServiceImpl.java @@ -1,12 +1,9 @@ -package MathCaptain.weakness.global.Security.jwt; +package MathCaptain.weakness.global.auth.jwt; -import MathCaptain.weakness.Group.repository.RelationRepository; -import MathCaptain.weakness.User.domain.Users; -import MathCaptain.weakness.User.repository.UserRepository; +import MathCaptain.weakness.domain.User.repository.UserRepository; import MathCaptain.weakness.global.exception.ResourceNotFoundException; import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; -import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.transaction.Transactional; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/SecurityConfig.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/config/SecurityConfig.java similarity index 87% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/SecurityConfig.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/config/SecurityConfig.java index b4f2c6c..5902379 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/Security/SecurityConfig.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/config/SecurityConfig.java @@ -1,17 +1,17 @@ -package MathCaptain.weakness.global.Security; - -import MathCaptain.weakness.Group.repository.RelationRepository; -import MathCaptain.weakness.Group.service.GroupService; -import MathCaptain.weakness.Recruitment.repository.CommentRepository; -import MathCaptain.weakness.Recruitment.repository.RecruitmentRepository; -import MathCaptain.weakness.global.Security.filter.GroupRoleFilter; -import MathCaptain.weakness.global.Security.filter.JsonUsernamePasswordAuthenticationFilter; -import MathCaptain.weakness.global.Security.filter.JwtAuthenticationProcessingFilter; -import MathCaptain.weakness.global.Security.jwt.JwtService; -import MathCaptain.weakness.Group.Login.LoginSuccessJWTProvideHandler; -import MathCaptain.weakness.Group.Login.LoginFailureHandler; -import MathCaptain.weakness.User.service.UserDetailsServiceImpl; -import MathCaptain.weakness.User.repository.UserRepository; +package MathCaptain.weakness.global.config; + +import MathCaptain.weakness.domain.Group.repository.RelationRepository; +import MathCaptain.weakness.domain.Group.service.GroupService; +import MathCaptain.weakness.domain.Recruitment.repository.CommentRepository; +import MathCaptain.weakness.domain.Recruitment.repository.RecruitmentRepository; +import MathCaptain.weakness.global.auth.filter.GroupRoleFilter; +import MathCaptain.weakness.global.auth.filter.JsonUsernamePasswordAuthenticationFilter; +import MathCaptain.weakness.global.auth.filter.JwtAuthenticationProcessingFilter; +import MathCaptain.weakness.global.auth.jwt.JwtService; +import MathCaptain.weakness.domain.Group.Login.LoginSuccessJWTProvideHandler; +import MathCaptain.weakness.domain.Group.Login.LoginFailureHandler; +import MathCaptain.weakness.domain.User.service.UserDetailsServiceImpl; +import MathCaptain.weakness.domain.User.repository.UserRepository; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.security.servlet.PathRequest; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/config/WebConfig.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/config/WebConfig.java index 7b6fec6..3b4a44d 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/config/WebConfig.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/global/config/WebConfig.java @@ -1,6 +1,6 @@ package MathCaptain.weakness.global.config; -import MathCaptain.weakness.Group.Login.LoginUserArgumentResolver; +import MathCaptain.weakness.domain.Group.Login.LoginUserArgumentResolver; import org.springframework.context.annotation.Configuration; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; From f9ebc470961b0abdb67184198d0a80ffa567ba66 Mon Sep 17 00:00:00 2001 From: Jeyong Date: Tue, 25 Mar 2025 22:51:37 +0900 Subject: [PATCH 4/8] =?UTF-8?q?{refactor}=20JPA=20=EA=B0=90=EC=82=AC=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/MathCaptain/weakness/WeaknessApplication.java | 2 ++ .../weakness/domain/Record/entity/ActivityRecord.java | 9 ++++----- .../weakness/domain/Recruitment/entity/Comment.java | 2 ++ .../weakness/domain/Recruitment/entity/Recruitment.java | 6 ++++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/WeaknessApplication.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/WeaknessApplication.java index 7dacc22..fcd8c8a 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/WeaknessApplication.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/WeaknessApplication.java @@ -3,7 +3,9 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +@EnableJpaAuditing @SpringBootApplication(exclude = SecurityAutoConfiguration.class) public class WeaknessApplication { diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/entity/ActivityRecord.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/entity/ActivityRecord.java index 86c19ed..b3256b8 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/entity/ActivityRecord.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/entity/ActivityRecord.java @@ -8,6 +8,8 @@ import lombok.Getter; import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.Range; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; import java.time.DayOfWeek; import java.time.LocalDateTime; @@ -17,6 +19,7 @@ @NoArgsConstructor @AllArgsConstructor @Builder +@EntityListeners(AuditingEntityListener.class) public class ActivityRecord { @Id @@ -31,6 +34,7 @@ public class ActivityRecord { @JoinColumn(name = "group_id") private Group group; + @CreatedDate private LocalDateTime startTime; // 인증 시작 시간 private LocalDateTime endTime; // 인증 종료 시간 @@ -48,11 +52,6 @@ public class ActivityRecord { public void prePersist() { this.dailyGoalAchieved = false; this.weeklyGoalAchieved = false; - - if (this.startTime == null) { - this.startTime = LocalDateTime.now(); - } - this.durationInMinutes = 0L; } diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/entity/Comment.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/entity/Comment.java index 9ca3430..c90df7f 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/entity/Comment.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/entity/Comment.java @@ -6,6 +6,7 @@ import lombok.*; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; import java.time.LocalDateTime; @@ -14,6 +15,7 @@ @Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor +@EntityListeners(AuditingEntityListener.class) @Table(name = "COMMENT") public class Comment { @Id diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/entity/Recruitment.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/entity/Recruitment.java index 76f4abf..61236a3 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/entity/Recruitment.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Recruitment/entity/Recruitment.java @@ -8,6 +8,9 @@ import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; import lombok.*; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; import java.time.LocalDateTime; import java.util.List; @@ -17,6 +20,7 @@ @Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor +@EntityListeners(AuditingEntityListener.class) public class Recruitment { @Id @@ -52,8 +56,10 @@ public class Recruitment { private List comments; @Column(nullable = false) + @CreatedDate private LocalDateTime postTime; + @LastModifiedDate private LocalDateTime lastModifiedTime; // 기본값 설정 From 2cc3ff2e626b06dbba0bad5e7226fa0b7d2b53de Mon Sep 17 00:00:00 2001 From: Jeyong Date: Tue, 25 Mar 2025 22:51:54 +0900 Subject: [PATCH 5/8] =?UTF-8?q?{refactor}=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20JPA=20?= =?UTF-8?q?=EA=B0=90=EC=82=AC=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Notification/{domain => entity}/Notification.java | 9 ++++----- .../Notification/repository/NotificationRepository.java | 2 +- .../domain/Notification/service/NotificationService.java | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) rename MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/{domain => entity}/Notification.java (70%) diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/domain/Notification.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/entity/Notification.java similarity index 70% rename from MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/domain/Notification.java rename to MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/entity/Notification.java index 69afe9c..a8e2d04 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/domain/Notification.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/entity/Notification.java @@ -1,14 +1,12 @@ -package MathCaptain.weakness.domain.Notification.domain; +package MathCaptain.weakness.domain.Notification.entity; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; import java.time.LocalDateTime; @@ -17,6 +15,7 @@ @Builder @AllArgsConstructor @NoArgsConstructor +@EntityListeners(AuditingEntityListener.class) public class Notification { @Id diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/repository/NotificationRepository.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/repository/NotificationRepository.java index 9958b2f..c107b2c 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/repository/NotificationRepository.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/repository/NotificationRepository.java @@ -1,6 +1,6 @@ package MathCaptain.weakness.domain.Notification.repository; -import MathCaptain.weakness.domain.Notification.domain.Notification; +import MathCaptain.weakness.domain.Notification.entity.Notification; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/service/NotificationService.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/service/NotificationService.java index 0dd8513..f6c00d6 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/service/NotificationService.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Notification/service/NotificationService.java @@ -5,7 +5,7 @@ import MathCaptain.weakness.domain.Group.repository.GroupRepository; import MathCaptain.weakness.domain.Group.repository.RelationRepository; import MathCaptain.weakness.domain.Notification.controller.NotificationController; -import MathCaptain.weakness.domain.Notification.domain.Notification; +import MathCaptain.weakness.domain.Notification.entity.Notification; import MathCaptain.weakness.domain.Notification.repository.NotificationRepository; import MathCaptain.weakness.domain.Recruitment.entity.Comment; import MathCaptain.weakness.domain.Recruitment.entity.Recruitment; From 73374aa6f12bc2c56ecf7c46c62dd86391000336 Mon Sep 17 00:00:00 2001 From: Jeyong Date: Tue, 25 Mar 2025 23:35:04 +0900 Subject: [PATCH 6/8] =?UTF-8?q?{docs}=20CI/CD=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EB=B0=8F=20application.properties=20=EC=B6=94=EC=A0=81=20?= =?UTF-8?q?=ED=95=B4=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/application-CI.yml | 38 +++++++++++++++ .github/workflows/docker-image-ec2.yml | 17 ++++++- MathCaptain/weakness/build.gradle | 12 +++++ .../src/main/resources/application.properties | 46 ------------------- 4 files changed, 66 insertions(+), 47 deletions(-) create mode 100644 .github/workflows/application-CI.yml delete mode 100644 MathCaptain/weakness/src/main/resources/application.properties diff --git a/.github/workflows/application-CI.yml b/.github/workflows/application-CI.yml new file mode 100644 index 0000000..c900f38 --- /dev/null +++ b/.github/workflows/application-CI.yml @@ -0,0 +1,38 @@ +name: CI + +on: + pull_request: + branches: [ "main" ] + +jobs: + build: + runs-on: ubuntu-22.04 + + steps: + - name: checkout + uses: actions/checkout@v3 + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'corretto' + java-version: '17' + + - name: create application.properties + run: | + ## create application.properties + mkdir -p ./src/main/resources + cd ./src/main/resources + + touch ./application.properties + + echo "${{ secrets.APPLICATION }}" >> ./application.properties + + cat ./application.properties + shell: bash + + - name: build + run: | + chmod +x gradlew + ./gradlew build -x test + shell: bash diff --git a/.github/workflows/docker-image-ec2.yml b/.github/workflows/docker-image-ec2.yml index 641172d..7c0581c 100644 --- a/.github/workflows/docker-image-ec2.yml +++ b/.github/workflows/docker-image-ec2.yml @@ -18,9 +18,24 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - distribution: 'temurin' # OpenJDK 배포판 + distribution: 'corretto' java-version: '17' # Java 버전 (Spring Boot 3.x의 경우 Java 17 이상 필요) + - name: Create application.properties + run: | + # application.properties 파일 생성 + mkdir -p ./src/main/resources + cd ./src/main/resources + + # application.properties 파일 생성 + touch ./application.properties + + # GitHub-Actions 에서 설정한 값을 application.properties 파일에 쓰기 + echo "${{ secrets.APPLICATION }}" >> ./application.properties + + # application.properties 파일 확인 + cat ./application.properties + # 3. Gradle 캐시 설정 (빌드 속도 향상) - name: Cache Gradle packages uses: actions/cache@v3 diff --git a/MathCaptain/weakness/build.gradle b/MathCaptain/weakness/build.gradle index b09ea5c..fc69137 100644 --- a/MathCaptain/weakness/build.gradle +++ b/MathCaptain/weakness/build.gradle @@ -4,6 +4,10 @@ plugins { id 'io.spring.dependency-management' version '1.1.6' } +ext { + springAiVersion = "1.0.0-M6" +} + group = 'MathCaptain' version = '0.0.1-SNAPSHOT' @@ -35,6 +39,8 @@ dependencies { implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect' implementation 'io.jsonwebtoken:jjwt-api:0.12.3' implementation 'commons-codec:commons-codec:1.5' + implementation 'org.springframework.ai:spring-ai-openai-spring-boot-starter' + implementation 'com.h2database:h2' runtimeOnly 'mysql:mysql-connector-java:8.0.33' implementation 'com.auth0:java-jwt:3.13.0' runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.3' @@ -51,6 +57,12 @@ dependencies { testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0' } +dependencyManagement { + imports { + mavenBom "org.springframework.ai:spring-ai-bom:$springAiVersion" + } +} + tasks.named('test') { useJUnitPlatform() } diff --git a/MathCaptain/weakness/src/main/resources/application.properties b/MathCaptain/weakness/src/main/resources/application.properties deleted file mode 100644 index 3800cf5..0000000 --- a/MathCaptain/weakness/src/main/resources/application.properties +++ /dev/null @@ -1,46 +0,0 @@ -spring.config.import=optional:secret.properties - -spring.application.name=weakness - -spring.messages.basename=messages,errors - -# DATABASE -spring.jpa.properties.hibernate.format_sql=true -spring.jpa.hibernate.ddl-auto=create -spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect -spring.datasource.url=jdbc:mysql://weakness.c58aaigi69h0.ap-northeast-2.rds.amazonaws.com:3306/weakness -spring.datasource.username=weakness -spring.datasource.password=weak1234 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver - -spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.h2.H2ConsoleAutoConfiguration -# JWT -spring.profiles.include=jwt - -logging.level.org.springframework.security=DEBUG - -jwt.secret=47148be797dd94ae76bc1e297446c604e9165a03f1dec7f047084c3304f2eb1c86471a6a674ac08560bc65487843a7f2be8ddafe7ffda2921d50de633e61b5a0 - -# Access Token(5?) -jwt.access.expiration=300 -jwt.access.header=Authorization - -# Refresh Token(15?) -jwt.refresh.expiration=648000 -jwt.refresh.header=Authorization-refresh - -# FILE UPLOAD -spring.servlet.multipart.enabled=true -spring.servlet.multipart.max-file-size=10MB -spring.servlet.multipart.max-request-size=10MB - -# email -spring.mail.host=smtp.gmail.com -spring.mail.port=587 -spring.mail.username=jayong6652@gmail.com -spring.mail.password=jplh wsms xkrx ghyk -spring.mail.properties.mail.smtp.auth=true -spring.mail.properties.mail.smtp.starttls.enable=true - -spring.jackson.time-zone=Asia/Seoul - From 600906d59b5b0c3923d933df9cf0b79f02c92680 Mon Sep 17 00:00:00 2001 From: Jeyong Date: Tue, 25 Mar 2025 23:38:12 +0900 Subject: [PATCH 7/8] =?UTF-8?q?{docs}=20CI=20=EB=AC=B8=EC=84=9C=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/application-CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/application-CI.yml b/.github/workflows/application-CI.yml index c900f38..dfb97d5 100644 --- a/.github/workflows/application-CI.yml +++ b/.github/workflows/application-CI.yml @@ -33,6 +33,6 @@ jobs: - name: build run: | - chmod +x gradlew - ./gradlew build -x test + chmod +x gradle + ./gradle build -x test shell: bash From 8ba4ea2d14f3751c6fb6ef7116621813f1d1388e Mon Sep 17 00:00:00 2001 From: Jeyong Date: Tue, 25 Mar 2025 23:41:37 +0900 Subject: [PATCH 8/8] =?UTF-8?q?{docs}=20CI=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/application-CI.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/application-CI.yml b/.github/workflows/application-CI.yml index dfb97d5..2cfb864 100644 --- a/.github/workflows/application-CI.yml +++ b/.github/workflows/application-CI.yml @@ -32,7 +32,8 @@ jobs: shell: bash - name: build + working-directory: MathCaptain/weakness run: | - chmod +x gradle - ./gradle build -x test + chmod +x gradlew + ./gradlew build -x test shell: bash