From 8b4fbcb252bb0bbe3323909859c3cfbd2bd10d75 Mon Sep 17 00:00:00 2001 From: ashish-egov <137176738+ashish-egov@users.noreply.github.com> Date: Wed, 29 Jan 2025 11:38:00 +0530 Subject: [PATCH 1/3] Update WorkflowService.java --- .../org/egov/inbox/service/WorkflowService.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/accelerators/inbox/src/main/java/org/egov/inbox/service/WorkflowService.java b/accelerators/inbox/src/main/java/org/egov/inbox/service/WorkflowService.java index d3ebf374ae2..6c2172779a5 100644 --- a/accelerators/inbox/src/main/java/org/egov/inbox/service/WorkflowService.java +++ b/accelerators/inbox/src/main/java/org/egov/inbox/service/WorkflowService.java @@ -30,7 +30,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.extern.slf4j.Slf4j; + @Service +@Slf4j public class WorkflowService { private InboxConfiguration config; @@ -191,7 +194,7 @@ public BusinessService getBusinessService(String tenantId, RequestInfo requestIn @Cacheable(value = "businessServices") public List getBusinessServices(InboxRequest request) { - String tenantId = request.getInbox().getTenantId().split("\\.")[0]; + String tenantId = request.getInbox().getProcessSearchCriteria().getTenantId().split("\\.")[0]; RequestInfo requestInfo = request.getRequestInfo(); List businessServicesCodes = request.getInbox().getProcessSearchCriteria().getBusinessService(); String businessServiceList = String.join(",", businessServicesCodes); @@ -326,8 +329,6 @@ private StringBuilder getSearchURLWithParams(String tenantId, String businessSer public HashMap getActionableStatusesForRole(RequestInfo requestInfo, List businessServices, ProcessInstanceSearchCriteria criteria) { - String tenantId; - List userRoleCodes; Map> tenantIdToUserRolesMap = getTenantIdToUserRolesMap(requestInfo); Map> tenantIdToBuisnessSevicesMap = getTenantIdToBuisnessSevicesMap( businessServices); @@ -374,15 +375,16 @@ public HashMap getActionableStatusesForRole(RequestInfo requestI public Map> getTenantIdToUserRolesMap(RequestInfo requestInfo) { Map> tenantIdToUserRoles = new HashMap<>(); requestInfo.getUserInfo().getRoles().forEach(role -> { - if (tenantIdToUserRoles.containsKey(role.getTenantId())) { - tenantIdToUserRoles.get(role.getTenantId()).add(role.getCode()); + if (tenantIdToUserRoles.containsKey(role.getTenantId().split("\\.")[0])) { + tenantIdToUserRoles.get(role.getTenantId().split("\\.")[0]).add(role.getCode()); } else { List roleCodes = new LinkedList<>(); roleCodes.add(role.getCode()); - tenantIdToUserRoles.put(role.getTenantId(), roleCodes); + tenantIdToUserRoles.put(role.getTenantId().split("\\.")[0], roleCodes); } }); + log.info("tenantIdToUserRoles:" + tenantIdToUserRoles.toString()); return tenantIdToUserRoles; } From 3a3e2d0fd2afa0f4e29dcbabb16e10b8a6509822 Mon Sep 17 00:00:00 2001 From: ashish-egov <137176738+ashish-egov@users.noreply.github.com> Date: Wed, 29 Jan 2025 11:40:45 +0530 Subject: [PATCH 2/3] Update InboxServiceV2.java --- .../java/org/egov/inbox/service/V2/InboxServiceV2.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/accelerators/inbox/src/main/java/org/egov/inbox/service/V2/InboxServiceV2.java b/accelerators/inbox/src/main/java/org/egov/inbox/service/V2/InboxServiceV2.java index 499d3ec13c4..fd553a34c4e 100644 --- a/accelerators/inbox/src/main/java/org/egov/inbox/service/V2/InboxServiceV2.java +++ b/accelerators/inbox/src/main/java/org/egov/inbox/service/V2/InboxServiceV2.java @@ -132,9 +132,7 @@ private void enrichProcessInstanceInInboxItems(List items) { private List getInboxItems(InboxRequest inboxRequest, String indexName) { List businessServices = workflowService.getBusinessServices(inboxRequest); enrichActionableStatusesFromRole(inboxRequest, businessServices); - if (CollectionUtils.isEmpty(inboxRequest.getInbox().getProcessSearchCriteria().getStatus())) { - return new ArrayList<>(); - } + Map finalQueryBody = queryBuilder.getESQuery(inboxRequest, Boolean.TRUE); try { String q = mapper.writeValueAsString(finalQueryBody); @@ -164,7 +162,8 @@ private void enrichActionableStatusesFromRole(InboxRequest inboxRequest, List actionableStatus = new ArrayList<>(); - if (StatusIdNameMap.values().size() > 0) { + if (StatusIdNameMap.values().size() > 0 && processCriteria.getStatus() != null + && !processCriteria.getStatus().isEmpty()) { if (!CollectionUtils.isEmpty(processCriteria.getStatus())) { processCriteria.getStatus().forEach(status -> { if (StatusIdNameMap.values().contains(status)) { From f5c92ada4e29d3e4859ea2febe1707f5459e263d Mon Sep 17 00:00:00 2001 From: ashish-egov <137176738+ashish-egov@users.noreply.github.com> Date: Wed, 29 Jan 2025 11:41:43 +0530 Subject: [PATCH 3/3] Update InboxQueryBuilder.java --- .../egov/inbox/repository/builder/V2/InboxQueryBuilder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/accelerators/inbox/src/main/java/org/egov/inbox/repository/builder/V2/InboxQueryBuilder.java b/accelerators/inbox/src/main/java/org/egov/inbox/repository/builder/V2/InboxQueryBuilder.java index 5621ac28d5a..3477ba3974a 100644 --- a/accelerators/inbox/src/main/java/org/egov/inbox/repository/builder/V2/InboxQueryBuilder.java +++ b/accelerators/inbox/src/main/java/org/egov/inbox/repository/builder/V2/InboxQueryBuilder.java @@ -70,7 +70,7 @@ public Map getESQuery(InboxRequest inboxRequest, Boolean isPagin nameToOperator, mustClauseList); innerBoolClause.put(MUST_KEY, mustClauseList); - System.out.println("Final ES Query after adding must clause: " + baseEsQuery.toString()); + log.info("Final ES Query after adding must clause: " + baseEsQuery.toString()); return baseEsQuery; } @@ -339,4 +339,5 @@ private String addDataPathToSearchParamKey(String key, Map nameT return path; } + }