Refactor: user 패키지 구조 개선 (#276)

src/main/java/com/back/domain/board/comment/entity/Comment.java

@@ -1,15 +1,14 @@
 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;
 import lombok.NoArgsConstructor;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 @Entity
 @Getter

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;
 

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;

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;

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;

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;
 
 /**

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;

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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,

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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

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;
 

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;

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 컨트롤러