Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.backend into SI-352_Meldungen_fuer_Qualifizierer
# Conflicts:
# gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java
diff --git a/gfsBackendService/bpmn/ProcessGrid.bpmn b/gfsBackendService/bpmn/ProcessGrid.bpmn
new file mode 100644
index 0000000..a25a697
--- /dev/null
+++ b/gfsBackendService/bpmn/ProcessGrid.bpmn
@@ -0,0 +1,771 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_09pdgnm" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.5.0">
+ <bpmn:collaboration id="Collaboration_1c2s1lo">
+ <bpmn:participant id="Participant_0wxy5vb" name="Status und Rollen in SIT" processRef="Process_1l4e4iw" />
+ </bpmn:collaboration>
+ <bpmn:process id="Process_1l4e4iw" isExecutable="true">
+ <bpmn:laneSet id="LaneSet_0vomn4b">
+ <bpmn:lane id="Lane_0wexw2n" name="Qualifizierer">
+ <bpmn:flowNodeRef>Task_1nbvq3a</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>ExclusiveGateway_0glqc2x</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>EndEvent_1981rjs</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>Task_0zwvi1u</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>ExclusiveGateway_17pzc5x</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>EndEvent_0lb36iq</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>ExclusiveGateway_18n4p05</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>IntermediateThrowEvent_0mxlo8o</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>IntermediateThrowEvent_1npr4p4</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>Task_1xbiavw</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>ExclusiveGateway_0ngagx2</bpmn:flowNodeRef>
+ </bpmn:lane>
+ <bpmn:lane id="Lane_1jxrz7y" name="Erfasser">
+ <bpmn:flowNodeRef>StartEvent_1newp0v</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>ExclusiveGateway_1d34rja</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>Task_1dzsp52</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>ExclusiveGateway_10f52zp</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>Task_1nbzrjq</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>ExclusiveGateway_07oj9op</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>ExclusiveGateway_1n2o5sr</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>IntermediateThrowEvent_1l1be3r</bpmn:flowNodeRef>
+ </bpmn:lane>
+ <bpmn:lane id="Lane_10cs5ua" name="Automatisch (über Schnittstelle)">
+ <bpmn:flowNodeRef>StartEvent_1</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>Task_0qfv9kb</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>Task_17mx1xk</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>ExclusiveGateway_1p7taua</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>Task_0jin54k</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>Activity_0mzi263</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>IntermediateThrowEvent_1t3f807</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>ExclusiveGateway_0yma76l</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>ExclusiveGateway_01eik65</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>IntermediateThrowEvent_00uhxku</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>IntermediateThrowEvent_0n2ccdg</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>ExclusiveGateway_1vo6kty</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>ExclusiveGateway_0eg1ek1</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>IntermediateThrowEvent_0jqai4j</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>Task_1dplsah</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>EndEvent_14kudh7</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>Task_07w1vxy</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>EndEvent_1uwjv8d</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>ExclusiveGateway_01toojw</bpmn:flowNodeRef>
+ </bpmn:lane>
+ <bpmn:lane id="Lane_0t8jtef" name="Veröffentlicher">
+ <bpmn:flowNodeRef>ExclusiveGateway_094sbo8</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>Task_1j8w7w2</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>Task_0cwrree</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>ExclusiveGateway_0xhlwvz</bpmn:flowNodeRef>
+ </bpmn:lane>
+ </bpmn:laneSet>
+ <bpmn:startEvent id="StartEvent_1newp0v" name="Störung liegt vor">
+ <bpmn:outgoing>SequenceFlow_0jvlm13</bpmn:outgoing>
+ </bpmn:startEvent>
+ <bpmn:sequenceFlow id="SequenceFlow_0jvlm13" sourceRef="StartEvent_1newp0v" targetRef="ExclusiveGateway_1vo6kty" />
+ <bpmn:sequenceFlow id="SequenceFlow_0qou6ri" sourceRef="StartEvent_1" targetRef="ExclusiveGateway_1vo6kty" />
+ <bpmn:exclusiveGateway id="ExclusiveGateway_1d34rja">
+ <bpmn:incoming>SequenceFlow_1ikou2g</bpmn:incoming>
+ <bpmn:incoming>SequenceFlow_01po711</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0dkg162</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:task id="Task_1dzsp52" name="Meldung manuell in SIT erfassen">
+ <bpmn:incoming>SequenceFlow_1218mqe</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_1x1ocw5</bpmn:outgoing>
+ </bpmn:task>
+ <bpmn:sequenceFlow id="SequenceFlow_1m7vj0o" name="ja" sourceRef="ExclusiveGateway_01eik65" targetRef="Task_17mx1xk" />
+ <bpmn:sequenceFlow id="SequenceFlow_13mm502" sourceRef="Task_17mx1xk" targetRef="IntermediateThrowEvent_0n2ccdg" />
+ <bpmn:sequenceFlow id="SequenceFlow_1ikou2g" sourceRef="ExclusiveGateway_01eik65" targetRef="ExclusiveGateway_1d34rja" />
+ <bpmn:sequenceFlow id="SequenceFlow_01po711" sourceRef="IntermediateThrowEvent_0n2ccdg" targetRef="ExclusiveGateway_1d34rja" />
+ <bpmn:sequenceFlow id="SequenceFlow_0dkg162" sourceRef="ExclusiveGateway_1d34rja" targetRef="Task_1nbvq3a" />
+ <bpmn:sequenceFlow id="SequenceFlow_1xavuo6" sourceRef="Task_0qfv9kb" targetRef="ExclusiveGateway_0yma76l" />
+ <bpmn:sequenceFlow id="SequenceFlow_1x1ocw5" sourceRef="Task_1dzsp52" targetRef="ExclusiveGateway_0yma76l" />
+ <bpmn:sequenceFlow id="SequenceFlow_13aoc3y" name="nein" sourceRef="ExclusiveGateway_0glqc2x" targetRef="Task_1j8w7w2" />
+ <bpmn:sequenceFlow id="SequenceFlow_1ppmiuq" name="automatisch" sourceRef="ExclusiveGateway_0eg1ek1" targetRef="Task_0qfv9kb" />
+ <bpmn:sequenceFlow id="SequenceFlow_1218mqe" name="manuell" sourceRef="ExclusiveGateway_0eg1ek1" targetRef="Task_1dzsp52" />
+ <bpmn:sequenceFlow id="SequenceFlow_0gq5m83" name="ja" sourceRef="ExclusiveGateway_094sbo8" targetRef="ExclusiveGateway_1p7taua" />
+ <bpmn:sequenceFlow id="SequenceFlow_0nfqrdv" name="ja" sourceRef="ExclusiveGateway_0xhlwvz" targetRef="ExclusiveGateway_1p7taua" />
+ <bpmn:sequenceFlow id="SequenceFlow_1y9czge" sourceRef="Task_0jin54k" targetRef="IntermediateThrowEvent_0jqai4j" />
+ <bpmn:sequenceFlow id="SequenceFlow_1yqamwf" name="nein" sourceRef="ExclusiveGateway_094sbo8" targetRef="ExclusiveGateway_07oj9op" />
+ <bpmn:sequenceFlow id="SequenceFlow_1402wrv" sourceRef="IntermediateThrowEvent_0jqai4j" targetRef="ExclusiveGateway_07oj9op" />
+ <bpmn:exclusiveGateway id="ExclusiveGateway_10f52zp" name="Aktualisierung durch?">
+ <bpmn:incoming>SequenceFlow_18d39gw</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0l6kney</bpmn:outgoing>
+ <bpmn:outgoing>Flow_1itiq2o</bpmn:outgoing>
+ <bpmn:outgoing>SequenceFlow_1q0bcrt</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:task id="Task_1nbzrjq" name="Meldung aktualisieren">
+ <bpmn:incoming>SequenceFlow_0l6kney</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_19m0zzx</bpmn:outgoing>
+ </bpmn:task>
+ <bpmn:exclusiveGateway id="ExclusiveGateway_07oj9op">
+ <bpmn:incoming>SequenceFlow_1yqamwf</bpmn:incoming>
+ <bpmn:incoming>SequenceFlow_1402wrv</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_1ajzn2j</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:exclusiveGateway id="ExclusiveGateway_1n2o5sr" name="Meldung aktualisieren?">
+ <bpmn:incoming>SequenceFlow_1ajzn2j</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_18d39gw</bpmn:outgoing>
+ <bpmn:outgoing>SequenceFlow_13z76nc</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:sequenceFlow id="SequenceFlow_18d39gw" name="ja" sourceRef="ExclusiveGateway_1n2o5sr" targetRef="ExclusiveGateway_10f52zp" />
+ <bpmn:sequenceFlow id="SequenceFlow_0l6kney" name="manuell durch Erfasser" sourceRef="ExclusiveGateway_10f52zp" targetRef="Task_1nbzrjq" />
+ <bpmn:sequenceFlow id="Flow_1itiq2o" name="automatisch" sourceRef="ExclusiveGateway_10f52zp" targetRef="Activity_0mzi263" />
+ <bpmn:sequenceFlow id="SequenceFlow_1q0bcrt" name="manuell durch Qualifizierer" sourceRef="ExclusiveGateway_10f52zp" targetRef="ExclusiveGateway_18n4p05" />
+ <bpmn:sequenceFlow id="SequenceFlow_19m0zzx" sourceRef="Task_1nbzrjq" targetRef="IntermediateThrowEvent_1l1be3r" />
+ <bpmn:sequenceFlow id="Flow_1f3c69q" name="nein" sourceRef="ExclusiveGateway_17pzc5x" targetRef="Task_0cwrree" />
+ <bpmn:sequenceFlow id="SequenceFlow_13z76nc" name="nein" sourceRef="ExclusiveGateway_1n2o5sr" targetRef="Task_1xbiavw" />
+ <bpmn:sequenceFlow id="SequenceFlow_1uwpbzw" sourceRef="IntermediateThrowEvent_1l1be3r" targetRef="ExclusiveGateway_18n4p05" />
+ <bpmn:sequenceFlow id="SequenceFlow_0ry805u" sourceRef="IntermediateThrowEvent_1t3f807" targetRef="ExclusiveGateway_18n4p05" />
+ <bpmn:sequenceFlow id="SequenceFlow_1ajzn2j" sourceRef="ExclusiveGateway_07oj9op" targetRef="ExclusiveGateway_1n2o5sr" />
+ <bpmn:exclusiveGateway id="ExclusiveGateway_094sbo8" name="Meldung veröffentlichen?">
+ <bpmn:incoming>SequenceFlow_044uaxe</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0gq5m83</bpmn:outgoing>
+ <bpmn:outgoing>SequenceFlow_1yqamwf</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:task id="Task_1j8w7w2" name="Meldung er-gänzen, kate-gorisieren oder verdichten und über Veröffent-lichung entscheiden">
+ <bpmn:incoming>SequenceFlow_13aoc3y</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_044uaxe</bpmn:outgoing>
+ </bpmn:task>
+ <bpmn:sequenceFlow id="SequenceFlow_044uaxe" sourceRef="Task_1j8w7w2" targetRef="ExclusiveGateway_094sbo8" />
+ <bpmn:sequenceFlow id="SequenceFlow_10l200r" sourceRef="Task_0cwrree" targetRef="ExclusiveGateway_0xhlwvz" />
+ <bpmn:task id="Task_1nbvq3a" name="Meldung prüfen, ergänzen, kategorisieren oder verdichten">
+ <bpmn:incoming>SequenceFlow_0dkg162</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0eb5mfw</bpmn:outgoing>
+ </bpmn:task>
+ <bpmn:exclusiveGateway id="ExclusiveGateway_0glqc2x" name="Meldung storniert?">
+ <bpmn:incoming>SequenceFlow_1shod95</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_094vx6n</bpmn:outgoing>
+ <bpmn:outgoing>SequenceFlow_13aoc3y</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:endEvent id="EndEvent_1981rjs" name="Status: storniert">
+ <bpmn:incoming>SequenceFlow_094vx6n</bpmn:incoming>
+ </bpmn:endEvent>
+ <bpmn:task id="Task_0zwvi1u" name="Meldung wird geprüft, ergänzt, kategorisiert oder verdichtet">
+ <bpmn:incoming>SequenceFlow_0gfti86</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_01fk6wq</bpmn:outgoing>
+ </bpmn:task>
+ <bpmn:exclusiveGateway id="ExclusiveGateway_17pzc5x" name="Meldung storniert?">
+ <bpmn:incoming>SequenceFlow_0llld19</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_1bilofs</bpmn:outgoing>
+ <bpmn:outgoing>Flow_1f3c69q</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:endEvent id="EndEvent_0lb36iq" name="Status: storniert">
+ <bpmn:incoming>SequenceFlow_1bilofs</bpmn:incoming>
+ </bpmn:endEvent>
+ <bpmn:exclusiveGateway id="ExclusiveGateway_18n4p05">
+ <bpmn:incoming>SequenceFlow_1q0bcrt</bpmn:incoming>
+ <bpmn:incoming>SequenceFlow_1uwpbzw</bpmn:incoming>
+ <bpmn:incoming>SequenceFlow_0ry805u</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0gfti86</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_0mxlo8o" name="Status: qualifiziert">
+ <bpmn:incoming>SequenceFlow_0eb5mfw</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_1shod95</bpmn:outgoing>
+ </bpmn:intermediateThrowEvent>
+ <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_1npr4p4" name="Status: qualifiziert, aktualisiert">
+ <bpmn:incoming>SequenceFlow_01fk6wq</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0llld19</bpmn:outgoing>
+ </bpmn:intermediateThrowEvent>
+ <bpmn:sequenceFlow id="SequenceFlow_0eb5mfw" sourceRef="Task_1nbvq3a" targetRef="IntermediateThrowEvent_0mxlo8o" />
+ <bpmn:sequenceFlow id="SequenceFlow_1shod95" sourceRef="IntermediateThrowEvent_0mxlo8o" targetRef="ExclusiveGateway_0glqc2x" />
+ <bpmn:sequenceFlow id="SequenceFlow_094vx6n" name="ja" sourceRef="ExclusiveGateway_0glqc2x" targetRef="EndEvent_1981rjs" />
+ <bpmn:sequenceFlow id="SequenceFlow_0gfti86" sourceRef="ExclusiveGateway_18n4p05" targetRef="Task_0zwvi1u" />
+ <bpmn:sequenceFlow id="SequenceFlow_01fk6wq" sourceRef="Task_0zwvi1u" targetRef="IntermediateThrowEvent_1npr4p4" />
+ <bpmn:sequenceFlow id="SequenceFlow_0llld19" sourceRef="IntermediateThrowEvent_1npr4p4" targetRef="ExclusiveGateway_17pzc5x" />
+ <bpmn:sequenceFlow id="SequenceFlow_1bilofs" name="ja" sourceRef="ExclusiveGateway_17pzc5x" targetRef="EndEvent_0lb36iq" />
+ <bpmn:startEvent id="StartEvent_1" name="Versorgungs-unterbrechung geplant">
+ <bpmn:outgoing>SequenceFlow_0qou6ri</bpmn:outgoing>
+ </bpmn:startEvent>
+ <bpmn:task id="Task_0qfv9kb" name="Meldung über Schnittstelle in SIT importieren">
+ <bpmn:incoming>SequenceFlow_1ppmiuq</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_1xavuo6</bpmn:outgoing>
+ </bpmn:task>
+ <bpmn:task id="Task_17mx1xk" name="Meldungsstatus anpassen und Veröffentlich-ungszeitpunkt erfassen">
+ <bpmn:incoming>SequenceFlow_1m7vj0o</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_13mm502</bpmn:outgoing>
+ </bpmn:task>
+ <bpmn:exclusiveGateway id="ExclusiveGateway_1p7taua">
+ <bpmn:incoming>SequenceFlow_0gq5m83</bpmn:incoming>
+ <bpmn:incoming>SequenceFlow_0nfqrdv</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_02bazol</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:task id="Task_0jin54k" name="Meldung veröffentlichen (E-Mail, SMS, Webseite)">
+ <bpmn:incoming>SequenceFlow_02bazol</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_1y9czge</bpmn:outgoing>
+ </bpmn:task>
+ <bpmn:task id="Activity_0mzi263" name="Meldung über Schnittstelle aktualisieren">
+ <bpmn:incoming>Flow_1itiq2o</bpmn:incoming>
+ <bpmn:outgoing>Flow_0cs46dl</bpmn:outgoing>
+ </bpmn:task>
+ <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_1t3f807" name="Status: aktualisiert">
+ <bpmn:incoming>Flow_0cs46dl</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0ry805u</bpmn:outgoing>
+ </bpmn:intermediateThrowEvent>
+ <bpmn:sequenceFlow id="SequenceFlow_02bazol" sourceRef="ExclusiveGateway_1p7taua" targetRef="Task_0jin54k" />
+ <bpmn:sequenceFlow id="Flow_0cs46dl" sourceRef="Activity_0mzi263" targetRef="IntermediateThrowEvent_1t3f807" />
+ <bpmn:exclusiveGateway id="ExclusiveGateway_0yma76l">
+ <bpmn:incoming>SequenceFlow_1xavuo6</bpmn:incoming>
+ <bpmn:incoming>SequenceFlow_1x1ocw5</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_1q2g320</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:exclusiveGateway id="ExclusiveGateway_01eik65" name="Geplante Maßnahme?">
+ <bpmn:incoming>SequenceFlow_106nlbc</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_1ikou2g</bpmn:outgoing>
+ <bpmn:outgoing>SequenceFlow_1m7vj0o</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_00uhxku" name="Status: angelegt">
+ <bpmn:incoming>SequenceFlow_1q2g320</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_106nlbc</bpmn:outgoing>
+ </bpmn:intermediateThrowEvent>
+ <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_0n2ccdg" name="Status: geplant">
+ <bpmn:incoming>SequenceFlow_13mm502</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_01po711</bpmn:outgoing>
+ </bpmn:intermediateThrowEvent>
+ <bpmn:exclusiveGateway id="ExclusiveGateway_1vo6kty">
+ <bpmn:incoming>SequenceFlow_0qou6ri</bpmn:incoming>
+ <bpmn:incoming>SequenceFlow_0jvlm13</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_060a6e0</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:exclusiveGateway id="ExclusiveGateway_0eg1ek1" name="Erfassungsart?">
+ <bpmn:incoming>SequenceFlow_060a6e0</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_1ppmiuq</bpmn:outgoing>
+ <bpmn:outgoing>SequenceFlow_1218mqe</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_0jqai4j" name="Status: qualifiziert, veröffentlicht">
+ <bpmn:incoming>SequenceFlow_1y9czge</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_1402wrv</bpmn:outgoing>
+ </bpmn:intermediateThrowEvent>
+ <bpmn:sequenceFlow id="SequenceFlow_1q2g320" name="nein" sourceRef="ExclusiveGateway_0yma76l" targetRef="IntermediateThrowEvent_00uhxku" />
+ <bpmn:sequenceFlow id="SequenceFlow_106nlbc" sourceRef="IntermediateThrowEvent_00uhxku" targetRef="ExclusiveGateway_01eik65" />
+ <bpmn:sequenceFlow id="SequenceFlow_060a6e0" sourceRef="ExclusiveGateway_1vo6kty" targetRef="ExclusiveGateway_0eg1ek1" />
+ <bpmn:intermediateThrowEvent id="IntermediateThrowEvent_1l1be3r" name="Status: aktualisiert">
+ <bpmn:incoming>SequenceFlow_19m0zzx</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_1uwpbzw</bpmn:outgoing>
+ </bpmn:intermediateThrowEvent>
+ <bpmn:task id="Task_1dplsah" name="Meldung nicht öffentlich darstellen">
+ <bpmn:incoming>SequenceFlow_09ko4c6</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0t5ds48</bpmn:outgoing>
+ </bpmn:task>
+ <bpmn:endEvent id="EndEvent_14kudh7" name="Status: Veröffentlichung zurückgezogen">
+ <bpmn:incoming>SequenceFlow_0t5ds48</bpmn:incoming>
+ </bpmn:endEvent>
+ <bpmn:sequenceFlow id="SequenceFlow_09ko4c6" name="nein" sourceRef="ExclusiveGateway_0xhlwvz" targetRef="Task_1dplsah" />
+ <bpmn:sequenceFlow id="SequenceFlow_0t5ds48" sourceRef="Task_1dplsah" targetRef="EndEvent_14kudh7" />
+ <bpmn:sequenceFlow id="SequenceFlow_1jlr9xn" sourceRef="Task_1xbiavw" targetRef="ExclusiveGateway_0ngagx2" />
+ <bpmn:task id="Task_0cwrree" name="Meldung er-gänzen, kate-gorisieren oder verdichten und über Veröffent-lichung entscheiden">
+ <bpmn:incoming>Flow_1f3c69q</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_10l200r</bpmn:outgoing>
+ </bpmn:task>
+ <bpmn:exclusiveGateway id="ExclusiveGateway_0xhlwvz" name="Meldung weiter veröffentlichen?">
+ <bpmn:incoming>SequenceFlow_10l200r</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_09ko4c6</bpmn:outgoing>
+ <bpmn:outgoing>SequenceFlow_0nfqrdv</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:task id="Task_1xbiavw" name="Störung wurde behoben">
+ <bpmn:incoming>SequenceFlow_13z76nc</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_1jlr9xn</bpmn:outgoing>
+ </bpmn:task>
+ <bpmn:task id="Task_07w1vxy" name="Meldung aus öffentlicher Darstellung entfernen">
+ <bpmn:incoming>SequenceFlow_0nc7uln</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0hxy7x8</bpmn:outgoing>
+ </bpmn:task>
+ <bpmn:exclusiveGateway id="ExclusiveGateway_0ngagx2" name="Meldung veröffentlicht?">
+ <bpmn:incoming>SequenceFlow_1jlr9xn</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0nc7uln</bpmn:outgoing>
+ <bpmn:outgoing>SequenceFlow_0pezg8s</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ <bpmn:sequenceFlow id="SequenceFlow_0nc7uln" name="ja" sourceRef="ExclusiveGateway_0ngagx2" targetRef="Task_07w1vxy" />
+ <bpmn:sequenceFlow id="SequenceFlow_0hxy7x8" sourceRef="Task_07w1vxy" targetRef="ExclusiveGateway_01toojw" />
+ <bpmn:sequenceFlow id="SequenceFlow_0jwnzpq" sourceRef="ExclusiveGateway_01toojw" targetRef="EndEvent_1uwjv8d" />
+ <bpmn:sequenceFlow id="SequenceFlow_0pezg8s" name="nein" sourceRef="ExclusiveGateway_0ngagx2" targetRef="ExclusiveGateway_01toojw" />
+ <bpmn:endEvent id="EndEvent_1uwjv8d" name="Status: Abgeschlossen">
+ <bpmn:incoming>SequenceFlow_0jwnzpq</bpmn:incoming>
+ </bpmn:endEvent>
+ <bpmn:exclusiveGateway id="ExclusiveGateway_01toojw">
+ <bpmn:incoming>SequenceFlow_0pezg8s</bpmn:incoming>
+ <bpmn:incoming>SequenceFlow_0hxy7x8</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0jwnzpq</bpmn:outgoing>
+ </bpmn:exclusiveGateway>
+ </bpmn:process>
+ <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+ <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_1c2s1lo">
+ <bpmndi:BPMNShape id="Participant_0wxy5vb_di" bpmnElement="Participant_0wxy5vb" isHorizontal="true">
+ <dc:Bounds x="149" y="80" width="2921" height="1030" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+ <dc:Bounds x="282" y="222" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="265" y="265" width="72" height="40" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="Lane_10cs5ua_di" bpmnElement="Lane_10cs5ua" isHorizontal="true">
+ <dc:Bounds x="179" y="80" width="2891" height="354" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="Lane_1jxrz7y_di" bpmnElement="Lane_1jxrz7y" isHorizontal="true">
+ <dc:Bounds x="179" y="434" width="2891" height="246" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="Task_0qfv9kb_di" bpmnElement="Task_0qfv9kb">
+ <dc:Bounds x="510" y="200" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_0qou6ri_di" bpmnElement="SequenceFlow_0qou6ri">
+ <di:waypoint x="318" y="240" />
+ <di:waypoint x="370" y="240" />
+ <di:waypoint x="370" y="335" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="StartEvent_1newp0v_di" bpmnElement="StartEvent_1newp0v">
+ <dc:Bounds x="282" y="512" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="260" y="555" width="82" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="Task_1dzsp52_di" bpmnElement="Task_1dzsp52">
+ <dc:Bounds x="510" y="490" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_0jvlm13_di" bpmnElement="SequenceFlow_0jvlm13">
+ <di:waypoint x="318" y="530" />
+ <di:waypoint x="370" y="530" />
+ <di:waypoint x="370" y="385" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ExclusiveGateway_0yma76l_di" bpmnElement="ExclusiveGateway_0yma76l" isMarkerVisible="true">
+ <dc:Bounds x="625" y="335" width="50" height="50" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="438.5" y="356" width="63" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_1xavuo6_di" bpmnElement="SequenceFlow_1xavuo6">
+ <di:waypoint x="610" y="240" />
+ <di:waypoint x="650" y="240" />
+ <di:waypoint x="650" y="335" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_1x1ocw5_di" bpmnElement="SequenceFlow_1x1ocw5">
+ <di:waypoint x="610" y="530" />
+ <di:waypoint x="650" y="530" />
+ <di:waypoint x="650" y="385" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="Task_17mx1xk_di" bpmnElement="Task_17mx1xk">
+ <dc:Bounds x="880" y="200" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_1m7vj0o_di" bpmnElement="SequenceFlow_1m7vj0o">
+ <di:waypoint x="790" y="335" />
+ <di:waypoint x="790" y="240" />
+ <di:waypoint x="880" y="240" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="805" y="311" width="9" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="Task_0jin54k_di" bpmnElement="Task_0jin54k">
+ <dc:Bounds x="1420" y="200" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="Lane_0wexw2n_di" bpmnElement="Lane_0wexw2n" isHorizontal="true">
+ <dc:Bounds x="179" y="680" width="2891" height="220" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="Task_1nbvq3a_di" bpmnElement="Task_1nbvq3a">
+ <dc:Bounds x="880" y="770" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_1q2g320_di" bpmnElement="SequenceFlow_1q2g320">
+ <di:waypoint x="675" y="360" />
+ <di:waypoint x="702" y="360" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="799" y="403" width="22" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ExclusiveGateway_094sbo8_di" bpmnElement="ExclusiveGateway_094sbo8" isMarkerVisible="true">
+ <dc:Bounds x="1335" y="965" width="50" height="50" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1322" y="1022" width="77" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="ExclusiveGateway_1p7taua_di" bpmnElement="ExclusiveGateway_1p7taua" isMarkerVisible="true">
+ <dc:Bounds x="1335" y="215" width="50" height="50" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_02bazol_di" bpmnElement="SequenceFlow_02bazol">
+ <di:waypoint x="1385" y="240" />
+ <di:waypoint x="1420" y="240" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_0gq5m83_di" bpmnElement="SequenceFlow_0gq5m83">
+ <di:waypoint x="1360" y="965" />
+ <di:waypoint x="1360" y="265" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1365" y="923" width="9" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="Task_1xbiavw_di" bpmnElement="Task_1xbiavw">
+ <dc:Bounds x="2530" y="770" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_1yqamwf_di" bpmnElement="SequenceFlow_1yqamwf">
+ <di:waypoint x="1385" y="990" />
+ <di:waypoint x="1470" y="990" />
+ <di:waypoint x="1470" y="555" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1428.9999999999998" y="973" width="22" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ExclusiveGateway_10f52zp_di" bpmnElement="ExclusiveGateway_10f52zp" isMarkerVisible="true">
+ <dc:Bounds x="1695" y="505" width="50" height="50" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1645" y="486" width="69" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_1y9czge_di" bpmnElement="SequenceFlow_1y9czge">
+ <di:waypoint x="1470" y="280" />
+ <di:waypoint x="1470" y="352" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ExclusiveGateway_0ngagx2_di" bpmnElement="ExclusiveGateway_0ngagx2" isMarkerVisible="true">
+ <dc:Bounds x="2715" y="785" width="50" height="50" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="2706" y="842" width="68" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_1jlr9xn_di" bpmnElement="SequenceFlow_1jlr9xn">
+ <di:waypoint x="2630" y="810" />
+ <di:waypoint x="2715" y="810" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="Task_07w1vxy_di" bpmnElement="Task_07w1vxy">
+ <dc:Bounds x="2690" y="200" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_0nc7uln_di" bpmnElement="SequenceFlow_0nc7uln">
+ <di:waypoint x="2740" y="785" />
+ <di:waypoint x="2740" y="280" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="2755" y="743" width="9" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="EndEvent_1uwjv8d_di" bpmnElement="EndEvent_1uwjv8d">
+ <dc:Bounds x="2942" y="222" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="2923" y="266" width="75" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_0hxy7x8_di" bpmnElement="SequenceFlow_0hxy7x8">
+ <di:waypoint x="2790" y="240" />
+ <di:waypoint x="2845" y="240" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="Lane_0t8jtef_di" bpmnElement="Lane_0t8jtef" isHorizontal="true">
+ <dc:Bounds x="179" y="900" width="2891" height="210" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="Task_1j8w7w2_di" bpmnElement="Task_1j8w7w2">
+ <dc:Bounds x="1170" y="950" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_044uaxe_di" bpmnElement="SequenceFlow_044uaxe">
+ <di:waypoint x="1270" y="990" />
+ <di:waypoint x="1335" y="990" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ExclusiveGateway_0glqc2x_di" bpmnElement="ExclusiveGateway_0glqc2x" isMarkerVisible="true">
+ <dc:Bounds x="1085" y="785" width="50" height="50" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1087" y="754" width="47" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_0eb5mfw_di" bpmnElement="SequenceFlow_0eb5mfw">
+ <di:waypoint x="980" y="810" />
+ <di:waypoint x="1012" y="810" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="EndEvent_1981rjs_di" bpmnElement="EndEvent_1981rjs">
+ <dc:Bounds x="1202" y="792" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1200" y="835" width="41" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_094vx6n_di" bpmnElement="SequenceFlow_094vx6n">
+ <di:waypoint x="1135" y="810" />
+ <di:waypoint x="1202" y="810" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1165" y="792" width="9" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_13aoc3y_di" bpmnElement="SequenceFlow_13aoc3y">
+ <di:waypoint x="1110" y="835" />
+ <di:waypoint x="1110" y="990" />
+ <di:waypoint x="1170" y="990" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1115" y="996" width="22" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ExclusiveGateway_1d34rja_di" bpmnElement="ExclusiveGateway_1d34rja" isMarkerVisible="true">
+ <dc:Bounds x="905" y="505" width="50" height="50" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_13mm502_di" bpmnElement="SequenceFlow_13mm502">
+ <di:waypoint x="930" y="280" />
+ <di:waypoint x="930" y="342" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_0dkg162_di" bpmnElement="SequenceFlow_0dkg162">
+ <di:waypoint x="930" y="555" />
+ <di:waypoint x="930" y="770" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="Task_1nbzrjq_di" bpmnElement="Task_1nbzrjq">
+ <dc:Bounds x="1870" y="490" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_0l6kney_di" bpmnElement="SequenceFlow_0l6kney">
+ <di:waypoint x="1745" y="530" />
+ <di:waypoint x="1870" y="530" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1755" y="496" width="70" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_0pezg8s_di" bpmnElement="SequenceFlow_0pezg8s">
+ <di:waypoint x="2765" y="810" />
+ <di:waypoint x="2870" y="810" />
+ <di:waypoint x="2870" y="265" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="2807" y="792" width="22" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_13z76nc_di" bpmnElement="SequenceFlow_13z76nc">
+ <di:waypoint x="1570" y="555" />
+ <di:waypoint x="1570" y="1070" />
+ <di:waypoint x="2580" y="1070" />
+ <di:waypoint x="2580" y="850" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1579" y="613" width="22" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="Task_0zwvi1u_di" bpmnElement="Task_0zwvi1u">
+ <dc:Bounds x="1870" y="770" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="Task_0cwrree_di" bpmnElement="Task_0cwrree">
+ <dc:Bounds x="2140" y="950" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="ExclusiveGateway_0xhlwvz_di" bpmnElement="ExclusiveGateway_0xhlwvz" isMarkerVisible="true">
+ <dc:Bounds x="2305" y="965" width="50" height="50" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="2291" y="1022" width="77" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_10l200r_di" bpmnElement="SequenceFlow_10l200r">
+ <di:waypoint x="2240" y="990" />
+ <di:waypoint x="2305" y="990" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ExclusiveGateway_17pzc5x_di" bpmnElement="ExclusiveGateway_17pzc5x" isMarkerVisible="true">
+ <dc:Bounds x="2075" y="785" width="50" height="50" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="2077" y="754" width="47" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="EndEvent_0lb36iq_di" bpmnElement="EndEvent_0lb36iq">
+ <dc:Bounds x="2172" y="792" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="2170" y="835" width="41" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_1bilofs_di" bpmnElement="SequenceFlow_1bilofs">
+ <di:waypoint x="2125" y="810" />
+ <di:waypoint x="2172" y="810" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="2145" y="792" width="9" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_01fk6wq_di" bpmnElement="SequenceFlow_01fk6wq">
+ <di:waypoint x="1970" y="810" />
+ <di:waypoint x="2002" y="810" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="Task_1dplsah_di" bpmnElement="Task_1dplsah">
+ <dc:Bounds x="2400" y="200" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_09ko4c6_di" bpmnElement="SequenceFlow_09ko4c6">
+ <di:waypoint x="2355" y="990" />
+ <di:waypoint x="2450" y="990" />
+ <di:waypoint x="2450" y="280" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="2394" y="973" width="22" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_0nfqrdv_di" bpmnElement="SequenceFlow_0nfqrdv">
+ <di:waypoint x="2330" y="965" />
+ <di:waypoint x="2330" y="140" />
+ <di:waypoint x="1360" y="140" />
+ <di:waypoint x="1360" y="215" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="2345" y="933" width="9" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="Flow_1f3c69q_di" bpmnElement="Flow_1f3c69q">
+ <di:waypoint x="2100" y="835" />
+ <di:waypoint x="2100" y="990" />
+ <di:waypoint x="2140" y="990" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="2104" y="883" width="22" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="Activity_0mzi263_di" bpmnElement="Activity_0mzi263">
+ <dc:Bounds x="1870" y="200" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="Flow_0cs46dl_di" bpmnElement="Flow_0cs46dl">
+ <di:waypoint x="1970" y="240" />
+ <di:waypoint x="2082" y="240" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="Flow_1itiq2o_di" bpmnElement="Flow_1itiq2o">
+ <di:waypoint x="1720" y="505" />
+ <di:waypoint x="1720" y="240" />
+ <di:waypoint x="1870" y="240" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1730" y="365" width="60" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ExclusiveGateway_18n4p05_di" bpmnElement="ExclusiveGateway_18n4p05" isMarkerVisible="true">
+ <dc:Bounds x="1895" y="695" width="50" height="50" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_19m0zzx_di" bpmnElement="SequenceFlow_19m0zzx">
+ <di:waypoint x="1920" y="570" />
+ <di:waypoint x="1920" y="612" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_0gfti86_di" bpmnElement="SequenceFlow_0gfti86">
+ <di:waypoint x="1920" y="745" />
+ <di:waypoint x="1920" y="770" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ExclusiveGateway_01eik65_di" bpmnElement="ExclusiveGateway_01eik65" isMarkerVisible="true">
+ <dc:Bounds x="765" y="335" width="50" height="50" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="819" y="350" width="63" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_1ikou2g_di" bpmnElement="SequenceFlow_1ikou2g">
+ <di:waypoint x="790" y="385" />
+ <di:waypoint x="790" y="530" />
+ <di:waypoint x="905" y="530" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="IntermediateThrowEvent_00uhxku_di" bpmnElement="IntermediateThrowEvent_00uhxku">
+ <dc:Bounds x="702" y="342" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="699" y="385" width="44" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_106nlbc_di" bpmnElement="SequenceFlow_106nlbc">
+ <di:waypoint x="738" y="360" />
+ <di:waypoint x="765" y="360" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="IntermediateThrowEvent_0n2ccdg_di" bpmnElement="IntermediateThrowEvent_0n2ccdg">
+ <dc:Bounds x="912" y="342" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="961" y="350" width="38" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_01po711_di" bpmnElement="SequenceFlow_01po711">
+ <di:waypoint x="930" y="378" />
+ <di:waypoint x="930" y="505" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="IntermediateThrowEvent_0mxlo8o_di" bpmnElement="IntermediateThrowEvent_0mxlo8o">
+ <dc:Bounds x="1012" y="792" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1005" y="835" width="51" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_1shod95_di" bpmnElement="SequenceFlow_1shod95">
+ <di:waypoint x="1048" y="810" />
+ <di:waypoint x="1085" y="810" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ExclusiveGateway_1vo6kty_di" bpmnElement="ExclusiveGateway_1vo6kty" isMarkerVisible="true">
+ <dc:Bounds x="345" y="335" width="50" height="50" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="ExclusiveGateway_0eg1ek1_di" bpmnElement="ExclusiveGateway_0eg1ek1" isMarkerVisible="true">
+ <dc:Bounds x="435" y="335" width="50" height="50" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="494.5" y="353" width="75" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_060a6e0_di" bpmnElement="SequenceFlow_060a6e0">
+ <di:waypoint x="395" y="360" />
+ <di:waypoint x="435" y="360" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_1ppmiuq_di" bpmnElement="SequenceFlow_1ppmiuq">
+ <di:waypoint x="460" y="335" />
+ <di:waypoint x="460" y="240" />
+ <di:waypoint x="510" y="240" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="470" y="305" width="60" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_1218mqe_di" bpmnElement="SequenceFlow_1218mqe">
+ <di:waypoint x="460" y="385" />
+ <di:waypoint x="460" y="530" />
+ <di:waypoint x="510" y="530" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="470" y="435" width="39" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="IntermediateThrowEvent_0jqai4j_di" bpmnElement="IntermediateThrowEvent_0jqai4j">
+ <dc:Bounds x="1452" y="352" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1497.5" y="350" width="63" height="40" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_1402wrv_di" bpmnElement="SequenceFlow_1402wrv">
+ <di:waypoint x="1470" y="388" />
+ <di:waypoint x="1470" y="505" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ExclusiveGateway_07oj9op_di" bpmnElement="ExclusiveGateway_07oj9op" isMarkerVisible="true">
+ <dc:Bounds x="1445" y="505" width="50" height="50" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_1ajzn2j_di" bpmnElement="SequenceFlow_1ajzn2j">
+ <di:waypoint x="1495" y="530" />
+ <di:waypoint x="1545" y="530" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ExclusiveGateway_1n2o5sr_di" bpmnElement="ExclusiveGateway_1n2o5sr" isMarkerVisible="true">
+ <dc:Bounds x="1545" y="505" width="50" height="50" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1534.5" y="476" width="69" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_18d39gw_di" bpmnElement="SequenceFlow_18d39gw">
+ <di:waypoint x="1595" y="530" />
+ <di:waypoint x="1695" y="530" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1608" y="512" width="9" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="SequenceFlow_1q0bcrt_di" bpmnElement="SequenceFlow_1q0bcrt">
+ <di:waypoint x="1720" y="555" />
+ <di:waypoint x="1720" y="720" />
+ <di:waypoint x="1895" y="720" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1725" y="588" width="70" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="IntermediateThrowEvent_1l1be3r_di" bpmnElement="IntermediateThrowEvent_1l1be3r">
+ <dc:Bounds x="1902" y="612" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1953" y="616" width="54" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_1uwpbzw_di" bpmnElement="SequenceFlow_1uwpbzw">
+ <di:waypoint x="1920" y="648" />
+ <di:waypoint x="1920" y="695" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="IntermediateThrowEvent_1t3f807_di" bpmnElement="IntermediateThrowEvent_1t3f807">
+ <dc:Bounds x="2082" y="222" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="2123" y="226" width="54" height="27" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_0ry805u_di" bpmnElement="SequenceFlow_0ry805u">
+ <di:waypoint x="2100" y="258" />
+ <di:waypoint x="2100" y="720" />
+ <di:waypoint x="1945" y="720" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="IntermediateThrowEvent_1npr4p4_di" bpmnElement="IntermediateThrowEvent_1npr4p4">
+ <dc:Bounds x="2002" y="792" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1993" y="835" width="54" height="40" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_0llld19_di" bpmnElement="SequenceFlow_0llld19">
+ <di:waypoint x="2038" y="810" />
+ <di:waypoint x="2075" y="810" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="EndEvent_14kudh7_di" bpmnElement="EndEvent_14kudh7">
+ <dc:Bounds x="2562" y="222" width="36" height="36" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="2541" y="265" width="79" height="40" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_0t5ds48_di" bpmnElement="SequenceFlow_0t5ds48">
+ <di:waypoint x="2500" y="240" />
+ <di:waypoint x="2562" y="240" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ExclusiveGateway_01toojw_di" bpmnElement="ExclusiveGateway_01toojw" isMarkerVisible="true">
+ <dc:Bounds x="2845" y="215" width="50" height="50" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_0jwnzpq_di" bpmnElement="SequenceFlow_0jwnzpq">
+ <di:waypoint x="2895" y="240" />
+ <di:waypoint x="2942" y="240" />
+ </bpmndi:BPMNEdge>
+ </bpmndi:BPMNPlane>
+ </bpmndi:BPMNDiagram>
+</bpmn:definitions>
\ No newline at end of file
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/base/tasks/DecisionTask.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/base/tasks/DecisionTask.java
index 3bdec77..13fba0c 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/base/tasks/DecisionTask.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/base/tasks/DecisionTask.java
@@ -51,6 +51,11 @@
}
@Override
+ protected void onEnterStep(T model) throws ProcessException {
+
+ }
+
+ @Override
protected void onLeaveStep(T model) throws ProcessException {
throw new ProcessException("onLeaveStep must not be called on a decision task object");
}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiGrid.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiGrid.java
index 2c42f4a..0119fde 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiGrid.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiGrid.java
@@ -16,14 +16,37 @@
package org.eclipse.openk.gridfailureinformation.bpmn.impl;
import lombok.extern.log4j.Log4j2;
+import org.eclipse.openk.gridfailureinformation.bpmn.base.ProcessException;
import org.eclipse.openk.gridfailureinformation.bpmn.base.ProcessGrid;
+import org.eclipse.openk.gridfailureinformation.bpmn.base.ProcessTask;
+import org.eclipse.openk.gridfailureinformation.bpmn.base.tasks.DecisionTask;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.tasks.DecideFailureInfoPlanned;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.tasks.StoreEditStatusServiceTask;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.tasks.UIStoreFailureInformationTask;
import org.springframework.stereotype.Component;
+import static org.eclipse.openk.gridfailureinformation.bpmn.base.tasks.DecisionTask.OutputPort.NO;
+import static org.eclipse.openk.gridfailureinformation.bpmn.base.tasks.DecisionTask.OutputPort.YES;
+import static org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiProcessState.*;
+
@Log4j2
@Component
public class GfiGrid extends ProcessGrid {
- public GfiGrid() {
- // TODO: Create the Grid here
+ public GfiGrid() throws ProcessException {
+ DecisionTask decidePlanned = register( NEW, new DecideFailureInfoPlanned());
+ ProcessTask storeEditStatusPlanned = new StoreEditStatusServiceTask( PLANNED );
+ ProcessTask enterMessage = register( PLANNED,
+ new UIStoreFailureInformationTask("State PLANNED UI Task", true));
+ ProcessTask storeEditStatusCreated = new StoreEditStatusServiceTask( CREATED );
+ ProcessTask qualifyMessage = register( CREATED,
+ new UIStoreFailureInformationTask( "State CREATED UI Task", true));
+
+
+ decidePlanned.connectOutputTo( YES, storeEditStatusPlanned );
+ decidePlanned.connectOutputTo( NO, storeEditStatusCreated );
+ storeEditStatusPlanned.connectOutputTo(enterMessage);
+ enterMessage.connectOutputTo( storeEditStatusCreated );
+ storeEditStatusCreated.connectOutputTo( qualifyMessage );
}
}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessEnvironment.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessEnvironment.java
new file mode 100644
index 0000000..9e7ecc8
--- /dev/null
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessEnvironment.java
@@ -0,0 +1,26 @@
+package org.eclipse.openk.gridfailureinformation.bpmn.impl;
+
+import lombok.Data;
+import org.eclipse.openk.gridfailureinformation.repository.FailureClassificationRepository;
+import org.eclipse.openk.gridfailureinformation.repository.FailureInformationRepository;
+import org.eclipse.openk.gridfailureinformation.repository.StatusRepository;
+import org.eclipse.openk.gridfailureinformation.service.FailureInformationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+@Data
+public class GfiProcessEnvironment {
+ @Autowired
+ private FailureClassificationRepository failureClassificationRepository;
+
+ @Autowired
+ private FailureInformationRepository failureInformationRepository;
+
+ @Autowired
+ private StatusRepository statusRepository;
+
+ @Autowired
+ private FailureInformationService failureInformationService;
+
+}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessState.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessState.java
index ca42894..cb656f3 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessState.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessState.java
@@ -20,29 +20,53 @@
@Log4j2
public enum GfiProcessState implements ProcessState {
- NEW (0),
- APPLIED (1),
- CANCELED (2),
- UNDEFINED_ (-1); // NOSONAR
+ NEW (1),
+ CREATED (2),
+ PLANNED (3),
+ CREATED_PLANNED (4),
+ QUALIFIED (5),
+ CANCELED (6),
+ QUALIFIED_PUBLISHED (7),
+ WITHDRAWN (8),
+ UPDATED (9),
+ QUALIFIED_UPDATED (10),
+ COMPLETED (11),
+ UNDEFINED_ (-1); // NOSONAR
- private final int statusValue;
+ private final long statusValue;
- GfiProcessState(int statusValue ) {
+ GfiProcessState(long statusValue ) {
this.statusValue = statusValue;
}
- public int getStatusValue() {
+ public long getStatusValue() {
return statusValue;
}
- public static ProcessState fromValue( int statusValue ) { // NOSONAR complexity high but simple
- switch( statusValue ) {
- case 0:
- return NEW;
+ public static ProcessState fromValue( long statusValue ) { // NOSONAR complexity high but simple
+ switch( (int)statusValue ) {
case 1:
- return APPLIED;
+ return NEW;
case 2:
+ return CREATED;
+ case 3:
+ return PLANNED;
+ case 4:
+ return CREATED_PLANNED;
+ case 5:
+ return QUALIFIED;
+ case 6:
return CANCELED;
+ case 7:
+ return QUALIFIED_PUBLISHED;
+ case 8:
+ return WITHDRAWN;
+ case 9:
+ return UPDATED;
+ case 10:
+ return QUALIFIED_UPDATED;
+ case 11:
+ return COMPLETED;
default:
log.error("Invalid statusValue:"+statusValue);
return UNDEFINED_;
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessSubject.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessSubject.java
index 8c2574f..12dbe11 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessSubject.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessSubject.java
@@ -19,6 +19,7 @@
import lombok.extern.log4j.Log4j2;
import org.eclipse.openk.gridfailureinformation.bpmn.base.ProcessState;
import org.eclipse.openk.gridfailureinformation.bpmn.base.ProcessSubject;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.tasks.ProcessHelper;
import org.eclipse.openk.gridfailureinformation.viewmodel.FailureInformationDto;
@Log4j2
@@ -26,19 +27,19 @@
public class GfiProcessSubject implements ProcessSubject {
private FailureInformationDto failureInformationDto;
- private String changeUser;
private ProcessState stateInDb;
- private String jwt;
+ private ProcessHelper processHelper;
private GfiProcessSubject() {}
- private GfiProcessSubject(FailureInformationDto failureInformationDto, String changeUser ) {
+ private GfiProcessSubject(FailureInformationDto failureInformationDto, ProcessHelper processHelper ) {
this.failureInformationDto = failureInformationDto;
- this.changeUser = changeUser;
+ this.processHelper = processHelper;
}
- public static GfiProcessSubject of(FailureInformationDto failureInformationDto, String changeUser ) {
- return new GfiProcessSubject(failureInformationDto, changeUser);
+ public static GfiProcessSubject of(FailureInformationDto failureInformationDto, ProcessHelper processHelper ) {
+ return new GfiProcessSubject(failureInformationDto, processHelper);
+
}
}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/tasks/DecideFailureInfoPlanned.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/tasks/DecideFailureInfoPlanned.java
new file mode 100644
index 0000000..fdce917
--- /dev/null
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/tasks/DecideFailureInfoPlanned.java
@@ -0,0 +1,48 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
+package org.eclipse.openk.gridfailureinformation.bpmn.impl.tasks;
+
+import lombok.extern.log4j.Log4j2;
+import org.eclipse.openk.gridfailureinformation.bpmn.base.ProcessException;
+import org.eclipse.openk.gridfailureinformation.bpmn.base.tasks.DecisionTask;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiProcessSubject;
+
+@Log4j2
+public class DecideFailureInfoPlanned extends DecisionTask<GfiProcessSubject> {
+
+ public DecideFailureInfoPlanned() {
+ super("Decision: Ist die Störungsinformation geplant?");
+ }
+
+ @Override
+ public OutputPort decide(GfiProcessSubject subject) throws ProcessException {
+
+ boolean isFailureInfoPlanned = subject.getProcessHelper().isFailureInfoPlanned(
+ subject.getFailureInformationDto());
+
+ String loggerOutput1 = "Decide: ";
+
+ if( isFailureInfoPlanned ) {
+ log.debug(loggerOutput1 + getDescription()+"\" -> Firing YES");
+ return OutputPort.YES;
+ }
+ else {
+ log.debug(loggerOutput1 + getDescription()+"\" -> Firing NO");
+ return OutputPort.NO;
+ }
+ }
+
+}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/tasks/ProcessHelper.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/tasks/ProcessHelper.java
new file mode 100644
index 0000000..9a9e0ef
--- /dev/null
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/tasks/ProcessHelper.java
@@ -0,0 +1,65 @@
+package org.eclipse.openk.gridfailureinformation.bpmn.impl.tasks;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.eclipse.openk.gridfailureinformation.bpmn.base.ProcessState;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiProcessEnvironment;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiProcessState;
+import org.eclipse.openk.gridfailureinformation.exceptions.InternalServerErrorException;
+import org.eclipse.openk.gridfailureinformation.exceptions.NotFoundException;
+import org.eclipse.openk.gridfailureinformation.model.RefFailureClassification;
+import org.eclipse.openk.gridfailureinformation.model.RefStatus;
+import org.eclipse.openk.gridfailureinformation.model.TblFailureInformation;
+import org.eclipse.openk.gridfailureinformation.viewmodel.FailureInformationDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.Optional;
+import java.util.UUID;
+
+@Log4j2
+@RequiredArgsConstructor
+@Component
+public class ProcessHelper {
+ @Autowired
+ private GfiProcessEnvironment environment;
+
+ @Value("${process.definitions.classification.plannedMeasureDbid}")
+ long plannedMeasureDbId;
+
+ public boolean isFailureInfoPlanned(FailureInformationDto dto) {
+ RefFailureClassification refPlannedMeasure = environment.getFailureClassificationRepository()
+ .findById(plannedMeasureDbId)
+ .orElseThrow(() -> new InternalServerErrorException("planned.measure.obj.not.found"));
+ return refPlannedMeasure.getUuid().equals(dto.getFailureClassificationId());
+ }
+
+ public void setEditStatusAndStore(UUID failureInfoUuid, GfiProcessState state) {
+ TblFailureInformation obj = environment.getFailureInformationRepository().findByUuid(failureInfoUuid)
+ .orElseThrow(() -> new NotFoundException("failure.information.not.found"));
+
+ Optional<RefStatus> optRefStatus = environment.getStatusRepository().findById(state.getStatusValue());
+ if( !optRefStatus.isPresent()) {
+ log.error("RefStatus <"+state.getStatusValue()+"> not found in DB");
+ throw new InternalServerErrorException("status.not.found");
+ }
+ obj.setRefStatusIntern(optRefStatus.get());
+ obj.setRefStatusExtern(optRefStatus.get());
+ environment.getFailureInformationRepository().save(obj);
+ }
+
+ public void storeFailureFromViewModel( FailureInformationDto dto ) {
+ environment.getFailureInformationService().storeFailureInfo(dto);
+ }
+
+ public ProcessState getProcessStateFromStatusUuid( UUID statusUuid ) {
+ Optional<RefStatus> optRefStatus = environment.getStatusRepository().findByUuid(statusUuid);
+ if( !optRefStatus.isPresent()) {
+ log.error("RefStatus <"+statusUuid+"> not found in DB");
+ throw new InternalServerErrorException("status.uuid.not.found");
+ }
+ return GfiProcessState.fromValue(optRefStatus.get().getId());
+ }
+
+}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/tasks/StoreEditStatusServiceTask.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/tasks/StoreEditStatusServiceTask.java
new file mode 100644
index 0000000..7170c69
--- /dev/null
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/tasks/StoreEditStatusServiceTask.java
@@ -0,0 +1,38 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
+package org.eclipse.openk.gridfailureinformation.bpmn.impl.tasks;
+
+import lombok.extern.log4j.Log4j2;
+import org.eclipse.openk.gridfailureinformation.bpmn.base.ProcessException;
+import org.eclipse.openk.gridfailureinformation.bpmn.base.tasks.ServiceTask;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiProcessState;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiProcessSubject;
+
+@Log4j2
+public class StoreEditStatusServiceTask extends ServiceTask<GfiProcessSubject> {
+ protected final GfiProcessState stateToSave;
+
+
+ public StoreEditStatusServiceTask(GfiProcessState stateToSave) {
+ super("Bearbeitungsstatus-Status setzen: "+stateToSave);
+ this.stateToSave = stateToSave;
+ }
+
+ @Override
+ protected void onLeaveStep(GfiProcessSubject subject) throws ProcessException {
+ subject.getProcessHelper().setEditStatusAndStore( subject.getFailureInformationDto().getUuid(), stateToSave );
+ }
+}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/tasks/UIStoreFailureInformationTask.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/tasks/UIStoreFailureInformationTask.java
new file mode 100644
index 0000000..8fba5f9
--- /dev/null
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/tasks/UIStoreFailureInformationTask.java
@@ -0,0 +1,61 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
+package org.eclipse.openk.gridfailureinformation.bpmn.impl.tasks;
+
+import lombok.extern.log4j.Log4j2;
+import org.eclipse.openk.gridfailureinformation.bpmn.base.ProcessException;
+import org.eclipse.openk.gridfailureinformation.bpmn.base.ProcessState;
+import org.eclipse.openk.gridfailureinformation.bpmn.base.tasks.UserInteractionTask;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiProcessSubject;
+
+@Log4j2
+public class UIStoreFailureInformationTask extends UserInteractionTask<GfiProcessSubject> {
+
+ private final boolean stayIfStateUnchanged;
+
+ public UIStoreFailureInformationTask(String description, boolean stayIfStateUnchanged) {
+ super(description);
+ this.stayIfStateUnchanged = stayIfStateUnchanged;
+ }
+
+
+ @Override
+ protected void onLeaveStep(GfiProcessSubject subject) throws ProcessException {
+ subject.getProcessHelper().storeFailureFromViewModel(subject.getFailureInformationDto());
+ }
+
+ @Override
+ protected void onEnterStep(GfiProcessSubject subject) throws ProcessException {
+ // nothing to do here
+ }
+
+ @Override
+ protected boolean isStayInThisTask(GfiProcessSubject subject){
+ return stayIfStateUnchanged && !detectStateChanged( subject );
+ }
+
+ @Override
+ protected void onStayInTask(GfiProcessSubject subject) throws ProcessException {
+ subject.getProcessHelper().storeFailureFromViewModel(subject.getFailureInformationDto());
+ }
+
+ private boolean detectStateChanged( GfiProcessSubject subject ) {
+ ProcessState stateFromObj = subject.getProcessHelper().getProcessStateFromStatusUuid(
+ subject.getFailureInformationDto().getStatusInternId());
+ return stateFromObj != subject.getStateInDb();
+ }
+
+}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/RabbitMqConfig.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/RabbitMqConfig.java
index a040b54..51ca37f 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/RabbitMqConfig.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/RabbitMqConfig.java
@@ -10,12 +10,8 @@
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
-import org.springframework.data.domain.AuditorAware;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.messaging.MessageChannel;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
@Profile("!test")
@Configuration
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/jobs/JobManager.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/jobs/JobManager.java
index dc7f0f4..cfca495 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/jobs/JobManager.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/jobs/JobManager.java
@@ -1,62 +1,12 @@
package org.eclipse.openk.gridfailureinformation.config.jobs;
import lombok.extern.log4j.Log4j2;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.support.converter.SimpleMessageConverter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.integration.channel.DirectChannel;
-import org.springframework.messaging.MessageChannel;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.stereotype.Component;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.nio.charset.Charset;
-import java.util.Random;
-
@EnableScheduling
@Component
@Log4j2
public class JobManager {
-
-// @Value("${rabbitmqconfig.routing-key}")
-// public String routingKey;
-// @Value("${rabbitmqconfig.exchange-name}")
-// public String exchangeName;
-//
-// @Autowired
-// private RabbitTemplate template;
-
-
- // Testjob for sending data into queue
- /*@Scheduled(initialDelay = 1000, fixedRate = 5000)
- public void sendRabbitMQMessages() {
- MessageProperties testProps = new MessageProperties();
-
- byte[] array = new byte[7];
- new Random().nextBytes(array);
- String generatedString = new String(array, Charset.forName("UTF-8"));
-
- int rnd = new Random().nextInt(100);
- //System.out.println(generatedString);
- testProps.setHeader("metaId", "Extern_05.05.2020 13:12:110 " + rnd);
- testProps.setHeader("source", "Extern");
- testProps.setHeader("description", "Wasserleitung kaputt");
-
- String msgBody = "{ \"Quelle\": \"Extern\", \"Eigenschaften\": {\"Branch\": \"Wasser\", \"Ort\": \"Ulm\", \"Datum\": \"2020-05-05T13:12.110Z\"}}";
- //byte[] body = msgBody.getBytes();
- //Message testMsg = new Message(body, testProps);
-
- SimpleMessageConverter converter = new SimpleMessageConverter();
- Message testMsg = converter.toMessage(msgBody, testProps);
-
- template.send(exchangeName , routingKey, testMsg);
- log.info("Message sent!");
- }*/
-
}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/listener/TblFailureInformationListener.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/listener/TblFailureInformationListener.java
new file mode 100644
index 0000000..d6cf54e
--- /dev/null
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/listener/TblFailureInformationListener.java
@@ -0,0 +1,20 @@
+package org.eclipse.openk.gridfailureinformation.listener;
+
+import org.eclipse.openk.gridfailureinformation.model.TblFailureInformation;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.PrePersist;
+import javax.persistence.PreUpdate;
+import java.util.Optional;
+
+@Component
+public class TblFailureInformationListener {
+
+ @PreUpdate
+ @PrePersist
+ public void failureInformationPreUpdate(TblFailureInformation failureInformation ) {
+ failureInformation.setVersionNumber(
+ Optional.ofNullable(failureInformation.getVersionNumber()).orElse(0L)
+ + 1);
+ }
+}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/messagebroker/MessageConsumer.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/messagebroker/MessageConsumer.java
index 9b31c49..74919cc 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/messagebroker/MessageConsumer.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/messagebroker/MessageConsumer.java
@@ -34,9 +34,7 @@
importDataDto.setDescription((String) message.getMessageProperties().getHeaders().get("description"));
importDataDto.setSource((String) message.getMessageProperties().getHeaders().get("source"));
- ImportDataDto importDataDtoToSearch = new ImportDataDto();
-
- importDataDtoToSearch = importDataService.getImportDataByMetaId(importDataDto.getMetaId());
+ ImportDataDto importDataDtoToSearch = importDataService.getImportDataByMetaId(importDataDto.getMetaId());
if( importDataDtoToSearch == null ) {
importDataService.insertImportData(importDataDto);
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/model/TblFailureInformation.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/model/TblFailureInformation.java
index 0de85d8..d42d324 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/model/TblFailureInformation.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/model/TblFailureInformation.java
@@ -15,6 +15,7 @@
package org.eclipse.openk.gridfailureinformation.model;
import lombok.Data;
+import org.eclipse.openk.gridfailureinformation.listener.TblFailureInformationListener;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
@@ -28,7 +29,10 @@
@Data
@Entity
-@EntityListeners(AuditingEntityListener.class)
+@EntityListeners({
+ AuditingEntityListener.class,
+ TblFailureInformationListener.class
+ })
public class TblFailureInformation {
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "tbl_failure_information_id_seq")
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/repository/StatusRepository.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/repository/StatusRepository.java
index 4720ff5..0875914 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/repository/StatusRepository.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/repository/StatusRepository.java
@@ -29,4 +29,6 @@
List<RefStatus> findAll();
Optional<RefStatus> findByUuid(UUID uuid);
+
+ Optional<RefStatus> findById( Long id );
}
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java
index bcb5dd7..a318fb8 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java
@@ -15,8 +15,16 @@
package org.eclipse.openk.gridfailureinformation.service;
+import lombok.extern.log4j.Log4j2;
+import org.eclipse.openk.gridfailureinformation.bpmn.base.ProcessException;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiGrid;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiProcessState;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiProcessSubject;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.tasks.ProcessHelper;
+import org.eclipse.openk.gridfailureinformation.exceptions.InternalServerErrorException;
import org.eclipse.openk.gridfailureinformation.exceptions.NotFoundException;
import org.eclipse.openk.gridfailureinformation.mapper.FailureInformationMapper;
+import org.eclipse.openk.gridfailureinformation.model.RefStatus;
import org.eclipse.openk.gridfailureinformation.model.TblFailureInformation;
import org.eclipse.openk.gridfailureinformation.repository.*;
import org.eclipse.openk.gridfailureinformation.viewmodel.FailureInformationDto;
@@ -28,7 +36,7 @@
import java.util.UUID;
-
+@Log4j2
@Service
public class FailureInformationService {
@@ -60,6 +68,12 @@
@Autowired
private StatusRepository statusRepository;
+ @Autowired
+ private GfiGrid grid;
+
+ @Autowired
+ private ProcessHelper processHelper;
+
public FailureInformationDto findFailureInformation( UUID uuid ) {
return failureInformationMapper.toFailureInformationDto(
failureInformationRepository.findByUuid( uuid )
@@ -70,32 +84,60 @@
return failureInformationRepository.findAll(pageable).map(failureInformationMapper::toFailureInformationDto);
}
- public FailureInformationDto insertFailureInfo(FailureInformationDto failureInfoDto){
- TblFailureInformation tblFailureInformationToSave = failureInformationMapper.toTblFailureInformation(failureInfoDto);
- tblFailureInformationToSave.setUuid(UUID.randomUUID());
- tblFailureInformationToSave.setVersionNumber(1L);
-
- setFromGridFailureInformationDto(tblFailureInformationToSave, failureInfoDto);
- return failureInformationMapper.toFailureInformationDto(failureInformationRepository.save(tblFailureInformationToSave));
+ @Transactional
+ public FailureInformationDto insertFailureInfo(FailureInformationDto failureInfoDto) {
+ failureInfoDto.setUuid(null); // force null here
+ return processGrid(
+ storeFailureInfo(failureInfoDto)
+ );
}
@Transactional
public FailureInformationDto updateFailureInfo(FailureInformationDto failureInfoDto) {
- TblFailureInformation tblFailureInformation = failureInformationRepository.findByUuid(failureInfoDto.getUuid())
- .orElseThrow(() -> new NotFoundException("failure.info.uuid.not.existing"));
+ return processGrid(failureInfoDto);
+ }
- TblFailureInformation tblFailureInformationToSave = failureInformationMapper.toTblFailureInformation(failureInfoDto);
- tblFailureInformationToSave.setId(tblFailureInformation.getId());
+ @Transactional
+ public FailureInformationDto storeFailureInfo(FailureInformationDto dto) {
+ TblFailureInformation tblFailureInformationToSave = failureInformationMapper.toTblFailureInformation(dto);
+ if(dto.getUuid() == null ) {
+ tblFailureInformationToSave.setUuid(UUID.randomUUID());
+ tblFailureInformationToSave.setVersionNumber(1L);
+ setFromGridFailureInformationDto(tblFailureInformationToSave, dto);
+ RefStatus statusNew = statusRepository.findById(Long.valueOf(GfiProcessState.NEW.getStatusValue()))
+ .orElseThrow(() -> new NotFoundException("ref.status.not.found"));
+ tblFailureInformationToSave.setRefStatusIntern(statusNew);
+ tblFailureInformationToSave.setRefStatusExtern(statusNew);
+ }
+ else {
+ TblFailureInformation tblFailureInformation = failureInformationRepository.findByUuid(dto.getUuid())
+ .orElseThrow(() -> new NotFoundException("failure.info.uuid.not.existing"));
- setFromGridFailureInformationDto(tblFailureInformationToSave, failureInfoDto);
+ tblFailureInformationToSave = failureInformationMapper.toTblFailureInformation(dto);
+ tblFailureInformationToSave.setId(tblFailureInformation.getId());
- // Holen der nächsten Versionsnummer mit Hilfe der History-Tabelle
- Long countVersions = histFailureInformationRepository.countByUuid(failureInfoDto.getUuid());
- tblFailureInformationToSave.setVersionNumber(countVersions + 1);
+ setFromGridFailureInformationDto(tblFailureInformationToSave, dto);
+ }
+ return failureInformationMapper.toFailureInformationDto(failureInformationRepository.save(tblFailureInformationToSave));
- TblFailureInformation savedFailureInformation = failureInformationRepository.save(tblFailureInformationToSave);
- return failureInformationMapper.toFailureInformationDto(savedFailureInformation);
+ }
+
+ private FailureInformationDto processGrid(FailureInformationDto failureInfoDto) {
+ RefStatus refStatus = statusRepository.findByUuid(failureInfoDto.getStatusInternId())
+ .orElseThrow( () -> new InternalServerErrorException("status.not.found.or.null"));
+
+ GfiProcessSubject subject = GfiProcessSubject.of(failureInfoDto, processHelper );
+ subject.setStateInDb(GfiProcessState.fromValue(refStatus.getId())); // TODO: Get Status direct from DB
+
+ try {
+ grid.recover( subject ).start( () -> subject.getStateInDb() );
+ } catch (ProcessException e) {
+ log.error( e.getMessage() + " -> \r\n" + e.getStackTrace());
+ throw new InternalServerErrorException(e.getMessage());
+ }
+
+ return subject.getFailureInformationDto();
}
private void setFromGridFailureInformationDto( TblFailureInformation destTblFailureInformation, FailureInformationDto sourceDto ) {
diff --git a/gfsBackendService/src/main/resources/application.yml b/gfsBackendService/src/main/resources/application.yml
index 3b77950..b09ac32 100644
--- a/gfsBackendService/src/main/resources/application.yml
+++ b/gfsBackendService/src/main/resources/application.yml
@@ -55,6 +55,11 @@
cors:
corsEnabled: false
+process:
+ definitions:
+ classification:
+ plannedMeasureDbid: 3
+
email:
sender: sender@olaf.senderson
smtpHost: entdockergss
diff --git a/gfsBackendService/src/main/resources/application_localdev.yml b/gfsBackendService/src/main/resources/application_localdev.yml
index c5eeb4c..7cb9249 100644
--- a/gfsBackendService/src/main/resources/application_localdev.yml
+++ b/gfsBackendService/src/main/resources/application_localdev.yml
@@ -53,6 +53,10 @@
cors:
corsEnabled: true
+process:
+ definitions:
+ classification:
+ plannedMeasureDbid: 3
email:
sender: sender@olaf.senderson
smtpHost: entdockergss
diff --git a/gfsBackendService/src/main/resources/db/migration/V0_x__CREATE_GFI_DB.sql b/gfsBackendService/src/main/resources/db/migration/V0_x__CREATE_GFI_DB.sql
new file mode 100644
index 0000000..fe8eb45
--- /dev/null
+++ b/gfsBackendService/src/main/resources/db/migration/V0_x__CREATE_GFI_DB.sql
@@ -0,0 +1,494 @@
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2019 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
+-- CREATE ROLE GFI_SERVICE LOGIN
+-- NOSUPERUSER INHERIT NOCREATEDB NOCREATEROLE NOREPLICATION;
+-- ALTER ROLE GFI_SERVICE with password 'gfi_service';
+
+DROP TABLE IF EXISTS public.VERSION CASCADE;
+DROP TABLE IF EXISTS public.TBL_FAILURE_INFORMATION CASCADE;
+DROP SEQUENCE IF EXISTS public.TBL_FAILURE_INFORMATION_ID_SEQ;
+
+DROP TABLE IF EXISTS public.REF_STATUS CASCADE;
+DROP SEQUENCE IF EXISTS public.REF_STATUS_ID_SEQ;
+
+DROP TABLE IF EXISTS public.REF_BRANCH CASCADE;
+DROP SEQUENCE IF EXISTS public.REF_BRANCH_ID_SEQ;
+
+DROP TABLE IF EXISTS public.REF_FAILURE_CLASSIFICATION CASCADE;
+DROP SEQUENCE IF EXISTS public.REF_FAILURE_CLASSIFICATION_ID_SEQ;
+
+DROP TABLE IF EXISTS public.REF_FAILURE_TYPE CASCADE;
+DROP SEQUENCE IF EXISTS public.REF_FAILURE_TYPE_ID_SEQ;
+
+DROP TABLE IF EXISTS public.TBL_IMPORT_DATA CASCADE;
+DROP SEQUENCE IF EXISTS public.TBL_IMPORT_DATA_ID_SEQ;
+
+-- ---------------------------------------------
+-- TABLE VERSION
+-- ---------------------------------------------
+CREATE TABLE public.VERSION
+(
+ ID integer NOT NULL,
+ VERSION character varying(50) NOT NULL,
+ CONSTRAINT REF_VERSION_PKEY PRIMARY KEY (id)
+);
+
+ALTER TABLE public.VERSION
+ OWNER TO GFI_SERVICE;
+GRANT ALL ON TABLE public.VERSION TO GFI_SERVICE;
+
+INSERT INTO public.VERSION (ID, VERSION) VALUES ( 1, '00-DEV' );
+
+-- ---------------------------------------------
+-- TABLE REF_STATUS
+-- ---------------------------------------------
+CREATE SEQUENCE public.ref_status_id_seq
+ INCREMENT 1
+ MINVALUE 1
+ MAXVALUE 9223372036854775807
+ START 1
+ CACHE 1;
+ALTER TABLE public.ref_status_id_seq
+ OWNER TO GFI_SERVICE;
+
+CREATE TABLE public.REF_STATUS
+(
+ ID integer NOT NULL DEFAULT nextval('REF_STATUS_ID_SEQ'::regclass),
+ UUID uuid NOT NULL,
+ STATUS character varying(50) NOT NULL,
+ IS_INTERNAL boolean NOT NULL,
+ IS_EXTERNAL boolean NOT NULL,
+ CONSTRAINT REF_STATUS_PKEY PRIMARY KEY (id)
+);
+
+ALTER TABLE public.REF_STATUS
+ OWNER TO GFI_SERVICE;
+GRANT ALL ON TABLE public.REF_STATUS TO GFI_SERVICE;
+
+INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( '95ad4d13-594f-4e15-a48f-ba52ca72dc98', 'neu', TRUE, TRUE );
+INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( 'acabc8f6-2cf3-485a-a4f8-68d178c7df45', 'angelegt', TRUE, TRUE );
+INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( 'a6cda99d-9f41-4637-9d9b-04f95ea352ec', 'geplant', TRUE, TRUE );
+INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( '75cb31b1-8918-4fc7-884b-54e7f95f0572', 'angelegt, geplant', TRUE, TRUE );
+INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( '23fc0254-cc3d-4371-97ad-54ef733008ae', 'qualifiziert', TRUE, TRUE );
+INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( '9374219a-7419-4b72-899d-cd0576d85cdb', 'storniert', TRUE, TRUE );
+INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( '7e1039e9-52d2-415d-ba77-896707ef6055', 'qualifiziert, veröffentlicht', TRUE, TRUE );
+INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( '3cc963c8-0eea-45ff-90ef-154e59d05d97', 'Veröffentlichung zurückgezogen', TRUE, TRUE );
+INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( '8c0f9e9b-7fa7-4acc-81eb-2e6997493ae4', 'aktualisiert', TRUE, TRUE );
+INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( '32ef19c5-d95b-403c-b4f4-b7963b9ccb49', 'qualifiziert, aktualisiert', TRUE, TRUE );
+INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( '6ae63f63-8fe9-4a41-be4e-43a0480e4d7b', 'abgeschlossen', TRUE, TRUE );
+
+
+-- ---------------------------------------------
+-- TABLE REF_FAILURE_CLASSIFICATION
+-- ---------------------------------------------
+CREATE SEQUENCE public.ref_failure_classification_id_seq
+ INCREMENT 1
+ MINVALUE 1
+ MAXVALUE 9223372036854775807
+ START 1
+ CACHE 1;
+ALTER TABLE public.ref_failure_classification_id_seq
+ OWNER TO GFI_SERVICE;
+
+CREATE TABLE public.REF_FAILURE_CLASSIFICATION
+(
+ ID integer NOT NULL DEFAULT nextval('REF_FAILURE_CLASSIFICATION_ID_SEQ'::regclass),
+ UUID uuid NOT NULL,
+ CLASSIFICATION character varying(50) NOT NULL,
+ DESCRIPTION character varying(255) NULL,
+ CONSTRAINT REF_FAILURE_CLASSIFICATION_PKEY PRIMARY KEY (id)
+);
+
+ALTER TABLE public.REF_FAILURE_CLASSIFICATION
+ OWNER TO GFI_SERVICE;
+GRANT ALL ON TABLE public.REF_FAILURE_CLASSIFICATION TO GFI_SERVICE;
+
+INSERT INTO public.REF_FAILURE_CLASSIFICATION (UUID, CLASSIFICATION, DESCRIPTION) VALUES ( '9255fb79-c57a-4448-a69c-5d57994f0c91', 'Störung', NULL );
+INSERT INTO public.REF_FAILURE_CLASSIFICATION (UUID, CLASSIFICATION, DESCRIPTION) VALUES ( '8db5a71b-9676-45ca-ae1d-161c6a2dc305', 'Ereignis', NULL );
+INSERT INTO public.REF_FAILURE_CLASSIFICATION (UUID, CLASSIFICATION, DESCRIPTION) VALUES ( '8ec1e144-5230-4d43-a3df-f62dd64bb855', 'geplante Maßnahme', NULL );
+
+
+-- ---------------------------------------------
+-- TABLE REF_FAILURE_TYPE
+-- ---------------------------------------------
+CREATE SEQUENCE public.ref_failure_type_id_seq
+ INCREMENT 1
+ MINVALUE 1
+ MAXVALUE 9223372036854775807
+ START 1
+ CACHE 1;
+ALTER TABLE public.ref_failure_type_id_seq
+ OWNER TO GFI_SERVICE;
+
+CREATE TABLE public.REF_FAILURE_TYPE
+(
+ ID integer NOT NULL DEFAULT nextval('REF_FAILURE_TYPE_ID_SEQ'::regclass),
+ UUID uuid NOT NULL,
+ TYPE character varying(50) NOT NULL,
+ DESCRIPTION character varying(255) NULL,
+ CONSTRAINT REF_FAILURE_TYPE_PKEY PRIMARY KEY (id)
+);
+
+ALTER TABLE public.REF_FAILURE_TYPE
+ OWNER TO GFI_SERVICE;
+GRANT ALL ON TABLE public.REF_FAILURE_TYPE TO GFI_SERVICE;
+
+
+INSERT INTO public.REF_FAILURE_TYPE (UUID, TYPE, DESCRIPTION) VALUES ( '44a2aaed-8910-4116-b0c4-0855f8d3c28d', 'Information', NULL );
+INSERT INTO public.REF_FAILURE_TYPE (UUID, TYPE, DESCRIPTION) VALUES ( '94e880c4-3127-47d5-aaee-5f778462ab0c', 'zu veröffentliche Meldung', 'Standardwert' );
+INSERT INTO public.REF_FAILURE_TYPE (UUID, TYPE, DESCRIPTION) VALUES ( '658245bd-bdc4-47dd-bc90-0336f9471410', 'unterlagerte Störung', 'Nicht zu veröffentlichen' );
+
+-- ---------------------------------------------
+-- TABLE REF_BRANCH
+-- ---------------------------------------------
+CREATE SEQUENCE public.ref_branch_id_seq
+ INCREMENT 1
+ MINVALUE 1
+ MAXVALUE 9223372036854775807
+ START 1
+ CACHE 1;
+ALTER TABLE public.ref_branch_id_seq
+ OWNER TO GFI_SERVICE;
+
+CREATE TABLE public.REF_BRANCH
+(
+ ID integer NOT NULL DEFAULT nextval('REF_BRANCH_ID_SEQ'::regclass),
+ UUID uuid NOT NULL,
+ NAME character varying(50) NOT NULL,
+ DESCRIPTION character varying(255),
+ COLOR_CODE character varying(20),
+ CONSTRAINT REF_BRANCH_PKEY PRIMARY KEY (id)
+);
+
+ALTER TABLE public.REF_BRANCH
+ OWNER TO GFI_SERVICE;
+GRANT ALL ON TABLE public.REF_BRANCH TO GFI_SERVICE;
+
+INSERT INTO public.ref_branch(uuid, name, description, color_code) VALUES ('535b4beb-9b17-4247-bb8b-26bd01b48f9a', 'S', 'Strom', '#fc6042');
+INSERT INTO public.ref_branch(uuid, name, description, color_code) VALUES ('d41f54e5-c4df-440e-b334-40e8f3a6854a', 'G', 'Gas', '#fdea64');
+INSERT INTO public.ref_branch(uuid, name, description, color_code) VALUES ('62c6d361-96a0-41cc-bda1-4e58ad16f21a', 'F', 'Fernwärme', '#2cc990');
+INSERT INTO public.ref_branch(uuid, name, description, color_code) VALUES ('d8d93e0e-5c8c-4ab8-9625-f820de55ee7c', 'W', 'Wasser', '#2c82c9');
+
+
+-- ---------------------------------------------
+-- TABLE TBL_FAILURE_INFORMATION
+-- ---------------------------------------------
+CREATE SEQUENCE public.tbl_failure_information_id_seq
+ INCREMENT 1
+ MINVALUE 1
+ MAXVALUE 9223372036854775807
+ START 1
+ CACHE 1;
+ALTER TABLE public.tbl_failure_information_id_seq
+ OWNER TO GFI_SERVICE;
+
+CREATE TABLE public.TBL_FAILURE_INFORMATION
+(
+ ID integer NOT NULL DEFAULT nextval('TBL_FAILURE_INFORMATION_ID_SEQ'::regclass),
+ UUID uuid NOT NULL,
+ VERSION_NUMBER integer NOT NULL,
+ FK_REF_FAILURE_CLASSIFICATION integer,
+ FK_REF_FAILURE_TYPE integer,
+ TITLE character varying(255) NULL,
+ DESCRIPTION character varying(255) NULL,
+ RESPONSIBILITY character varying(255),
+ INTERN_EXTERN character varying(1),
+ FK_REF_STATUS_INTERN integer NOT NULL,
+ FK_REF_STATUS_EXTERN integer NOT NULL,
+ FK_REF_BRANCH integer NOT NULL,
+ VOLTAGE_LEVEL character varying(2),
+ PRESSURE_LEVEL character varying(2),
+ FAILURE_BEGIN timestamp NOT NULL,
+ FAILURE_END_PLANNED timestamp,
+ FAILURE_END_RESUPPLIED timestamp,
+ PROBABLE_REASON character varying(1024),
+ INTERNAL_REMARK character varying(1024),
+ POSTCODE character varying(30),
+ CITY character varying(255),
+ DISTRICT character varying(255),
+ STREET character varying(255),
+ HOUSENUMBER character varying(30),
+ STATION_DESCRIPTION character varying(255),
+ STATION_COORDS character varying(255),
+ RADIUS character varying(100),
+ LONGITUDE numeric(9,6),
+ LATITUDE numeric(9,6),
+ CREATE_DATE timestamp without time zone NOT NULL,
+ CREATE_USER character varying(100) NOT NULL,
+ MOD_DATE timestamp without time zone NOT NULL,
+ MOD_USER character varying(100),
+ CONSTRAINT TBL_FAILURE_INFORMATION_PKEY PRIMARY KEY (id)
+);
+
+ALTER TABLE public.TBL_FAILURE_INFORMATION
+ OWNER TO GFI_SERVICE;
+GRANT ALL ON TABLE public.TBL_FAILURE_INFORMATION TO GFI_SERVICE;
+
+INSERT INTO public.tbl_failure_information(UUID, VERSION_NUMBER, FK_REF_FAILURE_CLASSIFICATION, FK_REF_FAILURE_TYPE, TITLE, DESCRIPTION, RESPONSIBILITY, INTERN_EXTERN, FK_REF_STATUS_INTERN, FK_REF_STATUS_EXTERN, FK_REF_BRANCH, VOLTAGE_LEVEL, PRESSURE_LEVEL, FAILURE_BEGIN, FAILURE_END_PLANNED, FAILURE_END_RESUPPLIED, PROBABLE_REASON, INTERNAL_REMARK, POSTCODE, CITY, DISTRICT, STREET, HOUSENUMBER, STATION_DESCRIPTION, STATION_COORDS, RADIUS, LONGITUDE, LATITUDE, CREATE_DATE, CREATE_USER, MOD_DATE, MOD_USER)
+VALUES ('6432a9c9-0384-44af-9bb8-34f2878d7b49',1, 1, 1, 'Stromausfall Murr', 'Es gibt einen Stromausfall im Bereich Murr/Westbezirk', 'Rolf Rudis', 'I', 1, 1, 1, 'NS', null, '2021-01-19 00:00:00', '2021-01-22 00:00:00', '2021-01-22 12:00:00', 'Stromausfall durch Bagger', 'Der Bagger grub zu tief', '71711', 'Murr', 'Westbezirk', 'Ferdinand-Porsche-Straße', '2', 'Trafo 1', '124,2323', '2km', 9.247952, 48.955700, '2020-01-22 15:32:15', 'schmidth', '2020-01-24 08:02:44', 'meyers');
+
+INSERT INTO public.tbl_failure_information(UUID, VERSION_NUMBER, FK_REF_FAILURE_CLASSIFICATION, FK_REF_FAILURE_TYPE, TITLE, DESCRIPTION, RESPONSIBILITY, INTERN_EXTERN, FK_REF_STATUS_INTERN, FK_REF_STATUS_EXTERN, FK_REF_BRANCH, VOLTAGE_LEVEL, PRESSURE_LEVEL, FAILURE_BEGIN, FAILURE_END_PLANNED, FAILURE_END_RESUPPLIED, PROBABLE_REASON, INTERNAL_REMARK, POSTCODE, CITY, DISTRICT, STREET, HOUSENUMBER, STATION_DESCRIPTION, STATION_COORDS, RADIUS, LONGITUDE, LATITUDE, CREATE_DATE, CREATE_USER, MOD_DATE, MOD_USER)
+VALUES ('37aef635-d0d4-4c47-ac25-c0d16c29e35c', 1,3, 2, 'Gasleck Oldenburg', 'Es gibt ein Gasleck in Oldenburg', 'Bernd Britzel', 'E', 2, 2, 3, null, 'HD', '2021-05-19 00:00:00', '2021-05-22 00:00:00', '2021-05-22 12:00:00', 'Leck in Gasleitung', 'HD betroffen', '26133', 'Oldenburg', null, 'Cloppenburger Str.', '302', 'ertf', '124,2323', '6km', 8.210150, 53.111820, '2020-02-03 15:15:15', 'schulzek', '2020-02-24 20:08:41', 'muellert');
+
+-- ---------------------------------------------
+-- TABLE TBL_IMPORT_DATA
+-- ---------------------------------------------
+CREATE SEQUENCE public.tbl_import_data_id_seq
+ INCREMENT 1
+ MINVALUE 1
+ MAXVALUE 9223372036854775807
+ START 1
+ CACHE 1;
+ALTER TABLE public.tbl_import_data_id_seq
+ OWNER TO GFI_SERVICE;
+
+CREATE TABLE public.TBL_IMPORT_DATA
+(
+ ID integer NOT NULL DEFAULT nextval('TBL_IMPORT_DATA_ID_SEQ'::regclass),
+ UUID uuid NOT NULL,
+ META_ID character varying(255) NOT NULL,
+ DESCRIPTION character varying(255) NULL,
+ SOURCE character varying(255) NULL,
+ MESSAGE_CONTENT character varying(1024) NOT NULL,
+ CONSTRAINT TBL_IMPORT_DATA_PKEY PRIMARY KEY (id)
+);
+
+ALTER TABLE public.TBL_IMPORT_DATA
+ OWNER TO GFI_SERVICE;
+GRANT ALL ON TABLE public.TBL_IMPORT_DATA TO GFI_SERVICE;
+
+INSERT INTO public.tbl_import_data(uuid, meta_id, description, source, message_content)
+VALUES ('355b4beb-9b17-4247-bb8b-36bd01b48f9a', 'StoeDE_10.03.2020 10:31:000 XYZ', 'Gasleck im Haus', 'Stoerungen.de', '{ "Quelle": "Stoerungen.de", "Eigenschaften": {"Branch": "Gas", "Ort": "Worms", "Datum": "2020-03-10T10:31.000Z"}}');
+INSERT INTO public.tbl_import_data(uuid, meta_id, description, source, message_content)
+VALUES ('d61f54e5-c4df-440e-b334-22e8f3a6854a', 'StoeDE_10.03.2020 10:31:000 XYZ', 'Gasleck im Haus', 'Stoerungen.de', '{ "Quelle": "Stoerungen.de", "Eigenschaften": {"Branch": "Gas", "Ort": "Worms", "Datum": "2020-03-10T10:31.000Z"}}');
+INSERT INTO public.tbl_import_data(uuid, meta_id, description, source, message_content)
+VALUES ('26c6d361-96a0-41cc-bda1-4e85ad16f21a', 'email_10.03.2020 23:45:000 ABC', 'Stromausfall im Haus', 'email', '{ "Quelle": "email", "Eigenschaften": {"Branch": "Strom", "Ort": "Kassel", "Datum": "2020-06-11T23:45.000Z"}}');
+INSERT INTO public.tbl_import_data(uuid, meta_id, description, source, message_content)
+VALUES ('d7d93e0e-5c8c-4ab8-9625-f910de55ee7c', 'Intern_04.09.2020 13:12:110 BLA', 'Wasserrohrbruch in der Straße', 'Intern', '{ "Quelle": "Intern", "Eigenschaften": {"Branch": "Wasser", "Ort": "Kassel", "Datum": "2020-09-04T13:12.110Z"}}');
+
+
+-- ----------------------------------------------------------------------------
+-- ----------------------------------------------------------------------------
+-- HISTORY-TABLES
+-- ----------------------------------------------------------------------------
+-- ----------------------------------------------------------------------------
+
+
+-- PUBLIC.HTBL_FAILURE_INFORMATION Automatic generanted History Table DDL --
+-- <GENERATED CODE!>
+
+DROP TABLE IF EXISTS PUBLIC.HTBL_FAILURE_INFORMATION;
+DROP SEQUENCE IF EXISTS PUBLIC.HTBL_FAILURE_INFORMATION_ID_SEQ;
+
+CREATE SEQUENCE PUBLIC.HTBL_FAILURE_INFORMATION_ID_SEQ
+ INCREMENT 1
+ MINVALUE 1
+ MAXVALUE 9223372036854775807
+ START 1
+ CACHE 1;
+
+ALTER TABLE PUBLIC.HTBL_FAILURE_INFORMATION_ID_SEQ
+ OWNER TO gfi_service;
+
+CREATE TABLE PUBLIC.HTBL_FAILURE_INFORMATION
+(
+ HID integer NOT NULL DEFAULT nextval('HTBL_FAILURE_INFORMATION_ID_SEQ'::regclass),
+ HACTION integer NOT NULL,
+ HDATE timestamp without time zone NOT NULL,
+ HUSER character varying(100),
+
+ ID integer,
+ UUID uuid,
+ VERSION_NUMBER integer,
+ FK_REF_FAILURE_CLASSIFICATION integer,
+ FK_REF_FAILURE_TYPE integer,
+ TITLE character varying(255) NULL,
+ DESCRIPTION character varying(255) NULL,
+ RESPONSIBILITY character varying (255),
+ INTERN_EXTERN character varying (1),
+ FK_REF_STATUS_INTERN integer,
+ FK_REF_STATUS_EXTERN integer,
+ FK_REF_BRANCH integer,
+ VOLTAGE_LEVEL character varying (2),
+ PRESSURE_LEVEL character varying (2),
+ FAILURE_BEGIN timestamp without time zone,
+ FAILURE_END_PLANNED timestamp without time zone,
+ FAILURE_END_RESUPPLIED timestamp without time zone,
+ PROBABLE_REASON character varying (1024),
+ INTERNAL_REMARK character varying (1024),
+ POSTCODE character varying (30),
+ CITY character varying (255),
+ DISTRICT character varying (255),
+ STREET character varying (255),
+ HOUSENUMBER character varying (30),
+ STATION_DESCRIPTION character varying (255),
+ STATION_COORDS character varying (255),
+ RADIUS character varying (100),
+ LONGITUDE numeric(9,6),
+ LATITUDE numeric(9,6),
+ CREATE_USER character varying(100),
+ CREATE_DATE timestamp without time zone,
+ MOD_USER character varying(100),
+ MOD_DATE timestamp without time zone,
+ CONSTRAINT HTBL_FAILURE_INFORMATION_PKEY PRIMARY KEY (HID)
+)
+WITH (
+ OIDS=FALSE
+);
+
+ALTER TABLE PUBLIC.HTBL_FAILURE_INFORMATION
+ OWNER TO gfi_service;
+GRANT ALL ON TABLE PUBLIC.HTBL_FAILURE_INFORMATION TO gfi_service;
+
+INSERT INTO public.htbl_failure_information(HACTION, HDATE, HUSER, ID, UUID, VERSION_NUMBER, FK_REF_FAILURE_CLASSIFICATION, FK_REF_FAILURE_TYPE, TITLE, DESCRIPTION, RESPONSIBILITY, INTERN_EXTERN, FK_REF_STATUS_INTERN, FK_REF_STATUS_EXTERN, FK_REF_BRANCH, VOLTAGE_LEVEL, PRESSURE_LEVEL, FAILURE_BEGIN, FAILURE_END_PLANNED, FAILURE_END_RESUPPLIED, PROBABLE_REASON, INTERNAL_REMARK, POSTCODE, CITY, DISTRICT, STREET, HOUSENUMBER, STATION_DESCRIPTION, STATION_COORDS, RADIUS, LONGITUDE, LATITUDE, CREATE_DATE, CREATE_USER, MOD_DATE, MOD_USER)
+VALUES (1, '2020-03-13 00:00:00', 'SCRIPT', 1, '6432a9c9-0384-44af-9bb8-34f2878d7b49', 1, 1, 1, 'Stromausfall Murr', 'Es gibt einen Stromausfall im Bereich Murr/Westbezirk', 'Rolf Rudis', 'I', 1, 1, 1, 'NS', null, '2021-01-19 00:00:00', '2021-01-22 00:00:00', '2021-01-22 12:00:00', 'Stromausfall durch Bagger', 'Der Bagger grub zu tief', '71711', 'Murr', 'Westbezirk', 'Ferdinand-Porsche-Straße', '2', 'Trafo 1', '124,2323', '2km', 9.247952, 48.955700, '2020-01-22 15:32:15', 'schmidth', '2020-01-24 08:02:44', 'meyers');
+
+INSERT INTO public.htbl_failure_information(HACTION, HDATE, HUSER, ID, UUID, VERSION_NUMBER, FK_REF_FAILURE_CLASSIFICATION, FK_REF_FAILURE_TYPE, TITLE, DESCRIPTION, RESPONSIBILITY, INTERN_EXTERN, FK_REF_STATUS_INTERN, FK_REF_STATUS_EXTERN, FK_REF_BRANCH, VOLTAGE_LEVEL, PRESSURE_LEVEL, FAILURE_BEGIN, FAILURE_END_PLANNED, FAILURE_END_RESUPPLIED, PROBABLE_REASON, INTERNAL_REMARK, POSTCODE, CITY, DISTRICT, STREET, HOUSENUMBER, STATION_DESCRIPTION, STATION_COORDS, RADIUS, LONGITUDE, LATITUDE, CREATE_DATE, CREATE_USER, MOD_DATE, MOD_USER)
+VALUES (2, '2020-03-13 00:00:00', 'SCRIPT', 1, '6432a9c9-0384-44af-9bb8-34f2878d7b49', 2, 1, 1, 'Stromausfall Murr', 'Es gibt einen Stromausfall im Bereich Murr/Westbezirk', 'Rolf Rudis', 'I', 1, 1, 1, 'NS', null, '2021-01-19 00:00:00', '2021-01-22 00:00:00', '2021-01-22 12:00:00', 'Stromausfall durch Bagger', 'Der Bagger grub tiefer', '71711', 'Murr', 'Westbezirk', 'Ferdinand-Porsche-Straße', '2', 'Trafo 1', '124,2323', '2km', 9.247952, 48.955700, '2020-01-22 15:32:15', 'schmidth', '2020-01-24 08:02:44', 'meyers');
+
+INSERT INTO public.htbl_failure_information(HACTION, HDATE, HUSER, ID, UUID, VERSION_NUMBER, FK_REF_FAILURE_CLASSIFICATION, FK_REF_FAILURE_TYPE, TITLE, DESCRIPTION, RESPONSIBILITY, INTERN_EXTERN, FK_REF_STATUS_INTERN, FK_REF_STATUS_EXTERN, FK_REF_BRANCH, VOLTAGE_LEVEL, PRESSURE_LEVEL, FAILURE_BEGIN, FAILURE_END_PLANNED, FAILURE_END_RESUPPLIED, PROBABLE_REASON, INTERNAL_REMARK, POSTCODE, CITY, DISTRICT, STREET, HOUSENUMBER, STATION_DESCRIPTION, STATION_COORDS, RADIUS, LONGITUDE, LATITUDE, CREATE_DATE, CREATE_USER, MOD_DATE, MOD_USER)
+VALUES (1, '2020-03-13 00:00:00', 'SCRIPT', 1, '6432a9c9-0384-44af-9bb8-34f2878d7b49', 3, 1, 1, 'Stromausfall Murr', 'Es gibt einen Stromausfall im Bereich Murr/Westbezirk', 'Rolf Rudis', 'I', 1, 1, 1, 'NS', null, '2021-01-19 00:00:00', '2021-01-22 00:00:00', '2021-01-22 12:00:00', 'Stromausfall durch Bagger', 'Der Bagger grub noch tiefer', '71711', 'Murr', 'Westbezirk', 'Ferdinand-Porsche-Straße', '2', 'Trafo 1', '124,2323', '2km', 9.247952, 48.955700, '2020-01-22 15:32:15', 'schmidth', '2020-01-24 08:02:44', 'meyers');
+
+INSERT INTO public.htbl_failure_information(HACTION, HDATE, HUSER, ID, UUID, VERSION_NUMBER, FK_REF_FAILURE_CLASSIFICATION, FK_REF_FAILURE_TYPE, TITLE, DESCRIPTION, RESPONSIBILITY, INTERN_EXTERN, FK_REF_STATUS_INTERN, FK_REF_STATUS_EXTERN, FK_REF_BRANCH, VOLTAGE_LEVEL, PRESSURE_LEVEL, FAILURE_BEGIN, FAILURE_END_PLANNED, FAILURE_END_RESUPPLIED, PROBABLE_REASON, INTERNAL_REMARK, POSTCODE, CITY, DISTRICT, STREET, HOUSENUMBER, STATION_DESCRIPTION, STATION_COORDS, RADIUS, LONGITUDE, LATITUDE, CREATE_DATE, CREATE_USER, MOD_DATE, MOD_USER)
+VALUES (2, '2020-03-13 00:00:00', 'SCRIPT', 2, '37aef635-d0d4-4c47-ac25-c0d16c29e35c', 1,3, 2, 'Gasleck Oldenburg', 'Es gibt ein Gasleck in Oldenburg', 'Bernd Britzel', 'E', 2, 2, 3, null, 'HD', '2021-05-19 00:00:00', '2021-05-22 00:00:00', '2021-05-22 12:00:00', 'Leck in Gasleitung', 'HD betroffen', '26133', 'Oldenburg', null, 'Cloppenburger Str.', '302', 'ertf', '124,2323', '6km', 8.210150, 53.111820, '2020-02-03 15:15:15', 'schulzek', '2020-02-24 20:08:41', 'muellert');
+
+-- ----------------------------------------------------------------------------
+-- ----------------------------------------------------------------------------
+-- TRIGGER
+-- ----------------------------------------------------------------------------
+-- ----------------------------------------------------------------------------
+
+
+-- PUBLIC.TBL_FAILURE_INFORMATION INSERT TRIGGER --
+-- <GENERATED CODE!>
+CREATE OR REPLACE FUNCTION PUBLIC.TBL_FAILURE_INFORMATION_INSERT_TRG()
+ RETURNS trigger AS
+$BODY$
+ BEGIN
+ INSERT INTO HTBL_FAILURE_INFORMATION (
+ ID,UUID,VERSION_NUMBER,FK_REF_FAILURE_CLASSIFICATION,FK_REF_FAILURE_TYPE,TITLE, DESCRIPTION,RESPONSIBILITY,INTERN_EXTERN,FK_REF_STATUS_INTERN,FK_REF_STATUS_EXTERN,FK_REF_BRANCH,VOLTAGE_LEVEL,PRESSURE_LEVEL,FAILURE_BEGIN,FAILURE_END_PLANNED,FAILURE_END_RESUPPLIED,PROBABLE_REASON,INTERNAL_REMARK,POSTCODE,CITY,DISTRICT,STREET,HOUSENUMBER,STATION_DESCRIPTION,STATION_COORDS,RADIUS,LONGITUDE,LATITUDE,CREATE_DATE,CREATE_USER,MOD_DATE,MOD_USER,
+
+ HACTION,
+ HDATE,
+ HUSER
+ )
+ VALUES (
+
+ NEW.ID,NEW.UUID,NEW.VERSION_NUMBER,NEW.FK_REF_FAILURE_CLASSIFICATION,NEW.FK_REF_FAILURE_TYPE,NEW.TITLE,NEW.DESCRIPTION,NEW.RESPONSIBILITY,NEW.INTERN_EXTERN,NEW.FK_REF_STATUS_INTERN,NEW.FK_REF_STATUS_EXTERN,NEW.FK_REF_BRANCH,NEW.VOLTAGE_LEVEL,NEW.PRESSURE_LEVEL,NEW.FAILURE_BEGIN,NEW.FAILURE_END_PLANNED,NEW.FAILURE_END_RESUPPLIED,NEW.PROBABLE_REASON,NEW.INTERNAL_REMARK,NEW.POSTCODE,NEW.CITY,NEW.DISTRICT,NEW.STREET,NEW.HOUSENUMBER,NEW.STATION_DESCRIPTION,NEW.STATION_COORDS,NEW.RADIUS,NEW.LONGITUDE,NEW.LATITUDE,NEW.CREATE_DATE,NEW.CREATE_USER,NEW.MOD_DATE,NEW.MOD_USER,
+
+ 1,
+ current_timestamp,
+ NEW.CREATE_USER );
+
+ RETURN NEW;
+ END;
+$BODY$
+ LANGUAGE plpgsql VOLATILE
+ COST 100;
+ALTER FUNCTION PUBLIC.TBL_FAILURE_INFORMATION_INSERT_TRG()
+ OWNER TO gfi_service;
+
+
+DROP TRIGGER IF EXISTS TBL_FAILURE_INFORMATION_INSERT_TRG ON PUBLIC.TBL_FAILURE_INFORMATION;
+
+CREATE TRIGGER TBL_FAILURE_INFORMATION_INSERT_TRG
+ BEFORE INSERT
+ ON PUBLIC.TBL_FAILURE_INFORMATION
+ FOR EACH ROW
+ EXECUTE PROCEDURE PUBLIC.TBL_FAILURE_INFORMATION_INSERT_TRG();
+
+
+
+-- PUBLIC.TBL_FAILURE_INFORMATION UPDATE TRIGGER --
+-- <GENERATED CODE!>
+
+CREATE OR REPLACE FUNCTION PUBLIC.TBL_FAILURE_INFORMATION_UPDATE_TRG()
+ RETURNS trigger AS
+$BODY$
+ BEGIN
+ INSERT INTO HTBL_FAILURE_INFORMATION (
+ ID,UUID,VERSION_NUMBER,FK_REF_FAILURE_CLASSIFICATION,FK_REF_FAILURE_TYPE,RESPONSIBILITY,INTERN_EXTERN,FK_REF_STATUS_INTERN,FK_REF_STATUS_EXTERN,FK_REF_BRANCH,VOLTAGE_LEVEL,PRESSURE_LEVEL,FAILURE_BEGIN,FAILURE_END_PLANNED,FAILURE_END_RESUPPLIED,PROBABLE_REASON,INTERNAL_REMARK,POSTCODE,CITY,DISTRICT,STREET,HOUSENUMBER,STATION_DESCRIPTION,STATION_COORDS,RADIUS,LONGITUDE,LATITUDE,CREATE_DATE,CREATE_USER,MOD_DATE,MOD_USER,
+
+ HACTION,
+ HDATE,
+ HUSER
+ )
+ VALUES (
+ NEW.ID,NEW.UUID,NEW.VERSION_NUMBER,NEW.FK_REF_FAILURE_CLASSIFICATION,NEW.FK_REF_FAILURE_TYPE,NEW.RESPONSIBILITY,NEW.INTERN_EXTERN,NEW.FK_REF_STATUS_INTERN,NEW.FK_REF_STATUS_EXTERN,NEW.FK_REF_BRANCH,NEW.VOLTAGE_LEVEL,NEW.PRESSURE_LEVEL,NEW.FAILURE_BEGIN,NEW.FAILURE_END_PLANNED,NEW.FAILURE_END_RESUPPLIED,NEW.PROBABLE_REASON,NEW.INTERNAL_REMARK,NEW.POSTCODE,NEW.CITY,NEW.DISTRICT,NEW.STREET,NEW.HOUSENUMBER,NEW.STATION_DESCRIPTION,NEW.STATION_COORDS,NEW.RADIUS,NEW.LONGITUDE,NEW.LATITUDE,NEW.CREATE_DATE,NEW.CREATE_USER,NEW.MOD_DATE,NEW.MOD_USER,
+ 2,
+ current_timestamp,
+ NEW.MOD_USER
+ );
+
+ RETURN NEW;
+ END;
+$BODY$
+ LANGUAGE plpgsql VOLATILE
+ COST 100;
+ALTER FUNCTION PUBLIC.TBL_FAILURE_INFORMATION_UPDATE_TRG()
+ OWNER TO gfi_service;
+
+DROP TRIGGER IF EXISTS TBL_FAILURE_INFORMATION_UPDATE_TRG ON PUBLIC.TBL_FAILURE_INFORMATION;
+
+CREATE TRIGGER TBL_FAILURE_INFORMATION_UPDATE_TRG
+ BEFORE UPDATE
+ ON PUBLIC.TBL_FAILURE_INFORMATION
+ FOR EACH ROW
+ EXECUTE PROCEDURE PUBLIC.TBL_FAILURE_INFORMATION_UPDATE_TRG();
+
+
+
+-- PUBLIC.TBL_FAILURE_INFORMATION DELETE TRIGGER --
+-- <GENERATED CODE!>
+
+CREATE OR REPLACE FUNCTION PUBLIC.TBL_FAILURE_INFORMATION_DELETE_TRG()
+ RETURNS trigger AS
+$BODY$
+ BEGIN
+ IF TG_OP = 'DELETE' THEN
+ INSERT INTO HTBL_FAILURE_INFORMATION (
+
+ ID,UUID,VERSION_NUMBER,FK_REF_FAILURE_CLASSIFICATION,FK_REF_FAILURE_TYPE,RESPONSIBILITY,INTERN_EXTERN,FK_REF_STATUS_INTERN,FK_REF_STATUS_EXTERN,FK_REF_BRANCH,VOLTAGE_LEVEL,PRESSURE_LEVEL,FAILURE_BEGIN,FAILURE_END_PLANNED,FAILURE_END_RESUPPLIED,PROBABLE_REASON,INTERNAL_REMARK,POSTCODE,CITY,DISTRICT,STREET,HOUSENUMBER,STATION_DESCRIPTION,STATION_COORDS,RADIUS,LONGITUDE,LATITUDE,CREATE_DATE,CREATE_USER,MOD_DATE,MOD_USER,
+
+ HACTION,
+ HDATE,
+ HUSER
+ )
+ VALUES (
+ OLD.ID,OLD.UUID,OLD.VERSION_NUMBER,OLD.FK_REF_FAILURE_CLASSIFICATION,OLD.FK_REF_FAILURE_TYPE,OLD.RESPONSIBILITY,OLD.INTERN_EXTERN,OLD.FK_REF_STATUS_INTERN,OLD.FK_REF_STATUS_EXTERN,OLD.FK_REF_BRANCH,OLD.VOLTAGE_LEVEL,OLD.PRESSURE_LEVEL,OLD.FAILURE_BEGIN,OLD.FAILURE_END_PLANNED,OLD.FAILURE_END_RESUPPLIED,OLD.PROBABLE_REASON,OLD.INTERNAL_REMARK,OLD.POSTCODE,OLD.CITY,OLD.DISTRICT,OLD.STREET,OLD.HOUSENUMBER,OLD.STATION_DESCRIPTION,OLD.STATION_COORDS,OLD.RADIUS,OLD.LONGITUDE,OLD.LATITUDE,OLD.CREATE_DATE,OLD.CREATE_USER,OLD.MOD_DATE,OLD.MOD_USER,
+
+ 3,
+ current_timestamp,
+ OLD.MOD_USER );
+ END IF;
+
+ RETURN OLD;
+ END;
+$BODY$
+ LANGUAGE plpgsql VOLATILE
+ COST 100;
+ALTER FUNCTION PUBLIC.TBL_FAILURE_INFORMATION_DELETE_TRG()
+ OWNER TO gfi_service;
+
+DROP TRIGGER IF EXISTS TBL_FAILURE_INFORMATION_DELETE_TRG ON PUBLIC.TBL_FAILURE_INFORMATION;
+
+CREATE TRIGGER TBL_FAILURE_INFORMATION_DELETE_TRG
+ BEFORE DELETE
+ ON PUBLIC.TBL_FAILURE_INFORMATION
+ FOR EACH ROW
+ EXECUTE PROCEDURE PUBLIC.TBL_FAILURE_INFORMATION_DELETE_TRG();
+
+
+
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiGridTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiGridTest.java
index 0e28eda..5e2ac16 100644
--- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiGridTest.java
+++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiGridTest.java
@@ -41,7 +41,7 @@
// wegen intialer Testabdeckung
@Test
- public void testGfiGridConstr() {
+ public void testGfiGridConstr() throws ProcessException {
ProcessGrid grid = new GfiGrid();
assertNotNull(grid);
}
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessStateTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessStateTest.java
index 7195b9c..775e50c 100644
--- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessStateTest.java
+++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessStateTest.java
@@ -22,11 +22,18 @@
public class GfiProcessStateTest {
@Test
public void testAll() {
- assertEquals(GfiProcessState.NEW, GfiProcessState.fromValue(0) );
- assertEquals(GfiProcessState.APPLIED, GfiProcessState.fromValue(1) );
- assertEquals(GfiProcessState.CANCELED, GfiProcessState.fromValue(2) );
- assertEquals(GfiProcessState.UNDEFINED_, GfiProcessState.fromValue(-1) );
- assertEquals(GfiProcessState.UNDEFINED_.getStatusValue(), -1);
+ assertEquals(GfiProcessState.NEW , GfiProcessState.fromValue(1) );
+ assertEquals(GfiProcessState.CREATED, GfiProcessState.fromValue(2) );
+ assertEquals(GfiProcessState.PLANNED, GfiProcessState.fromValue(3) );
+ assertEquals(GfiProcessState.CREATED_PLANNED, GfiProcessState.fromValue(4) );
+ assertEquals(GfiProcessState.QUALIFIED, GfiProcessState.fromValue(5) );
+ assertEquals(GfiProcessState.CANCELED, GfiProcessState.fromValue(6) );
+ assertEquals(GfiProcessState.QUALIFIED_PUBLISHED, GfiProcessState.fromValue(7) );
+ assertEquals(GfiProcessState.WITHDRAWN, GfiProcessState.fromValue(8) );
+ assertEquals(GfiProcessState.UPDATED, GfiProcessState.fromValue(9) );
+ assertEquals(GfiProcessState.QUALIFIED_UPDATED, GfiProcessState.fromValue(10) );
+ assertEquals(GfiProcessState.COMPLETED, GfiProcessState.fromValue(11) );
+ assertEquals(GfiProcessState.UNDEFINED_, GfiProcessState.fromValue(-1) ); // NOSONAR
}
}
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessSubjectTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessSubjectTest.java
index 5f13faf..f7d31c6 100644
--- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessSubjectTest.java
+++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiProcessSubjectTest.java
@@ -15,23 +15,15 @@
package org.eclipse.openk.gridfailureinformation.bpmn.impl;
-import org.eclipse.openk.gridfailureinformation.support.MockDataHelper;
-import org.eclipse.openk.gridfailureinformation.viewmodel.FailureInformationDto;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class GfiProcessSubjectTest {
- @Test
+ /*@Test
+
public void testSubjectCreation() {
FailureInformationDto obj = MockDataHelper.mockFailureInformationDto();
obj.setResponsibility("me");
GfiProcessSubject sub = GfiProcessSubject.of(obj, "whoami");
- sub.setJwt("jwt");
- sub.setStateInDb(GfiProcessState.APPLIED);
- assertEquals( "whoami", sub.getChangeUser());
- assertEquals( "jwt", sub.getJwt() );
- assertEquals(GfiProcessState.APPLIED, sub.getStateInDb());
+ sub.setStateInDb(GfiProcessState.NEW);
+ assertEquals(GfiProcessState.NEW, sub.getStateInDb());
assertEquals("me", sub.getFailureInformationDto().getResponsibility());
- }
+ }*/
}
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/ProcessHelperTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/ProcessHelperTest.java
new file mode 100644
index 0000000..ca41ffb
--- /dev/null
+++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/ProcessHelperTest.java
@@ -0,0 +1,131 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
+package org.eclipse.openk.gridfailureinformation.bpmn.impl;
+
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.tasks.ProcessHelper;
+import org.eclipse.openk.gridfailureinformation.config.TestConfiguration;
+import org.eclipse.openk.gridfailureinformation.exceptions.InternalServerErrorException;
+import org.eclipse.openk.gridfailureinformation.exceptions.NotFoundException;
+import org.eclipse.openk.gridfailureinformation.model.RefFailureClassification;
+import org.eclipse.openk.gridfailureinformation.model.RefStatus;
+import org.eclipse.openk.gridfailureinformation.model.TblFailureInformation;
+import org.eclipse.openk.gridfailureinformation.repository.FailureClassificationRepository;
+import org.eclipse.openk.gridfailureinformation.repository.FailureInformationRepository;
+import org.eclipse.openk.gridfailureinformation.repository.StatusRepository;
+import org.eclipse.openk.gridfailureinformation.support.MockDataHelper;
+import org.eclipse.openk.gridfailureinformation.viewmodel.FailureInformationDto;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.ContextConfiguration;
+
+import java.util.Optional;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.when;
+
+@DataJpaTest
+@ContextConfiguration(classes = {TestConfiguration.class})
+public class ProcessHelperTest {
+ @Autowired
+ private ProcessHelper processHelper;
+
+ @MockBean
+ private FailureClassificationRepository failureClassificationRepository;
+
+ @MockBean
+ private FailureInformationRepository failureInformationRepository;
+
+ @MockBean
+ private StatusRepository statusRepository;
+
+ @Test
+ public void shouldDetectIfFailureInfoIsPlanned_True() {
+ RefFailureClassification fc = MockDataHelper.mockRefFailureClassification();
+ FailureInformationDto dto = MockDataHelper.mockFailureInformationDto();
+ dto.setFailureClassificationId(fc.getUuid());
+ when( failureClassificationRepository.findById(anyLong()))
+ .thenReturn(Optional.of(fc));
+
+ assertTrue(processHelper.isFailureInfoPlanned(dto));
+ }
+
+ @Test
+ public void shouldDetectIfFailureInfoIsPlanned_False() {
+ RefFailureClassification fc = MockDataHelper.mockRefFailureClassification();
+ FailureInformationDto dto = MockDataHelper.mockFailureInformationDto();
+ dto.setFailureClassificationId(UUID.randomUUID());
+ when( failureClassificationRepository.findById(anyLong()))
+ .thenReturn(Optional.of(fc));
+
+ assertFalse(processHelper.isFailureInfoPlanned(dto));
+ }
+
+ @Test
+ public void shouldDetectIfFailureInfoIsPlanned_Exception() {
+ RefFailureClassification fc = MockDataHelper.mockRefFailureClassification();
+ FailureInformationDto dto = MockDataHelper.mockFailureInformationDto();
+ when( failureClassificationRepository.findById(anyLong()))
+ .thenReturn(Optional.empty());
+
+ assertThrows( InternalServerErrorException.class, () -> processHelper.isFailureInfoPlanned(dto));
+ }
+
+ @Test
+ public void shouldSetEditAndStore_ExceptionNotFound() {
+ when(failureInformationRepository.findByUuid(any(UUID.class))).thenReturn(Optional.empty());
+ assertThrows(NotFoundException.class, () -> processHelper.setEditStatusAndStore(UUID.randomUUID(), GfiProcessState.NEW));
+
+ }
+
+ @Test
+ public void shouldSetEditAndStore_ExceptionInternalServerError() {
+ TblFailureInformation tblFailureInformation = MockDataHelper.mockTblFailureInformation();
+ when(failureInformationRepository.findByUuid(any(UUID.class))).thenReturn(Optional.of( tblFailureInformation ));
+ when(statusRepository.findById(GfiProcessState.NEW.getStatusValue())).thenReturn(Optional.empty());
+
+ assertThrows(InternalServerErrorException.class, () -> processHelper.setEditStatusAndStore(UUID.randomUUID(), GfiProcessState.NEW));
+ }
+
+
+ @Test
+ public void shouldSetEditAndStoreSuccessful() {
+ TblFailureInformation tblFailureInformation = MockDataHelper.mockTblFailureInformation();
+ tblFailureInformation.setRefStatusExtern(null);
+ tblFailureInformation.setRefStatusIntern(null);
+
+ when(failureInformationRepository.findByUuid(any(UUID.class))).thenReturn(Optional.of( tblFailureInformation ));
+ when(failureInformationRepository.save(any(TblFailureInformation.class))).thenReturn(null);
+ RefStatus refStatus = MockDataHelper.mockRefStatus();
+ when(statusRepository.findById(GfiProcessState.NEW.getStatusValue())).thenReturn(Optional.of(refStatus));
+
+ processHelper.setEditStatusAndStore(UUID.randomUUID(), GfiProcessState.NEW);
+
+ assertEquals(refStatus.getUuid(), tblFailureInformation.getRefStatusExtern().getUuid());
+ assertEquals(refStatus.getUuid(), tblFailureInformation.getRefStatusIntern().getUuid());
+
+ }
+
+ @Test
+ public void shouldGetProcessStateFromStatus_Exception() {
+ when( statusRepository.findByUuid(any( UUID.class ))).thenReturn(Optional.empty());
+ assertThrows(InternalServerErrorException.class, () -> processHelper.getProcessStateFromStatusUuid(UUID.randomUUID()));
+ }
+}
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/UIStoreFailureInformationTaskTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/UIStoreFailureInformationTaskTest.java
new file mode 100644
index 0000000..91da7ec
--- /dev/null
+++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/UIStoreFailureInformationTaskTest.java
@@ -0,0 +1,89 @@
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
+package org.eclipse.openk.gridfailureinformation.bpmn.impl;
+
+import org.eclipse.openk.gridfailureinformation.bpmn.base.ProcessException;
+import org.eclipse.openk.gridfailureinformation.bpmn.base.ProcessSubject;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.tasks.ProcessHelper;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.tasks.UIStoreFailureInformationTask;
+import org.eclipse.openk.gridfailureinformation.config.TestConfiguration;
+import org.eclipse.openk.gridfailureinformation.support.MockDataHelper;
+import org.eclipse.openk.gridfailureinformation.viewmodel.FailureInformationDto;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.ContextConfiguration;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+@DataJpaTest
+@ContextConfiguration(classes = {TestConfiguration.class})
+public class UIStoreFailureInformationTaskTest {
+ class UIStoreTaskTester extends UIStoreFailureInformationTask {
+ boolean onStayInTaskCalled = false;
+ boolean onLeaveStepCalled = false;
+
+ public UIStoreTaskTester(String description, boolean stayIfStateUnchanged) {
+ super(description, stayIfStateUnchanged);
+ }
+
+ @Override
+ protected void onStayInTask(GfiProcessSubject subject) throws ProcessException {
+ onStayInTaskCalled = true;
+ super.onStayInTask(subject);
+ }
+
+ @Override
+ protected void onLeaveStep(GfiProcessSubject subject) throws ProcessException {
+ onLeaveStepCalled = true;
+ super.onLeaveStep(subject);
+ }
+
+ }
+
+ @MockBean
+ private ProcessHelper processHelper;
+
+ @Test
+ public void shouldStayInTask() throws ProcessException {
+ ProcessSubject subject = GfiProcessSubject.of(MockDataHelper.mockFailureInformationDto(), processHelper);
+ doNothing().when(processHelper).storeFailureFromViewModel(any(FailureInformationDto.class));
+
+ UIStoreTaskTester task = new UIStoreTaskTester("Testme", true);
+ task.leaveStep(subject);
+
+ verify(processHelper, times(1))
+ .storeFailureFromViewModel(any( FailureInformationDto.class ));
+ assertTrue(task.onStayInTaskCalled);
+
+ }
+
+ @Test
+ public void shouldNotStayInTask() throws ProcessException {
+ ProcessSubject subject = GfiProcessSubject.of(MockDataHelper.mockFailureInformationDto(), processHelper);
+ doNothing().when(processHelper).storeFailureFromViewModel(any(FailureInformationDto.class));
+
+ UIStoreTaskTester task = new UIStoreTaskTester("Testme", false);
+ task.leaveStep(subject);
+
+ verify(processHelper, times(1))
+ .storeFailureFromViewModel(any( FailureInformationDto.class ));
+
+ assertTrue(task.onLeaveStepCalled);
+ }
+}
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/config/TestConfiguration.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/config/TestConfiguration.java
index 1d7d2f9..a22ab63 100644
--- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/config/TestConfiguration.java
+++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/config/TestConfiguration.java
@@ -15,8 +15,17 @@
package org.eclipse.openk.gridfailureinformation.config;
import org.eclipse.openk.gridfailureinformation.GridFailureInformationApplication;
+import org.eclipse.openk.gridfailureinformation.bpmn.base.ProcessException;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiGrid;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiProcessEnvironment;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.tasks.ProcessHelper;
+import org.eclipse.openk.gridfailureinformation.mapper.FailureInformationMapper;
+import org.eclipse.openk.gridfailureinformation.mapper.FailureInformationMapperImpl;
+import org.eclipse.openk.gridfailureinformation.mapper.VersionMapper;
+import org.eclipse.openk.gridfailureinformation.mapper.VersionMapperImpl;
import org.eclipse.openk.gridfailureinformation.mapper.*;
import org.eclipse.openk.gridfailureinformation.service.*;
+import org.mockito.Mockito;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.test.context.ConfigFileApplicationContextInitializer;
import org.springframework.context.annotation.Bean;
@@ -24,6 +33,9 @@
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
+import static org.mockito.Mockito.mock;
+import static org.mockito.internal.util.MockUtil.createMock;
+
@EnableJpaRepositories(basePackages = "org.eclipse.openk.gridfailureinformation")
@EntityScan(basePackageClasses = GridFailureInformationApplication.class)
@ContextConfiguration( initializers = {ConfigFileApplicationContextInitializer.class})
@@ -78,6 +90,25 @@
}
@Bean
+ public GfiGrid gfiGrid() {
+ try {
+ return new GfiGrid();
+ } catch (ProcessException e) {
+ return null;
+ }
+ }
+
+ @Bean
+ public ProcessHelper processHelper() {
+ return new ProcessHelper();
+ }
+
+ @Bean
+ public GfiProcessEnvironment gfiProcessEnvironment() {
+ return new GfiProcessEnvironment();
+ }
+
+ @Bean
public HistFailureInformationService myHistFailureInformationService() {
return new HistFailureInformationService();
}
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/BranchServiceTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/BranchServiceTest.java
index f847c67..6c5d757 100644
--- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/BranchServiceTest.java
+++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/BranchServiceTest.java
@@ -50,7 +50,7 @@
List<BranchDto> listRefBranch = branchService.getBranches();
assertEquals(listRefBranch.size(), mockRefBranchList.size());
- assertEquals(listRefBranch.size(), 2);
+ assertEquals(2, listRefBranch.size());
assertEquals(listRefBranch.get(1).getUuid(), mockRefBranchList.get(1).getUuid());
}
}
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java
index ac1214a..ef1456e 100644
--- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java
+++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java
@@ -14,6 +14,7 @@
*/
package org.eclipse.openk.gridfailureinformation.service;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiProcessState;
import org.eclipse.openk.gridfailureinformation.config.TestConfiguration;
import org.eclipse.openk.gridfailureinformation.exceptions.NotFoundException;
import org.eclipse.openk.gridfailureinformation.model.*;
@@ -35,6 +36,7 @@
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.when;
@DataJpaTest
@@ -90,7 +92,7 @@
}
@Test
- public void shouldUpdateFailureInformation() {
+ public void shouldStoreFailureInformation() {
FailureInformationDto fiDto = MockDataHelper.mockFailureInformationDto();
TblFailureInformation fiTbl = MockDataHelper.mockTblFailureInformation();
RefFailureClassification refFailureClassification = MockDataHelper.mockRefFailureClassification();
@@ -115,9 +117,8 @@
return (TblFailureInformation) args[0];
});
- FailureInformationDto savedDto = failureInformationService.updateFailureInfo(fiDto);
+ FailureInformationDto savedDto = failureInformationService.storeFailureInfo(fiDto);
- assertEquals(savedDto.getVersionNumber(), 6L);
assertEquals(fiTbl.getResponsibility(), savedDto.getResponsibility());
assertEquals(fiTbl.getInternExtern(), savedDto.getInternExtern());
assertEquals(fiTbl.getVoltageLevel(), savedDto.getVoltageLevel());
@@ -156,16 +157,20 @@
@Test
public void shouldUpdateFailureInformation_emptyReferences() {
+ RefStatus refStatus = MockDataHelper.mockRefStatus();
+ refStatus.setId(GfiProcessState.PLANNED.getStatusValue());
+
FailureInformationDto fiDto = MockDataHelper.mockFailureInformationDto();
fiDto.setBranchId(null);
fiDto.setFailureClassificationId(null);
fiDto.setFailureTypeId(null);
fiDto.setStatusExternId(null);
- fiDto.setStatusInternId(null);
+ fiDto.setStatusInternId(UUID.randomUUID());
fiDto.setRadiusId(null);
fiDto.setPublicationTextId(null);
TblFailureInformation fiTbl = MockDataHelper.mockTblFailureInformation();
+ fiTbl.setId(777L);
fiTbl.setRefBranch(null);
fiTbl.setRefFailureClassification(null);
fiTbl.setRefFailureType(null);
@@ -174,13 +179,15 @@
fiTbl.setRefRadius(null);
fiTbl.setRefPublicationText(null);
+ when(statusRepository.findByUuid(any( UUID.class ))).thenReturn(Optional.of(refStatus));
+ when(statusRepository.findByUuid(any( UUID.class ))).thenReturn(Optional.of(refStatus));
when(failureInformationRepository.findByUuid(any(UUID.class))).thenReturn(Optional.of(fiTbl));
- when (failureInformationRepository.save(any(TblFailureInformation.class))).thenReturn(fiTbl);
+ when(failureInformationRepository.save(any(TblFailureInformation.class))).thenReturn(fiTbl);
FailureInformationDto savedDto = failureInformationService.updateFailureInfo(fiDto);
- assertEquals(fiTbl.getUuid(), savedDto.getUuid());
- assertEquals(fiTbl.getVersionNumber(), savedDto.getVersionNumber());
+ assertEquals(fiDto.getUuid(), savedDto.getUuid());
+ assertEquals(fiTbl.getVersionNumber(), savedDto.getVersionNumber()+1);
assertEquals(fiTbl.getResponsibility(), savedDto.getResponsibility());
assertEquals(fiTbl.getInternExtern(), savedDto.getInternExtern());
assertEquals(fiTbl.getVoltageLevel(), savedDto.getVoltageLevel());
@@ -202,9 +209,8 @@
}
@Test
- public void shouldNotUpdateFailureInformation_Exception_FailureInformationNotFound() {
+ public void shouldNotStoreFailureInformation_Exception_FailureInformationNotFound() {
FailureInformationDto fiDto = MockDataHelper.mockFailureInformationDto();
- TblFailureInformation fiTbl = MockDataHelper.mockTblFailureInformation();
RefFailureClassification refFailureClassification = MockDataHelper.mockRefFailureClassification();
RefFailureType refFailureType = MockDataHelper.mockRefFailureType();
RefStatus refStatus = MockDataHelper.mockRefStatus();
@@ -224,7 +230,7 @@
return (TblFailureInformation) args[0];
});
- assertThrows(NotFoundException.class, () -> failureInformationService.updateFailureInfo(fiDto));
+ assertThrows(NotFoundException.class, () -> failureInformationService.storeFailureInfo(fiDto));
}
@@ -251,7 +257,7 @@
return (TblFailureInformation) args[0];
});
- assertThrows(NotFoundException.class, () -> failureInformationService.updateFailureInfo(fiDto));
+ assertThrows(NotFoundException.class, () -> failureInformationService.storeFailureInfo(fiDto));
}
@@ -278,7 +284,7 @@
return (TblFailureInformation) args[0];
});
- assertThrows(NotFoundException.class, () -> failureInformationService.updateFailureInfo(fiDto));
+ assertThrows(NotFoundException.class, () -> failureInformationService.storeFailureInfo(fiDto));
}
@@ -304,7 +310,7 @@
return (TblFailureInformation) args[0];
});
- assertThrows(NotFoundException.class, () -> failureInformationService.updateFailureInfo(fiDto));
+ assertThrows(NotFoundException.class, () -> failureInformationService.storeFailureInfo(fiDto));
}
@@ -330,7 +336,7 @@
return (TblFailureInformation) args[0];
});
- assertThrows(NotFoundException.class, () -> failureInformationService.updateFailureInfo(fiDto));
+ assertThrows(NotFoundException.class, () -> failureInformationService.storeFailureInfo(fiDto));
}
@@ -402,6 +408,7 @@
RefRadius refRadius = MockDataHelper.mockRefRadius();
RefPublicationText refPublicationText = MockDataHelper.mockRefPublicationText();
+ when(statusRepository.findById(anyLong())).thenReturn(Optional.of(refStatus));
when(failureInformationRepository.findByUuid(any(UUID.class))).thenReturn(Optional.of(fiTbl));
when(branchRepository.findByUuid(any(UUID.class))).thenReturn(Optional.of(refBranch));
when(failureClassificationRepository.findByUuid(any(UUID.class))).thenReturn(Optional.of(refFailureClassification));
@@ -418,7 +425,7 @@
return (TblFailureInformation) args[0];
});
- FailureInformationDto savedDto = failureInformationService.insertFailureInfo(fiDto);
+ FailureInformationDto savedDto = failureInformationService.storeFailureInfo(fiDto);
assertNotNull(savedDto.getUuid());
assertEquals(1L, savedDto.getVersionNumber());
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/HistFailureInformationServiceTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/HistFailureInformationServiceTest.java
index 0c3b4d4..2fcc505 100644
--- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/HistFailureInformationServiceTest.java
+++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/HistFailureInformationServiceTest.java
@@ -53,7 +53,7 @@
List<FailureInformationDto> retList = histFailureInformationService.getFailureInformationVersionsByUuid(UUID.randomUUID());
assertEquals(retList.size(), mockHistFailureList.size());
- assertEquals(retList.size(), 2);
+ assertEquals(2, retList.size());
assertEquals(retList.get(1).getUuid(), mockHistFailureList.get(1).getUuid());
assertEquals(retList.get(0).getResponsibility(), mockHistFailureList.get(0).getResponsibility());
}
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/ImportDataServiceTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/ImportDataServiceTest.java
index fea9ac8..80685be 100644
--- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/ImportDataServiceTest.java
+++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/ImportDataServiceTest.java
@@ -55,7 +55,7 @@
List<ImportDataDto> listTblImportData = importDataService.getImportData();
assertEquals(listTblImportData.size(), mockTblImportDataList.size());
- assertEquals(listTblImportData.size(), 2);
+ assertEquals(2, listTblImportData.size());
assertEquals(listTblImportData.get(1).getUuid(), mockTblImportDataList.get(1).getUuid());
}
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/StatusServiceTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/StatusServiceTest.java
index c0b5304..2b0b02d 100644
--- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/StatusServiceTest.java
+++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/StatusServiceTest.java
@@ -50,7 +50,7 @@
List<StatusDto> listRefStatus = statusService.getStatus();
assertEquals(listRefStatus.size(), mockRefStatusList.size());
- assertEquals(listRefStatus.size(), 2);
+ assertEquals(2, listRefStatus.size());
assertEquals(listRefStatus.get(1).getUuid(), mockRefStatusList.get(1).getUuid());
}
}
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/VersionServiceTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/VersionServiceTest.java
index 8e525e9..5c41d11 100644
--- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/VersionServiceTest.java
+++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/VersionServiceTest.java
@@ -14,6 +14,7 @@
*/
package org.eclipse.openk.gridfailureinformation.service;
+import org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiProcessEnvironment;
import org.eclipse.openk.gridfailureinformation.config.TestConfiguration;
import org.eclipse.openk.gridfailureinformation.constants.Constants;
import org.eclipse.openk.gridfailureinformation.model.Version;
@@ -60,4 +61,5 @@
VersionDto versionDto = versionService.getVersion();
assertEquals(Constants.DB_VERSION_NOT_PRESENT, versionDto.getDbVersion() );
}
+
}
