Skip to content

Commit

Permalink
Merge pull request #60 from medizininformatik-initiative/prerelease-0…
Browse files Browse the repository at this point in the history 
….6.3-rc2

Prerelease 0.6.3 rc2
  • Loading branch information
@EmteZogaf
EmteZogaf authored Apr 13, 2023
2 parents cb0c22e + ccbaa2c commit d7d281b
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 234 deletions.
51 changes: 0 additions & 51 deletions ...medizininformatik_initiative/feasibility_dsf_process/service/AggregateMeasureReports.java
View file

This file was deleted.

6 changes: 0 additions & 6 deletions ...medizininformatik_initiative/feasibility_dsf_process/spring/config/FeasibilityConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import de.medizininformatik_initiative.feasibility_dsf_process.client.flare.FlareWebserviceClient;
import de.medizininformatik_initiative.feasibility_dsf_process.message.SendDicRequest;
import de.medizininformatik_initiative.feasibility_dsf_process.message.SendDicResponse;
import de.medizininformatik_initiative.feasibility_dsf_process.service.AggregateMeasureReports;
import de.medizininformatik_initiative.feasibility_dsf_process.service.DownloadFeasibilityResources;
import de.medizininformatik_initiative.feasibility_dsf_process.service.DownloadMeasureReport;
import de.medizininformatik_initiative.feasibility_dsf_process.service.EvaluateCqlMeasure;
Expand Down Expand Up @@ -103,11 +102,6 @@ public StoreLiveResult storeLiveResult() {
return new StoreLiveResult(fhirClientProvider, taskHelper, readAccessHelper);
}

@Bean
public AggregateMeasureReports aggregateMeasureReports() {
return new AggregateMeasureReports(fhirClientProvider, taskHelper, readAccessHelper);
}

