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

admin: entity 정적 팩토리 메서드 이름 수정

This commit is contained in:
geonhos 2024-05-31 10:53:34 +09:00
parent 4f9e7f7106
commit a061628091
41 changed files with 72 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
poc/admin/src/main/java/com/bpgroup/poc/admin/app/admin/AdminAppService.java
View File

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

4
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/Admin.java
View File

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

4
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/entity/AdminActionLog.java
View File

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

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

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

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

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

2
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogCreateCommand.java
View File

@ -24,6 +24,6 @@ public class AdminActionLogCreateCommand {
}
public AdminActionLog toEntity() {
return AdminActionLog.createOf(sessionId, requestUri, requestValue, admin);
return AdminActionLog.getNewInstanceForCreateOf(sessionId, requestUri, requestValue, admin);
}
}

2
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminActionLogUpdateCommand.java
View File

@ -19,6 +19,6 @@ public class AdminActionLogUpdateCommand {
}
public AdminActionLog toEntity() {
return AdminActionLog.updateOf(sessionId, responseValue);
return AdminActionLog.getNewInstanceForUpdateOf(sessionId, responseValue);
}
}

2
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminCreateCommand.java
View File

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

2
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminTokenCreateCommand.java
View File

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

2
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/admin/service/AdminUpdateCommand.java
View File

@ -27,7 +27,7 @@ public class AdminUpdateCommand {
}
public Admin toEntity() {
return Admin.updateOf(password, email, name, adminRole);
return Admin.getNewInstanceForUpdateOf(password, email, name, adminRole);
}
}

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

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

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

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

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

@ -24,6 +24,6 @@ public class MenuCreateCommand {
}
public Menu toEntity() {
return Menu.createOf(uri, name, sortOrder);
return Menu.getNewInstanceForCreateOf(uri, name, sortOrder);
}
}

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

@ -22,7 +22,7 @@ public class MenuGroupCreateCommand {
}
public MenuGroup toEntity() {
return MenuGroup.createOf(
return MenuGroup.getNewInstanceForCreateOf(
uri,
name,
sortOrder

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

@ -24,7 +24,7 @@ public class MenuGroupUpdateCommand {
}
public MenuGroup toEntity() {
return MenuGroup.updateOf(
return MenuGroup.getNewInstanceForUpdateOf(
uri,
name,
sortOrder

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

@ -24,7 +24,7 @@ public class MenuUpdateCommand {
}
public Menu toEntity() {
return Menu.updateOf(uri, name, sortOrder);
return Menu.getNewInstanceForUpdateOf(uri, name, sortOrder);
}

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

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

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

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

2
poc/admin/src/main/java/com/bpgroup/poc/admin/domain/role/service/RoleAddMenuCommand.java
View File

@ -24,7 +24,7 @@ public class RoleAddMenuCommand {
}
public RoleMenu toEntity() {
return RoleMenu.createOf(role, menu, roleMenuType);
return RoleMenu.getNewInstanceForCreateOf(role, menu, roleMenuType);
}
}

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

@ -16,7 +16,7 @@ public class RoleCreateCommand {
}
public Role toEntity() {
return Role.createOf(
return Role.getNewInstanceForCreateOf(
name,
description
);

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

@ -21,7 +21,7 @@ public class RoleUpdateCommand {
}
public Role toEntity() {
return Role.updateOf(
return Role.getNewInstanceForUpdateOf(
name,
description
);

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

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

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

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

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

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

3
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuCreate.java
View File

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

3
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuDelete.java
View File

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

3
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuGroupCreate.java
View File

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

3
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuGroupDelete.java
View File

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

3
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuGroupUpdate.java
View File

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

3
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/menu/reqres/MenuUpdate.java
View File

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

3
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleAddMenu.java
View File

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

3
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleCreate.java
View File

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

3
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleDelete.java
View File

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

3
poc/admin/src/main/java/com/bpgroup/poc/admin/web/main/admin/role/reqres/RoleUpdate.java
View File

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

10
poc/admin/src/test/java/com/bpgroup/poc/admin/app/admin/AdminAppServiceTest.java
View File

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

6
poc/admin/src/test/java/com/bpgroup/poc/admin/app/authentication/AuthenticationAppServiceTest.java
View File

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

4
poc/admin/src/test/java/com/bpgroup/poc/admin/app/menu/MenuAppServiceTest.java
View File

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

4
poc/admin/src/test/java/com/bpgroup/poc/admin/app/role/RoleAppServiceTest.java
View File

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

40
poc/admin/src/test/java/com/bpgroup/poc/admin/domain/admin/service/AdminServiceTest.java
View File

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

6
poc/admin/src/test/java/com/bpgroup/poc/admin/domain/menu/service/MenuServiceTest.java
View File

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

20
poc/admin/src/test/java/com/bpgroup/poc/admin/domain/role/service/RoleServiceTest.java
View File

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