From 40c59711b5668c9f0780c369df9bc25cad6f6cd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 23 Jun 2025 16:14:06 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EA=B6=8C=ED=95=9C=20uri?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/interceptor/AdminURIInterceptor.java | 7 +- .../templates/common/components.html | 2 +- .../adapters/persistence/URIMapper.java | 2 + .../adapters/persistence/URITopTierDao.java | 23 +++++- .../uri/toptier/ports/URITopTierPortIn.java | 1 + .../uri/toptier/ports/URITopTierPortOut.java | 1 + .../ports/application/URITopTierService.java | 6 ++ .../main/resources/mappers/uri/URIMapper.xml | 77 +++++++++++++------ 8 files changed, 92 insertions(+), 27 deletions(-) diff --git a/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java b/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java index a9ae6cdc..81288652 100644 --- a/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java +++ b/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java @@ -1,5 +1,6 @@ package app.module.admin.config.adapters.web.interceptor; +import app.module.admin.config.application.util.AdminUtil; import app.module.core.config.adapters.web.interceptor.model.URITopTierVO; import app.module.core.config.application.enums.AppType; import app.module.core.config.application.exception.NoMatchingURIException; @@ -76,16 +77,16 @@ public class AdminURIInterceptor implements HandlerInterceptor { // 활성 프로파일 가져오기 TODO 2차 오픈시 삭제 예정 modelAndView.addObject("activeProfile", activeProfiles); + String roleId = AdminUtil.getLoginUserRole(); if (!CommonUtil.isAjaxRequest(request)) { - URITopTier topTierOutput = topTierPortIn.connect(AppType.ADMIN); + URITopTier topTierOutput = topTierPortIn.connectRoleId(AppType.ADMIN,roleId); modelAndView.addObject("topNode", recursiveMapping(topTierOutput)); if (modelAndView.getModelMap().getAttribute("currentURI") == null) { modelAndView.addObject("currentURI", request.getAttribute("currentURI")); } - modelAndView.addObject( - "menuHierarchy", uriAncestryPortIn.connect(AppType.ADMIN, request.getRequestURI())); + modelAndView.addObject("menuHierarchy", uriAncestryPortIn.connect(AppType.ADMIN, request.getRequestURI())); if (cloudFrontDomain != null && bucketFolder != null) { modelAndView.addObject("S3URL", "https://" + cloudFrontDomain + bucketFolder); diff --git a/admin/src/main/resources/templates/common/components.html b/admin/src/main/resources/templates/common/components.html index 9555d4d9..36bb2b1e 100644 --- a/admin/src/main/resources/templates/common/components.html +++ b/admin/src/main/resources/templates/common/components.html @@ -105,7 +105,7 @@ - 메뉴명 + 메뉴명 diff --git a/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URIMapper.java b/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URIMapper.java index bd285743..49c0baf9 100644 --- a/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URIMapper.java +++ b/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URIMapper.java @@ -9,5 +9,7 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface URIMapper { URITopTier findTopTierByAppType(@Param("appType") AppType appType); + URITopTier findTopTierByAppTypeByRoleId(@Param("appType") AppType appType,@Param("roleId") String roleId); List findChildrenByParentId(@Param("parentId") String parentId); + List findChildrenByParentIdByRoleId(@Param("parentId") String parentId,@Param("roleId") String roleId); } diff --git a/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URITopTierDao.java b/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URITopTierDao.java index 1bc70c25..d72fe639 100644 --- a/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URITopTierDao.java +++ b/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URITopTierDao.java @@ -25,12 +25,33 @@ public class URITopTierDao implements URITopTierPortOut { return recursiveMapping(top); } + @Override + @Transactional + public URITopTier connectRoleId(AppType appType, String roleId) { + URITopTier top = uriMapper.findTopTierByAppTypeByRoleId(appType,roleId); + if (top == null) { + throw new RuntimeException("There is no top tier item of " + appType); + } + + return recursiveMapping(top,roleId); + } private URITopTier recursiveMapping(URITopTier current) { List children = uriMapper.findChildrenByParentId(current.getId()); current.setChildren(children.stream() - .map(this::recursiveMapping) + .map(this::recursiveMapping) + .collect(Collectors.toList())); + return current; + } + + private URITopTier recursiveMapping(URITopTier current,String roleId) { + List children = uriMapper.findChildrenByParentIdByRoleId(current.getId(),roleId); + current.setChildren(children.stream() + .map(uri -> recursiveMapping(uri,roleId)) .collect(Collectors.toList())); return current; } + + + } diff --git a/core/src/main/java/app/module/core/usecase/uri/toptier/ports/URITopTierPortIn.java b/core/src/main/java/app/module/core/usecase/uri/toptier/ports/URITopTierPortIn.java index 000380a8..6abead7c 100644 --- a/core/src/main/java/app/module/core/usecase/uri/toptier/ports/URITopTierPortIn.java +++ b/core/src/main/java/app/module/core/usecase/uri/toptier/ports/URITopTierPortIn.java @@ -5,4 +5,5 @@ import app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier; public interface URITopTierPortIn { URITopTier connect(AppType appType); + URITopTier connectRoleId(AppType appType, String roleId); } diff --git a/core/src/main/java/app/module/core/usecase/uri/toptier/ports/URITopTierPortOut.java b/core/src/main/java/app/module/core/usecase/uri/toptier/ports/URITopTierPortOut.java index 8499caf9..3684811c 100644 --- a/core/src/main/java/app/module/core/usecase/uri/toptier/ports/URITopTierPortOut.java +++ b/core/src/main/java/app/module/core/usecase/uri/toptier/ports/URITopTierPortOut.java @@ -6,4 +6,5 @@ import app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier; public interface URITopTierPortOut { URITopTier connect(AppType appType); + URITopTier connectRoleId(AppType appType,String roleId); } diff --git a/core/src/main/java/app/module/core/usecase/uri/toptier/ports/application/URITopTierService.java b/core/src/main/java/app/module/core/usecase/uri/toptier/ports/application/URITopTierService.java index 2c133556..230be1f7 100644 --- a/core/src/main/java/app/module/core/usecase/uri/toptier/ports/application/URITopTierService.java +++ b/core/src/main/java/app/module/core/usecase/uri/toptier/ports/application/URITopTierService.java @@ -19,4 +19,10 @@ public class URITopTierService implements URITopTierPortIn { public URITopTier connect(AppType appType) { return topTierPortOut.connect(appType); } + + + @Override + public URITopTier connectRoleId(AppType appType, String roleId) { + return topTierPortOut.connectRoleId(appType,roleId); + } } diff --git a/core/src/main/resources/mappers/uri/URIMapper.xml b/core/src/main/resources/mappers/uri/URIMapper.xml index 719e7e6b..feeee92e 100644 --- a/core/src/main/resources/mappers/uri/URIMapper.xml +++ b/core/src/main/resources/mappers/uri/URIMapper.xml @@ -2,32 +2,65 @@ + - + SELECT + u.id, + u.app_type, + u.text, + u.uri, + u.show_on_navi, + u.order_no + FROM uri u + WHERE u.parent_id = #{parentId} + AND u.is_deleted = false + ORDER BY u.order_no ASC + + + - SELECT - id, - app_type, - text, - uri, - show_on_navi, - order_no - FROM uri - WHERE parent_id = #{parentId} - AND is_deleted = false - ORDER BY order_no ASC + u.id, + u.app_type, + u.text, + u.uri, + u.show_on_navi, + u.order_no + FROM uri u + JOIN uri_has_role uhr ON u.id = uhr.uri_id and uhr.is_deleted = false + WHERE u.parent_id = #{parentId} + AND u.is_deleted = false + AND uhr.role_id = #{roleId} + AND u.show_on_navi = true + ORDER BY u.order_no ASC \ No newline at end of file