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 a4792cd0..7b3557df 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 @@ -6,6 +6,7 @@ import app.module.core.config.application.enums.AppType; import app.module.core.config.application.util.MessageUtil; import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn; import app.module.core.usecase.role.list.ports.RoleListPortIn; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; @@ -22,6 +23,7 @@ public class AdminCreatePostController { private final RoleListPortIn roleListPortIn; private final MessageUtil messageUtil; private final SaveAdminPortIn savePortIn; + private final UICodeListPortIn uiCodeListPortIn; private final AdminCreateValidator adminCreateValidator; @PostMapping(path = "/settings/admins/create") @@ -34,6 +36,7 @@ public class AdminCreatePostController { adminCreateValidator.validate(bindingVO, bindingResult); if (bindingResult.hasErrors()) { model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN)); + model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main")); return "admin/adminCreateForm"; } @@ -42,6 +45,7 @@ public class AdminCreatePostController { bindingVO.getId(), bindingVO.getPassword(), bindingVO.getEmail(), + bindingVO.getRegionMainCode(), bindingVO.getAccountDisabled(), bindingVO.getAccountLocked(), bindingVO.getRoleIds()); 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 b8a93a68..bc43415d 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 @@ -9,6 +9,7 @@ import app.module.core.config.application.util.MessageUtil; import app.module.core.usecase.admin.view.ports.AdminViewPortIn; import app.module.core.usecase.admin.view.ports.application.domain.AdminView; import app.module.core.usecase.role.list.ports.RoleListPortIn; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import java.util.NoSuchElementException; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; @@ -24,6 +25,7 @@ class AdminUpdateGetController { private final AdminViewPortIn adminViewPortIn; private final RoleListPortIn roleListPortIn; + private final UICodeListPortIn uiCodeListPortIn; private final MessageUtil messageUtil; @GetMapping(path = "/settings/admins/update/{adminId}") @@ -52,6 +54,7 @@ class AdminUpdateGetController { output.getId(), null, output.getEmail(), + output.getRegionMainCode(), output.getPasswordUpdatedAt(), output.getAccountDisabled(), output.getLoginFailCnt(), @@ -60,6 +63,7 @@ class AdminUpdateGetController { model.addAttribute("bindingVO", bindingVO); model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN)); + model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main")); return "admin/adminUpdateForm"; } 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 9f3e109f..72ffb25f 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 @@ -1,11 +1,13 @@ package app.module.admin.usecase.admin.saveAdmin.adapters.web; +import app.module.admin.usecase.admin.getAdmins.adapters.web.model.AdminListFilterVO; import app.module.admin.usecase.admin.saveAdmin.adapters.web.model.AdminUpdateBindingVO; import app.module.admin.usecase.admin.saveAdmin.adapters.web.validator.AdminUpdateValidator; import app.module.core.config.application.enums.AppType; import app.module.core.config.application.util.MessageUtil; import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortIn; import app.module.core.usecase.role.list.ports.RoleListPortIn; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; @@ -21,6 +23,7 @@ class AdminUpdatePostController { private final AdminUpdateValidator adminUpdateValidator; private final RoleListPortIn roleListPortIn; + private final UICodeListPortIn uiCodeListPortIn; private final SaveAdminPortIn saveAdminPortIn; private final MessageUtil messageUtil; @@ -34,6 +37,7 @@ class AdminUpdatePostController { adminUpdateValidator.validate(bindingVO, bindingResult); if (bindingResult.hasErrors()) { model.addAttribute("roles", roleListPortIn.connect(AppType.ADMIN)); + model.addAttribute("regionMainCode", uiCodeListPortIn.connect("code.region.main")); return "admin/adminUpdateForm"; } @@ -42,6 +46,7 @@ class AdminUpdatePostController { bindingVO.getId(), bindingVO.getUpdatePassword(), bindingVO.getEmail(), + bindingVO.getRegionMainCode(), bindingVO.getAccountDisabled(), bindingVO.getAccountLocked(), bindingVO.getRoleIds()); 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 95b881d2..269b453e 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 @@ -21,9 +21,9 @@ public class AdminCreateBindingVO { "^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$", message = "{valid.common.email.wrong}") private String email; - private String regionMainCode; private Boolean accountDisabled; 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 3e16d020..e340bbad 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 @@ -32,6 +32,7 @@ public class AdminUpdateBindingVO implements AuditOutput { "^[\\w!#$%&’*+/=?`{|}~^-]+(?:\\.[\\w!#$%&’*+/=?`{|}~^-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,6}$", message = "{valid.common.email.wrong}") private String email; + private String regionMainCode; private LocalDateTime passwordUpdatedAt; private Boolean accountDisabled; diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java index 895fe727..7780d5df 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminCreateValidator.java @@ -24,14 +24,23 @@ public class AdminCreateValidator implements Validator { ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", "valid.common.required"); Optional.ofNullable(vo.getPassword()) - .filter(password -> !password.matches(PASSWORD_REGEX)) - .ifPresent(password -> errors.rejectValue("password", "valid.common.password.wrong")); + .filter(password -> !password.matches(PASSWORD_REGEX)) + .ifPresent(password -> errors.rejectValue("password", "valid.common.password.wrong")); Optional.ofNullable(vo.getRoleIds()) - .filter(ids -> ids.size() < 1) - .ifPresent( - ids -> - errors.rejectValue( - "roleIds", "valid.common.required.size.min", new Object[]{1}, "")); + .filter(ids -> ids.size() < 1) + .ifPresent( + ids -> + errors.rejectValue( + "roleIds", "valid.common.required.size.min", new Object[]{1}, "")); + + // ROLE_ADMIN이 아닌 경우 regionMainCode null체크 + Optional.ofNullable(vo.getRoleIds()) + .filter(ids -> ids.stream().noneMatch(role -> role.equals("ROLE_ADMIN"))) + .ifPresent(nonAdmins -> { + if (vo.getRegionMainCode() == null || vo.getRegionMainCode().isBlank()) { + errors.rejectValue("regionMainCode", "valid.common.required"); + } + }); } } diff --git a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java index 75fb5e2f..d6ebabdd 100644 --- a/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java +++ b/admin/src/main/java/app/module/admin/usecase/admin/saveAdmin/adapters/web/validator/AdminUpdateValidator.java @@ -30,5 +30,14 @@ public class AdminUpdateValidator implements Validator { Optional.ofNullable(vo.getUpdatePassword()) .filter(s -> !s.trim().isEmpty() && !s.matches(PASSWORD_REGEX)) .ifPresent(s -> errors.rejectValue("updatePassword", "valid.common.password.wrong")); + + // ROLE_ADMIN이 아닌 경우 regionMainCode null체크 + Optional.ofNullable(vo.getRoleIds()) + .filter(ids -> ids.stream().noneMatch(role -> role.equals("ROLE_ADMIN"))) + .ifPresent(nonAdmins -> { + if (vo.getRegionMainCode() == null || vo.getRegionMainCode().isBlank()) { + errors.rejectValue("regionMainCode", "valid.common.required"); + } + }); } } diff --git a/admin/src/main/resources/templates/admin/adminCreateForm.html b/admin/src/main/resources/templates/admin/adminCreateForm.html index b8b734c0..2c23e6e4 100644 --- a/admin/src/main/resources/templates/admin/adminCreateForm.html +++ b/admin/src/main/resources/templates/admin/adminCreateForm.html @@ -4,136 +4,144 @@
-
+ - -
- -
- -
- 에러 메세지 -
-
-
- -
- -
- - -
- 에러 메세지 +
+ +
+ +
+ 에러 메세지 +
+
-
-
+
+ +
-
- -
- -
- 에러 메세지 -
-
-
+ +
+ 에러 메세지 +
-
- -
- -
- 에러 메세지 +
-
-
- +
+ +
+ +
+ 에러 메세지 +
+
+
- -
- -
-
- - +
+ +
+ +
+ 에러 메세지 +
+
-
- - -
-
- 에러 메세지 -
-
-
- -
- -
-
- - + -
- - + + +
+ +
+
+ + +
+
+ + +
+
+ 에러 메세지 +
+
-
- 에러 메세지 + + +
+ +
+
+ + +
+
+ + +
+
+ 에러 메세지 +
+
-
-
- - - + + + - + - +
diff --git a/admin/src/main/resources/templates/admin/adminList.html b/admin/src/main/resources/templates/admin/adminList.html index 4e329ebd..c0d789c0 100644 --- a/admin/src/main/resources/templates/admin/adminList.html +++ b/admin/src/main/resources/templates/admin/adminList.html @@ -4,200 +4,210 @@
-
+ - - - - + + + + -
-
- - - -
-
- - -
-
- - -
-
+
+
+ + + +
+
+ + +
+
+ + +
+
-
-
-
Total:
-
-
- - -
-
+
+
+
Total:
+
+
+ + +
+
- - - - - - - - - - - - - - - - - - - - + + + + + + + +
# - - ID권한Email활성화 - 계정잠김등록일수정일
- 게시물번호 - - 아이디 + + + + + + + + + + + + + + + + + + + + - - - - - - - -
# + + ID권한Email + 활성화 + 계정잠김등록일 + 수정일 +
+ 게시물번호 + + 아이디 + - 이메일등록일수정일
+
이메일등록일수정일
-
+ -
+
-
-
- +
+
+ +
+
+ + +
-
- - -
-
- + - + // 초기화 + function goInit() { + const f = document.adminParamForm; + f.searchField.value = ''; + f.searchValue.value = ''; + f.searchRole.value = ''; + } + + // 수정페이지 이동 + function goUpdate(adminId) { + const f = document.adminParamForm; + f.action = '/settings/admins/update/' + adminId; + f.method = 'get'; + f.submit(); + } + + // 체크박스 선택/해제 + function toggleCheckbox(oj) { + $('input[name=checkedIds]').prop("checked", oj.checked); + } + + function goRemove() { + if (!$('input[name=checkedIds]').is(':checked')) { + alert(/*[[#{operation.common.remove.choose}]]*/); + return; + } + + if (confirm(/*[[#{operation.common.remove.ask}]]*/)) { + const f = document.adminParamForm; + const data = $(f).serializeObject(); + + $.ajax({ + 'method': 'DELETE', + 'url': '/api/settings/admin/remove', + 'data': { + 'checkedIds': data.checkedIds + }, + beforeSend: function (xhr) { + xhr.setRequestHeader( + $("meta[name='_csrf_header']").attr("content"), + $("meta[name='_csrf']").attr("content")); + }, + success(res) { + alert('선택한 관리자가 삭제되었습니다.'); + f.method = 'get'; + f.submit(); + } + }); + } + } + + function goExcel() { + const f = document.adminParamForm; + f.action = '/settings/admins/excel'; + f.sort.value = convertToPageableSortValue(f.sort.value); + f.method = 'post'; + f.submit(); + } +
diff --git a/admin/src/main/resources/templates/admin/adminUpdateForm.html b/admin/src/main/resources/templates/admin/adminUpdateForm.html index 7023808f..88a1e3e4 100644 --- a/admin/src/main/resources/templates/admin/adminUpdateForm.html +++ b/admin/src/main/resources/templates/admin/adminUpdateForm.html @@ -4,144 +4,177 @@
-
+ - + -
- -
- -
-
- -
- -
- -
- 에러 메세지 +
+ +
+ +
-
-
-
- -
- -
- 에러 메세지 +
+ +
+ +
+ 에러 메세지 +
+
-
-
-
- -
- -
- 에러 메세지 +
+ +
+ +
+ 에러 메세지 +
+
-
-
- -
- -
-
- - +
+ +
+ +
+ 에러 메세지 +
+
-
- - -
-
- 에러 메세지 -
-
-
- -
- -
-
- - +
+ +
+ +
+ 에러 메세지 +
+
-
- - + + +
+ +
+
+ + +
+
+ + +
+
+ 에러 메세지 +
+
-
- 에러 메세지 + + +
+ +
+
+ + +
+
+ + +
+
+ 에러 메세지 +
+
-
-
-
- -
-
+
+ +
+
- - - + + + - -
- - - - - - + + + + + + + + + + + - - + $(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")}]]); + }); + + +
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 3c188322..40164a99 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 @@ -48,6 +48,7 @@ class AdminAuthFailHandlerTest { 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 957180e8..d2a258a4 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 @@ -43,6 +43,7 @@ class AdminDetailsServiceTest { 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 63694e48..828a6ed2 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 @@ -39,6 +39,7 @@ class AdminCreateUpdateDaoTest { "admin_for_createDao_test", "test.1@#$", "admin_for_createDao_test@test.com", + null, false, false, Arrays.asList("ROLE_SUPER", "ROLE_STAFF")); @@ -56,6 +57,7 @@ class AdminCreateUpdateDaoTest { "admin_for_createDao_test", "test.1@#$", "admin_for_createDao_test@test.com", + null, false, false, List.of("ROLE_STAFF")); diff --git a/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java b/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java index 407685ae..9580986a 100644 --- a/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java +++ b/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/CreateAdminController.java @@ -52,6 +52,7 @@ class CreateAdminController { reqVO.getId(), reqVO.getPassword(), reqVO.getEmail(), + reqVO.getRegionMainCode(), reqVO.getAccountDisabled(), reqVO.getAccountLocked(), reqVO.getRoleIds()); diff --git a/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/model/CreateAdminReqVO.java b/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/model/CreateAdminReqVO.java index 75131142..47e96576 100644 --- a/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/model/CreateAdminReqVO.java +++ b/api/src/main/java/app/module/api/usecases/admin/createAdmin/adapters/web/model/CreateAdminReqVO.java @@ -28,6 +28,9 @@ public class CreateAdminReqVO { @Schema(description = "email", example = "admin-email@email.com") private String email; + @Schema(description = "실사지역코드", example = "code.region.main.1") + private String regionMainCode; + @Schema(description = "계정 비활성화", example = "false") private Boolean accountDisabled; diff --git a/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/UpdateAdminController.java b/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/UpdateAdminController.java index 0b3d3e52..704663a8 100644 --- a/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/UpdateAdminController.java +++ b/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/UpdateAdminController.java @@ -58,6 +58,7 @@ class UpdateAdminController { reqVO.getId(), reqVO.getUpdatePassword(), reqVO.getEmail(), + reqVO.getRegionMainCode(), reqVO.getAccountDisabled(), reqVO.getAccountLocked(), reqVO.getRoleIds()); diff --git a/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/model/UpdateAdminReqVO.java b/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/model/UpdateAdminReqVO.java index fa63566a..309bb2a6 100644 --- a/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/model/UpdateAdminReqVO.java +++ b/api/src/main/java/app/module/api/usecases/admin/updateAdmin/adapters/web/model/UpdateAdminReqVO.java @@ -35,6 +35,9 @@ public class UpdateAdminReqVO { @Schema(description = "email", example = "staff@new-staff.com") private String email; + @Schema(description = "실사지역코드", example = "code.region.main.1") + private String regionMainCode; + @Schema(description = "계정 비활성화 여부", example = "false") private Boolean accountDisabled; 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 44a81a02..b2b391c5 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 @@ -33,6 +33,7 @@ public class InitAdminData implements ApplicationRunner { "test-admin", "admin1@#$", "admin@framework.org", + null, false, false, List.of("ROLE_ADMIN")); @@ -43,6 +44,7 @@ public class InitAdminData implements ApplicationRunner { "test-analyst", "analyst1@#$", "analyst@framework.org", + "code.region.main.1", false, false, List.of("ROLE_ANALYST")); @@ -53,6 +55,7 @@ public class InitAdminData implements ApplicationRunner { "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 3534b5bc..860c5b4c 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 @@ -9,6 +9,7 @@ public interface SaveAdminPortIn { 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 52b5cfea..5c6706d7 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 @@ -26,6 +26,7 @@ public class SaveAdminService implements SaveAdminPortIn { String id, String password, String email, + String regionMainCode, Boolean accountDisabled, Boolean accountLocked, List roleIds) { @@ -58,6 +59,7 @@ public class SaveAdminService implements SaveAdminPortIn { password, passwordUpdatedAt, email, + regionMainCode, accountDisabled, loginFailCnt, accountLocked, 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 3ba66358..106f12f4 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 @@ -16,6 +16,7 @@ public class SaveAdminCmd extends AuditCommand { private String encodedPassword; private LocalDateTime passwordUpdatedAt; private String email; + private String regionMainCode; private Boolean accountDisabled; private Integer loginFailCnt; private Boolean accountLocked; diff --git a/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java b/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java index 76952c9a..c7f46523 100644 --- a/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java +++ b/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java @@ -18,6 +18,7 @@ public class AdminView implements Serializable { private String email; private String name; private String contact; + private String regionMainCode; private Integer inspectionArea; private LocalDateTime passwordUpdatedAt; private Boolean accountDisabled; diff --git a/core/src/main/resources/mappers/admin/AdminViewMapper.xml b/core/src/main/resources/mappers/admin/AdminViewMapper.xml index 8ae9100d..d2937037 100644 --- a/core/src/main/resources/mappers/admin/AdminViewMapper.xml +++ b/core/src/main/resources/mappers/admin/AdminViewMapper.xml @@ -13,7 +13,7 @@ a.email, a.name, a.contact, - a.inspection_area, + a.region_main_code, a.password_updated_at, a.account_disabled, a.login_fail_cnt, diff --git a/core/src/main/resources/mappers/admin/SaveAdminMapper.xml b/core/src/main/resources/mappers/admin/SaveAdminMapper.xml index c0a577cd..1460ecfd 100644 --- a/core/src/main/resources/mappers/admin/SaveAdminMapper.xml +++ b/core/src/main/resources/mappers/admin/SaveAdminMapper.xml @@ -13,6 +13,7 @@ id, password, email, + region_main_code, password_updated_at, account_disabled, login_fail_cnt, @@ -22,6 +23,7 @@ #{id}, #{encodedPassword}, #{email}, + #{regionMainCode}, #{passwordUpdatedAt}, #{accountDisabled}, #{loginFailCnt}, @@ -35,6 +37,7 @@ SET password = #{encodedPassword}, email = #{email}, + region_main_code = #{regionMainCode}, password_updated_at = #{passwordUpdatedAt}, account_disabled = #{accountDisabled}, login_fail_cnt = #{loginFailCnt}, diff --git a/core/src/main/resources/sql/schema/02_create-all.sql b/core/src/main/resources/sql/schema/02_create-all.sql index fd770373..0f1a4c50 100644 --- a/core/src/main/resources/sql/schema/02_create-all.sql +++ b/core/src/main/resources/sql/schema/02_create-all.sql @@ -187,7 +187,7 @@ CREATE TABLE admin ( password_updated_at timestamp(6) NOT NULL, -- 비밀번호 수정일 name varchar(4), -- 관리자 이름 contact varchar(15), -- 연락처 - inspection_area varchar(10), -- 실사지역 + region_main_code varchar(255), -- 실사(공통코드) account_disabled boolean, -- 계정 비활성화 여부 login_fail_cnt integer, -- 로그인 실패 횟수 account_locked boolean, -- 계정 잠김 여부 @@ -211,7 +211,7 @@ COMMENT ON COLUMN admin.password IS '비밀번호'; COMMENT ON COLUMN admin.password_updated_at IS '비밀번호 수정일'; COMMENT ON COLUMN admin.name IS '관리자 이름'; COMMENT ON COLUMN admin.contact IS '연락처'; -COMMENT ON COLUMN admin.inspection_area IS '실사지역'; +COMMENT ON COLUMN admin.region_main_code IS '실사'; COMMENT ON COLUMN admin.account_disabled IS '계정 비활성화 여부'; COMMENT ON COLUMN admin.login_fail_cnt IS '로그인 실패 횟수'; COMMENT ON COLUMN admin.account_locked IS '계정 잠김 여부';