added fixes to the flow

Author: annahileta

src/main/java/com/docusign/controller/maestro/examples/Mae001TriggerWorkflowController.java

@@ -88,8 +88,10 @@ private void ensureWorkflowExists(ModelMap model) throws Exception {
         var accessToken = user.getAccessToken();
         var templateId = session.getTemplateId();
 
-        findActiveWorkflow(accessToken, accountId)
+        if (session.getWorkflowId() == null) {
+            findActiveWorkflow(accessToken, accountId)
                 .ifPresent(workflowId -> session.setWorkflowId(workflowId));
+        }
 
         if (session.getIsWorkflowPublished()) {
             publishAndSetLink(model, accessToken, accountId, session.getWorkflowId());
@@ -112,8 +114,7 @@ private Optional<String> findActiveWorkflow(String accessToken, String accountId
         return workflowsResponse.workflowsListSuccess().stream()
                 .filter(w -> w.data().isPresent())
                 .flatMap(w -> w.data().orElseThrow().stream())
-                .filter(workflow ->
-                        workflow.name().orElseThrow().equals(WORKFLOW_NAME) && workflow.status().orElseThrow().equals(STATUS))
+                .filter(workflow -> workflow.name().orElseThrow().equals(WORKFLOW_NAME))
                 .map(workflow -> workflow.id().orElse(null))
                 .findFirst();
     }

src/main/java/com/docusign/controller/maestro/services/TriggerWorkflowService.java

@@ -5,6 +5,8 @@
 import com.docusign.iam.sdk.models.components.TriggerWorkflow;
 import com.docusign.iam.sdk.models.operations.*;
 import org.json.JSONObject;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.util.StreamUtils;
 
 import java.io.IOException;
 import java.net.URI;
@@ -16,6 +18,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.UUID;
 
 public class TriggerWorkflowService {
@@ -101,10 +104,10 @@ private static String prepareWorkflowDefinition(
             String triggerId,
             String accountId) throws Exception {
         try {
-            var templateFilePath = TriggerWorkflowService.class.getClassLoader().getResource(fileLocation);
-            var templateFile = Paths.get(Objects.requireNonNull(templateFilePath).toURI());
+            ClassPathResource resource = new ClassPathResource(fileLocation);
+            byte[] buffer = StreamUtils.copyToByteArray(resource.getInputStream());
 
-            String workflowDefinition = new String(Files.readAllBytes(templateFile));
+            String workflowDefinition = new String(buffer);
             return workflowDefinition
                     .replace("TEMPLATE_ID", templateId)
                     .replace("ACCOUNT_ID", accountId)
@@ -147,6 +150,6 @@ public static GetWorkflowsListResponse getMaestroWorkflow(
             String accountId) throws Exception {
         return client.maestro()
                 .workflows()
-                .getWorkflowsList(accountId);
+                .getWorkflowsList(accountId, Optional.of(Status.ACTIVE), Optional.empty());
     }
 }