Merge pull request #76 from iowusu/bug/timeWaitUnfiltered

changed the time base wait task to use filtered query
marklogic-community · Jun 23, 2020 · bf85ab2 · bf85ab2
2 parents 273a949 + 97259f8
commit bf85ab2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/state-conductor-example/src/test/java/com/marklogic/ext/AbstractStateConductorRestTest.java b/state-conductor-example/src/test/java/com/marklogic/ext/AbstractStateConductorRestTest.java
@@ -116,7 +116,7 @@ protected StringHandle loadTokenizedResource(String name, Map<String, String> to
     }
 
     File file = new File(resource.getFile());
-    String content = Files.readString(file.toPath());
+    String content = new String(Files.readAllBytes(file.toPath()));
 
     for (Map.Entry<String, String> token : tokens.entrySet()) {
       content = content.replaceAll(token.getKey(), token.getValue());
@@ -126,7 +126,7 @@ protected StringHandle loadTokenizedResource(String name, Map<String, String> to
   }
 
   protected StringHandle replaceTokensInResource(FileHandle file, Map<String, String> tokens) throws IOException {
-    String content = Files.readString(file.get().toPath());
+    String content = new String(Files.readAllBytes(file.get().toPath()));
 
     for (Map.Entry<String, String> token : tokens.entrySet()) {
       content = content.replaceAll(token.getKey(), token.getValue());

diff --git a/...ductor-example/src/test/ml-modules/root/test/suites/StateConductorSuite/timeWait-test.sjs b/...ductor-example/src/test/ml-modules/root/test/suites/StateConductorSuite/timeWait-test.sjs
@@ -20,11 +20,19 @@ jobDoc = xdmp.toJSON({
   errors: {},
 });
 
+//"test excute job")
 //"test excute job")
 assertion = sc.executeStateByJobDoc(jobDoc, false);
-assertions.push(test.assertEqual('waiting', assertion.flowStatus, 'waiting flowStatus'));
 assertions.push(
-  test.assertTrue(assertion.hasOwnProperty('currentlyWaiting'), 'waiting currentlyWaiting')
+  test.assertEqual('waiting', assertion.flowStatus, 'waiting flowStatus'));
+assertions.push(
+  test.assertTrue(assertion.hasOwnProperty('currentlyWaiting'))
+);
+assertions.push(
+  test.assertTrue(assertion.currentlyWaiting.hasOwnProperty("nextTaskTime"))
+);
+assertions.push(
+  test.assertTrue(assertion.provenance[0].waiting.hasOwnProperty("doneNextTaskTime"))
 );
 
 jobDoc = xdmp.toJSON({

diff --git a/state-conductor-modules/src/main/ml-modules/root/state-conductor/state-conductor.sjs b/state-conductor-modules/src/main/ml-modules/root/state-conductor/state-conductor.sjs
@@ -584,10 +584,14 @@ function transition(jobDoc, jobObj, stateName, state, flowObj, save = true) {
     if (jobObj.flowStatus === FLOW_STATUS_WAITING) {
       xdmp.trace(TRACE_EVENT, `transition wait: ${stateName}`);
 
+       let pro = JSON.parse(JSON.stringify(jobObj.currentlyWaiting));
+       pro['doneNextTaskTime'] = pro['nextTaskTime'];
+       delete pro['nextTaskTime'];
+
       jobObj.provenance.push({
         date: new Date().toISOString(),
         state: stateName,
-        waiting: jobObj.currentlyWaiting,
+        waiting: pro,
       });
     } else if (!inTerminalState(jobObj, flowObj)) {
       xdmp.trace(TRACE_EVENT, `transition from non-terminal state: ${stateName}`);