//
// process executeFeasibility implementations
//
Expand Down
141 changes: 45 additions & 96 deletions feasibility-dsf-process/src/main/resources/bpe/feasibilityRequest.bpmn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,55 +24,27 @@
<bpmn:sequenceFlow id="SequenceFlow_11k77gx" sourceRef="StartEvent" targetRef="selectRequestTargets" />
<bpmn:sequenceFlow id="SequenceFlow_0b5s4ef" sourceRef="selectRequestTargets" targetRef="sendRequestToDics" />
<bpmn:endEvent id="EndEvent" name="success">
<bpmn:incoming>Flow_1479yc4</bpmn:incoming>
<bpmn:incoming>Flow_0wm2en5</bpmn:incoming>
</bpmn:endEvent>
<bpmn:subProcess id="Activity_1h2vwsh">
<bpmn:incoming>Flow_0qqdr67</bpmn:incoming>
<bpmn:outgoing>Flow_0wm2en5</bpmn:outgoing>
<bpmn:multiInstanceLoopCharacteristics camunda:collection="${targets.entries}" camunda:elementVariable="target" />
<bpmn:receiveTask id="Activity_15y7a7a" name="receive query result from DIC" messageRef="Message_18ld88c">
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="correlationKey">${target.correlationKey}</camunda:inputParameter>
</camunda:inputOutput>
</bpmn:extensionElements>
<bpmn:incoming>Flow_1iuvnle</bpmn:incoming>
<bpmn:outgoing>Flow_1mxiy48</bpmn:outgoing>
</bpmn:receiveTask>
<bpmn:startEvent id="Event_1tvmfdb">
<bpmn:outgoing>Flow_1iuvnle</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:sequenceFlow id="Flow_1iuvnle" sourceRef="Event_1tvmfdb" targetRef="Activity_15y7a7a" />
<bpmn:sequenceFlow id="Flow_1mxiy48" sourceRef="Activity_15y7a7a" targetRef="Activity_09o61p4" />
<bpmn:serviceTask id="Activity_09o61p4" name="download MeasureReport" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.DownloadMeasureReport">
<bpmn:incoming>Flow_1mxiy48</bpmn:incoming>
<bpmn:outgoing>Flow_1oq6cy1</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:sequenceFlow id="Flow_1oq6cy1" sourceRef="Activity_09o61p4" targetRef="Activity_103gahn" />
<bpmn:serviceTask id="Activity_103gahn" name="store live result" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.StoreLiveResult">
<bpmn:incoming>Flow_1oq6cy1</bpmn:incoming>
<bpmn:outgoing>Flow_1kiy9bc</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:sequenceFlow id="Flow_1kiy9bc" sourceRef="Activity_103gahn" targetRef="Activity_16mfy9t" />
<bpmn:endEvent id="Event_0i55mqk">
<bpmn:incoming>Flow_13dcknp</bpmn:incoming>
</bpmn:endEvent>
<bpmn:serviceTask id="Activity_16mfy9t" name="aggregate query results" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.AggregateMeasureReports">
<bpmn:incoming>Flow_1kiy9bc</bpmn:incoming>
<bpmn:outgoing>Flow_13dcknp</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:sequenceFlow id="Flow_13dcknp" sourceRef="Activity_16mfy9t" targetRef="Event_0i55mqk" />
</bpmn:subProcess>
<bpmn:boundaryEvent id="Event_13wq5pb" attachedToRef="Activity_1h2vwsh">
<bpmn:outgoing>Flow_1479yc4</bpmn:outgoing>
<bpmn:timerEventDefinition id="TimerEventDefinition_0bvcu02">
<bpmn:timeDuration xsi:type="bpmn:tFormalExpression">PT45S</bpmn:timeDuration>
</bpmn:timerEventDefinition>
</bpmn:boundaryEvent>
<bpmn:sequenceFlow id="Flow_0qqdr67" sourceRef="sendRequestToDics" targetRef="Activity_1h2vwsh" />
<bpmn:sequenceFlow id="Flow_1479yc4" sourceRef="Event_13wq5pb" targetRef="EndEvent" />
<bpmn:sequenceFlow id="Flow_0wm2en5" sourceRef="Activity_1h2vwsh" targetRef="EndEvent" />
</bpmn:endEvent>
<bpmn:sequenceFlow id="Flow_0qqdr67" sourceRef="sendRequestToDics" targetRef="EndEvent" />
<bpmn:serviceTask id="Activity_09o61p4" name="download MeasureReport" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.DownloadMeasureReport">
<bpmn:incoming>Flow_0b1et2t</bpmn:incoming>
<bpmn:outgoing>Flow_0xpflx6</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:serviceTask id="Activity_103gahn" name="store live result" camunda:class="de.medizininformatik_initiative.feasibility_dsf_process.service.StoreLiveResult">
<bpmn:incoming>Flow_0xpflx6</bpmn:incoming>
<bpmn:outgoing>Flow_0yj01k2</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:endEvent id="Event_0i55mqk" name="complete query result">
<bpmn:incoming>Flow_0yj01k2</bpmn:incoming>
</bpmn:endEvent>
<bpmn:startEvent id="singleResult" name="receive query result from DIC">
<bpmn:outgoing>Flow_0b1et2t</bpmn:outgoing>
<bpmn:messageEventDefinition id="MessageEventDefinition_01pa805" messageRef="Message_18ld88c" />
</bpmn:startEvent>
<bpmn:sequenceFlow id="Flow_0b1et2t" sourceRef="singleResult" targetRef="Activity_09o61p4" />
<bpmn:sequenceFlow id="Flow_0xpflx6" sourceRef="Activity_09o61p4" targetRef="Activity_103gahn" />
<bpmn:sequenceFlow id="Flow_0yj01k2" sourceRef="Activity_103gahn" targetRef="Event_0i55mqk" />
</bpmn:process>
<bpmn:message id="Message_1pq9qxp" name="feasibilityRequestMessage" />
<bpmn:message id="Message_07ayhv1" name="feasibilityResultMessage" />
Expand Down Expand Up @@ -102,54 +74,28 @@
<dc:Bounds x="430" y="115" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="EndEvent_18syky8_di" bpmnElement="EndEvent">
<dc:Bounds x="1442" y="137" width="36" height="36" />
<dc:Bounds x="582" y="137" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1440" y="113" width="41" height="14" />
<dc:Bounds x="580" y="113" width="41" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1h2vwsh_di" bpmnElement="Activity_1h2vwsh" isExpanded="true">
<dc:Bounds x="580" y="88" width="800" height="134" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_15y7a7a_di" bpmnElement="Activity_15y7a7a">
<dc:Bounds x="677" y="117" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1tvmfdb_di" bpmnElement="Event_1tvmfdb">
<dc:Bounds x="602" y="139" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1l7gm0z_di" bpmnElement="Activity_09o61p4">
<dc:Bounds x="830" y="117" width="100" height="80" />
<dc:Bounds x="270" y="260" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_103gahn_di" bpmnElement="Activity_103gahn">
<dc:Bounds x="980" y="117" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0i55mqk_di" bpmnElement="Event_0i55mqk">
<dc:Bounds x="1312" y="139" width="36" height="36" />
<dc:Bounds x="430" y="260" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0ecnlg3_di" bpmnElement="Activity_16mfy9t">
<dc:Bounds x="1140" y="117" width="100" height="80" />
<bpmndi:BPMNShape id="Event_00dgrgy_di" bpmnElement="singleResult">
<dc:Bounds x="152" y="282" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="135" y="325" width="75" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_1iuvnle_di" bpmnElement="Flow_1iuvnle">
<di:waypoint x="638" y="157" />
<di:waypoint x="677" y="157" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1mxiy48_di" bpmnElement="Flow_1mxiy48">
<di:waypoint x="777" y="157" />
<di:waypoint x="830" y="157" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1oq6cy1_di" bpmnElement="Flow_1oq6cy1">
<di:waypoint x="930" y="157" />
<di:waypoint x="980" y="157" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1kiy9bc_di" bpmnElement="Flow_1kiy9bc">
<di:waypoint x="1080" y="157" />
<di:waypoint x="1140" y="157" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_13dcknp_di" bpmnElement="Flow_13dcknp">
<di:waypoint x="1240" y="157" />
<di:waypoint x="1312" y="157" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Event_13wq5pb_di" bpmnElement="Event_13wq5pb">
<dc:Bounds x="1362" y="204" width="36" height="36" />
<bpmndi:BPMNShape id="Event_0i55mqk_di" bpmnElement="Event_0i55mqk">
<dc:Bounds x="582" y="282" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="567" y="325" width="76" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_11k77gx_di" bpmnElement="SequenceFlow_11k77gx">
<di:waypoint x="188" y="155" />
Expand All @@ -161,16 +107,19 @@
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0qqdr67_di" bpmnElement="Flow_0qqdr67">
<di:waypoint x="530" y="155" />
<di:waypoint x="580" y="155" />
<di:waypoint x="582" y="155" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0b1et2t_di" bpmnElement="Flow_0b1et2t">
<di:waypoint x="188" y="300" />
<di:waypoint x="270" y="300" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1479yc4_di" bpmnElement="Flow_1479yc4">
<di:waypoint x="1398" y="222" />
<di:waypoint x="1460" y="222" />
<di:waypoint x="1460" y="173" />
<bpmndi:BPMNEdge id="Flow_0xpflx6_di" bpmnElement="Flow_0xpflx6">
<di:waypoint x="370" y="300" />
<di:waypoint x="430" y="300" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0wm2en5_di" bpmnElement="Flow_0wm2en5">
<di:waypoint x="1380" y="155" />
<di:waypoint x="1442" y="155" />
<bpmndi:BPMNEdge id="Flow_0yj01k2_di" bpmnElement="Flow_0yj01k2">
<di:waypoint x="530" y="300" />
<di:waypoint x="582" y="300" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
Expand Down
81 changes: 0 additions & 81 deletions ...zininformatik_initiative/feasibility_dsf_process/service/AggregateMeasureReportsTest.java
View file

This file was deleted.

0 comments on commit d7d281b

Please sign in to comment.