diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/BaseEntity.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/BaseEntity.java similarity index 93% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/BaseEntity.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/BaseEntity.java index e76b888..54422f2 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/BaseEntity.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/BaseEntity.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain; +package com.bpgroup.poc.admin.domain.entity; import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Administrator.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/administrator/Administrator.java similarity index 91% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Administrator.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/administrator/Administrator.java index f7fc3aa..832a684 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Administrator.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/administrator/Administrator.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.admin.entity; +package com.bpgroup.poc.admin.domain.entity.administrator; -import com.bpgroup.poc.admin.domain.BaseEntity; +import com.bpgroup.poc.admin.domain.entity.BaseEntity; import jakarta.persistence.*; import lombok.Builder; import lombok.Getter; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdministratorRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/administrator/AdministratorRepository.java similarity index 80% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdministratorRepository.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/administrator/AdministratorRepository.java index b81a4ad..07f8756 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdministratorRepository.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/administrator/AdministratorRepository.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.admin.entity; +package com.bpgroup.poc.admin.domain.entity.administrator; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdministratorRole.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/administrator/AdministratorRole.java similarity index 79% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdministratorRole.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/administrator/AdministratorRole.java index 29540a5..56392dc 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdministratorRole.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/administrator/AdministratorRole.java @@ -1,6 +1,7 @@ -package com.bpgroup.poc.admin.domain.admin.entity; +package com.bpgroup.poc.admin.domain.entity.administrator; -import com.bpgroup.poc.admin.domain.BaseEntity; +import com.bpgroup.poc.admin.domain.entity.BaseEntity; +import com.bpgroup.poc.admin.domain.entity.role.Role; import jakarta.persistence.*; import lombok.Getter; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/exception/DuplicationAdministratorException.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/exception/DuplicationAdministratorException.java similarity index 79% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/exception/DuplicationAdministratorException.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/exception/DuplicationAdministratorException.java index 356b127..554ffc0 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/exception/DuplicationAdministratorException.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/exception/DuplicationAdministratorException.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.admin.exception; +package com.bpgroup.poc.admin.domain.entity.exception; public class DuplicationAdministratorException extends RuntimeException { public DuplicationAdministratorException(String loginId) { diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/exception/NotFoundAdministratorException.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/exception/NotFoundAdministratorException.java similarity index 78% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/exception/NotFoundAdministratorException.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/exception/NotFoundAdministratorException.java index 2f2a2da..ffd4fe6 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/exception/NotFoundAdministratorException.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/exception/NotFoundAdministratorException.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.admin.exception; +package com.bpgroup.poc.admin.domain.entity.exception; import com.bpgroup.poc.admin.domain.DomainException; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Menu.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/menu/Menu.java similarity index 91% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Menu.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/menu/Menu.java index 81afce1..300eee5 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Menu.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/menu/Menu.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.admin.entity; +package com.bpgroup.poc.admin.domain.entity.menu; -import com.bpgroup.poc.admin.domain.BaseEntity; +import com.bpgroup.poc.admin.domain.entity.BaseEntity; import jakarta.persistence.*; import lombok.Builder; import lombok.Getter; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuGroup.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/menu/MenuGroup.java similarity index 92% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuGroup.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/menu/MenuGroup.java index b6029d7..1de2b60 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuGroup.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/menu/MenuGroup.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.admin.entity; +package com.bpgroup.poc.admin.domain.entity.menu; -import com.bpgroup.poc.admin.domain.BaseEntity; +import com.bpgroup.poc.admin.domain.entity.BaseEntity; import jakarta.persistence.*; import lombok.Builder; import lombok.Getter; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuGroupRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/menu/MenuGroupRepository.java similarity index 73% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuGroupRepository.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/menu/MenuGroupRepository.java index cdc5f47..6fe9035 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuGroupRepository.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/menu/MenuGroupRepository.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.admin.entity; +package com.bpgroup.poc.admin.domain.entity.menu; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/menu/MenuRepository.java similarity index 72% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuRepository.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/menu/MenuRepository.java index c3d12dd..63fc004 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuRepository.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/menu/MenuRepository.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.admin.entity; +package com.bpgroup.poc.admin.domain.entity.menu; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Role.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/role/Role.java similarity index 89% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Role.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/role/Role.java index b83381f..ea110da 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Role.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/role/Role.java @@ -1,6 +1,6 @@ -package com.bpgroup.poc.admin.domain.admin.entity; +package com.bpgroup.poc.admin.domain.entity.role; -import com.bpgroup.poc.admin.domain.BaseEntity; +import com.bpgroup.poc.admin.domain.entity.BaseEntity; import jakarta.persistence.*; import lombok.Builder; import lombok.Getter; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/RoleMenu.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/role/RoleMenu.java similarity index 78% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/RoleMenu.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/role/RoleMenu.java index 0779612..bbe0ee1 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/RoleMenu.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/role/RoleMenu.java @@ -1,6 +1,7 @@ -package com.bpgroup.poc.admin.domain.admin.entity; +package com.bpgroup.poc.admin.domain.entity.role; -import com.bpgroup.poc.admin.domain.BaseEntity; +import com.bpgroup.poc.admin.domain.entity.BaseEntity; +import com.bpgroup.poc.admin.domain.entity.menu.Menu; import jakarta.persistence.*; import lombok.Getter; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/RoleRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/role/RoleRepository.java similarity index 72% rename from poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/RoleRepository.java rename to poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/role/RoleRepository.java index 3747729..cb12527 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/RoleRepository.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/role/RoleRepository.java @@ -1,4 +1,4 @@ -package com.bpgroup.poc.admin.domain.admin.entity; +package com.bpgroup.poc.admin.domain.entity.role; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/LoginService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/LoginService.java index 4769cd7..1c90bc9 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/LoginService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/LoginService.java @@ -1,7 +1,7 @@ package com.bpgroup.poc.admin.security.authentication.service; -import com.bpgroup.poc.admin.domain.admin.entity.Administrator; -import com.bpgroup.poc.admin.domain.admin.entity.AdministratorRepository; +import com.bpgroup.poc.admin.domain.entity.administrator.Administrator; +import com.bpgroup.poc.admin.domain.entity.administrator.AdministratorRepository; import com.bpgroup.poc.admin.security.authentication.service.exception.AdministratorNotFoundException; import com.bpgroup.poc.admin.security.authentication.service.exception.DoNotHaveAnyMenuException; import com.bpgroup.poc.admin.security.authentication.service.exception.InvalidPasswordException; 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 bc50a50..55f5b6d 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.admin.entity.QAdministrator.administrator; -import static com.bpgroup.poc.admin.domain.admin.entity.QAdministratorRole.administratorRole; -import static com.bpgroup.poc.admin.domain.admin.entity.QMenu.menu; -import static com.bpgroup.poc.admin.domain.admin.entity.QMenuGroup.menuGroup; -import static com.bpgroup.poc.admin.domain.admin.entity.QRole.role; -import static com.bpgroup.poc.admin.domain.admin.entity.QRoleMenu.roleMenu; +import static com.bpgroup.poc.admin.domain.entity.administrator.QAdministrator.administrator; +import static com.bpgroup.poc.admin.domain.entity.administrator.QAdministratorRole.administratorRole; +import static com.bpgroup.poc.admin.domain.entity.menu.QMenu.menu; +import static com.bpgroup.poc.admin.domain.entity.menu.QMenuGroup.menuGroup; +import static com.bpgroup.poc.admin.domain.entity.role.QRole.role; +import static com.bpgroup.poc.admin.domain.entity.role.QRoleMenu.roleMenu; @Repository @RequiredArgsConstructor diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementQueryRepository.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementQueryRepository.java index 9ef2d17..6303968 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementQueryRepository.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementQueryRepository.java @@ -8,7 +8,8 @@ import org.springframework.stereotype.Repository; import java.util.List; -import static com.bpgroup.poc.admin.domain.admin.entity.QAdministrator.administrator; +import static com.bpgroup.poc.admin.domain.entity.administrator.QAdministrator.administrator; + @Repository @RequiredArgsConstructor diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/service/AdministratorCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/service/AdministratorCreateCommand.java index 334d411..4afd243 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/service/AdministratorCreateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/service/AdministratorCreateCommand.java @@ -1,6 +1,6 @@ package com.bpgroup.poc.admin.web.main.admin.management.service; -import com.bpgroup.poc.admin.domain.admin.entity.Administrator; +import com.bpgroup.poc.admin.domain.entity.administrator.Administrator; import jakarta.validation.constraints.NotBlank; import lombok.Builder; import lombok.Getter; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/service/AdministratorManagementService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/service/AdministratorManagementService.java index 23be259..e3b8f89 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/service/AdministratorManagementService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/service/AdministratorManagementService.java @@ -1,7 +1,7 @@ package com.bpgroup.poc.admin.web.main.admin.management.service; -import com.bpgroup.poc.admin.domain.admin.entity.Administrator; -import com.bpgroup.poc.admin.domain.admin.entity.AdministratorRepository; +import com.bpgroup.poc.admin.domain.entity.administrator.Administrator; +import com.bpgroup.poc.admin.domain.entity.administrator.AdministratorRepository; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/service/AdministratorUpdateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/service/AdministratorUpdateCommand.java index 2465f1b..1c6d59e 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/service/AdministratorUpdateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/service/AdministratorUpdateCommand.java @@ -1,6 +1,6 @@ package com.bpgroup.poc.admin.web.main.admin.management.service; -import com.bpgroup.poc.admin.domain.admin.entity.Administrator; +import com.bpgroup.poc.admin.domain.entity.administrator.Administrator; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Builder; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuCreateCommand.java index f33077f..dd34fe9 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuCreateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuCreateCommand.java @@ -1,6 +1,6 @@ package com.bpgroup.poc.admin.web.main.admin.menu.service; -import com.bpgroup.poc.admin.domain.admin.entity.Menu; +import com.bpgroup.poc.admin.domain.entity.menu.Menu; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Builder; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuGroupCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuGroupCreateCommand.java index 0e223f2..cd07aaf 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuGroupCreateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuGroupCreateCommand.java @@ -1,6 +1,6 @@ package com.bpgroup.poc.admin.web.main.admin.menu.service; -import com.bpgroup.poc.admin.domain.admin.entity.MenuGroup; +import com.bpgroup.poc.admin.domain.entity.menu.MenuGroup; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Builder; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuGroupUpdateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuGroupUpdateCommand.java index 0f9f1bb..991a8d0 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuGroupUpdateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuGroupUpdateCommand.java @@ -1,6 +1,6 @@ package com.bpgroup.poc.admin.web.main.admin.menu.service; -import com.bpgroup.poc.admin.domain.admin.entity.MenuGroup; +import com.bpgroup.poc.admin.domain.entity.menu.MenuGroup; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Builder; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuService.java index 98fdaee..8b9b84f 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuService.java @@ -1,13 +1,9 @@ package com.bpgroup.poc.admin.web.main.admin.menu.service; -import com.bpgroup.poc.admin.domain.admin.entity.Menu; -import com.bpgroup.poc.admin.domain.admin.entity.MenuGroup; -import com.bpgroup.poc.admin.domain.admin.entity.MenuGroupRepository; -import com.bpgroup.poc.admin.domain.admin.entity.MenuRepository; -import com.bpgroup.poc.admin.web.main.admin.menu.service.MenuCreateCommand; -import com.bpgroup.poc.admin.web.main.admin.menu.service.MenuGroupCreateCommand; -import com.bpgroup.poc.admin.web.main.admin.menu.service.MenuGroupUpdateCommand; -import com.bpgroup.poc.admin.web.main.admin.menu.service.MenuUpdateCommand; +import com.bpgroup.poc.admin.domain.entity.menu.Menu; +import com.bpgroup.poc.admin.domain.entity.menu.MenuGroup; +import com.bpgroup.poc.admin.domain.entity.menu.MenuGroupRepository; +import com.bpgroup.poc.admin.domain.entity.menu.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/web/main/admin/menu/service/MenuUpdateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuUpdateCommand.java index 032c11c..2617dd1 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuUpdateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuUpdateCommand.java @@ -1,6 +1,6 @@ package com.bpgroup.poc.admin.web.main.admin.menu.service; -import com.bpgroup.poc.admin.domain.admin.entity.Menu; +import com.bpgroup.poc.admin.domain.entity.menu.Menu; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Builder; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/service/RoleCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/service/RoleCreateCommand.java index 2eee1d5..62b074e 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/service/RoleCreateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/service/RoleCreateCommand.java @@ -1,6 +1,6 @@ package com.bpgroup.poc.admin.web.main.admin.role.service; -import com.bpgroup.poc.admin.domain.admin.entity.Role; +import com.bpgroup.poc.admin.domain.entity.role.Role; import jakarta.validation.constraints.NotBlank; import lombok.Builder; import lombok.Getter; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/service/RoleService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/service/RoleService.java index d15a3cd..5ae3bbd 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/service/RoleService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/service/RoleService.java @@ -1,7 +1,7 @@ package com.bpgroup.poc.admin.web.main.admin.role.service; -import com.bpgroup.poc.admin.domain.admin.entity.Role; -import com.bpgroup.poc.admin.domain.admin.entity.RoleRepository; +import com.bpgroup.poc.admin.domain.entity.role.Role; +import com.bpgroup.poc.admin.domain.entity.role.RoleRepository; import com.bpgroup.poc.admin.web.main.admin.role.RoleQueryRepository; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/service/RoleUpdateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/service/RoleUpdateCommand.java index e6362f5..920c9de 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/service/RoleUpdateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/service/RoleUpdateCommand.java @@ -1,6 +1,6 @@ package com.bpgroup.poc.admin.web.main.admin.role.service; -import com.bpgroup.poc.admin.domain.admin.entity.Role; +import com.bpgroup.poc.admin.domain.entity.role.Role; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Builder; diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/administrator/AdministratorServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/administrator/AdministratorServiceTest.java index ab61f76..5d3c6da 100644 --- a/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/administrator/AdministratorServiceTest.java +++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/administrator/AdministratorServiceTest.java @@ -1,7 +1,7 @@ package com.bpgroup.poc.admin.web.main.admin.administrator; -import com.bpgroup.poc.admin.domain.admin.entity.Administrator; -import com.bpgroup.poc.admin.domain.admin.entity.AdministratorRepository; +import com.bpgroup.poc.admin.domain.entity.administrator.Administrator; +import com.bpgroup.poc.admin.domain.entity.administrator.AdministratorRepository; import com.bpgroup.poc.admin.env.MariaDBTestEnv; import com.bpgroup.poc.admin.web.main.admin.management.service.AdministratorCreateCommand; import com.bpgroup.poc.admin.web.main.admin.management.service.AdministratorCreateResult; diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/menu/MenuServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/menu/MenuServiceTest.java index a0ea6bd..10f90b6 100644 --- a/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/menu/MenuServiceTest.java +++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/menu/MenuServiceTest.java @@ -1,9 +1,9 @@ package com.bpgroup.poc.admin.web.main.admin.menu; -import com.bpgroup.poc.admin.domain.admin.entity.Menu; -import com.bpgroup.poc.admin.domain.admin.entity.MenuGroup; -import com.bpgroup.poc.admin.domain.admin.entity.MenuGroupRepository; -import com.bpgroup.poc.admin.domain.admin.entity.MenuRepository; +import com.bpgroup.poc.admin.domain.entity.menu.Menu; +import com.bpgroup.poc.admin.domain.entity.menu.MenuGroup; +import com.bpgroup.poc.admin.domain.entity.menu.MenuGroupRepository; +import com.bpgroup.poc.admin.domain.entity.menu.MenuRepository; import com.bpgroup.poc.admin.env.MariaDBTestEnv; import com.bpgroup.poc.admin.web.main.admin.menu.service.*; import jakarta.validation.ConstraintViolationException; diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/role/RoleServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/role/RoleServiceTest.java index 2d676ed..14a527d 100644 --- a/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/role/RoleServiceTest.java +++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/role/RoleServiceTest.java @@ -1,7 +1,7 @@ package com.bpgroup.poc.admin.web.main.admin.role; -import com.bpgroup.poc.admin.domain.admin.entity.Role; -import com.bpgroup.poc.admin.domain.admin.entity.RoleRepository; +import com.bpgroup.poc.admin.domain.entity.role.Role; +import com.bpgroup.poc.admin.domain.entity.role.RoleRepository; import com.bpgroup.poc.admin.env.MariaDBTestEnv; import com.bpgroup.poc.admin.web.main.admin.role.service.RoleCreateCommand; import com.bpgroup.poc.admin.web.main.admin.role.service.RoleCreateResult;