From 8b063b35fd4ad6c50fd3ff3a5324c086cfa5789d Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Thu, 27 Jan 2022 20:31:39 +0100 Subject: [PATCH] bugfix: fixed some state problems within process modell --- .../provisioning/process/simple-connect.bpmn | 1548 ++++++++--------- 1 file changed, 722 insertions(+), 826 deletions(-) diff --git a/smardigo/provisioning/process/simple-connect.bpmn b/smardigo/provisioning/process/simple-connect.bpmn index fb8ee12..27c171c 100644 --- a/smardigo/provisioning/process/simple-connect.bpmn +++ b/smardigo/provisioning/process/simple-connect.bpmn @@ -7,89 +7,10 @@ - - - - - - - - ${progress_current + 1} - - - Flow_1f0iyrk - Flow_11k5c1y - - - - - - - - - ${progress_current + 1} - - - Flow_11ki58f - Flow_1eku1o4 - - - - - - - - - ${progress_current + 1} - - - Flow_1eku1o4 - Flow_0pvr263 - - - - - - - - - ${progress_current + 1} - - - Flow_0pvr263 - Flow_1f0iyrk - - - Flow_0l51s9z - Flow_1myfmc6 - Flow_1w2pl97 Flow_0l51s9z - - Flow_1x24mk0 - - - - Flow_0fqbjt7 - Flow_1x24mk0 - - - - - - ${91} - Antrag abgebrochen - - - Flow_0xsem7d - Flow_0fqbjt7 - - - Flow_0xsem7d - - Flow_1rtcnw8 @@ -98,7 +19,7 @@ Flow_13jykf9 Flow_1hsqawc - + ${15} @@ -112,7 +33,7 @@ Flow_0dybqr7 Flow_17rbwn1 - + ${10} @@ -159,7 +80,7 @@ Flow_1qghkm9 Flow_0qc2wxt - + ${30} @@ -192,14 +113,207 @@ Flow_19oh3q2 Flow_0qhadmy - + + Flow_0zcb7z2 + Flow_052tizj + + Flow_1xk6340 + + + + + ${tenant.id} + + + Flow_1xk6340 + Flow_18sqo48 + + + + + + import de.tolina.connect.common.variable.Variables +def authenticatedUserId = users.currentUserId() +Variables.userId(authenticatedUserId) + + + + Flow_18sqo48 + Flow_0cqe2bp + Flow_0xvqt4u + + + Flow_0xvqt4u + Flow_1j32s69 + + + Flow_1j32s69 + Flow_0cqe2bp + Flow_1az29g1 + + + Flow_1az29g1 + Flow_0135fm5 + Flow_0tivdau + + + + ${$action == 'abbrechen'} + + + + + ${$action == 'speichern'} + + + + Flow_0135fm5 + + + ${antrag_decission== 'antragGenehmigen'} + + + + + ${92} + Antrag abgebrochen + + + Flow_0tivdau + + + ${antrag_decission== 'antragAblehnen'} + + + + Flow_0l2gvw9 + Flow_14pzxys + + Flow_0oy4ldu + + + Flow_0oy4ldu + Flow_0wzmz4j + + + + Flow_0wzmz4j + + + + + + Flow_1n08t19 + + ${vorgang_status == 30} + + + + Flow_09j614s + + ${vorgang_status == 92} + + + + Flow_19oh3q2 + + ${vorgang_status == 30} + + + + Flow_0qhadmy + + ${vorgang_status == 92} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${$action == 'abbrechen'} + + + ${$action == 'senden'} + + + + + + + + + + + + + + + + + + + + + + + + + + + + Flow_0qc2wxt + + + Flow_14qlmwl + Flow_03lhlpu + + + Flow_14qlmwl + + ${vorgang_status == 50} + + + + Flow_03lhlpu + + ${vorgang_status == 92} + + + + + + + + ${40} Service wird gestartet - Flow_1myfmc6 + Flow_0l51s9z Flow_0bzl5jh @@ -212,29 +326,157 @@ Flow_0bzl5jh Flow_11ki58f - + + + + + - ${1} - ${6} + ${progress_current + 1} - Flow_1hoe8au - Flow_04gf2u4 - - + Flow_11ki58f + Flow_1eku1o4 + + - - + + ${progress_current + 1} - Flow_0utt18n - Flow_0kli6wa - + Flow_1eku1o4 + Flow_0pvr263 + + + + + + + + + ${progress_current + 1} + + + Flow_0pvr263 + Flow_1f0iyrk + + + + + + + + + ${progress_current + 1} + + + Flow_1f0iyrk + Flow_11k5c1y + + + + + + + + + ${progress_current + 1} + + + Flow_11k5c1y + Flow_1r4otto + + + + + + + + + + + wordpress_portal.sql.gz + + + ${progress_current + 1} + + + Flow_1r4otto + Flow_1u7vy0j + + + Flow_1u7vy0j + Flow_1gzjfsr + Flow_0d1wzgo + + + Flow_0d1wzgo + + + + + + ${50} + Service gestartet + + + Flow_1gzjfsr + Flow_15fkmn4 + + + Flow_15fkmn4 + Flow_0yh3rtc + Flow_1c2a31w + + + + + + import de.tolina.connect.common.variable.Variables +def authenticatedUserId = users.currentUserId() +Variables.userId(authenticatedUserId) + + + + Flow_0yh3rtc + Flow_090j3ro + + + + + ${60} + Service wird gelöscht + + + Flow_090j3ro + Flow_14gp1tg + + + + + + + + + + Flow_14gp1tg + Flow_1hoe8au + + + + + ${1} + ${6} + + + Flow_1hoe8au + Flow_04gf2u4 + @@ -274,122 +516,43 @@ Flow_14qi17c Flow_0utt18n - - Flow_13do7kt - - - + + + + + - ${70} - Service gelöscht + ${progress_current + 1} - Flow_17g4mcr - Flow_13do7kt + Flow_0utt18n + Flow_0kli6wa + + + Flow_0kli6wa + Flow_1sjwm1e + Flow_0tjjeit + + + + Flow_1sjwm1e + - + - - - - - ${progress_current + 1} + ${70} + Service gelöscht - Flow_0kli6wa - Flow_17g4mcr - - - Flow_0zcb7z2 - Flow_052tizj - - Flow_1xk6340 - - - - - ${tenant.id} - - - Flow_1xk6340 - Flow_18sqo48 - - - - - - import de.tolina.connect.common.variable.Variables -def authenticatedUserId = users.currentUserId() -Variables.userId(authenticatedUserId) - - - - Flow_18sqo48 - Flow_0cqe2bp - Flow_0xvqt4u - - - Flow_0xvqt4u - Flow_1j32s69 - - - Flow_1j32s69 - Flow_0cqe2bp - Flow_1az29g1 - - - Flow_1az29g1 - Flow_0135fm5 - Flow_0tivdau - - - - ${$action == 'abbrechen'} - - - - - ${$action == 'speichern'} - - - - Flow_0135fm5 - - - ${antrag_decission== 'antragGenehmigen'} - - - - - ${92} - Antrag abgebrochen - - - Flow_0tivdau - - - ${antrag_decission== 'antragAblehnen'} - - - - Flow_0l2gvw9 - Flow_14pzxys - - Flow_0oy4ldu - - - Flow_0oy4ldu - Flow_0wzmz4j - - - - Flow_0wzmz4j - - - - + Flow_0tjjeit + Flow_13do7kt + + + Flow_13do7kt + + Flow_1c2a31w @@ -408,27 +571,27 @@ Variables.userId(authenticatedUserId) Flow_07sf9z8 Flow_1c6reic - + ${50} Service gestartet - Flow_0zgec7o + Flow_0e5dqc8 Flow_1qzrr09 ${1} - ${4} + ${3} Flow_0r057gs Flow_07sf9z8 - + ${41} @@ -448,7 +611,7 @@ Variables.userId(authenticatedUserId) - + ${42} @@ -468,7 +631,7 @@ Variables.userId(authenticatedUserId) Flow_0nhy074 Flow_1pt1vey - + ${50} @@ -558,7 +721,7 @@ Variables.userId(authenticatedUserId) - + ${43} @@ -578,7 +741,7 @@ Variables.userId(authenticatedUserId) Flow_1c39717 Flow_09id3fl - + ${50} @@ -673,20 +836,6 @@ Variables.userId(authenticatedUserId) Flow_00jy6ae - - - - - - - - ${progress_current + 1} - - - Flow_0e5dqc8 - Flow_0zgec7o - - @@ -700,152 +849,51 @@ Variables.userId(authenticatedUserId) Flow_1c6reic Flow_0e5dqc8 - - - - Flow_1n08t19 - - ${vorgang_status == 30} - - - - Flow_09j614s - - ${vorgang_status == 92} - - - - Flow_19oh3q2 - - ${vorgang_status == 30} - - - - Flow_0qhadmy - - ${vorgang_status == 92} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${$action == 'abbrechen'} - - - ${$action == 'senden'} - - - - - - - - - - - - - - - - - - - - - - - import de.tolina.connect.common.variable.Variables -def authenticatedUserId = users.currentUserId() -Variables.userId(authenticatedUserId) - - - - Flow_0yh3rtc - Flow_090j3ro - - - - - - Flow_15fkmn4 - Flow_0yh3rtc - Flow_1c2a31w - - - - - - - - - - - - ${60} - Service wird gelöscht - - - Flow_090j3ro - Flow_14gp1tg - - - - - - - - - - Flow_14gp1tg - Flow_1hoe8au - - + + - Flow_019b5ec + Flow_042d7e6 - - Flow_019b5ec + + + Flow_042d7e6 - ${vorgang_status == 30} + ${vorgang_status >= 60} - + + Flow_1x24mk0 + + + + Flow_0fqbjt7 + Flow_1x24mk0 + + + - ${50} - Service gestartet + ${91} + Antrag abgebrochen - Flow_0n5twpx - Flow_15fkmn4 + Flow_0xsem7d + Flow_0fqbjt7 - + + Flow_0xsem7d + + + + + + + Flow_00t49db + + + + + @@ -855,134 +903,12 @@ Variables.userId(authenticatedUserId) ${progress_current + 1} - Flow_1u7vy0j - Flow_0n5twpx - - - - - - - - - - - wordpress_portal.sql.gz - - - ${progress_current + 1} - - - Flow_1r4otto - Flow_1u7vy0j - - - - - - - - - ${progress_current + 1} - - - Flow_11k5c1y - Flow_1r4otto + Flow_00t49db + Flow_1in0ur5 - - - - Flow_0qc2wxt - - - Flow_14qlmwl - Flow_03lhlpu + + Flow_1in0ur5 - - Flow_14qlmwl - - ${vorgang_status == 50} - - - - Flow_03lhlpu - - ${vorgang_status == 92} - - - - - - Shared Service -Server bei Hetzner erstellen - -- Provisioning -- Domain (Administration) -- Networks -- (Monitoring) -- (Logging) - - - Shared Service -Keycloak Realm mit Administrator Account - -- Neuer Nutzer (connect-admin) -- Neuer Nutzer (connect-realm-admin) -- (Emailadresse des Erstellers) -- (Automatisch generiertes PW) --( PW per EMail an Administrator) - - - Shared Service -Datenbanken erstellen - -- connect_postgres -- ?connect_wordpress_maria -- (Credentials in Vorgang ablegen) - - - Service auf Server installieren - -- Domain (Services) -- connect -- ?connect_wordpress - - - Service auf Server deinstallieren - - -- Domain (Services) - - - Shared Service -Keycloak Realm mit Administrator Account - - -- Clients entfernen - - - Shared Service -Datenbanken löschen - - -- connect_postgres -- connect_wordpress_maria - - - Shared Service -Server bei Hetzner löschen - - -- Provisioning - - - - - - - - - @@ -1097,6 +1023,46 @@ Server bei Hetzner löschen + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1115,35 +1081,31 @@ Server bei Hetzner löschen - - + + - - + + - - + + - + - - + + - - + + - - - - - - + + @@ -1154,52 +1116,36 @@ Server bei Hetzner löschen + - - - - - - - + + - + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - + + @@ -1274,77 +1220,36 @@ Server bei Hetzner löschen - - + + - - + + - - + + - - + + - - + + - - - - - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1357,7 +1262,7 @@ Server bei Hetzner löschen - + @@ -1396,7 +1301,7 @@ Server bei Hetzner löschen - + @@ -1405,42 +1310,6 @@ Server bei Hetzner löschen - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1517,7 +1386,7 @@ Server bei Hetzner löschen - + @@ -1543,292 +1412,357 @@ Server bei Hetzner löschen + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - - + + + - + - - + + - - + + - - + + - - - + + + - + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - + - + - + - + - + - + - + - + - - + + - + - + - + - - + + - - + + - - + + - + - + - + - + - - - - - + + - + - - + + - - + + - + - + - + - - - - + - + - - - - - + + - - - - - + + - - + + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - + + + + + - - + + - - + + - - + + + + + @@ -1842,12 +1776,6 @@ Server bei Hetzner löschen - - - - - - @@ -1872,38 +1800,6 @@ Server bei Hetzner löschen - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -