diff --git a/src/main/java/commonly/commonlybe/domain/admin/presentation/AdminController.java b/src/main/java/commonly/commonlybe/admin/controller/AdminController.java similarity index 79% rename from src/main/java/commonly/commonlybe/domain/admin/presentation/AdminController.java rename to src/main/java/commonly/commonlybe/admin/controller/AdminController.java index b789b5c..64d158c 100644 --- a/src/main/java/commonly/commonlybe/domain/admin/presentation/AdminController.java +++ b/src/main/java/commonly/commonlybe/admin/controller/AdminController.java @@ -1,12 +1,12 @@ -package commonly.commonlybe.domain.admin.presentation; +package commonly.commonlybe.admin.controller; -import commonly.commonlybe.domain.admin.presentation.dto.request.ChangeInitialPasswordRequest; -import commonly.commonlybe.domain.admin.presentation.dto.request.CreateUserRequest; -import commonly.commonlybe.domain.admin.presentation.dto.response.UserListResponse; -import commonly.commonlybe.domain.admin.service.ChangeInitialPasswordService; -import commonly.commonlybe.domain.admin.service.CreateUserService; -import commonly.commonlybe.domain.admin.service.DeleteUserService; -import commonly.commonlybe.domain.admin.service.QueryUserListService; +import commonly.commonlybe.admin.controller.dto.ChangeInitialPasswordRequest; +import commonly.commonlybe.admin.controller.dto.CreateUserRequest; +import commonly.commonlybe.admin.controller.dto.UserListResponse; +import commonly.commonlybe.admin.service.ChangeInitialPasswordService; +import commonly.commonlybe.admin.service.CreateUserService; +import commonly.commonlybe.admin.service.DeleteUserService; +import commonly.commonlybe.admin.service.QueryUserListService; import commonly.commonlybe.global.security.auth.AuthDetails; import jakarta.validation.Valid; import jakarta.validation.constraints.Min; diff --git a/src/main/java/commonly/commonlybe/domain/admin/presentation/dto/request/ChangeInitialPasswordRequest.java b/src/main/java/commonly/commonlybe/admin/controller/dto/ChangeInitialPasswordRequest.java similarity index 78% rename from src/main/java/commonly/commonlybe/domain/admin/presentation/dto/request/ChangeInitialPasswordRequest.java rename to src/main/java/commonly/commonlybe/admin/controller/dto/ChangeInitialPasswordRequest.java index 5d90424..eb8b407 100644 --- a/src/main/java/commonly/commonlybe/domain/admin/presentation/dto/request/ChangeInitialPasswordRequest.java +++ b/src/main/java/commonly/commonlybe/admin/controller/dto/ChangeInitialPasswordRequest.java @@ -1,4 +1,4 @@ -package commonly.commonlybe.domain.admin.presentation.dto.request; +package commonly.commonlybe.admin.controller.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; diff --git a/src/main/java/commonly/commonlybe/domain/admin/presentation/dto/request/CreateUserRequest.java b/src/main/java/commonly/commonlybe/admin/controller/dto/CreateUserRequest.java similarity index 86% rename from src/main/java/commonly/commonlybe/domain/admin/presentation/dto/request/CreateUserRequest.java rename to src/main/java/commonly/commonlybe/admin/controller/dto/CreateUserRequest.java index 463a089..cdacff7 100644 --- a/src/main/java/commonly/commonlybe/domain/admin/presentation/dto/request/CreateUserRequest.java +++ b/src/main/java/commonly/commonlybe/admin/controller/dto/CreateUserRequest.java @@ -1,4 +1,4 @@ -package commonly.commonlybe.domain.admin.presentation.dto.request; +package commonly.commonlybe.admin.controller.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; diff --git a/src/main/java/commonly/commonlybe/domain/admin/presentation/dto/response/UserListResponse.java b/src/main/java/commonly/commonlybe/admin/controller/dto/UserListResponse.java similarity index 68% rename from src/main/java/commonly/commonlybe/domain/admin/presentation/dto/response/UserListResponse.java rename to src/main/java/commonly/commonlybe/admin/controller/dto/UserListResponse.java index 9a1b8cf..85a4c1c 100644 --- a/src/main/java/commonly/commonlybe/domain/admin/presentation/dto/response/UserListResponse.java +++ b/src/main/java/commonly/commonlybe/admin/controller/dto/UserListResponse.java @@ -1,4 +1,4 @@ -package commonly.commonlybe.domain.admin.presentation.dto.response; +package commonly.commonlybe.admin.controller.dto; import lombok.Builder; diff --git a/src/main/java/commonly/commonlybe/domain/admin/domain/Admin.java b/src/main/java/commonly/commonlybe/admin/entity/Admin.java similarity index 87% rename from src/main/java/commonly/commonlybe/domain/admin/domain/Admin.java rename to src/main/java/commonly/commonlybe/admin/entity/Admin.java index 9be45d3..8ce03e2 100644 --- a/src/main/java/commonly/commonlybe/domain/admin/domain/Admin.java +++ b/src/main/java/commonly/commonlybe/admin/entity/Admin.java @@ -1,6 +1,6 @@ -package commonly.commonlybe.domain.admin.domain; +package commonly.commonlybe.admin.entity; -import commonly.commonlybe.domain.user.domain.User; +import commonly.commonlybe.user.entity.User; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/commonly/commonlybe/admin/entity/AdminRole.java b/src/main/java/commonly/commonlybe/admin/entity/AdminRole.java new file mode 100644 index 0000000..e6d8da9 --- /dev/null +++ b/src/main/java/commonly/commonlybe/admin/entity/AdminRole.java @@ -0,0 +1,6 @@ +package commonly.commonlybe.admin.entity; + +public enum AdminRole { + ADMIN, + USER +} diff --git a/src/main/java/commonly/commonlybe/domain/admin/domain/repository/AdminRepository.java b/src/main/java/commonly/commonlybe/admin/repository/AdminRepository.java similarity index 71% rename from src/main/java/commonly/commonlybe/domain/admin/domain/repository/AdminRepository.java rename to src/main/java/commonly/commonlybe/admin/repository/AdminRepository.java index 8309fd5..5ec6bb7 100644 --- a/src/main/java/commonly/commonlybe/domain/admin/domain/repository/AdminRepository.java +++ b/src/main/java/commonly/commonlybe/admin/repository/AdminRepository.java @@ -1,7 +1,7 @@ -package commonly.commonlybe.domain.admin.domain.repository; +package commonly.commonlybe.admin.repository; -import commonly.commonlybe.domain.admin.domain.Admin; -import commonly.commonlybe.domain.admin.domain.AdminRole; +import commonly.commonlybe.admin.entity.Admin; +import commonly.commonlybe.admin.entity.AdminRole; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.EntityGraph; diff --git a/src/main/java/commonly/commonlybe/domain/admin/service/ChangeInitialPasswordService.java b/src/main/java/commonly/commonlybe/admin/service/ChangeInitialPasswordService.java similarity index 66% rename from src/main/java/commonly/commonlybe/domain/admin/service/ChangeInitialPasswordService.java rename to src/main/java/commonly/commonlybe/admin/service/ChangeInitialPasswordService.java index 6d9a6b7..d27d03d 100644 --- a/src/main/java/commonly/commonlybe/domain/admin/service/ChangeInitialPasswordService.java +++ b/src/main/java/commonly/commonlybe/admin/service/ChangeInitialPasswordService.java @@ -1,9 +1,9 @@ -package commonly.commonlybe.domain.admin.service; +package commonly.commonlybe.admin.service; -import commonly.commonlybe.domain.admin.presentation.dto.request.ChangeInitialPasswordRequest; -import commonly.commonlybe.domain.user.domain.User; -import commonly.commonlybe.domain.user.domain.repository.UserRepository; -import commonly.commonlybe.domain.user.exception.UserNotFoundException; +import commonly.commonlybe.admin.controller.dto.ChangeInitialPasswordRequest; +import commonly.commonlybe.user.entity.User; +import commonly.commonlybe.user.repository.UserRepository; +import commonly.commonlybe.user.exception.UserNotFoundException; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; diff --git a/src/main/java/commonly/commonlybe/domain/admin/service/CreateUserService.java b/src/main/java/commonly/commonlybe/admin/service/CreateUserService.java similarity index 69% rename from src/main/java/commonly/commonlybe/domain/admin/service/CreateUserService.java rename to src/main/java/commonly/commonlybe/admin/service/CreateUserService.java index 8f953e3..f545666 100644 --- a/src/main/java/commonly/commonlybe/domain/admin/service/CreateUserService.java +++ b/src/main/java/commonly/commonlybe/admin/service/CreateUserService.java @@ -1,12 +1,12 @@ -package commonly.commonlybe.domain.admin.service; +package commonly.commonlybe.admin.service; -import commonly.commonlybe.domain.admin.domain.Admin; -import commonly.commonlybe.domain.admin.domain.AdminRole; -import commonly.commonlybe.domain.admin.domain.repository.AdminRepository; -import commonly.commonlybe.domain.admin.presentation.dto.request.CreateUserRequest; -import commonly.commonlybe.domain.user.domain.User; -import commonly.commonlybe.domain.user.domain.repository.UserRepository; -import commonly.commonlybe.domain.user.exception.UserAlreadyExistsException; +import commonly.commonlybe.admin.entity.Admin; +import commonly.commonlybe.admin.entity.AdminRole; +import commonly.commonlybe.admin.repository.AdminRepository; +import commonly.commonlybe.admin.controller.dto.CreateUserRequest; +import commonly.commonlybe.user.entity.User; +import commonly.commonlybe.user.repository.UserRepository; +import commonly.commonlybe.user.exception.UserAlreadyExistsException; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; diff --git a/src/main/java/commonly/commonlybe/domain/admin/service/DeleteUserService.java b/src/main/java/commonly/commonlybe/admin/service/DeleteUserService.java similarity index 64% rename from src/main/java/commonly/commonlybe/domain/admin/service/DeleteUserService.java rename to src/main/java/commonly/commonlybe/admin/service/DeleteUserService.java index 2945253..e05cdd3 100644 --- a/src/main/java/commonly/commonlybe/domain/admin/service/DeleteUserService.java +++ b/src/main/java/commonly/commonlybe/admin/service/DeleteUserService.java @@ -1,9 +1,9 @@ -package commonly.commonlybe.domain.admin.service; +package commonly.commonlybe.admin.service; -import commonly.commonlybe.domain.admin.domain.Admin; -import commonly.commonlybe.domain.admin.domain.repository.AdminRepository; -import commonly.commonlybe.domain.user.domain.repository.UserRepository; -import commonly.commonlybe.domain.user.exception.UserNotFoundException; +import commonly.commonlybe.admin.entity.Admin; +import commonly.commonlybe.admin.repository.AdminRepository; +import commonly.commonlybe.user.repository.UserRepository; +import commonly.commonlybe.user.exception.UserNotFoundException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/commonly/commonlybe/domain/admin/service/QueryUserListService.java b/src/main/java/commonly/commonlybe/admin/service/QueryUserListService.java similarity index 79% rename from src/main/java/commonly/commonlybe/domain/admin/service/QueryUserListService.java rename to src/main/java/commonly/commonlybe/admin/service/QueryUserListService.java index 3bb599d..c44a0b1 100644 --- a/src/main/java/commonly/commonlybe/domain/admin/service/QueryUserListService.java +++ b/src/main/java/commonly/commonlybe/admin/service/QueryUserListService.java @@ -1,8 +1,8 @@ -package commonly.commonlybe.domain.admin.service; +package commonly.commonlybe.admin.service; -import commonly.commonlybe.domain.admin.domain.AdminRole; -import commonly.commonlybe.domain.admin.domain.repository.AdminRepository; -import commonly.commonlybe.domain.admin.presentation.dto.response.UserListResponse; +import commonly.commonlybe.admin.entity.AdminRole; +import commonly.commonlybe.admin.repository.AdminRepository; +import commonly.commonlybe.admin.controller.dto.UserListResponse; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/commonly/commonlybe/domain/auth/presentation/AuthController.java b/src/main/java/commonly/commonlybe/auth/controller/AuthController.java similarity index 73% rename from src/main/java/commonly/commonlybe/domain/auth/presentation/AuthController.java rename to src/main/java/commonly/commonlybe/auth/controller/AuthController.java index 5fb3e58..69fe46a 100644 --- a/src/main/java/commonly/commonlybe/domain/auth/presentation/AuthController.java +++ b/src/main/java/commonly/commonlybe/auth/controller/AuthController.java @@ -1,14 +1,14 @@ -package commonly.commonlybe.domain.auth.presentation; +package commonly.commonlybe.auth.controller; -import commonly.commonlybe.domain.auth.presentation.dto.request.ChangePasswordRequest; -import commonly.commonlybe.domain.auth.presentation.dto.request.LoginRequest; -import commonly.commonlybe.domain.auth.presentation.dto.request.SignupRequest; -import commonly.commonlybe.domain.auth.presentation.dto.request.UpdateAccountRequest; -import commonly.commonlybe.domain.auth.presentation.dto.response.TokenResponse; -import commonly.commonlybe.domain.auth.service.ChangePasswordService; -import commonly.commonlybe.domain.auth.service.LoginService; -import commonly.commonlybe.domain.auth.service.SignupService; -import commonly.commonlybe.domain.auth.service.UpdateAccountService; +import commonly.commonlybe.auth.controller.dto.ChangePasswordRequest; +import commonly.commonlybe.auth.controller.dto.LoginRequest; +import commonly.commonlybe.auth.controller.dto.SignupRequest; +import commonly.commonlybe.auth.controller.dto.UpdateAccountRequest; +import commonly.commonlybe.auth.controller.dto.TokenResponse; +import commonly.commonlybe.auth.service.ChangePasswordService; +import commonly.commonlybe.auth.service.LoginService; +import commonly.commonlybe.auth.service.SignupService; +import commonly.commonlybe.auth.service.UpdateAccountService; import commonly.commonlybe.global.security.auth.AuthDetails; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/commonly/commonlybe/domain/auth/presentation/dto/request/ChangePasswordRequest.java b/src/main/java/commonly/commonlybe/auth/controller/dto/ChangePasswordRequest.java similarity index 81% rename from src/main/java/commonly/commonlybe/domain/auth/presentation/dto/request/ChangePasswordRequest.java rename to src/main/java/commonly/commonlybe/auth/controller/dto/ChangePasswordRequest.java index 36cc3e4..72c2755 100644 --- a/src/main/java/commonly/commonlybe/domain/auth/presentation/dto/request/ChangePasswordRequest.java +++ b/src/main/java/commonly/commonlybe/auth/controller/dto/ChangePasswordRequest.java @@ -1,4 +1,4 @@ -package commonly.commonlybe.domain.auth.presentation.dto.request; +package commonly.commonlybe.auth.controller.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; diff --git a/src/main/java/commonly/commonlybe/domain/auth/presentation/dto/request/LoginRequest.java b/src/main/java/commonly/commonlybe/auth/controller/dto/LoginRequest.java similarity index 75% rename from src/main/java/commonly/commonlybe/domain/auth/presentation/dto/request/LoginRequest.java rename to src/main/java/commonly/commonlybe/auth/controller/dto/LoginRequest.java index 2d8ae04..50cf4d9 100644 --- a/src/main/java/commonly/commonlybe/domain/auth/presentation/dto/request/LoginRequest.java +++ b/src/main/java/commonly/commonlybe/auth/controller/dto/LoginRequest.java @@ -1,4 +1,4 @@ -package commonly.commonlybe.domain.auth.presentation.dto.request; +package commonly.commonlybe.auth.controller.dto; import jakarta.validation.constraints.NotBlank; import lombok.Getter; diff --git a/src/main/java/commonly/commonlybe/domain/auth/presentation/dto/request/SignupRequest.java b/src/main/java/commonly/commonlybe/auth/controller/dto/SignupRequest.java similarity index 90% rename from src/main/java/commonly/commonlybe/domain/auth/presentation/dto/request/SignupRequest.java rename to src/main/java/commonly/commonlybe/auth/controller/dto/SignupRequest.java index a54e1f4..3c2e223 100644 --- a/src/main/java/commonly/commonlybe/domain/auth/presentation/dto/request/SignupRequest.java +++ b/src/main/java/commonly/commonlybe/auth/controller/dto/SignupRequest.java @@ -1,4 +1,4 @@ -package commonly.commonlybe.domain.auth.presentation.dto.request; +package commonly.commonlybe.auth.controller.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/commonly/commonlybe/domain/auth/presentation/dto/response/TokenResponse.java b/src/main/java/commonly/commonlybe/auth/controller/dto/TokenResponse.java similarity index 57% rename from src/main/java/commonly/commonlybe/domain/auth/presentation/dto/response/TokenResponse.java rename to src/main/java/commonly/commonlybe/auth/controller/dto/TokenResponse.java index 7672750..f46946a 100644 --- a/src/main/java/commonly/commonlybe/domain/auth/presentation/dto/response/TokenResponse.java +++ b/src/main/java/commonly/commonlybe/auth/controller/dto/TokenResponse.java @@ -1,4 +1,4 @@ -package commonly.commonlybe.domain.auth.presentation.dto.response; +package commonly.commonlybe.auth.controller.dto; import lombok.Builder; diff --git a/src/main/java/commonly/commonlybe/domain/auth/presentation/dto/request/UpdateAccountRequest.java b/src/main/java/commonly/commonlybe/auth/controller/dto/UpdateAccountRequest.java similarity index 84% rename from src/main/java/commonly/commonlybe/domain/auth/presentation/dto/request/UpdateAccountRequest.java rename to src/main/java/commonly/commonlybe/auth/controller/dto/UpdateAccountRequest.java index 01aa6df..0f43d0b 100644 --- a/src/main/java/commonly/commonlybe/domain/auth/presentation/dto/request/UpdateAccountRequest.java +++ b/src/main/java/commonly/commonlybe/auth/controller/dto/UpdateAccountRequest.java @@ -1,4 +1,4 @@ -package commonly.commonlybe.domain.auth.presentation.dto.request; +package commonly.commonlybe.auth.controller.dto; import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; diff --git a/src/main/java/commonly/commonlybe/domain/auth/service/ChangePasswordService.java b/src/main/java/commonly/commonlybe/auth/service/ChangePasswordService.java similarity index 66% rename from src/main/java/commonly/commonlybe/domain/auth/service/ChangePasswordService.java rename to src/main/java/commonly/commonlybe/auth/service/ChangePasswordService.java index 929143f..d76c4be 100644 --- a/src/main/java/commonly/commonlybe/domain/auth/service/ChangePasswordService.java +++ b/src/main/java/commonly/commonlybe/auth/service/ChangePasswordService.java @@ -1,11 +1,11 @@ -package commonly.commonlybe.domain.auth.service; +package commonly.commonlybe.auth.service; -import commonly.commonlybe.domain.auth.presentation.dto.request.ChangePasswordRequest; -import commonly.commonlybe.domain.user.domain.User; -import commonly.commonlybe.domain.user.domain.repository.UserRepository; -import commonly.commonlybe.domain.user.exception.ForbiddenUserException; -import commonly.commonlybe.domain.user.exception.PasswordMismatchException; -import commonly.commonlybe.domain.user.exception.UserNotFoundException; +import commonly.commonlybe.auth.controller.dto.ChangePasswordRequest; +import commonly.commonlybe.user.entity.User; +import commonly.commonlybe.user.repository.UserRepository; +import commonly.commonlybe.user.exception.ForbiddenUserException; +import commonly.commonlybe.user.exception.PasswordMismatchException; +import commonly.commonlybe.user.exception.UserNotFoundException; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; diff --git a/src/main/java/commonly/commonlybe/domain/auth/service/LoginService.java b/src/main/java/commonly/commonlybe/auth/service/LoginService.java similarity index 71% rename from src/main/java/commonly/commonlybe/domain/auth/service/LoginService.java rename to src/main/java/commonly/commonlybe/auth/service/LoginService.java index 35196cb..9ece450 100644 --- a/src/main/java/commonly/commonlybe/domain/auth/service/LoginService.java +++ b/src/main/java/commonly/commonlybe/auth/service/LoginService.java @@ -1,10 +1,10 @@ -package commonly.commonlybe.domain.auth.service; +package commonly.commonlybe.auth.service; -import commonly.commonlybe.domain.auth.presentation.dto.request.LoginRequest; -import commonly.commonlybe.domain.auth.presentation.dto.response.TokenResponse; -import commonly.commonlybe.domain.user.domain.User; -import commonly.commonlybe.domain.user.domain.repository.UserRepository; -import commonly.commonlybe.domain.user.exception.PasswordMismatchException; +import commonly.commonlybe.auth.controller.dto.LoginRequest; +import commonly.commonlybe.auth.controller.dto.TokenResponse; +import commonly.commonlybe.user.entity.User; +import commonly.commonlybe.user.repository.UserRepository; +import commonly.commonlybe.user.exception.PasswordMismatchException; import commonly.commonlybe.global.jwt.JwtGenerator; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/java/commonly/commonlybe/domain/auth/service/SignupService.java b/src/main/java/commonly/commonlybe/auth/service/SignupService.java similarity index 71% rename from src/main/java/commonly/commonlybe/domain/auth/service/SignupService.java rename to src/main/java/commonly/commonlybe/auth/service/SignupService.java index 1598f97..7a13052 100644 --- a/src/main/java/commonly/commonlybe/domain/auth/service/SignupService.java +++ b/src/main/java/commonly/commonlybe/auth/service/SignupService.java @@ -1,12 +1,12 @@ -package commonly.commonlybe.domain.auth.service; +package commonly.commonlybe.auth.service; -import commonly.commonlybe.domain.auth.presentation.dto.request.SignupRequest; -import commonly.commonlybe.domain.auth.presentation.dto.response.TokenResponse; -import commonly.commonlybe.domain.petitioner.domain.Petitioner; -import commonly.commonlybe.domain.petitioner.domain.repository.PetitionerRepository; -import commonly.commonlybe.domain.user.domain.User; -import commonly.commonlybe.domain.user.domain.repository.UserRepository; -import commonly.commonlybe.domain.user.exception.UserAlreadyExistsException; +import commonly.commonlybe.auth.controller.dto.SignupRequest; +import commonly.commonlybe.auth.controller.dto.TokenResponse; +import commonly.commonlybe.petitioner.entity.Petitioner; +import commonly.commonlybe.petitioner.repository.PetitionerRepository; +import commonly.commonlybe.user.entity.User; +import commonly.commonlybe.user.repository.UserRepository; +import commonly.commonlybe.user.exception.UserAlreadyExistsException; import commonly.commonlybe.global.jwt.JwtGenerator; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/java/commonly/commonlybe/domain/auth/service/UpdateAccountService.java b/src/main/java/commonly/commonlybe/auth/service/UpdateAccountService.java similarity index 69% rename from src/main/java/commonly/commonlybe/domain/auth/service/UpdateAccountService.java rename to src/main/java/commonly/commonlybe/auth/service/UpdateAccountService.java index 3a23209..6fd3aac 100644 --- a/src/main/java/commonly/commonlybe/domain/auth/service/UpdateAccountService.java +++ b/src/main/java/commonly/commonlybe/auth/service/UpdateAccountService.java @@ -1,11 +1,11 @@ -package commonly.commonlybe.domain.auth.service; +package commonly.commonlybe.auth.service; -import commonly.commonlybe.domain.auth.presentation.dto.request.UpdateAccountRequest; -import commonly.commonlybe.domain.petitioner.domain.repository.PetitionerRepository; -import commonly.commonlybe.domain.user.domain.User; -import commonly.commonlybe.domain.user.domain.repository.UserRepository; -import commonly.commonlybe.domain.user.exception.ForbiddenUserException; -import commonly.commonlybe.domain.user.exception.UserNotFoundException; +import commonly.commonlybe.auth.controller.dto.UpdateAccountRequest; +import commonly.commonlybe.petitioner.repository.PetitionerRepository; +import commonly.commonlybe.user.entity.User; +import commonly.commonlybe.user.repository.UserRepository; +import commonly.commonlybe.user.exception.ForbiddenUserException; +import commonly.commonlybe.user.exception.UserNotFoundException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/commonly/commonlybe/certificate/service/PetitionerHumanResolver.java b/src/main/java/commonly/commonlybe/certificate/service/PetitionerHumanResolver.java index 1ecb1cf..15a3fd5 100644 --- a/src/main/java/commonly/commonlybe/certificate/service/PetitionerHumanResolver.java +++ b/src/main/java/commonly/commonlybe/certificate/service/PetitionerHumanResolver.java @@ -2,8 +2,8 @@ import commonly.commonlybe.certificate.exception.CertificateErrorCode; import commonly.commonlybe.certificate.exception.CertificateException; -import commonly.commonlybe.domain.petitioner.domain.Petitioner; -import commonly.commonlybe.domain.petitioner.domain.repository.PetitionerRepository; +import commonly.commonlybe.petitioner.entity.Petitioner; +import commonly.commonlybe.petitioner.repository.PetitionerRepository; import commonly.commonlybe.global.security.auth.AuthDetails; import commonly.commonlybe.human.entity.HumanEntity; import commonly.commonlybe.human.repository.HumanRepository; diff --git a/src/main/java/commonly/commonlybe/domain/admin/domain/AdminRole.java b/src/main/java/commonly/commonlybe/domain/admin/domain/AdminRole.java deleted file mode 100644 index 565835f..0000000 --- a/src/main/java/commonly/commonlybe/domain/admin/domain/AdminRole.java +++ /dev/null @@ -1,6 +0,0 @@ -package commonly.commonlybe.domain.admin.domain; - -public enum AdminRole { - ADMIN, - USER -} diff --git a/src/main/java/commonly/commonlybe/global/jwt/JwtParser.java b/src/main/java/commonly/commonlybe/global/jwt/JwtParser.java index ff03fde..c923d7e 100644 --- a/src/main/java/commonly/commonlybe/global/jwt/JwtParser.java +++ b/src/main/java/commonly/commonlybe/global/jwt/JwtParser.java @@ -1,6 +1,6 @@ package commonly.commonlybe.global.jwt; -import commonly.commonlybe.domain.user.exception.UserNotFoundException; +import commonly.commonlybe.user.exception.UserNotFoundException; import commonly.commonlybe.global.jwt.exception.ExpiredTokenException; import commonly.commonlybe.global.jwt.exception.InvalidTokenException; import commonly.commonlybe.global.security.auth.AuthDetailsService; diff --git a/src/main/java/commonly/commonlybe/global/security/auth/AuthDetails.java b/src/main/java/commonly/commonlybe/global/security/auth/AuthDetails.java index 102f20a..775c9c2 100644 --- a/src/main/java/commonly/commonlybe/global/security/auth/AuthDetails.java +++ b/src/main/java/commonly/commonlybe/global/security/auth/AuthDetails.java @@ -1,6 +1,6 @@ package commonly.commonlybe.global.security.auth; -import commonly.commonlybe.domain.user.domain.User; +import commonly.commonlybe.user.entity.User; import org.jspecify.annotations.Nullable; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/src/main/java/commonly/commonlybe/global/security/auth/AuthDetailsService.java b/src/main/java/commonly/commonlybe/global/security/auth/AuthDetailsService.java index 934f355..e924939 100644 --- a/src/main/java/commonly/commonlybe/global/security/auth/AuthDetailsService.java +++ b/src/main/java/commonly/commonlybe/global/security/auth/AuthDetailsService.java @@ -1,10 +1,10 @@ package commonly.commonlybe.global.security.auth; -import commonly.commonlybe.domain.admin.domain.Admin; -import commonly.commonlybe.domain.admin.domain.repository.AdminRepository; -import commonly.commonlybe.domain.user.domain.User; -import commonly.commonlybe.domain.user.domain.repository.UserRepository; -import commonly.commonlybe.domain.user.exception.UserNotFoundException; +import commonly.commonlybe.admin.entity.Admin; +import commonly.commonlybe.admin.repository.AdminRepository; +import commonly.commonlybe.user.entity.User; +import commonly.commonlybe.user.repository.UserRepository; +import commonly.commonlybe.user.exception.UserNotFoundException; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; diff --git a/src/main/java/commonly/commonlybe/domain/petitioner/domain/Petitioner.java b/src/main/java/commonly/commonlybe/petitioner/entity/Petitioner.java similarity index 89% rename from src/main/java/commonly/commonlybe/domain/petitioner/domain/Petitioner.java rename to src/main/java/commonly/commonlybe/petitioner/entity/Petitioner.java index af29384..469fa11 100644 --- a/src/main/java/commonly/commonlybe/domain/petitioner/domain/Petitioner.java +++ b/src/main/java/commonly/commonlybe/petitioner/entity/Petitioner.java @@ -1,6 +1,6 @@ -package commonly.commonlybe.domain.petitioner.domain; +package commonly.commonlybe.petitioner.entity; -import commonly.commonlybe.domain.user.domain.User; +import commonly.commonlybe.user.entity.User; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/src/main/java/commonly/commonlybe/domain/petitioner/domain/repository/PetitionerRepository.java b/src/main/java/commonly/commonlybe/petitioner/repository/PetitionerRepository.java similarity index 53% rename from src/main/java/commonly/commonlybe/domain/petitioner/domain/repository/PetitionerRepository.java rename to src/main/java/commonly/commonlybe/petitioner/repository/PetitionerRepository.java index 8740cec..df688bc 100644 --- a/src/main/java/commonly/commonlybe/domain/petitioner/domain/repository/PetitionerRepository.java +++ b/src/main/java/commonly/commonlybe/petitioner/repository/PetitionerRepository.java @@ -1,6 +1,6 @@ -package commonly.commonlybe.domain.petitioner.domain.repository; +package commonly.commonlybe.petitioner.repository; -import commonly.commonlybe.domain.petitioner.domain.Petitioner; +import commonly.commonlybe.petitioner.entity.Petitioner; import org.springframework.data.jpa.repository.JpaRepository; public interface PetitionerRepository extends JpaRepository { diff --git a/src/main/java/commonly/commonlybe/domain/user/domain/User.java b/src/main/java/commonly/commonlybe/user/entity/User.java similarity index 94% rename from src/main/java/commonly/commonlybe/domain/user/domain/User.java rename to src/main/java/commonly/commonlybe/user/entity/User.java index 6da09c0..f117825 100644 --- a/src/main/java/commonly/commonlybe/domain/user/domain/User.java +++ b/src/main/java/commonly/commonlybe/user/entity/User.java @@ -1,4 +1,4 @@ -package commonly.commonlybe.domain.user.domain; +package commonly.commonlybe.user.entity; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/src/main/java/commonly/commonlybe/domain/user/exception/ForbiddenUserException.java b/src/main/java/commonly/commonlybe/user/exception/ForbiddenUserException.java similarity index 81% rename from src/main/java/commonly/commonlybe/domain/user/exception/ForbiddenUserException.java rename to src/main/java/commonly/commonlybe/user/exception/ForbiddenUserException.java index 22f552f..52eed78 100644 --- a/src/main/java/commonly/commonlybe/domain/user/exception/ForbiddenUserException.java +++ b/src/main/java/commonly/commonlybe/user/exception/ForbiddenUserException.java @@ -1,4 +1,4 @@ -package commonly.commonlybe.domain.user.exception; +package commonly.commonlybe.user.exception; import commonly.commonlybe.global.error.exception.CommonlyException; diff --git a/src/main/java/commonly/commonlybe/domain/user/exception/PasswordMismatchException.java b/src/main/java/commonly/commonlybe/user/exception/PasswordMismatchException.java similarity index 82% rename from src/main/java/commonly/commonlybe/domain/user/exception/PasswordMismatchException.java rename to src/main/java/commonly/commonlybe/user/exception/PasswordMismatchException.java index c12768c..f1ff6aa 100644 --- a/src/main/java/commonly/commonlybe/domain/user/exception/PasswordMismatchException.java +++ b/src/main/java/commonly/commonlybe/user/exception/PasswordMismatchException.java @@ -1,4 +1,4 @@ -package commonly.commonlybe.domain.user.exception; +package commonly.commonlybe.user.exception; import commonly.commonlybe.global.error.exception.CommonlyException; diff --git a/src/main/java/commonly/commonlybe/domain/user/exception/UserAlreadyExistsException.java b/src/main/java/commonly/commonlybe/user/exception/UserAlreadyExistsException.java similarity index 82% rename from src/main/java/commonly/commonlybe/domain/user/exception/UserAlreadyExistsException.java rename to src/main/java/commonly/commonlybe/user/exception/UserAlreadyExistsException.java index 83f7f37..efbd283 100644 --- a/src/main/java/commonly/commonlybe/domain/user/exception/UserAlreadyExistsException.java +++ b/src/main/java/commonly/commonlybe/user/exception/UserAlreadyExistsException.java @@ -1,4 +1,4 @@ -package commonly.commonlybe.domain.user.exception; +package commonly.commonlybe.user.exception; import commonly.commonlybe.global.error.exception.CommonlyException; diff --git a/src/main/java/commonly/commonlybe/domain/user/exception/UserErrorCode.java b/src/main/java/commonly/commonlybe/user/exception/UserErrorCode.java similarity index 93% rename from src/main/java/commonly/commonlybe/domain/user/exception/UserErrorCode.java rename to src/main/java/commonly/commonlybe/user/exception/UserErrorCode.java index 4b96fb9..e53c848 100644 --- a/src/main/java/commonly/commonlybe/domain/user/exception/UserErrorCode.java +++ b/src/main/java/commonly/commonlybe/user/exception/UserErrorCode.java @@ -1,4 +1,4 @@ -package commonly.commonlybe.domain.user.exception; +package commonly.commonlybe.user.exception; import commonly.commonlybe.global.error.error_code.ErrorProperty; import lombok.AccessLevel; diff --git a/src/main/java/commonly/commonlybe/domain/user/exception/UserNotFoundException.java b/src/main/java/commonly/commonlybe/user/exception/UserNotFoundException.java similarity index 81% rename from src/main/java/commonly/commonlybe/domain/user/exception/UserNotFoundException.java rename to src/main/java/commonly/commonlybe/user/exception/UserNotFoundException.java index 03126ea..d882400 100644 --- a/src/main/java/commonly/commonlybe/domain/user/exception/UserNotFoundException.java +++ b/src/main/java/commonly/commonlybe/user/exception/UserNotFoundException.java @@ -1,4 +1,4 @@ -package commonly.commonlybe.domain.user.exception; +package commonly.commonlybe.user.exception; import commonly.commonlybe.global.error.exception.CommonlyException; diff --git a/src/main/java/commonly/commonlybe/domain/user/domain/repository/UserRepository.java b/src/main/java/commonly/commonlybe/user/repository/UserRepository.java similarity index 70% rename from src/main/java/commonly/commonlybe/domain/user/domain/repository/UserRepository.java rename to src/main/java/commonly/commonlybe/user/repository/UserRepository.java index b92760e..6559f17 100644 --- a/src/main/java/commonly/commonlybe/domain/user/domain/repository/UserRepository.java +++ b/src/main/java/commonly/commonlybe/user/repository/UserRepository.java @@ -1,6 +1,6 @@ -package commonly.commonlybe.domain.user.domain.repository; +package commonly.commonlybe.user.repository; -import commonly.commonlybe.domain.user.domain.User; +import commonly.commonlybe.user.entity.User; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 27e4aef..ea457c6 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -37,13 +37,6 @@ jwt: prefix: ${JWT_PREFIX:Bearer} access-exp: ${JWT_ACCESS_EXP:3600} -garage: - endpoint: ${GARAGE_ENDPOINT:http://garage:3900} - region: ${GARAGE_REGION:garage} - bucket: ${GARAGE_BUCKET:commonly} - access-key: ${GARAGE_ACCESS_KEY:} - secret-key: ${GARAGE_SECRET_KEY:} - app: s3: bucket: ${S3_BUCKET:commonly-files}