BP
/
poc
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature/admin #7

Merged
gh.yeom merged 8 commits from feature/admin into main 2024-05-16 16:36:02 +09:00
Conversation 0 Commits 8 Files Changed 52 +55 -56
30 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 49c2757e65 - Show all commits

2
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/BaseEntity.java → poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/BaseEntity.java
View File

@ -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;

4
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Administrator.java → poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/administrator/Administrator.java
View File

@ -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;

2
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdministratorRepository.java → poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/administrator/AdministratorRepository.java
View File

@ -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;

5
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdministratorRole.java → poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/administrator/AdministratorRole.java
View File

@ -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;

2
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/exception/DuplicationAdministratorException.java → poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/exception/DuplicationAdministratorException.java
View File

@ -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) {

2
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/exception/NotFoundAdministratorException.java → poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/exception/NotFoundAdministratorException.java
View File

@ -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;

4
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Menu.java → poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/menu/Menu.java
View File

@ -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;

4
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuGroup.java → poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/menu/MenuGroup.java
View File

@ -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;

2
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuGroupRepository.java → poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/menu/MenuGroupRepository.java
View File

@ -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;

2
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/MenuRepository.java → poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/menu/MenuRepository.java
View File

@ -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;

4
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Role.java → poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/role/Role.java
View File

@ -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;

5
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/RoleMenu.java → poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/role/RoleMenu.java
View File

@ -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;

2
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/RoleRepository.java → poc/admin/src/main/java/com/bpgroup/poc/admin/domain/entity/role/RoleRepository.java
View File

@ -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;

4
poc/admin/src/main/java/com/bpgroup/poc/admin/security/authentication/service/LoginService.java
View File

@ -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;

12
poc/admin/src/main/java/com/bpgroup/poc/admin/web/advice/menu/MenuQueryRepository.java
View File

@ -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

3
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/AdministratorManagementQueryRepository.java
View File

@ -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

2
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/service/AdministratorCreateCommand.java
View File

@ -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;

4
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/service/AdministratorManagementService.java
View File

@ -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;

2
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/service/AdministratorUpdateCommand.java
View File

@ -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;

2
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuCreateCommand.java
View File

@ -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;

2
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuGroupCreateCommand.java
View File

@ -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;

2
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuGroupUpdateCommand.java
View File

@ -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;

12
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuService.java
View File

@ -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;

2
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/service/MenuUpdateCommand.java
View File

@ -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;

2
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/service/RoleCreateCommand.java
View File

@ -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;

4
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/service/RoleService.java
View File

@ -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;

2
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/service/RoleUpdateCommand.java
View File

@ -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;

4
poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/administrator/AdministratorServiceTest.java
View File

@ -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;

8
poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/menu/MenuServiceTest.java
View File

@ -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;

4
poc/admin/src/test/java/com/bpgroup/poc/admin/web/main/admin/role/RoleServiceTest.java
View File

@ -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;