From a061628091546ca386eec7b238a2f75a92ee8fde Mon Sep 17 00:00:00 2001 From: geonhos Date: Fri, 31 May 2024 10:53:34 +0900 Subject: [PATCH] =?UTF-8?q?admin:=20entity=20=EC=A0=95=EC=A0=81=20?= =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A6=AC=20=EB=A9=94=EC=84=9C=EB=93=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../poc/admin/app/admin/AdminAppService.java | 4 +- .../poc/admin/domain/admin/entity/Admin.java | 4 +- .../domain/admin/entity/AdminActionLog.java | 4 +- .../admin/domain/admin/entity/AdminRole.java | 2 +- .../admin/domain/admin/entity/AdminToken.java | 2 +- .../service/AdminActionLogCreateCommand.java | 2 +- .../service/AdminActionLogUpdateCommand.java | 2 +- .../admin/service/AdminCreateCommand.java | 2 +- .../service/AdminTokenCreateCommand.java | 2 +- .../admin/service/AdminUpdateCommand.java | 2 +- .../poc/admin/domain/menu/entity/Menu.java | 4 +- .../admin/domain/menu/entity/MenuGroup.java | 4 +- .../menu/service/MenuCreateCommand.java | 2 +- .../menu/service/MenuGroupCreateCommand.java | 2 +- .../menu/service/MenuGroupUpdateCommand.java | 2 +- .../menu/service/MenuUpdateCommand.java | 2 +- .../poc/admin/domain/role/entity/Role.java | 4 +- .../admin/domain/role/entity/RoleMenu.java | 2 +- .../role/service/RoleAddMenuCommand.java | 2 +- .../role/service/RoleCreateCommand.java | 2 +- .../role/service/RoleUpdateCommand.java | 2 +- .../admin/management/reqres/AdminCreate.java | 3 -- .../admin/management/reqres/AdminDelete.java | 3 -- .../admin/management/reqres/AdminUpdate.java | 3 -- .../main/admin/menu/reqres/MenuCreate.java | 3 -- .../main/admin/menu/reqres/MenuDelete.java | 3 -- .../admin/menu/reqres/MenuGroupCreate.java | 3 -- .../admin/menu/reqres/MenuGroupDelete.java | 3 -- .../admin/menu/reqres/MenuGroupUpdate.java | 3 -- .../main/admin/menu/reqres/MenuUpdate.java | 3 -- .../main/admin/role/reqres/RoleAddMenu.java | 3 -- .../main/admin/role/reqres/RoleCreate.java | 3 -- .../main/admin/role/reqres/RoleDelete.java | 3 -- .../main/admin/role/reqres/RoleUpdate.java | 3 -- .../admin/app/admin/AdminAppServiceTest.java | 10 ++--- .../AuthenticationAppServiceTest.java | 6 +-- .../admin/app/menu/MenuAppServiceTest.java | 4 +- .../admin/app/role/RoleAppServiceTest.java | 4 +- .../admin/service/AdminServiceTest.java | 40 +++++++++---------- .../domain/menu/service/MenuServiceTest.java | 6 +-- .../domain/role/service/RoleServiceTest.java | 20 +++++----- 41 files changed, 72 insertions(+), 111 deletions(-) diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminAppService.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminAppService.java index a18f7c2..4949ada 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminAppService.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminAppService.java @@ -34,7 +34,7 @@ public class AdminAppService { passwordEncoder.encode(request.getPassword()), request.getEmail(), request.getName(), - AdminRole.of(findRole) + AdminRole.getNewInstanceOf(findRole) ) ); @@ -50,7 +50,7 @@ public class AdminAppService { passwordEncoder.encode(request.getPassword()), request.getEmail(), request.getName(), - AdminRole.of(findRole) + AdminRole.getNewInstanceOf(findRole) ) ); diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Admin.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Admin.java index 8a7eaac..2593262 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Admin.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Admin.java @@ -46,11 +46,11 @@ public class Admin extends BaseEntity { this.adminRole = adminRole; } - public static Admin createOf(String loginId, String password, String email, String name, AdminRole adminRole) { + public static Admin getNewInstanceForCreateOf(String loginId, String password, String email, String name, AdminRole adminRole) { return new Admin(loginId, password, email, name, adminRole); } - public static Admin updateOf(String password, String email, String name, AdminRole adminRole) { + public static Admin getNewInstanceForUpdateOf(String password, String email, String name, AdminRole adminRole) { return new Admin(password, email, name, adminRole); } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminActionLog.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminActionLog.java index 2d3c286..d3d4dae 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminActionLog.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminActionLog.java @@ -43,11 +43,11 @@ public class AdminActionLog extends BaseEntity { this.responseValue = SubStringHelper.substringInBytes(responseValue, 1000); } - public static AdminActionLog createOf(String sessionId, String requestUri, String requestValue, Admin admin) { + public static AdminActionLog getNewInstanceForCreateOf(String sessionId, String requestUri, String requestValue, Admin admin) { return new AdminActionLog(sessionId, requestUri, requestValue, admin); } - public static AdminActionLog updateOf(String sessionId, String responseValue) { + public static AdminActionLog getNewInstanceForUpdateOf(String sessionId, String responseValue) { return new AdminActionLog(sessionId, responseValue); } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminRole.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminRole.java index a1daae8..c80a47d 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminRole.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminRole.java @@ -12,7 +12,7 @@ public class AdminRole { @JoinColumn(name = "role_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) private Role role; - public static AdminRole of(Role role) { + public static AdminRole getNewInstanceOf(Role role) { AdminRole adminRole = new AdminRole(); adminRole.role = role; return adminRole; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminToken.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminToken.java index 8ddfdac..7aa861a 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminToken.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminToken.java @@ -47,7 +47,7 @@ public class AdminToken extends BaseEntity { this.admin = admin; } - public static AdminToken createOf( + public static AdminToken getNewInstanceForCreateOf( String ip, String accessToken, String refreshToken, diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogCreateCommand.java index 6343471..2214063 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogCreateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogCreateCommand.java @@ -24,6 +24,6 @@ public class AdminActionLogCreateCommand { } public AdminActionLog toEntity() { - return AdminActionLog.createOf(sessionId, requestUri, requestValue, admin); + return AdminActionLog.getNewInstanceForCreateOf(sessionId, requestUri, requestValue, admin); } } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogUpdateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogUpdateCommand.java index 2869f53..28954f5 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogUpdateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogUpdateCommand.java @@ -19,6 +19,6 @@ public class AdminActionLogUpdateCommand { } public AdminActionLog toEntity() { - return AdminActionLog.updateOf(sessionId, responseValue); + return AdminActionLog.getNewInstanceForUpdateOf(sessionId, responseValue); } } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminCreateCommand.java index f48c945..8f6b3b5 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminCreateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminCreateCommand.java @@ -27,7 +27,7 @@ public class AdminCreateCommand { } public Admin toEntity() { - return Admin.createOf(loginId, password, email, name, adminRole); + return Admin.getNewInstanceForCreateOf(loginId, password, email, name, adminRole); } } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminTokenCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminTokenCreateCommand.java index c19ffcf..98680b0 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminTokenCreateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminTokenCreateCommand.java @@ -39,7 +39,7 @@ public class AdminTokenCreateCommand { } public AdminToken toEntity() { - return AdminToken.createOf(ip, accessToken, refreshToken, expiredRefreshTokenDateTime, state, admin); + return AdminToken.getNewInstanceForCreateOf(ip, accessToken, refreshToken, expiredRefreshTokenDateTime, state, admin); } } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminUpdateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminUpdateCommand.java index 2ecc918..d6f4ff5 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminUpdateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminUpdateCommand.java @@ -27,7 +27,7 @@ public class AdminUpdateCommand { } public Admin toEntity() { - return Admin.updateOf(password, email, name, adminRole); + return Admin.getNewInstanceForUpdateOf(password, email, name, adminRole); } } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/Menu.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/Menu.java index 8f33524..6c385f6 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/Menu.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/Menu.java @@ -36,11 +36,11 @@ public class Menu extends BaseEntity { this.menuGroup = menuGroup; } - public static Menu createOf(String uri, String name, Integer sortOrder) { + public static Menu getNewInstanceForCreateOf(String uri, String name, Integer sortOrder) { return new Menu(uri, name, sortOrder, null); } - public static Menu updateOf(String uri, String name, Integer sortOrder) { + public static Menu getNewInstanceForUpdateOf(String uri, String name, Integer sortOrder) { return new Menu(uri, name, sortOrder, null); } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuGroup.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuGroup.java index cc3e6a0..91f91b0 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuGroup.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/entity/MenuGroup.java @@ -37,11 +37,11 @@ public class MenuGroup extends BaseEntity { this.sortOrder = sortOrder; } - public static MenuGroup createOf(String uri, String name, Integer sortOrder) { + public static MenuGroup getNewInstanceForCreateOf(String uri, String name, Integer sortOrder) { return new MenuGroup(uri, name, sortOrder); } - public static MenuGroup updateOf(String uri, String name, Integer sortOrder) { + public static MenuGroup getNewInstanceForUpdateOf(String uri, String name, Integer sortOrder) { return new MenuGroup(uri, name, sortOrder); } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuCreateCommand.java index 819335c..2b499a7 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuCreateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuCreateCommand.java @@ -24,6 +24,6 @@ public class MenuCreateCommand { } public Menu toEntity() { - return Menu.createOf(uri, name, sortOrder); + return Menu.getNewInstanceForCreateOf(uri, name, sortOrder); } } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuGroupCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuGroupCreateCommand.java index a02fb3b..d7db8d2 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuGroupCreateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuGroupCreateCommand.java @@ -22,7 +22,7 @@ public class MenuGroupCreateCommand { } public MenuGroup toEntity() { - return MenuGroup.createOf( + return MenuGroup.getNewInstanceForCreateOf( uri, name, sortOrder diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuGroupUpdateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuGroupUpdateCommand.java index 5922150..b7ce02f 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuGroupUpdateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuGroupUpdateCommand.java @@ -24,7 +24,7 @@ public class MenuGroupUpdateCommand { } public MenuGroup toEntity() { - return MenuGroup.updateOf( + return MenuGroup.getNewInstanceForUpdateOf( uri, name, sortOrder diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuUpdateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuUpdateCommand.java index 5bdcb42..68625f8 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuUpdateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/menu/service/MenuUpdateCommand.java @@ -24,7 +24,7 @@ public class MenuUpdateCommand { } public Menu toEntity() { - return Menu.updateOf(uri, name, sortOrder); + return Menu.getNewInstanceForUpdateOf(uri, name, sortOrder); } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/Role.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/Role.java index fd20ffa..1876b01 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/Role.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/Role.java @@ -33,11 +33,11 @@ public class Role extends BaseEntity { this.description = description; } - public static Role createOf(String name, String description) { + public static Role getNewInstanceForCreateOf(String name, String description) { return new Role(name, description); } - public static Role updateOf(String name, String description) { + public static Role getNewInstanceForUpdateOf(String name, String description) { return new Role(name, description); } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleMenu.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleMenu.java index a2f2c90..0a4cfa7 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleMenu.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/entity/RoleMenu.java @@ -36,7 +36,7 @@ public class RoleMenu extends BaseEntity { this.roleMenuType = roleMenuType; } - public static RoleMenu createOf(Role role, Menu menu, RoleMenuType roleMenuType) { + public static RoleMenu getNewInstanceForCreateOf(Role role, Menu menu, RoleMenuType roleMenuType) { return new RoleMenu(role, menu, roleMenuType); } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleAddMenuCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleAddMenuCommand.java index f21d611..a23ada6 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleAddMenuCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleAddMenuCommand.java @@ -24,7 +24,7 @@ public class RoleAddMenuCommand { } public RoleMenu toEntity() { - return RoleMenu.createOf(role, menu, roleMenuType); + return RoleMenu.getNewInstanceForCreateOf(role, menu, roleMenuType); } } diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleCreateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleCreateCommand.java index a27553e..904e122 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleCreateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleCreateCommand.java @@ -16,7 +16,7 @@ public class RoleCreateCommand { } public Role toEntity() { - return Role.createOf( + return Role.getNewInstanceForCreateOf( name, description ); diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleUpdateCommand.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleUpdateCommand.java index cc52a45..563e482 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleUpdateCommand.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleUpdateCommand.java @@ -21,7 +21,7 @@ public class RoleUpdateCommand { } public Role toEntity() { - return Role.updateOf( + return Role.getNewInstanceForUpdateOf( name, description ); diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdminCreate.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdminCreate.java index 7aec662..e2620eb 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdminCreate.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdminCreate.java @@ -3,7 +3,6 @@ package com.bpgroup.poc.admin.web.main.admin.management.reqres; import com.bpgroup.poc.admin.web.common.reqres.CommonResponse; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import lombok.Builder; import lombok.Data; import lombok.Getter; import lombok.ToString; @@ -30,7 +29,6 @@ public class AdminCreate { private Long id; - @Builder public static Response success(Long id) { Response response = new Response(); response.resultCode = "0000"; @@ -39,7 +37,6 @@ public class AdminCreate { return response; } - @Builder public static Response fail() { Response response = new Response(); response.resultCode = "9999"; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdminDelete.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdminDelete.java index 9311115..099d088 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdminDelete.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdminDelete.java @@ -2,7 +2,6 @@ package com.bpgroup.poc.admin.web.main.admin.management.reqres; import com.bpgroup.poc.admin.web.common.reqres.CommonResponse; import jakarta.validation.constraints.NotNull; -import lombok.Builder; import lombok.Data; import lombok.Getter; import lombok.ToString; @@ -18,7 +17,6 @@ public class AdminDelete { @Getter @ToString public static class Response extends CommonResponse { - @Builder public static AdminDelete.Response success() { AdminDelete.Response response = new AdminDelete.Response(); response.resultCode = "0000"; @@ -26,7 +24,6 @@ public class AdminDelete { return response; } - @Builder public static AdminDelete.Response fail(String resultMessage) { AdminDelete.Response response = new AdminDelete.Response(); response.resultCode = "9999"; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdminUpdate.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdminUpdate.java index 9fe8e45..c663886 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdminUpdate.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/management/reqres/AdminUpdate.java @@ -3,7 +3,6 @@ package com.bpgroup.poc.admin.web.main.admin.management.reqres; import com.bpgroup.poc.admin.web.common.reqres.CommonResponse; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import lombok.Builder; import lombok.Data; import lombok.Getter; import lombok.ToString; @@ -27,7 +26,6 @@ public class AdminUpdate { @Getter @ToString public static class Response extends CommonResponse { - @Builder public static AdminUpdate.Response success() { AdminUpdate.Response response = new AdminUpdate.Response(); response.resultCode = "0000"; @@ -35,7 +33,6 @@ public class AdminUpdate { return response; } - @Builder public static AdminUpdate.Response fail(String resultMessage) { AdminUpdate.Response response = new AdminUpdate.Response(); response.resultCode = "9999"; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuCreate.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuCreate.java index 1b3b026..0f696e7 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuCreate.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuCreate.java @@ -3,7 +3,6 @@ package com.bpgroup.poc.admin.web.main.admin.menu.reqres; import com.bpgroup.poc.admin.web.common.reqres.CommonResponse; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import lombok.Builder; import lombok.Data; import lombok.Getter; import lombok.ToString; @@ -25,7 +24,6 @@ public class MenuCreate { @Getter @ToString public static class Response extends CommonResponse { - @Builder public static Response success() { Response response = new Response(); response.resultCode = "0000"; @@ -33,7 +31,6 @@ public class MenuCreate { return response; } - @Builder public static Response fail() { Response response = new Response(); response.resultCode = "9999"; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuDelete.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuDelete.java index c8052b0..d36e0af 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuDelete.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuDelete.java @@ -2,7 +2,6 @@ package com.bpgroup.poc.admin.web.main.admin.menu.reqres; import com.bpgroup.poc.admin.web.common.reqres.CommonResponse; import jakarta.validation.constraints.NotNull; -import lombok.Builder; import lombok.Data; import lombok.Getter; import lombok.ToString; @@ -17,7 +16,6 @@ public class MenuDelete { @Getter @ToString public static class Response extends CommonResponse { - @Builder public static Response success() { Response response = new Response(); response.resultCode = "0000"; @@ -25,7 +23,6 @@ public class MenuDelete { return response; } - @Builder public static Response fail(String resultMessage) { Response response = new Response(); response.resultCode = "9999"; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuGroupCreate.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuGroupCreate.java index 51129d5..9a02710 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuGroupCreate.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuGroupCreate.java @@ -3,7 +3,6 @@ package com.bpgroup.poc.admin.web.main.admin.menu.reqres; import com.bpgroup.poc.admin.web.common.reqres.CommonResponse; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import lombok.Builder; import lombok.Data; import lombok.Getter; import lombok.ToString; @@ -26,7 +25,6 @@ public class MenuGroupCreate { @Getter @ToString public static class Response extends CommonResponse { - @Builder public static Response success() { Response response = new Response(); response.resultCode = "0000"; @@ -34,7 +32,6 @@ public class MenuGroupCreate { return response; } - @Builder public static Response fail() { Response response = new Response(); response.resultCode = "9999"; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuGroupDelete.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuGroupDelete.java index e400e62..8585aa0 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuGroupDelete.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuGroupDelete.java @@ -2,7 +2,6 @@ package com.bpgroup.poc.admin.web.main.admin.menu.reqres; import com.bpgroup.poc.admin.web.common.reqres.CommonResponse; import jakarta.validation.constraints.NotNull; -import lombok.Builder; import lombok.Data; import lombok.Getter; import lombok.ToString; @@ -17,7 +16,6 @@ public class MenuGroupDelete { @Getter @ToString public static class Response extends CommonResponse { - @Builder public static Response success() { Response response = new Response(); response.resultCode = "0000"; @@ -25,7 +23,6 @@ public class MenuGroupDelete { return response; } - @Builder public static Response fail(String resultMessage) { Response response = new Response(); response.resultCode = "9999"; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuGroupUpdate.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuGroupUpdate.java index 95c9fce..3068605 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuGroupUpdate.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuGroupUpdate.java @@ -3,7 +3,6 @@ package com.bpgroup.poc.admin.web.main.admin.menu.reqres; import com.bpgroup.poc.admin.web.common.reqres.CommonResponse; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import lombok.Builder; import lombok.Data; import lombok.Getter; import lombok.ToString; @@ -25,7 +24,6 @@ public class MenuGroupUpdate { @Getter @ToString public static class Response extends CommonResponse { - @Builder public static Response success() { Response response = new Response(); response.resultCode = "0000"; @@ -33,7 +31,6 @@ public class MenuGroupUpdate { return response; } - @Builder public static Response fail(String resultMessage) { Response response = new Response(); response.resultCode = "9999"; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuUpdate.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuUpdate.java index cfa82c6..aaf5936 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuUpdate.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuUpdate.java @@ -3,7 +3,6 @@ package com.bpgroup.poc.admin.web.main.admin.menu.reqres; import com.bpgroup.poc.admin.web.common.reqres.CommonResponse; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import lombok.Builder; import lombok.Data; import lombok.Getter; import lombok.ToString; @@ -25,7 +24,6 @@ public class MenuUpdate { @Getter @ToString public static class Response extends CommonResponse { - @Builder public static Response success() { Response response = new Response(); response.resultCode = "0000"; @@ -33,7 +31,6 @@ public class MenuUpdate { return response; } - @Builder public static Response fail(String resultMessage) { Response response = new Response(); response.resultCode = "9999"; 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 2c3cbfb..84bf2c0 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 @@ -4,7 +4,6 @@ import com.bpgroup.poc.admin.domain.role.RoleMenuType; import com.bpgroup.poc.admin.web.common.reqres.CommonResponse; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import lombok.Builder; import lombok.Data; import lombok.Getter; import lombok.ToString; @@ -30,7 +29,6 @@ public class RoleAddMenu { @Getter @ToString public static class Response extends CommonResponse { - @Builder public static Response success() { Response response = new Response(); response.resultCode = "0000"; @@ -38,7 +36,6 @@ public class RoleAddMenu { return response; } - @Builder public static Response fail(String resultMessage) { Response response = new Response(); response.resultCode = "9999"; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleCreate.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleCreate.java index 7e92028..9244c89 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleCreate.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleCreate.java @@ -2,7 +2,6 @@ package com.bpgroup.poc.admin.web.main.admin.role.reqres; import com.bpgroup.poc.admin.web.common.reqres.CommonResponse; import jakarta.validation.constraints.NotBlank; -import lombok.Builder; import lombok.Data; import lombok.Getter; import lombok.ToString; @@ -21,7 +20,6 @@ public class RoleCreate { public static class Response extends CommonResponse { private Long id; - @Builder public static RoleCreate.Response success(Long id) { RoleCreate.Response response = new RoleCreate.Response(); response.resultCode = "0000"; @@ -30,7 +28,6 @@ public class RoleCreate { return response; } - @Builder public static RoleCreate.Response fail() { RoleCreate.Response response = new RoleCreate.Response(); response.resultCode = "9999"; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleDelete.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleDelete.java index 9bad42b..2e20e86 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleDelete.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleDelete.java @@ -2,7 +2,6 @@ package com.bpgroup.poc.admin.web.main.admin.role.reqres; import com.bpgroup.poc.admin.web.common.reqres.CommonResponse; import jakarta.validation.constraints.NotNull; -import lombok.Builder; import lombok.Data; import lombok.Getter; import lombok.ToString; @@ -17,7 +16,6 @@ public class RoleDelete { @Getter @ToString public static class Response extends CommonResponse { - @Builder public static RoleDelete.Response success() { RoleDelete.Response response = new RoleDelete.Response(); response.resultCode = "0000"; @@ -25,7 +23,6 @@ public class RoleDelete { return response; } - @Builder public static RoleDelete.Response fail(String resultMessage) { RoleDelete.Response response = new RoleDelete.Response(); response.resultCode = "9999"; diff --git a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleUpdate.java b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleUpdate.java index bf1807a..2ccc706 100644 --- a/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleUpdate.java +++ b/poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleUpdate.java @@ -3,7 +3,6 @@ package com.bpgroup.poc.admin.web.main.admin.role.reqres; import com.bpgroup.poc.admin.web.common.reqres.CommonResponse; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import lombok.Builder; import lombok.Data; import lombok.Getter; import lombok.ToString; @@ -22,7 +21,6 @@ public class RoleUpdate { @Getter @ToString public static class Response extends CommonResponse { - @Builder public static RoleUpdate.Response success() { RoleUpdate.Response response = new RoleUpdate.Response(); response.resultCode = "0000"; @@ -30,7 +28,6 @@ public class RoleUpdate { return response; } - @Builder public static RoleUpdate.Response fail(String resultMessage) { RoleUpdate.Response response = new RoleUpdate.Response(); response.resultCode = "9999"; diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/app/admin/AdminAppServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/app/admin/AdminAppServiceTest.java index 0275eae..032fe37 100644 --- a/poc/admin/src/test/java/com/bpgroup/poc/admin/app/admin/AdminAppServiceTest.java +++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/app/admin/AdminAppServiceTest.java @@ -56,12 +56,12 @@ class AdminAppServiceTest extends MariaDBTestEnv { // given Role savedRole = getSavedRole(); Admin savedAdmin = adminRepository.save( - Admin.createOf( + Admin.getNewInstanceForCreateOf( "test", "test", "test", "test", - AdminRole.of(savedRole) + AdminRole.getNewInstanceOf(savedRole) ) ); flushAndClear(); @@ -86,12 +86,12 @@ class AdminAppServiceTest extends MariaDBTestEnv { // given Role savedRole = getSavedRole(); Admin savedAdmin = adminRepository.save( - Admin.createOf( + Admin.getNewInstanceForCreateOf( "test", "test", "test", "test", - AdminRole.of(savedRole) + AdminRole.getNewInstanceOf(savedRole) ) ); @@ -109,7 +109,7 @@ class AdminAppServiceTest extends MariaDBTestEnv { private Role getSavedRole() { - Role role = Role.createOf( + Role role = Role.getNewInstanceForCreateOf( "test", "test" ); diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/app/authentication/AuthenticationAppServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/app/authentication/AuthenticationAppServiceTest.java index 6f94318..e376e32 100644 --- a/poc/admin/src/test/java/com/bpgroup/poc/admin/app/authentication/AuthenticationAppServiceTest.java +++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/app/authentication/AuthenticationAppServiceTest.java @@ -65,7 +65,7 @@ class AuthenticationAppServiceTest extends MariaDBTestEnv { private void createRoleAndAdmin() { Role savedRole = roleRepository.save( - Role.createOf( + Role.getNewInstanceForCreateOf( "test", "test" ) @@ -73,12 +73,12 @@ class AuthenticationAppServiceTest extends MariaDBTestEnv { flushAndClear(); adminRepository.save( - Admin.createOf( + Admin.getNewInstanceForCreateOf( "test", passwordEncoder.encode("test"), "test", "test", - AdminRole.of(savedRole) + AdminRole.getNewInstanceOf(savedRole) ) ); flushAndClear(); 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 8181e39..e56f02a 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 @@ -144,7 +144,7 @@ public class MenuAppServiceTest extends MariaDBTestEnv { @NotNull private Menu getSavedMenu() { return menuRepository.save( - Menu.createOf( + Menu.getNewInstanceForCreateOf( "test", "test", 1 @@ -155,7 +155,7 @@ public class MenuAppServiceTest extends MariaDBTestEnv { @NotNull private MenuGroup getSavedMenuGroup() { return menuGroupRepository.save( - MenuGroup.createOf( + MenuGroup.getNewInstanceForCreateOf( "test", "test", 1 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 5ab1da6..a4904c7 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 @@ -111,7 +111,7 @@ class RoleAppServiceTest extends MariaDBTestEnv { private Menu getSavedMenu() { return menuRepository.save( - Menu.createOf( + Menu.getNewInstanceForCreateOf( "test", "test", 1 @@ -121,7 +121,7 @@ class RoleAppServiceTest extends MariaDBTestEnv { private Role getSavedRole() { return roleRepository.save( - Role.createOf( + Role.getNewInstanceForCreateOf( "test", "test" ) diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/admin/service/AdminServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/admin/service/AdminServiceTest.java index 4dbe296..4986006 100644 --- a/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/admin/service/AdminServiceTest.java +++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/admin/service/AdminServiceTest.java @@ -49,7 +49,7 @@ class AdminServiceTest extends MariaDBTestEnv { "test", "test", "test", - AdminRole.of(role) + AdminRole.getNewInstanceOf(role) ) ); flushAndClear(); @@ -72,7 +72,7 @@ class AdminServiceTest extends MariaDBTestEnv { flushAndClear(); Role updateRole = roleRepository.save( - Role.createOf( + Role.getNewInstanceForCreateOf( "test2", "test2" ) @@ -86,7 +86,7 @@ class AdminServiceTest extends MariaDBTestEnv { "test2", "test2", "test2", - AdminRole.of(updateRole) + AdminRole.getNewInstanceOf(updateRole) ) ); flushAndClear(); @@ -139,7 +139,7 @@ class AdminServiceTest extends MariaDBTestEnv { @NotNull private Role getSaveRole() { return roleRepository.save( - Role.createOf( + Role.getNewInstanceForCreateOf( "test", "test" ) @@ -149,12 +149,12 @@ class AdminServiceTest extends MariaDBTestEnv { @NotNull private Admin createAdmin(Role role) { return adminRepository.save( - Admin.createOf( + Admin.getNewInstanceForCreateOf( "test", "test", "test", "test", - AdminRole.of(role) + AdminRole.getNewInstanceOf(role) ) ); } @@ -163,23 +163,23 @@ class AdminServiceTest extends MariaDBTestEnv { @DisplayName("AdminService method 호출 유효성 검사 테스트") void validationTest() { // create - assertThatThrownBy(() -> service.create(AdminCreateCommand.of(null, "password", "email", "name", AdminRole.of(Role.createOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); - assertThatThrownBy(() -> service.create(AdminCreateCommand.of("", "password", "email", "name", AdminRole.of(Role.createOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); - assertThatThrownBy(() -> service.create(AdminCreateCommand.of("loginId", null, "email", "name", AdminRole.of(Role.createOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); - assertThatThrownBy(() -> service.create(AdminCreateCommand.of("loginId", "", "email", "name", AdminRole.of(Role.createOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); - assertThatThrownBy(() -> service.create(AdminCreateCommand.of("loginId", "password", null, "name", AdminRole.of(Role.createOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); - assertThatThrownBy(() -> service.create(AdminCreateCommand.of("loginId", "password", "", "name", AdminRole.of(Role.createOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); - assertThatThrownBy(() -> service.create(AdminCreateCommand.of("loginId", "password", "email", null, AdminRole.of(Role.createOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); - assertThatThrownBy(() -> service.create(AdminCreateCommand.of("loginId", "password", "email", "", AdminRole.of(Role.createOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); + assertThatThrownBy(() -> service.create(AdminCreateCommand.of(null, "password", "email", "name", AdminRole.getNewInstanceOf(Role.getNewInstanceForCreateOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); + assertThatThrownBy(() -> service.create(AdminCreateCommand.of("", "password", "email", "name", AdminRole.getNewInstanceOf(Role.getNewInstanceForCreateOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); + assertThatThrownBy(() -> service.create(AdminCreateCommand.of("loginId", null, "email", "name", AdminRole.getNewInstanceOf(Role.getNewInstanceForCreateOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); + assertThatThrownBy(() -> service.create(AdminCreateCommand.of("loginId", "", "email", "name", AdminRole.getNewInstanceOf(Role.getNewInstanceForCreateOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); + assertThatThrownBy(() -> service.create(AdminCreateCommand.of("loginId", "password", null, "name", AdminRole.getNewInstanceOf(Role.getNewInstanceForCreateOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); + assertThatThrownBy(() -> service.create(AdminCreateCommand.of("loginId", "password", "", "name", AdminRole.getNewInstanceOf(Role.getNewInstanceForCreateOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); + assertThatThrownBy(() -> service.create(AdminCreateCommand.of("loginId", "password", "email", null, AdminRole.getNewInstanceOf(Role.getNewInstanceForCreateOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); + assertThatThrownBy(() -> service.create(AdminCreateCommand.of("loginId", "password", "email", "", AdminRole.getNewInstanceOf(Role.getNewInstanceForCreateOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); assertThatThrownBy(() -> service.create(AdminCreateCommand.of("loginId", "password", "email", "name", null))).isInstanceOf(ConstraintViolationException.class); // update - assertThatThrownBy(() -> service.update(AdminUpdateCommand.of(null, "password", "email", "name", AdminRole.of(Role.createOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); - assertThatThrownBy(() -> service.update(AdminUpdateCommand.of(1L, "", "email", "name", AdminRole.of(Role.createOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); - assertThatThrownBy(() -> service.update(AdminUpdateCommand.of(1L, "password", null, "name", AdminRole.of(Role.createOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); - assertThatThrownBy(() -> service.update(AdminUpdateCommand.of(1L, "password", "", "name", AdminRole.of(Role.createOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); - assertThatThrownBy(() -> service.update(AdminUpdateCommand.of(1L, "password", "email", null, AdminRole.of(Role.createOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); - assertThatThrownBy(() -> service.update(AdminUpdateCommand.of(1L, "password", "email", "", AdminRole.of(Role.createOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); + assertThatThrownBy(() -> service.update(AdminUpdateCommand.of(null, "password", "email", "name", AdminRole.getNewInstanceOf(Role.getNewInstanceForCreateOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); + assertThatThrownBy(() -> service.update(AdminUpdateCommand.of(1L, "", "email", "name", AdminRole.getNewInstanceOf(Role.getNewInstanceForCreateOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); + assertThatThrownBy(() -> service.update(AdminUpdateCommand.of(1L, "password", null, "name", AdminRole.getNewInstanceOf(Role.getNewInstanceForCreateOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); + assertThatThrownBy(() -> service.update(AdminUpdateCommand.of(1L, "password", "", "name", AdminRole.getNewInstanceOf(Role.getNewInstanceForCreateOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); + assertThatThrownBy(() -> service.update(AdminUpdateCommand.of(1L, "password", "email", null, AdminRole.getNewInstanceOf(Role.getNewInstanceForCreateOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); + assertThatThrownBy(() -> service.update(AdminUpdateCommand.of(1L, "password", "email", "", AdminRole.getNewInstanceOf(Role.getNewInstanceForCreateOf("name", ""))))).isInstanceOf(ConstraintViolationException.class); assertThatThrownBy(() -> service.update(AdminUpdateCommand.of(1L, "password", "email", "name", null))).isInstanceOf(ConstraintViolationException.class); // delete diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/menu/service/MenuServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/menu/service/MenuServiceTest.java index 3e5d8ca..c3b8dc3 100644 --- a/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/menu/service/MenuServiceTest.java +++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/menu/service/MenuServiceTest.java @@ -91,7 +91,7 @@ class MenuServiceTest extends MariaDBTestEnv { @NotNull private MenuGroup createMenuGroup() { return menuGroupRepository.save( - MenuGroup.createOf( + MenuGroup.getNewInstanceForCreateOf( "uri", "name", 1 @@ -128,7 +128,7 @@ class MenuServiceTest extends MariaDBTestEnv { MenuGroup saveMenuGroup = createMenuGroup(); flushAndClear(); - Menu menu = Menu.updateOf( + Menu menu = Menu.getNewInstanceForUpdateOf( "uri", "name", 1 @@ -163,7 +163,7 @@ class MenuServiceTest extends MariaDBTestEnv { MenuGroup saveMenuGroup = createMenuGroup(); flushAndClear(); - Menu menu = Menu.createOf( + Menu menu = Menu.getNewInstanceForCreateOf( "uri", "name", 1 diff --git a/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/role/service/RoleServiceTest.java b/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/role/service/RoleServiceTest.java index 94a8e14..addf701 100644 --- a/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/role/service/RoleServiceTest.java +++ b/poc/admin/src/test/java/com/bpgroup/poc/admin/domain/role/service/RoleServiceTest.java @@ -152,7 +152,7 @@ class RoleServiceTest extends MariaDBTestEnv { flushAndClear(); roleMenuRepository.save( - RoleMenu.createOf( + RoleMenu.getNewInstanceForCreateOf( saveRole, saveMenu1, RoleMenuType.MANAGER @@ -160,7 +160,7 @@ class RoleServiceTest extends MariaDBTestEnv { ); roleMenuRepository.save( - RoleMenu.createOf( + RoleMenu.getNewInstanceForCreateOf( saveRole, saveMenu2, RoleMenuType.MANAGER @@ -191,7 +191,7 @@ class RoleServiceTest extends MariaDBTestEnv { flushAndClear(); roleMenuRepository.save( - RoleMenu.createOf( + RoleMenu.getNewInstanceForCreateOf( saveRole, saveMenu1, RoleMenuType.MANAGER @@ -199,7 +199,7 @@ class RoleServiceTest extends MariaDBTestEnv { ); roleMenuRepository.save( - RoleMenu.createOf( + RoleMenu.getNewInstanceForCreateOf( saveRole, saveMenu2, RoleMenuType.MANAGER @@ -216,7 +216,7 @@ class RoleServiceTest extends MariaDBTestEnv { private Role createRole() { return roleRepository.save( - Role.createOf( + Role.getNewInstanceForCreateOf( "TEST", "TEST" ) @@ -225,7 +225,7 @@ class RoleServiceTest extends MariaDBTestEnv { private MenuGroup createMenuGroup() { return menuGroupRepository.save( - MenuGroup.createOf( + MenuGroup.getNewInstanceForCreateOf( "TEST", "TEST", 1 @@ -234,7 +234,7 @@ class RoleServiceTest extends MariaDBTestEnv { } private Menu createMenu(MenuGroup menuGroup) { - Menu menu = Menu.createOf( + Menu menu = Menu.getNewInstanceForCreateOf( "TEST", "TEST", 1 @@ -259,9 +259,9 @@ class RoleServiceTest extends MariaDBTestEnv { assertThatThrownBy(() -> roleService.delete(null)).isInstanceOf(ConstraintViolationException.class); // add Role Menu - assertThatThrownBy(() -> roleService.addRoleMenu(Set.of(RoleAddMenuCommand.of(null, Menu.createOf("uri", "name", 1), RoleMenuType.MANAGER)))).isInstanceOf(ConstraintViolationException.class); - assertThatThrownBy(() -> roleService.addRoleMenu(Set.of(RoleAddMenuCommand.of(Role.createOf("name", ""), null, RoleMenuType.MANAGER)))).isInstanceOf(ConstraintViolationException.class); - assertThatThrownBy(() -> roleService.addRoleMenu(Set.of(RoleAddMenuCommand.of(Role.createOf("name", ""), Menu.createOf("uri", "name", 1), null)))).isInstanceOf(ConstraintViolationException.class); + assertThatThrownBy(() -> roleService.addRoleMenu(Set.of(RoleAddMenuCommand.of(null, Menu.getNewInstanceForCreateOf("uri", "name", 1), RoleMenuType.MANAGER)))).isInstanceOf(ConstraintViolationException.class); + assertThatThrownBy(() -> roleService.addRoleMenu(Set.of(RoleAddMenuCommand.of(Role.getNewInstanceForCreateOf("name", ""), null, RoleMenuType.MANAGER)))).isInstanceOf(ConstraintViolationException.class); + assertThatThrownBy(() -> roleService.addRoleMenu(Set.of(RoleAddMenuCommand.of(Role.getNewInstanceForCreateOf("name", ""), Menu.getNewInstanceForCreateOf("uri", "name", 1), null)))).isInstanceOf(ConstraintViolationException.class); // delete Role Menu assertThatThrownBy(() -> roleService.deleteRoleMenu(null)).isInstanceOf(ConstraintViolationException.class);