|
1 | 1 | <?xml version="1.0" encoding="UTF-8"?>
|
2 |
| -<bpmn:definitions xmlns:bpmn="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:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_11iudjt" targetNamespace="http://jong-soft.org/fintrack/user/register" exporter="Camunda Modeler" exporterVersion="3.7.3"> |
3 |
| - <bpmn:process id="RegisterUserAccount" name="Register User Account" isExecutable="true" camunda:versionTag="1.0.0" camunda:historyTimeToLive="P1D"> |
| 2 | +<bpmn:definitions xmlns:bpmn="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:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_11iudjt" targetNamespace="http://jong-soft.org/fintrack/user/register" exporter="Camunda Modeler" exporterVersion="5.17.0"> |
| 3 | + <bpmn:process id="RegisterUserAccount" name="Register User Account" isExecutable="true" camunda:versionTag="1.1.0" camunda:historyTimeToLive="P1D"> |
4 | 4 | <bpmn:startEvent id="se_register_account">
|
5 | 5 | <bpmn:outgoing>sf_locate_account</bpmn:outgoing>
|
6 | 6 | </bpmn:startEvent>
|
|
15 | 15 | <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${usernameAvailable}</bpmn:conditionExpression>
|
16 | 16 | </bpmn:sequenceFlow>
|
17 | 17 | <bpmn:sequenceFlow id="sf_wait_for_mail" sourceRef="st_create_account" targetRef="st_create_reconcile_account" />
|
18 |
| - <bpmn:sendTask id="st_send_welcome_mail" name="Send welcome mail" camunda:asyncBefore="true" camunda:expression="${mailDaemon.send(username, 'user-registered', mailProperties)}"> |
| 18 | + <bpmn:sendTask id="st_send_welcome_mail" name="Send welcome mail" camunda:expression="${mailDaemon.send(username, 'user-registered', mailProperties)}"> |
19 | 19 | <bpmn:incoming>SequenceFlow_1q5pqa4</bpmn:incoming>
|
20 | 20 | <bpmn:outgoing>SequenceFlow_102zsei</bpmn:outgoing>
|
21 | 21 | </bpmn:sendTask>
|
22 |
| - <bpmn:serviceTask id="st_create_account" name="Create account" camunda:asyncBefore="true" camunda:delegateExpression="${createUserDelegate}"> |
| 22 | + <bpmn:serviceTask id="st_create_account" name="Create account" camunda:delegateExpression="${createUserDelegate}"> |
23 | 23 | <bpmn:extensionElements>
|
24 | 24 | <camunda:inputOutput>
|
25 | 25 | <camunda:inputParameter name="username">${username}</camunda:inputParameter>
|
|
30 | 30 | <bpmn:incoming>sf_account_free</bpmn:incoming>
|
31 | 31 | <bpmn:outgoing>sf_wait_for_mail</bpmn:outgoing>
|
32 | 32 | </bpmn:serviceTask>
|
33 |
| - <bpmn:serviceTask id="tk_locate_account" name="Locate existing by username" camunda:expression="${userProvider.available(username)}" camunda:resultVariable="usernameAvailable"> |
| 33 | + <bpmn:serviceTask id="tk_locate_account" name="Locate existing by username" camunda:delegateExpression="${usernameAvailableDelegate}"> |
| 34 | + <bpmn:extensionElements> |
| 35 | + <camunda:inputOutput> |
| 36 | + <camunda:inputParameter name="username">${username}</camunda:inputParameter> |
| 37 | + <camunda:outputParameter name="usernameAvailable">${usernameAvailable}</camunda:outputParameter> |
| 38 | + </camunda:inputOutput> |
| 39 | + </bpmn:extensionElements> |
34 | 40 | <bpmn:incoming>sf_locate_account</bpmn:incoming>
|
35 | 41 | <bpmn:outgoing>sf_decide_exists</bpmn:outgoing>
|
36 | 42 | </bpmn:serviceTask>
|
37 |
| - <bpmn:sequenceFlow id="SequenceFlow_191lcjy" sourceRef="te_mail_delay" targetRef="st_convert_mail_properties" /> |
38 |
| - <bpmn:intermediateCatchEvent id="te_mail_delay" name="Delay timer" camunda:asyncBefore="true"> |
39 |
| - <bpmn:incoming>Flow_0nf51zz</bpmn:incoming> |
40 |
| - <bpmn:outgoing>SequenceFlow_191lcjy</bpmn:outgoing> |
41 |
| - <bpmn:timerEventDefinition> |
42 |
| - <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">PT5S</bpmn:timeDuration> |
43 |
| - </bpmn:timerEventDefinition> |
44 |
| - </bpmn:intermediateCatchEvent> |
45 |
| - <bpmn:endEvent id="EndEvent_08ovygi" name="Cannot register"> |
| 43 | + <bpmn:endEvent id="register_failed" name="Cannot register"> |
46 | 44 | <bpmn:incoming>sf_account_taken</bpmn:incoming>
|
47 | 45 | <bpmn:errorEventDefinition errorRef="Error_1kt8lal" />
|
48 | 46 | </bpmn:endEvent>
|
49 |
| - <bpmn:sequenceFlow id="sf_account_taken" name="no" sourceRef="eg_account_exists" targetRef="EndEvent_08ovygi" /> |
| 47 | + <bpmn:sequenceFlow id="sf_account_taken" name="no" sourceRef="eg_account_exists" targetRef="register_failed" /> |
50 | 48 | <bpmn:endEvent id="ee_register_complete" name="Finished">
|
51 | 49 | <bpmn:incoming>SequenceFlow_102zsei</bpmn:incoming>
|
52 | 50 | </bpmn:endEvent>
|
53 | 51 | <bpmn:sequenceFlow id="SequenceFlow_102zsei" sourceRef="st_send_welcome_mail" targetRef="ee_register_complete" />
|
54 | 52 | <bpmn:sequenceFlow id="SequenceFlow_1q5pqa4" sourceRef="st_convert_mail_properties" targetRef="st_send_welcome_mail" />
|
55 |
| - <bpmn:serviceTask id="st_convert_mail_properties" name="Prepare mail contents" camunda:asyncBefore="true" camunda:delegateExpression="${propertyConversionDelegate}"> |
| 53 | + <bpmn:serviceTask id="st_convert_mail_properties" name="Prepare mail contents" camunda:delegateExpression="${propertyConversionDelegate}"> |
56 | 54 | <bpmn:extensionElements>
|
57 | 55 | <camunda:inputOutput>
|
58 |
| - <camunda:inputParameter name="user">${currentUserProvider.currentUser()}</camunda:inputParameter> |
| 56 | + <camunda:inputParameter name="user">${username}</camunda:inputParameter> |
59 | 57 | <camunda:outputParameter name="mailProperties">${propertyConversionResult}</camunda:outputParameter>
|
60 | 58 | </camunda:inputOutput>
|
61 |
| - <camunda:executionListener delegateExpression="${startProcessListener}" event="start" /> |
62 | 59 | </bpmn:extensionElements>
|
63 |
| - <bpmn:incoming>SequenceFlow_191lcjy</bpmn:incoming> |
| 60 | + <bpmn:incoming>Flow_0nf51zz</bpmn:incoming> |
64 | 61 | <bpmn:outgoing>SequenceFlow_1q5pqa4</bpmn:outgoing>
|
65 | 62 | </bpmn:serviceTask>
|
66 |
| - <bpmn:serviceTask id="st_create_reconcile_account" name="Create Reconcile account" camunda:asyncBefore="true" camunda:delegateExpression="${processAccountCreationDelegate}"> |
| 63 | + <bpmn:serviceTask id="st_create_reconcile_account" name="Create Reconcile account" camunda:delegateExpression="${processAccountCreationDelegate}"> |
67 | 64 | <bpmn:extensionElements>
|
68 | 65 | <camunda:inputOutput>
|
69 | 66 | <camunda:inputParameter name="account">${accountJson}</camunda:inputParameter>
|
|
73 | 70 | <bpmn:incoming>sf_wait_for_mail</bpmn:incoming>
|
74 | 71 | <bpmn:outgoing>Flow_0nf51zz</bpmn:outgoing>
|
75 | 72 | </bpmn:serviceTask>
|
76 |
| - <bpmn:sequenceFlow id="Flow_0nf51zz" sourceRef="st_create_reconcile_account" targetRef="te_mail_delay" /> |
| 73 | + <bpmn:sequenceFlow id="Flow_0nf51zz" sourceRef="st_create_reconcile_account" targetRef="st_convert_mail_properties" /> |
77 | 74 | </bpmn:process>
|
78 | 75 | <bpmn:error id="Error_1kt8lal" name="DuplicateAccountException" errorCode="400" />
|
79 | 76 | <bpmndi:BPMNDiagram id="BPMNDiagram_1">
|
80 | 77 | <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="RegisterUserAccount">
|
81 |
| - <bpmndi:BPMNEdge id="SequenceFlow_1ai6in3_di" bpmnElement="sf_account_taken"> |
82 |
| - <di:waypoint x="505" y="249" /> |
83 |
| - <di:waypoint x="505" y="336" /> |
84 |
| - <di:waypoint x="650" y="336" /> |
85 |
| - <bpmndi:BPMNLabel> |
86 |
| - <dc:Bounds x="514" y="290" width="13" height="14" /> |
87 |
| - </bpmndi:BPMNLabel> |
88 |
| - </bpmndi:BPMNEdge> |
89 |
| - <bpmndi:BPMNEdge id="SequenceFlow_1if5hip_di" bpmnElement="sf_wait_for_mail"> |
90 |
| - <di:waypoint x="700" y="113" /> |
91 |
| - <di:waypoint x="770" y="113" /> |
92 |
| - </bpmndi:BPMNEdge> |
93 |
| - <bpmndi:BPMNEdge id="SequenceFlow_1mnsywe_di" bpmnElement="sf_account_free"> |
94 |
| - <di:waypoint x="505" y="199" /> |
95 |
| - <di:waypoint x="505" y="113" /> |
96 |
| - <di:waypoint x="600" y="113" /> |
97 |
| - <bpmndi:BPMNLabel> |
98 |
| - <dc:Bounds x="512" y="153" width="17" height="14" /> |
99 |
| - </bpmndi:BPMNLabel> |
100 |
| - </bpmndi:BPMNEdge> |
101 |
| - <bpmndi:BPMNEdge id="SequenceFlow_182ji34_di" bpmnElement="sf_decide_exists"> |
102 |
| - <di:waypoint x="401" y="224" /> |
103 |
| - <di:waypoint x="480" y="224" /> |
104 |
| - </bpmndi:BPMNEdge> |
105 |
| - <bpmndi:BPMNEdge id="SequenceFlow_0bv6skg_di" bpmnElement="sf_locate_account"> |
106 |
| - <di:waypoint x="217" y="224" /> |
107 |
| - <di:waypoint x="301" y="224" /> |
108 |
| - </bpmndi:BPMNEdge> |
109 |
| - <bpmndi:BPMNEdge id="SequenceFlow_1q5pqa4_di" bpmnElement="SequenceFlow_1q5pqa4"> |
110 |
| - <di:waypoint x="1124" y="113" /> |
111 |
| - <di:waypoint x="1197" y="113" /> |
112 |
| - </bpmndi:BPMNEdge> |
113 |
| - <bpmndi:BPMNEdge id="SequenceFlow_102zsei_di" bpmnElement="SequenceFlow_102zsei"> |
114 |
| - <di:waypoint x="1297" y="113" /> |
115 |
| - <di:waypoint x="1358" y="113" /> |
116 |
| - </bpmndi:BPMNEdge> |
117 |
| - <bpmndi:BPMNEdge id="SequenceFlow_191lcjy_di" bpmnElement="SequenceFlow_191lcjy"> |
118 |
| - <di:waypoint x="965" y="113" /> |
119 |
| - <di:waypoint x="1024" y="113" /> |
120 |
| - </bpmndi:BPMNEdge> |
121 |
| - <bpmndi:BPMNEdge id="Flow_0nf51zz_di" bpmnElement="Flow_0nf51zz"> |
122 |
| - <di:waypoint x="870" y="113" /> |
123 |
| - <di:waypoint x="929" y="113" /> |
124 |
| - </bpmndi:BPMNEdge> |
125 | 78 | <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="se_register_account">
|
126 | 79 | <dc:Bounds x="181" y="206" width="36" height="36" />
|
127 | 80 | </bpmndi:BPMNShape>
|
|
131 | 84 | <dc:Bounds x="528" y="206" width="73" height="14" />
|
132 | 85 | </bpmndi:BPMNLabel>
|
133 | 86 | </bpmndi:BPMNShape>
|
| 87 | + <bpmndi:BPMNShape id="SendTask_00cdvq2_di" bpmnElement="st_send_welcome_mail"> |
| 88 | + <dc:Bounds x="1113" y="73" width="100" height="80" /> |
| 89 | + </bpmndi:BPMNShape> |
| 90 | + <bpmndi:BPMNShape id="ServiceTask_0wbbt3m_di" bpmnElement="st_create_account"> |
| 91 | + <dc:Bounds x="600" y="73" width="100" height="80" /> |
| 92 | + </bpmndi:BPMNShape> |
134 | 93 | <bpmndi:BPMNShape id="ServiceTask_01rat76_di" bpmnElement="tk_locate_account">
|
135 | 94 | <dc:Bounds x="301" y="184" width="100" height="80" />
|
136 | 95 | </bpmndi:BPMNShape>
|
137 |
| - <bpmndi:BPMNShape id="EndEvent_0maa9fz_di" bpmnElement="EndEvent_08ovygi"> |
| 96 | + <bpmndi:BPMNShape id="EndEvent_0maa9fz_di" bpmnElement="register_failed"> |
138 | 97 | <dc:Bounds x="650" y="318" width="36" height="36" />
|
139 | 98 | <bpmndi:BPMNLabel>
|
140 | 99 | <dc:Bounds x="630" y="361" width="77" height="14" />
|
141 | 100 | </bpmndi:BPMNLabel>
|
142 | 101 | </bpmndi:BPMNShape>
|
143 |
| - <bpmndi:BPMNShape id="SendTask_00cdvq2_di" bpmnElement="st_send_welcome_mail"> |
144 |
| - <dc:Bounds x="1197" y="73" width="100" height="80" /> |
145 |
| - </bpmndi:BPMNShape> |
146 |
| - <bpmndi:BPMNShape id="IntermediateCatchEvent_16rxar0_di" bpmnElement="te_mail_delay"> |
147 |
| - <dc:Bounds x="929" y="95" width="36" height="36" /> |
148 |
| - <bpmndi:BPMNLabel> |
149 |
| - <dc:Bounds x="919" y="138" width="57" height="14" /> |
150 |
| - </bpmndi:BPMNLabel> |
151 |
| - </bpmndi:BPMNShape> |
152 | 102 | <bpmndi:BPMNShape id="EndEvent_0v11pke_di" bpmnElement="ee_register_complete">
|
153 |
| - <dc:Bounds x="1358" y="95" width="36" height="36" /> |
| 103 | + <dc:Bounds x="1274" y="95" width="36" height="36" /> |
154 | 104 | <bpmndi:BPMNLabel>
|
155 |
| - <dc:Bounds x="1355" y="138" width="42" height="14" /> |
| 105 | + <dc:Bounds x="1271" y="138" width="42" height="14" /> |
156 | 106 | </bpmndi:BPMNLabel>
|
157 | 107 | </bpmndi:BPMNShape>
|
158 | 108 | <bpmndi:BPMNShape id="ServiceTask_0qfxdyj_di" bpmnElement="st_convert_mail_properties">
|
159 |
| - <dc:Bounds x="1024" y="73" width="100" height="80" /> |
| 109 | + <dc:Bounds x="940" y="73" width="100" height="80" /> |
160 | 110 | </bpmndi:BPMNShape>
|
161 | 111 | <bpmndi:BPMNShape id="Activity_0wg14v9_di" bpmnElement="st_create_reconcile_account">
|
162 | 112 | <dc:Bounds x="770" y="73" width="100" height="80" />
|
163 | 113 | </bpmndi:BPMNShape>
|
164 |
| - <bpmndi:BPMNShape id="ServiceTask_0wbbt3m_di" bpmnElement="st_create_account"> |
165 |
| - <dc:Bounds x="600" y="73" width="100" height="80" /> |
166 |
| - </bpmndi:BPMNShape> |
| 114 | + <bpmndi:BPMNEdge id="SequenceFlow_0bv6skg_di" bpmnElement="sf_locate_account"> |
| 115 | + <di:waypoint x="217" y="224" /> |
| 116 | + <di:waypoint x="301" y="224" /> |
| 117 | + </bpmndi:BPMNEdge> |
| 118 | + <bpmndi:BPMNEdge id="SequenceFlow_182ji34_di" bpmnElement="sf_decide_exists"> |
| 119 | + <di:waypoint x="401" y="224" /> |
| 120 | + <di:waypoint x="480" y="224" /> |
| 121 | + </bpmndi:BPMNEdge> |
| 122 | + <bpmndi:BPMNEdge id="SequenceFlow_1mnsywe_di" bpmnElement="sf_account_free"> |
| 123 | + <di:waypoint x="505" y="199" /> |
| 124 | + <di:waypoint x="505" y="113" /> |
| 125 | + <di:waypoint x="600" y="113" /> |
| 126 | + <bpmndi:BPMNLabel> |
| 127 | + <dc:Bounds x="512" y="153" width="17" height="14" /> |
| 128 | + </bpmndi:BPMNLabel> |
| 129 | + </bpmndi:BPMNEdge> |
| 130 | + <bpmndi:BPMNEdge id="SequenceFlow_1if5hip_di" bpmnElement="sf_wait_for_mail"> |
| 131 | + <di:waypoint x="700" y="113" /> |
| 132 | + <di:waypoint x="770" y="113" /> |
| 133 | + </bpmndi:BPMNEdge> |
| 134 | + <bpmndi:BPMNEdge id="SequenceFlow_1ai6in3_di" bpmnElement="sf_account_taken"> |
| 135 | + <di:waypoint x="505" y="249" /> |
| 136 | + <di:waypoint x="505" y="336" /> |
| 137 | + <di:waypoint x="650" y="336" /> |
| 138 | + <bpmndi:BPMNLabel> |
| 139 | + <dc:Bounds x="514" y="290" width="13" height="14" /> |
| 140 | + </bpmndi:BPMNLabel> |
| 141 | + </bpmndi:BPMNEdge> |
| 142 | + <bpmndi:BPMNEdge id="SequenceFlow_102zsei_di" bpmnElement="SequenceFlow_102zsei"> |
| 143 | + <di:waypoint x="1213" y="113" /> |
| 144 | + <di:waypoint x="1274" y="113" /> |
| 145 | + </bpmndi:BPMNEdge> |
| 146 | + <bpmndi:BPMNEdge id="SequenceFlow_1q5pqa4_di" bpmnElement="SequenceFlow_1q5pqa4"> |
| 147 | + <di:waypoint x="1040" y="113" /> |
| 148 | + <di:waypoint x="1113" y="113" /> |
| 149 | + </bpmndi:BPMNEdge> |
| 150 | + <bpmndi:BPMNEdge id="Flow_0nf51zz_di" bpmnElement="Flow_0nf51zz"> |
| 151 | + <di:waypoint x="870" y="113" /> |
| 152 | + <di:waypoint x="940" y="113" /> |
| 153 | + </bpmndi:BPMNEdge> |
167 | 154 | </bpmndi:BPMNPlane>
|
168 | 155 | </bpmndi:BPMNDiagram>
|
169 | 156 | </bpmn:definitions>
|
0 commit comments