From 525462b659d450eb7f5270189da6d060bf43c9c8 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Sat, 31 May 2025 22:24:28 +0900 Subject: [PATCH] =?UTF-8?q?[2025.05.31]=20initData=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/aop/RoleUpdateAspect.java | 2 +- .../security/AdminDetailsService.java | 31 +- .../web/AdminCreatePostController.java | 1 + .../web/AdminUpdateGetController.java | 1 + .../web/AdminUpdatePostController.java | 1 + .../web/model/AdminCreateBindingVO.java | 2 +- .../web/model/AdminUpdateBindingVO.java | 1 + .../GetAnalystDashboardController.java | 21 + .../model/GetAnalystDashboardReqVO.java | 5 +- .../getNoticesUI/GetNoticesController.java | 21 + .../getNoticesUI/model/GetNoticesReqVO.java | 13 + .../sms/getSmsUI/GetSmsController.java | 21 + .../sms/getSmsUI/model/GetSmsReqVO.java | 13 + .../GetHouseholdsUIController.java | 21 + .../model/GetHouseholdsUIReqVO.java | 13 + .../GetResearcherDashboardUIController.java | 21 + .../model/GetResearcherDashboardUIReqVO.java | 13 + .../GetResearcherHouseholdsUIController.java | 21 + .../model/GetResearcherHouseholdsUIReqVO.java | 13 + .../main/resources/messages/uri.properties | 21 +- .../templates/analyst/dashboard.html | 9 + .../templates/communication/notices.html | 9 + .../templates/communication/sms.html | 9 + .../templates/household/households.html | 9 + .../templates/researcher/dashboard.html | 9 + .../templates/researcher/households.html | 9 + .../security/AdminAuthFailHandlerTest.java | 1 + .../security/AdminAuthSuccessHandlerTest.java | 1 + .../security/AdminDetailsServiceTest.java | 1 + .../dao/AdminCreateUpdateDaoTest.java | 2 + .../adapters/web/CreateAdminController.java | 1 + .../adapters/web/model/CreateAdminReqVO.java | 2 +- .../adapters/web/UpdateAdminController.java | 1 + .../adapters/web/model/UpdateAdminReqVO.java | 3 + .../main/resources/messages/uri.properties | 2 +- .../main/resources/messages/uri_en.properties | 2 +- .../adapters/persistence/entity/Admin.java | 1 + .../persistence/initData/InitAdminData.java | 21 +- .../persistence/initData/InitArticleData.java | 2 +- .../initData/InitFrontUserData.java | 39 +- .../initData/InitPrivilegeData.java | 13 +- .../persistence/initData/InitRoleData.java | 72 +- .../persistence/initData/InitUICodeData.java | 76 +- .../initData/InitUriAdminData.java | 826 +++++++++++------- .../initData/InitUriFrontData.java | 297 +++---- .../initData/InitUserPrivilegeData.java | 8 +- .../initData/InitUserRoleData.java | 6 +- .../persistence/initData/RemoveInitData.java | 51 ++ .../initData/helper/RemoveAllMapper.java | 25 + .../config/application/util/AuditUtil.java | 22 + .../adapters/persistence/GetAdminsDao.java | 4 +- .../adapters/persistence/GetAdminsMapper.java | 2 +- .../persistence/model/GetAdminsDto.java | 1 + .../application/domain/GetAdminsRole.java | 2 +- .../adapters/persistence/SaveAdminDao.java | 57 +- .../adapters/persistence/SaveAdminMapper.java | 6 +- .../model/DeleteAdminHasRoleParam.java | 9 +- .../model/SaveAdminHasRoleParam.java | 9 +- .../saveAdmin/ports/SaveAdminPortIn.java | 4 +- .../ports/application/SaveAdminService.java | 2 + .../application/domain/SaveAdminCmd.java | 6 +- .../adapters/persistence/AdminViewDao.java | 23 +- .../adapters/persistence/AdminViewMapper.java | 6 +- .../ports/application/domain/AdminView.java | 6 +- .../adapters/persistence/GetAdminDao.java | 23 - .../adapters/persistence/GetAdminMapper.java | 14 - .../getAdmin/ports/GetAdminPortIn.java | 9 - .../getAdmin/ports/GetAdminPortOut.java | 9 - .../ports/application/GetAdminService.java | 20 - .../ports/application/domain/GetAdmin.java | 32 - .../persistence/CreateArticleDao.java | 7 +- .../persistence/CreateHouseholdDao.java | 24 + .../persistence/CreateHouseholdMapper.java | 11 + .../ports/CreateHouseholdPortIn.java | 7 + .../ports/CreateHouseholdPortOut.java | 8 + .../application/CreateHouseholdService.java | 44 + .../domain/CreateHouseholdHasRoleCmd.java | 17 + .../domain/CreateHouseholdInCmd.java | 29 + .../domain/CreateHouseholdOutCmd.java | 34 + .../persistence/PrivilegeSaveDao.java | 17 +- .../persistence/PrivilegeSaveMapper.java | 5 +- .../domain/PrivilegeSaveCommand.java | 3 +- .../adapters/persistence/RoleSaveDao.java | 44 +- .../model/RoleHasPrivilegeDeleteParam.java | 8 +- .../model/RoleHasPrivilegeSaveParam.java | 7 +- core/src/main/resources/core.yml | 4 +- .../mappers/admin/AdminViewMapper.xml | 54 +- .../mappers/admin/GetAdminMapper.xml | 51 -- .../mappers/admin/GetAdminsMapper.xml | 13 +- .../mappers/admin/SaveAdminMapper.xml | 22 +- .../household/CreateHouseholdMapper.xml | 70 ++ .../mappers/initData/RemoveAllMapper.xml | 52 ++ core/src/main/resources/sql/01_admin.sql | 60 ++ core/src/main/resources/sql/02_household.sql | 84 ++ core/src/main/resources/sql/create-all.sql | 5 - core/src/main/resources/sql/drop-all.sql | 2 - 96 files changed, 1726 insertions(+), 985 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/analyst/dashboard/getAnalystDashboardUI/GetAnalystDashboardController.java rename core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/application/domain/GetAdminCmd.java => admin/src/main/java/app/module/admin/usecase/analyst/dashboard/getAnalystDashboardUI/model/GetAnalystDashboardReqVO.java (56%) create mode 100644 admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/GetNoticesController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/model/GetNoticesReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/communication/sms/getSmsUI/GetSmsController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/communication/sms/getSmsUI/model/GetSmsReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getHouseholdsUI/GetHouseholdsUIController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/getHouseholdsUI/model/GetHouseholdsUIReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/researcher/dashboard/getResearcherDashboardUI/adapters/web/GetResearcherDashboardUIController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/researcher/dashboard/getResearcherDashboardUI/adapters/web/model/GetResearcherDashboardUIReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/researcher/household/getResearcherHouseholdUI/web/GetResearcherHouseholdsUIController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/researcher/household/getResearcherHouseholdUI/web/model/GetResearcherHouseholdsUIReqVO.java create mode 100644 admin/src/main/resources/templates/analyst/dashboard.html create mode 100644 admin/src/main/resources/templates/communication/notices.html create mode 100644 admin/src/main/resources/templates/communication/sms.html create mode 100644 admin/src/main/resources/templates/household/households.html create mode 100644 admin/src/main/resources/templates/researcher/dashboard.html create mode 100644 admin/src/main/resources/templates/researcher/households.html create mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/initData/RemoveInitData.java create mode 100644 core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllMapper.java create mode 100644 core/src/main/java/app/module/core/config/application/util/AuditUtil.java delete mode 100644 core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/adapters/persistence/GetAdminDao.java delete mode 100644 core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/adapters/persistence/GetAdminMapper.java delete mode 100644 core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/GetAdminPortIn.java delete mode 100644 core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/GetAdminPortOut.java delete mode 100644 core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/application/GetAdminService.java delete mode 100644 core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/application/domain/GetAdmin.java create mode 100644 core/src/main/java/app/module/core/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java create mode 100644 core/src/main/java/app/module/core/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java create mode 100644 core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortIn.java create mode 100644 core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortOut.java create mode 100644 core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/CreateHouseholdService.java create mode 100644 core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdHasRoleCmd.java create mode 100644 core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java create mode 100644 core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java delete mode 100644 core/src/main/resources/mappers/admin/GetAdminMapper.xml create mode 100644 core/src/main/resources/mappers/household/CreateHouseholdMapper.xml create mode 100644 core/src/main/resources/mappers/initData/RemoveAllMapper.xml create mode 100644 core/src/main/resources/sql/01_admin.sql create mode 100644 core/src/main/resources/sql/02_household.sql delete mode 100644 core/src/main/resources/sql/create-all.sql delete mode 100644 core/src/main/resources/sql/drop-all.sql diff --git a/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java b/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java index 83a8c518..9f6503da 100644 --- a/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java +++ b/admin/src/main/java/app/module/admin/config/application/aop/RoleUpdateAspect.java @@ -34,7 +34,7 @@ public class RoleUpdateAspect { public Object operate(ProceedingJoinPoint joinPoint) throws Throwable { Object[] args = joinPoint.getArgs(); - String adminId = (String) args[0]; + String adminId = (String) args[1]; List currentRoles = Collections.emptyList(); MethodSignature signature = (MethodSignature) joinPoint.getSignature(); diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java index 398aad13..e735f923 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java @@ -4,10 +4,6 @@ import app.module.core.config.adapters.web.security.domain.CorePrivilege; import app.module.core.config.adapters.web.security.domain.CoreRole; 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.adminResearch.getAdmin.ports.GetAdminPortIn; -import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin; -import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd; -import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.Collection; import java.util.Optional; @@ -21,13 +17,13 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor public class AdminDetailsService implements UserDetailsService { private final AdminViewPortIn adminViewPortIn; - private final GetAdminPortIn getAdminPortIn; @Value("${app.admin.password.validity.period.days}") private long passwordValidPeriodDays; @@ -36,28 +32,23 @@ public class AdminDetailsService implements UserDetailsService { @Transactional public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - GetAdmin getAdmin = - getAdminPortIn - .operate(new GetAdminCmd(username)) + AdminView adminUser = + adminViewPortIn + .connect(username) .orElseThrow(() -> new UsernameNotFoundException("Invalid username or password.")); -// AdminView adminUser = -// adminViewPortIn -// .connect(username) -// .orElseThrow(() -> new UsernameNotFoundException("Invalid username or password.")); - - boolean accountLocked = Optional.ofNullable(getAdmin.getAccountLocked()).orElse(false); - boolean accountDisabled = Optional.ofNullable(getAdmin.getAccountDisabled()).orElse(false); + boolean accountLocked = Optional.ofNullable(adminUser.getAccountLocked()).orElse(false); + boolean accountDisabled = Optional.ofNullable(adminUser.getAccountDisabled()).orElse(false); return new AdminUser( - getAdmin.getId(), - getAdmin.getPassword(), + adminUser.getId(), + adminUser.getPassword(), !accountDisabled, true, - isCredentialsNonExpired(getAdmin.getPasswordUpdatedAt()), + isCredentialsNonExpired(adminUser.getPasswordUpdatedAt()), !accountLocked, - getAuthorities(getAdmin.getRoles()), - passwordValidPeriodDays - getDaysPassedFrom(getAdmin.getPasswordUpdatedAt())); + getAuthorities(adminUser.getRoles()), + passwordValidPeriodDays - getDaysPassedFrom(adminUser.getPasswordUpdatedAt())); } /** 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 c7f2f417..a4792cd0 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 @@ -38,6 +38,7 @@ public class AdminCreatePostController { } savePortIn.connect( + bindingVO.getSeq(), bindingVO.getId(), bindingVO.getPassword(), bindingVO.getEmail(), 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 1496eb55..b8a93a68 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 @@ -48,6 +48,7 @@ class AdminUpdateGetController { output.getCreatedAt(), output.getUpdatedBy(), output.getUpdatedAt(), + output.getSeq(), output.getId(), null, output.getEmail(), 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 8f217081..9f3e109f 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 @@ -38,6 +38,7 @@ class AdminUpdatePostController { } saveAdminPortIn.connect( + bindingVO.getSeq(), bindingVO.getId(), bindingVO.getUpdatePassword(), bindingVO.getEmail(), 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 89455fbe..3da1926e 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 @@ -11,7 +11,7 @@ import lombok.Setter; @Setter @AllArgsConstructor public class AdminCreateBindingVO { - + private Long seq; private String id; private String password; 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 07f5a020..3e16d020 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 @@ -22,6 +22,7 @@ public class AdminUpdateBindingVO implements AuditOutput { private final LocalDateTime updatedAt; + private Long seq; private String id; private String updatePassword; diff --git a/admin/src/main/java/app/module/admin/usecase/analyst/dashboard/getAnalystDashboardUI/GetAnalystDashboardController.java b/admin/src/main/java/app/module/admin/usecase/analyst/dashboard/getAnalystDashboardUI/GetAnalystDashboardController.java new file mode 100644 index 00000000..4f82b0a1 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/analyst/dashboard/getAnalystDashboardUI/GetAnalystDashboardController.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.analyst.dashboard.getAnalystDashboardUI; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import app.module.admin.usecase.analyst.dashboard.getAnalystDashboardUI.model.GetAnalystDashboardReqVO; + +@Controller +@RequiredArgsConstructor +class GetAnalystDashboardController { + + @GetMapping(path = "/analyst/dashboard") + String operate( + Model model, + @ModelAttribute("reqVO") GetAnalystDashboardReqVO reqVO) { + + return "analyst/dashboard"; + } +} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/application/domain/GetAdminCmd.java b/admin/src/main/java/app/module/admin/usecase/analyst/dashboard/getAnalystDashboardUI/model/GetAnalystDashboardReqVO.java similarity index 56% rename from core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/application/domain/GetAdminCmd.java rename to admin/src/main/java/app/module/admin/usecase/analyst/dashboard/getAnalystDashboardUI/model/GetAnalystDashboardReqVO.java index c2643c8c..9a1b1376 100644 --- a/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/application/domain/GetAdminCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/analyst/dashboard/getAnalystDashboardUI/model/GetAnalystDashboardReqVO.java @@ -1,4 +1,4 @@ -package app.module.core.usecase.adminResearch.getAdmin.ports.application.domain; +package app.module.admin.usecase.analyst.dashboard.getAnalystDashboardUI.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; @@ -9,6 +9,5 @@ import lombok.Setter; @Setter @AllArgsConstructor @EqualsAndHashCode -public class GetAdminCmd { - private String id; +public class GetAnalystDashboardReqVO { } diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/GetNoticesController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/GetNoticesController.java new file mode 100644 index 00000000..fbd118a5 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/GetNoticesController.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import app.module.admin.usecase.communication.notice.getNoticesUI.model.GetNoticesReqVO; + +@Controller +@RequiredArgsConstructor +class GetNoticesController { + + @GetMapping(path = "/communication/notices") + String operate( + Model model, + @ModelAttribute("reqVO") GetNoticesReqVO reqVO) { + + return "communication/notices"; + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/model/GetNoticesReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/model/GetNoticesReqVO.java new file mode 100644 index 00000000..2de43050 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/model/GetNoticesReqVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.communication.notice.getNoticesUI.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetNoticesReqVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/communication/sms/getSmsUI/GetSmsController.java b/admin/src/main/java/app/module/admin/usecase/communication/sms/getSmsUI/GetSmsController.java new file mode 100644 index 00000000..c386860f --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/sms/getSmsUI/GetSmsController.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.communication.sms.getSmsUI; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import app.module.admin.usecase.communication.sms.getSmsUI.model.GetSmsReqVO; + +@Controller +@RequiredArgsConstructor +class GetSmsController { + + @GetMapping(path = "/communication/sms") + String operate( + Model model, + @ModelAttribute("reqVO") GetSmsReqVO reqVO) { + + return "communication/sms"; + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/communication/sms/getSmsUI/model/GetSmsReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/sms/getSmsUI/model/GetSmsReqVO.java new file mode 100644 index 00000000..3be49f82 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/sms/getSmsUI/model/GetSmsReqVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.communication.sms.getSmsUI.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetSmsReqVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsUI/GetHouseholdsUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsUI/GetHouseholdsUIController.java new file mode 100644 index 00000000..1a1f6604 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsUI/GetHouseholdsUIController.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.household.getHouseholdsUI; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import app.module.admin.usecase.household.getHouseholdsUI.model.GetHouseholdsUIReqVO; + +@Controller +@RequiredArgsConstructor +class GetHouseholdsUIController { + + @GetMapping(path = "/household/households") + String operate( + Model model, + @ModelAttribute("reqVO") GetHouseholdsUIReqVO reqVO) { + + return "household/households"; + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsUI/model/GetHouseholdsUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsUI/model/GetHouseholdsUIReqVO.java new file mode 100644 index 00000000..607ddbfd --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsUI/model/GetHouseholdsUIReqVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.getHouseholdsUI.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetHouseholdsUIReqVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/dashboard/getResearcherDashboardUI/adapters/web/GetResearcherDashboardUIController.java b/admin/src/main/java/app/module/admin/usecase/researcher/dashboard/getResearcherDashboardUI/adapters/web/GetResearcherDashboardUIController.java new file mode 100644 index 00000000..dda9d1f6 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/dashboard/getResearcherDashboardUI/adapters/web/GetResearcherDashboardUIController.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.researcher.dashboard.getResearcherDashboardUI.adapters.web; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import app.module.admin.usecase.researcher.dashboard.getResearcherDashboardUI.adapters.web.model.GetResearcherDashboardUIReqVO; + +@Controller +@RequiredArgsConstructor +class GetResearcherDashboardUIController { + + @GetMapping(path = "/researcher/dashboard") + String operate( + Model model, + @ModelAttribute("reqVO") GetResearcherDashboardUIReqVO reqVO) { + + return "researcher/dashboard"; + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/dashboard/getResearcherDashboardUI/adapters/web/model/GetResearcherDashboardUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/dashboard/getResearcherDashboardUI/adapters/web/model/GetResearcherDashboardUIReqVO.java new file mode 100644 index 00000000..41694c49 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/dashboard/getResearcherDashboardUI/adapters/web/model/GetResearcherDashboardUIReqVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.researcher.dashboard.getResearcherDashboardUI.adapters.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetResearcherDashboardUIReqVO { +} diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/household/getResearcherHouseholdUI/web/GetResearcherHouseholdsUIController.java b/admin/src/main/java/app/module/admin/usecase/researcher/household/getResearcherHouseholdUI/web/GetResearcherHouseholdsUIController.java new file mode 100644 index 00000000..21cc4027 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/household/getResearcherHouseholdUI/web/GetResearcherHouseholdsUIController.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.researcher.household.getResearcherHouseholdUI.web; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import app.module.admin.usecase.researcher.household.getResearcherHouseholdUI.web.model.GetResearcherHouseholdsUIReqVO; + +@Controller +@RequiredArgsConstructor +class GetResearcherHouseholdsUIController { + + @GetMapping(path = "/researcher/households") + String operate( + Model model, + @ModelAttribute("reqVO") GetResearcherHouseholdsUIReqVO reqVO) { + + return "researcher/households"; + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/household/getResearcherHouseholdUI/web/model/GetResearcherHouseholdsUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/household/getResearcherHouseholdUI/web/model/GetResearcherHouseholdsUIReqVO.java new file mode 100644 index 00000000..23e3f82b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/household/getResearcherHouseholdUI/web/model/GetResearcherHouseholdsUIReqVO.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.researcher.household.getResearcherHouseholdUI.web.model; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class GetResearcherHouseholdsUIReqVO { +} diff --git a/admin/src/main/resources/messages/uri.properties b/admin/src/main/resources/messages/uri.properties index b4ca39d0..16bbd672 100644 --- a/admin/src/main/resources/messages/uri.properties +++ b/admin/src/main/resources/messages/uri.properties @@ -26,4 +26,23 @@ uri.admin.analysis.operationLog=Operation Log (\uC218\uD589\uB85C\uADF8) uri.admin.analysis.operationLog.{{pathVar}}=\uC218\uD589\uB85C\uADF8 \uC0C1\uC138 uri.admin.addons=Add-ons (\uBD80\uAC00\uAE30\uB2A5) uri.admin.addons.email=Email -uri.admin.addons.email.form=Email \uBC1C\uC1A1\uD3FC +uri.admin.addons.email.create=Email \uBC1C\uC1A1\uD3FC + +uri.admin.researcher=\uC870\uC0AC\uC6D0 +uri.admin.researcher.household=\uC784\uAC00\uD604\uD669 +uri.admin.researcher.household.{{pathVar}}=\uC784\uAC00\uD604\uD669 \uC0C1\uC138 +uri.admin.researcher.dashboard=\uB300\uC2DC\uBCF4\uB4DC + +uri.admin.analyst=\uC5F0\uAD6C\uC6D0 +uri.admin.analyst.dashboard=\uB300\uC2DC\uBCF4\uB4DC + +uri.admin.communication=\uCEE4\uBBA4\uB2C8\uCF00\uC774\uC158 +uri.admin.communication.notice=\uACF5\uC9C0\uC0AC\uD56D +uri.admin.communication.notice.create=\uACF5\uC9C0\uC0AC\uD56D \uB4F1\uB85D +uri.admin.communication.notice.update.{{pathVar}}=\uACF5\uC9C0\uC0AC\uD56D \uC218\uC815 +uri.admin.communication.sms=\uBB38\uC790\uBC1C\uC1A1 + +uri.admin.household=\uC784\uAC00\uD68C\uC6D0\uAD00\uB9AC +uri.admin.household.household=\uC784\uAC00\uD68C\uC6D0 +uri.admin.household.household.create=\uC784\uAC00\uD68C\uC6D0 \uB4F1\uB85D +uri.admin.household.household.update.{{pathVar}}=\uC784\uAC00\uD68C\uC6D0 \uC218\uC815 diff --git a/admin/src/main/resources/templates/analyst/dashboard.html b/admin/src/main/resources/templates/analyst/dashboard.html new file mode 100644 index 00000000..46aa363e --- /dev/null +++ b/admin/src/main/resources/templates/analyst/dashboard.html @@ -0,0 +1,9 @@ + + + +
+

/analyst/dashboard

+
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/communication/notices.html b/admin/src/main/resources/templates/communication/notices.html new file mode 100644 index 00000000..1419696b --- /dev/null +++ b/admin/src/main/resources/templates/communication/notices.html @@ -0,0 +1,9 @@ + + + +
+

/communication/notices

+
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/communication/sms.html b/admin/src/main/resources/templates/communication/sms.html new file mode 100644 index 00000000..7672ab40 --- /dev/null +++ b/admin/src/main/resources/templates/communication/sms.html @@ -0,0 +1,9 @@ + + + +
+

/communication/sms

+
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/household/households.html b/admin/src/main/resources/templates/household/households.html new file mode 100644 index 00000000..c046824a --- /dev/null +++ b/admin/src/main/resources/templates/household/households.html @@ -0,0 +1,9 @@ + + + +
+

/household/households

+
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/researcher/dashboard.html b/admin/src/main/resources/templates/researcher/dashboard.html new file mode 100644 index 00000000..814e7222 --- /dev/null +++ b/admin/src/main/resources/templates/researcher/dashboard.html @@ -0,0 +1,9 @@ + + + +
+

/researcher/dashboard

+
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/researcher/households.html b/admin/src/main/resources/templates/researcher/households.html new file mode 100644 index 00000000..fc0d118e --- /dev/null +++ b/admin/src/main/resources/templates/researcher/households.html @@ -0,0 +1,9 @@ + + + +
+

/researcher/households

+
+ + \ 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 93eb35f1..3c188322 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 @@ -44,6 +44,7 @@ class AdminAuthFailHandlerTest { @BeforeAll public void beforeAll() { saveAdminPortIn.connect( + 1L, testUsername, "test.1@#$", "xx4@test.com", diff --git a/admin/src/test/java/app/module/admin/config/security/AdminAuthSuccessHandlerTest.java b/admin/src/test/java/app/module/admin/config/security/AdminAuthSuccessHandlerTest.java index 6c419d4e..8bb5606e 100644 --- a/admin/src/test/java/app/module/admin/config/security/AdminAuthSuccessHandlerTest.java +++ b/admin/src/test/java/app/module/admin/config/security/AdminAuthSuccessHandlerTest.java @@ -49,6 +49,7 @@ class AdminAuthSuccessHandlerTest { @BeforeAll public void beforeAll() { saveAdminPortIn.connect( + 1L, username, password, "admin_for_createDao_test@test.com", 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 61067116..957180e8 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 @@ -39,6 +39,7 @@ class AdminDetailsServiceTest { @BeforeAll public void beforeAll() { saveAdminPortIn.connect( + 1L, username, password, "xx1@test.com", 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 df41b2a9..63694e48 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 @@ -35,6 +35,7 @@ class AdminCreateUpdateDaoTest { void operate() { saveAdminPortIn.connect( + 1L, "admin_for_createDao_test", "test.1@#$", "admin_for_createDao_test@test.com", @@ -51,6 +52,7 @@ class AdminCreateUpdateDaoTest { retrieveUser.getRoles().size())); saveAdminPortIn.connect( + 2L, "admin_for_createDao_test", "test.1@#$", "admin_for_createDao_test@test.com", 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 76175e30..407685ae 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 @@ -48,6 +48,7 @@ class CreateAdminController { String createdId = saveAdminPortIn.connect( + reqVO.getSeq(), reqVO.getId(), reqVO.getPassword(), reqVO.getEmail(), 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 65866eae..75131142 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 @@ -16,7 +16,7 @@ import lombok.Setter; @AllArgsConstructor @EqualsAndHashCode public class CreateAdminReqVO { - + private Long seq; private String id; private String password; 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 b369f226..0b3d3e52 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 @@ -54,6 +54,7 @@ class UpdateAdminController { String updatedId = saveAdminPortIn.connect( + reqVO.getSeq(), reqVO.getId(), reqVO.getUpdatePassword(), reqVO.getEmail(), 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 2f41e3cc..fa63566a 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 @@ -18,6 +18,9 @@ import lombok.Setter; @Schema(description = "UpdateAdmin request") public class UpdateAdminReqVO { + @Schema(description = "seq", example = "seq") + private Long seq; + @Schema(description = "id", example = "staff") private String id; diff --git a/api/src/main/resources/messages/uri.properties b/api/src/main/resources/messages/uri.properties index 4b8d0e4e..1b916c91 100644 --- a/api/src/main/resources/messages/uri.properties +++ b/api/src/main/resources/messages/uri.properties @@ -26,4 +26,4 @@ uri.admin.analysis.operationLog=Operation Log (\uC218\uD589\uB85C\uADF8) uri.admin.analysis.operationLog.{{pathVar}}=\uC218\uD589\uB85C\uADF8 \uC0C1\uC138 uri.admin.addons=Add-ons (\uBD80\uAC00\uAE30\uB2A5) uri.admin.addons.email=Email -uri.admin.addons.email.form=Email \uBC1C\uC1A1\uD3FC +uri.admin.addons.email.create=Email \uBC1C\uC1A1\uD3FC diff --git a/api/src/main/resources/messages/uri_en.properties b/api/src/main/resources/messages/uri_en.properties index c23a08c7..aa8bbf3d 100644 --- a/api/src/main/resources/messages/uri_en.properties +++ b/api/src/main/resources/messages/uri_en.properties @@ -26,4 +26,4 @@ uri.admin.analysis.operationLog=Operation Log uri.admin.analysis.operationLog.{{pathVar}}=Operation Log Details uri.admin.addons=Add-ons uri.admin.addons.email=Email -uri.admin.addons.email.form=Email Sending Form \ No newline at end of file +uri.admin.addons.email.create=Email Sending Form \ No newline at end of file diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Admin.java b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Admin.java index 8e4c4f56..974bf1c4 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/entity/Admin.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/entity/Admin.java @@ -12,6 +12,7 @@ import lombok.Setter; @NoArgsConstructor @AllArgsConstructor public class Admin extends AuditEntity { + private Long seq; private String id; 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 3463629c..a7125cf4 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 @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor @Slf4j -@Order(3) +@Order(5) public class InitAdminData implements ApplicationRunner { private final SaveAdminPortIn saveAdminPortIn; @@ -27,20 +27,19 @@ public class InitAdminData implements ApplicationRunner { return; } + // 관리자 saveAdminPortIn.connect( - "recycle-super", "recycle1@#$", "super@framework.org", false, false, - List.of("ROLE_SUPER")); + null,"test-admin", "admin1@#$", "admin@framework.org", false, false, + List.of("ROLE_ADMIN")); + // 연구원 saveAdminPortIn.connect( - "recycle-manager", - "manager1@#$", - "manager@framework.org", - false, - false, - List.of("ROLE_MANAGER")); + null,"test-analysis", "analysis1@#$", "analysis@framework.org", false, false, + List.of("ROLE_ANALYST")); + // 조사원 saveAdminPortIn.connect( - "recycle-staff", "staff1@#$", "staff@framework.org", false, false, - List.of("ROLE_STAFF")); + null,"test-researcher", "researcher1@#$", "researcher@framework.org", false, false, + List.of("ROLE_RESEARCHER")); } } diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitArticleData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitArticleData.java index 2165ff58..1e6190de 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitArticleData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitArticleData.java @@ -29,7 +29,7 @@ public class InitArticleData implements ApplicationRunner { // article_has_upload_file 테이블 우선 삭제 removeAllArticleMapper.deleteAllFiles(); - // article_comment 테이블 우선 삭ㅈ데 + // article_comment 테이블 우선 삭제 removeAllArticleMapper.deleteAllComments(); // article 전체 데이터 삭제 removeAllArticleMapper.deleteAll(); diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java index 87c476fa..83616ee1 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java @@ -1,9 +1,7 @@ package app.module.core.config.adapters.persistence.initData; -import app.module.core.config.application.enums.SignUpType; -import app.module.core.usecase.user.createUser.ports.CreateUserPortIn; -import app.module.core.usecase.user.createUser.ports.application.domain.CreateUserCmd; -import java.util.Set; +import app.module.core.usecase.household.createHousehold.ports.CreateHouseholdPortIn; +import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -15,10 +13,10 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor @Slf4j -@Order(3) +@Order(5) public class InitFrontUserData implements ApplicationRunner { - private final CreateUserPortIn createUserPortIn; + private final CreateHouseholdPortIn createHouseholdPortIn; @Value("${app.initData.core}") private boolean isCoreDataRequired; @@ -29,16 +27,23 @@ public class InitFrontUserData implements ApplicationRunner { return; } -// createUserPortIn.operate( -// new CreateUserCmd( -// "generalUser", -// "generalUser1@#$", -// "general-user@recycle.com", -// "recycle-사용자", -// SignUpType.NORMAL, -// false, -// 0, -// false, -// Set.of("ROLE_GENERAL"))); + createHouseholdPortIn.operate(new CreateHouseholdInCmd( + "11111", + "테스트임가", + 58, + null, + "01011111111", + "서울", + "마포구", + "와와빌딩 2층", + 14, + 13, + 11, + 10, + 10, + true, + null, + null + )); } } diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitPrivilegeData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitPrivilegeData.java index 92248b5b..da883c8d 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitPrivilegeData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitPrivilegeData.java @@ -1,9 +1,8 @@ package app.module.core.config.adapters.persistence.initData; -import app.module.core.config.adapters.persistence.entity.Privilege; import app.module.core.config.application.enums.AppType; -import app.module.core.usecase.privilege.save.adapters.persistence.PrivilegeSaveMapper; -import app.module.core.usecase.privilege.save.adapters.persistence.PrivilegeSaveRepo; +import app.module.core.usecase.privilege.save.ports.PrivilegeSavePortIn; +import app.module.core.usecase.privilege.save.ports.application.domain.PrivilegeSaveCommand; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.ApplicationArguments; @@ -13,10 +12,10 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor -@Order(1) +@Order(2) public class InitPrivilegeData implements ApplicationRunner { - private final PrivilegeSaveMapper privilegeSaveMapper; + private final PrivilegeSavePortIn privilegeSavePortIn; @Value("${app.initData.core}") private boolean isCoreDataRequired; @@ -27,7 +26,7 @@ public class InitPrivilegeData implements ApplicationRunner { return; } -// privilegeSaveMapper.insertPrivilege(new Privilege("ADMIN_API", "ADMIN API 이용 권한", AppType.ADMIN, 0)); -// privilegeSaveMapper.insertPrivilege(new Privilege("ADMIN_ACCESS", "ADMIN 사이트 접근 권한", AppType.ADMIN, 1)); + privilegeSavePortIn.connect(new PrivilegeSaveCommand( AppType.ADMIN, "ADMIN_API", "ADMIN API 이용 권한", 0)); + privilegeSavePortIn.connect(new PrivilegeSaveCommand(AppType.ADMIN,"ADMIN_ACCESS", "ADMIN 사이트 접근 권한", 1)); } } diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitRoleData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitRoleData.java index a1b71988..6a30cb34 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitRoleData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitRoleData.java @@ -1,19 +1,14 @@ package app.module.core.config.adapters.persistence.initData; -import app.module.core.config.adapters.persistence.entity.Privilege; import app.module.core.config.adapters.persistence.entity.Role; -import app.module.core.config.adapters.persistence.entity.RoleHasPrivilege; -import app.module.core.config.adapters.persistence.repository.PrivilegeRepo; -import app.module.core.config.adapters.persistence.repository.RoleRepo; import app.module.core.config.application.enums.AppType; -import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.privilege.view.adapters.persistence.PrivilegeViewMapper; import app.module.core.usecase.privilege.view.ports.application.domain.PrivilegeView; import app.module.core.usecase.role.save.adapters.persistence.RoleSaveMapper; import app.module.core.usecase.role.save.adapters.persistence.model.RoleHasPrivilegeSaveParam; +import app.module.core.usecase.role.save.ports.RoleSavePortIn; import java.time.LocalDateTime; import java.util.List; -import java.util.Set; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.ApplicationArguments; @@ -23,11 +18,10 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor -@Order(2) +@Order(3) public class InitRoleData implements ApplicationRunner { - private final RoleSaveMapper roleSaveMapper; - private final PrivilegeViewMapper privilegeViewRepo; + private final RoleSavePortIn roleSavePortIn; @Value("${app.initData.core}") private boolean isCoreDataRequired; @@ -38,43 +32,27 @@ public class InitRoleData implements ApplicationRunner { return; } -// // 권한 `privilege` 정보 가져오기 -// PrivilegeView apiPrivilege = privilegeViewRepo.findById("ADMIN_API").orElseThrow(); -// PrivilegeView privilege = privilegeViewRepo.findById("ADMIN_ACCESS").orElseThrow(); -// -// int orderNo = 0; -// -// roleSaveMapper.insertRole(new Role("ROLE_SUPER", "SUPER 관리자", AppType.ADMIN, orderNo++)); -// roleSaveMapper.insertRoleHasPrivileges( -// new RoleHasPrivilegeSaveParam( -// "ROLE_SUPER", -// List.of(apiPrivilege.getId(), privilege.getId()), -// LocalDateTime.now(), -// "INIT_DATA", -// LocalDateTime.now(), -// "INIT_DATA" -// )); -// -// roleSaveMapper.insertRole(new Role("ROLE_MANAGER", "매니저", AppType.ADMIN, orderNo++)); -// roleSaveMapper.insertRoleHasPrivileges( -// new RoleHasPrivilegeSaveParam( -// "ROLE_MANAGER", -// List.of(apiPrivilege.getId(), privilege.getId()), -// LocalDateTime.now(), -// "INIT_DATA", -// LocalDateTime.now(), -// "INIT_DATA" -// )); -// -// roleSaveMapper.insertRole(new Role("ROLE_STAFF", "스텝", AppType.ADMIN, orderNo++)); -// roleSaveMapper.insertRoleHasPrivileges( -// new RoleHasPrivilegeSaveParam( -// "ROLE_STAFF", -// List.of(apiPrivilege.getId(), privilege.getId()), -// LocalDateTime.now(), -// "INIT_DATA", -// LocalDateTime.now(), -// "INIT_DATA" -// )); + int orderNo = 0; + + roleSavePortIn.connect( + AppType.ADMIN, + "ROLE_ADMIN", + "관리자", + orderNo++, + List.of("ADMIN_API", "ADMIN_ACCESS")); + + roleSavePortIn.connect( + AppType.ADMIN, + "ROLE_ANALYST", + "연구원", + orderNo++, + List.of("ADMIN_API", "ADMIN_ACCESS")); + + roleSavePortIn.connect( + AppType.ADMIN, + "ROLE_RESEARCHER", + "조사원", + orderNo++, + List.of("ADMIN_API", "ADMIN_ACCESS")); } } diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java index 1a4d67bd..faa90706 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java @@ -7,11 +7,13 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; +import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor @Slf4j +@Order(4) public class InitUICodeData implements ApplicationRunner { private final UICodeSavePortIn uiCodeSavePortIn; @@ -25,42 +27,42 @@ public class InitUICodeData implements ApplicationRunner { return; } -// final String UICODE = "code"; -// final String UICODE_PAGEABLE = "code.pageable"; -// final String UICODE_PAGEABLE_ROWS = "code.pageable.rows"; -// -// // root 노드 - code -// uiCodeSavePortIn.connect( -// new UICodeSaveCommand(UICODE, null, null, "UI Code", "", null, true), false); -// -// // code - board -// uiCodeSavePortIn.connect( -// new UICodeSaveCommand(UICODE_PAGEABLE, UICODE, 0, "Pageable", "", null, true), false); -// -// // code - board - rows -// uiCodeSavePortIn.connect( -// new UICodeSaveCommand(UICODE_PAGEABLE_ROWS, UICODE_PAGEABLE, 0, "ROW 갯수", "", null, -// true), -// false); -// -// uiCodeSavePortIn.connect( -// new UICodeSaveCommand( -// UICODE_PAGEABLE_ROWS + ".10", UICODE_PAGEABLE_ROWS, 1, "10", "10", null, true), -// false); -// -// uiCodeSavePortIn.connect( -// new UICodeSaveCommand( -// UICODE_PAGEABLE_ROWS + ".20", UICODE_PAGEABLE_ROWS, 2, "20", "20", null, true), -// false); -// -// uiCodeSavePortIn.connect( -// new UICodeSaveCommand( -// UICODE_PAGEABLE_ROWS + ".50", UICODE_PAGEABLE_ROWS, 3, "50", "50", null, true), -// false); -// -// uiCodeSavePortIn.connect( -// new UICodeSaveCommand( -// UICODE_PAGEABLE_ROWS + ".100", UICODE_PAGEABLE_ROWS, 4, "100", "100", null, true), -// false); + final String UICODE = "code"; + final String UICODE_PAGEABLE = "code.pageable"; + final String UICODE_PAGEABLE_ROWS = "code.pageable.rows"; + + // root 노드 - code + uiCodeSavePortIn.connect( + new UICodeSaveCommand(UICODE, null, null, "UI Code", "", null, true), false); + + // code - board + uiCodeSavePortIn.connect( + new UICodeSaveCommand(UICODE_PAGEABLE, UICODE, 0, "Pageable", "", null, true), false); + + // code - board - rows + uiCodeSavePortIn.connect( + new UICodeSaveCommand(UICODE_PAGEABLE_ROWS, UICODE_PAGEABLE, 0, "ROW 갯수", "", null, + true), + false); + + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_PAGEABLE_ROWS + ".10", UICODE_PAGEABLE_ROWS, 1, "10", "10", null, true), + false); + + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_PAGEABLE_ROWS + ".20", UICODE_PAGEABLE_ROWS, 2, "20", "20", null, true), + false); + + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_PAGEABLE_ROWS + ".50", UICODE_PAGEABLE_ROWS, 3, "50", "50", null, true), + false); + + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_PAGEABLE_ROWS + ".100", UICODE_PAGEABLE_ROWS, 4, "100", "100", null, true), + false); } } diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java index 0c54ab5e..c0c98c0a 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriAdminData.java @@ -1,15 +1,10 @@ package app.module.core.config.adapters.persistence.initData; -import app.module.core.config.adapters.persistence.initData.helper.RemoveAllAdminURIMapper; import app.module.core.config.application.enums.AppType; -import app.module.core.usecase.uri.getUris.ports.GetUrisPortIn; -import app.module.core.usecase.uri.getUris.ports.application.domain.URIElement; import app.module.core.usecase.uri.save.ports.URISavePortIn; import app.module.core.usecase.uri.save.ports.application.domain.URISaveCommand; import java.io.IOException; -import java.util.List; import java.util.Set; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -22,12 +17,10 @@ import org.springframework.transaction.annotation.Transactional; @Component @RequiredArgsConstructor @Slf4j -@Order(3) +@Order(4) public class InitUriAdminData implements ApplicationRunner { - private final GetUrisPortIn getUrisPortIn; private final URISavePortIn uriSavePortIn; - private final RemoveAllAdminURIMapper removeAllAdminURIMapper; @Value("${app.initData.core}") private boolean isCoreDataRequired; @@ -39,326 +32,503 @@ public class InitUriAdminData implements ApplicationRunner { return; } -// List uris = getUrisPortIn.connect(AppType.ADMIN); -// removeAllAdminURIMapper.deleteAllByAdminUriIds( -// uris.stream().map(URIElement::getId).collect(Collectors.toList())); -// removeAllAdminURIMapper.deleteAllByAppType(AppType.ADMIN); -// -// final String ADMIN = "uri.admin"; -// -// final String ADMIN_BOARD = "uri.admin.board"; -// -// final String ADMIN_ARTICLE = "uri.admin.board.article"; -// final String ADMIN_ARTICLE_CREATE = "uri.admin.board.article.create"; -// final String ADMIN_ARTICLE_UPDATE = "uri.admin.board.article.update.{{pathVar}}"; -// final String ADMIN_ARTICLE_DELETE = "uri.admin.board.article.delete"; -// final String ADMIN_ARTICLE_EXCEL = "uri.admin.board.article.excel"; -// -// final String ADMIN_SETTINGS = "uri.admin.settings"; -// -// final String ADMIN_SETTINGS_ADMIN_GROUP = "uri.admin.settings.admins.group"; -// final String ADMIN_SETTINGS_ADMIN = "uri.admin.settings.admins"; -// final String ADMIN_SETTINGS_ADMIN_CREATE = "uri.admin.settings.admins.create"; -// final String ADMIN_SETTINGS_ADMIN_UPDATE = "uri.admin.settings.admins.update.{{pathVar}}"; -// final String ADMIN_SETTINGS_ADMIN_DELETE = "uri.admin.settings.admins.delete"; -// final String ADMIN_SETTINGS_ADMIN_EXCEL = "uri.admin.settings.admins.excel"; -// final String ADMIN_SETTINGS_ADMIN_ROLE = "uri.admin.settings.adminRoles"; -// final String ADMIN_SETTINGS_ADMIN_PRIVILEGE = "uri.admin.settings.adminPrivilege"; -// -// final String ADMIN_SETTINGS_USER_GROUP = "uri.admin.settings.user.group"; -// final String ADMIN_SETTINGS_USER = "uri.admin.settings.user"; -// final String ADMIN_SETTINGS_USER_UPDATE = "uri.admin.settings.user.update"; -// final String ADMIN_SETTINGS_USER_ROLE = "uri.admin.settings.user.role"; -// final String ADMIN_SETTINGS_USER_PRIVILEGE = "uri.admin.settings.user.privilege"; -// -// final String ADMIN_SETTINGS_URI_ADMIN = "uri.admin.settings.uri.admin"; -// final String ADMIN_SETTINGS_URI_FRONT = "uri.admin.settings.uri.front"; -// final String ADMIN_SETTINGS_CODE = "uri.admin.settings.uicode"; -// -// final String ADMIN_ANALYSIS = "uri.admin.analysis"; -// final String ADMIN_ANALYSIS_OPERATION_LOG = "uri.admin.analysis.operationLog"; -// final String ADMIN_ANALYSIS_OPERATION_LOG_UPDATE = -// "uri.admin.analysis.operationLog.{{pathVar}}"; -// final String ADMIN_ANALYSIS_OPERATION_LOG_EXCEL = "uri.admin.analysis.operationLog.excel"; -// -// final String ADMIN_ADD_ONS = "uri.admin.addons"; -// final String ADMIN_ADD_ONS_SEND_EMAIL = "uri.admin.addons.email"; -// final String ADMIN_ADD_ONS_SEND_EMAIL_CREATE = "uri.admin.addons.email.create"; -// -// // 최상위 URI 정보 -// appendURI( -// AppType.ADMIN, -// null, -// ADMIN, -// "메인", -// "/", -// true, -// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF")); -// -// // `1` depth URI 정의 - 시작 -// -// appendURI( -// AppType.ADMIN, -// ADMIN, -// ADMIN_SETTINGS, -// "Settings", -// "/true", -// true, -// Set.of("ROLE_SUPER", "ROLE_MANAGER")); -// -// appendURI(AppType.ADMIN, ADMIN, ADMIN_ANALYSIS, "분석", "/analysis", true, -// Set.of("ROLE_SUPER")); -// -// appendURI(AppType.ADMIN, ADMIN, ADMIN_BOARD, "게시판", "/board", true, Set.of("ROLE_SUPER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN, -// ADMIN_ADD_ONS, -// "Add-ons (부가기능)", -// "/add-ons", -// true, -// Set.of("ROLE_SUPER")); -// // `1` depth URI 정의 - 끝 -// -// appendURI( -// AppType.ADMIN, -// ADMIN_SETTINGS, -// ADMIN_SETTINGS_ADMIN_GROUP, -// "관리자 & 역할", -// "/settings/adminGroup", -// true, -// Set.of("ROLE_SUPER", "ROLE_MANAGER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_SETTINGS_ADMIN_GROUP, -// ADMIN_SETTINGS_ADMIN, -// "관리자 목록", -// "/settings/admins", -// true, -// Set.of("ROLE_SUPER", "ROLE_MANAGER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_SETTINGS_ADMIN, -// ADMIN_SETTINGS_ADMIN_CREATE, -// "관리자 등록", -// "/settings/admins/create", -// false, -// Set.of("ROLE_SUPER", "ROLE_MANAGER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_SETTINGS_ADMIN, -// ADMIN_SETTINGS_ADMIN_UPDATE, -// "관리자 수정", -// "/settings/admins/update/{{pathVar}}", -// false, -// Set.of("ROLE_SUPER", "ROLE_MANAGER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_SETTINGS_ADMIN, -// ADMIN_SETTINGS_ADMIN_DELETE, -// "관리자 삭제", -// "/settings/admins/delete", -// false, -// Set.of("ROLE_SUPER", "ROLE_MANAGER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_SETTINGS_ADMIN, -// ADMIN_SETTINGS_ADMIN_EXCEL, -// "관리자 엑셀 다운로드", -// "/settings/admins/excel", -// false, -// Set.of("ROLE_SUPER", "ROLE_MANAGER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_SETTINGS_ADMIN_GROUP, -// ADMIN_SETTINGS_ADMIN_ROLE, -// "관리자 역할", -// "/settings/adminRoles", -// true, -// Set.of("ROLE_SUPER", "ROLE_MANAGER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_SETTINGS_ADMIN_GROUP, -// ADMIN_SETTINGS_ADMIN_PRIVILEGE, -// "관리자 권한", -// "/settings/adminPrivilege", -// true, -// Set.of("ROLE_SUPER", "ROLE_MANAGER")); -// -// // 사용자 & 역할 - 시작 -// appendURI( -// AppType.ADMIN, -// ADMIN_SETTINGS, -// ADMIN_SETTINGS_USER_GROUP, -// "사용자 & 역할", -// "/settings/userGroup", -// true, -// Set.of("ROLE_SUPER", "ROLE_MANAGER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_SETTINGS_USER_GROUP, -// ADMIN_SETTINGS_USER, -// "사용자 목록", -// "/settings/users", -// true, -// Set.of("ROLE_SUPER", "ROLE_MANAGER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_SETTINGS_USER, -// ADMIN_SETTINGS_USER_UPDATE, -// "사용자 수정", -// "/settings/users/{{pathVar}}", -// false, -// Set.of("ROLE_SUPER", "ROLE_MANAGER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_SETTINGS_USER_GROUP, -// ADMIN_SETTINGS_USER_ROLE, -// "사용자 역할", -// "/settings/userRoles", -// true, -// Set.of("ROLE_SUPER", "ROLE_MANAGER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_SETTINGS_USER_GROUP, -// ADMIN_SETTINGS_USER_PRIVILEGE, -// "사용자 권한", -// "/settings/userPrivilege", -// true, -// Set.of("ROLE_SUPER", "ROLE_MANAGER")); -// // 사용자 & 역할 - 끝 -// -// appendURI( -// AppType.ADMIN, -// ADMIN_SETTINGS, -// ADMIN_SETTINGS_URI_ADMIN, -// "URI 관리 (관리자)", -// "/settings/uri/ADMIN", -// true, -// Set.of("ROLE_SUPER", "ROLE_MANAGER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_SETTINGS, -// ADMIN_SETTINGS_URI_FRONT, -// "URI 관리 (FRONT)", -// "/settings/uri/FRONT", -// true, -// Set.of("ROLE_SUPER", "ROLE_MANAGER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_SETTINGS, -// ADMIN_SETTINGS_CODE, -// "UI 코드 (공통코드)", -// "/settings/uicode", -// true, -// Set.of("ROLE_SUPER", "ROLE_MANAGER")); -// -// // 예제 게시판 - 시작 -// // -// appendURI( -// AppType.ADMIN, -// ADMIN_BOARD, -// ADMIN_ARTICLE, -// "예제 게시판", -// "/board/articles", -// true, -// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_ARTICLE, -// ADMIN_ARTICLE_CREATE, -// "예제 게시판 등록", -// "/board/articles/create", -// false, -// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_ARTICLE, -// ADMIN_ARTICLE_UPDATE, -// "예제 게시판 수정", -// "/board/articles/{{pathVar}}", -// false, -// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_ARTICLE, -// ADMIN_ARTICLE_DELETE, -// "예제 게시판 삭제", -// "/board/articles/delete", -// false, -// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_ARTICLE, -// ADMIN_ARTICLE_EXCEL, -// "예제 게시판 엑셀 다운로드", -// "/board/articles/excel", -// false, -// Set.of("ROLE_SUPER", "ROLE_MANAGER", "ROLE_STAFF")); -// // 예제 게시판 - 끝 -// -// appendURI( -// AppType.ADMIN, -// ADMIN_ANALYSIS, -// ADMIN_ANALYSIS_OPERATION_LOG, -// "Operation Log (수행로그)", -// "/analysis/operationlog", -// true, -// Set.of("ROLE_SUPER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_ANALYSIS, -// ADMIN_ANALYSIS_OPERATION_LOG_UPDATE, -// "수행로그 상세", -// "/analysis/operationlog/{{pathVar}}", -// false, -// Set.of("ROLE_SUPER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_ANALYSIS_OPERATION_LOG, -// ADMIN_ANALYSIS_OPERATION_LOG_EXCEL, -// "수행로그 Excel", -// "/analysis/operationlog/excel", -// false, -// Set.of("ROLE_SUPER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_ADD_ONS, -// ADMIN_ADD_ONS_SEND_EMAIL, -// "Email 발송", -// "/addons/email/form", -// true, -// Set.of("ROLE_SUPER")); -// -// appendURI( -// AppType.ADMIN, -// ADMIN_ADD_ONS_SEND_EMAIL, -// ADMIN_ADD_ONS_SEND_EMAIL_CREATE, -// "Email 입력폼", -// "/addons/email/form", -// false, -// Set.of("ROLE_SUPER")); + final String ADMIN = "uri.admin"; + + final String ADMIN_BOARD = "uri.admin.board"; + + final String ADMIN_ARTICLE = "uri.admin.board.article"; + final String ADMIN_ARTICLE_CREATE = "uri.admin.board.article.create"; + final String ADMIN_ARTICLE_UPDATE = "uri.admin.board.article.update.{{pathVar}}"; + final String ADMIN_ARTICLE_DELETE = "uri.admin.board.article.delete"; + final String ADMIN_ARTICLE_EXCEL = "uri.admin.board.article.excel"; + + final String ADMIN_SETTINGS = "uri.admin.settings"; + + final String ADMIN_SETTINGS_ADMIN_GROUP = "uri.admin.settings.admins.group"; + final String ADMIN_SETTINGS_ADMIN = "uri.admin.settings.admins"; + final String ADMIN_SETTINGS_ADMIN_CREATE = "uri.admin.settings.admins.create"; + final String ADMIN_SETTINGS_ADMIN_UPDATE = "uri.admin.settings.admins.update.{{pathVar}}"; + final String ADMIN_SETTINGS_ADMIN_DELETE = "uri.admin.settings.admins.delete"; + final String ADMIN_SETTINGS_ADMIN_EXCEL = "uri.admin.settings.admins.excel"; + final String ADMIN_SETTINGS_ADMIN_ROLE = "uri.admin.settings.adminRoles"; + final String ADMIN_SETTINGS_ADMIN_PRIVILEGE = "uri.admin.settings.adminPrivilege"; + + final String ADMIN_SETTINGS_USER_GROUP = "uri.admin.settings.user.group"; + final String ADMIN_SETTINGS_USER = "uri.admin.settings.user"; + final String ADMIN_SETTINGS_USER_UPDATE = "uri.admin.settings.user.update"; + final String ADMIN_SETTINGS_USER_ROLE = "uri.admin.settings.user.role"; + final String ADMIN_SETTINGS_USER_PRIVILEGE = "uri.admin.settings.user.privilege"; + + final String ADMIN_SETTINGS_URI_ADMIN = "uri.admin.settings.uri.admin"; + final String ADMIN_SETTINGS_URI_FRONT = "uri.admin.settings.uri.front"; + final String ADMIN_SETTINGS_CODE = "uri.admin.settings.uicode"; + + final String ADMIN_ANALYSIS = "uri.admin.analysis"; + final String ADMIN_ANALYSIS_OPERATION_LOG = "uri.admin.analysis.operationLog"; + final String ADMIN_ANALYSIS_OPERATION_LOG_UPDATE = + "uri.admin.analysis.operationLog.{{pathVar}}"; + final String ADMIN_ANALYSIS_OPERATION_LOG_EXCEL = "uri.admin.analysis.operationLog.excel"; + + final String ADMIN_ADD_ONS = "uri.admin.addons"; + final String ADMIN_ADD_ONS_SEND_EMAIL = "uri.admin.addons.email"; + final String ADMIN_ADD_ONS_SEND_EMAIL_CREATE = "uri.admin.addons.email.create"; + + // 조사원 메뉴 + final String ADMIN_RESEARCHER = "uri.admin.researcher"; + + final String ADMIN_RESEARCHER_HOUSEHOLD = "uri.admin.researcher.household"; + final String ADMIN_RESEARCHER_HOUSEHOLD_VIEW = "uri.admin.researcher.household.{{pathVar}}"; + final String ADMIN_RESEARCHER_DASHBOARD = "uri.admin.researcher.dashboard"; + + final String ADMIN_RESEARCHER_RESEARCHER = "uri.admin.researcher.researcher"; + final String ADMIN_RESEARCHER_RESEARCHER_CREATE = "uri.admin.researcher.researcher.create"; + final String ADMIN_RESEARCHER_RESEARCHER_UPDATE = "uri.admin.researcher.researcher.update.{{pathVar}}"; + + // 연구원 메뉴 + final String ADMIN_ANALYST = "uri.admin.analyst"; + final String ADMIN_ANALYST_DASHBOARD = "uri.admin.analyst.dashboard"; + + // 커뮤니케이션 메뉴 + final String ADMIN_COMMUNICATION = "uri.admin.communication"; + final String ADMIN_COMMUNICATION_NOTICE = "uri.admin.communication.notice"; + final String ADMIN_COMMUNICATION_NOTICE_CREATE = "uri.admin.communication.notice.create"; + final String ADMIN_COMMUNICATION_NOTICE_UPDATE = "uri.admin.communication.notice.update.{{pathVar}}"; + final String ADMIN_COMMUNICATION_SMS = "uri.admin.communication.sms"; + + // 임가회원관리 메뉴 + final String ADMIN_HOUSEHOLD = "uri.admin.household"; + final String ADMIN_HOUSEHOLD_HOUSEHOLD = "uri.admin.household.household"; + final String ADMIN_HOUSEHOLD_HOUSEHOLD_CREATE = "uri.admin.household.household.create"; + final String ADMIN_HOUSEHOLD_HOUSEHOLD_UPDATE = "uri.admin.household.household.update.{{pathVar}}"; + + // 최상위 URI 정보 + appendURI( + AppType.ADMIN, + null, + ADMIN, + "메인", + "/", + true, + Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER")); + + // `1` depth URI 정의 - 시작 + + appendURI( + AppType.ADMIN, + ADMIN, + ADMIN_RESEARCHER, + "조사원", + "/researcher", + true, + Set.of("ROLE_ADMIN", "ROLE_RESEARCHER")); + + appendURI( + AppType.ADMIN, + ADMIN, + ADMIN_ANALYST, + "연구원", + "/analyst", + true, + Set.of("ROLE_ADMIN", "ROLE_ANALYST")); + + appendURI( + AppType.ADMIN, + ADMIN, + ADMIN_COMMUNICATION, + "커뮤니케이션", + "/communication", + true, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN, + ADMIN_HOUSEHOLD, + "임가회원관리", + "/household", + true, + Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER")); + + appendURI( + AppType.ADMIN, + ADMIN, + ADMIN_ANALYSIS, + "분석", + "/analysis", + true, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN, + ADMIN_BOARD, + "게시판", + "/board", + true, + Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER")); + + appendURI( + AppType.ADMIN, + ADMIN, + ADMIN_ADD_ONS, + "Add-ons (부가기능)", + "/add-ons", + true, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN, + ADMIN_SETTINGS, + "Settings", + "/true", + true, + Set.of("ROLE_ADMIN")); + // `1` depth URI 정의 - 끝 + + // 조사원 메뉴 시작 + appendURI( + AppType.ADMIN, + ADMIN_RESEARCHER, + ADMIN_RESEARCHER_HOUSEHOLD, + "임가현황조회", + "/researcher/households", + true, + Set.of("ROLE_ADMIN", "ROLE_RESEARCHER")); + + appendURI( + AppType.ADMIN, + ADMIN_RESEARCHER, + ADMIN_RESEARCHER_HOUSEHOLD_VIEW, + "임가현황조회 상세", + "/researcher/households/{{pathVar}}", + false, + Set.of("ROLE_ADMIN", "ROLE_RESEARCHER")); + + appendURI( + AppType.ADMIN, + ADMIN_RESEARCHER, + ADMIN_RESEARCHER_DASHBOARD, + "대시보드", + "/researcher/dashboard", + true, + Set.of("ROLE_ADMIN", "ROLE_RESEARCHER")); + + // 연구원 메뉴 시작 + appendURI( + AppType.ADMIN, + ADMIN_ANALYST, + ADMIN_ANALYST_DASHBOARD, + "대시보드", + "/analyst/dashboard", + true, + Set.of("ROLE_ADMIN", "ROLE_ANALYST")); + + // 커뮤니케이션 메뉴 시작 + appendURI( + AppType.ADMIN, + ADMIN_COMMUNICATION, + ADMIN_COMMUNICATION_NOTICE, + "공지사항", + "/communication/notices", + true, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_COMMUNICATION, + ADMIN_COMMUNICATION_NOTICE_CREATE, + "공지사항 등록", + "/communication/notices/create", + false, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_COMMUNICATION, + ADMIN_COMMUNICATION_NOTICE_UPDATE, + "공지사항 수정", + "/communication/notices/update/{{pathVar}}", + false, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_COMMUNICATION, + ADMIN_COMMUNICATION_SMS, + "문자발송", + "/communication/sms", + true, + Set.of("ROLE_ADMIN")); + + // 임가회원관리 메뉴 시작 + appendURI( + AppType.ADMIN, + ADMIN_HOUSEHOLD, + ADMIN_HOUSEHOLD_HOUSEHOLD, + "임가회원", + "/household/households", + true, + Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER")); + + appendURI( + AppType.ADMIN, + ADMIN_HOUSEHOLD, + ADMIN_HOUSEHOLD_HOUSEHOLD_CREATE, + "임가회원 등록", + "/household/households/create", + false, + Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER")); + + appendURI( + AppType.ADMIN, + ADMIN_HOUSEHOLD, + ADMIN_HOUSEHOLD_HOUSEHOLD_UPDATE, + "임가회원 수정", + "/household/households/update/{{pathVar}}", + false, + Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER")); + + + // 관리자 시작 + appendURI( + AppType.ADMIN, + ADMIN_SETTINGS, + ADMIN_SETTINGS_ADMIN_GROUP, + "관리자 & 역할", + "/settings/adminGroup", + true, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_SETTINGS_ADMIN_GROUP, + ADMIN_SETTINGS_ADMIN, + "관리자 목록", + "/settings/admins", + true, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_SETTINGS_ADMIN, + ADMIN_SETTINGS_ADMIN_CREATE, + "관리자 등록", + "/settings/admins/create", + false, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_SETTINGS_ADMIN, + ADMIN_SETTINGS_ADMIN_UPDATE, + "관리자 수정", + "/settings/admins/update/{{pathVar}}", + false, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_SETTINGS_ADMIN, + ADMIN_SETTINGS_ADMIN_DELETE, + "관리자 삭제", + "/settings/admins/delete", + false, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_SETTINGS_ADMIN, + ADMIN_SETTINGS_ADMIN_EXCEL, + "관리자 엑셀 다운로드", + "/settings/admins/excel", + false, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_SETTINGS_ADMIN_GROUP, + ADMIN_SETTINGS_ADMIN_ROLE, + "관리자 역할", + "/settings/adminRoles", + true, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_SETTINGS_ADMIN_GROUP, + ADMIN_SETTINGS_ADMIN_PRIVILEGE, + "관리자 권한", + "/settings/adminPrivilege", + true, + Set.of("ROLE_ADMIN")); + + // 사용자 & 역할 - 시작 + appendURI( + AppType.ADMIN, + ADMIN_SETTINGS, + ADMIN_SETTINGS_USER_GROUP, + "사용자 & 역할", + "/settings/userGroup", + true, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_SETTINGS_USER_GROUP, + ADMIN_SETTINGS_USER, + "사용자 목록", + "/settings/users", + true, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_SETTINGS_USER, + ADMIN_SETTINGS_USER_UPDATE, + "사용자 수정", + "/settings/users/{{pathVar}}", + false, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_SETTINGS_USER_GROUP, + ADMIN_SETTINGS_USER_ROLE, + "사용자 역할", + "/settings/userRoles", + true, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_SETTINGS_USER_GROUP, + ADMIN_SETTINGS_USER_PRIVILEGE, + "사용자 권한", + "/settings/userPrivilege", + true, + Set.of("ROLE_ADMIN")); + // 사용자 & 역할 - 끝 + + appendURI( + AppType.ADMIN, + ADMIN_SETTINGS, + ADMIN_SETTINGS_URI_ADMIN, + "URI 관리 (관리자)", + "/settings/uri/ADMIN", + true, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_SETTINGS, + ADMIN_SETTINGS_URI_FRONT, + "URI 관리 (FRONT)", + "/settings/uri/FRONT", + true, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_SETTINGS, + ADMIN_SETTINGS_CODE, + "UI 코드 (공통코드)", + "/settings/uicode", + true, + Set.of("ROLE_ADMIN")); + + // 예제 게시판 - 시작 + // + appendURI( + AppType.ADMIN, + ADMIN_BOARD, + ADMIN_ARTICLE, + "예제 게시판", + "/board/articles", + true, + Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER")); + + appendURI( + AppType.ADMIN, + ADMIN_ARTICLE, + ADMIN_ARTICLE_CREATE, + "예제 게시판 등록", + "/board/articles/create", + false, + Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER")); + + appendURI( + AppType.ADMIN, + ADMIN_ARTICLE, + ADMIN_ARTICLE_UPDATE, + "예제 게시판 수정", + "/board/articles/{{pathVar}}", + false, + Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER")); + + appendURI( + AppType.ADMIN, + ADMIN_ARTICLE, + ADMIN_ARTICLE_DELETE, + "예제 게시판 삭제", + "/board/articles/delete", + false, + Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER")); + + appendURI( + AppType.ADMIN, + ADMIN_ARTICLE, + ADMIN_ARTICLE_EXCEL, + "예제 게시판 엑셀 다운로드", + "/board/articles/excel", + false, + Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER")); + // 예제 게시판 - 끝 + + appendURI( + AppType.ADMIN, + ADMIN_ANALYSIS, + ADMIN_ANALYSIS_OPERATION_LOG, + "Operation Log (수행로그)", + "/analysis/operationlog", + true, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_ANALYSIS, + ADMIN_ANALYSIS_OPERATION_LOG_UPDATE, + "수행로그 상세", + "/analysis/operationlog/{{pathVar}}", + false, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_ANALYSIS_OPERATION_LOG, + ADMIN_ANALYSIS_OPERATION_LOG_EXCEL, + "수행로그 Excel", + "/analysis/operationlog/excel", + false, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_ADD_ONS, + ADMIN_ADD_ONS_SEND_EMAIL, + "Email 발송", + "/addons/email/form", + true, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_ADD_ONS_SEND_EMAIL, + ADMIN_ADD_ONS_SEND_EMAIL_CREATE, + "Email 입력폼", + "/addons/email/form", + false, + Set.of("ROLE_ADMIN")); } private void appendURI( diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriFrontData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriFrontData.java index 5b65df1d..4881b3d9 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriFrontData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUriFrontData.java @@ -22,12 +22,10 @@ import org.springframework.transaction.annotation.Transactional; @Component @RequiredArgsConstructor @Slf4j -@Order(3) +@Order(4) public class InitUriFrontData implements ApplicationRunner { - private final GetUrisPortIn getUrisPortIn; private final URISavePortIn uriSavePortIn; - private final RemoveAllFrontURIMapper removeAllFrontURIMapper; @Value("${app.initData.core}") private boolean isCoreDataRequired; @@ -39,154 +37,149 @@ public class InitUriFrontData implements ApplicationRunner { return; } -// List uris = getUrisPortIn.connect(AppType.FRONT); -// removeAllFrontURIMapper.deleteAllByFrontUriIds( -// uris.stream().map(URIElement::getId).collect(Collectors.toList())); -// removeAllFrontURIMapper.deleteAllByAppType(AppType.FRONT); -// -// final String FRONT_ROOT_ID = "uri.front"; -// -// uriSavePortIn.connect( -// new URISaveCommand( -// FRONT_ROOT_ID, -// null, -// AppType.FRONT, -// "/", -// true, -// "프론트", -// null, -// "프론트 홈", -// "프론트 메인", -// "front", -// null, -// null), -// null, -// false); -// -// // 로그인 -// uriSavePortIn.connect( -// new URISaveCommand( -// FRONT_ROOT_ID + ".login", -// FRONT_ROOT_ID, -// AppType.FRONT, -// "/login", -// false, -// "로그인", -// null, -// "로그인", -// "로그인 페이지", -// "front", -// null, -// null), -// null, -// false); -// -// // 회원가입 -// uriSavePortIn.connect( -// new URISaveCommand( -// FRONT_ROOT_ID + ".user.register", -// FRONT_ROOT_ID, -// AppType.FRONT, -// "/user/register", -// false, -// "회원가입", -// null, -// "회원가입", -// "회원가입 페이지", -// "회원가입", -// null, -// null), -// null, -// false); -// -// // 정보수정 -// uriSavePortIn.connect( -// new URISaveCommand( -// FRONT_ROOT_ID + ".user.info", -// FRONT_ROOT_ID, -// AppType.FRONT, -// "/user/info", -// false, -// "정보수정", -// null, -// "정보수정", -// "정보수정 페이지", -// "정보수정", -// null, -// Set.of("ROLE_GENERAL")), -// null, -// false); -// -// // 예제게시판 -// uriSavePortIn.connect( -// new URISaveCommand( -// FRONT_ROOT_ID + ".board.articles", -// FRONT_ROOT_ID, -// AppType.FRONT, -// "/board/articles", -// true, -// "예제게시판", -// null, -// "예제게시판", -// "예제게시판 페이지", -// "예제게시판", -// null, -// Set.of("ROLE_GENERAL")), -// null, -// false); -// -// // 예제 게시판 등록 -// uriSavePortIn.connect( -// new URISaveCommand( -// FRONT_ROOT_ID + ".board.article.create", -// FRONT_ROOT_ID, -// AppType.FRONT, -// "/board/articles/create", -// false, -// "예제 게시판 등록", -// null, -// "예제 게시판 등록", -// "예제 게시판 등록 페이지", -// "예제 게시판 등록", -// null, -// Set.of("ROLE_GENERAL")), -// null, -// false); -// -// // 예제 게시판 상세 -// uriSavePortIn.connect( -// new URISaveCommand( -// FRONT_ROOT_ID + ".board.article.{{pathVar}}", -// FRONT_ROOT_ID, -// AppType.FRONT, -// "/board/articles/{{pathVar}}", -// false, -// "예제 게시판 상세", -// null, -// "예제 게시판 상세", -// "예제 게시판 상세 페이지", -// "예제 게시판 상세", -// null, -// Set.of("ROLE_GENERAL")), -// null, -// false); -// -// // 예제 게시판 수정 -// uriSavePortIn.connect( -// new URISaveCommand( -// FRONT_ROOT_ID + ".board.article.update.{{pathVar}}", -// FRONT_ROOT_ID, -// AppType.FRONT, -// "/board/articles/update/{{pathVar}}", -// false, -// "예제 게시판 수정", -// null, -// "예제 게시판 수정", -// "예제 게시판 수정 페이지", -// "예제 게시판 수정", -// null, -// Set.of("ROLE_GENERAL")), -// null, -// false); + final String FRONT_ROOT_ID = "uri.front"; + + uriSavePortIn.connect( + new URISaveCommand( + FRONT_ROOT_ID, + null, + AppType.FRONT, + "/", + true, + "프론트", + null, + "프론트 홈", + "프론트 메인", + "front", + null, + null), + null, + false); + + // 로그인 + uriSavePortIn.connect( + new URISaveCommand( + FRONT_ROOT_ID + ".login", + FRONT_ROOT_ID, + AppType.FRONT, + "/login", + false, + "로그인", + null, + "로그인", + "로그인 페이지", + "front", + null, + null), + null, + false); + + // 회원가입 + uriSavePortIn.connect( + new URISaveCommand( + FRONT_ROOT_ID + ".user.register", + FRONT_ROOT_ID, + AppType.FRONT, + "/user/register", + false, + "회원가입", + null, + "회원가입", + "회원가입 페이지", + "회원가입", + null, + null), + null, + false); + + // 정보수정 + uriSavePortIn.connect( + new URISaveCommand( + FRONT_ROOT_ID + ".user.info", + FRONT_ROOT_ID, + AppType.FRONT, + "/user/info", + false, + "정보수정", + null, + "정보수정", + "정보수정 페이지", + "정보수정", + null, + Set.of("ROLE_GENERAL")), + null, + false); + + // 예제게시판 + uriSavePortIn.connect( + new URISaveCommand( + FRONT_ROOT_ID + ".board.articles", + FRONT_ROOT_ID, + AppType.FRONT, + "/board/articles", + true, + "예제게시판", + null, + "예제게시판", + "예제게시판 페이지", + "예제게시판", + null, + Set.of("ROLE_GENERAL")), + null, + false); + + // 예제 게시판 등록 + uriSavePortIn.connect( + new URISaveCommand( + FRONT_ROOT_ID + ".board.article.create", + FRONT_ROOT_ID, + AppType.FRONT, + "/board/articles/create", + false, + "예제 게시판 등록", + null, + "예제 게시판 등록", + "예제 게시판 등록 페이지", + "예제 게시판 등록", + null, + Set.of("ROLE_GENERAL")), + null, + false); + + // 예제 게시판 상세 + uriSavePortIn.connect( + new URISaveCommand( + FRONT_ROOT_ID + ".board.article.{{pathVar}}", + FRONT_ROOT_ID, + AppType.FRONT, + "/board/articles/{{pathVar}}", + false, + "예제 게시판 상세", + null, + "예제 게시판 상세", + "예제 게시판 상세 페이지", + "예제 게시판 상세", + null, + Set.of("ROLE_GENERAL")), + null, + false); + + // 예제 게시판 수정 + uriSavePortIn.connect( + new URISaveCommand( + FRONT_ROOT_ID + ".board.article.update.{{pathVar}}", + FRONT_ROOT_ID, + AppType.FRONT, + "/board/articles/update/{{pathVar}}", + false, + "예제 게시판 수정", + null, + "예제 게시판 수정", + "예제 게시판 수정 페이지", + "예제 게시판 수정", + null, + Set.of("ROLE_GENERAL")), + null, + false); } } diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserPrivilegeData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserPrivilegeData.java index 6321f1db..1c6ddd9a 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserPrivilegeData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserPrivilegeData.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor -@Order(1) +@Order(2) public class InitUserPrivilegeData implements ApplicationRunner { private final SaveUserPrivilegePortIn saveUserPrivilegePortIn; @@ -25,8 +25,8 @@ public class InitUserPrivilegeData implements ApplicationRunner { return; } -// saveUserPrivilegePortIn.operate(new SaveUserPrivilegeCmd("FRONT_API", "Front API 사용권한", 0)); -// saveUserPrivilegePortIn.operate( -// new SaveUserPrivilegeCmd("FRONT_ACCESS", "Front 사이트 접근 권한", 1)); + saveUserPrivilegePortIn.operate(new SaveUserPrivilegeCmd("FRONT_API", "Front API 사용권한", 0)); + saveUserPrivilegePortIn.operate( + new SaveUserPrivilegeCmd("FRONT_ACCESS", "Front 사이트 접근 권한", 1)); } } diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserRoleData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserRoleData.java index f4d6a8a4..78cfdf19 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserRoleData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUserRoleData.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor -@Order(2) +@Order(3) public class InitUserRoleData implements ApplicationRunner { private final SaveUserRolePortIn saveUserRolePortIn; @@ -26,7 +26,7 @@ public class InitUserRoleData implements ApplicationRunner { return; } -// saveUserRolePortIn.operate( -// new SaveUserRoleCmd("ROLE_GENERAL", "일반 사용자", 0, List.of("FRONT_API", "FRONT_ACCESS"))); + saveUserRolePortIn.operate( + new SaveUserRoleCmd("ROLE_GENERAL", "일반 사용자", 0, List.of("FRONT_API", "FRONT_ACCESS"))); } } diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/RemoveInitData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/RemoveInitData.java new file mode 100644 index 00000000..6fa45e2c --- /dev/null +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/RemoveInitData.java @@ -0,0 +1,51 @@ +package app.module.core.config.adapters.persistence.initData; + +import app.module.core.config.adapters.persistence.initData.helper.RemoveAllArticleMapper; +import app.module.core.config.adapters.persistence.initData.helper.RemoveAllMapper; +import app.module.core.usecase.article.createArticle.ports.CreateArticlePortIn; +import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticleCmd; +import java.time.LocalDateTime; +import java.util.stream.IntStream; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +@Order(1) +public class RemoveInitData implements ApplicationRunner { + + private final RemoveAllMapper mapper; + + @Value("${app.initData.core}") + private boolean isCoreDataRequired; + + @Override + public void run(ApplicationArguments args) throws Exception { + if (!isCoreDataRequired) { + return; + } + + mapper.deleteAllAdminHasRole(); + mapper.deleteAllAdmin(); + + mapper.deleteAllHouseholdHasRole(); + mapper.deleteAllHousehold(); + + mapper.deleteAllRoleHasPrivilege(); + mapper.deleteAllPrivilege(); + + mapper.deleteAllUriHasRole(); + mapper.deleteAllUri(); + + mapper.deleteAllFrontUserHasRole(); + mapper.deleteAllFrontUser(); + + mapper.deleteAllRole(); + + mapper.deleteAllUicode(); + } +} diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllMapper.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllMapper.java new file mode 100644 index 00000000..0eda9bf8 --- /dev/null +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/helper/RemoveAllMapper.java @@ -0,0 +1,25 @@ +package app.module.core.config.adapters.persistence.initData.helper; + +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RemoveAllMapper { + void deleteAllAdminHasRole(); + void deleteAllAdmin(); + + void deleteAllRoleHasPrivilege(); + void deleteAllPrivilege(); + + void deleteAllUriHasRole(); + void deleteAllUri(); + + void deleteAllFrontUserHasRole(); + void deleteAllFrontUser(); + + void deleteAllHouseholdHasRole(); + void deleteAllHousehold(); + + void deleteAllRole(); + + void deleteAllUicode(); +} diff --git a/core/src/main/java/app/module/core/config/application/util/AuditUtil.java b/core/src/main/java/app/module/core/config/application/util/AuditUtil.java new file mode 100644 index 00000000..c455231a --- /dev/null +++ b/core/src/main/java/app/module/core/config/application/util/AuditUtil.java @@ -0,0 +1,22 @@ +package app.module.core.config.application.util; + +import app.module.core.config.adapters.persistence.component.AuditCommand; + +public class AuditUtil { + private AuditUtil() {} + + public static T create(T cmd) { + cmd.create(); + return cmd; + } + + public static T update(T cmd) { + cmd.update(); + return cmd; + } + + public static T delete(T cmd) { + cmd.delete(); + return cmd; + } +} diff --git a/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsDao.java b/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsDao.java index 3871dd39..9899e035 100644 --- a/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsDao.java +++ b/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsDao.java @@ -32,7 +32,7 @@ class GetAdminsDao implements GetAdminsPortOut { // 관리자의 역할 목록 조회 List roles = getAdminsMapper.findRolesWithPrivilegesByAdminIds( - admins.stream().map(GetAdminsDto::getId).toList()); + admins.stream().map(GetAdminsDto::getSeq).toList()); return new PageImpl<>( admins.stream() @@ -47,7 +47,7 @@ class GetAdminsDao implements GetAdminsPortOut { admin.getAccountLocked(), admin.getTotal(), roles.stream() - .filter(r -> r.getAdminId().equals(admin.getId())) + .filter(r -> r.getAdminSeq().equals(admin.getSeq())) .collect(Collectors.toList()) )).toList(), pageable, diff --git a/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsMapper.java b/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsMapper.java index ebb2e6a8..7dcb43c9 100644 --- a/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsMapper.java +++ b/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/GetAdminsMapper.java @@ -12,5 +12,5 @@ import org.springframework.data.domain.Pageable; @Mapper public interface GetAdminsMapper { List findAll(@Param("cmd") GetAdminsCmd cmd, @Param("pageable") Pageable pageable); - List findRolesWithPrivilegesByAdminIds(@Param("ids") List ids); + List findRolesWithPrivilegesByAdminIds(@Param("seqs") List seqs); } \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/model/GetAdminsDto.java b/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/model/GetAdminsDto.java index f4eb6b16..51d1f848 100644 --- a/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/model/GetAdminsDto.java +++ b/core/src/main/java/app/module/core/usecase/admin/getAdmins/adapters/persistence/model/GetAdminsDto.java @@ -7,6 +7,7 @@ import lombok.Setter; @Getter @Setter public class GetAdminsDto { + private Long seq; private String id; private String createdBy; private LocalDateTime createdAt; diff --git a/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdminsRole.java b/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdminsRole.java index 5e9bb151..986c99fd 100644 --- a/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdminsRole.java +++ b/core/src/main/java/app/module/core/usecase/admin/getAdmins/ports/application/domain/GetAdminsRole.java @@ -14,7 +14,7 @@ import lombok.Setter; public class GetAdminsRole implements Serializable { private Integer adminHasRoleId; private String id; - private String adminId; + private Long adminSeq; private String description; private Integer orderNo; private List privileges; diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java index 16e08a70..63e0201a 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminDao.java @@ -1,6 +1,8 @@ package app.module.core.usecase.admin.saveAdmin.adapters.persistence; import app.module.core.config.adapters.persistence.entity.Admin; +import app.module.core.config.application.annotation.CreateCommand; +import app.module.core.config.application.util.AuditUtil; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.admin.saveAdmin.ports.SaveAdminPortOut; import app.module.core.usecase.admin.saveAdmin.adapters.persistence.model.DeleteAdminHasRoleParam; @@ -22,50 +24,29 @@ class SaveAdminDao implements SaveAdminPortOut { @Override @Transactional + @CreateCommand public String connect(SaveAdminCmd cmd) { - String userId = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); - Admin admin = new Admin( - cmd.getId(), - cmd.getEncodedPassword(), - cmd.getEmail(), - cmd.getPasswordUpdatedAt(), - cmd.getAccountDisabled(), - cmd.getLoginFailCnt(), - cmd.getAccountLocked() - ); + if (viewMapper.findById(cmd.getId()).isPresent()) { + // update + mapper.updateAdmin(cmd); + mapper.deleteAdminRolesByAdminId( + AuditUtil.delete(new DeleteAdminHasRoleParam(cmd.getSeq()))); - - if (viewMapper.findAdminUserById(cmd.getId()).isPresent()) { - updateAdmin(admin, cmd, userId, now); + if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) { + mapper.insertAdminHasRoles( + AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), cmd.getRoleIds()))); + } } else { - insertAdmin(admin, cmd, userId, now); + // create + mapper.insertAdmin(cmd); + + if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) { + mapper.insertAdminHasRoles( + AuditUtil.create(new SaveAdminHasRoleParam(cmd.getSeq(), cmd.getRoleIds()))); + } } return cmd.getId(); } - - private void updateAdmin(Admin admin, SaveAdminCmd cmd, String userId, LocalDateTime now) { - mapper.updateAdmin(admin); - mapper.deleteAdminRolesByAdminId(new DeleteAdminHasRoleParam( - cmd.getId(), now, userId, now, userId - )); - - if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) { - mapper.insertAdminHasRoles(new SaveAdminHasRoleParam( - cmd.getId(), cmd.getRoleIds(), now, userId, now, userId - )); - } - } - - private void insertAdmin(Admin admin, SaveAdminCmd cmd, String userId, LocalDateTime now) { - mapper.insertAdmin(admin); - - if (CollectionUtils.isNotEmpty(cmd.getRoleIds())) { - mapper.insertAdminHasRoles(new SaveAdminHasRoleParam( - cmd.getId(), cmd.getRoleIds(), now, userId, now, userId - )); - } - } } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminMapper.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminMapper.java index cc5b7685..c6e10b2a 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminMapper.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/SaveAdminMapper.java @@ -1,14 +1,14 @@ package app.module.core.usecase.admin.saveAdmin.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Admin; import app.module.core.usecase.admin.saveAdmin.adapters.persistence.model.DeleteAdminHasRoleParam; import app.module.core.usecase.admin.saveAdmin.adapters.persistence.model.SaveAdminHasRoleParam; +import app.module.core.usecase.admin.saveAdmin.ports.application.domain.SaveAdminCmd; import org.apache.ibatis.annotations.Mapper; @Mapper public interface SaveAdminMapper { - void insertAdmin(Admin admin); - void updateAdmin(Admin admin); + void insertAdmin(SaveAdminCmd cmd); + void updateAdmin(SaveAdminCmd cmd); void insertAdminHasRoles(SaveAdminHasRoleParam param); void deleteAdminRolesByAdminId(DeleteAdminHasRoleParam param); } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/DeleteAdminHasRoleParam.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/DeleteAdminHasRoleParam.java index 6558861c..170bc301 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/DeleteAdminHasRoleParam.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/DeleteAdminHasRoleParam.java @@ -1,5 +1,6 @@ package app.module.core.usecase.admin.saveAdmin.adapters.persistence.model; +import app.module.core.config.adapters.persistence.component.AuditCommand; import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; @@ -8,10 +9,6 @@ import lombok.Setter; @Getter @Setter @AllArgsConstructor -public class DeleteAdminHasRoleParam { - private String adminId; - private LocalDateTime updatedAt; - private String updatedBy; - private LocalDateTime deletedAt; - private String deletedBy; +public class DeleteAdminHasRoleParam extends AuditCommand { + private Long adminSeq; } diff --git a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/SaveAdminHasRoleParam.java b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/SaveAdminHasRoleParam.java index 042d9488..e1211f5f 100644 --- a/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/SaveAdminHasRoleParam.java +++ b/core/src/main/java/app/module/core/usecase/admin/saveAdmin/adapters/persistence/model/SaveAdminHasRoleParam.java @@ -1,5 +1,6 @@ package app.module.core.usecase.admin.saveAdmin.adapters.persistence.model; +import app.module.core.config.adapters.persistence.component.AuditCommand; import java.time.LocalDateTime; import java.util.List; import lombok.AllArgsConstructor; @@ -9,11 +10,7 @@ import lombok.Setter; @Getter @Setter @AllArgsConstructor -public class SaveAdminHasRoleParam { - private String adminId; +public class SaveAdminHasRoleParam extends AuditCommand { + private Long adminSeq; private List roleIds; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; } 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 6cf1678c..3534b5bc 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 @@ -4,7 +4,9 @@ import java.util.List; public interface SaveAdminPortIn { - String connect(String id, + String connect( + Long seq, + String id, String password, String email, Boolean accountDisabled, 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 7bce3d58..52b5cfea 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 @@ -22,6 +22,7 @@ public class SaveAdminService implements SaveAdminPortIn { @Override public String connect( + Long seq, String id, String password, String email, @@ -52,6 +53,7 @@ public class SaveAdminService implements SaveAdminPortIn { return saveAdminPortOut.connect( new SaveAdminCmd( + seq, id, password, passwordUpdatedAt, 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 1f9ad30d..3ba66358 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 @@ -1,13 +1,17 @@ package app.module.core.usecase.admin.saveAdmin.ports.application.domain; +import app.module.core.config.adapters.persistence.component.AuditCommand; import java.time.LocalDateTime; import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.Setter; @Getter +@Setter @AllArgsConstructor -public class SaveAdminCmd { +public class SaveAdminCmd extends AuditCommand { + private Long seq; private String id; private String encodedPassword; private LocalDateTime passwordUpdatedAt; diff --git a/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewDao.java b/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewDao.java index 77b8916d..d51e07ba 100644 --- a/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewDao.java +++ b/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewDao.java @@ -4,7 +4,6 @@ import app.module.core.usecase.admin.view.ports.AdminViewPortOut; import app.module.core.usecase.admin.view.ports.application.domain.AdminView; import java.util.Optional; import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; @@ -12,26 +11,14 @@ import org.springframework.transaction.annotation.Transactional; @RequiredArgsConstructor class AdminViewDao implements AdminViewPortOut { - private final AdminViewMapper adminViewMapper; + private final AdminViewMapper mapper; @Override @Transactional public Optional connect(String id) { - return adminViewMapper.findAdminUserById(id) - .map(admin -> new AdminView( - admin.getId(), - admin.getPassword(), - admin.getEmail(), - admin.getPasswordUpdatedAt(), - admin.getAccountDisabled(), - admin.getLoginFailCnt(), - admin.getAccountLocked(), - ListUtils.emptyIfNull( - adminViewMapper.findRolesWithPrivilegesByAdminId(id)), - admin.getCreatedAt(), - admin.getCreatedBy(), - admin.getUpdatedAt(), - admin.getUpdatedBy() - )); + return mapper.findById(id).map(admin -> { + admin.setRoles(mapper.findRoleHasPrivilegesByAdminId(admin.getSeq())); + return admin; + }); } } diff --git a/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewMapper.java b/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewMapper.java index 063217ad..a82005ad 100644 --- a/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewMapper.java +++ b/core/src/main/java/app/module/core/usecase/admin/view/adapters/persistence/AdminViewMapper.java @@ -1,13 +1,13 @@ package app.module.core.usecase.admin.view.adapters.persistence; import app.module.core.config.adapters.web.security.domain.CoreRole; -import app.module.core.usecase.admin.view.adapters.persistence.model.AdminViewDto; +import app.module.core.usecase.admin.view.ports.application.domain.AdminView; import java.util.List; import java.util.Optional; import org.apache.ibatis.annotations.Mapper; @Mapper public interface AdminViewMapper { - Optional findAdminUserById(String id); - List findRolesWithPrivilegesByAdminId(String adminId); + Optional findById(String id); + List findRoleHasPrivilegesByAdminId(Long id); } 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 fa8db8b9..a4690167 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 @@ -12,16 +12,20 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class AdminView implements Serializable { + private Long seq; private String id; private String password; private String email; + private String name; + private String contact; + private Integer inspectionAreaCode; private LocalDateTime passwordUpdatedAt; private Boolean accountDisabled; private Integer loginFailCnt; private Boolean accountLocked; - private List roles; private LocalDateTime createdAt; private String createdBy; private LocalDateTime updatedAt; private String updatedBy; + private List roles; } diff --git a/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/adapters/persistence/GetAdminDao.java b/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/adapters/persistence/GetAdminDao.java deleted file mode 100644 index 4ad9a5bb..00000000 --- a/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/adapters/persistence/GetAdminDao.java +++ /dev/null @@ -1,23 +0,0 @@ -package app.module.core.usecase.adminResearch.getAdmin.adapters.persistence; - -import app.module.core.usecase.adminResearch.getAdmin.ports.GetAdminPortOut; -import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin; -import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd; -import java.util.Optional; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -@Repository -@RequiredArgsConstructor -class GetAdminDao implements GetAdminPortOut { - - private final GetAdminMapper mapper; - - @Override - public Optional operate(GetAdminCmd cmd) { - return mapper.findById(cmd).map(admin -> { - admin.setRoles(mapper.findRoleHasPrivilegesByAdminId(admin.getSeq())); - return admin; - }); - } -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/adapters/persistence/GetAdminMapper.java b/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/adapters/persistence/GetAdminMapper.java deleted file mode 100644 index f784ce28..00000000 --- a/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/adapters/persistence/GetAdminMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package app.module.core.usecase.adminResearch.getAdmin.adapters.persistence; - -import app.module.core.config.adapters.web.security.domain.CoreRole; -import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin; -import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd; -import java.util.List; -import java.util.Optional; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface GetAdminMapper { - Optional findById(GetAdminCmd cmd); - List findRoleHasPrivilegesByAdminId(Long id); -} diff --git a/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/GetAdminPortIn.java b/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/GetAdminPortIn.java deleted file mode 100644 index fd88af78..00000000 --- a/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/GetAdminPortIn.java +++ /dev/null @@ -1,9 +0,0 @@ -package app.module.core.usecase.adminResearch.getAdmin.ports; - -import java.util.Optional; -import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin; -import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd; - -public interface GetAdminPortIn { - Optional operate(GetAdminCmd cmd); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/GetAdminPortOut.java b/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/GetAdminPortOut.java deleted file mode 100644 index 90044544..00000000 --- a/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/GetAdminPortOut.java +++ /dev/null @@ -1,9 +0,0 @@ -package app.module.core.usecase.adminResearch.getAdmin.ports; - -import java.util.Optional; -import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin; -import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd; - -public interface GetAdminPortOut { - Optional operate(GetAdminCmd cmd); -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/application/GetAdminService.java b/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/application/GetAdminService.java deleted file mode 100644 index cf92ccda..00000000 --- a/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/application/GetAdminService.java +++ /dev/null @@ -1,20 +0,0 @@ -package app.module.core.usecase.adminResearch.getAdmin.ports.application; - -import lombok.RequiredArgsConstructor; -import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdmin; -import app.module.core.usecase.adminResearch.getAdmin.ports.application.domain.GetAdminCmd; -import app.module.core.usecase.adminResearch.getAdmin.ports.GetAdminPortIn; -import app.module.core.usecase.adminResearch.getAdmin.ports.GetAdminPortOut; -import java.util.Optional; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -class GetAdminService implements GetAdminPortIn { - private final GetAdminPortOut portOut; - - @Override - public Optional operate(GetAdminCmd cmd) { - return portOut.operate(cmd); - } -} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/application/domain/GetAdmin.java b/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/application/domain/GetAdmin.java deleted file mode 100644 index eb5f9436..00000000 --- a/core/src/main/java/app/module/core/usecase/adminResearch/getAdmin/ports/application/domain/GetAdmin.java +++ /dev/null @@ -1,32 +0,0 @@ -package app.module.core.usecase.adminResearch.getAdmin.ports.application.domain; - -import app.module.core.config.adapters.web.security.domain.CoreRole; -import java.time.LocalDateTime; -import java.util.List; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -@EqualsAndHashCode -public class GetAdmin { - private Long seq; - private String id; - private String password; - private String name; - private String contact; - private Integer inspectionAreaCode; - private LocalDateTime passwordUpdatedAt; - private Boolean accountDisabled; - private Integer loginFailCnt; - private Boolean accountLocked; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; - private List roles; -} diff --git a/core/src/main/java/app/module/core/usecase/article/createArticle/adapters/persistence/CreateArticleDao.java b/core/src/main/java/app/module/core/usecase/article/createArticle/adapters/persistence/CreateArticleDao.java index 2ec1553b..3e507e2a 100644 --- a/core/src/main/java/app/module/core/usecase/article/createArticle/adapters/persistence/CreateArticleDao.java +++ b/core/src/main/java/app/module/core/usecase/article/createArticle/adapters/persistence/CreateArticleDao.java @@ -1,20 +1,15 @@ package app.module.core.usecase.article.createArticle.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Article; -import app.module.core.config.adapters.persistence.entity.UploadFile; -import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.article.createArticle.adapters.persistence.model.CreateArticleDto; import app.module.core.usecase.article.createArticle.adapters.persistence.model.CreateArticleHasUploadFilesParam; import app.module.core.usecase.article.createArticle.ports.CreateArticlePortOut; import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticle; import app.module.core.usecase.article.createArticle.ports.application.domain.CreateArticleCmd; -import java.time.LocalDateTime; -import org.springframework.transaction.annotation.Transactional; import java.util.Optional; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; @Repository @RequiredArgsConstructor diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java new file mode 100644 index 00000000..8b89bc59 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java @@ -0,0 +1,24 @@ +package app.module.core.usecase.household.createHousehold.adapters.persistence; + +import app.module.core.config.application.annotation.CreateCommand; +import app.module.core.config.application.util.AuditUtil; +import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd; +import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; +import lombok.RequiredArgsConstructor; +import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; +import app.module.core.usecase.household.createHousehold.ports.CreateHouseholdPortOut; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +class CreateHouseholdDao implements CreateHouseholdPortOut { + private final CreateHouseholdMapper mapper; + + @Override + @CreateCommand + public void operate(CreateHouseholdOutCmd outCmd) { + mapper.createHousehold(outCmd); + mapper.createHouseholdHasRole( + AuditUtil.create(new CreateHouseholdHasRoleCmd(outCmd.getSeq(), outCmd.getRoleIds()))); + } +} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java new file mode 100644 index 00000000..3c031fb6 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/household/createHousehold/adapters/persistence/CreateHouseholdMapper.java @@ -0,0 +1,11 @@ +package app.module.core.usecase.household.createHousehold.adapters.persistence; + +import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd; +import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CreateHouseholdMapper { + void createHousehold(CreateHouseholdOutCmd outCmd); + void createHouseholdHasRole(CreateHouseholdHasRoleCmd cmd); +} diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortIn.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortIn.java new file mode 100644 index 00000000..39722dc2 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortIn.java @@ -0,0 +1,7 @@ +package app.module.core.usecase.household.createHousehold.ports; + +import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; + +public interface CreateHouseholdPortIn { + void operate(CreateHouseholdInCmd inCmd); +} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortOut.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortOut.java new file mode 100644 index 00000000..e848d0f5 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/CreateHouseholdPortOut.java @@ -0,0 +1,8 @@ +package app.module.core.usecase.household.createHousehold.ports; + +import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; +import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; + +public interface CreateHouseholdPortOut { + void operate(CreateHouseholdOutCmd outCmd); +} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/CreateHouseholdService.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/CreateHouseholdService.java new file mode 100644 index 00000000..30001aa1 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/CreateHouseholdService.java @@ -0,0 +1,44 @@ +package app.module.core.usecase.household.createHousehold.ports.application; + +import app.module.core.usecase.household.createHousehold.ports.CreateHouseholdPortIn; +import app.module.core.usecase.household.createHousehold.ports.CreateHouseholdPortOut; +import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; +import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +class CreateHouseholdService implements CreateHouseholdPortIn { + + private final CreateHouseholdPortOut portOut; + private final BCryptPasswordEncoder passwordEncoder; + + @Override + public void operate(CreateHouseholdInCmd inCmd) { + portOut.operate(new CreateHouseholdOutCmd( + null, + inCmd.getHouseholdNum(), + inCmd.getOwnerName(), + inCmd.getOwnerAge(), + inCmd.getTel(), + inCmd.getPhone(), + passwordEncoder.encode(StringUtils.right(inCmd.getPhone(), 4)), // 비밀번호 핸드폰 뒤 네자리 + inCmd.getRegion(), + inCmd.getCity(), + inCmd.getAddressDetail(), + inCmd.getIndustryLargeCode(), + inCmd.getIndustryMiddleCode(), + inCmd.getIndustrySmallCode(), + inCmd.getScaleCode(), + inCmd.getEmploymentCode(), + inCmd.getIsPanel(), + inCmd.getMemo(), + inCmd.getDropReason(), + List.of("ROLE_GENERAL") + )); + } +} \ No newline at end of file diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdHasRoleCmd.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdHasRoleCmd.java new file mode 100644 index 00000000..152072d1 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdHasRoleCmd.java @@ -0,0 +1,17 @@ +package app.module.core.usecase.household.createHousehold.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateHouseholdHasRoleCmd extends AuditCommand { + private Long householdSeq; + private List roleIds; +} diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java new file mode 100644 index 00000000..2853dd18 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java @@ -0,0 +1,29 @@ +package app.module.core.usecase.household.createHousehold.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateHouseholdInCmd { + private String householdNum; + private String ownerName; + private Integer ownerAge; + private String tel; + private String phone; + private String region; + private String city; + private String addressDetail; + private Integer industryLargeCode; + private Integer industryMiddleCode; + private Integer industrySmallCode; + private Integer scaleCode; + private Integer employmentCode; + private Boolean isPanel; + private String memo; + private String dropReason; +} diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java new file mode 100644 index 00000000..dcd2a679 --- /dev/null +++ b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java @@ -0,0 +1,34 @@ +package app.module.core.usecase.household.createHousehold.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@EqualsAndHashCode +public class CreateHouseholdOutCmd extends AuditCommand { + private Long seq; + private String householdNum; + private String ownerName; + private Integer ownerAge; + private String tel; + private String phone; + private String encodedPassword; + private String region; + private String city; + private String addressDetail; + private Integer industryLargeCode; + private Integer industryMiddleCode; + private Integer industrySmallCode; + private Integer scaleCode; + private Integer employmentCode; + private Boolean isPanel; + private String memo; + private String dropReason; + private List roleIds; +} diff --git a/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveDao.java b/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveDao.java index 4aa5a913..e39abebf 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveDao.java +++ b/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveDao.java @@ -1,14 +1,10 @@ package app.module.core.usecase.privilege.save.adapters.persistence; -import app.module.core.config.adapters.persistence.entity.Privilege; -import app.module.core.config.application.util.CommonUtil; +import app.module.core.config.application.util.AuditUtil; import app.module.core.usecase.privilege.save.ports.PrivilegeSavePortOut; import app.module.core.usecase.privilege.save.ports.application.domain.PrivilegeSaveCommand; import app.module.core.usecase.privilege.view.adapters.persistence.PrivilegeViewMapper; -import java.time.LocalDateTime; -import java.util.Optional; import lombok.RequiredArgsConstructor; -import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Repository; @Repository @@ -21,17 +17,10 @@ public class PrivilegeSaveDao implements PrivilegeSavePortOut { @Override public String connect(PrivilegeSaveCommand saveInput) { - Privilege privilege = new Privilege( - saveInput.getId(), - saveInput.getDescription(), - saveInput.getAppType(), - saveInput.getOrderNo() - ); - if (viewMapper.findById(saveInput.getId()).isPresent()) { - mapper.updatePrivilege(privilege); + mapper.updatePrivilege(AuditUtil.update(saveInput)); } else { - mapper.insertPrivilege(privilege); + mapper.insertPrivilege(AuditUtil.create(saveInput)); } return saveInput.getId(); diff --git a/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveMapper.java b/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveMapper.java index bd7ba39e..3e4f1ca1 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveMapper.java +++ b/core/src/main/java/app/module/core/usecase/privilege/save/adapters/persistence/PrivilegeSaveMapper.java @@ -1,10 +1,11 @@ package app.module.core.usecase.privilege.save.adapters.persistence; import app.module.core.config.adapters.persistence.entity.Privilege; +import app.module.core.usecase.privilege.save.ports.application.domain.PrivilegeSaveCommand; import org.apache.ibatis.annotations.Mapper; @Mapper public interface PrivilegeSaveMapper { - void insertPrivilege(Privilege privilege); - void updatePrivilege(Privilege privilege); + void insertPrivilege(PrivilegeSaveCommand cmd); + void updatePrivilege(PrivilegeSaveCommand cmd); } diff --git a/core/src/main/java/app/module/core/usecase/privilege/save/ports/application/domain/PrivilegeSaveCommand.java b/core/src/main/java/app/module/core/usecase/privilege/save/ports/application/domain/PrivilegeSaveCommand.java index fabe5d66..bdefe86b 100644 --- a/core/src/main/java/app/module/core/usecase/privilege/save/ports/application/domain/PrivilegeSaveCommand.java +++ b/core/src/main/java/app/module/core/usecase/privilege/save/ports/application/domain/PrivilegeSaveCommand.java @@ -1,5 +1,6 @@ package app.module.core.usecase.privilege.save.ports.application.domain; +import app.module.core.config.adapters.persistence.component.AuditCommand; import app.module.core.config.application.enums.AppType; import lombok.AllArgsConstructor; import lombok.Getter; @@ -8,7 +9,7 @@ import lombok.Setter; @Getter @Setter @AllArgsConstructor -public class PrivilegeSaveCommand { +public class PrivilegeSaveCommand extends AuditCommand { private AppType appType; private final String id; diff --git a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveDao.java b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveDao.java index 9bee5a5e..f0e4c636 100644 --- a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveDao.java +++ b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/RoleSaveDao.java @@ -2,6 +2,7 @@ package app.module.core.usecase.role.save.adapters.persistence; import app.module.core.config.adapters.persistence.entity.Role; import app.module.core.config.application.enums.AppType; +import app.module.core.config.application.util.AuditUtil; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.role.save.ports.RoleSavePortOut; import app.module.core.usecase.role.save.adapters.persistence.model.RoleHasPrivilegeDeleteParam; @@ -27,40 +28,27 @@ public class RoleSaveDao implements RoleSavePortOut { AppType appType, String id, String description, Integer orderNo, List privilegeIds) { - String userId = CommonUtil.getLoginUsername(); - LocalDateTime now = LocalDateTime.now(); - Role role = new Role(id, description, appType, orderNo); if (viewMapper.findRoleById(id).isPresent()) { - updateRole(role, privilegeIds, userId, now); + mapper.deleteAllRoleHasPrivileges( + AuditUtil.delete(new RoleHasPrivilegeDeleteParam(role.getId()))); + + mapper.updateRole(role); + + if (CollectionUtils.isNotEmpty(privilegeIds)) { + mapper.insertRoleHasPrivileges( + AuditUtil.create(new RoleHasPrivilegeSaveParam(role.getId(), privilegeIds))); + } } else { - insertRole(role, privilegeIds, userId, now); + mapper.insertRole(role); + + if (CollectionUtils.isNotEmpty(privilegeIds)) { + mapper.insertRoleHasPrivileges( + AuditUtil.create(new RoleHasPrivilegeSaveParam(role.getId(), privilegeIds))); + } } return id; } - - private void updateRole(Role role, List privilegeIds, String userId, LocalDateTime now) { - mapper.deleteAllRoleHasPrivileges(new RoleHasPrivilegeDeleteParam( - role.getId(), now, userId, now, userId - )); - mapper.updateRole(role); - - if (CollectionUtils.isNotEmpty(privilegeIds)) { - mapper.insertRoleHasPrivileges(new RoleHasPrivilegeSaveParam( - role.getId(), privilegeIds, now, userId, now, userId - )); - } - } - - private void insertRole(Role role, List privilegeIds, String userId, LocalDateTime now) { - mapper.insertRole(role); - - if (CollectionUtils.isNotEmpty(privilegeIds)) { - mapper.insertRoleHasPrivileges(new RoleHasPrivilegeSaveParam( - role.getId(), privilegeIds, now, userId, now, userId - )); - } - } } diff --git a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java index 1245856a..73aee0d0 100644 --- a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java +++ b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeDeleteParam.java @@ -1,5 +1,7 @@ package app.module.core.usecase.role.save.adapters.persistence.model; +import app.module.core.config.adapters.persistence.component.AuditCommand; +import app.module.core.config.application.util.AuditUtil; import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Getter; @@ -8,10 +10,6 @@ import lombok.Setter; @Getter @Setter @AllArgsConstructor -public class RoleHasPrivilegeDeleteParam { +public class RoleHasPrivilegeDeleteParam extends AuditCommand { private String roleId; - private LocalDateTime updatedAt; - private String updatedBy; - private LocalDateTime deletedAt; - private String deletedBy; } diff --git a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeSaveParam.java b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeSaveParam.java index 6c06bf0e..7ac4e4b0 100644 --- a/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeSaveParam.java +++ b/core/src/main/java/app/module/core/usecase/role/save/adapters/persistence/model/RoleHasPrivilegeSaveParam.java @@ -1,5 +1,6 @@ package app.module.core.usecase.role.save.adapters.persistence.model; +import app.module.core.config.adapters.persistence.component.AuditCommand; import java.time.LocalDateTime; import java.util.List; import lombok.AllArgsConstructor; @@ -9,11 +10,7 @@ import lombok.Setter; @AllArgsConstructor @Getter @Setter -public class RoleHasPrivilegeSaveParam { +public class RoleHasPrivilegeSaveParam extends AuditCommand { private String roleId; private List privilegeIds; - private LocalDateTime createdAt; - private String createdBy; - private LocalDateTime updatedAt; - private String updatedBy; } diff --git a/core/src/main/resources/core.yml b/core/src/main/resources/core.yml index dfefcaa6..44a9a6bf 100644 --- a/core/src/main/resources/core.yml +++ b/core/src/main/resources/core.yml @@ -53,9 +53,7 @@ spring: # 초기 스키마 생성 SQL 경로 설정 sql: init: - schema-locations: - - classpath:sql/drop-all.sql - - classpath:sql/create-all.sql + schema-locations: classpath:sql/schema/ # ============================================== # 암호화 설정 diff --git a/core/src/main/resources/mappers/admin/AdminViewMapper.xml b/core/src/main/resources/mappers/admin/AdminViewMapper.xml index 304452a6..e18f496e 100644 --- a/core/src/main/resources/mappers/admin/AdminViewMapper.xml +++ b/core/src/main/resources/mappers/admin/AdminViewMapper.xml @@ -3,27 +3,31 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > - + /* findById : 관리자 상세 조회 */ SELECT - a.id, - a.password, - a.email, - a.password_updated_at, - a.account_disabled, - a.login_fail_cnt, - a.account_locked, - a.created_at, - a.created_by, - a.updated_at, - a.updated_by + a.seq, + a.id, + a.password, + a.email, + a.name, + a.contact, + a.inspection_area_code, + a.password_updated_at, + a.account_disabled, + a.login_fail_cnt, + a.account_locked, + a.created_at, + a.created_by, + a.updated_at, + a.updated_by FROM admin a WHERE id = #{id} AND a.is_deleted = false - + @@ -32,18 +36,18 @@ - + /* findRoleHasPrivilegesByAdminId : 관리자 권한, 역할 조회 */ SELECT - r.id AS role_id, - r.description AS role_description, - p.id AS privilege_id + r.id AS role_id, + r.description AS role_description, + p.id AS privilege_id FROM admin_has_role ahr - JOIN role r ON ahr.role_id = r.id AND r.is_deleted = FALSE - LEFT JOIN role_has_privilege rhp ON r.id = rhp.role_id AND rhp.is_deleted = FALSE - LEFT JOIN privilege p ON rhp.privilege_id = p.id AND p.is_deleted = FALSE - WHERE ahr.admin_id = #{adminId} - AND ahr.is_deleted = FALSE + JOIN role r ON ahr.role_id = r.id AND r.is_deleted = false + LEFT JOIN role_has_privilege rhp ON r.id = rhp.role_id AND rhp.is_deleted = false + LEFT JOIN privilege p ON rhp.privilege_id = p.id AND p.is_deleted = false + WHERE ahr.admin_seq = #{seq} + AND ahr.is_deleted = false \ No newline at end of file diff --git a/core/src/main/resources/mappers/admin/GetAdminMapper.xml b/core/src/main/resources/mappers/admin/GetAdminMapper.xml deleted file mode 100644 index 98ea9df6..00000000 --- a/core/src/main/resources/mappers/admin/GetAdminMapper.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/src/main/resources/mappers/admin/GetAdminsMapper.xml b/core/src/main/resources/mappers/admin/GetAdminsMapper.xml index 0b6d67a9..4356820b 100644 --- a/core/src/main/resources/mappers/admin/GetAdminsMapper.xml +++ b/core/src/main/resources/mappers/admin/GetAdminsMapper.xml @@ -5,6 +5,7 @@ SELECT ahr.id AS admin_has_role_id, - ahr.admin_id AS admin_id, + ahr.admin_seq AS admin_seq, r.id AS role_id, r.description AS role_description, r.order_no AS role_order_no, @@ -81,9 +82,9 @@ LEFT JOIN role_has_privilege rhp ON r.id = rhp.role_id AND rhp.is_deleted = false LEFT JOIN privilege p ON rhp.privilege_id = p.id AND p.is_deleted = false WHERE ahr.is_deleted = false - AND ahr.admin_id IN - - #{id} + AND ahr.admin_seq IN + + #{seq} diff --git a/core/src/main/resources/mappers/admin/SaveAdminMapper.xml b/core/src/main/resources/mappers/admin/SaveAdminMapper.xml index 95f146ce..c0a577cd 100644 --- a/core/src/main/resources/mappers/admin/SaveAdminMapper.xml +++ b/core/src/main/resources/mappers/admin/SaveAdminMapper.xml @@ -4,8 +4,13 @@ + + SELECT nextval('admin_seq') + + /* insertAdmin : 관리자 등록 */ - INSERT INTO admin (id, + INSERT INTO admin (seq, + id, password, email, password_updated_at, @@ -13,8 +18,9 @@ login_fail_cnt, account_locked, ) - VALUES (#{id}, - #{password}, + VALUES (#{seq}, + #{id}, + #{encodedPassword}, #{email}, #{passwordUpdatedAt}, #{accountDisabled}, @@ -27,28 +33,28 @@ /* updateAdmin : 관리자 정보 수정 */ UPDATE admin SET - password = #{password}, + password = #{encodedPassword}, email = #{email}, password_updated_at = #{passwordUpdatedAt}, account_disabled = #{accountDisabled}, login_fail_cnt = #{loginFailCnt}, account_locked = #{accountLocked}, - WHERE id = #{id} + WHERE seq = #{seq} /* insertAdminHasRoles : 관리자 역할 매핑 정보 저장 */ INSERT INTO admin_has_role ( id, - admin_id, + admin_seq, role_id, ) VALUES ( nextval('admin_has_role_seq'), - #{adminId}, + #{adminSeq}, #{roleId}, ) @@ -59,6 +65,6 @@ /* deleteAdminRolesByAdminId : 관리자 역할 매핑 정보 수정 */ UPDATE admin_has_role SET - WHERE admin_id = #{adminId} + WHERE admin_seq = #{adminSeq} \ No newline at end of file diff --git a/core/src/main/resources/mappers/household/CreateHouseholdMapper.xml b/core/src/main/resources/mappers/household/CreateHouseholdMapper.xml new file mode 100644 index 00000000..91f88ca8 --- /dev/null +++ b/core/src/main/resources/mappers/household/CreateHouseholdMapper.xml @@ -0,0 +1,70 @@ + + + + + + + SELECT nextval('household_seq') + + + INSERT INTO household ( + seq, + household_num, + owner_name, + owner_age, + tel, + phone, + password, + region, + city, + address_detail, + industry_large_code, + industry_middle_code, + industry_small_code, + scale_code, + employment_code, + is_panel, + memo, + drop_reason, + + ) VALUES ( + #{seq}, + #{householdNum}, + #{ownerName}, + #{ownerAge}, + #{tel}, + #{phone}, + #{encodedPassword}, + #{region}, + #{city}, + #{addressDetail}, + #{industryLargeCode}, + #{industryMiddleCode}, + #{industrySmallCode}, + #{scaleCode}, + #{employmentCode}, + #{isPanel}, + #{memo}, + #{dropReason}, + + ) + + + + INSERT INTO household_has_role (id, + household_seq, + role_id, + ) + VALUES + + ( + nextval('household_has_role_seq'), + #{householdSeq}, + #{roleId}, + + ) + + + \ No newline at end of file diff --git a/core/src/main/resources/mappers/initData/RemoveAllMapper.xml b/core/src/main/resources/mappers/initData/RemoveAllMapper.xml new file mode 100644 index 00000000..c14fcc95 --- /dev/null +++ b/core/src/main/resources/mappers/initData/RemoveAllMapper.xml @@ -0,0 +1,52 @@ + + + + + DELETE FROM admin_has_role; + + + + DELETE FROM admin + + + + DELETE FROM household_has_role + + + + DELETE FROM household + + + + DELETE FROM role_has_privilege + + + + DELETE FROM privilege + + + + DELETE FROM uri_has_role + + + + DELETE FROM uri + + + + DELETE FROM front_user_has_role + + + + DELETE FROM front_user + + + + DELETE FROM role + + + + DELETE FROM uicode + + \ No newline at end of file diff --git a/core/src/main/resources/sql/01_admin.sql b/core/src/main/resources/sql/01_admin.sql new file mode 100644 index 00000000..be3d50eb --- /dev/null +++ b/core/src/main/resources/sql/01_admin.sql @@ -0,0 +1,60 @@ +-- 관리자 테이블 생성 +DROP TABLE IF EXISTS admin; + +CREATE TABLE admin +( + seq int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY UNIQUE, + id varchar(255), + password varchar(255), + password_updated_at timestamp(6) NOT NULL, + name varchar(4) , + contact varchar(15) , + inspection_area_code varchar(10) , + account_disabled boolean , + login_fail_cnt int4 , + account_locked boolean , + created_at timestamp(6), + created_by varchar(255), + updated_at timestamp(6), + updated_by varchar(255), + deleted_at timestamp(6), + deleted_by varchar(255), + is_deleted boolean NOT NULL DEFAULT false, + PRIMARY KEY (seq) +); + +COMMENT ON TABLE admin IS '관리자'; + +COMMENT ON COLUMN admin.seq IS '관리자 내부키'; + +COMMENT ON COLUMN admin.id IS '관리자 계정 아이디'; + +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_code IS '실사구역'; + +COMMENT ON COLUMN admin.account_disabled IS '비활성화 여부'; + +COMMENT ON COLUMN admin.login_fail_cnt IS '로그인 실패 횟수'; + +COMMENT ON COLUMN admin.account_locked IS '잠금 여부'; + +COMMENT ON COLUMN admin.created_at IS '생성일'; + +COMMENT ON COLUMN admin.created_by IS '생성자'; + +COMMENT ON COLUMN admin.updated_at IS '수정일'; + +COMMENT ON COLUMN admin.updated_by IS '수정자'; + +COMMENT ON COLUMN admin.deleted_at IS '삭제일'; + +COMMENT ON COLUMN admin.deleted_by IS '삭제자'; + +COMMENT ON COLUMN admin.is_deleted IS '삭제여부'; \ No newline at end of file diff --git a/core/src/main/resources/sql/02_household.sql b/core/src/main/resources/sql/02_household.sql new file mode 100644 index 00000000..572cf6d9 --- /dev/null +++ b/core/src/main/resources/sql/02_household.sql @@ -0,0 +1,84 @@ +-- 임가정보 테이블 생성 +DROP TABLE IF EXISTS household; + +CREATE TABLE household +( + seq int8 NOT NULL GENERATED BY DEFAULT AS IDENTITY UNIQUE, + household_num varchar(5) NOT NULL, + owner_name varchar(10) NOT NULL, + owner_age int2 NOT NULL, + tel varchar(20) , + phone varchar(15) NOT NULL, + password varchar(4) NOT NULL, + region varchar(20) , + city varchar(30) , + address_detail varchar(255), + industry_large_code int4 , + industry_middle_code int4 , + industry_small_code int4 , + scale_code int4 , + employment_code int2 , + is_panel boolean DEFAULT true, + memo varchar(255), + drop_reason varchar(255), + created_at timestamp(6) NOT NULL, + created_by varchar(255) NOT NULL, + updated_at timestamp(6) NOT NULL, + updated_by varchar(255) NOT NULL, + deleted_at timestamp(6), + deleted_by varchar(255), + is_deleted boolean DEFAULT false, + PRIMARY KEY (seq) +); + +COMMENT ON TABLE household IS '임가정보'; + +COMMENT ON COLUMN household.seq IS '임가정보내부키'; + +COMMENT ON COLUMN household.household_num IS '임가번호'; + +COMMENT ON COLUMN household.owner_name IS '경영주'; + +COMMENT ON COLUMN household.owner_age IS '경영주연령'; + +COMMENT ON COLUMN household.tel IS '가구연락처'; + +COMMENT ON COLUMN household.phone IS '핸드폰 번호'; + +COMMENT ON COLUMN household.password IS '비밀번호'; + +COMMENT ON COLUMN household.region IS '시/도 (주소관리테이블)'; + +COMMENT ON COLUMN household.city IS '시/군/구 (주소관리테이블)'; + +COMMENT ON COLUMN household.address_detail IS '세부 주소'; + +COMMENT ON COLUMN household.industry_large_code IS '업종 대분류'; + +COMMENT ON COLUMN household.industry_middle_code IS '업종 중분류'; + +COMMENT ON COLUMN household.industry_small_code IS '업종 소분류'; + +COMMENT ON COLUMN household.scale_code IS '규모'; + +COMMENT ON COLUMN household.employment_code IS '전/겸업 종류'; + +COMMENT ON COLUMN household.is_panel IS '패널유지여부'; + +COMMENT ON COLUMN household.memo IS '비고'; + +COMMENT ON COLUMN household.drop_reason IS '탈락사유'; + +COMMENT ON COLUMN household.created_at IS '생성일'; + +COMMENT ON COLUMN household.created_by IS '생성자'; + +COMMENT ON COLUMN household.updated_at IS '수정일'; + +COMMENT ON COLUMN household.updated_by IS '수정자'; + +COMMENT ON COLUMN household.deleted_at IS '삭제일'; + +COMMENT ON COLUMN household.deleted_by IS '삭제자'; + +COMMENT ON COLUMN household.is_deleted IS '삭제여부'; \ No newline at end of file diff --git a/core/src/main/resources/sql/create-all.sql b/core/src/main/resources/sql/create-all.sql deleted file mode 100644 index f6bcfcb8..00000000 --- a/core/src/main/resources/sql/create-all.sql +++ /dev/null @@ -1,5 +0,0 @@ --- test -CREATE TABLE my_first_table ( - id SERIAL PRIMARY KEY, - name VARCHAR(255) NOT NULL -); \ No newline at end of file diff --git a/core/src/main/resources/sql/drop-all.sql b/core/src/main/resources/sql/drop-all.sql deleted file mode 100644 index 561ebac7..00000000 --- a/core/src/main/resources/sql/drop-all.sql +++ /dev/null @@ -1,2 +0,0 @@ --- test -DROP TABLE IF EXISTS my_first_table; \ No newline at end of file