Skip to content
This repository was archived by the owner on Oct 6, 2025. It is now read-only.

Commit 7891db6

Browse files
hhundhhund
committed
Merge remote-tracking branch 'origin/issues/92_Process_Timeouts' into
develop
2 parents d45b9cf + 67a645b commit 7891db6

2 files changed

Lines changed: 86 additions & 86 deletions

File tree

‎codex-process-data-transfer/src/main/resources/bpe/send.bpmn‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
<bpmn:incoming>Flow_1dsdmf9</bpmn:incoming>
219219
<bpmn:outgoing>Flow_0yofyrq</bpmn:outgoing>
220220
<bpmn:timerEventDefinition id="TimerEventDefinition_1j4t0z6">
221-
<bpmn:timeDuration xsi:type="bpmn:tFormalExpression">PT10M</bpmn:timeDuration>
221+
<bpmn:timeDuration xsi:type="bpmn:tFormalExpression">PT15M</bpmn:timeDuration>
222222
</bpmn:timerEventDefinition>
223223
</bpmn:intermediateCatchEvent>
224224
<bpmn:serviceTask id="SetTimeoutError" name="set timeout error" camunda:class="de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.service.send.SetTimeoutError">
@@ -309,6 +309,25 @@
309309
<bpmn:message id="Message_0pk1d02" name="continueDataSend" />
310310
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
311311
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="wwwnetzwerk-universitaetsmedizinde_dataSend">
312+
<bpmndi:BPMNEdge id="Flow_1fuo1n3_di" bpmnElement="Flow_1fuo1n3">
313+
<di:waypoint x="1620" y="120" />
314+
<di:waypoint x="1685" y="120" />
315+
</bpmndi:BPMNEdge>
316+
<bpmndi:BPMNEdge id="Flow_13ulpon_di" bpmnElement="Flow_13ulpon">
317+
<di:waypoint x="1710" y="270" />
318+
<di:waypoint x="1710" y="322" />
319+
</bpmndi:BPMNEdge>
320+
<bpmndi:BPMNEdge id="Flow_1okvceo_di" bpmnElement="Flow_1okvceo">
321+
<di:waypoint x="1710" y="145" />
322+
<di:waypoint x="1710" y="190" />
323+
<bpmndi:BPMNLabel>
324+
<dc:Bounds x="1722" y="163" width="35" height="14" />
325+
</bpmndi:BPMNLabel>
326+
</bpmndi:BPMNEdge>
327+
<bpmndi:BPMNEdge id="Flow_1fl07dr_di" bpmnElement="Flow_1fl07dr">
328+
<di:waypoint x="1735" y="120" />
329+
<di:waypoint x="1800" y="120" />
330+
</bpmndi:BPMNEdge>
312331
<bpmndi:BPMNEdge id="Flow_1jjbgmm_di" bpmnElement="Flow_1jjbgmm">
313332
<di:waypoint x="2060" y="178" />
314333
<di:waypoint x="2060" y="530" />
@@ -543,25 +562,6 @@
543562
<di:waypoint x="198" y="120" />
544563
<di:waypoint x="270" y="120" />
545564
</bpmndi:BPMNEdge>
546-
<bpmndi:BPMNEdge id="Flow_1fl07dr_di" bpmnElement="Flow_1fl07dr">
547-
<di:waypoint x="1735" y="120" />
548-
<di:waypoint x="1800" y="120" />
549-
</bpmndi:BPMNEdge>
550-
<bpmndi:BPMNEdge id="Flow_1okvceo_di" bpmnElement="Flow_1okvceo">
551-
<di:waypoint x="1710" y="145" />
552-
<di:waypoint x="1710" y="190" />
553-
<bpmndi:BPMNLabel>
554-
<dc:Bounds x="1722" y="163" width="35" height="14" />
555-
</bpmndi:BPMNLabel>
556-
</bpmndi:BPMNEdge>
557-
<bpmndi:BPMNEdge id="Flow_13ulpon_di" bpmnElement="Flow_13ulpon">
558-
<di:waypoint x="1710" y="270" />
559-
<di:waypoint x="1710" y="322" />
560-
</bpmndi:BPMNEdge>
561-
<bpmndi:BPMNEdge id="Flow_1fuo1n3_di" bpmnElement="Flow_1fuo1n3">
562-
<di:waypoint x="1620" y="120" />
563-
<di:waypoint x="1685" y="120" />
564-
</bpmndi:BPMNEdge>
565565
<bpmndi:BPMNShape id="Event_0kggab9_di" bpmnElement="DataSendMessageStartEvent">
566566
<dc:Bounds x="162" y="102" width="36" height="36" />
567567
<bpmndi:BPMNLabel>
@@ -571,9 +571,6 @@
571571
<bpmndi:BPMNShape id="Activity_1e4ychv_di" bpmnElement="CheckConsent">
572572
<dc:Bounds x="440" y="80" width="100" height="80" />
573573
</bpmndi:BPMNShape>
574-
<bpmndi:BPMNShape id="Activity_0pw7tym_di" bpmnElement="ExtractPatientReference">
575-
<dc:Bounds x="270" y="80" width="100" height="80" />
576-
</bpmndi:BPMNShape>
577574
<bpmndi:BPMNShape id="Activity_0p0ebgq_di" bpmnElement="ReadData">
578575
<dc:Bounds x="1040" y="80" width="100" height="80" />
579576
</bpmndi:BPMNShape>
@@ -583,12 +580,18 @@
583580
<bpmndi:BPMNShape id="Activity_0mi94m2_di" bpmnElement="EncryptData">
584581
<dc:Bounds x="1360" y="80" width="100" height="80" />
585582
</bpmndi:BPMNShape>
583+
<bpmndi:BPMNShape id="Activity_0d04yf5_di" bpmnElement="StoreDataForGth">
584+
<dc:Bounds x="1800" y="80" width="100" height="80" />
585+
</bpmndi:BPMNShape>
586586
<bpmndi:BPMNShape id="Gateway_0h3dkik_di" bpmnElement="Gateway_0h3dkik" isMarkerVisible="true">
587587
<dc:Bounds x="925" y="95" width="50" height="50" />
588588
</bpmndi:BPMNShape>
589589
<bpmndi:BPMNShape id="Activity_1uvryxy_di" bpmnElement="SetNoConsentUsageAndTransferError">
590590
<dc:Bounds x="900" y="410" width="100" height="80" />
591591
</bpmndi:BPMNShape>
592+
<bpmndi:BPMNShape id="Activity_0pw7tym_di" bpmnElement="ExtractPatientReference">
593+
<dc:Bounds x="270" y="80" width="100" height="80" />
594+
</bpmndi:BPMNShape>
592595
<bpmndi:BPMNShape id="Activity_1btox3g_di" bpmnElement="ResolvePsn">
593596
<dc:Bounds x="750" y="190" width="100" height="80" />
594597
</bpmndi:BPMNShape>
@@ -601,21 +604,6 @@
601604
<bpmndi:BPMNShape id="Gateway_0ii6gnq_di" bpmnElement="Gateway_0ii6gnq" isMarkerVisible="true">
602605
<dc:Bounds x="625" y="205" width="50" height="50" />
603606
</bpmndi:BPMNShape>
604-
<bpmndi:BPMNShape id="Activity_1i5l6p1_di" bpmnElement="LogDryRunSuccess">
605-
<dc:Bounds x="1660" y="190" width="100" height="80" />
606-
</bpmndi:BPMNShape>
607-
<bpmndi:BPMNShape id="Gateway_056qqty_di" bpmnElement="Gateway_056qqty" isMarkerVisible="true">
608-
<dc:Bounds x="1685" y="95" width="50" height="50" />
609-
</bpmndi:BPMNShape>
610-
<bpmndi:BPMNShape id="Event_0ww5gaz_di" bpmnElement="Event_0ww5gaz">
611-
<dc:Bounds x="1692" y="322" width="36" height="36" />
612-
</bpmndi:BPMNShape>
613-
<bpmndi:BPMNShape id="Activity_0d04yf5_di" bpmnElement="StoreDataForGth">
614-
<dc:Bounds x="1800" y="80" width="100" height="80" />
615-
</bpmndi:BPMNShape>
616-
<bpmndi:BPMNShape id="Activity_1cf00bl_di" bpmnElement="StartDataTranslateProcess">
617-
<dc:Bounds x="1960" y="80" width="100" height="80" />
618-
</bpmndi:BPMNShape>
619607
<bpmndi:BPMNShape id="Activity_0og5zib_di" bpmnElement="DeleteDataForGth">
620608
<dc:Bounds x="2670" y="80" width="100" height="80" />
621609
</bpmndi:BPMNShape>
@@ -682,9 +670,30 @@
682670
<bpmndi:BPMNShape id="Activity_1xl8e8s_di" bpmnElement="CheckForError">
683671
<dc:Bounds x="2490" y="80" width="100" height="80" />
684672
</bpmndi:BPMNShape>
673+
<bpmndi:BPMNShape id="Activity_1cf00bl_di" bpmnElement="StartDataTranslateProcess">
674+
<dc:Bounds x="1960" y="80" width="100" height="80" />
675+
</bpmndi:BPMNShape>
676+
<bpmndi:BPMNShape id="Gateway_056qqty_di" bpmnElement="Gateway_056qqty" isMarkerVisible="true">
677+
<dc:Bounds x="1685" y="95" width="50" height="50" />
678+
</bpmndi:BPMNShape>
679+
<bpmndi:BPMNShape id="Event_0ww5gaz_di" bpmnElement="Event_0ww5gaz">
680+
<dc:Bounds x="1692" y="322" width="36" height="36" />
681+
</bpmndi:BPMNShape>
682+
<bpmndi:BPMNShape id="Activity_1i5l6p1_di" bpmnElement="LogDryRunSuccess">
683+
<dc:Bounds x="1660" y="190" width="100" height="80" />
684+
</bpmndi:BPMNShape>
685685
<bpmndi:BPMNShape id="Activity_0za4t5y_di" bpmnElement="CheckDryRun">
686686
<dc:Bounds x="1520" y="80" width="100" height="80" />
687687
</bpmndi:BPMNShape>
688+
<bpmndi:BPMNShape id="Event_0nmntjp_di" bpmnElement="Event_1iglx21">
689+
<dc:Bounds x="2042" y="142" width="36" height="36" />
690+
</bpmndi:BPMNShape>
691+
<bpmndi:BPMNShape id="Event_1qeyaib_di" bpmnElement="Event_1wqk00d">
692+
<dc:Bounds x="3222" y="272" width="36" height="36" />
693+
</bpmndi:BPMNShape>
694+
<bpmndi:BPMNShape id="Event_0z6ujob_di" bpmnElement="Event_0z6ujob">
695+
<dc:Bounds x="3032" y="272" width="36" height="36" />
696+
</bpmndi:BPMNShape>
688697
<bpmndi:BPMNShape id="Event_0qzm2eh_di" bpmnElement="Event_09702b0">
689698
<dc:Bounds x="352" y="142" width="36" height="36" />
690699
</bpmndi:BPMNShape>
@@ -703,18 +712,9 @@
703712
<bpmndi:BPMNShape id="Event_1jv2po6_di" bpmnElement="Event_1l3631s">
704713
<dc:Bounds x="1442" y="142" width="36" height="36" />
705714
</bpmndi:BPMNShape>
706-
<bpmndi:BPMNShape id="Event_0nmntjp_di" bpmnElement="Event_1iglx21">
707-
<dc:Bounds x="2042" y="142" width="36" height="36" />
708-
</bpmndi:BPMNShape>
709715
<bpmndi:BPMNShape id="Event_0fkfgqj_di" bpmnElement="Event_1cqf68a">
710716
<dc:Bounds x="1882" y="142" width="36" height="36" />
711717
</bpmndi:BPMNShape>
712-
<bpmndi:BPMNShape id="Event_1qeyaib_di" bpmnElement="Event_1wqk00d">
713-
<dc:Bounds x="3222" y="272" width="36" height="36" />
714-
</bpmndi:BPMNShape>
715-
<bpmndi:BPMNShape id="Event_0z6ujob_di" bpmnElement="Event_0z6ujob">
716-
<dc:Bounds x="3032" y="272" width="36" height="36" />
717-
</bpmndi:BPMNShape>
718718
</bpmndi:BPMNPlane>
719719
</bpmndi:BPMNDiagram>
720720
</bpmn:definitions>

