Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issues/92 process timeouts #98

Merged
merged 1 commit into from
Oct 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 47 additions & 47 deletions codex-process-data-transfer/src/main/resources/bpe/send.bpmn
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
<bpmn:incoming>Flow_1dsdmf9</bpmn:incoming>
<bpmn:outgoing>Flow_0yofyrq</bpmn:outgoing>
<bpmn:timerEventDefinition id="TimerEventDefinition_1j4t0z6">
<bpmn:timeDuration xsi:type="bpmn:tFormalExpression">PT10M</bpmn:timeDuration>
<bpmn:timeDuration xsi:type="bpmn:tFormalExpression">PT15M</bpmn:timeDuration>
</bpmn:timerEventDefinition>
</bpmn:intermediateCatchEvent>
<bpmn:serviceTask id="SetTimeoutError" name="set timeout error" camunda:class="de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.service.send.SetTimeoutError">
Expand Down Expand Up @@ -309,6 +309,25 @@
<bpmn:message id="Message_0pk1d02" name="continueDataSend" />
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="wwwnetzwerk-universitaetsmedizinde_dataSend">
<bpmndi:BPMNEdge id="Flow_1fuo1n3_di" bpmnElement="Flow_1fuo1n3">
<di:waypoint x="1620" y="120" />
<di:waypoint x="1685" y="120" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_13ulpon_di" bpmnElement="Flow_13ulpon">
<di:waypoint x="1710" y="270" />
<di:waypoint x="1710" y="322" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1okvceo_di" bpmnElement="Flow_1okvceo">
<di:waypoint x="1710" y="145" />
<di:waypoint x="1710" y="190" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1722" y="163" width="35" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1fl07dr_di" bpmnElement="Flow_1fl07dr">
<di:waypoint x="1735" y="120" />
<di:waypoint x="1800" y="120" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1jjbgmm_di" bpmnElement="Flow_1jjbgmm">
<di:waypoint x="2060" y="178" />
<di:waypoint x="2060" y="530" />
Expand Down Expand Up @@ -543,25 +562,6 @@
<di:waypoint x="198" y="120" />
<di:waypoint x="270" y="120" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1fl07dr_di" bpmnElement="Flow_1fl07dr">
<di:waypoint x="1735" y="120" />
<di:waypoint x="1800" y="120" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1okvceo_di" bpmnElement="Flow_1okvceo">
<di:waypoint x="1710" y="145" />
<di:waypoint x="1710" y="190" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1722" y="163" width="35" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_13ulpon_di" bpmnElement="Flow_13ulpon">
<di:waypoint x="1710" y="270" />
<di:waypoint x="1710" y="322" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1fuo1n3_di" bpmnElement="Flow_1fuo1n3">
<di:waypoint x="1620" y="120" />
<di:waypoint x="1685" y="120" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Event_0kggab9_di" bpmnElement="DataSendMessageStartEvent">
<dc:Bounds x="162" y="102" width="36" height="36" />
<bpmndi:BPMNLabel>
Expand All @@ -571,9 +571,6 @@
<bpmndi:BPMNShape id="Activity_1e4ychv_di" bpmnElement="CheckConsent">
<dc:Bounds x="440" y="80" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0pw7tym_di" bpmnElement="ExtractPatientReference">
<dc:Bounds x="270" y="80" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0p0ebgq_di" bpmnElement="ReadData">
<dc:Bounds x="1040" y="80" width="100" height="80" />
</bpmndi:BPMNShape>
Expand All @@ -583,12 +580,18 @@
<bpmndi:BPMNShape id="Activity_0mi94m2_di" bpmnElement="EncryptData">
<dc:Bounds x="1360" y="80" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0d04yf5_di" bpmnElement="StoreDataForGth">
<dc:Bounds x="1800" y="80" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_0h3dkik_di" bpmnElement="Gateway_0h3dkik" isMarkerVisible="true">
<dc:Bounds x="925" y="95" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1uvryxy_di" bpmnElement="SetNoConsentUsageAndTransferError">
<dc:Bounds x="900" y="410" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0pw7tym_di" bpmnElement="ExtractPatientReference">
<dc:Bounds x="270" y="80" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1btox3g_di" bpmnElement="ResolvePsn">
<dc:Bounds x="750" y="190" width="100" height="80" />
</bpmndi:BPMNShape>
Expand All @@ -601,21 +604,6 @@
<bpmndi:BPMNShape id="Gateway_0ii6gnq_di" bpmnElement="Gateway_0ii6gnq" isMarkerVisible="true">
<dc:Bounds x="625" y="205" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1i5l6p1_di" bpmnElement="LogDryRunSuccess">
<dc:Bounds x="1660" y="190" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_056qqty_di" bpmnElement="Gateway_056qqty" isMarkerVisible="true">
<dc:Bounds x="1685" y="95" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0ww5gaz_di" bpmnElement="Event_0ww5gaz">
<dc:Bounds x="1692" y="322" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0d04yf5_di" bpmnElement="StoreDataForGth">
<dc:Bounds x="1800" y="80" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1cf00bl_di" bpmnElement="StartDataTranslateProcess">
<dc:Bounds x="1960" y="80" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0og5zib_di" bpmnElement="DeleteDataForGth">
<dc:Bounds x="2670" y="80" width="100" height="80" />
</bpmndi:BPMNShape>
Expand Down Expand Up @@ -682,9 +670,30 @@
<bpmndi:BPMNShape id="Activity_1xl8e8s_di" bpmnElement="CheckForError">
<dc:Bounds x="2490" y="80" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1cf00bl_di" bpmnElement="StartDataTranslateProcess">
<dc:Bounds x="1960" y="80" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_056qqty_di" bpmnElement="Gateway_056qqty" isMarkerVisible="true">
<dc:Bounds x="1685" y="95" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0ww5gaz_di" bpmnElement="Event_0ww5gaz">
<dc:Bounds x="1692" y="322" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1i5l6p1_di" bpmnElement="LogDryRunSuccess">
<dc:Bounds x="1660" y="190" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0za4t5y_di" bpmnElement="CheckDryRun">
<dc:Bounds x="1520" y="80" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0nmntjp_di" bpmnElement="Event_1iglx21">
<dc:Bounds x="2042" y="142" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1qeyaib_di" bpmnElement="Event_1wqk00d">
<dc:Bounds x="3222" y="272" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0z6ujob_di" bpmnElement="Event_0z6ujob">
<dc:Bounds x="3032" y="272" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0qzm2eh_di" bpmnElement="Event_09702b0">
<dc:Bounds x="352" y="142" width="36" height="36" />
</bpmndi:BPMNShape>
Expand All @@ -703,18 +712,9 @@
<bpmndi:BPMNShape id="Event_1jv2po6_di" bpmnElement="Event_1l3631s">
<dc:Bounds x="1442" y="142" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0nmntjp_di" bpmnElement="Event_1iglx21">
<dc:Bounds x="2042" y="142" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0fkfgqj_di" bpmnElement="Event_1cqf68a">
<dc:Bounds x="1882" y="142" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1qeyaib_di" bpmnElement="Event_1wqk00d">
<dc:Bounds x="3222" y="272" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0z6ujob_di" bpmnElement="Event_0z6ujob">
<dc:Bounds x="3032" y="272" width="36" height="36" />
</bpmndi:BPMNShape>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>
78 changes: 39 additions & 39 deletions codex-process-data-transfer/src/main/resources/bpe/translate.bpmn
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
<bpmn:incoming>Flow_1haez7h</bpmn:incoming>
<bpmn:outgoing>Flow_0164ju7</bpmn:outgoing>
<bpmn:timerEventDefinition id="TimerEventDefinition_1r0n9ev">
<bpmn:timeDuration xsi:type="bpmn:tFormalExpression">PT5M</bpmn:timeDuration>
<bpmn:timeDuration xsi:type="bpmn:tFormalExpression">PT12M</bpmn:timeDuration>
</bpmn:timerEventDefinition>
</bpmn:intermediateCatchEvent>
<bpmn:sequenceFlow id="Flow_0jfknjf" sourceRef="Gateway_0wq4j86" targetRef="CheckForError" />
Expand Down Expand Up @@ -256,12 +256,19 @@ DIZ PSN</bpmn:text>
<bpmn:message id="Message_03uhlns" name="continueDataSendWithValidationError" />
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="wwwnetzwerk-universitaetsmedizinde_dataTranslate">
<bpmndi:BPMNShape id="TextAnnotation_16fbtrv_di" bpmnElement="TextAnnotation_16fbtrv">
<dc:Bounds x="2176" y="350" width="298" height="60" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="TextAnnotation_01veptg_di" bpmnElement="TextAnnotation_01veptg">
<dc:Bounds x="2176" y="440" width="220" height="30" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_0r6da1o_di" bpmnElement="Flow_0r6da1o">
<di:waypoint x="850" y="195" />
<di:waypoint x="850" y="536" />
<di:waypoint x="1985" y="536" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0at3gov_di" bpmnElement="Flow_0at3gov">
<di:waypoint x="850" y="137" />
<di:waypoint x="905" y="137" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0mzjsey_di" bpmnElement="Flow_0mzjsey">
<di:waypoint x="690" y="137" />
<di:waypoint x="750" y="137" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_10keuoy_di" bpmnElement="Flow_10keuoy">
<di:waypoint x="1370" y="137" />
<di:waypoint x="1454" y="137" />
Expand Down Expand Up @@ -419,19 +426,6 @@ DIZ PSN</bpmn:text>
<di:waypoint x="215" y="137" />
<di:waypoint x="270" y="137" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0mzjsey_di" bpmnElement="Flow_0mzjsey">
<di:waypoint x="690" y="137" />
<di:waypoint x="750" y="137" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0at3gov_di" bpmnElement="Flow_0at3gov">
<di:waypoint x="850" y="137" />
<di:waypoint x="905" y="137" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0r6da1o_di" bpmnElement="Flow_0r6da1o">
<di:waypoint x="850" y="195" />
<di:waypoint x="850" y="536" />
<di:waypoint x="1985" y="536" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Event_1rtmd0i_di" bpmnElement="DataTranslateMessageStartEvent">
<dc:Bounds x="179" y="119" width="36" height="36" />
<bpmndi:BPMNLabel>
Expand All @@ -447,9 +441,6 @@ DIZ PSN</bpmn:text>
<bpmndi:BPMNShape id="Activity_0tntlm8_di" bpmnElement="StoreDataForCrr">
<dc:Bounds x="590" y="97" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0r3d84x_di" bpmnElement="StartReceiveProcess">
<dc:Bounds x="750" y="97" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_16xbvhw_di" bpmnElement="LogSuccess">
<dc:Bounds x="1910" y="97" width="100" height="80" />
</bpmndi:BPMNShape>
Expand Down Expand Up @@ -540,32 +531,41 @@ DIZ PSN</bpmn:text>
<bpmndi:BPMNShape id="Event_1pfux3x_di" bpmnElement="Event_1pfux3x">
<dc:Bounds x="1032" y="452" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Association_07l3482_di" bpmnElement="Association_07l3482">
<di:waypoint x="2149" y="282" />
<di:waypoint x="2225" y="350" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_00i1em9_di" bpmnElement="Association_00i1em9">
<di:waypoint x="2246" y="470" />
<di:waypoint x="2152" y="527" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Event_0wwrtyg_di" bpmnElement="Event_1g62jmk">
<dc:Bounds x="672" y="159" width="36" height="36" />
<bpmndi:BPMNShape id="Activity_0r3d84x_di" bpmnElement="StartReceiveProcess">
<dc:Bounds x="750" y="97" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1x8jlnx_di" bpmnElement="Event_0nhr47n">
<dc:Bounds x="512" y="159" width="36" height="36" />
<bpmndi:BPMNShape id="TextAnnotation_16fbtrv_di" bpmnElement="TextAnnotation_16fbtrv">
<dc:Bounds x="2176" y="350" width="298" height="60" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_12sk9nk_di" bpmnElement="Event_1v57p58">
<dc:Bounds x="352" y="159" width="36" height="36" />
<bpmndi:BPMNShape id="TextAnnotation_01veptg_di" bpmnElement="TextAnnotation_01veptg">
<dc:Bounds x="2176" y="440" width="220" height="30" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_15ji9gc_di" bpmnElement="Event_0w1n24t">
<dc:Bounds x="832" y="159" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_09zdqf1_di" bpmnElement="Event_0ii8ir3">
<dc:Bounds x="1992" y="292" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1stg1ue_di" bpmnElement="Event_1eze3pv">
<dc:Bounds x="1812" y="292" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_15ji9gc_di" bpmnElement="Event_0w1n24t">
<dc:Bounds x="832" y="159" width="36" height="36" />
<bpmndi:BPMNShape id="Event_0wwrtyg_di" bpmnElement="Event_1g62jmk">
<dc:Bounds x="672" y="159" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1x8jlnx_di" bpmnElement="Event_0nhr47n">
<dc:Bounds x="512" y="159" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_12sk9nk_di" bpmnElement="Event_1v57p58">
<dc:Bounds x="352" y="159" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Association_07l3482_di" bpmnElement="Association_07l3482">
<di:waypoint x="2149" y="282" />
<di:waypoint x="2225" y="350" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_00i1em9_di" bpmnElement="Association_00i1em9">
<di:waypoint x="2246" y="470" />
<di:waypoint x="2152" y="527" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>