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 deleted file mode 100644 index 4f82b0a1..00000000 --- a/admin/src/main/java/app/module/admin/usecase/analyst/dashboard/getAnalystDashboardUI/GetAnalystDashboardController.java +++ /dev/null @@ -1,21 +0,0 @@ -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/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/GetNoticesController.java b/admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticeUI/GetNoticesUIController.java similarity index 71% rename from admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/GetNoticesController.java rename to admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticeUI/GetNoticesUIController.java index fbd118a5..eb98c216 100644 --- 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/getNoticeUI/GetNoticesUIController.java @@ -1,15 +1,15 @@ -package app.module.admin.usecase.communication.notice.getNoticesUI; +package app.module.admin.usecase.communication.notice.getNoticeUI; 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; +import app.module.admin.usecase.communication.notice.getNoticeUI.model.GetNoticesReqVO; @Controller @RequiredArgsConstructor -class GetNoticesController { +class GetNoticesUIController { @GetMapping(path = "/communication/notices") String operate( 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/getNoticeUI/model/GetNoticesReqVO.java similarity index 73% rename from admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticesUI/model/GetNoticesReqVO.java rename to admin/src/main/java/app/module/admin/usecase/communication/notice/getNoticeUI/model/GetNoticesReqVO.java index 2de43050..f2d68206 100644 --- 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/getNoticeUI/model/GetNoticesReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.communication.notice.getNoticesUI.model; +package app.module.admin.usecase.communication.notice.getNoticeUI.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestionsUI/GetSuggestionsUIController.java b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestionsUI/GetSuggestionsUIController.java new file mode 100644 index 00000000..98fc0c96 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestionsUI/GetSuggestionsUIController.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.communication.suggestion.getSuggestionsUI; + +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.suggestion.getSuggestionsUI.model.GetSuggestionsUIReqVO; + +@Controller +@RequiredArgsConstructor +class GetSuggestionsUIController { + + @GetMapping(path = "/communication/suggestions") + String operate( + Model model, + @ModelAttribute("reqVO") GetSuggestionsUIReqVO reqVO) { + + return "communication/suggestions"; + } +} \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/analyst/dashboard/getAnalystDashboardUI/model/GetAnalystDashboardReqVO.java b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestionsUI/model/GetSuggestionsUIReqVO.java similarity index 58% rename from admin/src/main/java/app/module/admin/usecase/analyst/dashboard/getAnalystDashboardUI/model/GetAnalystDashboardReqVO.java rename to admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestionsUI/model/GetSuggestionsUIReqVO.java index 9a1b1376..f54d7663 100644 --- a/admin/src/main/java/app/module/admin/usecase/analyst/dashboard/getAnalystDashboardUI/model/GetAnalystDashboardReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/communication/suggestion/getSuggestionsUI/model/GetSuggestionsUIReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.analyst.dashboard.getAnalystDashboardUI.model; +package app.module.admin.usecase.communication.suggestion.getSuggestionsUI.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; @@ -9,5 +9,5 @@ import lombok.Setter; @Setter @AllArgsConstructor @EqualsAndHashCode -public class GetAnalystDashboardReqVO { +public class GetSuggestionsUIReqVO { } diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/getDashboardUI/GetDashboardUIController.java b/admin/src/main/java/app/module/admin/usecase/dashboard/getDashboardUI/GetDashboardUIController.java new file mode 100644 index 00000000..3d5f2394 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/getDashboardUI/GetDashboardUIController.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.dashboard.getDashboardUI; + +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.dashboard.getDashboardUI.model.GetDashboardUIReqVO; + +@Controller +@RequiredArgsConstructor +class GetDashboardUIController { + + @GetMapping(path = "/dashboard") + String operate( + Model model, + @ModelAttribute("reqVO") GetDashboardUIReqVO reqVO) { + + return "dashboard"; + } +} \ 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/dashboard/getDashboardUI/model/GetDashboardUIReqVO.java similarity index 55% rename from admin/src/main/java/app/module/admin/usecase/researcher/household/getResearcherHouseholdUI/web/model/GetResearcherHouseholdsUIReqVO.java rename to admin/src/main/java/app/module/admin/usecase/dashboard/getDashboardUI/model/GetDashboardUIReqVO.java index 23e3f82b..bc255cc3 100644 --- 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/dashboard/getDashboardUI/model/GetDashboardUIReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.researcher.household.getResearcherHouseholdUI.web.model; +package app.module.admin.usecase.dashboard.getDashboardUI.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; @@ -9,5 +9,5 @@ import lombok.Setter; @Setter @AllArgsConstructor @EqualsAndHashCode -public class GetResearcherHouseholdsUIReqVO { +public class GetDashboardUIReqVO { } 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/getHouseholesUI/GetHouseholdsUIController.java similarity index 80% rename from admin/src/main/java/app/module/admin/usecase/household/getHouseholdsUI/GetHouseholdsUIController.java rename to admin/src/main/java/app/module/admin/usecase/household/getHouseholesUI/GetHouseholdsUIController.java index 1a1f6604..03dda2c6 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsUI/GetHouseholdsUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholesUI/GetHouseholdsUIController.java @@ -1,11 +1,11 @@ -package app.module.admin.usecase.household.getHouseholdsUI; +package app.module.admin.usecase.household.getHouseholesUI; +import app.module.admin.usecase.household.getHouseholesUI.model.GetHouseholdsUIReqVO; 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 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/getHouseholesUI/model/GetHouseholdsUIReqVO.java similarity index 76% rename from admin/src/main/java/app/module/admin/usecase/household/getHouseholdsUI/model/GetHouseholdsUIReqVO.java rename to admin/src/main/java/app/module/admin/usecase/household/getHouseholesUI/model/GetHouseholdsUIReqVO.java index 607ddbfd..d8db3ae1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsUI/model/GetHouseholdsUIReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholesUI/model/GetHouseholdsUIReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.household.getHouseholdsUI.model; +package app.module.admin.usecase.household.getHouseholesUI.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; 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 deleted file mode 100644 index dda9d1f6..00000000 --- a/admin/src/main/java/app/module/admin/usecase/researcher/dashboard/getResearcherDashboardUI/adapters/web/GetResearcherDashboardUIController.java +++ /dev/null @@ -1,21 +0,0 @@ -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/getResearchersUI/GetResearchersUIController.java b/admin/src/main/java/app/module/admin/usecase/researcher/getResearchersUI/GetResearchersUIController.java new file mode 100644 index 00000000..97330f22 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/researcher/getResearchersUI/GetResearchersUIController.java @@ -0,0 +1,21 @@ +package app.module.admin.usecase.researcher.getResearchersUI; + +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.getResearchersUI.model.GetResearchersUIReqVO; + +@Controller +@RequiredArgsConstructor +class GetResearchersUIController { + + @GetMapping(path = "/researcher/researchers") + String operate( + Model model, + @ModelAttribute("reqVO") GetResearchersUIReqVO reqVO) { + + return "researcher/researchers"; + } +} \ 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/getResearchersUI/model/GetResearchersUIReqVO.java similarity index 54% rename from admin/src/main/java/app/module/admin/usecase/researcher/dashboard/getResearcherDashboardUI/adapters/web/model/GetResearcherDashboardUIReqVO.java rename to admin/src/main/java/app/module/admin/usecase/researcher/getResearchersUI/model/GetResearchersUIReqVO.java index 41694c49..8f4489e2 100644 --- 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/getResearchersUI/model/GetResearchersUIReqVO.java @@ -1,4 +1,4 @@ -package app.module.admin.usecase.researcher.dashboard.getResearcherDashboardUI.adapters.web.model; +package app.module.admin.usecase.researcher.getResearchersUI.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; @@ -9,5 +9,5 @@ import lombok.Setter; @Setter @AllArgsConstructor @EqualsAndHashCode -public class GetResearcherDashboardUIReqVO { +public class GetResearchersUIReqVO { } 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 deleted file mode 100644 index 21cc4027..00000000 --- a/admin/src/main/java/app/module/admin/usecase/researcher/household/getResearcherHouseholdUI/web/GetResearcherHouseholdsUIController.java +++ /dev/null @@ -1,21 +0,0 @@ -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/resources/messages/uri.properties b/admin/src/main/resources/messages/uri.properties index c7487cc7..335c3132 100644 --- a/admin/src/main/resources/messages/uri.properties +++ b/admin/src/main/resources/messages/uri.properties @@ -28,21 +28,23 @@ uri.admin.addons=Add-ons (\uBD80\uAC00\uAE30\uB2A5) uri.admin.addons.email=Email 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.household=\uC784\uAC00 \uD604\uD669 +uri.admin.household.households=\uC784\uAC00 \uD604\uD669 +uri.admin.household.households.create=\uC784\uAC00 \uB4F1\uB85D +uri.admin.household.households.view.{{pathVar}}=\uC784\uAC00 \uC0C1\uC138 -uri.admin.analyst=\uC5F0\uAD6C\uC6D0 -uri.admin.analyst.dashboard=\uB300\uC2DC\uBCF4\uB4DC +uri.admin.researcher=\uC870\uC0AC\uC6D0 \uD604\uD669 +uri.admin.researcher.researchers=\uC870\uC0AC\uC6D0 \uD604\uD669 +uri.admin.researcher.researchers.create=\uC870\uC0AC\uC6D0 \uB4F1\uB85D +uri.admin.researcher.researchers.view.{{pathVar}}=\uC870\uC0AC\uC6D0 \uC0C1\uC138 + +uri.admin.dashboard=\uB300\uC2DC\uBCF4\uB4DC +uri.admin.dashboard.overview=\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.households=\uC784\uAC00\uD68C\uC6D0 -uri.admin.household.households.create=\uC784\uAC00\uD68C\uC6D0 \uB4F1\uB85D -uri.admin.household.households.update.{{pathVar}}=\uC784\uAC00\uD68C\uC6D0 \uC218\uC815 +uri.admin.communication.notices=\uACF5\uC9C0\uC0AC\uD56D +uri.admin.communication.notices.create=\uACF5\uC9C0\uC0AC\uD56D \uB4F1\uB85D +uri.admin.communication.notices.update.{{pathVar}}=\uACF5\uC9C0\uC0AC\uD56D \uC0C1\uC138 +uri.admin.communication.suggestions=\uAC74\uC758\uC0AC\uD56D +uri.admin.communication.suggestions.view.{{pathVar}}=\uAC74\uC758\uC0AC\uD56D \uC0C1\uC138 +uri.admin.communication.sms=\uBB38\uC790\uBC1C\uC1A1 \ No newline at end of file diff --git a/admin/src/main/resources/templates/researcher/dashboard.html b/admin/src/main/resources/templates/communication/suggestions.html similarity index 84% rename from admin/src/main/resources/templates/researcher/dashboard.html rename to admin/src/main/resources/templates/communication/suggestions.html index 814e7222..5330f5fe 100644 --- a/admin/src/main/resources/templates/researcher/dashboard.html +++ b/admin/src/main/resources/templates/communication/suggestions.html @@ -3,7 +3,7 @@ layout:decorate="~{layout/layout}">
-

/researcher/dashboard

+

/communication/suggestions

\ No newline at end of file diff --git a/admin/src/main/resources/templates/analyst/dashboard.html b/admin/src/main/resources/templates/dashboard.html similarity index 86% rename from admin/src/main/resources/templates/analyst/dashboard.html rename to admin/src/main/resources/templates/dashboard.html index 46aa363e..bebc0f5a 100644 --- a/admin/src/main/resources/templates/analyst/dashboard.html +++ b/admin/src/main/resources/templates/dashboard.html @@ -3,7 +3,7 @@ layout:decorate="~{layout/layout}">
-

/analyst/dashboard

+

/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/researchers.html similarity index 85% rename from admin/src/main/resources/templates/researcher/households.html rename to admin/src/main/resources/templates/researcher/researchers.html index fc0d118e..82310721 100644 --- a/admin/src/main/resources/templates/researcher/households.html +++ b/admin/src/main/resources/templates/researcher/researchers.html @@ -3,7 +3,7 @@ layout:decorate="~{layout/layout}">
-

/researcher/households

+

/researcher/researchers

\ No newline at end of file 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 da6442df..103fab49 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 @@ -73,33 +73,30 @@ public class InitUriAdminData implements ApplicationRunner { 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_HOUSEHOLD = "uri.admin.household"; // 1depth + final String ADMIN_HOUSEHOLD_STATUS = "uri.admin.household.households"; // 2depth 임가 리스트 + final String ADMIN_HOUSEHOLD_STATUS_CREATE = "uri.admin.household.households.create"; // 임가 등록 + final String ADMIN_HOUSEHOLD_STATUS_VIEW = "uri.admin.household.households.view.{{pathVar}}"; // 임가 상세 - 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 = "uri.admin.researcher"; // 1depth + final String ADMIN_RESEARCHER_STATUS = "uri.admin.researcher.researchers"; // 2depth 조사원 리스트 + final String ADMIN_RESEARCHER_STATUS_CREATE = "uri.admin.researcher.researchers.create"; // 조사원 등록 + final String ADMIN_RESEARCHER_STATUS_VIEW = "uri.admin.researcher.researchers.view.{{pathVar}}"; // 조사원 상세 - 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_DASHBOARD = "uri.admin.dashboard"; // 1depth + final String ADMIN_DASHBOARD_OVERVIEW = "uri.admin.dashboard.overview"; // 2depth // 커뮤니케이션 메뉴 - 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.households"; - final String ADMIN_HOUSEHOLD_HOUSEHOLD_CREATE = "uri.admin.household.households.create"; - final String ADMIN_HOUSEHOLD_HOUSEHOLD_UPDATE = "uri.admin.household.households.update.{{pathVar}}"; + final String ADMIN_COMMUNICATION = "uri.admin.communication"; // 1depth + final String ADMIN_COMMUNICATION_NOTICE = "uri.admin.communication.notices"; // 2depth 공지사항 + final String ADMIN_COMMUNICATION_NOTICE_CREATE = "uri.admin.communication.notices.create"; // 공지사항 등록 + final String ADMIN_COMMUNICATION_NOTICE_UPDATE = "uri.admin.communication.notices.update.{{pathVar}}"; // 공지사항 수정,상세 + final String ADMIN_COMMUNICATION_SUGGESTION = "uri.admin.communication.suggestions"; // 2depth 건의사항 + final String ADMIN_COMMUNICATION_SUGGESTION_VIEW = "uri.admin.communication.suggestions.view.{{pathVar}}"; // 건의사항 상세 + final String ADMIN_COMMUNICATION_SMS = "uri.admin.communication.sms"; // 2depth 문자발송 // 최상위 URI 정보 appendURI( @@ -116,21 +113,30 @@ public class InitUriAdminData implements ApplicationRunner { appendURI( AppType.ADMIN, ADMIN, - ADMIN_RESEARCHER, - "조사원", - "/researcher", + ADMIN_HOUSEHOLD, + "임가 현황", + "/household", true, - Set.of("ROLE_ADMIN", "ROLE_RESEARCHER")); + Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER")); appendURI( AppType.ADMIN, ADMIN, - ADMIN_ANALYST, - "연구원", - "/analyst", + ADMIN_RESEARCHER, + "조사원 현황", + "/researcher", true, Set.of("ROLE_ADMIN", "ROLE_ANALYST")); + appendURI( + AppType.ADMIN, + ADMIN, + ADMIN_DASHBOARD, + "대시보드", + "/dashboard", + true, + Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER")); + appendURI( AppType.ADMIN, ADMIN, @@ -140,15 +146,6 @@ public class InitUriAdminData implements ApplicationRunner { 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, @@ -187,47 +184,71 @@ public class InitUriAdminData implements ApplicationRunner { // `1` depth URI 정의 - 끝 - // 조사원 메뉴 시작 + // 임가 현황 메뉴 시작 appendURI( AppType.ADMIN, - ADMIN_RESEARCHER, - ADMIN_RESEARCHER_HOUSEHOLD, - "임가현황조회", - "/researcher/households", + ADMIN_HOUSEHOLD, + ADMIN_HOUSEHOLD_STATUS, + "임가 현황", + "/household/households", true, - Set.of("ROLE_ADMIN", "ROLE_RESEARCHER")); + Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER")); appendURI( AppType.ADMIN, - ADMIN_RESEARCHER, - ADMIN_RESEARCHER_HOUSEHOLD_VIEW, - "임가현황조회 상세", - "/researcher/households/{{pathVar}}", + ADMIN_HOUSEHOLD, + ADMIN_HOUSEHOLD_STATUS_CREATE, + "임가 등록", + "/household/households/create", false, - Set.of("ROLE_ADMIN", "ROLE_RESEARCHER")); + Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER")); + appendURI( + AppType.ADMIN, + ADMIN_HOUSEHOLD, + ADMIN_HOUSEHOLD_STATUS_VIEW, + "임가 상세", + "/household/households/{{pathVar}}", + false, + Set.of("ROLE_ADMIN", "ROLE_ANALYST", "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", + ADMIN_RESEARCHER_STATUS, + "조사원 현황", + "/researcher/researchers", true, Set.of("ROLE_ADMIN", "ROLE_ANALYST")); - // 연구원 메뉴 끝 + appendURI( + AppType.ADMIN, + ADMIN_RESEARCHER, + ADMIN_RESEARCHER_STATUS_CREATE, + "조사원 등록", + "/researcher/researchers/create", + false, + Set.of("ROLE_ADMIN", "ROLE_ANALYST")); + + appendURI( + AppType.ADMIN, + ADMIN_RESEARCHER, + ADMIN_RESEARCHER_STATUS_VIEW, + "조사원 상세", + "/researcher/researchers/view/{{pathVar}}", + false, + Set.of("ROLE_ADMIN", "ROLE_ANALYST")); + + // 대시보드 + appendURI( + AppType.ADMIN, + ADMIN_DASHBOARD, + ADMIN_DASHBOARD_OVERVIEW, + "대시보드", + "/dashboard", + true, + Set.of("ROLE_ADMIN", "ROLE_ANALYST", "ROLE_RESEARCHER")); // 커뮤니케이션 메뉴 시작 appendURI( @@ -253,7 +274,25 @@ public class InitUriAdminData implements ApplicationRunner { ADMIN_COMMUNICATION, ADMIN_COMMUNICATION_NOTICE_UPDATE, "공지사항 수정", - "/communication/notices/update/{{pathVar}}", + "/communication/notices/{{pathVar}}", + false, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_COMMUNICATION, + ADMIN_COMMUNICATION_SUGGESTION, + "건의사항", + "/communication/suggestions", + true, + Set.of("ROLE_ADMIN")); + + appendURI( + AppType.ADMIN, + ADMIN_COMMUNICATION, + ADMIN_COMMUNICATION_SUGGESTION_VIEW, + "건의사항 상세", + "/communication/suggestions/view/{{pathVar}}", false, Set.of("ROLE_ADMIN")); @@ -265,38 +304,6 @@ public class InitUriAdminData implements ApplicationRunner { "/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( diff --git a/core/src/main/java/app/module/core/config/application/util/CommonUtil.java b/core/src/main/java/app/module/core/config/application/util/CommonUtil.java index 4e282630..d0e26b61 100644 --- a/core/src/main/java/app/module/core/config/application/util/CommonUtil.java +++ b/core/src/main/java/app/module/core/config/application/util/CommonUtil.java @@ -6,17 +6,13 @@ import jakarta.servlet.http.HttpSession; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import lombok.RequiredArgsConstructor; import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.oauth2.core.user.DefaultOAuth2User; -import org.springframework.stereotype.Component; -import org.springframework.validation.BindingResult; -import org.springframework.validation.Errors; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; public class CommonUtil { @@ -92,6 +88,17 @@ public class CommonUtil { return username; } + public static String getLoginUserRole() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication == null) return null; + + return authentication.getAuthorities().stream() + .map(GrantedAuthority::getAuthority) + .filter(authStr -> authStr.startsWith("ROLE_")) + .findFirst() + .orElse(null); + } + public static HttpServletRequest getRequest() { HttpServletRequest request = null; if (RequestContextHolder.getRequestAttributes() != null) {