‎codex-process-data-transfer/src/main/resources/bpe/translate.bpmn‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
<bpmn:incoming>Flow_1haez7h</bpmn:incoming>
204204
<bpmn:outgoing>Flow_0164ju7</bpmn:outgoing>
205205
<bpmn:timerEventDefinition id="TimerEventDefinition_1r0n9ev">
206-
<bpmn:timeDuration xsi:type="bpmn:tFormalExpression">PT5M</bpmn:timeDuration>
206+
<bpmn:timeDuration xsi:type="bpmn:tFormalExpression">PT12M</bpmn:timeDuration>
207207
</bpmn:timerEventDefinition>
208208
</bpmn:intermediateCatchEvent>
209209
<bpmn:sequenceFlow id="Flow_0jfknjf" sourceRef="Gateway_0wq4j86" targetRef="CheckForError" />
@@ -256,12 +256,19 @@ DIZ PSN</bpmn:text>
256256
<bpmn:message id="Message_03uhlns" name="continueDataSendWithValidationError" />
257257
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
258258
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="wwwnetzwerk-universitaetsmedizinde_dataTranslate">
259-
<bpmndi:BPMNShape id="TextAnnotation_16fbtrv_di" bpmnElement="TextAnnotation_16fbtrv">
260-
<dc:Bounds x="2176" y="350" width="298" height="60" />
261-
</bpmndi:BPMNShape>
262-
<bpmndi:BPMNShape id="TextAnnotation_01veptg_di" bpmnElement="TextAnnotation_01veptg">
263-
<dc:Bounds x="2176" y="440" width="220" height="30" />
264-
</bpmndi:BPMNShape>
259+
<bpmndi:BPMNEdge id="Flow_0r6da1o_di" bpmnElement="Flow_0r6da1o">
260+
<di:waypoint x="850" y="195" />
261+
<di:waypoint x="850" y="536" />
262+
<di:waypoint x="1985" y="536" />
263+
</bpmndi:BPMNEdge>
264+
<bpmndi:BPMNEdge id="Flow_0at3gov_di" bpmnElement="Flow_0at3gov">
265+
<di:waypoint x="850" y="137" />
266+
<di:waypoint x="905" y="137" />
267+
</bpmndi:BPMNEdge>
268+
<bpmndi:BPMNEdge id="Flow_0mzjsey_di" bpmnElement="Flow_0mzjsey">
269+
<di:waypoint x="690" y="137" />
270+
<di:waypoint x="750" y="137" />
271+
</bpmndi:BPMNEdge>
265272
<bpmndi:BPMNEdge id="Flow_10keuoy_di" bpmnElement="Flow_10keuoy">
266273
<di:waypoint x="1370" y="137" />
267274
<di:waypoint x="1454" y="137" />
@@ -419,19 +426,6 @@ DIZ PSN</bpmn:text>
419426
<di:waypoint x="215" y="137" />
420427
<di:waypoint x="270" y="137" />
421428
</bpmndi:BPMNEdge>
422-
<bpmndi:BPMNEdge id="Flow_0mzjsey_di" bpmnElement="Flow_0mzjsey">
423-
<di:waypoint x="690" y="137" />
424-
<di:waypoint x="750" y="137" />
425-
</bpmndi:BPMNEdge>
426-
<bpmndi:BPMNEdge id="Flow_0at3gov_di" bpmnElement="Flow_0at3gov">
427-
<di:waypoint x="850" y="137" />
428-
<di:waypoint x="905" y="137" />
429-
</bpmndi:BPMNEdge>
430-
<bpmndi:BPMNEdge id="Flow_0r6da1o_di" bpmnElement="Flow_0r6da1o">
431-
<di:waypoint x="850" y="195" />
432-
<di:waypoint x="850" y="536" />
433-
<di:waypoint x="1985" y="536" />
434-
</bpmndi:BPMNEdge>
435429
<bpmndi:BPMNShape id="Event_1rtmd0i_di" bpmnElement="DataTranslateMessageStartEvent">
436430
<dc:Bounds x="179" y="119" width="36" height="36" />
437431
<bpmndi:BPMNLabel>
@@ -447,9 +441,6 @@ DIZ PSN</bpmn:text>
447441
<bpmndi:BPMNShape id="Activity_0tntlm8_di" bpmnElement="StoreDataForCrr">
448442
<dc:Bounds x="590" y="97" width="100" height="80" />
449443
</bpmndi:BPMNShape>
450-
<bpmndi:BPMNShape id="Activity_0r3d84x_di" bpmnElement="StartReceiveProcess">
451-
<dc:Bounds x="750" y="97" width="100" height="80" />
452-
</bpmndi:BPMNShape>
453444
<bpmndi:BPMNShape id="Activity_16xbvhw_di" bpmnElement="LogSuccess">
454445
<dc:Bounds x="1910" y="97" width="100" height="80" />
455446
</bpmndi:BPMNShape>
@@ -540,32 +531,41 @@ DIZ PSN</bpmn:text>
540531
<bpmndi:BPMNShape id="Event_1pfux3x_di" bpmnElement="Event_1pfux3x">
541532
<dc:Bounds x="1032" y="452" width="36" height="36" />
542533
</bpmndi:BPMNShape>
543-
<bpmndi:BPMNEdge id="Association_07l3482_di" bpmnElement="Association_07l3482">
544-
<di:waypoint x="2149" y="282" />
545-
<di:waypoint x="2225" y="350" />
546-
</bpmndi:BPMNEdge>
547-
<bpmndi:BPMNEdge id="Association_00i1em9_di" bpmnElement="Association_00i1em9">
548-
<di:waypoint x="2246" y="470" />
549-
<di:waypoint x="2152" y="527" />
550-
</bpmndi:BPMNEdge>
551-
<bpmndi:BPMNShape id="Event_0wwrtyg_di" bpmnElement="Event_1g62jmk">
552-
<dc:Bounds x="672" y="159" width="36" height="36" />
534+
<bpmndi:BPMNShape id="Activity_0r3d84x_di" bpmnElement="StartReceiveProcess">
535+
<dc:Bounds x="750" y="97" width="100" height="80" />
553536
</bpmndi:BPMNShape>
554-
<bpmndi:BPMNShape id="Event_1x8jlnx_di" bpmnElement="Event_0nhr47n">
555-
<dc:Bounds x="512" y="159" width="36" height="36" />
537+
<bpmndi:BPMNShape id="TextAnnotation_16fbtrv_di" bpmnElement="TextAnnotation_16fbtrv">
538+
<dc:Bounds x="2176" y="350" width="298" height="60" />
556539
</bpmndi:BPMNShape>
557-
<bpmndi:BPMNShape id="Event_12sk9nk_di" bpmnElement="Event_1v57p58">
558-
<dc:Bounds x="352" y="159" width="36" height="36" />
540+
<bpmndi:BPMNShape id="TextAnnotation_01veptg_di" bpmnElement="TextAnnotation_01veptg">
541+
<dc:Bounds x="2176" y="440" width="220" height="30" />
542+
</bpmndi:BPMNShape>
543+
<bpmndi:BPMNShape id="Event_15ji9gc_di" bpmnElement="Event_0w1n24t">
544+
<dc:Bounds x="832" y="159" width="36" height="36" />
559545
</bpmndi:BPMNShape>
560546
<bpmndi:BPMNShape id="Event_09zdqf1_di" bpmnElement="Event_0ii8ir3">
561547
<dc:Bounds x="1992" y="292" width="36" height="36" />
562548
</bpmndi:BPMNShape>
563549
<bpmndi:BPMNShape id="Event_1stg1ue_di" bpmnElement="Event_1eze3pv">
564550
<dc:Bounds x="1812" y="292" width="36" height="36" />
565551
</bpmndi:BPMNShape>
566-
<bpmndi:BPMNShape id="Event_15ji9gc_di" bpmnElement="Event_0w1n24t">
567-
<dc:Bounds x="832" y="159" width="36" height="36" />
552+
<bpmndi:BPMNShape id="Event_0wwrtyg_di" bpmnElement="Event_1g62jmk">
553+
<dc:Bounds x="672" y="159" width="36" height="36" />
568554
</bpmndi:BPMNShape>
555+
<bpmndi:BPMNShape id="Event_1x8jlnx_di" bpmnElement="Event_0nhr47n">
556+
<dc:Bounds x="512" y="159" width="36" height="36" />
557+
</bpmndi:BPMNShape>
558+
<bpmndi:BPMNShape id="Event_12sk9nk_di" bpmnElement="Event_1v57p58">
559+
<dc:Bounds x="352" y="159" width="36" height="36" />
560+
</bpmndi:BPMNShape>
561+
<bpmndi:BPMNEdge id="Association_07l3482_di" bpmnElement="Association_07l3482">
562+
<di:waypoint x="2149" y="282" />
563+
<di:waypoint x="2225" y="350" />
564+
</bpmndi:BPMNEdge>
565+
<bpmndi:BPMNEdge id="Association_00i1em9_di" bpmnElement="Association_00i1em9">
566+
<di:waypoint x="2246" y="470" />
567+
<di:waypoint x="2152" y="527" />
568+
</bpmndi:BPMNEdge>
569569
</bpmndi:BPMNPlane>
570570
</bpmndi:BPMNDiagram>
571571
</bpmn:definitions>

0 commit comments

Comments
 (0)