diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java index 7b3557df..5a510cab 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminCreatePostController.java @@ -44,10 +44,8 @@ public class AdminCreatePostController { bindingVO.getSeq(), bindingVO.getId(), bindingVO.getPassword(), - bindingVO.getEmail(), bindingVO.getRegionMainCode(), bindingVO.getAccountDisabled(), - bindingVO.getAccountLocked(), bindingVO.getRoleIds()); redirectAttributes.addFlashAttribute( diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java index bc43415d..f88e4c4c 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdateGetController.java @@ -53,12 +53,9 @@ class AdminUpdateGetController { output.getSeq(), output.getId(), null, - output.getEmail(), output.getRegionMainCode(), output.getPasswordUpdatedAt(), output.getAccountDisabled(), - output.getLoginFailCnt(), - output.getAccountLocked(), output.getRoles().stream().map(CoreRole::getId).collect(Collectors.toList())); model.addAttribute("bindingVO", bindingVO); diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java index 97e7b639..6919bb25 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/AdminUpdatePostController.java @@ -44,10 +44,8 @@ class AdminUpdatePostController { bindingVO.getSeq(), bindingVO.getId(), bindingVO.getUpdatePassword(), - bindingVO.getEmail(), bindingVO.getRegionMainCode(), bindingVO.getAccountDisabled(), - bindingVO.getAccountLocked(), bindingVO.getRoleIds()); redirectAttributes.addFlashAttribute( diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java index 269b453e..6698327e 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminCreateBindingVO.java @@ -15,15 +15,15 @@ public class AdminCreateBindingVO { private String id; private String password; - @NotBlank(message = "{valid.common.required}") +/* @NotBlank(message = "{valid.common.required}") @Pattern( regexp = "^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$", message = "{valid.common.email.wrong}") - private String email; + private String email;*/ private Boolean accountDisabled; - private Boolean accountLocked; +/* private Boolean accountLocked;*/ private List roleIds; private String regionMainCode; } diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java index e340bbad..a4379a44 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/model/AdminUpdateBindingVO.java @@ -26,17 +26,17 @@ public class AdminUpdateBindingVO implements AuditOutput { private String id; private String updatePassword; - @NotBlank(message = "{valid.common.required}") +/* @NotBlank(message = "{valid.common.required}") @Pattern( regexp = "^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$", message = "{valid.common.email.wrong}") - private String email; + private String email;*/ private String regionMainCode; private LocalDateTime passwordUpdatedAt; private Boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; +/* private Integer loginFailCnt; + private Boolean accountLocked;*/ private List roleIds; } diff --git a/admin/src/main/resources/templates/admin/adminCreateForm.html b/admin/src/main/resources/templates/admin/adminCreateForm.html index 2c23e6e4..ffa3d9dd 100644 --- a/admin/src/main/resources/templates/admin/adminCreateForm.html +++ b/admin/src/main/resources/templates/admin/adminCreateForm.html @@ -2,147 +2,160 @@ -
+
-
- -
- -
- 에러 메세지 -
+ + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ +
+
+ 에러 메세지 +
+
+
+
+
+
+
+
+ +
+ 에러 메세지 +
+
+
+
+
+
+
+
+ +
+ 에러 메세지 +
+
+
+
+
+
+
+ +
+
+ 에러 메세지 +
+
+
+
+ +
+
+ +
+
+ 에러 메세지 +
+
+ +
+
+ +
- -
- -
- - -
- 에러 메세지 -
- -
-
- -
- -
- -
- 에러 메세지 -
-
-
- -
- -
- -
- 에러 메세지 -
-
-
- - - - -
- -
-
- - -
-
- - -
-
- 에러 메세지 -
-
-
- - -
- -
-
- - -
-
- - -
-
- 에러 메세지 -
-
-
- - - - + + + $(document).ready(() => { + const roleSelect = document.getElementById('roleIds'); + onRoleChange(roleSelect); + }); + const onRoleChange = (el) => { + const selectedValues = Array.from(el.selectedOptions).map(option => option.value); + const isAdmin = !selectedValues.length || selectedValues.includes('ROLE_ADMIN'); + $('.regionMainCodeArea').toggle(!isAdmin); + }; + +
- + \ No newline at end of file diff --git a/admin/src/main/resources/templates/admin/adminUpdateForm.html b/admin/src/main/resources/templates/admin/adminUpdateForm.html index 88a1e3e4..0ebaef04 100644 --- a/admin/src/main/resources/templates/admin/adminUpdateForm.html +++ b/admin/src/main/resources/templates/admin/adminUpdateForm.html @@ -2,7 +2,7 @@ -
+
-
- -
- + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ +
+
+ 에러 메세지 +
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+ 에러 메세지 +
+
+
+
+
+
+ +
+
+ 에러 메세지 +
+
+
+
+ +
+
+ +
+
+ 에러 메세지 +
+
+
+ +
+
+ +
- -
- -
- -
- 에러 메세지 -
-
-
- -
- -
- -
- 에러 메세지 -
-
-
- -
- -
- -
- 에러 메세지 -
-
-
- -
- -
- -
- 에러 메세지 -
-
-
- - -
- -
-
- - -
-
- - -
-
- 에러 메세지 -
-
-
- - -
- -
-
- - -
-
- - -
-
- 에러 메세지 -
-
-
- -
- -
-
- - - -
- - - - - - - -
+
+ + + + + + + +
- + $(document).ready(() => { + showAudit([[${bindingVO.id}]], [[${bindingVO.createdBy}]], + [[${#temporals.format(bindingVO.createdAt, "yyyy-MM-dd'T'HH:mm:ss")}]], + [[${bindingVO.updatedBy}]], + [[${#temporals.format(bindingVO.updatedAt, "yyyy-MM-dd'T'HH:mm:ss")}]]); - + // 초기 로드 시 roleIds에 따라 regionMainCodeArea 표시/숨김 + const roleSelect = document.getElementById('roleIds'); + if (roleSelect) { + onRoleChange(roleSelect); + } + }); + + const onRoleChange = (el) => { + const isAdmin = el.value === 'ROLE_ADMIN' || !el.value; + $('.regionMainCodeArea').toggle(!isAdmin); + }; + +
- + \ No newline at end of file diff --git a/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java b/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java index 40164a99..8c921526 100644 --- a/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java +++ b/admin/src/test/java/app/module/admin/config/security/AdminAuthFailHandlerTest.java @@ -47,10 +47,8 @@ class AdminAuthFailHandlerTest { 1L, testUsername, "test.1@#$", - "xx4@test.com", null, false, - false, Arrays.asList("ROLE_SUPER", "ROLE_STAFF")); } diff --git a/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java b/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java index d2a258a4..c73fb3b9 100644 --- a/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java +++ b/admin/src/test/java/app/module/admin/config/security/AdminDetailsServiceTest.java @@ -42,10 +42,8 @@ class AdminDetailsServiceTest { 1L, username, password, - "xx1@test.com", null, false, - false, Arrays.asList("ROLE_SUPER", "ROLE_STAFF")); diff --git a/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java b/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java index 828a6ed2..7a80d20e 100644 --- a/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java +++ b/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java @@ -38,10 +38,8 @@ class AdminCreateUpdateDaoTest { 1L, "admin_for_createDao_test", "test.1@#$", - "admin_for_createDao_test@test.com", null, false, - false, Arrays.asList("ROLE_SUPER", "ROLE_STAFF")); adminViewPortIn @@ -56,10 +54,8 @@ class AdminCreateUpdateDaoTest { 2L, "admin_for_createDao_test", "test.1@#$", - "admin_for_createDao_test@test.com", null, false, - false, List.of("ROLE_STAFF")); assertEquals( 1, diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java index 87b04ff4..1e8a3f13 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitAdminData.java @@ -32,10 +32,8 @@ public class InitAdminData implements ApplicationRunner { null, "test-admin", "admin1@#$", - "admin@framework.org", null, false, - false, List.of("ROLE_ADMIN")); // 지방실사 @@ -43,10 +41,8 @@ public class InitAdminData implements ApplicationRunner { null, "test-local-inspection", "local1@#$", - "local@framework.org", "code.region.main.1", false, - false, List.of("ROLE_LOCAL_INSPECTION")); // 조사원 @@ -54,10 +50,8 @@ public class InitAdminData implements ApplicationRunner { null, "test-researcher", "researcher1@#$", - "researcher@framework.org", "code.region.main.1", false, - false, List.of("ROLE_RESEARCHER")); } } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/SaveAdminPortIn.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/SaveAdminPortIn.java index 860c5b4c..5abd145a 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/SaveAdminPortIn.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/SaveAdminPortIn.java @@ -8,9 +8,7 @@ public interface SaveAdminPortIn { Long seq, String id, String password, - String email, String regionMainCode, Boolean accountDisabled, - Boolean accountLocked, List roleIds); } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java index 5c6706d7..e85b296d 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/SaveAdminService.java @@ -25,10 +25,8 @@ public class SaveAdminService implements SaveAdminPortIn { Long seq, String id, String password, - String email, String regionMainCode, Boolean accountDisabled, - Boolean accountLocked, List roleIds) { LocalDateTime passwordUpdatedAt; @@ -58,11 +56,8 @@ public class SaveAdminService implements SaveAdminPortIn { id, password, passwordUpdatedAt, - email, regionMainCode, accountDisabled, - loginFailCnt, - accountLocked, roleIds )); } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java index 106f12f4..74c0dce1 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/ports/application/domain/SaveAdminCmd.java @@ -15,10 +15,10 @@ public class SaveAdminCmd extends AuditCommand { private String id; private String encodedPassword; private LocalDateTime passwordUpdatedAt; - private String email; +/* private String email;*/ private String regionMainCode; private Boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; +/* private Integer loginFailCnt; + private Boolean accountLocked;*/ private List roleIds; }