From 1f901df3c5f198912a5822a1f3b298fffa837386 Mon Sep 17 00:00:00 2001 From: geonhos Date: Thu, 23 May 2024 12:06:16 +0900 Subject: [PATCH] =?UTF-8?q?admin:=20domain=20=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/admin/AdminActionLogAppService.java | 10 +++++----- .../app/admin/AdminManagementAppService.java | 14 ++++++------- .../authentication/AuthenticationService.java | 4 ++-- .../authorization/AuthorizationService.java | 4 ++-- .../poc/admin/app/jwt/JwtTokenRequest.java | 2 +- .../poc/admin/app/jwt/JwtTokenService.java | 8 ++++---- .../poc/admin/app/menu/MenuAppService.java | 2 +- .../poc/admin/app/role/RoleAppService.java | 8 ++++---- .../admin/domain/{base => }/BaseEntity.java | 2 +- .../poc/admin/domain/DomainException.java | 7 ------- .../domain/{base => }/admin/entity/Admin.java | 4 ++-- .../admin/entity/AdminActionLog.java | 4 ++-- .../entity/AdminActionLogRepository.java | 2 +- .../admin/entity/AdminRepository.java | 2 +- .../{base => }/admin/entity/AdminRole.java | 4 ++-- .../{base => }/admin/entity/AdminToken.java | 4 ++-- .../admin/entity/AdminTokenRepository.java | 2 +- .../admin/domain/admin/entity/TokenState.java | 5 +++++ .../service/AdminActionLogCreateCommand.java | 6 +++--- .../admin/service/AdminActionLogService.java | 6 +++--- .../service/AdminActionLogUpdateCommand.java | 4 ++-- .../admin/service/AdminCreateCommand.java | 6 +++--- .../admin/service/AdminService.java | 6 +++--- .../service/AdminTokenCreateCommand.java | 8 ++++---- .../admin/service/AdminTokenService.java | 4 ++-- .../admin/service/AdminUpdateCommand.java | 6 +++--- .../domain/base/admin/entity/TokenState.java | 5 ----- .../domain/{base => }/menu/entity/Menu.java | 4 ++-- .../{base => }/menu/entity/MenuGroup.java | 4 ++-- .../menu/entity/MenuGroupRepository.java | 2 +- .../menu/entity/MenuRepository.java | 2 +- .../menu/service/MenuCreateCommand.java | 4 ++-- .../menu/service/MenuGroupCreateCommand.java | 4 ++-- .../menu/service/MenuGroupUpdateCommand.java | 4 ++-- .../{base => }/menu/service/MenuService.java | 10 +++++----- .../menu/service/MenuUpdateCommand.java | 4 ++-- .../domain/{base => }/role/RoleMenuType.java | 2 +- .../domain/{base => }/role/entity/Role.java | 4 ++-- .../{base => }/role/entity/RoleMenu.java | 8 ++++---- .../role/entity/RoleMenuRepository.java | 2 +- .../role/entity/RoleRepository.java | 2 +- .../role/service/RoleAddMenuCommand.java | 10 +++++----- .../role/service/RoleCreateCommand.java | 4 ++-- .../{base => }/role/service/RoleService.java | 8 ++++---- .../role/service/RoleUpdateCommand.java | 4 ++-- .../admin/security/jwt/JwtTokenProvider.java | 2 +- .../web/advice/menu/MenuQueryRepository.java | 12 +++++------ .../AdminManagementQueryRepository.java | 2 +- .../main/admin/role/reqres/RoleAddMenu.java | 2 +- .../admin/AdminManagementAppServiceTest.java | 10 +++++----- .../admin/app/menu/MenuAppServiceTest.java | 8 ++++---- .../admin/app/role/RoleAppServiceTest.java | 10 +++++----- .../admin/service/AdminServiceTest.java | 12 +++++------ .../menu/service/MenuServiceTest.java | 10 +++++----- .../role/service/RoleServiceTest.java | 20 +++++++++---------- 55 files changed, 151 insertions(+), 158 deletions(-) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/BaseEntity.java (93%) delete mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/domain/DomainException.java rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/admin/entity/Admin.java (94%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/admin/entity/AdminActionLog.java (93%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/admin/entity/AdminActionLogRepository.java (81%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/admin/entity/AdminRepository.java (79%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/admin/entity/AdminRole.java (79%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/admin/entity/AdminToken.java (94%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/admin/entity/AdminTokenRepository.java (81%) create mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/TokenState.java rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/admin/service/AdminActionLogCreateCommand.java (81%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/admin/service/AdminActionLogService.java (82%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/admin/service/AdminActionLogUpdateCommand.java (83%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/admin/service/AdminCreateCommand.java (82%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/admin/service/AdminService.java (85%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/admin/service/AdminTokenCreateCommand.java (82%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/admin/service/AdminTokenService.java (88%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/admin/service/AdminUpdateCommand.java (81%) delete mode 100644 poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/TokenState.java rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/menu/entity/Menu.java (93%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/menu/entity/MenuGroup.java (93%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/menu/entity/MenuGroupRepository.java (72%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/menu/entity/MenuRepository.java (70%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/menu/service/MenuCreateCommand.java (86%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/menu/service/MenuGroupCreateCommand.java (86%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/menu/service/MenuGroupUpdateCommand.java (86%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/menu/service/MenuService.java (85%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/menu/service/MenuUpdateCommand.java (86%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/role/RoleMenuType.java (83%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/role/entity/Role.java (92%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/role/entity/RoleMenu.java (83%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/role/entity/RoleMenuRepository.java (72%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/role/entity/RoleRepository.java (70%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/role/service/RoleAddMenuCommand.java (68%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/role/service/RoleCreateCommand.java (81%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/role/service/RoleService.java (86%) rename poc/admin/src/main/java/com/bpgroup/poc/admin/domain/{base => }/role/service/RoleUpdateCommand.java (85%) rename poc/admin/src/test/java/com/bpgroup/poc/admin/domain/{base => }/admin/service/AdminServiceTest.java (95%) rename poc/admin/src/test/java/com/bpgroup/poc/admin/domain/{base => }/menu/service/MenuServiceTest.java (96%) rename poc/admin/src/test/java/com/bpgroup/poc/admin/domain/{base => }/role/service/RoleServiceTest.java (92%) diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogAppService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogAppService.java index c938f40..0fa8c58 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogAppService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminActionLogAppService.java @@ -1,10 +1,10 @@ package com.bpgroup.poc.admin.app.admin; -import com.bpgroup.poc.admin.domain.base.admin.entity.Admin; -import com.bpgroup.poc.admin.domain.base.admin.service.AdminActionLogCreateCommand; -import com.bpgroup.poc.admin.domain.base.admin.service.AdminActionLogService; -import com.bpgroup.poc.admin.domain.base.admin.service.AdminActionLogUpdateCommand; -import com.bpgroup.poc.admin.domain.base.admin.service.AdminService; +import com.bpgroup.poc.admin.domain.admin.entity.Admin; +import com.bpgroup.poc.admin.domain.admin.service.AdminActionLogCreateCommand; +import com.bpgroup.poc.admin.domain.admin.service.AdminActionLogService; +import com.bpgroup.poc.admin.domain.admin.service.AdminActionLogUpdateCommand; +import com.bpgroup.poc.admin.domain.admin.service.AdminService; import com.bpgroup.poc.admin.filter.AdminActionLogCreate; import com.bpgroup.poc.admin.filter.AdminActionLogUpdate; import lombok.RequiredArgsConstructor; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminManagementAppService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminManagementAppService.java index b7f641d..70f4939 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminManagementAppService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminManagementAppService.java @@ -1,12 +1,12 @@ package com.bpgroup.poc.admin.app.admin; -import com.bpgroup.poc.admin.domain.base.admin.entity.Admin; -import com.bpgroup.poc.admin.domain.base.admin.entity.AdminRole; -import com.bpgroup.poc.admin.domain.base.admin.service.AdminCreateCommand; -import com.bpgroup.poc.admin.domain.base.admin.service.AdminService; -import com.bpgroup.poc.admin.domain.base.admin.service.AdminUpdateCommand; -import com.bpgroup.poc.admin.domain.base.role.entity.Role; -import com.bpgroup.poc.admin.domain.base.role.service.RoleService; +import com.bpgroup.poc.admin.domain.admin.entity.Admin; +import com.bpgroup.poc.admin.domain.admin.entity.AdminRole; +import com.bpgroup.poc.admin.domain.admin.service.AdminCreateCommand; +import com.bpgroup.poc.admin.domain.admin.service.AdminService; +import com.bpgroup.poc.admin.domain.admin.service.AdminUpdateCommand; +import com.bpgroup.poc.admin.domain.role.entity.Role; +import com.bpgroup.poc.admin.domain.role.service.RoleService; import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdminCreate; import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdminDelete; import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdminUpdate; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/authentication/AuthenticationService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/authentication/AuthenticationService.java index 3413bc7..4f39b4e 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/authentication/AuthenticationService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/authentication/AuthenticationService.java @@ -3,8 +3,8 @@ package com.bpgroup.poc.admin.app.authentication; import com.bpgroup.poc.admin.app.authentication.exception.AdminNotFoundException; import com.bpgroup.poc.admin.app.authentication.exception.DoNotHaveAnyMenuException; import com.bpgroup.poc.admin.app.authentication.exception.InvalidPasswordException; -import com.bpgroup.poc.admin.domain.base.admin.entity.Admin; -import com.bpgroup.poc.admin.domain.base.admin.entity.AdminRepository; +import com.bpgroup.poc.admin.domain.admin.entity.Admin; +import com.bpgroup.poc.admin.domain.admin.entity.AdminRepository; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/authorization/AuthorizationService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/authorization/AuthorizationService.java index 64cf466..b9e1683 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/authorization/AuthorizationService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/authorization/AuthorizationService.java @@ -1,7 +1,7 @@ package com.bpgroup.poc.admin.app.authorization; -import com.bpgroup.poc.admin.domain.base.admin.entity.Admin; -import com.bpgroup.poc.admin.domain.base.admin.entity.AdminRepository; +import com.bpgroup.poc.admin.domain.admin.entity.Admin; +import com.bpgroup.poc.admin.domain.admin.entity.AdminRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/jwt/JwtTokenRequest.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/jwt/JwtTokenRequest.java index 10fbebf..494470a 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/jwt/JwtTokenRequest.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/jwt/JwtTokenRequest.java @@ -1,6 +1,6 @@ package com.bpgroup.poc.admin.app.jwt; -import com.bpgroup.poc.admin.domain.base.admin.entity.TokenState; +import com.bpgroup.poc.admin.domain.admin.entity.TokenState; import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/jwt/JwtTokenService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/jwt/JwtTokenService.java index ee74098..5734c7d 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/jwt/JwtTokenService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/jwt/JwtTokenService.java @@ -1,9 +1,9 @@ package com.bpgroup.poc.admin.app.jwt; -import com.bpgroup.poc.admin.domain.base.admin.entity.Admin; -import com.bpgroup.poc.admin.domain.base.admin.service.AdminService; -import com.bpgroup.poc.admin.domain.base.admin.service.AdminTokenCreateCommand; -import com.bpgroup.poc.admin.domain.base.admin.service.AdminTokenService; +import com.bpgroup.poc.admin.domain.admin.entity.Admin; +import com.bpgroup.poc.admin.domain.admin.service.AdminService; +import com.bpgroup.poc.admin.domain.admin.service.AdminTokenCreateCommand; +import com.bpgroup.poc.admin.domain.admin.service.AdminTokenService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/menu/MenuAppService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/menu/MenuAppService.java index 70ae30c..302535b 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/menu/MenuAppService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/menu/MenuAppService.java @@ -1,6 +1,6 @@ package com.bpgroup.poc.admin.app.menu; -import com.bpgroup.poc.admin.domain.base.menu.service.*; +import com.bpgroup.poc.admin.domain.menu.service.*; import com.bpgroup.poc.admin.web.main.admin.menu.reqres.*; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/role/RoleAppService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/role/RoleAppService.java index 8fa8d26..cb2095c 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/role/RoleAppService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/role/RoleAppService.java @@ -1,9 +1,9 @@ package com.bpgroup.poc.admin.app.role; -import com.bpgroup.poc.admin.domain.base.menu.entity.Menu; -import com.bpgroup.poc.admin.domain.base.menu.service.MenuService; -import com.bpgroup.poc.admin.domain.base.role.entity.Role; -import com.bpgroup.poc.admin.domain.base.role.service.*; +import com.bpgroup.poc.admin.domain.menu.entity.Menu; +import com.bpgroup.poc.admin.domain.menu.service.MenuService; +import com.bpgroup.poc.admin.domain.role.entity.Role; +import com.bpgroup.poc.admin.domain.role.service.*; import com.bpgroup.poc.admin.web.main.admin.role.reqres.RoleAddMenu; import com.bpgroup.poc.admin.web.main.admin.role.reqres.RoleCreate; import com.bpgroup.poc.admin.web.main.admin.role.reqres.RoleDelete; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/BaseEntity.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/BaseEntity.java similarity index 93% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/BaseEntity.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/BaseEntity.java index e739d9b..e76b888 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/BaseEntity.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.base; +package com.bpgroup.poc.admin.domain; import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/DomainException.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/DomainException.java deleted file mode 100644 index d7f046c..0000000 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/DomainException.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.bpgroup.poc.admin.domain; - -public class DomainException extends RuntimeException { - public DomainException() { - super(); - } -} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/Admin.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Admin.java similarity index 94% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/Admin.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Admin.java index 567b916..2a364af 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/Admin.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Admin.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.base.admin.entity; +package com.bpgroup.poc.admin.domain.admin.entity; -import com.bpgroup.poc.admin.domain.base.BaseEntity; +import com.bpgroup.poc.admin.domain.BaseEntity; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminActionLog.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminActionLog.java similarity index 93% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminActionLog.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminActionLog.java index 870070c..92139b1 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminActionLog.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminActionLog.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.base.admin.entity; +package com.bpgroup.poc.admin.domain.admin.entity; -import com.bpgroup.poc.admin.domain.base.BaseEntity; +import com.bpgroup.poc.admin.domain.BaseEntity; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminActionLogRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminActionLogRepository.java similarity index 81% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminActionLogRepository.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminActionLogRepository.java index def66d2..0d69ec2 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminActionLogRepository.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminActionLogRepository.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.base.admin.entity; +package com.bpgroup.poc.admin.domain.admin.entity; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminRepository.java similarity index 79% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminRepository.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminRepository.java index d2eadff..4d3d73d 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminRepository.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminRepository.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.base.admin.entity; +package com.bpgroup.poc.admin.domain.admin.entity; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminRole.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminRole.java similarity index 79% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminRole.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminRole.java index 291d7fe..b9191c0 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminRole.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminRole.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.base.admin.entity; +package com.bpgroup.poc.admin.domain.admin.entity; -import com.bpgroup.poc.admin.domain.base.role.entity.Role; +import com.bpgroup.poc.admin.domain.role.entity.Role; import jakarta.persistence.*; import lombok.Builder; import lombok.Getter; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminToken.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminToken.java similarity index 94% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminToken.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminToken.java index 2d870dc..ec3341b 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminToken.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminToken.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.base.admin.entity; +package com.bpgroup.poc.admin.domain.admin.entity; -import com.bpgroup.poc.admin.domain.base.BaseEntity; +import com.bpgroup.poc.admin.domain.BaseEntity; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminTokenRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminTokenRepository.java similarity index 81% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminTokenRepository.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminTokenRepository.java index 8e95336..36235e5 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/AdminTokenRepository.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminTokenRepository.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.base.admin.entity; +package com.bpgroup.poc.admin.domain.admin.entity; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/TokenState.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/TokenState.java new file mode 100644 index 0000000..0431de8 --- /dev/null +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/TokenState.java @@ -0,0 +1,5 @@ +package com.bpgroup.poc.admin.domain.admin.entity; + +public enum TokenState { + NORMAL, EXPIRED +} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminActionLogCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogCreateCommand.java similarity index 81% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminActionLogCreateCommand.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogCreateCommand.java index 0fac673..6343471 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminActionLogCreateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogCreateCommand.java @@ -1,7 +1,7 @@ -package com.bpgroup.poc.admin.domain.base.admin.service; +package com.bpgroup.poc.admin.domain.admin.service; -import com.bpgroup.poc.admin.domain.base.admin.entity.Admin; -import com.bpgroup.poc.admin.domain.base.admin.entity.AdminActionLog; +import com.bpgroup.poc.admin.domain.admin.entity.Admin; +import com.bpgroup.poc.admin.domain.admin.entity.AdminActionLog; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminActionLogService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogService.java similarity index 82% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminActionLogService.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogService.java index c8702f5..4d2fae7 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminActionLogService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogService.java @@ -1,7 +1,7 @@ -package com.bpgroup.poc.admin.domain.base.admin.service; +package com.bpgroup.poc.admin.domain.admin.service; -import com.bpgroup.poc.admin.domain.base.admin.entity.AdminActionLog; -import com.bpgroup.poc.admin.domain.base.admin.entity.AdminActionLogRepository; +import com.bpgroup.poc.admin.domain.admin.entity.AdminActionLog; +import com.bpgroup.poc.admin.domain.admin.entity.AdminActionLogRepository; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminActionLogUpdateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogUpdateCommand.java similarity index 83% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminActionLogUpdateCommand.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogUpdateCommand.java index 3894647..2869f53 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminActionLogUpdateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogUpdateCommand.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.base.admin.service; +package com.bpgroup.poc.admin.domain.admin.service; -import com.bpgroup.poc.admin.domain.base.admin.entity.AdminActionLog; +import com.bpgroup.poc.admin.domain.admin.entity.AdminActionLog; import jakarta.validation.constraints.NotBlank; import lombok.AccessLevel; import lombok.Getter; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminCreateCommand.java similarity index 82% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminCreateCommand.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminCreateCommand.java index e464a70..f48c945 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminCreateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminCreateCommand.java @@ -1,7 +1,7 @@ -package com.bpgroup.poc.admin.domain.base.admin.service; +package com.bpgroup.poc.admin.domain.admin.service; -import com.bpgroup.poc.admin.domain.base.admin.entity.Admin; -import com.bpgroup.poc.admin.domain.base.admin.entity.AdminRole; +import com.bpgroup.poc.admin.domain.admin.entity.Admin; +import com.bpgroup.poc.admin.domain.admin.entity.AdminRole; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminService.java similarity index 85% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminService.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminService.java index 5843e3e..9a59df7 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminService.java @@ -1,7 +1,7 @@ -package com.bpgroup.poc.admin.domain.base.admin.service; +package com.bpgroup.poc.admin.domain.admin.service; -import com.bpgroup.poc.admin.domain.base.admin.entity.Admin; -import com.bpgroup.poc.admin.domain.base.admin.entity.AdminRepository; +import com.bpgroup.poc.admin.domain.admin.entity.Admin; +import com.bpgroup.poc.admin.domain.admin.entity.AdminRepository; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminTokenCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminTokenCreateCommand.java similarity index 82% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminTokenCreateCommand.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminTokenCreateCommand.java index a877d49..c19ffcf 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminTokenCreateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminTokenCreateCommand.java @@ -1,8 +1,8 @@ -package com.bpgroup.poc.admin.domain.base.admin.service; +package com.bpgroup.poc.admin.domain.admin.service; -import com.bpgroup.poc.admin.domain.base.admin.entity.Admin; -import com.bpgroup.poc.admin.domain.base.admin.entity.AdminToken; -import com.bpgroup.poc.admin.domain.base.admin.entity.TokenState; +import com.bpgroup.poc.admin.domain.admin.entity.Admin; +import com.bpgroup.poc.admin.domain.admin.entity.AdminToken; +import com.bpgroup.poc.admin.domain.admin.entity.TokenState; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminTokenService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminTokenService.java similarity index 88% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminTokenService.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminTokenService.java index d57e2c6..64612d3 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminTokenService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminTokenService.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.base.admin.service; +package com.bpgroup.poc.admin.domain.admin.service; -import com.bpgroup.poc.admin.domain.base.admin.entity.*; +import com.bpgroup.poc.admin.domain.admin.entity.*; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminUpdateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminUpdateCommand.java similarity index 81% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminUpdateCommand.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminUpdateCommand.java index f03b6e7..2ecc918 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminUpdateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminUpdateCommand.java @@ -1,7 +1,7 @@ -package com.bpgroup.poc.admin.domain.base.admin.service; +package com.bpgroup.poc.admin.domain.admin.service; -import com.bpgroup.poc.admin.domain.base.admin.entity.Admin; -import com.bpgroup.poc.admin.domain.base.admin.entity.AdminRole; +import com.bpgroup.poc.admin.domain.admin.entity.Admin; +import com.bpgroup.poc.admin.domain.admin.entity.AdminRole; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/TokenState.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/TokenState.java deleted file mode 100644 index d21be6c..0000000 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/admin/entity/TokenState.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.bpgroup.poc.admin.domain.base.admin.entity; - -public enum TokenState { - NORMAL, EXPIRED -} diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/entity/Menu.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/Menu.java similarity index 93% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/entity/Menu.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/Menu.java index e0e0e3f..8f33524 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/entity/Menu.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/Menu.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.base.menu.entity; +package com.bpgroup.poc.admin.domain.menu.entity; -import com.bpgroup.poc.admin.domain.base.BaseEntity; +import com.bpgroup.poc.admin.domain.BaseEntity; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/entity/MenuGroup.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuGroup.java similarity index 93% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/entity/MenuGroup.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuGroup.java index 4861ee3..6bfd05e 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/entity/MenuGroup.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuGroup.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.base.menu.entity; +package com.bpgroup.poc.admin.domain.menu.entity; -import com.bpgroup.poc.admin.domain.base.BaseEntity; +import com.bpgroup.poc.admin.domain.BaseEntity; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/entity/MenuGroupRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuGroupRepository.java similarity index 72% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/entity/MenuGroupRepository.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuGroupRepository.java index 844868b..f9ffe12 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/entity/MenuGroupRepository.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuGroupRepository.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.base.menu.entity; +package com.bpgroup.poc.admin.domain.menu.entity; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/entity/MenuRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuRepository.java similarity index 70% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/entity/MenuRepository.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuRepository.java index f4f3cfd..9d08b23 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/entity/MenuRepository.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuRepository.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.base.menu.entity; +package com.bpgroup.poc.admin.domain.menu.entity; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuCreateCommand.java similarity index 86% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuCreateCommand.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuCreateCommand.java index 1c51a0f..819335c 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuCreateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuCreateCommand.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.base.menu.service; +package com.bpgroup.poc.admin.domain.menu.service; -import com.bpgroup.poc.admin.domain.base.menu.entity.Menu; +import com.bpgroup.poc.admin.domain.menu.entity.Menu; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuGroupCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuGroupCreateCommand.java similarity index 86% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuGroupCreateCommand.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuGroupCreateCommand.java index 2d5d685..a02fb3b 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuGroupCreateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuGroupCreateCommand.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.base.menu.service; +package com.bpgroup.poc.admin.domain.menu.service; -import com.bpgroup.poc.admin.domain.base.menu.entity.MenuGroup; +import com.bpgroup.poc.admin.domain.menu.entity.MenuGroup; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuGroupUpdateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuGroupUpdateCommand.java similarity index 86% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuGroupUpdateCommand.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuGroupUpdateCommand.java index d59b71f..5922150 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuGroupUpdateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuGroupUpdateCommand.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.base.menu.service; +package com.bpgroup.poc.admin.domain.menu.service; -import com.bpgroup.poc.admin.domain.base.menu.entity.MenuGroup; +import com.bpgroup.poc.admin.domain.menu.entity.MenuGroup; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuService.java similarity index 85% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuService.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuService.java index 73a08b6..510e16b 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuService.java @@ -1,9 +1,9 @@ -package com.bpgroup.poc.admin.domain.base.menu.service; +package com.bpgroup.poc.admin.domain.menu.service; -import com.bpgroup.poc.admin.domain.base.menu.entity.Menu; -import com.bpgroup.poc.admin.domain.base.menu.entity.MenuGroup; -import com.bpgroup.poc.admin.domain.base.menu.entity.MenuGroupRepository; -import com.bpgroup.poc.admin.domain.base.menu.entity.MenuRepository; +import com.bpgroup.poc.admin.domain.menu.entity.Menu; +import com.bpgroup.poc.admin.domain.menu.entity.MenuGroup; +import com.bpgroup.poc.admin.domain.menu.entity.MenuGroupRepository; +import com.bpgroup.poc.admin.domain.menu.entity.MenuRepository; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuUpdateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuUpdateCommand.java similarity index 86% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuUpdateCommand.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuUpdateCommand.java index bf0660b..5bdcb42 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuUpdateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuUpdateCommand.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.base.menu.service; +package com.bpgroup.poc.admin.domain.menu.service; -import com.bpgroup.poc.admin.domain.base.menu.entity.Menu; +import com.bpgroup.poc.admin.domain.menu.entity.Menu; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/RoleMenuType.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/RoleMenuType.java similarity index 83% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/RoleMenuType.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/RoleMenuType.java index 79d5254..c7b8ff6 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/RoleMenuType.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/RoleMenuType.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.base.role; +package com.bpgroup.poc.admin.domain.role; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/entity/Role.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/Role.java similarity index 92% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/entity/Role.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/Role.java index 2352c07..fd20ffa 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/entity/Role.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/Role.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.base.role.entity; +package com.bpgroup.poc.admin.domain.role.entity; -import com.bpgroup.poc.admin.domain.base.BaseEntity; +import com.bpgroup.poc.admin.domain.BaseEntity; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/entity/RoleMenu.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleMenu.java similarity index 83% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/entity/RoleMenu.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleMenu.java index 4c99218..da32dae 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/entity/RoleMenu.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleMenu.java @@ -1,8 +1,8 @@ -package com.bpgroup.poc.admin.domain.base.role.entity; +package com.bpgroup.poc.admin.domain.role.entity; -import com.bpgroup.poc.admin.domain.base.BaseEntity; -import com.bpgroup.poc.admin.domain.base.menu.entity.Menu; -import com.bpgroup.poc.admin.domain.base.role.RoleMenuType; +import com.bpgroup.poc.admin.domain.BaseEntity; +import com.bpgroup.poc.admin.domain.menu.entity.Menu; +import com.bpgroup.poc.admin.domain.role.RoleMenuType; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/entity/RoleMenuRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleMenuRepository.java similarity index 72% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/entity/RoleMenuRepository.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleMenuRepository.java index beb122c..d8c8dcf 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/entity/RoleMenuRepository.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleMenuRepository.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.base.role.entity; +package com.bpgroup.poc.admin.domain.role.entity; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/entity/RoleRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleRepository.java similarity index 70% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/entity/RoleRepository.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleRepository.java index 70a8f15..e8edf77 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/entity/RoleRepository.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleRepository.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.base.role.entity; +package com.bpgroup.poc.admin.domain.role.entity; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/service/RoleAddMenuCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleAddMenuCommand.java similarity index 68% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/service/RoleAddMenuCommand.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleAddMenuCommand.java index 9893843..f21d611 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/service/RoleAddMenuCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleAddMenuCommand.java @@ -1,9 +1,9 @@ -package com.bpgroup.poc.admin.domain.base.role.service; +package com.bpgroup.poc.admin.domain.role.service; -import com.bpgroup.poc.admin.domain.base.menu.entity.Menu; -import com.bpgroup.poc.admin.domain.base.role.RoleMenuType; -import com.bpgroup.poc.admin.domain.base.role.entity.Role; -import com.bpgroup.poc.admin.domain.base.role.entity.RoleMenu; +import com.bpgroup.poc.admin.domain.menu.entity.Menu; +import com.bpgroup.poc.admin.domain.role.RoleMenuType; +import com.bpgroup.poc.admin.domain.role.entity.Role; +import com.bpgroup.poc.admin.domain.role.entity.RoleMenu; import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.Getter; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/service/RoleCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleCreateCommand.java similarity index 81% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/service/RoleCreateCommand.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleCreateCommand.java index 02f8fdb..a27553e 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/service/RoleCreateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleCreateCommand.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.base.role.service; +package com.bpgroup.poc.admin.domain.role.service; -import com.bpgroup.poc.admin.domain.base.role.entity.Role; +import com.bpgroup.poc.admin.domain.role.entity.Role; import jakarta.validation.constraints.NotBlank; import lombok.*; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/service/RoleService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleService.java similarity index 86% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/service/RoleService.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleService.java index cffaf7c..a6b18c0 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/service/RoleService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleService.java @@ -1,8 +1,8 @@ -package com.bpgroup.poc.admin.domain.base.role.service; +package com.bpgroup.poc.admin.domain.role.service; -import com.bpgroup.poc.admin.domain.base.role.entity.Role; -import com.bpgroup.poc.admin.domain.base.role.entity.RoleMenuRepository; -import com.bpgroup.poc.admin.domain.base.role.entity.RoleRepository; +import com.bpgroup.poc.admin.domain.role.entity.Role; +import com.bpgroup.poc.admin.domain.role.entity.RoleMenuRepository; +import com.bpgroup.poc.admin.domain.role.entity.RoleRepository; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/service/RoleUpdateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleUpdateCommand.java similarity index 85% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/service/RoleUpdateCommand.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleUpdateCommand.java index 7807450..cc52a45 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/base/role/service/RoleUpdateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleUpdateCommand.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.base.role.service; +package com.bpgroup.poc.admin.domain.role.service; -import com.bpgroup.poc.admin.domain.base.role.entity.Role; +import com.bpgroup.poc.admin.domain.role.entity.Role; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/jwt/JwtTokenProvider.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/jwt/JwtTokenProvider.java index 3f32bb0..04dd3e5 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/jwt/JwtTokenProvider.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/jwt/JwtTokenProvider.java @@ -2,7 +2,7 @@ package com.bpgroup.poc.admin.security.jwt; import com.bpgroup.poc.admin.app.jwt.JwtTokenRequest; import com.bpgroup.poc.admin.app.jwt.JwtTokenService; -import com.bpgroup.poc.admin.domain.base.admin.entity.TokenState; +import com.bpgroup.poc.admin.domain.admin.entity.TokenState; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.Jwts; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/menu/MenuQueryRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/menu/MenuQueryRepository.java index 46d3716..245efe3 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/menu/MenuQueryRepository.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/menu/MenuQueryRepository.java @@ -7,12 +7,12 @@ import org.springframework.stereotype.Repository; import java.util.*; -import static com.bpgroup.poc.admin.domain.base.admin.entity.QAdmin.admin; -import static com.bpgroup.poc.admin.domain.base.admin.entity.QAdminRole.adminRole; -import static com.bpgroup.poc.admin.domain.base.menu.entity.QMenu.menu; -import static com.bpgroup.poc.admin.domain.base.menu.entity.QMenuGroup.menuGroup; -import static com.bpgroup.poc.admin.domain.base.role.entity.QRole.role; -import static com.bpgroup.poc.admin.domain.base.role.entity.QRoleMenu.roleMenu; +import static com.bpgroup.poc.admin.domain.admin.entity.QAdmin.admin; +import static com.bpgroup.poc.admin.domain.admin.entity.QAdminRole.adminRole; +import static com.bpgroup.poc.admin.domain.menu.entity.QMenu.menu; +import static com.bpgroup.poc.admin.domain.menu.entity.QMenuGroup.menuGroup; +import static com.bpgroup.poc.admin.domain.role.entity.QRole.role; +import static com.bpgroup.poc.admin.domain.role.entity.QRoleMenu.roleMenu; @Repository @RequiredArgsConstructor diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdminManagementQueryRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdminManagementQueryRepository.java index a45a638..4a47218 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdminManagementQueryRepository.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdminManagementQueryRepository.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Repository; import java.util.List; -import static com.bpgroup.poc.admin.domain.base.admin.entity.QAdmin.admin; +import static com.bpgroup.poc.admin.domain.admin.entity.QAdmin.admin; @Repository diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleAddMenu.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleAddMenu.java index e57795b..01e742c 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleAddMenu.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleAddMenu.java @@ -1,6 +1,6 @@ package com.bpgroup.poc.admin.web.main.admin.role.reqres; -import com.bpgroup.poc.admin.domain.base.role.RoleMenuType; +import com.bpgroup.poc.admin.domain.role.RoleMenuType; import com.bpgroup.poc.admin.web.common.CommonResponse; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/app/admin/AdminManagementAppServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/app/admin/AdminManagementAppServiceTest.java index 3a2a029..f470f02 100644 --- a/poc/admin/src/test/java/com/bpgroup/poc/admin/app/admin/AdminManagementAppServiceTest.java +++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/app/admin/AdminManagementAppServiceTest.java @@ -1,10 +1,10 @@ package com.bpgroup.poc.admin.app.admin; -import com.bpgroup.poc.admin.domain.base.admin.entity.Admin; -import com.bpgroup.poc.admin.domain.base.admin.entity.AdminRepository; -import com.bpgroup.poc.admin.domain.base.admin.entity.AdminRole; -import com.bpgroup.poc.admin.domain.base.role.entity.Role; -import com.bpgroup.poc.admin.domain.base.role.entity.RoleRepository; +import com.bpgroup.poc.admin.domain.admin.entity.Admin; +import com.bpgroup.poc.admin.domain.admin.entity.AdminRepository; +import com.bpgroup.poc.admin.domain.admin.entity.AdminRole; +import com.bpgroup.poc.admin.domain.role.entity.Role; +import com.bpgroup.poc.admin.domain.role.entity.RoleRepository; import com.bpgroup.poc.admin.env.MariaDBTestEnv; import com.bpgroup.poc.admin.app.admin.AdminManagementAppService; import com.bpgroup.poc.admin.web.main.admin.management.reqres.AdminCreate; diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/app/menu/MenuAppServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/app/menu/MenuAppServiceTest.java index 967cb6f..1d044c3 100644 --- a/poc/admin/src/test/java/com/bpgroup/poc/admin/app/menu/MenuAppServiceTest.java +++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/app/menu/MenuAppServiceTest.java @@ -1,9 +1,9 @@ package com.bpgroup.poc.admin.app.menu; -import com.bpgroup.poc.admin.domain.base.menu.entity.Menu; -import com.bpgroup.poc.admin.domain.base.menu.entity.MenuGroup; -import com.bpgroup.poc.admin.domain.base.menu.entity.MenuGroupRepository; -import com.bpgroup.poc.admin.domain.base.menu.entity.MenuRepository; +import com.bpgroup.poc.admin.domain.menu.entity.Menu; +import com.bpgroup.poc.admin.domain.menu.entity.MenuGroup; +import com.bpgroup.poc.admin.domain.menu.entity.MenuGroupRepository; +import com.bpgroup.poc.admin.domain.menu.entity.MenuRepository; import com.bpgroup.poc.admin.env.MariaDBTestEnv; import com.bpgroup.poc.admin.app.menu.MenuAppService; import com.bpgroup.poc.admin.web.main.admin.menu.reqres.*; diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/app/role/RoleAppServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/app/role/RoleAppServiceTest.java index c9799b4..6a3ea1e 100644 --- a/poc/admin/src/test/java/com/bpgroup/poc/admin/app/role/RoleAppServiceTest.java +++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/app/role/RoleAppServiceTest.java @@ -1,10 +1,10 @@ package com.bpgroup.poc.admin.app.role; -import com.bpgroup.poc.admin.domain.base.menu.entity.Menu; -import com.bpgroup.poc.admin.domain.base.menu.entity.MenuRepository; -import com.bpgroup.poc.admin.domain.base.role.RoleMenuType; -import com.bpgroup.poc.admin.domain.base.role.entity.Role; -import com.bpgroup.poc.admin.domain.base.role.entity.RoleRepository; +import com.bpgroup.poc.admin.domain.menu.entity.Menu; +import com.bpgroup.poc.admin.domain.menu.entity.MenuRepository; +import com.bpgroup.poc.admin.domain.role.RoleMenuType; +import com.bpgroup.poc.admin.domain.role.entity.Role; +import com.bpgroup.poc.admin.domain.role.entity.RoleRepository; import com.bpgroup.poc.admin.env.MariaDBTestEnv; import com.bpgroup.poc.admin.app.role.RoleAppService; import com.bpgroup.poc.admin.web.main.admin.role.reqres.RoleAddMenu; diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/admin/service/AdminServiceTest.java similarity index 95% rename from poc/admin/src/test/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminServiceTest.java rename to poc/admin/src/test/java/com/bpgroup/poc/admin/domain/admin/service/AdminServiceTest.java index fdbead2..4dbe296 100644 --- a/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/base/admin/service/AdminServiceTest.java +++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/admin/service/AdminServiceTest.java @@ -1,10 +1,10 @@ -package com.bpgroup.poc.admin.domain.base.admin.service; +package com.bpgroup.poc.admin.domain.admin.service; -import com.bpgroup.poc.admin.domain.base.admin.entity.Admin; -import com.bpgroup.poc.admin.domain.base.admin.entity.AdminRepository; -import com.bpgroup.poc.admin.domain.base.admin.entity.AdminRole; -import com.bpgroup.poc.admin.domain.base.role.entity.Role; -import com.bpgroup.poc.admin.domain.base.role.entity.RoleRepository; +import com.bpgroup.poc.admin.domain.admin.entity.Admin; +import com.bpgroup.poc.admin.domain.admin.entity.AdminRepository; +import com.bpgroup.poc.admin.domain.admin.entity.AdminRole; +import com.bpgroup.poc.admin.domain.role.entity.Role; +import com.bpgroup.poc.admin.domain.role.entity.RoleRepository; import com.bpgroup.poc.admin.env.MariaDBTestEnv; import jakarta.validation.ConstraintViolationException; import org.jetbrains.annotations.NotNull; diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/menu/service/MenuServiceTest.java similarity index 96% rename from poc/admin/src/test/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuServiceTest.java rename to poc/admin/src/test/java/com/bpgroup/poc/admin/domain/menu/service/MenuServiceTest.java index a7102a9..3e5d8ca 100644 --- a/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/base/menu/service/MenuServiceTest.java +++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/menu/service/MenuServiceTest.java @@ -1,9 +1,9 @@ -package com.bpgroup.poc.admin.domain.base.menu.service; +package com.bpgroup.poc.admin.domain.menu.service; -import com.bpgroup.poc.admin.domain.base.menu.entity.Menu; -import com.bpgroup.poc.admin.domain.base.menu.entity.MenuGroup; -import com.bpgroup.poc.admin.domain.base.menu.entity.MenuGroupRepository; -import com.bpgroup.poc.admin.domain.base.menu.entity.MenuRepository; +import com.bpgroup.poc.admin.domain.menu.entity.Menu; +import com.bpgroup.poc.admin.domain.menu.entity.MenuGroup; +import com.bpgroup.poc.admin.domain.menu.entity.MenuGroupRepository; +import com.bpgroup.poc.admin.domain.menu.entity.MenuRepository; import com.bpgroup.poc.admin.env.MariaDBTestEnv; import jakarta.validation.ConstraintViolationException; import org.assertj.core.api.Assertions; diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/base/role/service/RoleServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/role/service/RoleServiceTest.java similarity index 92% rename from poc/admin/src/test/java/com/bpgroup/poc/admin/domain/base/role/service/RoleServiceTest.java rename to poc/admin/src/test/java/com/bpgroup/poc/admin/domain/role/service/RoleServiceTest.java index b22c0bb..ea6015c 100644 --- a/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/base/role/service/RoleServiceTest.java +++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/role/service/RoleServiceTest.java @@ -1,14 +1,14 @@ -package com.bpgroup.poc.admin.domain.base.role.service; +package com.bpgroup.poc.admin.domain.role.service; -import com.bpgroup.poc.admin.domain.base.role.RoleMenuType; -import com.bpgroup.poc.admin.domain.base.role.entity.Role; -import com.bpgroup.poc.admin.domain.base.role.entity.RoleMenu; -import com.bpgroup.poc.admin.domain.base.role.entity.RoleMenuRepository; -import com.bpgroup.poc.admin.domain.base.role.entity.RoleRepository; -import com.bpgroup.poc.admin.domain.base.menu.entity.Menu; -import com.bpgroup.poc.admin.domain.base.menu.entity.MenuGroup; -import com.bpgroup.poc.admin.domain.base.menu.entity.MenuGroupRepository; -import com.bpgroup.poc.admin.domain.base.menu.entity.MenuRepository; +import com.bpgroup.poc.admin.domain.role.RoleMenuType; +import com.bpgroup.poc.admin.domain.role.entity.Role; +import com.bpgroup.poc.admin.domain.role.entity.RoleMenu; +import com.bpgroup.poc.admin.domain.role.entity.RoleMenuRepository; +import com.bpgroup.poc.admin.domain.role.entity.RoleRepository; +import com.bpgroup.poc.admin.domain.menu.entity.Menu; +import com.bpgroup.poc.admin.domain.menu.entity.MenuGroup; +import com.bpgroup.poc.admin.domain.menu.entity.MenuGroupRepository; +import com.bpgroup.poc.admin.domain.menu.entity.MenuRepository; import com.bpgroup.poc.admin.env.MariaDBTestEnv; import jakarta.validation.ConstraintViolationException; import org.junit.jupiter.api.BeforeEach;