diff --git a/src/main/java/com/manchui/domain/controller/JoinController.java b/src/main/java/com/manchui/domain/auth/controller/JoinController.java similarity index 84% rename from src/main/java/com/manchui/domain/controller/JoinController.java rename to src/main/java/com/manchui/domain/auth/controller/JoinController.java index 070a779..45db07f 100644 --- a/src/main/java/com/manchui/domain/controller/JoinController.java +++ b/src/main/java/com/manchui/domain/auth/controller/JoinController.java @@ -1,8 +1,8 @@ -package com.manchui.domain.controller; +package com.manchui.domain.auth.controller; -import com.manchui.domain.dto.JoinDTO; -import com.manchui.domain.dto.NameDTO; -import com.manchui.domain.service.JoinService; +import com.manchui.domain.auth.dto.JoinDTO; +import com.manchui.domain.auth.dto.NameDTO; +import com.manchui.domain.auth.service.JoinService; import com.manchui.global.response.SuccessResponse; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/src/main/java/com/manchui/domain/controller/Oauth2Controller.java b/src/main/java/com/manchui/domain/auth/controller/Oauth2Controller.java similarity index 92% rename from src/main/java/com/manchui/domain/controller/Oauth2Controller.java rename to src/main/java/com/manchui/domain/auth/controller/Oauth2Controller.java index 73f880d..5a01ee9 100644 --- a/src/main/java/com/manchui/domain/controller/Oauth2Controller.java +++ b/src/main/java/com/manchui/domain/auth/controller/Oauth2Controller.java @@ -1,6 +1,6 @@ -package com.manchui.domain.controller; +package com.manchui.domain.auth.controller; -import com.manchui.domain.service.Oauth2Service; +import com.manchui.domain.auth.service.Oauth2Service; import com.manchui.global.response.SuccessResponse; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/manchui/domain/controller/ReissueController.java b/src/main/java/com/manchui/domain/auth/controller/ReissueController.java similarity index 86% rename from src/main/java/com/manchui/domain/controller/ReissueController.java rename to src/main/java/com/manchui/domain/auth/controller/ReissueController.java index 21bc33a..219b19a 100644 --- a/src/main/java/com/manchui/domain/controller/ReissueController.java +++ b/src/main/java/com/manchui/domain/auth/controller/ReissueController.java @@ -1,6 +1,6 @@ -package com.manchui.domain.controller; +package com.manchui.domain.auth.controller; -import com.manchui.domain.service.ReissueService; +import com.manchui.domain.auth.service.ReissueService; import com.manchui.global.response.SuccessResponse; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/manchui/domain/dto/CustomUserDetails.java b/src/main/java/com/manchui/domain/auth/dto/CustomUserDetails.java similarity index 89% rename from src/main/java/com/manchui/domain/dto/CustomUserDetails.java rename to src/main/java/com/manchui/domain/auth/dto/CustomUserDetails.java index 0ab8ba5..3f3a70d 100644 --- a/src/main/java/com/manchui/domain/dto/CustomUserDetails.java +++ b/src/main/java/com/manchui/domain/auth/dto/CustomUserDetails.java @@ -1,6 +1,6 @@ -package com.manchui.domain.dto; +package com.manchui.domain.auth.dto; -import com.manchui.domain.entity.User; +import com.manchui.domain.user.entity.User; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/com/manchui/domain/dto/JoinDTO.java b/src/main/java/com/manchui/domain/auth/dto/JoinDTO.java similarity index 91% rename from src/main/java/com/manchui/domain/dto/JoinDTO.java rename to src/main/java/com/manchui/domain/auth/dto/JoinDTO.java index d2572f6..dc7c1d1 100644 --- a/src/main/java/com/manchui/domain/dto/JoinDTO.java +++ b/src/main/java/com/manchui/domain/auth/dto/JoinDTO.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto; +package com.manchui.domain.auth.dto; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.Size; diff --git a/src/main/java/com/manchui/domain/dto/LoginDTO.java b/src/main/java/com/manchui/domain/auth/dto/LoginDTO.java similarity index 80% rename from src/main/java/com/manchui/domain/dto/LoginDTO.java rename to src/main/java/com/manchui/domain/auth/dto/LoginDTO.java index e7928ea..1dfab36 100644 --- a/src/main/java/com/manchui/domain/dto/LoginDTO.java +++ b/src/main/java/com/manchui/domain/auth/dto/LoginDTO.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto; +package com.manchui.domain.auth.dto; import jakarta.validation.constraints.NotEmpty; import lombok.Getter; diff --git a/src/main/java/com/manchui/domain/dto/NameDTO.java b/src/main/java/com/manchui/domain/auth/dto/NameDTO.java similarity index 81% rename from src/main/java/com/manchui/domain/dto/NameDTO.java rename to src/main/java/com/manchui/domain/auth/dto/NameDTO.java index 7188dbc..a2b03f2 100644 --- a/src/main/java/com/manchui/domain/dto/NameDTO.java +++ b/src/main/java/com/manchui/domain/auth/dto/NameDTO.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto; +package com.manchui.domain.auth.dto; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/manchui/domain/service/CustomUserDetailsService.java b/src/main/java/com/manchui/domain/auth/service/CustomUserDetailsService.java similarity index 76% rename from src/main/java/com/manchui/domain/service/CustomUserDetailsService.java rename to src/main/java/com/manchui/domain/auth/service/CustomUserDetailsService.java index 2c88200..7cb396f 100644 --- a/src/main/java/com/manchui/domain/service/CustomUserDetailsService.java +++ b/src/main/java/com/manchui/domain/auth/service/CustomUserDetailsService.java @@ -1,8 +1,8 @@ -package com.manchui.domain.service; +package com.manchui.domain.auth.service; -import com.manchui.domain.dto.CustomUserDetails; -import com.manchui.domain.entity.User; -import com.manchui.domain.repository.UserRepository; +import com.manchui.domain.auth.dto.CustomUserDetails; +import com.manchui.domain.user.entity.User; +import com.manchui.domain.user.repository.UserRepository; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/src/main/java/com/manchui/domain/service/JoinService.java b/src/main/java/com/manchui/domain/auth/service/JoinService.java similarity index 87% rename from src/main/java/com/manchui/domain/service/JoinService.java rename to src/main/java/com/manchui/domain/auth/service/JoinService.java index 487855c..c01808d 100644 --- a/src/main/java/com/manchui/domain/service/JoinService.java +++ b/src/main/java/com/manchui/domain/auth/service/JoinService.java @@ -1,9 +1,9 @@ -package com.manchui.domain.service; +package com.manchui.domain.auth.service; -import com.manchui.domain.dto.JoinDTO; -import com.manchui.domain.dto.NameDTO; -import com.manchui.domain.entity.User; -import com.manchui.domain.repository.UserRepository; +import com.manchui.domain.auth.dto.JoinDTO; +import com.manchui.domain.auth.dto.NameDTO; +import com.manchui.domain.user.entity.User; +import com.manchui.domain.user.repository.UserRepository; import com.manchui.global.exception.CustomException; import com.manchui.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/manchui/domain/service/Oauth2Service.java b/src/main/java/com/manchui/domain/auth/service/Oauth2Service.java similarity index 97% rename from src/main/java/com/manchui/domain/service/Oauth2Service.java rename to src/main/java/com/manchui/domain/auth/service/Oauth2Service.java index 1715065..83839c2 100644 --- a/src/main/java/com/manchui/domain/service/Oauth2Service.java +++ b/src/main/java/com/manchui/domain/auth/service/Oauth2Service.java @@ -1,11 +1,12 @@ -package com.manchui.domain.service; +package com.manchui.domain.auth.service; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.manchui.domain.entity.Image; -import com.manchui.domain.entity.User; +import com.manchui.domain.service.ImageServiceImpl; +import com.manchui.domain.user.entity.User; import com.manchui.domain.repository.ImageRepository; -import com.manchui.domain.repository.UserRepository; +import com.manchui.domain.user.repository.UserRepository; import com.manchui.global.exception.CustomException; import com.manchui.global.exception.ErrorCode; import com.manchui.global.jwt.JWTUtil; diff --git a/src/main/java/com/manchui/domain/service/RedisRefreshTokenService.java b/src/main/java/com/manchui/domain/auth/service/RedisRefreshTokenService.java similarity index 94% rename from src/main/java/com/manchui/domain/service/RedisRefreshTokenService.java rename to src/main/java/com/manchui/domain/auth/service/RedisRefreshTokenService.java index bb6991f..022a03d 100644 --- a/src/main/java/com/manchui/domain/service/RedisRefreshTokenService.java +++ b/src/main/java/com/manchui/domain/auth/service/RedisRefreshTokenService.java @@ -1,4 +1,4 @@ -package com.manchui.domain.service; +package com.manchui.domain.auth.service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/manchui/domain/service/ReissueService.java b/src/main/java/com/manchui/domain/auth/service/ReissueService.java similarity index 96% rename from src/main/java/com/manchui/domain/service/ReissueService.java rename to src/main/java/com/manchui/domain/auth/service/ReissueService.java index 7497835..9e9afa4 100644 --- a/src/main/java/com/manchui/domain/service/ReissueService.java +++ b/src/main/java/com/manchui/domain/auth/service/ReissueService.java @@ -1,4 +1,4 @@ -package com.manchui.domain.service; +package com.manchui.domain.auth.service; import com.manchui.global.exception.CustomException; import com.manchui.global.exception.ErrorCode; diff --git a/src/main/java/com/manchui/domain/controller/ChatController.java b/src/main/java/com/manchui/domain/chat/controller/ChatController.java similarity index 93% rename from src/main/java/com/manchui/domain/controller/ChatController.java rename to src/main/java/com/manchui/domain/chat/controller/ChatController.java index 9488dcb..82e443f 100644 --- a/src/main/java/com/manchui/domain/controller/ChatController.java +++ b/src/main/java/com/manchui/domain/chat/controller/ChatController.java @@ -1,9 +1,9 @@ -package com.manchui.domain.controller; +package com.manchui.domain.chat.controller; -import com.manchui.domain.dto.CustomUserDetails; -import com.manchui.domain.dto.chat.*; -import com.manchui.domain.service.ChatMessageService; -import com.manchui.domain.service.ChatRoomService; +import com.manchui.domain.chat.dto.*; +import com.manchui.domain.auth.dto.CustomUserDetails; +import com.manchui.domain.chat.service.ChatMessageService; +import com.manchui.domain.chat.service.ChatRoomService; import com.manchui.global.response.SuccessResponse; import io.swagger.v3.oas.annotations.parameters.RequestBody; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/manchui/domain/dto/chat/ChatMessageRequest.java b/src/main/java/com/manchui/domain/chat/dto/ChatMessageRequest.java similarity index 78% rename from src/main/java/com/manchui/domain/dto/chat/ChatMessageRequest.java rename to src/main/java/com/manchui/domain/chat/dto/ChatMessageRequest.java index 699dcd2..72d9cd8 100644 --- a/src/main/java/com/manchui/domain/dto/chat/ChatMessageRequest.java +++ b/src/main/java/com/manchui/domain/chat/dto/ChatMessageRequest.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto.chat; +package com.manchui.domain.chat.dto; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/manchui/domain/dto/chat/ChatMessageResponse.java b/src/main/java/com/manchui/domain/chat/dto/ChatMessageResponse.java similarity index 82% rename from src/main/java/com/manchui/domain/dto/chat/ChatMessageResponse.java rename to src/main/java/com/manchui/domain/chat/dto/ChatMessageResponse.java index db1539e..b14a60b 100644 --- a/src/main/java/com/manchui/domain/dto/chat/ChatMessageResponse.java +++ b/src/main/java/com/manchui/domain/chat/dto/ChatMessageResponse.java @@ -1,6 +1,6 @@ -package com.manchui.domain.dto.chat; +package com.manchui.domain.chat.dto; -import com.manchui.domain.entity.mongodb.ChatMessageType; +import com.manchui.domain.chat.entity.mongodb.ChatMessageType; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/manchui/domain/dto/chat/ChatMessageSliceResponse.java b/src/main/java/com/manchui/domain/chat/dto/ChatMessageSliceResponse.java similarity index 84% rename from src/main/java/com/manchui/domain/dto/chat/ChatMessageSliceResponse.java rename to src/main/java/com/manchui/domain/chat/dto/ChatMessageSliceResponse.java index 2210405..05fadf2 100644 --- a/src/main/java/com/manchui/domain/dto/chat/ChatMessageSliceResponse.java +++ b/src/main/java/com/manchui/domain/chat/dto/ChatMessageSliceResponse.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto.chat; +package com.manchui.domain.chat.dto; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/manchui/domain/dto/chat/ChatRoomListDetail.java b/src/main/java/com/manchui/domain/chat/dto/ChatRoomListDetail.java similarity index 87% rename from src/main/java/com/manchui/domain/dto/chat/ChatRoomListDetail.java rename to src/main/java/com/manchui/domain/chat/dto/ChatRoomListDetail.java index 27bc5dc..38b29ef 100644 --- a/src/main/java/com/manchui/domain/dto/chat/ChatRoomListDetail.java +++ b/src/main/java/com/manchui/domain/chat/dto/ChatRoomListDetail.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto.chat; +package com.manchui.domain.chat.dto; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/manchui/domain/dto/chat/ChatRoomListResponse.java b/src/main/java/com/manchui/domain/chat/dto/ChatRoomListResponse.java similarity index 80% rename from src/main/java/com/manchui/domain/dto/chat/ChatRoomListResponse.java rename to src/main/java/com/manchui/domain/chat/dto/ChatRoomListResponse.java index 3ec1ad8..3c6fe51 100644 --- a/src/main/java/com/manchui/domain/dto/chat/ChatRoomListResponse.java +++ b/src/main/java/com/manchui/domain/chat/dto/ChatRoomListResponse.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto.chat; +package com.manchui.domain.chat.dto; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/manchui/domain/dto/chat/ChatRoomUserListResponse.java b/src/main/java/com/manchui/domain/chat/dto/ChatRoomUserListResponse.java similarity index 67% rename from src/main/java/com/manchui/domain/dto/chat/ChatRoomUserListResponse.java rename to src/main/java/com/manchui/domain/chat/dto/ChatRoomUserListResponse.java index c6b8bc2..ad08796 100644 --- a/src/main/java/com/manchui/domain/dto/chat/ChatRoomUserListResponse.java +++ b/src/main/java/com/manchui/domain/chat/dto/ChatRoomUserListResponse.java @@ -1,6 +1,6 @@ -package com.manchui.domain.dto.chat; +package com.manchui.domain.chat.dto; -import com.manchui.domain.dto.UserInfo; +import com.manchui.domain.user.dto.UserInfo; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/manchui/domain/entity/mongodb/ChatMessage.java b/src/main/java/com/manchui/domain/chat/entity/mongodb/ChatMessage.java similarity index 91% rename from src/main/java/com/manchui/domain/entity/mongodb/ChatMessage.java rename to src/main/java/com/manchui/domain/chat/entity/mongodb/ChatMessage.java index 9ecac68..a3d52c3 100644 --- a/src/main/java/com/manchui/domain/entity/mongodb/ChatMessage.java +++ b/src/main/java/com/manchui/domain/chat/entity/mongodb/ChatMessage.java @@ -1,4 +1,4 @@ -package com.manchui.domain.entity.mongodb; +package com.manchui.domain.chat.entity.mongodb; import jakarta.persistence.Id; import lombok.AccessLevel; diff --git a/src/main/java/com/manchui/domain/entity/mongodb/ChatMessageType.java b/src/main/java/com/manchui/domain/chat/entity/mongodb/ChatMessageType.java similarity index 55% rename from src/main/java/com/manchui/domain/entity/mongodb/ChatMessageType.java rename to src/main/java/com/manchui/domain/chat/entity/mongodb/ChatMessageType.java index b8681af..8b87e7a 100644 --- a/src/main/java/com/manchui/domain/entity/mongodb/ChatMessageType.java +++ b/src/main/java/com/manchui/domain/chat/entity/mongodb/ChatMessageType.java @@ -1,4 +1,4 @@ -package com.manchui.domain.entity.mongodb; +package com.manchui.domain.chat.entity.mongodb; public enum ChatMessageType { diff --git a/src/main/java/com/manchui/domain/entity/ChatRoom.java b/src/main/java/com/manchui/domain/chat/entity/mysql/ChatRoom.java similarity index 87% rename from src/main/java/com/manchui/domain/entity/ChatRoom.java rename to src/main/java/com/manchui/domain/chat/entity/mysql/ChatRoom.java index d66f166..59790e9 100644 --- a/src/main/java/com/manchui/domain/entity/ChatRoom.java +++ b/src/main/java/com/manchui/domain/chat/entity/mysql/ChatRoom.java @@ -1,4 +1,4 @@ -package com.manchui.domain.entity; +package com.manchui.domain.chat.entity.mysql; import com.manchui.global.entity.Timestamped; import jakarta.persistence.*; diff --git a/src/main/java/com/manchui/domain/entity/ChatRoomUser.java b/src/main/java/com/manchui/domain/chat/entity/mysql/ChatRoomUser.java similarity index 85% rename from src/main/java/com/manchui/domain/entity/ChatRoomUser.java rename to src/main/java/com/manchui/domain/chat/entity/mysql/ChatRoomUser.java index e463881..f4ec1ed 100644 --- a/src/main/java/com/manchui/domain/entity/ChatRoomUser.java +++ b/src/main/java/com/manchui/domain/chat/entity/mysql/ChatRoomUser.java @@ -1,5 +1,6 @@ -package com.manchui.domain.entity; +package com.manchui.domain.chat.entity.mysql; +import com.manchui.domain.user.entity.User; import com.manchui.global.entity.Timestamped; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/src/main/java/com/manchui/domain/repository/ChatRoomRepository.java b/src/main/java/com/manchui/domain/chat/repository/ChatRoomRepository.java similarity index 63% rename from src/main/java/com/manchui/domain/repository/ChatRoomRepository.java rename to src/main/java/com/manchui/domain/chat/repository/ChatRoomRepository.java index f646af0..6df7666 100644 --- a/src/main/java/com/manchui/domain/repository/ChatRoomRepository.java +++ b/src/main/java/com/manchui/domain/chat/repository/ChatRoomRepository.java @@ -1,6 +1,6 @@ -package com.manchui.domain.repository; +package com.manchui.domain.chat.repository; -import com.manchui.domain.entity.ChatRoom; +import com.manchui.domain.chat.entity.mysql.ChatRoom; import org.springframework.data.jpa.repository.JpaRepository; public interface ChatRoomRepository extends JpaRepository { diff --git a/src/main/java/com/manchui/domain/repository/ChatRoomUserRepository.java b/src/main/java/com/manchui/domain/chat/repository/ChatRoomUserRepository.java similarity index 71% rename from src/main/java/com/manchui/domain/repository/ChatRoomUserRepository.java rename to src/main/java/com/manchui/domain/chat/repository/ChatRoomUserRepository.java index c6b7efb..c8749e1 100644 --- a/src/main/java/com/manchui/domain/repository/ChatRoomUserRepository.java +++ b/src/main/java/com/manchui/domain/chat/repository/ChatRoomUserRepository.java @@ -1,9 +1,9 @@ -package com.manchui.domain.repository; +package com.manchui.domain.chat.repository; -import com.manchui.domain.entity.ChatRoom; -import com.manchui.domain.entity.ChatRoomUser; -import com.manchui.domain.entity.User; +import com.manchui.domain.chat.entity.mysql.ChatRoom; +import com.manchui.domain.chat.entity.mysql.ChatRoomUser; +import com.manchui.domain.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/manchui/domain/repository/mongodb/ChatMessageRepository.java b/src/main/java/com/manchui/domain/chat/repository/mongodb/ChatMessageRepository.java similarity index 86% rename from src/main/java/com/manchui/domain/repository/mongodb/ChatMessageRepository.java rename to src/main/java/com/manchui/domain/chat/repository/mongodb/ChatMessageRepository.java index d7d6251..e59dfd6 100644 --- a/src/main/java/com/manchui/domain/repository/mongodb/ChatMessageRepository.java +++ b/src/main/java/com/manchui/domain/chat/repository/mongodb/ChatMessageRepository.java @@ -1,6 +1,6 @@ -package com.manchui.domain.repository.mongodb; +package com.manchui.domain.chat.repository.mongodb; -import com.manchui.domain.entity.mongodb.ChatMessage; +import com.manchui.domain.chat.entity.mongodb.ChatMessage; import org.bson.types.ObjectId; import org.springframework.data.mongodb.repository.Query; import org.springframework.data.mongodb.repository.ReactiveMongoRepository; diff --git a/src/main/java/com/manchui/domain/service/ChatMessageService.java b/src/main/java/com/manchui/domain/chat/service/ChatMessageService.java similarity index 89% rename from src/main/java/com/manchui/domain/service/ChatMessageService.java rename to src/main/java/com/manchui/domain/chat/service/ChatMessageService.java index a213243..ee66986 100644 --- a/src/main/java/com/manchui/domain/service/ChatMessageService.java +++ b/src/main/java/com/manchui/domain/chat/service/ChatMessageService.java @@ -1,18 +1,18 @@ -package com.manchui.domain.service; - -import com.manchui.domain.dto.CustomUserDetails; -import com.manchui.domain.dto.chat.ChatMessageRequest; -import com.manchui.domain.dto.chat.ChatMessageResponse; -import com.manchui.domain.dto.chat.ChatMessageSliceResponse; -import com.manchui.domain.entity.mongodb.ChatMessageType; -import com.manchui.domain.entity.ChatRoom; -import com.manchui.domain.entity.ChatRoomUser; -import com.manchui.domain.entity.User; -import com.manchui.domain.entity.mongodb.ChatMessage; -import com.manchui.domain.repository.ChatRoomRepository; -import com.manchui.domain.repository.ChatRoomUserRepository; -import com.manchui.domain.repository.UserRepository; -import com.manchui.domain.repository.mongodb.ChatMessageRepository; +package com.manchui.domain.chat.service; + +import com.manchui.domain.auth.dto.CustomUserDetails; +import com.manchui.domain.chat.dto.ChatMessageRequest; +import com.manchui.domain.chat.dto.ChatMessageResponse; +import com.manchui.domain.chat.dto.ChatMessageSliceResponse; +import com.manchui.domain.chat.entity.mongodb.ChatMessageType; +import com.manchui.domain.chat.entity.mysql.ChatRoom; +import com.manchui.domain.chat.entity.mysql.ChatRoomUser; +import com.manchui.domain.user.entity.User; +import com.manchui.domain.chat.entity.mongodb.ChatMessage; +import com.manchui.domain.chat.repository.ChatRoomRepository; +import com.manchui.domain.chat.repository.ChatRoomUserRepository; +import com.manchui.domain.user.repository.UserRepository; +import com.manchui.domain.chat.repository.mongodb.ChatMessageRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.bson.types.ObjectId; diff --git a/src/main/java/com/manchui/domain/service/ChatRoomService.java b/src/main/java/com/manchui/domain/chat/service/ChatRoomService.java similarity index 80% rename from src/main/java/com/manchui/domain/service/ChatRoomService.java rename to src/main/java/com/manchui/domain/chat/service/ChatRoomService.java index 1fe0c96..609fbfc 100644 --- a/src/main/java/com/manchui/domain/service/ChatRoomService.java +++ b/src/main/java/com/manchui/domain/chat/service/ChatRoomService.java @@ -1,14 +1,20 @@ -package com.manchui.domain.service; - -import com.manchui.domain.dto.CustomUserDetails; -import com.manchui.domain.dto.UserInfo; -import com.manchui.domain.dto.chat.ChatRoomListDetail; -import com.manchui.domain.dto.chat.ChatRoomListResponse; -import com.manchui.domain.dto.chat.ChatRoomUserListResponse; +package com.manchui.domain.chat.service; + +import com.manchui.domain.chat.entity.mysql.ChatRoom; +import com.manchui.domain.chat.entity.mysql.ChatRoomUser; +import com.manchui.domain.chat.repository.ChatRoomRepository; +import com.manchui.domain.chat.repository.ChatRoomUserRepository; +import com.manchui.domain.auth.dto.CustomUserDetails; +import com.manchui.domain.user.dto.UserInfo; +import com.manchui.domain.chat.dto.ChatRoomListDetail; +import com.manchui.domain.chat.dto.ChatRoomListResponse; +import com.manchui.domain.chat.dto.ChatRoomUserListResponse; import com.manchui.domain.entity.*; -import com.manchui.domain.entity.mongodb.ChatMessage; +import com.manchui.domain.chat.entity.mongodb.ChatMessage; import com.manchui.domain.repository.*; -import com.manchui.domain.repository.mongodb.ChatMessageRepository; +import com.manchui.domain.chat.repository.mongodb.ChatMessageRepository; +import com.manchui.domain.user.entity.User; +import com.manchui.domain.user.repository.UserRepository; import com.manchui.global.exception.CustomException; import com.manchui.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/manchui/domain/controller/GatheringController.java b/src/main/java/com/manchui/domain/controller/GatheringController.java index d7e8a1c..7841058 100644 --- a/src/main/java/com/manchui/domain/controller/GatheringController.java +++ b/src/main/java/com/manchui/domain/controller/GatheringController.java @@ -1,6 +1,6 @@ package com.manchui.domain.controller; -import com.manchui.domain.dto.CustomUserDetails; +import com.manchui.domain.auth.dto.CustomUserDetails; import com.manchui.domain.dto.gathering.*; import com.manchui.domain.service.GatheringService; import com.manchui.global.response.SuccessResponse; diff --git a/src/main/java/com/manchui/domain/controller/ReviewController.java b/src/main/java/com/manchui/domain/controller/ReviewController.java index df84b30..4a72cf4 100644 --- a/src/main/java/com/manchui/domain/controller/ReviewController.java +++ b/src/main/java/com/manchui/domain/controller/ReviewController.java @@ -1,6 +1,6 @@ package com.manchui.domain.controller; -import com.manchui.domain.dto.CustomUserDetails; +import com.manchui.domain.auth.dto.CustomUserDetails; import com.manchui.domain.dto.review.ReviewCreateRequest; import com.manchui.domain.dto.review.ReviewCreateResponse; import com.manchui.domain.dto.review.ReviewDetailPagingResponse; diff --git a/src/main/java/com/manchui/domain/dto/gathering/GatheringCreateRequest.java b/src/main/java/com/manchui/domain/dto/gathering/GatheringCreateRequest.java index 2a4f459..4daf851 100644 --- a/src/main/java/com/manchui/domain/dto/gathering/GatheringCreateRequest.java +++ b/src/main/java/com/manchui/domain/dto/gathering/GatheringCreateRequest.java @@ -1,8 +1,8 @@ package com.manchui.domain.dto.gathering; -import com.manchui.domain.entity.ChatRoom; +import com.manchui.domain.chat.entity.mysql.ChatRoom; import com.manchui.domain.entity.Gathering; -import com.manchui.domain.entity.User; +import com.manchui.domain.user.entity.User; import jakarta.validation.constraints.*; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/manchui/domain/dto/gathering/GatheringCreateResponse.java b/src/main/java/com/manchui/domain/dto/gathering/GatheringCreateResponse.java index 485415d..6a7e9f3 100644 --- a/src/main/java/com/manchui/domain/dto/gathering/GatheringCreateResponse.java +++ b/src/main/java/com/manchui/domain/dto/gathering/GatheringCreateResponse.java @@ -1,6 +1,5 @@ package com.manchui.domain.dto.gathering; -import com.manchui.domain.entity.ChatRoom; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/manchui/domain/dto/gathering/GatheringInfoResponse.java b/src/main/java/com/manchui/domain/dto/gathering/GatheringInfoResponse.java index 5648b43..fe8e766 100644 --- a/src/main/java/com/manchui/domain/dto/gathering/GatheringInfoResponse.java +++ b/src/main/java/com/manchui/domain/dto/gathering/GatheringInfoResponse.java @@ -1,6 +1,6 @@ package com.manchui.domain.dto.gathering; -import com.manchui.domain.dto.UserInfo; +import com.manchui.domain.user.dto.UserInfo; import com.manchui.domain.dto.review.ReviewDetailPagingResponse; import com.manchui.domain.entity.Gathering; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/manchui/domain/entity/Attendance.java b/src/main/java/com/manchui/domain/entity/Attendance.java index dc554a4..db71192 100644 --- a/src/main/java/com/manchui/domain/entity/Attendance.java +++ b/src/main/java/com/manchui/domain/entity/Attendance.java @@ -1,5 +1,6 @@ package com.manchui.domain.entity; +import com.manchui.domain.user.entity.User; import com.manchui.global.entity.Timestamped; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/manchui/domain/entity/Gathering.java b/src/main/java/com/manchui/domain/entity/Gathering.java index 4429340..51f027d 100644 --- a/src/main/java/com/manchui/domain/entity/Gathering.java +++ b/src/main/java/com/manchui/domain/entity/Gathering.java @@ -1,7 +1,9 @@ package com.manchui.domain.entity; +import com.manchui.domain.chat.entity.mysql.ChatRoom; import com.manchui.domain.dto.gathering.ClosedGatheringInfoResponse; import com.manchui.domain.dto.gathering.GatheringCreateResponse; +import com.manchui.domain.user.entity.User; import com.manchui.global.entity.Timestamped; import jakarta.persistence.*; import jakarta.validation.constraints.Max; diff --git a/src/main/java/com/manchui/domain/entity/Heart.java b/src/main/java/com/manchui/domain/entity/Heart.java index da1d61a..3085b7c 100644 --- a/src/main/java/com/manchui/domain/entity/Heart.java +++ b/src/main/java/com/manchui/domain/entity/Heart.java @@ -1,5 +1,6 @@ package com.manchui.domain.entity; +import com.manchui.domain.user.entity.User; import com.manchui.global.entity.Timestamped; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/manchui/domain/entity/Review.java b/src/main/java/com/manchui/domain/entity/Review.java index 2afdd2d..6c384ae 100644 --- a/src/main/java/com/manchui/domain/entity/Review.java +++ b/src/main/java/com/manchui/domain/entity/Review.java @@ -2,6 +2,7 @@ import com.manchui.domain.dto.review.ReviewCreateRequest; import com.manchui.domain.dto.review.ReviewCreateResponse; +import com.manchui.domain.user.entity.User; import com.manchui.global.entity.Timestamped; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/manchui/domain/notification/controller/NotificationController.java b/src/main/java/com/manchui/domain/notification/controller/NotificationController.java index b835aac..a0ecc1b 100644 --- a/src/main/java/com/manchui/domain/notification/controller/NotificationController.java +++ b/src/main/java/com/manchui/domain/notification/controller/NotificationController.java @@ -1,6 +1,6 @@ package com.manchui.domain.notification.controller; -import com.manchui.domain.dto.CustomUserDetails; +import com.manchui.domain.auth.dto.CustomUserDetails; import com.manchui.domain.notification.dto.NotificationCursorPagingResponse; import com.manchui.domain.notification.service.NotificationService; import com.manchui.global.response.SuccessResponse; diff --git a/src/main/java/com/manchui/domain/notification/entity/Notification.java b/src/main/java/com/manchui/domain/notification/entity/Notification.java index 90dd8b7..cb223ec 100644 --- a/src/main/java/com/manchui/domain/notification/entity/Notification.java +++ b/src/main/java/com/manchui/domain/notification/entity/Notification.java @@ -1,6 +1,6 @@ package com.manchui.domain.notification.entity; -import com.manchui.domain.entity.User; +import com.manchui.domain.user.entity.User; import com.manchui.domain.notification.dto.NotificationResponse; import com.manchui.global.entity.Timestamped; import jakarta.persistence.*; diff --git a/src/main/java/com/manchui/domain/notification/repository/NotificationRepository.java b/src/main/java/com/manchui/domain/notification/repository/NotificationRepository.java index a0812e3..dcaf6d8 100644 --- a/src/main/java/com/manchui/domain/notification/repository/NotificationRepository.java +++ b/src/main/java/com/manchui/domain/notification/repository/NotificationRepository.java @@ -1,6 +1,6 @@ package com.manchui.domain.notification.repository; -import com.manchui.domain.entity.User; +import com.manchui.domain.user.entity.User; import com.manchui.domain.notification.entity.Notification; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/manchui/domain/notification/service/NotificationService.java b/src/main/java/com/manchui/domain/notification/service/NotificationService.java index b2a91c2..b214954 100644 --- a/src/main/java/com/manchui/domain/notification/service/NotificationService.java +++ b/src/main/java/com/manchui/domain/notification/service/NotificationService.java @@ -1,6 +1,6 @@ package com.manchui.domain.notification.service; -import com.manchui.domain.entity.User; +import com.manchui.domain.user.entity.User; import com.manchui.domain.notification.dto.NotificationCursorPagingResponse; import com.manchui.domain.notification.entity.NotificationType; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/manchui/domain/notification/service/NotificationServiceImpl.java b/src/main/java/com/manchui/domain/notification/service/NotificationServiceImpl.java index 5381680..4570b40 100644 --- a/src/main/java/com/manchui/domain/notification/service/NotificationServiceImpl.java +++ b/src/main/java/com/manchui/domain/notification/service/NotificationServiceImpl.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.manchui.domain.entity.User; +import com.manchui.domain.user.entity.User; import com.manchui.domain.notification.dto.NotificationCursorPagingResponse; import com.manchui.domain.notification.dto.NotificationResponse; import com.manchui.domain.notification.entity.Notification; @@ -11,7 +11,7 @@ import com.manchui.domain.notification.entity.NotificationType; import com.manchui.domain.notification.repository.EmitterRepository; import com.manchui.domain.notification.repository.NotificationRepository; -import com.manchui.domain.service.UserService; +import com.manchui.domain.user.service.UserService; import com.manchui.global.exception.CustomException; import com.manchui.global.exception.ErrorCode; import com.manchui.global.response.SuccessResponse; diff --git a/src/main/java/com/manchui/domain/repository/AttendanceRepository.java b/src/main/java/com/manchui/domain/repository/AttendanceRepository.java index 2594236..926a3b9 100644 --- a/src/main/java/com/manchui/domain/repository/AttendanceRepository.java +++ b/src/main/java/com/manchui/domain/repository/AttendanceRepository.java @@ -2,7 +2,7 @@ import com.manchui.domain.entity.Attendance; import com.manchui.domain.entity.Gathering; -import com.manchui.domain.entity.User; +import com.manchui.domain.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/manchui/domain/repository/GatheringRepository.java b/src/main/java/com/manchui/domain/repository/GatheringRepository.java index b65a383..a4c0a81 100644 --- a/src/main/java/com/manchui/domain/repository/GatheringRepository.java +++ b/src/main/java/com/manchui/domain/repository/GatheringRepository.java @@ -1,8 +1,8 @@ package com.manchui.domain.repository; -import com.manchui.domain.entity.ChatRoom; +import com.manchui.domain.chat.entity.mysql.ChatRoom; import com.manchui.domain.entity.Gathering; -import com.manchui.domain.entity.User; +import com.manchui.domain.user.entity.User; import com.manchui.domain.repository.querydsl.GatheringCursorQueryDsl; import com.manchui.domain.repository.querydsl.GatheringQueryDsl; import org.springframework.data.domain.Page; diff --git a/src/main/java/com/manchui/domain/repository/HeartRepository.java b/src/main/java/com/manchui/domain/repository/HeartRepository.java index 61549d2..1d3187c 100644 --- a/src/main/java/com/manchui/domain/repository/HeartRepository.java +++ b/src/main/java/com/manchui/domain/repository/HeartRepository.java @@ -2,7 +2,7 @@ import com.manchui.domain.entity.Gathering; import com.manchui.domain.entity.Heart; -import com.manchui.domain.entity.User; +import com.manchui.domain.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/manchui/domain/repository/ReviewRepository.java b/src/main/java/com/manchui/domain/repository/ReviewRepository.java index 699ecbc..3d5e9d7 100644 --- a/src/main/java/com/manchui/domain/repository/ReviewRepository.java +++ b/src/main/java/com/manchui/domain/repository/ReviewRepository.java @@ -2,7 +2,7 @@ import com.manchui.domain.entity.Gathering; import com.manchui.domain.entity.Review; -import com.manchui.domain.entity.User; +import com.manchui.domain.user.entity.User; import com.manchui.domain.repository.querydsl.ReviewQueryDsl; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/manchui/domain/repository/querydsl/GatheringCursorQueryDslImpl.java b/src/main/java/com/manchui/domain/repository/querydsl/GatheringCursorQueryDslImpl.java index d681b16..31b97d4 100644 --- a/src/main/java/com/manchui/domain/repository/querydsl/GatheringCursorQueryDslImpl.java +++ b/src/main/java/com/manchui/domain/repository/querydsl/GatheringCursorQueryDslImpl.java @@ -21,7 +21,7 @@ import static com.manchui.domain.entity.QGathering.gathering; import static com.manchui.domain.entity.QHeart.heart; import static com.manchui.domain.entity.QImage.image; -import static com.manchui.domain.entity.QUser.user; +import static com.manchui.domain.user.entity.QUser.user; import static com.querydsl.jpa.JPAExpressions.select; @Slf4j diff --git a/src/main/java/com/manchui/domain/repository/querydsl/GatheringQueryDslImpl.java b/src/main/java/com/manchui/domain/repository/querydsl/GatheringQueryDslImpl.java index 467fa38..148c51e 100644 --- a/src/main/java/com/manchui/domain/repository/querydsl/GatheringQueryDslImpl.java +++ b/src/main/java/com/manchui/domain/repository/querydsl/GatheringQueryDslImpl.java @@ -21,7 +21,7 @@ import static com.manchui.domain.entity.QGathering.gathering; import static com.manchui.domain.entity.QHeart.heart; import static com.manchui.domain.entity.QImage.image; -import static com.manchui.domain.entity.QUser.user; +import static com.manchui.domain.user.entity.QUser.user; import static com.querydsl.jpa.JPAExpressions.select; @Slf4j diff --git a/src/main/java/com/manchui/domain/repository/querydsl/ReviewQueryDslImpl.java b/src/main/java/com/manchui/domain/repository/querydsl/ReviewQueryDslImpl.java index 62a2bb9..68d7795 100644 --- a/src/main/java/com/manchui/domain/repository/querydsl/ReviewQueryDslImpl.java +++ b/src/main/java/com/manchui/domain/repository/querydsl/ReviewQueryDslImpl.java @@ -21,7 +21,7 @@ import static com.manchui.domain.entity.QGathering.gathering; import static com.manchui.domain.entity.QImage.image; import static com.manchui.domain.entity.QReview.review; -import static com.manchui.domain.entity.QUser.user; +import static com.manchui.domain.user.entity.QUser.user; import static com.querydsl.jpa.JPAExpressions.select; @Slf4j diff --git a/src/main/java/com/manchui/domain/service/GatheringReader.java b/src/main/java/com/manchui/domain/service/GatheringReader.java index 599c96b..b261e0f 100644 --- a/src/main/java/com/manchui/domain/service/GatheringReader.java +++ b/src/main/java/com/manchui/domain/service/GatheringReader.java @@ -1,8 +1,8 @@ package com.manchui.domain.service; -import com.manchui.domain.dto.UserInfo; +import com.manchui.domain.user.dto.UserInfo; import com.manchui.domain.entity.Gathering; -import com.manchui.domain.entity.User; +import com.manchui.domain.user.entity.User; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/manchui/domain/service/GatheringReaderImpl.java b/src/main/java/com/manchui/domain/service/GatheringReaderImpl.java index a85e045..ea2bb0f 100644 --- a/src/main/java/com/manchui/domain/service/GatheringReaderImpl.java +++ b/src/main/java/com/manchui/domain/service/GatheringReaderImpl.java @@ -1,9 +1,9 @@ package com.manchui.domain.service; -import com.manchui.domain.dto.UserInfo; +import com.manchui.domain.user.dto.UserInfo; import com.manchui.domain.entity.Attendance; import com.manchui.domain.entity.Gathering; -import com.manchui.domain.entity.User; +import com.manchui.domain.user.entity.User; import com.manchui.domain.repository.AttendanceRepository; import com.manchui.domain.repository.GatheringRepository; import com.manchui.global.exception.CustomException; diff --git a/src/main/java/com/manchui/domain/service/GatheringService.java b/src/main/java/com/manchui/domain/service/GatheringService.java index af8567c..476e7c0 100644 --- a/src/main/java/com/manchui/domain/service/GatheringService.java +++ b/src/main/java/com/manchui/domain/service/GatheringService.java @@ -1,6 +1,6 @@ package com.manchui.domain.service; -import com.manchui.domain.dto.CustomUserDetails; +import com.manchui.domain.auth.dto.CustomUserDetails; import com.manchui.domain.dto.gathering.*; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/manchui/domain/service/GatheringServiceImpl.java b/src/main/java/com/manchui/domain/service/GatheringServiceImpl.java index 7210bd7..34e4e37 100644 --- a/src/main/java/com/manchui/domain/service/GatheringServiceImpl.java +++ b/src/main/java/com/manchui/domain/service/GatheringServiceImpl.java @@ -1,8 +1,13 @@ package com.manchui.domain.service; -import com.manchui.domain.dto.CustomUserDetails; -import com.manchui.domain.dto.UserInfo; -import com.manchui.domain.dto.chat.ChatMessageRequest; +import com.manchui.domain.chat.entity.mysql.ChatRoom; +import com.manchui.domain.chat.entity.mysql.ChatRoomUser; +import com.manchui.domain.chat.repository.ChatRoomRepository; +import com.manchui.domain.chat.repository.ChatRoomUserRepository; +import com.manchui.domain.chat.service.ChatMessageService; +import com.manchui.domain.auth.dto.CustomUserDetails; +import com.manchui.domain.user.dto.UserInfo; +import com.manchui.domain.chat.dto.ChatMessageRequest; import com.manchui.domain.dto.gathering.*; import com.manchui.domain.dto.review.ReviewDetailPagingResponse; import com.manchui.domain.dto.review.ReviewInfo; @@ -11,6 +16,8 @@ import com.manchui.domain.notification.entity.NotificationType; import com.manchui.domain.notification.service.NotificationServiceImpl; import com.manchui.domain.repository.*; +import com.manchui.domain.user.entity.User; +import com.manchui.domain.user.service.UserService; import com.manchui.global.exception.CustomException; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; @@ -123,7 +130,7 @@ public GatheringCreateResponse createGathering(String email, GatheringCreateRequ ChatRoom chatRoom = new ChatRoom(UUID.randomUUID().toString()); String roomId = chatRoomRepository.save(chatRoom).getRoomId(); chatRoomUserRepository.save(new ChatRoomUser(user, chatRoom)); - chatMessageService.chatRoomOpenMessageSave(new ChatMessageRequest(user.getName(), user.getName() + "님이 채팅방을 개설하였습니다."), roomId).block(); + chatMessageService.chatRoomOpenMessageSave(new ChatMessageRequest(user.getName(), user.getName() + "님이 입장하셨습니다."), roomId).block(); Gathering gathering = gatheringStore.saveGathering(createRequest, user, gatheringDate, dueDate, chatRoom); imageService.uploadGatheringImage(createRequest.getGatheringImage(), gathering.getId(), false); diff --git a/src/main/java/com/manchui/domain/service/GatheringStore.java b/src/main/java/com/manchui/domain/service/GatheringStore.java index 2a60a7d..024dbca 100644 --- a/src/main/java/com/manchui/domain/service/GatheringStore.java +++ b/src/main/java/com/manchui/domain/service/GatheringStore.java @@ -1,9 +1,9 @@ package com.manchui.domain.service; import com.manchui.domain.dto.gathering.GatheringCreateRequest; -import com.manchui.domain.entity.ChatRoom; +import com.manchui.domain.chat.entity.mysql.ChatRoom; import com.manchui.domain.entity.Gathering; -import com.manchui.domain.entity.User; +import com.manchui.domain.user.entity.User; import java.time.LocalDateTime; diff --git a/src/main/java/com/manchui/domain/service/GatheringStoreImpl.java b/src/main/java/com/manchui/domain/service/GatheringStoreImpl.java index 411942f..732f257 100644 --- a/src/main/java/com/manchui/domain/service/GatheringStoreImpl.java +++ b/src/main/java/com/manchui/domain/service/GatheringStoreImpl.java @@ -2,9 +2,9 @@ import com.manchui.domain.dto.gathering.GatheringCreateRequest; import com.manchui.domain.entity.Attendance; -import com.manchui.domain.entity.ChatRoom; +import com.manchui.domain.chat.entity.mysql.ChatRoom; import com.manchui.domain.entity.Gathering; -import com.manchui.domain.entity.User; +import com.manchui.domain.user.entity.User; import com.manchui.domain.repository.AttendanceRepository; import com.manchui.domain.repository.GatheringRepository; import jakarta.transaction.Transactional; diff --git a/src/main/java/com/manchui/domain/service/ReviewServiceImpl.java b/src/main/java/com/manchui/domain/service/ReviewServiceImpl.java index d3ff2c8..c1cf263 100644 --- a/src/main/java/com/manchui/domain/service/ReviewServiceImpl.java +++ b/src/main/java/com/manchui/domain/service/ReviewServiceImpl.java @@ -4,9 +4,10 @@ import com.manchui.domain.entity.Attendance; import com.manchui.domain.entity.Gathering; import com.manchui.domain.entity.Review; -import com.manchui.domain.entity.User; +import com.manchui.domain.user.entity.User; import com.manchui.domain.repository.AttendanceRepository; import com.manchui.domain.repository.ReviewRepository; +import com.manchui.domain.user.service.UserService; import com.manchui.global.exception.CustomException; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/manchui/domain/controller/UserController.java b/src/main/java/com/manchui/domain/user/controller/UserController.java similarity index 93% rename from src/main/java/com/manchui/domain/controller/UserController.java rename to src/main/java/com/manchui/domain/user/controller/UserController.java index 5c672ed..a7a2344 100644 --- a/src/main/java/com/manchui/domain/controller/UserController.java +++ b/src/main/java/com/manchui/domain/user/controller/UserController.java @@ -1,9 +1,9 @@ -package com.manchui.domain.controller; +package com.manchui.domain.user.controller; -import com.manchui.domain.dto.CustomUserDetails; -import com.manchui.domain.dto.User.*; -import com.manchui.domain.entity.User; -import com.manchui.domain.service.UserService; +import com.manchui.domain.auth.dto.CustomUserDetails; +import com.manchui.domain.user.entity.User; +import com.manchui.domain.user.service.UserService; +import com.manchui.domain.user.dto.*; import com.manchui.global.response.SuccessResponse; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/src/main/java/com/manchui/domain/dto/User/GatheringInfo.java b/src/main/java/com/manchui/domain/user/dto/GatheringInfo.java similarity index 95% rename from src/main/java/com/manchui/domain/dto/User/GatheringInfo.java rename to src/main/java/com/manchui/domain/user/dto/GatheringInfo.java index 808003f..ad84219 100644 --- a/src/main/java/com/manchui/domain/dto/User/GatheringInfo.java +++ b/src/main/java/com/manchui/domain/user/dto/GatheringInfo.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto.User; +package com.manchui.domain.user.dto; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/manchui/domain/dto/User/ReviewableGatheringInfo.java b/src/main/java/com/manchui/domain/user/dto/ReviewableGatheringInfo.java similarity index 89% rename from src/main/java/com/manchui/domain/dto/User/ReviewableGatheringInfo.java rename to src/main/java/com/manchui/domain/user/dto/ReviewableGatheringInfo.java index 5ae31bd..d86f9fe 100644 --- a/src/main/java/com/manchui/domain/dto/User/ReviewableGatheringInfo.java +++ b/src/main/java/com/manchui/domain/user/dto/ReviewableGatheringInfo.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto.User; +package com.manchui.domain.user.dto; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/manchui/domain/dto/User/UserEditInfoRequest.java b/src/main/java/com/manchui/domain/user/dto/UserEditInfoRequest.java similarity index 88% rename from src/main/java/com/manchui/domain/dto/User/UserEditInfoRequest.java rename to src/main/java/com/manchui/domain/user/dto/UserEditInfoRequest.java index 2860825..713a2ff 100644 --- a/src/main/java/com/manchui/domain/dto/User/UserEditInfoRequest.java +++ b/src/main/java/com/manchui/domain/user/dto/UserEditInfoRequest.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto.User; +package com.manchui.domain.user.dto; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.Size; diff --git a/src/main/java/com/manchui/domain/dto/User/UserEditInfoResponse.java b/src/main/java/com/manchui/domain/user/dto/UserEditInfoResponse.java similarity index 84% rename from src/main/java/com/manchui/domain/dto/User/UserEditInfoResponse.java rename to src/main/java/com/manchui/domain/user/dto/UserEditInfoResponse.java index 71d0204..c70fea0 100644 --- a/src/main/java/com/manchui/domain/dto/User/UserEditInfoResponse.java +++ b/src/main/java/com/manchui/domain/user/dto/UserEditInfoResponse.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto.User; +package com.manchui.domain.user.dto; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/manchui/domain/dto/UserInfo.java b/src/main/java/com/manchui/domain/user/dto/UserInfo.java similarity index 82% rename from src/main/java/com/manchui/domain/dto/UserInfo.java rename to src/main/java/com/manchui/domain/user/dto/UserInfo.java index 3b20197..a2515f5 100644 --- a/src/main/java/com/manchui/domain/dto/UserInfo.java +++ b/src/main/java/com/manchui/domain/user/dto/UserInfo.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto; +package com.manchui.domain.user.dto; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/manchui/domain/dto/User/UserInfoResponse.java b/src/main/java/com/manchui/domain/user/dto/UserInfoResponse.java similarity index 84% rename from src/main/java/com/manchui/domain/dto/User/UserInfoResponse.java rename to src/main/java/com/manchui/domain/user/dto/UserInfoResponse.java index 2caa104..be7186a 100644 --- a/src/main/java/com/manchui/domain/dto/User/UserInfoResponse.java +++ b/src/main/java/com/manchui/domain/user/dto/UserInfoResponse.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto.User; +package com.manchui.domain.user.dto; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/manchui/domain/dto/User/UserParticipatedGatheringResponse.java b/src/main/java/com/manchui/domain/user/dto/UserParticipatedGatheringResponse.java similarity index 92% rename from src/main/java/com/manchui/domain/dto/User/UserParticipatedGatheringResponse.java rename to src/main/java/com/manchui/domain/user/dto/UserParticipatedGatheringResponse.java index dd2e158..8a90713 100644 --- a/src/main/java/com/manchui/domain/dto/User/UserParticipatedGatheringResponse.java +++ b/src/main/java/com/manchui/domain/user/dto/UserParticipatedGatheringResponse.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto.User; +package com.manchui.domain.user.dto; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/manchui/domain/dto/User/UserReviewableGatheringsResponse.java b/src/main/java/com/manchui/domain/user/dto/UserReviewableGatheringsResponse.java similarity index 87% rename from src/main/java/com/manchui/domain/dto/User/UserReviewableGatheringsResponse.java rename to src/main/java/com/manchui/domain/user/dto/UserReviewableGatheringsResponse.java index a7a2f48..40ae27d 100644 --- a/src/main/java/com/manchui/domain/dto/User/UserReviewableGatheringsResponse.java +++ b/src/main/java/com/manchui/domain/user/dto/UserReviewableGatheringsResponse.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto.User; +package com.manchui.domain.user.dto; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/manchui/domain/dto/User/UserWrittenGatheringsResponse.java b/src/main/java/com/manchui/domain/user/dto/UserWrittenGatheringsResponse.java similarity index 91% rename from src/main/java/com/manchui/domain/dto/User/UserWrittenGatheringsResponse.java rename to src/main/java/com/manchui/domain/user/dto/UserWrittenGatheringsResponse.java index 0d30c7e..fe2bdac 100644 --- a/src/main/java/com/manchui/domain/dto/User/UserWrittenGatheringsResponse.java +++ b/src/main/java/com/manchui/domain/user/dto/UserWrittenGatheringsResponse.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto.User; +package com.manchui.domain.user.dto; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/manchui/domain/dto/User/UserWrittenReviewsResponse.java b/src/main/java/com/manchui/domain/user/dto/UserWrittenReviewsResponse.java similarity index 86% rename from src/main/java/com/manchui/domain/dto/User/UserWrittenReviewsResponse.java rename to src/main/java/com/manchui/domain/user/dto/UserWrittenReviewsResponse.java index 1992b9f..b9c1912 100644 --- a/src/main/java/com/manchui/domain/dto/User/UserWrittenReviewsResponse.java +++ b/src/main/java/com/manchui/domain/user/dto/UserWrittenReviewsResponse.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto.User; +package com.manchui.domain.user.dto; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/manchui/domain/dto/User/WrittenReviewInfo.java b/src/main/java/com/manchui/domain/user/dto/WrittenReviewInfo.java similarity index 89% rename from src/main/java/com/manchui/domain/dto/User/WrittenReviewInfo.java rename to src/main/java/com/manchui/domain/user/dto/WrittenReviewInfo.java index 2a2e28c..ed87ee0 100644 --- a/src/main/java/com/manchui/domain/dto/User/WrittenReviewInfo.java +++ b/src/main/java/com/manchui/domain/user/dto/WrittenReviewInfo.java @@ -1,4 +1,4 @@ -package com.manchui.domain.dto.User; +package com.manchui.domain.user.dto; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/manchui/domain/entity/User.java b/src/main/java/com/manchui/domain/user/entity/User.java similarity index 93% rename from src/main/java/com/manchui/domain/entity/User.java rename to src/main/java/com/manchui/domain/user/entity/User.java index ceb9c55..f6368f5 100644 --- a/src/main/java/com/manchui/domain/entity/User.java +++ b/src/main/java/com/manchui/domain/user/entity/User.java @@ -1,4 +1,4 @@ -package com.manchui.domain.entity; +package com.manchui.domain.user.entity; import com.manchui.global.entity.Timestamped; import jakarta.persistence.Entity; diff --git a/src/main/java/com/manchui/domain/repository/UserRepository.java b/src/main/java/com/manchui/domain/user/repository/UserRepository.java similarity index 76% rename from src/main/java/com/manchui/domain/repository/UserRepository.java rename to src/main/java/com/manchui/domain/user/repository/UserRepository.java index a8f86bb..f004d8a 100644 --- a/src/main/java/com/manchui/domain/repository/UserRepository.java +++ b/src/main/java/com/manchui/domain/user/repository/UserRepository.java @@ -1,6 +1,6 @@ -package com.manchui.domain.repository; +package com.manchui.domain.user.repository; -import com.manchui.domain.entity.User; +import com.manchui.domain.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/manchui/domain/service/UserService.java b/src/main/java/com/manchui/domain/user/service/UserService.java similarity index 97% rename from src/main/java/com/manchui/domain/service/UserService.java rename to src/main/java/com/manchui/domain/user/service/UserService.java index 67b4f83..281f74c 100644 --- a/src/main/java/com/manchui/domain/service/UserService.java +++ b/src/main/java/com/manchui/domain/user/service/UserService.java @@ -1,14 +1,16 @@ -package com.manchui.domain.service; +package com.manchui.domain.user.service; -import com.manchui.domain.dto.CustomUserDetails; -import com.manchui.domain.dto.User.*; +import com.manchui.domain.auth.dto.CustomUserDetails; import com.manchui.domain.entity.*; import com.manchui.domain.repository.*; +import com.manchui.domain.service.ImageServiceImpl; +import com.manchui.domain.user.dto.*; +import com.manchui.domain.user.entity.User; +import com.manchui.domain.user.repository.UserRepository; import com.manchui.global.exception.CustomException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.stereotype.Service; diff --git a/src/main/java/com/manchui/global/config/SecurityConfig.java b/src/main/java/com/manchui/global/config/SecurityConfig.java index bb3ee0d..e25a68a 100644 --- a/src/main/java/com/manchui/global/config/SecurityConfig.java +++ b/src/main/java/com/manchui/global/config/SecurityConfig.java @@ -1,7 +1,7 @@ package com.manchui.global.config; import com.manchui.domain.notification.repository.EmitterRepository; -import com.manchui.domain.service.RedisRefreshTokenService; +import com.manchui.domain.auth.service.RedisRefreshTokenService; import com.manchui.global.jwt.CustomLogoutFilter; import com.manchui.global.jwt.JWTFilter; import com.manchui.global.jwt.JWTUtil; diff --git a/src/main/java/com/manchui/global/handler/StompHandler.java b/src/main/java/com/manchui/global/handler/StompHandler.java index 309429c..671ecf6 100644 --- a/src/main/java/com/manchui/global/handler/StompHandler.java +++ b/src/main/java/com/manchui/global/handler/StompHandler.java @@ -1,9 +1,9 @@ package com.manchui.global.handler; -import com.manchui.domain.dto.CustomUserDetails; -import com.manchui.domain.entity.User; -import com.manchui.domain.repository.UserRepository; -import com.manchui.domain.service.RedisRefreshTokenService; +import com.manchui.domain.auth.dto.CustomUserDetails; +import com.manchui.domain.user.entity.User; +import com.manchui.domain.user.repository.UserRepository; +import com.manchui.domain.auth.service.RedisRefreshTokenService; import com.manchui.global.exception.CustomException; import com.manchui.global.exception.ErrorCode; import com.manchui.global.jwt.JWTUtil; diff --git a/src/main/java/com/manchui/global/jwt/CustomLogoutFilter.java b/src/main/java/com/manchui/global/jwt/CustomLogoutFilter.java index b269400..1ecfe85 100644 --- a/src/main/java/com/manchui/global/jwt/CustomLogoutFilter.java +++ b/src/main/java/com/manchui/global/jwt/CustomLogoutFilter.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.manchui.domain.notification.repository.EmitterRepository; -import com.manchui.domain.service.RedisRefreshTokenService; +import com.manchui.domain.auth.service.RedisRefreshTokenService; import com.manchui.global.exception.CustomException; import com.manchui.global.exception.ErrorCode; import com.manchui.global.response.ErrorResponse; diff --git a/src/main/java/com/manchui/global/jwt/JWTFilter.java b/src/main/java/com/manchui/global/jwt/JWTFilter.java index 6c62174..e12d7a5 100644 --- a/src/main/java/com/manchui/global/jwt/JWTFilter.java +++ b/src/main/java/com/manchui/global/jwt/JWTFilter.java @@ -1,9 +1,9 @@ package com.manchui.global.jwt; import com.fasterxml.jackson.databind.ObjectMapper; -import com.manchui.domain.dto.CustomUserDetails; -import com.manchui.domain.entity.User; -import com.manchui.domain.service.RedisRefreshTokenService; +import com.manchui.domain.auth.dto.CustomUserDetails; +import com.manchui.domain.user.entity.User; +import com.manchui.domain.auth.service.RedisRefreshTokenService; import com.manchui.global.exception.CustomException; import com.manchui.global.exception.ErrorCode; import com.manchui.global.response.ErrorResponse; diff --git a/src/main/java/com/manchui/global/jwt/LoginFilter.java b/src/main/java/com/manchui/global/jwt/LoginFilter.java index 9ea7f4e..fa5e168 100644 --- a/src/main/java/com/manchui/global/jwt/LoginFilter.java +++ b/src/main/java/com/manchui/global/jwt/LoginFilter.java @@ -1,8 +1,8 @@ package com.manchui.global.jwt; import com.fasterxml.jackson.databind.ObjectMapper; -import com.manchui.domain.dto.LoginDTO; -import com.manchui.domain.service.RedisRefreshTokenService; +import com.manchui.domain.auth.dto.LoginDTO; +import com.manchui.domain.auth.service.RedisRefreshTokenService; import com.manchui.global.exception.ErrorCode; import com.manchui.global.response.ErrorResponse; import jakarta.servlet.FilterChain; @@ -13,7 +13,6 @@ import jakarta.validation.ConstraintViolation; import jakarta.validation.Validator; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseCookie; import org.springframework.security.authentication.AuthenticationManager; @@ -21,7 +20,6 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; -import org.springframework.stereotype.Component; import org.springframework.util.StreamUtils; import java.io.IOException;