From 0c191ee68740a98aae3f10e0683bb4db9d8412f2 Mon Sep 17 00:00:00 2001 From: sreeragksgh Date: Sun, 12 Sep 2021 19:38:44 +0530 Subject: [PATCH 1/3] fetching through system settings --- .../org/sunbird/workflow/config/Configuration.java | 11 +++++++++++ .../workflow/service/impl/WorkflowServiceImpl.java | 7 ++++++- src/main/resources/application.properties | 3 ++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/sunbird/workflow/config/Configuration.java b/src/main/java/org/sunbird/workflow/config/Configuration.java index f94ecdd..7bd2759 100644 --- a/src/main/java/org/sunbird/workflow/config/Configuration.java +++ b/src/main/java/org/sunbird/workflow/config/Configuration.java @@ -63,6 +63,17 @@ public class Configuration { @Value("${sunbird.user.search.endpoint}") private String lmsUserSearchEndpoint; + @Value("${workflow.config.endpoint}") + private String workflowConfigEndpoint; + + public String getWorkflowConfigEndpoint() { + return workflowConfigEndpoint; + } + + public void setWorkflowConfigEndpoint(String workflowConfigEndpoint) { + this.workflowConfigEndpoint = workflowConfigEndpoint; + } + public Integer getDefaultLimit() { return defaultLimit; } diff --git a/src/main/java/org/sunbird/workflow/service/impl/WorkflowServiceImpl.java b/src/main/java/org/sunbird/workflow/service/impl/WorkflowServiceImpl.java index 5a0be49..d8b4130 100644 --- a/src/main/java/org/sunbird/workflow/service/impl/WorkflowServiceImpl.java +++ b/src/main/java/org/sunbird/workflow/service/impl/WorkflowServiceImpl.java @@ -405,7 +405,12 @@ public Response getApplicationHistoryOnWfId(String rootOrg, String wfId, String public Response getNextActionForState(String rootOrg, String org, String serviceName, String state) { Response response = new Response(); try { - Workflow workFlow = wfRepo.getWorkFlowForService(rootOrg, org, serviceName); +// Workflow workFlow = wfRepo.getWorkFlowForService(rootOrg, org, serviceName); + StringBuilder builder = new StringBuilder(); + String endPoint = configuration.getWorkflowConfigEndpoint(); + builder.append(configuration.getLexCoreServiceHost()).append(endPoint); + Map response1 = (Map) requestServiceImpl.fetchResultUsingGet(builder); + Workflow workFlow = (Workflow) response1; WorkFlowModel workFlowModel = mapper.readValue(workFlow.getConfiguration(), WorkFlowModel.class); WfStatus wfStatus = getWfStatus(state, workFlowModel); List> nextActionArray = new ArrayList<>(); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0b776d8..02362e8 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -58,4 +58,5 @@ notify.service.path=v1/notification/send/sync portal.departmentupdate.path=portal/updateuserroledept sunbird.learner.service.host=http://learner-service:9000/ -sunbird.user.search.endpoint=private/user/v1/search \ No newline at end of file +sunbird.user.search.endpoint=private/user/v1/search +workflow.config.endpoint=api/data/v1/system/settings/get/workFlowConfig \ No newline at end of file From 0d9172448306e66a70ec163446d829a7f12e4571 Mon Sep 17 00:00:00 2001 From: sreeragksgh Date: Sun, 12 Sep 2021 19:40:17 +0530 Subject: [PATCH 2/3] fetching through system settings --- .../org/sunbird/workflow/service/impl/WorkflowServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/sunbird/workflow/service/impl/WorkflowServiceImpl.java b/src/main/java/org/sunbird/workflow/service/impl/WorkflowServiceImpl.java index d8b4130..100692f 100644 --- a/src/main/java/org/sunbird/workflow/service/impl/WorkflowServiceImpl.java +++ b/src/main/java/org/sunbird/workflow/service/impl/WorkflowServiceImpl.java @@ -405,7 +405,6 @@ public Response getApplicationHistoryOnWfId(String rootOrg, String wfId, String public Response getNextActionForState(String rootOrg, String org, String serviceName, String state) { Response response = new Response(); try { -// Workflow workFlow = wfRepo.getWorkFlowForService(rootOrg, org, serviceName); StringBuilder builder = new StringBuilder(); String endPoint = configuration.getWorkflowConfigEndpoint(); builder.append(configuration.getLexCoreServiceHost()).append(endPoint); From 1653490ec8db7d76747dddef757f55e49ecaf7bd Mon Sep 17 00:00:00 2001 From: sreeragksgh Date: Sun, 12 Sep 2021 19:42:35 +0530 Subject: [PATCH 3/3] fetching through system settings --- .../sunbird/workflow/service/impl/WorkflowServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/sunbird/workflow/service/impl/WorkflowServiceImpl.java b/src/main/java/org/sunbird/workflow/service/impl/WorkflowServiceImpl.java index 100692f..e24fe79 100644 --- a/src/main/java/org/sunbird/workflow/service/impl/WorkflowServiceImpl.java +++ b/src/main/java/org/sunbird/workflow/service/impl/WorkflowServiceImpl.java @@ -408,8 +408,8 @@ public Response getNextActionForState(String rootOrg, String org, String service StringBuilder builder = new StringBuilder(); String endPoint = configuration.getWorkflowConfigEndpoint(); builder.append(configuration.getLexCoreServiceHost()).append(endPoint); - Map response1 = (Map) requestServiceImpl.fetchResultUsingGet(builder); - Workflow workFlow = (Workflow) response1; + Map configResponse = (Map) requestServiceImpl.fetchResultUsingGet(builder); + Workflow workFlow = (Workflow) configResponse; WorkFlowModel workFlowModel = mapper.readValue(workFlow.getConfiguration(), WorkFlowModel.class); WfStatus wfStatus = getWfStatus(state, workFlowModel); List> nextActionArray = new ArrayList<>();