Included search for wf:user on Inbox and added test for dynamicUser and inbox

Author: Luis Martinez

src/test/suites/inclusive-gateway/inclusive-gateway-01.xqy

@@ -37,7 +37,7 @@ declare namespace ext = "http://marklogic.com/rest-api/resource/process";
 
 declare variable $PROCESS-MODEL-NAME := test-constants:expected-model-id($test-constants:TEST-01-MODEL-NAME);
 
-let $payload := element ext:createRequest{element ext:processName{$PROCESS-MODEL-NAME},element ext:data{element value{"A"}},element ext:attachments{}}
+let $payload := element ext:createRequest{element ext:processName{$PROCESS-MODEL-NAME},element ext:data{element value{"A"}, element assignTo{"admin"}},element ext:attachments{}}
 let $process-response := wrt:process-create($const:xml-options, $payload)[2]
 let $pid := $process-response/ext:createResponse/ext:processId/text()
 return
@@ -70,6 +70,44 @@ test:assert-equal(xs:string($process-state/ext:outcome/text()),"SUCCESS"),
 test:assert-equal("InclusiveGateway_1",fn:tokenize($current-state,"/")[fn:last()])
 )
 ;
+
+(: test inbox lists wf:user processinbox-read :)
+import module namespace test-constants = "http://marklogic.com/workflow/test-constants/inclusive-gateway" at "/test/suites/inclusive-gateway/lib/constants.xqy";
+import module namespace const="http://marklogic.com/roxy/workflow-constants" at "/test/workflow-constants.xqy";
+import module namespace wrt="http://marklogic.com/workflow/rest-tests" at "/test/workflow-rest-tests.xqy";
+import module namespace test="http://marklogic.com/roxy/test-helper" at "/test/test-helper.xqy";
+declare namespace cpf = "http://marklogic.com/cpf";
+declare namespace ext = "http://marklogic.com/rest-api/resource/processinbox";
+declare namespace http = "xdmp:http";
+declare namespace prop = "http://marklogic.com/xdmp/property";
+declare namespace wf="http://marklogic.com/workflow";
+
+let $_pause := xdmp:sleep(10000)
+let $test-pid := fn:doc(test-constants:test-pid-uri($test-constants:TEST-01-MODEL-NAME))/test-constants:pid/text()
+let $child-pid := /wf:process[fn:matches(wf:parent,$test-pid)]/@id/fn:string()
+let $result := wrt:test-08-processinbox-read($const:xml-options)
+return (
+  test:assert-equal('200', xs:string($result[1]/http:code)),
+  test:assert-equal('SUCCESS', xs:string($result[2]/ext:readResponse/ext:outcome)),
+  test:assert-exists($result[2]/ext:readResponse/wf:inbox/wf:task[@processid=$child-pid]),
+  let $task := $result[2]/ext:readResponse/wf:inbox/wf:task[@processid=$child-pid]
+  return (
+    test:assert-exists($task/wf:process-data/wf:process/wf:data),
+    test:assert-exists($task/wf:process-data/wf:process/wf:attachments),
+    test:assert-exists($task/wf:process-data/wf:process/wf:audit-trail),
+    test:assert-exists($task/wf:process-data/wf:process/wf:metrics),
+    test:assert-exists($task/wf:process-data/wf:process/wf:process-definition-name),
+    let $properties := $task/wf:process-properties/prop:properties
+    return (
+      test:assert-equal('done', xs:string($properties/cpf:processing-status)),
+      test:assert-equal('dynamicUser', xs:string($properties/wf:currentStep/wf:type)),
+      test:assert-equal('admin', xs:string($properties/wf:currentStep/wf:user)),
+      test:assert-equal('userTask', xs:string($properties/wf:currentStep/wf:step-type)),
+      test:assert-equal('ENTERED', xs:string($properties/wf:currentStep/wf:step-status))
+    )
+  )
+);
+
 (:
   Fork has not rendezvoused because there is a user task requiring completion. We therefore complete it
 :)
