From 78fdddd1491e51995a4e3e0caa4ebc1ce5827804 Mon Sep 17 00:00:00 2001 From: joyewon0705 <77885098+joyewon0705@users.noreply.github.com> Date: Tue, 14 Oct 2025 15:35:34 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Rename:=20user=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20=EA=B5=AC=EC=A1=B0=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/board/comment/entity/Comment.java | 3 +- .../board/comment/entity/CommentLike.java | 3 +- .../comment/service/CommentLikeService.java | 4 +- .../board/comment/service/CommentService.java | 4 +- .../board/common/dto/AuthorResponse.java | 2 +- .../back/domain/board/post/entity/Post.java | 2 +- .../board/post/entity/PostBookmark.java | 3 +- .../domain/board/post/entity/PostLike.java | 3 +- .../post/service/PostBookmarkService.java | 4 +- .../post/service/PostCategoryService.java | 4 +- .../board/post/service/PostLikeService.java | 4 +- .../board/post/service/PostService.java | 4 +- .../chat/room/service/RoomChatService.java | 4 +- .../domain/file/entity/FileAttachment.java | 2 +- .../back/domain/file/service/FileService.java | 4 +- .../controller/NotificationController.java | 4 +- .../domain/notification/dto/ActorDto.java | 2 +- .../notification/entity/Notification.java | 2 +- .../notification/entity/NotificationRead.java | 2 +- .../entity/NotificationSetting.java | 2 +- .../study/StudyNotificationEventListener.java | 4 - .../StudyRoomNotificationEventListener.java | 7 -- .../service/NotificationService.java | 4 +- .../service/NotificationSettingService.java | 4 +- .../back/domain/study/memo/entity/Memo.java | 2 +- .../study/memo/service/MemoService.java | 4 +- .../domain/study/plan/entity/StudyPlan.java | 2 +- .../study/plan/service/StudyPlanService.java | 4 +- .../study/record/entity/StudyRecord.java | 4 +- .../record/service/StudyRecordService.java | 5 +- .../back/domain/study/todo/entity/Todo.java | 5 +- .../study/todo/repository/TodoRepository.java | 1 - .../study/todo/service/TodoService.java | 4 +- .../studyroom/controller/RoomController.java | 3 +- .../back/domain/studyroom/entity/Room.java | 2 +- .../studyroom/entity/RoomChatMessage.java | 2 +- .../studyroom/entity/RoomInviteCode.java | 2 +- .../domain/studyroom/entity/RoomMember.java | 2 +- .../studyroom/entity/RoomMemberAvatar.java | 3 +- .../entity/RoomParticipantHistory.java | 2 +- .../studyroom/service/AvatarService.java | 5 +- .../studyroom/service/RoomInviteService.java | 4 +- .../domain/studyroom/service/RoomService.java | 4 +- .../controller/AccountController.java} | 45 +++++----- .../docs/AccountControllerDocs.java} | 10 +-- .../dto/ChangePasswordRequest.java | 2 +- .../dto/UpdateUserProfileRequest.java | 2 +- .../{ => account}/dto/UserDetailResponse.java | 10 +-- .../service/AccountService.java} | 24 +++--- .../{ => auth}/controller/AuthController.java | 7 +- .../controller/docs}/AuthControllerDocs.java | 5 +- .../user/{ => auth}/dto/LoginRequest.java | 2 +- .../user/{ => auth}/dto/LoginResponse.java | 2 +- .../{ => auth}/dto/PasswordResetRequest.java | 2 +- .../user/{ => auth}/dto/SendEmailRequest.java | 2 +- .../{ => auth}/dto/UserRegisterRequest.java | 2 +- .../user/{ => auth}/dto/UserResponse.java | 9 +- .../user/{ => auth}/service/AuthService.java | 28 +++---- .../user/{ => auth}/service/EmailService.java | 3 +- .../user/{ => auth}/service/TokenService.java | 2 +- .../domain/user/{ => common}/entity/User.java | 4 +- .../user/{ => common}/entity/UserProfile.java | 2 +- .../user/{ => common}/entity/UserToken.java | 2 +- .../back/domain/user/common/enums/Role.java | 5 ++ .../{entity => common/enums}/UserStatus.java | 2 +- .../repository/UserProfileRepository.java | 4 +- .../repository/UserRepository.java | 4 +- .../repository/UserTokenRepository.java | 4 +- .../user/common}/util/CookieUtil.java | 5 +- .../user/common}/util/PasswordValidator.java | 2 +- .../com/back/domain/user/entity/Role.java | 5 -- .../back/global/initData/DevInitService.java | 8 +- .../global/security/jwt/JwtTokenProvider.java | 2 +- .../oauth/CustomOAuth2UserService.java | 6 +- .../oauth/OAuth2LoginSuccessHandler.java | 13 ++- .../global/security/user/CurrentUser.java | 6 +- .../security/user/CustomUserDetails.java | 2 +- .../controller/CommentControllerTest.java | 8 +- .../controller/CommentLikeControllerTest.java | 8 +- .../custom/CommentLikeRepositoryImplTest.java | 8 +- .../custom/CommentRepositoryImplTest.java | 8 +- .../service/CommentLikeServiceTest.java | 9 +- .../comment/service/CommentServiceTest.java | 9 +- .../PostBookmarkControllerTest.java | 8 +- .../PostCategoryControllerTest.java | 8 +- .../post/controller/PostControllerTest.java | 8 +- .../controller/PostLikeControllerTest.java | 8 +- .../custom/PostRepositoryImplTest.java | 12 +-- .../post/service/PostBookmarkServiceTest.java | 8 +- .../post/service/PostCategoryServiceTest.java | 8 +- .../post/service/PostLikeServiceTest.java | 8 +- .../board/post/service/PostServiceTest.java | 8 +- .../RoomChatWebSocketControllerTest.java | 4 +- .../room/service/RoomChatServiceTest.java | 12 +-- .../file/controller/FileControllerTest.java | 8 +- .../domain/file/service/FileServiceTest.java | 15 +--- .../NotificationControllerTest.java | 6 +- .../NotificationSettingControllerTest.java | 4 +- .../NotificationRepositoryTest.java | 4 +- .../NotificationSettingRepositoryTest.java | 4 +- .../service/NotificationServiceTest.java | 4 +- .../NotificationSettingServiceTest.java | 4 +- .../NotificationWebSocketServiceTest.java | 3 +- .../controller/StudyPlanControllerTest.java | 13 +-- .../controller/StudyRecordControllerTest.java | 10 +-- .../todo/controller/TodoControllerTest.java | 8 +- .../controller/RoomControllerTest.java | 8 +- .../controller/RoomInviteControllerTest.java | 8 +- .../RoomInvitePublicControllerTest.java | 8 +- .../RoomCreateIntegrationTest.java | 11 ++- .../RoomChatMessageRepositoryTest.java | 2 +- .../RoomMemberAvatarRepositoryTest.java | 8 +- .../service/RoomInviteServiceTest.java | 10 +-- .../studyroom/service/RoomServiceTest.java | 10 +-- .../controller/AccountControllerTest.java} | 16 ++-- .../service/AccountServiceTest.java} | 84 +++++++++---------- .../controller/AuthControllerTest.java | 16 ++-- .../{ => auth}/service/AuthServiceTest.java | 24 +++--- .../{ => auth}/service/EmailServiceTest.java | 4 +- .../{ => auth}/service/TokenServiceTest.java | 2 +- .../service/WebRTCSignalValidatorTest.java | 2 +- 121 files changed, 372 insertions(+), 440 deletions(-) rename src/main/java/com/back/domain/user/{controller/UserController.java => account/controller/AccountController.java} (73%) rename src/main/java/com/back/domain/user/{controller/UserControllerDocs.java => account/controller/docs/AccountControllerDocs.java} (99%) rename src/main/java/com/back/domain/user/{ => account}/dto/ChangePasswordRequest.java (88%) rename src/main/java/com/back/domain/user/{ => account}/dto/UpdateUserProfileRequest.java (93%) rename src/main/java/com/back/domain/user/{ => account}/dto/UserDetailResponse.java (90%) rename src/main/java/com/back/domain/user/{service/UserService.java => account/service/AccountService.java} (91%) rename src/main/java/com/back/domain/user/{ => auth}/controller/AuthController.java (95%) rename src/main/java/com/back/domain/user/{controller => auth/controller/docs}/AuthControllerDocs.java (99%) rename src/main/java/com/back/domain/user/{ => auth}/dto/LoginRequest.java (88%) rename src/main/java/com/back/domain/user/{ => auth}/dto/LoginResponse.java (87%) rename src/main/java/com/back/domain/user/{ => auth}/dto/PasswordResetRequest.java (88%) rename src/main/java/com/back/domain/user/{ => auth}/dto/SendEmailRequest.java (87%) rename src/main/java/com/back/domain/user/{ => auth}/dto/UserRegisterRequest.java (93%) rename src/main/java/com/back/domain/user/{ => auth}/dto/UserResponse.java (82%) rename src/main/java/com/back/domain/user/{ => auth}/service/AuthService.java (94%) rename src/main/java/com/back/domain/user/{ => auth}/service/EmailService.java (97%) rename src/main/java/com/back/domain/user/{ => auth}/service/TokenService.java (98%) rename src/main/java/com/back/domain/user/{ => common}/entity/User.java (97%) rename src/main/java/com/back/domain/user/{ => common}/entity/UserProfile.java (93%) rename src/main/java/com/back/domain/user/{ => common}/entity/UserToken.java (91%) create mode 100644 src/main/java/com/back/domain/user/common/enums/Role.java rename src/main/java/com/back/domain/user/{entity => common/enums}/UserStatus.java (61%) rename src/main/java/com/back/domain/user/{ => common}/repository/UserProfileRepository.java (76%) rename src/main/java/com/back/domain/user/{ => common}/repository/UserRepository.java (83%) rename src/main/java/com/back/domain/user/{ => common}/repository/UserTokenRepository.java (77%) rename src/main/java/com/back/{global => domain/user/common}/util/CookieUtil.java (94%) rename src/main/java/com/back/{global => domain/user/common}/util/PasswordValidator.java (95%) delete mode 100644 src/main/java/com/back/domain/user/entity/Role.java rename src/test/java/com/back/domain/user/{controller/UserControllerTest.java => account/controller/AccountControllerTest.java} (99%) rename src/test/java/com/back/domain/user/{service/UserServiceTest.java => account/service/AccountServiceTest.java} (88%) rename src/test/java/com/back/domain/user/{ => auth}/controller/AuthControllerTest.java (99%) rename src/test/java/com/back/domain/user/{ => auth}/service/AuthServiceTest.java (97%) rename src/test/java/com/back/domain/user/{ => auth}/service/EmailServiceTest.java (91%) rename src/test/java/com/back/domain/user/{ => auth}/service/TokenServiceTest.java (98%) diff --git a/src/main/java/com/back/domain/board/comment/entity/Comment.java b/src/main/java/com/back/domain/board/comment/entity/Comment.java index 74ef1924..5f039df0 100644 --- a/src/main/java/com/back/domain/board/comment/entity/Comment.java +++ b/src/main/java/com/back/domain/board/comment/entity/Comment.java @@ -1,7 +1,7 @@ package com.back.domain.board.comment.entity; import com.back.domain.board.post.entity.Post; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.Getter; @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Objects; @Entity @Getter diff --git a/src/main/java/com/back/domain/board/comment/entity/CommentLike.java b/src/main/java/com/back/domain/board/comment/entity/CommentLike.java index 91c22d07..6dc5438c 100644 --- a/src/main/java/com/back/domain/board/comment/entity/CommentLike.java +++ b/src/main/java/com/back/domain/board/comment/entity/CommentLike.java @@ -1,9 +1,8 @@ package com.back.domain.board.comment.entity; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/back/domain/board/comment/service/CommentLikeService.java b/src/main/java/com/back/domain/board/comment/service/CommentLikeService.java index 56f87eb6..0dbec3aa 100644 --- a/src/main/java/com/back/domain/board/comment/service/CommentLikeService.java +++ b/src/main/java/com/back/domain/board/comment/service/CommentLikeService.java @@ -6,8 +6,8 @@ import com.back.domain.board.comment.repository.CommentLikeRepository; import com.back.domain.board.comment.repository.CommentRepository; import com.back.domain.notification.event.community.CommentLikedEvent; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/back/domain/board/comment/service/CommentService.java b/src/main/java/com/back/domain/board/comment/service/CommentService.java index e51fd2e9..3522db95 100644 --- a/src/main/java/com/back/domain/board/comment/service/CommentService.java +++ b/src/main/java/com/back/domain/board/comment/service/CommentService.java @@ -12,8 +12,8 @@ import com.back.domain.board.post.repository.PostRepository; import com.back.domain.notification.event.community.CommentCreatedEvent; import com.back.domain.notification.event.community.ReplyCreatedEvent; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/back/domain/board/common/dto/AuthorResponse.java b/src/main/java/com/back/domain/board/common/dto/AuthorResponse.java index d177b025..28a840b6 100644 --- a/src/main/java/com/back/domain/board/common/dto/AuthorResponse.java +++ b/src/main/java/com/back/domain/board/common/dto/AuthorResponse.java @@ -1,6 +1,6 @@ package com.back.domain.board.common.dto; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.querydsl.core.annotations.QueryProjection; /** diff --git a/src/main/java/com/back/domain/board/post/entity/Post.java b/src/main/java/com/back/domain/board/post/entity/Post.java index f3efa1c8..e9b2bbc8 100644 --- a/src/main/java/com/back/domain/board/post/entity/Post.java +++ b/src/main/java/com/back/domain/board/post/entity/Post.java @@ -1,7 +1,7 @@ package com.back.domain.board.post.entity; import com.back.domain.board.comment.entity.Comment; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.Getter; diff --git a/src/main/java/com/back/domain/board/post/entity/PostBookmark.java b/src/main/java/com/back/domain/board/post/entity/PostBookmark.java index fc0ccdae..085a6cae 100644 --- a/src/main/java/com/back/domain/board/post/entity/PostBookmark.java +++ b/src/main/java/com/back/domain/board/post/entity/PostBookmark.java @@ -1,9 +1,8 @@ package com.back.domain.board.post.entity; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/back/domain/board/post/entity/PostLike.java b/src/main/java/com/back/domain/board/post/entity/PostLike.java index 2f42850e..b0419106 100644 --- a/src/main/java/com/back/domain/board/post/entity/PostLike.java +++ b/src/main/java/com/back/domain/board/post/entity/PostLike.java @@ -1,9 +1,8 @@ package com.back.domain.board.post.entity; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; -import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/back/domain/board/post/service/PostBookmarkService.java b/src/main/java/com/back/domain/board/post/service/PostBookmarkService.java index cc3c3d2b..8ecdcdeb 100644 --- a/src/main/java/com/back/domain/board/post/service/PostBookmarkService.java +++ b/src/main/java/com/back/domain/board/post/service/PostBookmarkService.java @@ -5,8 +5,8 @@ import com.back.domain.board.post.entity.PostBookmark; import com.back.domain.board.post.repository.PostBookmarkRepository; import com.back.domain.board.post.repository.PostRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/back/domain/board/post/service/PostCategoryService.java b/src/main/java/com/back/domain/board/post/service/PostCategoryService.java index a55d548c..f7c14601 100644 --- a/src/main/java/com/back/domain/board/post/service/PostCategoryService.java +++ b/src/main/java/com/back/domain/board/post/service/PostCategoryService.java @@ -4,8 +4,8 @@ import com.back.domain.board.post.dto.CategoryResponse; import com.back.domain.board.post.entity.PostCategory; import com.back.domain.board.post.repository.PostCategoryRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/back/domain/board/post/service/PostLikeService.java b/src/main/java/com/back/domain/board/post/service/PostLikeService.java index 5be34854..fb3d60a2 100644 --- a/src/main/java/com/back/domain/board/post/service/PostLikeService.java +++ b/src/main/java/com/back/domain/board/post/service/PostLikeService.java @@ -6,8 +6,8 @@ import com.back.domain.board.post.repository.PostLikeRepository; import com.back.domain.board.post.repository.PostRepository; import com.back.domain.notification.event.community.PostLikedEvent; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/back/domain/board/post/service/PostService.java b/src/main/java/com/back/domain/board/post/service/PostService.java index 7249d850..0efdb232 100644 --- a/src/main/java/com/back/domain/board/post/service/PostService.java +++ b/src/main/java/com/back/domain/board/post/service/PostService.java @@ -11,8 +11,8 @@ import com.back.domain.board.post.repository.PostCategoryRepository; import com.back.domain.board.post.repository.PostLikeRepository; import com.back.domain.board.post.repository.PostRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/back/domain/chat/room/service/RoomChatService.java b/src/main/java/com/back/domain/chat/room/service/RoomChatService.java index aab99deb..d4a19031 100644 --- a/src/main/java/com/back/domain/chat/room/service/RoomChatService.java +++ b/src/main/java/com/back/domain/chat/room/service/RoomChatService.java @@ -10,8 +10,8 @@ import com.back.domain.studyroom.repository.RoomChatMessageRepository; import com.back.domain.studyroom.repository.RoomMemberRepository; import com.back.domain.studyroom.repository.RoomRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.domain.chat.room.dto.RoomChatPageResponse; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; diff --git a/src/main/java/com/back/domain/file/entity/FileAttachment.java b/src/main/java/com/back/domain/file/entity/FileAttachment.java index 195da19d..41dfbeb6 100644 --- a/src/main/java/com/back/domain/file/entity/FileAttachment.java +++ b/src/main/java/com/back/domain/file/entity/FileAttachment.java @@ -1,6 +1,6 @@ package com.back.domain.file.entity; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.Getter; diff --git a/src/main/java/com/back/domain/file/service/FileService.java b/src/main/java/com/back/domain/file/service/FileService.java index dd55d6a5..d00391bf 100644 --- a/src/main/java/com/back/domain/file/service/FileService.java +++ b/src/main/java/com/back/domain/file/service/FileService.java @@ -9,8 +9,8 @@ import com.back.domain.file.dto.FileUploadResponseDto; import com.back.domain.file.entity.FileAttachment; import com.back.domain.file.repository.FileAttachmentRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/back/domain/notification/controller/NotificationController.java b/src/main/java/com/back/domain/notification/controller/NotificationController.java index 43613287..b49a0829 100644 --- a/src/main/java/com/back/domain/notification/controller/NotificationController.java +++ b/src/main/java/com/back/domain/notification/controller/NotificationController.java @@ -5,8 +5,8 @@ import com.back.domain.notification.entity.Notification; import com.back.domain.notification.service.NotificationService; import com.back.domain.studyroom.repository.RoomRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.common.dto.RsData; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; diff --git a/src/main/java/com/back/domain/notification/dto/ActorDto.java b/src/main/java/com/back/domain/notification/dto/ActorDto.java index b2c25b5a..e22eb688 100644 --- a/src/main/java/com/back/domain/notification/dto/ActorDto.java +++ b/src/main/java/com/back/domain/notification/dto/ActorDto.java @@ -1,6 +1,6 @@ package com.back.domain.notification.dto; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; public record ActorDto( Long userId, diff --git a/src/main/java/com/back/domain/notification/entity/Notification.java b/src/main/java/com/back/domain/notification/entity/Notification.java index c1e0dfc1..54b4167a 100644 --- a/src/main/java/com/back/domain/notification/entity/Notification.java +++ b/src/main/java/com/back/domain/notification/entity/Notification.java @@ -1,7 +1,7 @@ package com.back.domain.notification.entity; import com.back.domain.studyroom.entity.Room; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.Getter; diff --git a/src/main/java/com/back/domain/notification/entity/NotificationRead.java b/src/main/java/com/back/domain/notification/entity/NotificationRead.java index 34dc62f4..fc970ff8 100644 --- a/src/main/java/com/back/domain/notification/entity/NotificationRead.java +++ b/src/main/java/com/back/domain/notification/entity/NotificationRead.java @@ -1,6 +1,6 @@ package com.back.domain.notification.entity; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.Getter; diff --git a/src/main/java/com/back/domain/notification/entity/NotificationSetting.java b/src/main/java/com/back/domain/notification/entity/NotificationSetting.java index f409af72..5f592f68 100644 --- a/src/main/java/com/back/domain/notification/entity/NotificationSetting.java +++ b/src/main/java/com/back/domain/notification/entity/NotificationSetting.java @@ -1,6 +1,6 @@ package com.back.domain.notification.entity; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.Getter; diff --git a/src/main/java/com/back/domain/notification/event/study/StudyNotificationEventListener.java b/src/main/java/com/back/domain/notification/event/study/StudyNotificationEventListener.java index 7c6b846e..fcc58087 100644 --- a/src/main/java/com/back/domain/notification/event/study/StudyNotificationEventListener.java +++ b/src/main/java/com/back/domain/notification/event/study/StudyNotificationEventListener.java @@ -2,10 +2,6 @@ import com.back.domain.notification.entity.NotificationSettingType; import com.back.domain.notification.service.NotificationService; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; -import com.back.global.exception.CustomException; -import com.back.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; diff --git a/src/main/java/com/back/domain/notification/event/studyroom/StudyRoomNotificationEventListener.java b/src/main/java/com/back/domain/notification/event/studyroom/StudyRoomNotificationEventListener.java index c99544c8..8b772405 100644 --- a/src/main/java/com/back/domain/notification/event/studyroom/StudyRoomNotificationEventListener.java +++ b/src/main/java/com/back/domain/notification/event/studyroom/StudyRoomNotificationEventListener.java @@ -2,13 +2,6 @@ import com.back.domain.notification.entity.NotificationSettingType; import com.back.domain.notification.service.NotificationService; -import com.back.domain.studyroom.entity.Room; -import com.back.domain.studyroom.repository.RoomMemberRepository; -import com.back.domain.studyroom.repository.RoomRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; -import com.back.global.exception.CustomException; -import com.back.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; diff --git a/src/main/java/com/back/domain/notification/service/NotificationService.java b/src/main/java/com/back/domain/notification/service/NotificationService.java index 5a45f28a..8607e8ab 100644 --- a/src/main/java/com/back/domain/notification/service/NotificationService.java +++ b/src/main/java/com/back/domain/notification/service/NotificationService.java @@ -8,8 +8,8 @@ import com.back.domain.notification.repository.NotificationRepository; import com.back.domain.studyroom.entity.Room; import com.back.domain.studyroom.repository.RoomRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/back/domain/notification/service/NotificationSettingService.java b/src/main/java/com/back/domain/notification/service/NotificationSettingService.java index 937ac343..2d0700cd 100644 --- a/src/main/java/com/back/domain/notification/service/NotificationSettingService.java +++ b/src/main/java/com/back/domain/notification/service/NotificationSettingService.java @@ -4,8 +4,8 @@ import com.back.domain.notification.entity.NotificationSetting; import com.back.domain.notification.entity.NotificationSettingType; import com.back.domain.notification.repository.NotificationSettingRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/back/domain/study/memo/entity/Memo.java b/src/main/java/com/back/domain/study/memo/entity/Memo.java index 427d3ad6..075f357e 100644 --- a/src/main/java/com/back/domain/study/memo/entity/Memo.java +++ b/src/main/java/com/back/domain/study/memo/entity/Memo.java @@ -1,6 +1,6 @@ package com.back.domain.study.memo.entity; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.Getter; diff --git a/src/main/java/com/back/domain/study/memo/service/MemoService.java b/src/main/java/com/back/domain/study/memo/service/MemoService.java index 55b8c4bf..29cf0ae7 100644 --- a/src/main/java/com/back/domain/study/memo/service/MemoService.java +++ b/src/main/java/com/back/domain/study/memo/service/MemoService.java @@ -4,8 +4,8 @@ import com.back.domain.study.memo.dto.MemoResponseDto; import com.back.domain.study.memo.entity.Memo; import com.back.domain.study.memo.repository.MemoRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/back/domain/study/plan/entity/StudyPlan.java b/src/main/java/com/back/domain/study/plan/entity/StudyPlan.java index 9603f822..f3ab757b 100644 --- a/src/main/java/com/back/domain/study/plan/entity/StudyPlan.java +++ b/src/main/java/com/back/domain/study/plan/entity/StudyPlan.java @@ -1,7 +1,7 @@ package com.back.domain.study.plan.entity; import com.back.domain.study.record.entity.StudyRecord; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.Getter; diff --git a/src/main/java/com/back/domain/study/plan/service/StudyPlanService.java b/src/main/java/com/back/domain/study/plan/service/StudyPlanService.java index 2101f504..72a45f4a 100644 --- a/src/main/java/com/back/domain/study/plan/service/StudyPlanService.java +++ b/src/main/java/com/back/domain/study/plan/service/StudyPlanService.java @@ -6,8 +6,8 @@ import com.back.domain.study.plan.entity.*; import com.back.domain.study.plan.repository.StudyPlanExceptionRepository; import com.back.domain.study.plan.repository.StudyPlanRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/back/domain/study/record/entity/StudyRecord.java b/src/main/java/com/back/domain/study/record/entity/StudyRecord.java index 57b4ad49..d71fbae2 100644 --- a/src/main/java/com/back/domain/study/record/entity/StudyRecord.java +++ b/src/main/java/com/back/domain/study/record/entity/StudyRecord.java @@ -2,10 +2,8 @@ import com.back.domain.study.plan.entity.StudyPlan; import com.back.domain.studyroom.entity.Room; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; -import com.back.global.exception.CustomException; -import com.back.global.exception.ErrorCode; import jakarta.persistence.*; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/back/domain/study/record/service/StudyRecordService.java b/src/main/java/com/back/domain/study/record/service/StudyRecordService.java index fd81097d..cf9159d1 100644 --- a/src/main/java/com/back/domain/study/record/service/StudyRecordService.java +++ b/src/main/java/com/back/domain/study/record/service/StudyRecordService.java @@ -13,8 +13,8 @@ import com.back.domain.study.record.repository.StudyRecordRepository; import com.back.domain.studyroom.entity.Room; import com.back.domain.studyroom.repository.RoomRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; @@ -25,7 +25,6 @@ import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/back/domain/study/todo/entity/Todo.java b/src/main/java/com/back/domain/study/todo/entity/Todo.java index 14045f17..eca398cc 100644 --- a/src/main/java/com/back/domain/study/todo/entity/Todo.java +++ b/src/main/java/com/back/domain/study/todo/entity/Todo.java @@ -1,15 +1,12 @@ package com.back.domain.study.todo.entity; -import com.back.domain.study.record.entity.StudyRecord; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.Getter; import lombok.NoArgsConstructor; import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.List; @Entity @Getter diff --git a/src/main/java/com/back/domain/study/todo/repository/TodoRepository.java b/src/main/java/com/back/domain/study/todo/repository/TodoRepository.java index 89bf755f..7b25196f 100644 --- a/src/main/java/com/back/domain/study/todo/repository/TodoRepository.java +++ b/src/main/java/com/back/domain/study/todo/repository/TodoRepository.java @@ -1,7 +1,6 @@ package com.back.domain.study.todo.repository; import com.back.domain.study.todo.entity.Todo; -import com.back.domain.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/back/domain/study/todo/service/TodoService.java b/src/main/java/com/back/domain/study/todo/service/TodoService.java index d2783757..352221b5 100644 --- a/src/main/java/com/back/domain/study/todo/service/TodoService.java +++ b/src/main/java/com/back/domain/study/todo/service/TodoService.java @@ -4,8 +4,8 @@ import com.back.domain.study.todo.dto.TodoResponseDto; import com.back.domain.study.todo.entity.Todo; import com.back.domain.study.todo.repository.TodoRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/back/domain/studyroom/controller/RoomController.java b/src/main/java/com/back/domain/studyroom/controller/RoomController.java index 50a5b01e..d498d601 100644 --- a/src/main/java/com/back/domain/studyroom/controller/RoomController.java +++ b/src/main/java/com/back/domain/studyroom/controller/RoomController.java @@ -5,7 +5,7 @@ import com.back.domain.studyroom.entity.RoomMember; import com.back.domain.studyroom.entity.RoomRole; import com.back.domain.studyroom.service.RoomService; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.common.dto.RsData; import com.back.global.security.user.CurrentUser; import io.swagger.v3.oas.annotations.Operation; @@ -26,7 +26,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * 스터디 룸 관련 API 컨트롤러 diff --git a/src/main/java/com/back/domain/studyroom/entity/Room.java b/src/main/java/com/back/domain/studyroom/entity/Room.java index c537c5f3..39d05d25 100644 --- a/src/main/java/com/back/domain/studyroom/entity/Room.java +++ b/src/main/java/com/back/domain/studyroom/entity/Room.java @@ -1,7 +1,7 @@ package com.back.domain.studyroom.entity; import com.back.domain.study.record.entity.StudyRecord; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/back/domain/studyroom/entity/RoomChatMessage.java b/src/main/java/com/back/domain/studyroom/entity/RoomChatMessage.java index 7e12d667..19d4454d 100644 --- a/src/main/java/com/back/domain/studyroom/entity/RoomChatMessage.java +++ b/src/main/java/com/back/domain/studyroom/entity/RoomChatMessage.java @@ -1,6 +1,6 @@ package com.back.domain.studyroom.entity; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/src/main/java/com/back/domain/studyroom/entity/RoomInviteCode.java b/src/main/java/com/back/domain/studyroom/entity/RoomInviteCode.java index 0d8a5c6b..1e8401d1 100644 --- a/src/main/java/com/back/domain/studyroom/entity/RoomInviteCode.java +++ b/src/main/java/com/back/domain/studyroom/entity/RoomInviteCode.java @@ -1,6 +1,6 @@ package com.back.domain.studyroom.entity; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/src/main/java/com/back/domain/studyroom/entity/RoomMember.java b/src/main/java/com/back/domain/studyroom/entity/RoomMember.java index 929425e9..7a4ad2f4 100644 --- a/src/main/java/com/back/domain/studyroom/entity/RoomMember.java +++ b/src/main/java/com/back/domain/studyroom/entity/RoomMember.java @@ -1,6 +1,6 @@ package com.back.domain.studyroom.entity; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.Getter; diff --git a/src/main/java/com/back/domain/studyroom/entity/RoomMemberAvatar.java b/src/main/java/com/back/domain/studyroom/entity/RoomMemberAvatar.java index a28e7f5f..e9c295ae 100644 --- a/src/main/java/com/back/domain/studyroom/entity/RoomMemberAvatar.java +++ b/src/main/java/com/back/domain/studyroom/entity/RoomMemberAvatar.java @@ -1,10 +1,9 @@ package com.back.domain.studyroom.entity; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; diff --git a/src/main/java/com/back/domain/studyroom/entity/RoomParticipantHistory.java b/src/main/java/com/back/domain/studyroom/entity/RoomParticipantHistory.java index 1d009226..6eb6e2b8 100644 --- a/src/main/java/com/back/domain/studyroom/entity/RoomParticipantHistory.java +++ b/src/main/java/com/back/domain/studyroom/entity/RoomParticipantHistory.java @@ -1,6 +1,6 @@ package com.back.domain.studyroom.entity; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.entity.BaseEntity; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/src/main/java/com/back/domain/studyroom/service/AvatarService.java b/src/main/java/com/back/domain/studyroom/service/AvatarService.java index 1a84b74d..38c87cfd 100644 --- a/src/main/java/com/back/domain/studyroom/service/AvatarService.java +++ b/src/main/java/com/back/domain/studyroom/service/AvatarService.java @@ -4,12 +4,10 @@ import com.back.domain.studyroom.entity.Avatar; import com.back.domain.studyroom.entity.RoomMember; import com.back.domain.studyroom.entity.RoomMemberAvatar; -import com.back.domain.studyroom.entity.RoomRole; import com.back.domain.studyroom.repository.AvatarRepository; import com.back.domain.studyroom.repository.RoomMemberAvatarRepository; import com.back.domain.studyroom.repository.RoomMemberRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; @@ -17,7 +15,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/com/back/domain/studyroom/service/RoomInviteService.java b/src/main/java/com/back/domain/studyroom/service/RoomInviteService.java index fb3facf1..aad82944 100644 --- a/src/main/java/com/back/domain/studyroom/service/RoomInviteService.java +++ b/src/main/java/com/back/domain/studyroom/service/RoomInviteService.java @@ -4,8 +4,8 @@ import com.back.domain.studyroom.entity.RoomInviteCode; import com.back.domain.studyroom.repository.RoomInviteCodeRepository; import com.back.domain.studyroom.repository.RoomRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/com/back/domain/studyroom/service/RoomService.java b/src/main/java/com/back/domain/studyroom/service/RoomService.java index 1b44228c..60588b4b 100644 --- a/src/main/java/com/back/domain/studyroom/service/RoomService.java +++ b/src/main/java/com/back/domain/studyroom/service/RoomService.java @@ -7,8 +7,8 @@ import com.back.domain.studyroom.dto.RoomResponse; import com.back.domain.studyroom.entity.*; import com.back.domain.studyroom.repository.*; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import com.back.global.websocket.service.RoomParticipantService; diff --git a/src/main/java/com/back/domain/user/controller/UserController.java b/src/main/java/com/back/domain/user/account/controller/AccountController.java similarity index 73% rename from src/main/java/com/back/domain/user/controller/UserController.java rename to src/main/java/com/back/domain/user/account/controller/AccountController.java index 79abf699..f519b913 100644 --- a/src/main/java/com/back/domain/user/controller/UserController.java +++ b/src/main/java/com/back/domain/user/account/controller/AccountController.java @@ -1,12 +1,13 @@ -package com.back.domain.user.controller; +package com.back.domain.user.account.controller; import com.back.domain.board.comment.dto.MyCommentResponse; import com.back.domain.board.common.dto.PageResponse; import com.back.domain.board.post.dto.PostListResponse; -import com.back.domain.user.dto.ChangePasswordRequest; -import com.back.domain.user.dto.UpdateUserProfileRequest; -import com.back.domain.user.dto.UserDetailResponse; -import com.back.domain.user.service.UserService; +import com.back.domain.user.account.controller.docs.AccountControllerDocs; +import com.back.domain.user.account.dto.ChangePasswordRequest; +import com.back.domain.user.account.dto.UpdateUserProfileRequest; +import com.back.domain.user.account.dto.UserDetailResponse; +import com.back.domain.user.account.service.AccountService; import com.back.global.common.dto.RsData; import com.back.global.security.user.CustomUserDetails; import jakarta.validation.Valid; @@ -19,17 +20,17 @@ import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("/api/users") +@RequestMapping("/api/users/me") @RequiredArgsConstructor -public class UserController implements UserControllerDocs { - private final UserService userService; +public class AccountController implements AccountControllerDocs { + private final AccountService accountService; // 내 정보 조회 - @GetMapping("/me") + @GetMapping public ResponseEntity> getMyInfo( @AuthenticationPrincipal CustomUserDetails user ) { - UserDetailResponse userDetail = userService.getUserInfo(user.getUserId()); + UserDetailResponse userDetail = accountService.getUserInfo(user.getUserId()); return ResponseEntity .ok(RsData.success( "회원 정보를 조회했습니다.", @@ -38,12 +39,12 @@ public ResponseEntity> getMyInfo( } // 내 정보 수정 - @PatchMapping("/me") + @PatchMapping public ResponseEntity> updateMyProfile( @AuthenticationPrincipal CustomUserDetails user, @Valid @RequestBody UpdateUserProfileRequest request ) { - UserDetailResponse updated = userService.updateUserProfile(user.getUserId(), request); + UserDetailResponse updated = accountService.updateUserProfile(user.getUserId(), request); return ResponseEntity .ok(RsData.success( "회원 정보를 수정했습니다.", @@ -52,12 +53,12 @@ public ResponseEntity> updateMyProfile( } // 내 비밀번호 변경 - @PatchMapping("/me/password") + @PatchMapping("/password") public ResponseEntity> changeMyPassword( @AuthenticationPrincipal CustomUserDetails user, @Valid @RequestBody ChangePasswordRequest request ) { - userService.changePassword(user.getUserId(), request); + accountService.changePassword(user.getUserId(), request); return ResponseEntity .ok(RsData.success( "비밀번호가 변경되었습니다." @@ -65,11 +66,11 @@ public ResponseEntity> changeMyPassword( } // 내 계정 삭제 - @DeleteMapping("/me") + @DeleteMapping public ResponseEntity> deleteMyAccount( @AuthenticationPrincipal CustomUserDetails user ) { - userService.deleteUser(user.getUserId()); + accountService.deleteUser(user.getUserId()); return ResponseEntity .ok(RsData.success( "회원 탈퇴가 완료되었습니다." @@ -77,12 +78,12 @@ public ResponseEntity> deleteMyAccount( } // 내 게시글 목록 조회 - @GetMapping("/me/posts") + @GetMapping("/posts") public ResponseEntity>> getMyPosts( @AuthenticationPrincipal CustomUserDetails user, @PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable ) { - PageResponse response = userService.getMyPosts(user.getUserId(), pageable); + PageResponse response = accountService.getMyPosts(user.getUserId(), pageable); return ResponseEntity .ok(RsData.success( "내 게시글 목록이 조회되었습니다.", @@ -91,12 +92,12 @@ public ResponseEntity>> getMyPosts( } // 내 댓글 목록 조회 - @GetMapping("/me/comments") + @GetMapping("/comments") public ResponseEntity>> getMyComments( @AuthenticationPrincipal CustomUserDetails user, @PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable ) { - PageResponse response = userService.getMyComments(user.getUserId(), pageable); + PageResponse response = accountService.getMyComments(user.getUserId(), pageable); return ResponseEntity .ok(RsData.success( "내 댓글 목록이 조회되었습니다.", @@ -105,12 +106,12 @@ public ResponseEntity>> getMyComments( } // 내 북마크 게시글 목록 조회 - @GetMapping("/me/bookmarks") + @GetMapping("/bookmarks") public ResponseEntity>> getMyBookmarks( @AuthenticationPrincipal CustomUserDetails user, @PageableDefault(sort = "createdAt", direction = Sort.Direction.DESC) Pageable pageable ) { - PageResponse response = userService.getMyBookmarks(user.getUserId(), pageable); + PageResponse response = accountService.getMyBookmarks(user.getUserId(), pageable); return ResponseEntity .ok(RsData.success( "내 북마크 게시글 목록이 조회되었습니다.", diff --git a/src/main/java/com/back/domain/user/controller/UserControllerDocs.java b/src/main/java/com/back/domain/user/account/controller/docs/AccountControllerDocs.java similarity index 99% rename from src/main/java/com/back/domain/user/controller/UserControllerDocs.java rename to src/main/java/com/back/domain/user/account/controller/docs/AccountControllerDocs.java index 8536d780..d46b3909 100644 --- a/src/main/java/com/back/domain/user/controller/UserControllerDocs.java +++ b/src/main/java/com/back/domain/user/account/controller/docs/AccountControllerDocs.java @@ -1,11 +1,11 @@ -package com.back.domain.user.controller; +package com.back.domain.user.account.controller.docs; import com.back.domain.board.comment.dto.MyCommentResponse; import com.back.domain.board.common.dto.PageResponse; import com.back.domain.board.post.dto.PostListResponse; -import com.back.domain.user.dto.ChangePasswordRequest; -import com.back.domain.user.dto.UpdateUserProfileRequest; -import com.back.domain.user.dto.UserDetailResponse; +import com.back.domain.user.account.dto.ChangePasswordRequest; +import com.back.domain.user.account.dto.UpdateUserProfileRequest; +import com.back.domain.user.account.dto.UserDetailResponse; import com.back.global.common.dto.RsData; import com.back.global.security.user.CustomUserDetails; import io.swagger.v3.oas.annotations.Operation; @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestBody; @Tag(name = "User API", description = "사용자 정보 관련 API") -public interface UserControllerDocs { +public interface AccountControllerDocs { @Operation( summary = "내 정보 조회", diff --git a/src/main/java/com/back/domain/user/dto/ChangePasswordRequest.java b/src/main/java/com/back/domain/user/account/dto/ChangePasswordRequest.java similarity index 88% rename from src/main/java/com/back/domain/user/dto/ChangePasswordRequest.java rename to src/main/java/com/back/domain/user/account/dto/ChangePasswordRequest.java index c674dbab..6922496e 100644 --- a/src/main/java/com/back/domain/user/dto/ChangePasswordRequest.java +++ b/src/main/java/com/back/domain/user/account/dto/ChangePasswordRequest.java @@ -1,4 +1,4 @@ -package com.back.domain.user.dto; +package com.back.domain.user.account.dto; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/back/domain/user/dto/UpdateUserProfileRequest.java b/src/main/java/com/back/domain/user/account/dto/UpdateUserProfileRequest.java similarity index 93% rename from src/main/java/com/back/domain/user/dto/UpdateUserProfileRequest.java rename to src/main/java/com/back/domain/user/account/dto/UpdateUserProfileRequest.java index 700d88b3..93955e08 100644 --- a/src/main/java/com/back/domain/user/dto/UpdateUserProfileRequest.java +++ b/src/main/java/com/back/domain/user/account/dto/UpdateUserProfileRequest.java @@ -1,4 +1,4 @@ -package com.back.domain.user.dto; +package com.back.domain.user.account.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; diff --git a/src/main/java/com/back/domain/user/dto/UserDetailResponse.java b/src/main/java/com/back/domain/user/account/dto/UserDetailResponse.java similarity index 90% rename from src/main/java/com/back/domain/user/dto/UserDetailResponse.java rename to src/main/java/com/back/domain/user/account/dto/UserDetailResponse.java index f2c5ea31..127535af 100644 --- a/src/main/java/com/back/domain/user/dto/UserDetailResponse.java +++ b/src/main/java/com/back/domain/user/account/dto/UserDetailResponse.java @@ -1,9 +1,9 @@ -package com.back.domain.user.dto; +package com.back.domain.user.account.dto; -import com.back.domain.user.entity.Role; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; +import com.back.domain.user.common.enums.Role; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/src/main/java/com/back/domain/user/service/UserService.java b/src/main/java/com/back/domain/user/account/service/AccountService.java similarity index 91% rename from src/main/java/com/back/domain/user/service/UserService.java rename to src/main/java/com/back/domain/user/account/service/AccountService.java index 1d747cc3..9b177fb9 100644 --- a/src/main/java/com/back/domain/user/service/UserService.java +++ b/src/main/java/com/back/domain/user/account/service/AccountService.java @@ -1,21 +1,21 @@ -package com.back.domain.user.service; +package com.back.domain.user.account.service; import com.back.domain.board.comment.dto.MyCommentResponse; import com.back.domain.board.comment.repository.CommentRepository; import com.back.domain.board.common.dto.PageResponse; import com.back.domain.board.post.dto.PostListResponse; import com.back.domain.board.post.repository.PostRepository; -import com.back.domain.user.dto.ChangePasswordRequest; -import com.back.domain.user.dto.UpdateUserProfileRequest; -import com.back.domain.user.dto.UserDetailResponse; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserProfileRepository; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.account.dto.ChangePasswordRequest; +import com.back.domain.user.account.dto.UpdateUserProfileRequest; +import com.back.domain.user.account.dto.UserDetailResponse; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserProfileRepository; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; -import com.back.global.util.PasswordValidator; +import com.back.domain.user.common.util.PasswordValidator; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -23,12 +23,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - @Service @RequiredArgsConstructor @Transactional -public class UserService { +public class AccountService { private final UserRepository userRepository; private final UserProfileRepository userProfileRepository; private final CommentRepository commentRepository; diff --git a/src/main/java/com/back/domain/user/controller/AuthController.java b/src/main/java/com/back/domain/user/auth/controller/AuthController.java similarity index 95% rename from src/main/java/com/back/domain/user/controller/AuthController.java rename to src/main/java/com/back/domain/user/auth/controller/AuthController.java index 2d13ead7..da90a2fd 100644 --- a/src/main/java/com/back/domain/user/controller/AuthController.java +++ b/src/main/java/com/back/domain/user/auth/controller/AuthController.java @@ -1,7 +1,8 @@ -package com.back.domain.user.controller; +package com.back.domain.user.auth.controller; -import com.back.domain.user.dto.*; -import com.back.domain.user.service.AuthService; +import com.back.domain.user.auth.controller.docs.AuthControllerDocs; +import com.back.domain.user.auth.dto.*; +import com.back.domain.user.auth.service.AuthService; import com.back.global.common.dto.RsData; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/back/domain/user/controller/AuthControllerDocs.java b/src/main/java/com/back/domain/user/auth/controller/docs/AuthControllerDocs.java similarity index 99% rename from src/main/java/com/back/domain/user/controller/AuthControllerDocs.java rename to src/main/java/com/back/domain/user/auth/controller/docs/AuthControllerDocs.java index 323913ef..836704a7 100644 --- a/src/main/java/com/back/domain/user/controller/AuthControllerDocs.java +++ b/src/main/java/com/back/domain/user/auth/controller/docs/AuthControllerDocs.java @@ -1,6 +1,7 @@ -package com.back.domain.user.controller; +package com.back.domain.user.auth.controller.docs; -import com.back.domain.user.dto.*; +import com.back.domain.user.auth.dto.*; +import com.back.domain.user.auth.dto.UserResponse; import com.back.global.common.dto.RsData; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; diff --git a/src/main/java/com/back/domain/user/dto/LoginRequest.java b/src/main/java/com/back/domain/user/auth/dto/LoginRequest.java similarity index 88% rename from src/main/java/com/back/domain/user/dto/LoginRequest.java rename to src/main/java/com/back/domain/user/auth/dto/LoginRequest.java index fd86ab63..b3a2b0db 100644 --- a/src/main/java/com/back/domain/user/dto/LoginRequest.java +++ b/src/main/java/com/back/domain/user/auth/dto/LoginRequest.java @@ -1,4 +1,4 @@ -package com.back.domain.user.dto; +package com.back.domain.user.auth.dto; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/back/domain/user/dto/LoginResponse.java b/src/main/java/com/back/domain/user/auth/dto/LoginResponse.java similarity index 87% rename from src/main/java/com/back/domain/user/dto/LoginResponse.java rename to src/main/java/com/back/domain/user/auth/dto/LoginResponse.java index 2bb350b4..46d95fc5 100644 --- a/src/main/java/com/back/domain/user/dto/LoginResponse.java +++ b/src/main/java/com/back/domain/user/auth/dto/LoginResponse.java @@ -1,4 +1,4 @@ -package com.back.domain.user.dto; +package com.back.domain.user.auth.dto; /** * 사용자 로그인 응답을 나타내는 DTO diff --git a/src/main/java/com/back/domain/user/dto/PasswordResetRequest.java b/src/main/java/com/back/domain/user/auth/dto/PasswordResetRequest.java similarity index 88% rename from src/main/java/com/back/domain/user/dto/PasswordResetRequest.java rename to src/main/java/com/back/domain/user/auth/dto/PasswordResetRequest.java index 2b6ba4e0..93263b46 100644 --- a/src/main/java/com/back/domain/user/dto/PasswordResetRequest.java +++ b/src/main/java/com/back/domain/user/auth/dto/PasswordResetRequest.java @@ -1,4 +1,4 @@ -package com.back.domain.user.dto; +package com.back.domain.user.auth.dto; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/back/domain/user/dto/SendEmailRequest.java b/src/main/java/com/back/domain/user/auth/dto/SendEmailRequest.java similarity index 87% rename from src/main/java/com/back/domain/user/dto/SendEmailRequest.java rename to src/main/java/com/back/domain/user/auth/dto/SendEmailRequest.java index b1c6d60c..c6298cd8 100644 --- a/src/main/java/com/back/domain/user/dto/SendEmailRequest.java +++ b/src/main/java/com/back/domain/user/auth/dto/SendEmailRequest.java @@ -1,4 +1,4 @@ -package com.back.domain.user.dto; +package com.back.domain.user.auth.dto; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/back/domain/user/dto/UserRegisterRequest.java b/src/main/java/com/back/domain/user/auth/dto/UserRegisterRequest.java similarity index 93% rename from src/main/java/com/back/domain/user/dto/UserRegisterRequest.java rename to src/main/java/com/back/domain/user/auth/dto/UserRegisterRequest.java index 20f7635f..21e4b046 100644 --- a/src/main/java/com/back/domain/user/dto/UserRegisterRequest.java +++ b/src/main/java/com/back/domain/user/auth/dto/UserRegisterRequest.java @@ -1,4 +1,4 @@ -package com.back.domain.user.dto; +package com.back.domain.user.auth.dto; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/back/domain/user/dto/UserResponse.java b/src/main/java/com/back/domain/user/auth/dto/UserResponse.java similarity index 82% rename from src/main/java/com/back/domain/user/dto/UserResponse.java rename to src/main/java/com/back/domain/user/auth/dto/UserResponse.java index 86f293f0..1da0789b 100644 --- a/src/main/java/com/back/domain/user/dto/UserResponse.java +++ b/src/main/java/com/back/domain/user/auth/dto/UserResponse.java @@ -1,9 +1,8 @@ -package com.back.domain.user.dto; +package com.back.domain.user.auth.dto; -import com.back.domain.user.entity.Role; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; +import com.back.domain.user.common.enums.Role; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.enums.UserStatus; import java.time.LocalDateTime; diff --git a/src/main/java/com/back/domain/user/service/AuthService.java b/src/main/java/com/back/domain/user/auth/service/AuthService.java similarity index 94% rename from src/main/java/com/back/domain/user/service/AuthService.java rename to src/main/java/com/back/domain/user/auth/service/AuthService.java index 7c9f27e7..fd251939 100644 --- a/src/main/java/com/back/domain/user/service/AuthService.java +++ b/src/main/java/com/back/domain/user/auth/service/AuthService.java @@ -1,22 +1,22 @@ -package com.back.domain.user.service; +package com.back.domain.user.auth.service; import com.back.domain.notification.service.NotificationSettingService; -import com.back.domain.user.dto.LoginRequest; -import com.back.domain.user.dto.LoginResponse; -import com.back.domain.user.dto.UserRegisterRequest; -import com.back.domain.user.dto.UserResponse; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.entity.UserToken; -import com.back.domain.user.repository.UserProfileRepository; -import com.back.domain.user.repository.UserRepository; -import com.back.domain.user.repository.UserTokenRepository; +import com.back.domain.user.auth.dto.LoginRequest; +import com.back.domain.user.auth.dto.LoginResponse; +import com.back.domain.user.auth.dto.UserRegisterRequest; +import com.back.domain.user.auth.dto.UserResponse; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.entity.UserToken; +import com.back.domain.user.common.repository.UserProfileRepository; +import com.back.domain.user.common.repository.UserRepository; +import com.back.domain.user.common.repository.UserTokenRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import com.back.global.security.jwt.JwtTokenProvider; -import com.back.global.util.CookieUtil; -import com.back.global.util.PasswordValidator; +import com.back.domain.user.common.util.CookieUtil; +import com.back.domain.user.common.util.PasswordValidator; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/back/domain/user/service/EmailService.java b/src/main/java/com/back/domain/user/auth/service/EmailService.java similarity index 97% rename from src/main/java/com/back/domain/user/service/EmailService.java rename to src/main/java/com/back/domain/user/auth/service/EmailService.java index 1be79a72..0ad40623 100644 --- a/src/main/java/com/back/domain/user/service/EmailService.java +++ b/src/main/java/com/back/domain/user/auth/service/EmailService.java @@ -1,10 +1,9 @@ -package com.back.domain.user.service; +package com.back.domain.user.auth.service; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; -import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/back/domain/user/service/TokenService.java b/src/main/java/com/back/domain/user/auth/service/TokenService.java similarity index 98% rename from src/main/java/com/back/domain/user/service/TokenService.java rename to src/main/java/com/back/domain/user/auth/service/TokenService.java index 8f11cc9f..47aebcd5 100644 --- a/src/main/java/com/back/domain/user/service/TokenService.java +++ b/src/main/java/com/back/domain/user/auth/service/TokenService.java @@ -1,4 +1,4 @@ -package com.back.domain.user.service; +package com.back.domain.user.auth.service; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.StringRedisTemplate; diff --git a/src/main/java/com/back/domain/user/entity/User.java b/src/main/java/com/back/domain/user/common/entity/User.java similarity index 97% rename from src/main/java/com/back/domain/user/entity/User.java rename to src/main/java/com/back/domain/user/common/entity/User.java index 1d58629e..7dd7a6c8 100644 --- a/src/main/java/com/back/domain/user/entity/User.java +++ b/src/main/java/com/back/domain/user/common/entity/User.java @@ -1,4 +1,4 @@ -package com.back.domain.user.entity; +package com.back.domain.user.common.entity; import com.back.domain.board.comment.entity.Comment; import com.back.domain.board.comment.entity.CommentLike; @@ -11,6 +11,8 @@ import com.back.domain.studyroom.entity.RoomChatMessage; import com.back.domain.studyroom.entity.RoomMember; import com.back.domain.studyroom.entity.RoomParticipantHistory; +import com.back.domain.user.common.enums.Role; +import com.back.domain.user.common.enums.UserStatus; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/back/domain/user/entity/UserProfile.java b/src/main/java/com/back/domain/user/common/entity/UserProfile.java similarity index 93% rename from src/main/java/com/back/domain/user/entity/UserProfile.java rename to src/main/java/com/back/domain/user/common/entity/UserProfile.java index e87a4554..540fc695 100644 --- a/src/main/java/com/back/domain/user/entity/UserProfile.java +++ b/src/main/java/com/back/domain/user/common/entity/UserProfile.java @@ -1,4 +1,4 @@ -package com.back.domain.user.entity; +package com.back.domain.user.common.entity; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; diff --git a/src/main/java/com/back/domain/user/entity/UserToken.java b/src/main/java/com/back/domain/user/common/entity/UserToken.java similarity index 91% rename from src/main/java/com/back/domain/user/entity/UserToken.java rename to src/main/java/com/back/domain/user/common/entity/UserToken.java index 0b98061c..8faa2ec6 100644 --- a/src/main/java/com/back/domain/user/entity/UserToken.java +++ b/src/main/java/com/back/domain/user/common/entity/UserToken.java @@ -1,4 +1,4 @@ -package com.back.domain.user.entity; +package com.back.domain.user.common.entity; import com.back.global.entity.BaseEntity; import jakarta.persistence.*; diff --git a/src/main/java/com/back/domain/user/common/enums/Role.java b/src/main/java/com/back/domain/user/common/enums/Role.java new file mode 100644 index 00000000..a4f7e6f3 --- /dev/null +++ b/src/main/java/com/back/domain/user/common/enums/Role.java @@ -0,0 +1,5 @@ +package com.back.domain.user.common.enums; + +public enum Role { + USER, ADMIN +} \ No newline at end of file diff --git a/src/main/java/com/back/domain/user/entity/UserStatus.java b/src/main/java/com/back/domain/user/common/enums/UserStatus.java similarity index 61% rename from src/main/java/com/back/domain/user/entity/UserStatus.java rename to src/main/java/com/back/domain/user/common/enums/UserStatus.java index 101e4428..f5cd7558 100644 --- a/src/main/java/com/back/domain/user/entity/UserStatus.java +++ b/src/main/java/com/back/domain/user/common/enums/UserStatus.java @@ -1,4 +1,4 @@ -package com.back.domain.user.entity; +package com.back.domain.user.common.enums; public enum UserStatus { ACTIVE, PENDING, DELETED, SUSPENDED diff --git a/src/main/java/com/back/domain/user/repository/UserProfileRepository.java b/src/main/java/com/back/domain/user/common/repository/UserProfileRepository.java similarity index 76% rename from src/main/java/com/back/domain/user/repository/UserProfileRepository.java rename to src/main/java/com/back/domain/user/common/repository/UserProfileRepository.java index ebc61d2b..c5d562e7 100644 --- a/src/main/java/com/back/domain/user/repository/UserProfileRepository.java +++ b/src/main/java/com/back/domain/user/common/repository/UserProfileRepository.java @@ -1,6 +1,6 @@ -package com.back.domain.user.repository; +package com.back.domain.user.common.repository; -import com.back.domain.user.entity.UserProfile; +import com.back.domain.user.common.entity.UserProfile; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/back/domain/user/repository/UserRepository.java b/src/main/java/com/back/domain/user/common/repository/UserRepository.java similarity index 83% rename from src/main/java/com/back/domain/user/repository/UserRepository.java rename to src/main/java/com/back/domain/user/common/repository/UserRepository.java index d9766f05..ddf2b7c2 100644 --- a/src/main/java/com/back/domain/user/repository/UserRepository.java +++ b/src/main/java/com/back/domain/user/common/repository/UserRepository.java @@ -1,6 +1,6 @@ -package com.back.domain.user.repository; +package com.back.domain.user.common.repository; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/back/domain/user/repository/UserTokenRepository.java b/src/main/java/com/back/domain/user/common/repository/UserTokenRepository.java similarity index 77% rename from src/main/java/com/back/domain/user/repository/UserTokenRepository.java rename to src/main/java/com/back/domain/user/common/repository/UserTokenRepository.java index 34f50460..2029e9b2 100644 --- a/src/main/java/com/back/domain/user/repository/UserTokenRepository.java +++ b/src/main/java/com/back/domain/user/common/repository/UserTokenRepository.java @@ -1,6 +1,6 @@ -package com.back.domain.user.repository; +package com.back.domain.user.common.repository; -import com.back.domain.user.entity.UserToken; +import com.back.domain.user.common.entity.UserToken; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/back/global/util/CookieUtil.java b/src/main/java/com/back/domain/user/common/util/CookieUtil.java similarity index 94% rename from src/main/java/com/back/global/util/CookieUtil.java rename to src/main/java/com/back/domain/user/common/util/CookieUtil.java index fb1cccf1..2b8cd0ed 100644 --- a/src/main/java/com/back/global/util/CookieUtil.java +++ b/src/main/java/com/back/domain/user/common/util/CookieUtil.java @@ -1,7 +1,4 @@ -package com.back.global.util; - -import jakarta.servlet.http.Cookie; -import jakarta.servlet.http.HttpServletResponse; +package com.back.domain.user.common.util; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletResponse; diff --git a/src/main/java/com/back/global/util/PasswordValidator.java b/src/main/java/com/back/domain/user/common/util/PasswordValidator.java similarity index 95% rename from src/main/java/com/back/global/util/PasswordValidator.java rename to src/main/java/com/back/domain/user/common/util/PasswordValidator.java index fd5815ab..6a1d24ba 100644 --- a/src/main/java/com/back/global/util/PasswordValidator.java +++ b/src/main/java/com/back/domain/user/common/util/PasswordValidator.java @@ -1,4 +1,4 @@ -package com.back.global.util; +package com.back.domain.user.common.util; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; diff --git a/src/main/java/com/back/domain/user/entity/Role.java b/src/main/java/com/back/domain/user/entity/Role.java deleted file mode 100644 index 50236f76..00000000 --- a/src/main/java/com/back/domain/user/entity/Role.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.back.domain.user.entity; - -public enum Role { - USER, ADMIN -} \ No newline at end of file diff --git a/src/main/java/com/back/global/initData/DevInitService.java b/src/main/java/com/back/global/initData/DevInitService.java index 502fd027..e588944f 100644 --- a/src/main/java/com/back/global/initData/DevInitService.java +++ b/src/main/java/com/back/global/initData/DevInitService.java @@ -6,10 +6,10 @@ import com.back.domain.board.post.entity.PostCategory; import com.back.domain.board.post.repository.PostCategoryRepository; import com.back.domain.board.post.repository.PostRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import jakarta.persistence.EntityManager; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/java/com/back/global/security/jwt/JwtTokenProvider.java b/src/main/java/com/back/global/security/jwt/JwtTokenProvider.java index f008f2aa..23f3f112 100644 --- a/src/main/java/com/back/global/security/jwt/JwtTokenProvider.java +++ b/src/main/java/com/back/global/security/jwt/JwtTokenProvider.java @@ -1,6 +1,6 @@ package com.back.global.security.jwt; -import com.back.domain.user.entity.Role; +import com.back.domain.user.common.enums.Role; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import com.back.global.security.user.CustomUserDetails; diff --git a/src/main/java/com/back/global/security/oauth/CustomOAuth2UserService.java b/src/main/java/com/back/global/security/oauth/CustomOAuth2UserService.java index 4fedf037..e21c8c6f 100644 --- a/src/main/java/com/back/global/security/oauth/CustomOAuth2UserService.java +++ b/src/main/java/com/back/global/security/oauth/CustomOAuth2UserService.java @@ -1,8 +1,8 @@ package com.back.global.security.oauth; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import com.back.global.security.user.CustomUserDetails; diff --git a/src/main/java/com/back/global/security/oauth/OAuth2LoginSuccessHandler.java b/src/main/java/com/back/global/security/oauth/OAuth2LoginSuccessHandler.java index ca7034ec..e9a46a74 100644 --- a/src/main/java/com/back/global/security/oauth/OAuth2LoginSuccessHandler.java +++ b/src/main/java/com/back/global/security/oauth/OAuth2LoginSuccessHandler.java @@ -1,16 +1,14 @@ package com.back.global.security.oauth; -import com.back.domain.user.dto.LoginResponse; -import com.back.domain.user.dto.UserResponse; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserToken; -import com.back.domain.user.repository.UserRepository; -import com.back.domain.user.repository.UserTokenRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserToken; +import com.back.domain.user.common.repository.UserRepository; +import com.back.domain.user.common.repository.UserTokenRepository; import com.back.global.common.dto.RsData; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import com.back.global.security.jwt.JwtTokenProvider; -import com.back.global.util.CookieUtil; +import com.back.domain.user.common.util.CookieUtil; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -19,7 +17,6 @@ import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.stereotype.Component; -import org.springframework.web.util.UriComponentsBuilder; import java.io.IOException; import java.time.LocalDateTime; diff --git a/src/main/java/com/back/global/security/user/CurrentUser.java b/src/main/java/com/back/global/security/user/CurrentUser.java index 0fd00942..112d5347 100644 --- a/src/main/java/com/back/global/security/user/CurrentUser.java +++ b/src/main/java/com/back/global/security/user/CurrentUser.java @@ -1,8 +1,8 @@ package com.back.global.security.user; -import com.back.domain.user.entity.Role; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.enums.Role; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/back/global/security/user/CustomUserDetails.java b/src/main/java/com/back/global/security/user/CustomUserDetails.java index e50111c6..fa5932c5 100644 --- a/src/main/java/com/back/global/security/user/CustomUserDetails.java +++ b/src/main/java/com/back/global/security/user/CustomUserDetails.java @@ -1,6 +1,6 @@ package com.back.global.security.user; -import com.back.domain.user.entity.Role; +import com.back.domain.user.common.enums.Role; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/test/java/com/back/domain/board/comment/controller/CommentControllerTest.java b/src/test/java/com/back/domain/board/comment/controller/CommentControllerTest.java index 4baecf8e..4344aa29 100644 --- a/src/test/java/com/back/domain/board/comment/controller/CommentControllerTest.java +++ b/src/test/java/com/back/domain/board/comment/controller/CommentControllerTest.java @@ -5,10 +5,10 @@ import com.back.domain.board.post.entity.Post; import com.back.domain.board.comment.repository.CommentRepository; import com.back.domain.board.post.repository.PostRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.fixture.TestJwtTokenProvider; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/back/domain/board/comment/controller/CommentLikeControllerTest.java b/src/test/java/com/back/domain/board/comment/controller/CommentLikeControllerTest.java index 610e4472..8cca0d17 100644 --- a/src/test/java/com/back/domain/board/comment/controller/CommentLikeControllerTest.java +++ b/src/test/java/com/back/domain/board/comment/controller/CommentLikeControllerTest.java @@ -5,10 +5,10 @@ import com.back.domain.board.comment.repository.CommentRepository; import com.back.domain.board.post.entity.Post; import com.back.domain.board.post.repository.PostRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.fixture.TestJwtTokenProvider; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/back/domain/board/comment/repository/custom/CommentLikeRepositoryImplTest.java b/src/test/java/com/back/domain/board/comment/repository/custom/CommentLikeRepositoryImplTest.java index 1d2e6e7a..7cb1dd38 100644 --- a/src/test/java/com/back/domain/board/comment/repository/custom/CommentLikeRepositoryImplTest.java +++ b/src/test/java/com/back/domain/board/comment/repository/custom/CommentLikeRepositoryImplTest.java @@ -6,10 +6,10 @@ import com.back.domain.board.comment.repository.CommentRepository; import com.back.domain.board.post.entity.Post; import com.back.domain.board.post.repository.PostRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.config.QueryDslConfig; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/back/domain/board/comment/repository/custom/CommentRepositoryImplTest.java b/src/test/java/com/back/domain/board/comment/repository/custom/CommentRepositoryImplTest.java index 95d26933..f049f68f 100644 --- a/src/test/java/com/back/domain/board/comment/repository/custom/CommentRepositoryImplTest.java +++ b/src/test/java/com/back/domain/board/comment/repository/custom/CommentRepositoryImplTest.java @@ -5,10 +5,10 @@ import com.back.domain.board.comment.repository.CommentRepository; import com.back.domain.board.post.entity.Post; import com.back.domain.board.post.repository.PostRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.config.QueryDslConfig; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/back/domain/board/comment/service/CommentLikeServiceTest.java b/src/test/java/com/back/domain/board/comment/service/CommentLikeServiceTest.java index cf8b015b..2957c297 100644 --- a/src/test/java/com/back/domain/board/comment/service/CommentLikeServiceTest.java +++ b/src/test/java/com/back/domain/board/comment/service/CommentLikeServiceTest.java @@ -4,13 +4,12 @@ import com.back.domain.board.comment.entity.Comment; import com.back.domain.board.comment.repository.CommentLikeRepository; import com.back.domain.board.comment.repository.CommentRepository; -import com.back.domain.board.comment.service.CommentLikeService; import com.back.domain.board.post.entity.Post; import com.back.domain.board.post.repository.PostRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import jakarta.transaction.Transactional; diff --git a/src/test/java/com/back/domain/board/comment/service/CommentServiceTest.java b/src/test/java/com/back/domain/board/comment/service/CommentServiceTest.java index 90e0ac1f..168ef896 100644 --- a/src/test/java/com/back/domain/board/comment/service/CommentServiceTest.java +++ b/src/test/java/com/back/domain/board/comment/service/CommentServiceTest.java @@ -4,17 +4,16 @@ import com.back.domain.board.comment.dto.CommentRequest; import com.back.domain.board.comment.dto.CommentResponse; import com.back.domain.board.comment.dto.ReplyResponse; -import com.back.domain.board.comment.service.CommentService; import com.back.domain.board.common.dto.PageResponse; import com.back.domain.board.comment.entity.Comment; import com.back.domain.board.post.entity.Post; import com.back.domain.board.comment.repository.CommentRepository; import com.back.domain.board.post.repository.PostRepository; import com.back.domain.notification.service.NotificationService; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/back/domain/board/post/controller/PostBookmarkControllerTest.java b/src/test/java/com/back/domain/board/post/controller/PostBookmarkControllerTest.java index dfb0b96f..8e0de2b6 100644 --- a/src/test/java/com/back/domain/board/post/controller/PostBookmarkControllerTest.java +++ b/src/test/java/com/back/domain/board/post/controller/PostBookmarkControllerTest.java @@ -1,10 +1,10 @@ package com.back.domain.board.post.controller; import com.back.domain.board.post.entity.Post; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.domain.board.post.repository.PostRepository; import com.back.fixture.TestJwtTokenProvider; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/test/java/com/back/domain/board/post/controller/PostCategoryControllerTest.java b/src/test/java/com/back/domain/board/post/controller/PostCategoryControllerTest.java index 93f32c89..2b37a204 100644 --- a/src/test/java/com/back/domain/board/post/controller/PostCategoryControllerTest.java +++ b/src/test/java/com/back/domain/board/post/controller/PostCategoryControllerTest.java @@ -4,10 +4,10 @@ import com.back.domain.board.post.enums.CategoryType; import com.back.domain.board.post.entity.PostCategory; import com.back.domain.board.post.repository.PostCategoryRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.fixture.TestJwtTokenProvider; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/back/domain/board/post/controller/PostControllerTest.java b/src/test/java/com/back/domain/board/post/controller/PostControllerTest.java index 92bbac0d..920cb262 100644 --- a/src/test/java/com/back/domain/board/post/controller/PostControllerTest.java +++ b/src/test/java/com/back/domain/board/post/controller/PostControllerTest.java @@ -6,10 +6,10 @@ import com.back.domain.board.post.enums.CategoryType; import com.back.domain.board.post.repository.PostCategoryRepository; import com.back.domain.board.post.repository.PostRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.fixture.TestJwtTokenProvider; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/back/domain/board/post/controller/PostLikeControllerTest.java b/src/test/java/com/back/domain/board/post/controller/PostLikeControllerTest.java index cb106cd8..30604ad2 100644 --- a/src/test/java/com/back/domain/board/post/controller/PostLikeControllerTest.java +++ b/src/test/java/com/back/domain/board/post/controller/PostLikeControllerTest.java @@ -2,10 +2,10 @@ import com.back.domain.board.post.entity.Post; import com.back.domain.board.post.repository.PostRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.fixture.TestJwtTokenProvider; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/back/domain/board/post/repository/custom/PostRepositoryImplTest.java b/src/test/java/com/back/domain/board/post/repository/custom/PostRepositoryImplTest.java index 1d5ccdfe..f38bd1da 100644 --- a/src/test/java/com/back/domain/board/post/repository/custom/PostRepositoryImplTest.java +++ b/src/test/java/com/back/domain/board/post/repository/custom/PostRepositoryImplTest.java @@ -6,14 +6,11 @@ import com.back.domain.board.post.repository.PostBookmarkRepository; import com.back.domain.board.post.repository.PostRepository; import com.back.domain.board.post.repository.PostCategoryRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.config.QueryDslConfig; -import jakarta.persistence.EntityManager; -import jakarta.persistence.PersistenceContext; -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -25,7 +22,6 @@ import org.springframework.data.domain.Sort; import org.springframework.test.context.ActiveProfiles; -import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/back/domain/board/post/service/PostBookmarkServiceTest.java b/src/test/java/com/back/domain/board/post/service/PostBookmarkServiceTest.java index 023da49f..28859db4 100644 --- a/src/test/java/com/back/domain/board/post/service/PostBookmarkServiceTest.java +++ b/src/test/java/com/back/domain/board/post/service/PostBookmarkServiceTest.java @@ -5,10 +5,10 @@ import com.back.domain.board.post.entity.PostBookmark; import com.back.domain.board.post.repository.PostBookmarkRepository; import com.back.domain.board.post.repository.PostRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/back/domain/board/post/service/PostCategoryServiceTest.java b/src/test/java/com/back/domain/board/post/service/PostCategoryServiceTest.java index f62d47b4..83482be7 100644 --- a/src/test/java/com/back/domain/board/post/service/PostCategoryServiceTest.java +++ b/src/test/java/com/back/domain/board/post/service/PostCategoryServiceTest.java @@ -5,10 +5,10 @@ import com.back.domain.board.post.enums.CategoryType; import com.back.domain.board.post.entity.PostCategory; import com.back.domain.board.post.repository.PostCategoryRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/back/domain/board/post/service/PostLikeServiceTest.java b/src/test/java/com/back/domain/board/post/service/PostLikeServiceTest.java index 4b017322..6091dd2a 100644 --- a/src/test/java/com/back/domain/board/post/service/PostLikeServiceTest.java +++ b/src/test/java/com/back/domain/board/post/service/PostLikeServiceTest.java @@ -5,10 +5,10 @@ import com.back.domain.board.post.entity.PostLike; import com.back.domain.board.post.repository.PostLikeRepository; import com.back.domain.board.post.repository.PostRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/back/domain/board/post/service/PostServiceTest.java b/src/test/java/com/back/domain/board/post/service/PostServiceTest.java index a7fc63ab..e07a1289 100644 --- a/src/test/java/com/back/domain/board/post/service/PostServiceTest.java +++ b/src/test/java/com/back/domain/board/post/service/PostServiceTest.java @@ -10,10 +10,10 @@ import com.back.domain.board.post.enums.CategoryType; import com.back.domain.board.post.repository.PostCategoryRepository; import com.back.domain.board.post.repository.PostRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/back/domain/chat/room/controller/RoomChatWebSocketControllerTest.java b/src/test/java/com/back/domain/chat/room/controller/RoomChatWebSocketControllerTest.java index 9be644c2..b6c1c057 100644 --- a/src/test/java/com/back/domain/chat/room/controller/RoomChatWebSocketControllerTest.java +++ b/src/test/java/com/back/domain/chat/room/controller/RoomChatWebSocketControllerTest.java @@ -4,8 +4,8 @@ import com.back.domain.chat.room.dto.RoomChatMessageResponse; import com.back.domain.studyroom.entity.Room; import com.back.domain.studyroom.entity.RoomChatMessage; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import com.back.global.security.user.CustomUserDetails; diff --git a/src/test/java/com/back/domain/chat/room/service/RoomChatServiceTest.java b/src/test/java/com/back/domain/chat/room/service/RoomChatServiceTest.java index c4290784..1f4b5c5e 100644 --- a/src/test/java/com/back/domain/chat/room/service/RoomChatServiceTest.java +++ b/src/test/java/com/back/domain/chat/room/service/RoomChatServiceTest.java @@ -7,13 +7,12 @@ import com.back.domain.studyroom.entity.Room; import com.back.domain.studyroom.entity.RoomChatMessage; import com.back.domain.studyroom.entity.RoomMember; -import com.back.domain.studyroom.entity.RoomRole; import com.back.domain.studyroom.repository.RoomChatMessageRepository; import com.back.domain.studyroom.repository.RoomMemberRepository; import com.back.domain.studyroom.repository.RoomRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import org.junit.jupiter.api.BeforeEach; @@ -26,13 +25,8 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; -import org.springframework.test.context.ActiveProfiles; -import java.lang.reflect.Field; -import java.time.LocalDateTime; -import java.util.Arrays; import java.util.List; import java.util.Optional; diff --git a/src/test/java/com/back/domain/file/controller/FileControllerTest.java b/src/test/java/com/back/domain/file/controller/FileControllerTest.java index 93970213..bee6fbed 100644 --- a/src/test/java/com/back/domain/file/controller/FileControllerTest.java +++ b/src/test/java/com/back/domain/file/controller/FileControllerTest.java @@ -3,10 +3,10 @@ import com.back.domain.file.config.S3MockConfig; import com.back.domain.file.dto.FileUploadResponseDto; import com.back.domain.file.service.FileService; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.fixture.TestJwtTokenProvider; import io.findify.s3mock.S3Mock; import org.junit.jupiter.api.AfterEach; diff --git a/src/test/java/com/back/domain/file/service/FileServiceTest.java b/src/test/java/com/back/domain/file/service/FileServiceTest.java index 2d6124d8..d0821803 100644 --- a/src/test/java/com/back/domain/file/service/FileServiceTest.java +++ b/src/test/java/com/back/domain/file/service/FileServiceTest.java @@ -1,20 +1,15 @@ package com.back.domain.file.service; -import com.back.domain.board.post.entity.Post; -import com.back.domain.board.post.repository.PostRepository; import com.back.domain.file.config.S3MockConfig; import com.back.domain.file.dto.FileReadResponseDto; import com.back.domain.file.dto.FileUploadResponseDto; -import com.back.domain.file.entity.EntityType; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import io.findify.s3mock.S3Mock; -import jakarta.persistence.EntityManager; -import org.assertj.core.api.Assertions; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -25,12 +20,10 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.transaction.annotation.Transactional; -import java.io.FileNotFoundException; import java.time.LocalDate; import static org.assertj.core.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.when; @Import(S3MockConfig.class) @SpringBootTest diff --git a/src/test/java/com/back/domain/notification/controller/NotificationControllerTest.java b/src/test/java/com/back/domain/notification/controller/NotificationControllerTest.java index 6a8e60e3..530b3e56 100644 --- a/src/test/java/com/back/domain/notification/controller/NotificationControllerTest.java +++ b/src/test/java/com/back/domain/notification/controller/NotificationControllerTest.java @@ -3,9 +3,9 @@ import com.back.domain.notification.entity.Notification; import com.back.domain.notification.service.NotificationService; import com.back.domain.studyroom.repository.RoomRepository; -import com.back.domain.user.entity.Role; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.enums.Role; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import com.back.global.security.jwt.JwtTokenProvider; diff --git a/src/test/java/com/back/domain/notification/controller/NotificationSettingControllerTest.java b/src/test/java/com/back/domain/notification/controller/NotificationSettingControllerTest.java index 997920e6..a52a8890 100644 --- a/src/test/java/com/back/domain/notification/controller/NotificationSettingControllerTest.java +++ b/src/test/java/com/back/domain/notification/controller/NotificationSettingControllerTest.java @@ -3,7 +3,7 @@ import com.back.domain.notification.dto.NotificationSettingDto.*; import com.back.domain.notification.entity.NotificationSettingType; import com.back.domain.notification.service.NotificationSettingService; -import com.back.domain.user.entity.Role; +import com.back.domain.user.common.enums.Role; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import com.back.global.security.jwt.JwtTokenProvider; @@ -16,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.MediaType; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.authority.SimpleGrantedAuthority; @@ -26,7 +25,6 @@ import java.util.Collections; import java.util.List; -import java.util.Map; import static org.mockito.ArgumentMatchers.*; import static org.mockito.BDDMockito.*; diff --git a/src/test/java/com/back/domain/notification/repository/NotificationRepositoryTest.java b/src/test/java/com/back/domain/notification/repository/NotificationRepositoryTest.java index 0786b7ac..177af309 100644 --- a/src/test/java/com/back/domain/notification/repository/NotificationRepositoryTest.java +++ b/src/test/java/com/back/domain/notification/repository/NotificationRepositoryTest.java @@ -7,8 +7,8 @@ import com.back.domain.studyroom.entity.RoomMember; import com.back.domain.studyroom.repository.RoomMemberRepository; import com.back.domain.studyroom.repository.RoomRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.config.QueryDslTestConfig; import jakarta.persistence.EntityManager; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/back/domain/notification/repository/NotificationSettingRepositoryTest.java b/src/test/java/com/back/domain/notification/repository/NotificationSettingRepositoryTest.java index 0bb9376a..f6b33219 100644 --- a/src/test/java/com/back/domain/notification/repository/NotificationSettingRepositoryTest.java +++ b/src/test/java/com/back/domain/notification/repository/NotificationSettingRepositoryTest.java @@ -2,8 +2,8 @@ import com.back.domain.notification.entity.NotificationSetting; import com.back.domain.notification.entity.NotificationSettingType; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.config.QueryDslTestConfig; import jakarta.persistence.EntityManager; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/back/domain/notification/service/NotificationServiceTest.java b/src/test/java/com/back/domain/notification/service/NotificationServiceTest.java index 995fa4ba..59664e39 100644 --- a/src/test/java/com/back/domain/notification/service/NotificationServiceTest.java +++ b/src/test/java/com/back/domain/notification/service/NotificationServiceTest.java @@ -9,8 +9,8 @@ import com.back.domain.notification.repository.NotificationRepository; import com.back.domain.studyroom.entity.Room; import com.back.domain.studyroom.repository.RoomRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; diff --git a/src/test/java/com/back/domain/notification/service/NotificationSettingServiceTest.java b/src/test/java/com/back/domain/notification/service/NotificationSettingServiceTest.java index c0675087..9f4645b5 100644 --- a/src/test/java/com/back/domain/notification/service/NotificationSettingServiceTest.java +++ b/src/test/java/com/back/domain/notification/service/NotificationSettingServiceTest.java @@ -4,8 +4,8 @@ import com.back.domain.notification.entity.NotificationSetting; import com.back.domain.notification.entity.NotificationSettingType; import com.back.domain.notification.repository.NotificationSettingRepository; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/back/domain/notification/service/NotificationWebSocketServiceTest.java b/src/test/java/com/back/domain/notification/service/NotificationWebSocketServiceTest.java index 3cd167b9..ee0096ce 100644 --- a/src/test/java/com/back/domain/notification/service/NotificationWebSocketServiceTest.java +++ b/src/test/java/com/back/domain/notification/service/NotificationWebSocketServiceTest.java @@ -6,8 +6,7 @@ import com.back.domain.notification.dto.NotificationWebSocketDto; import com.back.domain.notification.entity.Notification; -import com.back.domain.notification.entity.NotificationType; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/com/back/domain/study/plan/controller/StudyPlanControllerTest.java b/src/test/java/com/back/domain/study/plan/controller/StudyPlanControllerTest.java index 358931cd..96b440bf 100644 --- a/src/test/java/com/back/domain/study/plan/controller/StudyPlanControllerTest.java +++ b/src/test/java/com/back/domain/study/plan/controller/StudyPlanControllerTest.java @@ -1,28 +1,20 @@ package com.back.domain.study.plan.controller; -import com.back.domain.study.plan.dto.StudyPlanRequest; import com.back.domain.study.plan.entity.*; import com.back.domain.study.plan.repository.StudyPlanExceptionRepository; import com.back.domain.study.plan.repository.StudyPlanRepository; -import com.back.domain.study.plan.service.StudyPlanService; -import com.back.domain.user.entity.User; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.security.jwt.JwtTokenProvider; import com.back.global.security.user.CustomUserDetails; -import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; -import org.mockito.Mock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.security.test.context.support.WithUserDetails; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; @@ -37,7 +29,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.hasSize; -import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.BDDMockito.given; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; diff --git a/src/test/java/com/back/domain/study/record/controller/StudyRecordControllerTest.java b/src/test/java/com/back/domain/study/record/controller/StudyRecordControllerTest.java index 82f5ecf4..04c248ee 100644 --- a/src/test/java/com/back/domain/study/record/controller/StudyRecordControllerTest.java +++ b/src/test/java/com/back/domain/study/record/controller/StudyRecordControllerTest.java @@ -7,10 +7,10 @@ import com.back.domain.study.plan.repository.StudyPlanRepository; import com.back.domain.studyroom.entity.Room; import com.back.domain.studyroom.repository.RoomRepository; -import com.back.domain.user.entity.Role; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.enums.Role; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.security.jwt.JwtTokenProvider; import com.back.global.security.user.CustomUserDetails; import org.junit.jupiter.api.BeforeEach; @@ -27,11 +27,9 @@ import org.springframework.test.web.servlet.ResultActions; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDate; import java.time.LocalDateTime; import static org.hamcrest.Matchers.hasSize; -import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.BDDMockito.given; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; diff --git a/src/test/java/com/back/domain/study/todo/controller/TodoControllerTest.java b/src/test/java/com/back/domain/study/todo/controller/TodoControllerTest.java index 04988d2a..9030f57e 100644 --- a/src/test/java/com/back/domain/study/todo/controller/TodoControllerTest.java +++ b/src/test/java/com/back/domain/study/todo/controller/TodoControllerTest.java @@ -2,10 +2,10 @@ import com.back.domain.study.todo.entity.Todo; import com.back.domain.study.todo.repository.TodoRepository; -import com.back.domain.user.entity.Role; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.enums.Role; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.security.jwt.JwtTokenProvider; import com.back.global.security.user.CustomUserDetails; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/back/domain/studyroom/controller/RoomControllerTest.java b/src/test/java/com/back/domain/studyroom/controller/RoomControllerTest.java index ae52d9c0..9a867b45 100644 --- a/src/test/java/com/back/domain/studyroom/controller/RoomControllerTest.java +++ b/src/test/java/com/back/domain/studyroom/controller/RoomControllerTest.java @@ -3,10 +3,10 @@ import com.back.domain.studyroom.dto.*; import com.back.domain.studyroom.entity.*; import com.back.domain.studyroom.service.RoomService; -import com.back.domain.user.entity.Role; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; +import com.back.domain.user.common.enums.Role; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; import com.back.global.common.dto.RsData; import com.back.global.security.user.CurrentUser; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/back/domain/studyroom/controller/RoomInviteControllerTest.java b/src/test/java/com/back/domain/studyroom/controller/RoomInviteControllerTest.java index e1296b07..0596aec0 100644 --- a/src/test/java/com/back/domain/studyroom/controller/RoomInviteControllerTest.java +++ b/src/test/java/com/back/domain/studyroom/controller/RoomInviteControllerTest.java @@ -4,10 +4,10 @@ import com.back.domain.studyroom.entity.Room; import com.back.domain.studyroom.entity.RoomInviteCode; import com.back.domain.studyroom.service.RoomInviteService; -import com.back.domain.user.entity.Role; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; +import com.back.domain.user.common.enums.Role; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; import com.back.global.common.dto.RsData; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; diff --git a/src/test/java/com/back/domain/studyroom/controller/RoomInvitePublicControllerTest.java b/src/test/java/com/back/domain/studyroom/controller/RoomInvitePublicControllerTest.java index e71c0cce..93f365b1 100644 --- a/src/test/java/com/back/domain/studyroom/controller/RoomInvitePublicControllerTest.java +++ b/src/test/java/com/back/domain/studyroom/controller/RoomInvitePublicControllerTest.java @@ -7,10 +7,10 @@ import com.back.domain.studyroom.entity.RoomRole; import com.back.domain.studyroom.service.RoomInviteService; import com.back.domain.studyroom.service.RoomService; -import com.back.domain.user.entity.Role; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; +import com.back.domain.user.common.enums.Role; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; import com.back.global.common.dto.RsData; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; diff --git a/src/test/java/com/back/domain/studyroom/integration/RoomCreateIntegrationTest.java b/src/test/java/com/back/domain/studyroom/integration/RoomCreateIntegrationTest.java index fd32427b..980ef9ce 100644 --- a/src/test/java/com/back/domain/studyroom/integration/RoomCreateIntegrationTest.java +++ b/src/test/java/com/back/domain/studyroom/integration/RoomCreateIntegrationTest.java @@ -1,15 +1,14 @@ package com.back.domain.studyroom.integration; -import com.back.domain.studyroom.dto.CreateRoomRequest; import com.back.domain.studyroom.entity.Room; import com.back.domain.studyroom.repository.RoomMemberRepository; import com.back.domain.studyroom.repository.RoomRepository; import com.back.domain.studyroom.service.RoomService; -import com.back.domain.user.entity.Role; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.enums.Role; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/back/domain/studyroom/repository/RoomChatMessageRepositoryTest.java b/src/test/java/com/back/domain/studyroom/repository/RoomChatMessageRepositoryTest.java index 8caff59c..3ad72a98 100644 --- a/src/test/java/com/back/domain/studyroom/repository/RoomChatMessageRepositoryTest.java +++ b/src/test/java/com/back/domain/studyroom/repository/RoomChatMessageRepositoryTest.java @@ -2,7 +2,7 @@ import com.back.domain.studyroom.entity.Room; import com.back.domain.studyroom.entity.RoomChatMessage; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.config.DataSourceProxyTestConfig; import com.back.global.config.QueryDslTestConfig; import com.back.global.util.QueryCounter; diff --git a/src/test/java/com/back/domain/studyroom/repository/RoomMemberAvatarRepositoryTest.java b/src/test/java/com/back/domain/studyroom/repository/RoomMemberAvatarRepositoryTest.java index eef04396..626e375d 100644 --- a/src/test/java/com/back/domain/studyroom/repository/RoomMemberAvatarRepositoryTest.java +++ b/src/test/java/com/back/domain/studyroom/repository/RoomMemberAvatarRepositoryTest.java @@ -1,10 +1,10 @@ package com.back.domain.studyroom.repository; import com.back.domain.studyroom.entity.*; -import com.back.domain.user.entity.Role; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; +import com.back.domain.user.common.enums.Role; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; import com.back.global.config.QueryDslTestConfig; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/back/domain/studyroom/service/RoomInviteServiceTest.java b/src/test/java/com/back/domain/studyroom/service/RoomInviteServiceTest.java index 2004b100..c9de42be 100644 --- a/src/test/java/com/back/domain/studyroom/service/RoomInviteServiceTest.java +++ b/src/test/java/com/back/domain/studyroom/service/RoomInviteServiceTest.java @@ -4,11 +4,11 @@ import com.back.domain.studyroom.entity.RoomInviteCode; import com.back.domain.studyroom.repository.RoomInviteCodeRepository; import com.back.domain.studyroom.repository.RoomRepository; -import com.back.domain.user.entity.Role; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.enums.Role; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/test/java/com/back/domain/studyroom/service/RoomServiceTest.java b/src/test/java/com/back/domain/studyroom/service/RoomServiceTest.java index b787db7e..1438d65a 100644 --- a/src/test/java/com/back/domain/studyroom/service/RoomServiceTest.java +++ b/src/test/java/com/back/domain/studyroom/service/RoomServiceTest.java @@ -5,11 +5,11 @@ import com.back.domain.studyroom.entity.*; import com.back.domain.studyroom.repository.RoomMemberRepository; import com.back.domain.studyroom.repository.RoomRepository; -import com.back.domain.user.entity.Role; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.common.enums.Role; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import com.back.global.websocket.service.RoomParticipantService; diff --git a/src/test/java/com/back/domain/user/controller/UserControllerTest.java b/src/test/java/com/back/domain/user/account/controller/AccountControllerTest.java similarity index 99% rename from src/test/java/com/back/domain/user/controller/UserControllerTest.java rename to src/test/java/com/back/domain/user/account/controller/AccountControllerTest.java index 0a727898..287e3c1a 100644 --- a/src/test/java/com/back/domain/user/controller/UserControllerTest.java +++ b/src/test/java/com/back/domain/user/account/controller/AccountControllerTest.java @@ -1,4 +1,4 @@ -package com.back.domain.user.controller; +package com.back.domain.user.account.controller; import com.back.domain.board.comment.entity.Comment; import com.back.domain.board.comment.repository.CommentRepository; @@ -6,12 +6,12 @@ import com.back.domain.board.post.entity.PostBookmark; import com.back.domain.board.post.repository.PostBookmarkRepository; import com.back.domain.board.post.repository.PostRepository; -import com.back.domain.user.dto.ChangePasswordRequest; -import com.back.domain.user.dto.UpdateUserProfileRequest; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.account.dto.ChangePasswordRequest; +import com.back.domain.user.account.dto.UpdateUserProfileRequest; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; import com.back.fixture.TestJwtTokenProvider; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.DisplayName; @@ -41,7 +41,7 @@ @AutoConfigureMockMvc @ActiveProfiles("test") @Transactional -class UserControllerTest { +class AccountControllerTest { @Autowired private MockMvc mvc; diff --git a/src/test/java/com/back/domain/user/service/UserServiceTest.java b/src/test/java/com/back/domain/user/account/service/AccountServiceTest.java similarity index 88% rename from src/test/java/com/back/domain/user/service/UserServiceTest.java rename to src/test/java/com/back/domain/user/account/service/AccountServiceTest.java index ab64a894..ee4b10f6 100644 --- a/src/test/java/com/back/domain/user/service/UserServiceTest.java +++ b/src/test/java/com/back/domain/user/account/service/AccountServiceTest.java @@ -1,4 +1,4 @@ -package com.back.domain.user.service; +package com.back.domain.user.account.service; import com.back.domain.board.comment.dto.MyCommentResponse; import com.back.domain.board.comment.entity.Comment; @@ -9,14 +9,14 @@ import com.back.domain.board.post.entity.PostBookmark; import com.back.domain.board.post.repository.PostBookmarkRepository; import com.back.domain.board.post.repository.PostRepository; -import com.back.domain.user.dto.ChangePasswordRequest; -import com.back.domain.user.dto.UpdateUserProfileRequest; -import com.back.domain.user.dto.UserDetailResponse; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserProfileRepository; -import com.back.domain.user.repository.UserRepository; +import com.back.domain.user.account.dto.ChangePasswordRequest; +import com.back.domain.user.account.dto.UpdateUserProfileRequest; +import com.back.domain.user.account.dto.UserDetailResponse; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; +import com.back.domain.user.account.service.AccountService; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import org.junit.jupiter.api.DisplayName; @@ -39,10 +39,10 @@ @SpringBootTest @Transactional @ActiveProfiles("test") -class UserServiceTest { +class AccountServiceTest { @Autowired - private UserService userService; + private AccountService accountService; @Autowired private UserRepository userRepository; @@ -71,7 +71,7 @@ void getUserInfo_success() { userRepository.save(user); // when: 서비스 호출 - UserDetailResponse response = userService.getUserInfo(user.getId()); + UserDetailResponse response = accountService.getUserInfo(user.getId()); // then: 응답 값 검증 assertThat(response.username()).isEqualTo("testuser"); @@ -82,7 +82,7 @@ void getUserInfo_success() { @DisplayName("유저 없음 → USER_NOT_FOUND 예외") void getUserInfo_userNotFound() { // when & then: 존재하지 않는 ID로 조회 - assertThatThrownBy(() -> userService.getUserInfo(999L)) + assertThatThrownBy(() -> accountService.getUserInfo(999L)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_NOT_FOUND.getMessage()); } @@ -97,7 +97,7 @@ void getUserInfo_deletedUser() { userRepository.save(user); // when & then - assertThatThrownBy(() -> userService.getUserInfo(user.getId())) + assertThatThrownBy(() -> accountService.getUserInfo(user.getId())) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_DELETED.getMessage()); } @@ -112,7 +112,7 @@ void getUserInfo_suspendedUser() { userRepository.save(user); // when & then - assertThatThrownBy(() -> userService.getUserInfo(user.getId())) + assertThatThrownBy(() -> accountService.getUserInfo(user.getId())) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_SUSPENDED.getMessage()); } @@ -133,7 +133,7 @@ void updateUserProfile_success() { ); // when: 서비스 호출 - UserDetailResponse response = userService.updateUserProfile(user.getId(), request); + UserDetailResponse response = accountService.updateUserProfile(user.getId(), request); // then: 응답 및 DB 값 검증 assertThat(response.profile().nickname()).isEqualTo("새닉네임"); @@ -160,7 +160,7 @@ void updateUserProfile_duplicateNickname() { UpdateUserProfileRequest request = new UpdateUserProfileRequest("닉1", null, null, null); // when & then - assertThatThrownBy(() -> userService.updateUserProfile(user2.getId(), request)) + assertThatThrownBy(() -> accountService.updateUserProfile(user2.getId(), request)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.NICKNAME_DUPLICATED.getMessage()); } @@ -177,7 +177,7 @@ void updateUserProfile_deletedUser() { UpdateUserProfileRequest request = new UpdateUserProfileRequest("새닉", null, null, null); // when & then - assertThatThrownBy(() -> userService.updateUserProfile(user.getId(), request)) + assertThatThrownBy(() -> accountService.updateUserProfile(user.getId(), request)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_DELETED.getMessage()); } @@ -194,7 +194,7 @@ void updateUserProfile_suspendedUser() { UpdateUserProfileRequest request = new UpdateUserProfileRequest("새닉", null, null, null); // when & then - assertThatThrownBy(() -> userService.updateUserProfile(user.getId(), request)) + assertThatThrownBy(() -> accountService.updateUserProfile(user.getId(), request)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_SUSPENDED.getMessage()); } @@ -213,7 +213,7 @@ void changePassword_success() { ChangePasswordRequest request = new ChangePasswordRequest("P@ssw0rd!", "NewP@ssw0rd!"); // when - userService.changePassword(user.getId(), request); + accountService.changePassword(user.getId(), request); // then: DB의 비밀번호가 변경되었는지 확인 User updated = userRepository.findById(user.getId()).orElseThrow(); @@ -232,7 +232,7 @@ void changePassword_invalidCurrentPassword() { ChangePasswordRequest request = new ChangePasswordRequest("Wrong1!", "NewP@ssw0rd!"); // when & then - assertThatThrownBy(() -> userService.changePassword(user.getId(), request)) + assertThatThrownBy(() -> accountService.changePassword(user.getId(), request)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.INVALID_CREDENTIALS.getMessage()); } @@ -250,7 +250,7 @@ void changePassword_invalidNewPassword() { ChangePasswordRequest request = new ChangePasswordRequest("Valid1!", "short"); // when & then - assertThatThrownBy(() -> userService.changePassword(user.getId(), request)) + assertThatThrownBy(() -> accountService.changePassword(user.getId(), request)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.INVALID_PASSWORD.getMessage()); } @@ -267,7 +267,7 @@ void changePassword_socialUser() { ChangePasswordRequest request = new ChangePasswordRequest("dummy", "NewP@ssw0rd!"); // when & then - assertThatThrownBy(() -> userService.changePassword(user.getId(), request)) + assertThatThrownBy(() -> accountService.changePassword(user.getId(), request)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.SOCIAL_PASSWORD_CHANGE_FORBIDDEN.getMessage()); } @@ -284,7 +284,7 @@ void changePassword_deletedUser() { ChangePasswordRequest request = new ChangePasswordRequest("Valid1!", "NewP@ssw0rd!"); // when & then - assertThatThrownBy(() -> userService.changePassword(user.getId(), request)) + assertThatThrownBy(() -> accountService.changePassword(user.getId(), request)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_DELETED.getMessage()); } @@ -301,7 +301,7 @@ void changePassword_suspendedUser() { ChangePasswordRequest request = new ChangePasswordRequest("Valid1!", "NewP@ssw0rd!"); // when & then - assertThatThrownBy(() -> userService.changePassword(user.getId(), request)) + assertThatThrownBy(() -> accountService.changePassword(user.getId(), request)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_SUSPENDED.getMessage()); } @@ -311,7 +311,7 @@ void changePassword_suspendedUser() { void changePassword_userNotFound() { // when & then ChangePasswordRequest request = new ChangePasswordRequest("dummy", "NewP@ssw0rd!"); - assertThatThrownBy(() -> userService.changePassword(999L, request)) + assertThatThrownBy(() -> accountService.changePassword(999L, request)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_NOT_FOUND.getMessage()); } @@ -328,7 +328,7 @@ void deleteUser_success() { userRepository.save(user); // when: 탈퇴 처리 - userService.deleteUser(user.getId()); + accountService.deleteUser(user.getId()); // then: 상태 및 개인정보 마스킹 검증 User deleted = userRepository.findById(user.getId()).orElseThrow(); @@ -355,7 +355,7 @@ void deleteUser_alreadyDeleted() { userRepository.save(user); // when & then - assertThatThrownBy(() -> userService.deleteUser(user.getId())) + assertThatThrownBy(() -> accountService.deleteUser(user.getId())) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_DELETED.getMessage()); } @@ -370,7 +370,7 @@ void deleteUser_suspendedUser() { userRepository.save(user); // when & then - assertThatThrownBy(() -> userService.deleteUser(user.getId())) + assertThatThrownBy(() -> accountService.deleteUser(user.getId())) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_SUSPENDED.getMessage()); } @@ -379,7 +379,7 @@ void deleteUser_suspendedUser() { @DisplayName("존재하지 않는 회원 탈퇴 시도 → USER_NOT_FOUND 예외") void deleteUser_notFound() { // when & then - assertThatThrownBy(() -> userService.deleteUser(999L)) + assertThatThrownBy(() -> accountService.deleteUser(999L)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_NOT_FOUND.getMessage()); } @@ -403,7 +403,7 @@ void getMyPosts_success() { Pageable pageable = PageRequest.of(0, 10, Sort.by(Sort.Direction.DESC, "createdAt")); // when - PageResponse response = userService.getMyPosts(user.getId(), pageable); + PageResponse response = accountService.getMyPosts(user.getId(), pageable); // then assertThat(response.items()).hasSize(2); @@ -418,7 +418,7 @@ void getMyPosts_userNotFound() { Pageable pageable = PageRequest.of(0, 10); // when & then - assertThatThrownBy(() -> userService.getMyPosts(999L, pageable)) + assertThatThrownBy(() -> accountService.getMyPosts(999L, pageable)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_NOT_FOUND.getMessage()); } @@ -435,7 +435,7 @@ void getMyPosts_deletedUser() { Pageable pageable = PageRequest.of(0, 10); // when & then - assertThatThrownBy(() -> userService.getMyPosts(user.getId(), pageable)) + assertThatThrownBy(() -> accountService.getMyPosts(user.getId(), pageable)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_DELETED.getMessage()); } @@ -452,7 +452,7 @@ void getMyPosts_suspendedUser() { Pageable pageable = PageRequest.of(0, 10); // when & then - assertThatThrownBy(() -> userService.getMyPosts(user.getId(), pageable)) + assertThatThrownBy(() -> accountService.getMyPosts(user.getId(), pageable)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_SUSPENDED.getMessage()); } @@ -480,7 +480,7 @@ void getMyComments_success() { Pageable pageable = PageRequest.of(0, 10, Sort.by(Sort.Direction.DESC, "createdAt")); // when - PageResponse response = userService.getMyComments(user.getId(), pageable); + PageResponse response = accountService.getMyComments(user.getId(), pageable); // then assertThat(response.items()).hasSize(2); @@ -495,7 +495,7 @@ void getMyComments_userNotFound() { Pageable pageable = PageRequest.of(0, 10); // when & then - assertThatThrownBy(() -> userService.getMyComments(999L, pageable)) + assertThatThrownBy(() -> accountService.getMyComments(999L, pageable)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_NOT_FOUND.getMessage()); } @@ -512,7 +512,7 @@ void getMyComments_deletedUser() { Pageable pageable = PageRequest.of(0, 10); // when & then - assertThatThrownBy(() -> userService.getMyComments(user.getId(), pageable)) + assertThatThrownBy(() -> accountService.getMyComments(user.getId(), pageable)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_DELETED.getMessage()); } @@ -529,7 +529,7 @@ void getMyComments_suspendedUser() { Pageable pageable = PageRequest.of(0, 10); // when & then - assertThatThrownBy(() -> userService.getMyComments(user.getId(), pageable)) + assertThatThrownBy(() -> accountService.getMyComments(user.getId(), pageable)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_SUSPENDED.getMessage()); } @@ -556,7 +556,7 @@ void getMyBookmarks_success() { Pageable pageable = PageRequest.of(0, 10, Sort.by(Sort.Direction.DESC, "createdAt")); // when - PageResponse response = userService.getMyBookmarks(user.getId(), pageable); + PageResponse response = accountService.getMyBookmarks(user.getId(), pageable); // then assertThat(response.items()).hasSize(2); @@ -568,7 +568,7 @@ void getMyBookmarks_success() { @DisplayName("존재하지 않는 사용자 → USER_NOT_FOUND 예외 발생") void getMyBookmarks_userNotFound() { Pageable pageable = PageRequest.of(0, 10); - assertThatThrownBy(() -> userService.getMyBookmarks(999L, pageable)) + assertThatThrownBy(() -> accountService.getMyBookmarks(999L, pageable)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_NOT_FOUND.getMessage()); } @@ -581,7 +581,7 @@ void getMyBookmarks_deletedUser() { userRepository.save(user); Pageable pageable = PageRequest.of(0, 10); - assertThatThrownBy(() -> userService.getMyBookmarks(user.getId(), pageable)) + assertThatThrownBy(() -> accountService.getMyBookmarks(user.getId(), pageable)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_DELETED.getMessage()); } @@ -594,7 +594,7 @@ void getMyBookmarks_suspendedUser() { userRepository.save(user); Pageable pageable = PageRequest.of(0, 10); - assertThatThrownBy(() -> userService.getMyBookmarks(user.getId(), pageable)) + assertThatThrownBy(() -> accountService.getMyBookmarks(user.getId(), pageable)) .isInstanceOf(CustomException.class) .hasMessage(ErrorCode.USER_SUSPENDED.getMessage()); } diff --git a/src/test/java/com/back/domain/user/controller/AuthControllerTest.java b/src/test/java/com/back/domain/user/auth/controller/AuthControllerTest.java similarity index 99% rename from src/test/java/com/back/domain/user/controller/AuthControllerTest.java rename to src/test/java/com/back/domain/user/auth/controller/AuthControllerTest.java index 01f661a0..d5b8a185 100644 --- a/src/test/java/com/back/domain/user/controller/AuthControllerTest.java +++ b/src/test/java/com/back/domain/user/auth/controller/AuthControllerTest.java @@ -1,11 +1,11 @@ -package com.back.domain.user.controller; - -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserRepository; -import com.back.domain.user.service.EmailService; -import com.back.domain.user.service.TokenService; +package com.back.domain.user.auth.controller; + +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserRepository; +import com.back.domain.user.auth.service.EmailService; +import com.back.domain.user.auth.service.TokenService; import com.back.fixture.TestJwtTokenProvider; import jakarta.servlet.http.Cookie; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/back/domain/user/service/AuthServiceTest.java b/src/test/java/com/back/domain/user/auth/service/AuthServiceTest.java similarity index 97% rename from src/test/java/com/back/domain/user/service/AuthServiceTest.java rename to src/test/java/com/back/domain/user/auth/service/AuthServiceTest.java index 6457c8c3..de12903d 100644 --- a/src/test/java/com/back/domain/user/service/AuthServiceTest.java +++ b/src/test/java/com/back/domain/user/auth/service/AuthServiceTest.java @@ -1,15 +1,15 @@ -package com.back.domain.user.service; - -import com.back.domain.user.dto.LoginRequest; -import com.back.domain.user.dto.LoginResponse; -import com.back.domain.user.dto.UserRegisterRequest; -import com.back.domain.user.dto.UserResponse; -import com.back.domain.user.entity.User; -import com.back.domain.user.entity.UserProfile; -import com.back.domain.user.entity.UserStatus; -import com.back.domain.user.repository.UserProfileRepository; -import com.back.domain.user.repository.UserRepository; -import com.back.domain.user.repository.UserTokenRepository; +package com.back.domain.user.auth.service; + +import com.back.domain.user.auth.dto.LoginRequest; +import com.back.domain.user.auth.dto.LoginResponse; +import com.back.domain.user.auth.dto.UserRegisterRequest; +import com.back.domain.user.auth.dto.UserResponse; +import com.back.domain.user.common.entity.User; +import com.back.domain.user.common.entity.UserProfile; +import com.back.domain.user.common.enums.UserStatus; +import com.back.domain.user.common.repository.UserProfileRepository; +import com.back.domain.user.common.repository.UserRepository; +import com.back.domain.user.common.repository.UserTokenRepository; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import jakarta.servlet.http.Cookie; diff --git a/src/test/java/com/back/domain/user/service/EmailServiceTest.java b/src/test/java/com/back/domain/user/auth/service/EmailServiceTest.java similarity index 91% rename from src/test/java/com/back/domain/user/service/EmailServiceTest.java rename to src/test/java/com/back/domain/user/auth/service/EmailServiceTest.java index 68e928cb..1afa0758 100644 --- a/src/test/java/com/back/domain/user/service/EmailServiceTest.java +++ b/src/test/java/com/back/domain/user/auth/service/EmailServiceTest.java @@ -1,4 +1,4 @@ -package com.back.domain.user.service; +package com.back.domain.user.auth.service; import jakarta.mail.internet.MimeMessage; import jakarta.mail.Session; @@ -9,9 +9,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.context.annotation.Profile; import org.springframework.mail.javamail.JavaMailSender; -import org.springframework.test.context.ActiveProfiles; import org.springframework.test.util.ReflectionTestUtils; import static org.mockito.Mockito.*; diff --git a/src/test/java/com/back/domain/user/service/TokenServiceTest.java b/src/test/java/com/back/domain/user/auth/service/TokenServiceTest.java similarity index 98% rename from src/test/java/com/back/domain/user/service/TokenServiceTest.java rename to src/test/java/com/back/domain/user/auth/service/TokenServiceTest.java index 1d813d9f..ff99691d 100644 --- a/src/test/java/com/back/domain/user/service/TokenServiceTest.java +++ b/src/test/java/com/back/domain/user/auth/service/TokenServiceTest.java @@ -1,4 +1,4 @@ -package com.back.domain.user.service; +package com.back.domain.user.auth.service; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/back/global/websocket/webrtc/service/WebRTCSignalValidatorTest.java b/src/test/java/com/back/global/websocket/webrtc/service/WebRTCSignalValidatorTest.java index f14b02e8..6be365c2 100644 --- a/src/test/java/com/back/global/websocket/webrtc/service/WebRTCSignalValidatorTest.java +++ b/src/test/java/com/back/global/websocket/webrtc/service/WebRTCSignalValidatorTest.java @@ -3,7 +3,7 @@ import com.back.domain.studyroom.entity.Room; import com.back.domain.studyroom.entity.RoomMember; import com.back.domain.studyroom.repository.RoomMemberRepository; -import com.back.domain.user.entity.User; +import com.back.domain.user.common.entity.User; import com.back.global.exception.CustomException; import com.back.global.exception.ErrorCode; import org.junit.jupiter.api.BeforeEach; From 4067582d8891a4c040875f6a6c38bdabfa63b47b Mon Sep 17 00:00:00 2001 From: joyewon0705 <77885098+joyewon0705@users.noreply.github.com> Date: Tue, 14 Oct 2025 16:49:28 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Ref:=20import=20=EB=AC=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comment/repository/custom/CommentRepositoryImpl.java | 5 ++--- .../board/post/repository/custom/PostRepositoryImpl.java | 4 ++-- .../studyroom/repository/RoomChatMessageRepositoryImpl.java | 2 +- .../studyroom/repository/RoomMemberRepositoryImpl.java | 2 +- .../back/domain/studyroom/repository/RoomRepositoryImpl.java | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/back/domain/board/comment/repository/custom/CommentRepositoryImpl.java b/src/main/java/com/back/domain/board/comment/repository/custom/CommentRepositoryImpl.java index b2adfc74..79d71c2c 100644 --- a/src/main/java/com/back/domain/board/comment/repository/custom/CommentRepositoryImpl.java +++ b/src/main/java/com/back/domain/board/comment/repository/custom/CommentRepositoryImpl.java @@ -8,9 +8,8 @@ import com.back.domain.board.comment.entity.QComment; import com.back.domain.board.common.dto.QAuthorResponse; import com.back.domain.board.post.entity.QPost; -import com.back.domain.user.entity.QUser; -import com.back.domain.user.entity.QUserProfile; -import com.querydsl.core.BooleanBuilder; +import com.back.domain.user.common.entity.QUser; +import com.back.domain.user.common.entity.QUserProfile; import com.querydsl.core.types.Order; import com.querydsl.core.types.OrderSpecifier; import com.querydsl.core.types.dsl.BooleanExpression; diff --git a/src/main/java/com/back/domain/board/post/repository/custom/PostRepositoryImpl.java b/src/main/java/com/back/domain/board/post/repository/custom/PostRepositoryImpl.java index 8e00626a..4ad68e7f 100644 --- a/src/main/java/com/back/domain/board/post/repository/custom/PostRepositoryImpl.java +++ b/src/main/java/com/back/domain/board/post/repository/custom/PostRepositoryImpl.java @@ -7,8 +7,8 @@ import com.back.domain.board.post.dto.QPostListResponse; import com.back.domain.board.post.entity.*; import com.back.domain.board.post.enums.CategoryType; -import com.back.domain.user.entity.QUser; -import com.back.domain.user.entity.QUserProfile; +import com.back.domain.user.common.entity.QUser; +import com.back.domain.user.common.entity.QUserProfile; import com.querydsl.core.BooleanBuilder; import com.querydsl.core.Tuple; import com.querydsl.core.types.Order; diff --git a/src/main/java/com/back/domain/studyroom/repository/RoomChatMessageRepositoryImpl.java b/src/main/java/com/back/domain/studyroom/repository/RoomChatMessageRepositoryImpl.java index 61e4e185..92674354 100644 --- a/src/main/java/com/back/domain/studyroom/repository/RoomChatMessageRepositoryImpl.java +++ b/src/main/java/com/back/domain/studyroom/repository/RoomChatMessageRepositoryImpl.java @@ -3,7 +3,7 @@ import com.back.domain.studyroom.entity.QRoom; import com.back.domain.studyroom.entity.QRoomChatMessage; import com.back.domain.studyroom.entity.RoomChatMessage; -import com.back.domain.user.entity.QUser; +import com.back.domain.user.common.entity.QUser; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/back/domain/studyroom/repository/RoomMemberRepositoryImpl.java b/src/main/java/com/back/domain/studyroom/repository/RoomMemberRepositoryImpl.java index 898b437c..f8fc364e 100644 --- a/src/main/java/com/back/domain/studyroom/repository/RoomMemberRepositoryImpl.java +++ b/src/main/java/com/back/domain/studyroom/repository/RoomMemberRepositoryImpl.java @@ -3,7 +3,7 @@ import com.back.domain.studyroom.entity.QRoomMember; import com.back.domain.studyroom.entity.RoomMember; import com.back.domain.studyroom.entity.RoomRole; -import com.back.domain.user.entity.QUser; +import com.back.domain.user.common.entity.QUser; import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/back/domain/studyroom/repository/RoomRepositoryImpl.java b/src/main/java/com/back/domain/studyroom/repository/RoomRepositoryImpl.java index 5a67ac3c..c56dd021 100644 --- a/src/main/java/com/back/domain/studyroom/repository/RoomRepositoryImpl.java +++ b/src/main/java/com/back/domain/studyroom/repository/RoomRepositoryImpl.java @@ -4,7 +4,7 @@ import com.back.domain.studyroom.entity.QRoomMember; import com.back.domain.studyroom.entity.Room; import com.back.domain.studyroom.entity.RoomStatus; -import com.back.domain.user.entity.QUser; +import com.back.domain.user.common.entity.QUser; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.jpa.impl.JPAQuery; import com.querydsl.jpa.impl.JPAQueryFactory;