@@ -90,6 +128,7 @@ test:assert-equal(xs:string($update-response/ext:outcome/text()),"SUCCESS")
 (: Need to sleep to ensure asynchronous behaviour has completed :)
 xdmp:sleep(2000)
 ;
+
 (:
   Check process has rendezvoused and completed
 :)

src/test/suites/inclusive-gateway/test-data/InclusiveGatewayTest-01.bpmn

@@ -2,6 +2,8 @@
 <!-- origin at X=0.0 Y=0.0 -->
 <bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xs="http://www.w3.org/2001/XMLSchema" id="_GqqWIBraEeiDzsBG-Hp4NA" exporter="org.eclipse.bpmn2.modeler.core" exporterVersion="1.4.2.Final-v20171109-1930-B1">
   <bpmn2:itemDefinition id="ItemDefinition_18" isCollection="false" structureRef="xs:boolean"/>
+  <bpmn2:itemDefinition id="ItemDefinition_922" isCollection="false" structureRef="xs:string"/>
+  <bpmn2:resource id="Resource_1" name="DynamicUser"/>
   <bpmn2:process id="Process_1" name="Process 1" isExecutable="false">
     <bpmn2:startEvent id="StartEvent_1" name="Start">
       <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
@@ -22,6 +24,12 @@
     <bpmn2:userTask id="UserTask_1" name="TaskA">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
+      <bpmn2:humanPerformer id="HumanPerformer_1" name="Actor">
+        <bpmn2:resourceRef>Resource_1</bpmn2:resourceRef>
+        <bpmn2:resourceAssignmentExpression id="ResourceAssignmentExpression_1">
+          <bpmn2:formalExpression id="FormalExpression_3" evaluatesToTypeRef="ItemDefinition_922" language="http://www.w3.org/1999/XPath">$wf:process/wf:data//assignTo/text()</bpmn2:formalExpression>
+        </bpmn2:resourceAssignmentExpression>
+      </bpmn2:humanPerformer>
     </bpmn2:userTask>
     <bpmn2:userTask id="UserTask_2" name="TaskB">
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
@@ -55,13 +63,13 @@
       <bpmndi:BPMNShape id="BPMNShape_InclusiveGateway_1" bpmnElement="InclusiveGateway_1" isMarkerVisible="true">
         <dc:Bounds height="50.0" width="50.0" x="350.0" y="248.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_3" labelStyle="BPMNLabelStyle_1">
-          <dc:Bounds height="48.0" width="58.0" x="346.0" y="298.0"/>
+          <dc:Bounds height="22.0" width="76.0" x="337.0" y="298.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_InclusiveGateway_2" bpmnElement="InclusiveGateway_2" isMarkerVisible="true">
         <dc:Bounds height="50.0" width="50.0" x="600.0" y="248.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_4" labelStyle="BPMNLabelStyle_1">
-          <dc:Bounds height="48.0" width="69.0" x="591.0" y="298.0"/>
+          <dc:Bounds height="22.0" width="76.0" x="587.0" y="298.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_UserTask_1" bpmnElement="UserTask_1" isExpanded="true">

src/workflowengine/models/workflow-util.xqy

@@ -203,7 +203,7 @@ declare function m:inbox($username as xs:string?) as element(wf:inbox) {
         (: TODO add cpf-active check, wf:status running check, wf:locked-user blank :)
         cts:properties-query(
           cts:element-query(xs:QName("wf:currentStep"),
-            cts:element-value-query(xs:QName("wf:assignee"),($username,xdmp:get-current-user())[1])
+            cts:element-value-query( ( xs:QName("wf:user"), xs:QName("wf:assignee")),($username,xdmp:get-current-user())[1])
           )
         )
       ),("unfiltered") (: TODO ordering, prioritisation support, and so on :)