Skip to content

Commit d53074a

Browse files
hhundhhund
committed
Merge remote-tracking branch 'origin/release/0.5.0' into main
2 parents e6707c7 + 0217f07 commit d53074a

File tree

133 files changed

+3838
-1897
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+3838
-1897
lines changed

‎.github/workflows/maven-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ jobs:
1919
- name: Build with Maven
2020
env:
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22-
run: mvn -B verify --file pom.xml
22+
run: mvn -B verify -fae --file pom.xml

‎dsf-bpe-process-feasibility/pom.xml‎

Lines changed: 116 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@
88
<parent>
99
<artifactId>dsf-bpe-highmed-processes-pom</artifactId>
1010
<groupId>org.highmed.dsf</groupId>
11-
<version>0.4.1</version>
11+
<version>0.5.0</version>
1212
</parent>
13+
14+
<properties>
15+
<main.basedir>${project.basedir}/..</main.basedir>
16+
<dsf.location>../../highmed-dsf</dsf.location>
17+
</properties>
1318

1419
<dependencies>
1520
<dependency>
@@ -64,7 +69,7 @@
6469
<version>${project.version}</version>
6570
</artifactItem>
6671
</artifactItems>
67-
<outputDirectory>../../highmed-dsf/dsf-docker-test-setup/bpe/app/process</outputDirectory>
72+
<outputDirectory>${dsf.location}/dsf-docker-test-setup/bpe/process</outputDirectory>
6873
</configuration>
6974
</execution>
7075
<execution>
@@ -81,7 +86,7 @@
8186
<version>${project.version}</version>
8287
</artifactItem>
8388
</artifactItems>
84-
<outputDirectory>../../highmed-dsf/dsf-docker-test-setup-3medic-ttp/medic1/bpe/app/process</outputDirectory>
89+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic1/bpe/process</outputDirectory>
8590
</configuration>
8691
</execution>
8792
<execution>
@@ -98,7 +103,7 @@
98103
<version>${project.version}</version>
99104
</artifactItem>
100105
</artifactItems>
101-
<outputDirectory>../../highmed-dsf/dsf-docker-test-setup-3medic-ttp/medic2/bpe/app/process</outputDirectory>
106+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic2/bpe/process</outputDirectory>
102107
</configuration>
103108
</execution>
104109
<execution>
@@ -115,7 +120,7 @@
115120
<version>${project.version}</version>
116121
</artifactItem>
117122
</artifactItems>
118-
<outputDirectory>../../highmed-dsf/dsf-docker-test-setup-3medic-ttp/medic3/bpe/app/process</outputDirectory>
123+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic3/bpe/process</outputDirectory>
119124
</configuration>
120125
</execution>
121126
<execution>
@@ -132,7 +137,79 @@
132137
<version>${project.version}</version>
133138
</artifactItem>
134139
</artifactItems>
135-
<outputDirectory>../../highmed-dsf/dsf-docker-test-setup-3medic-ttp/ttp/bpe/app/process</outputDirectory>
140+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/ttp/bpe/process</outputDirectory>
141+
</configuration>
142+
</execution>
143+
<execution>
144+
<id>copy-process-to-docker-test-setup-3medic-ttp-docker/medic1</id>
145+
<phase>package</phase>
146+
<goals>
147+
<goal>copy</goal>
148+
</goals>
149+
<configuration>
150+
<artifactItems>
151+
<artifactItem>
152+
<groupId>${project.groupId}</groupId>
153+
<artifactId>${project.artifactId}</artifactId>
154+
<version>${project.version}</version>
155+
</artifactItem>
156+
</artifactItems>
157+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic1/bpe/process
158+
</outputDirectory>
159+
</configuration>
160+
</execution>
161+
<execution>
162+
<id>copy-process-to-docker-test-setup-3medic-ttp-docker/medic2</id>
163+
<phase>package</phase>
164+
<goals>
165+
<goal>copy</goal>
166+
</goals>
167+
<configuration>
168+
<artifactItems>
169+
<artifactItem>
170+
<groupId>${project.groupId}</groupId>
171+
<artifactId>${project.artifactId}</artifactId>
172+
<version>${project.version}</version>
173+
</artifactItem>
174+
</artifactItems>
175+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic2/bpe/process
176+
</outputDirectory>
177+
</configuration>
178+
</execution>
179+
<execution>
180+
<id>copy-process-to-docker-test-setup-3medic-ttp-docker/medic3</id>
181+
<phase>package</phase>
182+
<goals>
183+
<goal>copy</goal>
184+
</goals>
185+
<configuration>
186+
<artifactItems>
187+
<artifactItem>
188+
<groupId>${project.groupId}</groupId>
189+
<artifactId>${project.artifactId}</artifactId>
190+
<version>${project.version}</version>
191+
</artifactItem>
192+
</artifactItems>
193+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic3/bpe/process
194+
</outputDirectory>
195+
</configuration>
196+
</execution>
197+
<execution>
198+
<id>copy-process-to-docker-test-setup-3medic-ttp-docker/ttp</id>
199+
<phase>package</phase>
200+
<goals>
201+
<goal>copy</goal>
202+
</goals>
203+
<configuration>
204+
<artifactItems>
205+
<artifactItem>
206+
<groupId>${project.groupId}</groupId>
207+
<artifactId>${project.artifactId}</artifactId>
208+
<version>${project.version}</version>
209+
</artifactItem>
210+
</artifactItems>
211+
<outputDirectory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/ttp/bpe/process
212+
</outputDirectory>
136213
</configuration>
137214
</execution>
138215
</executions>
@@ -143,35 +220,63 @@
143220
<configuration>
144221
<filesets>
145222
<fileset>
146-
<directory>../../highmed-dsf/dsf-docker-test-setup/bpe/app/process</directory>
223+
<directory>${dsf.location}/dsf-docker-test-setup/bpe/process</directory>
224+
<includes>
225+
<include>${project.artifactId}-${project.version}.jar</include>
226+
</includes>
227+
<followSymlinks>false</followSymlinks>
228+
</fileset>
229+
<fileset>
230+
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic1/bpe/process</directory>
231+
<includes>
232+
<include>${project.artifactId}-${project.version}.jar</include>
233+
</includes>
234+
<followSymlinks>false</followSymlinks>
235+
</fileset>
236+
<fileset>
237+
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic2/bpe/process</directory>
238+
<includes>
239+
<include>${project.artifactId}-${project.version}.jar</include>
240+
</includes>
241+
<followSymlinks>false</followSymlinks>
242+
</fileset>
243+
<fileset>
244+
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/medic3/bpe/process</directory>
245+
<includes>
246+
<include>${project.artifactId}-${project.version}.jar</include>
247+
</includes>
248+
<followSymlinks>false</followSymlinks>
249+
</fileset>
250+
<fileset>
251+
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp/ttp/bpe/process</directory>
147252
<includes>
148253
<include>${project.artifactId}-${project.version}.jar</include>
149254
</includes>
150255
<followSymlinks>false</followSymlinks>
151256
</fileset>
152257
<fileset>
153-
<directory>../../highmed-dsf/dsf-docker-test-setup-3medic-ttp/medic1/bpe/app/process</directory>
258+
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic1/bpe/process</directory>
154259
<includes>
155260
<include>${project.artifactId}-${project.version}.jar</include>
156261
</includes>
157262
<followSymlinks>false</followSymlinks>
158263
</fileset>
159264
<fileset>
160-
<directory>../../highmed-dsf/dsf-docker-test-setup-3medic-ttp/medic2/bpe/app/process</directory>
265+
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic2/bpe/process</directory>
161266
<includes>
162267
<include>${project.artifactId}-${project.version}.jar</include>
163268
</includes>
164269
<followSymlinks>false</followSymlinks>
165270
</fileset>
166271
<fileset>
167-
<directory>../../highmed-dsf/dsf-docker-test-setup-3medic-ttp/medic3/bpe/app/process</directory>
272+
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/medic3/bpe/process</directory>
168273
<includes>
169274
<include>${project.artifactId}-${project.version}.jar</include>
170275
</includes>
171276
<followSymlinks>false</followSymlinks>
172277
</fileset>
173278
<fileset>
174-
<directory>../../highmed-dsf/dsf-docker-test-setup-3medic-ttp/ttp/bpe/app/process</directory>
279+
<directory>${dsf.location}/dsf-docker-test-setup-3medic-ttp-docker/ttp/bpe/process</directory>
175280
<includes>
176281
<include>${project.artifactId}-${project.version}.jar</include>
177282
</includes>

‎dsf-bpe-process-feasibility/src/main/java/org/highmed/dsf/bpe/ConstantsFeasibility.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,22 @@ public interface ConstantsFeasibility
3636

3737
String PROFILE_HIGHMED_TASK_REQUEST_FEASIBILITY = "http://highmed.org/fhir/StructureDefinition/task-request-feasibility";
3838
String PROFILE_HIGHMED_TASK_REQUEST_FEASIBILITY_PROCESS_URI = PROCESS_HIGHMED_URI_BASE + "requestFeasibility/";
39-
String PROFILE_HIGHMED_TASK_REQUEST_FEASIBILITY_PROCESS_URI_AND_LATEST_VERSION =
40-
PROFILE_HIGHMED_TASK_REQUEST_FEASIBILITY_PROCESS_URI + VERSION;
39+
String PROFILE_HIGHMED_TASK_REQUEST_FEASIBILITY_PROCESS_URI_AND_LATEST_VERSION = PROFILE_HIGHMED_TASK_REQUEST_FEASIBILITY_PROCESS_URI
40+
+ VERSION;
4141
String PROFILE_HIGHMED_TASK_REQUEST_FEASIBILITY_MESSAGE_NAME = "requestFeasibilityMessage";
4242

4343
String PROFILE_HIGHMED_TASK_LOCAL_SERVICES_PROCESS_URI = PROCESS_HIGHMED_URI_BASE + "localServicesIntegration/";
4444

4545
String PROFILE_HIGHMED_TASK_EXECUTE_FEASIBILITY = "http://highmed.org/fhir/StructureDefinition/task-execute-feasibility";
4646
String PROFILE_HIGHMED_TASK_EXECUTE_FEASIBILITY_PROCESS_URI = PROCESS_HIGHMED_URI_BASE + "executeFeasibility/";
47-
String PROFILE_HIGHMED_TASK_EXECUTE_FEASIBILITY_PROCESS_URI_AND_LATEST_VERSION =
48-
PROFILE_HIGHMED_TASK_EXECUTE_FEASIBILITY_PROCESS_URI + VERSION;
47+
String PROFILE_HIGHMED_TASK_EXECUTE_FEASIBILITY_PROCESS_URI_AND_LATEST_VERSION = PROFILE_HIGHMED_TASK_EXECUTE_FEASIBILITY_PROCESS_URI
48+
+ VERSION;
4949
String PROFILE_HIGHMED_TASK_EXECUTE_FEASIBILITY_MESSAGE_NAME = "executeFeasibilityMessage";
5050

5151
String PROFILE_HIGHMED_TASK_COMPUTE_FEASIBILITY = "http://highmed.org/fhir/StructureDefinition/task-compute-feasibility";
5252
String PROFILE_HIGHMED_TASK_COMPUTE_FEASIBILITY_PROCESS_URI = PROCESS_HIGHMED_URI_BASE + "computeFeasibility/";
53-
String PROFILE_HIGHMED_TASK_COMPUTE_FEASIBILITY_PROCESS_URI_AND_LATEST_VERSION =
54-
PROFILE_HIGHMED_TASK_COMPUTE_FEASIBILITY_PROCESS_URI + VERSION;
53+
String PROFILE_HIGHMED_TASK_COMPUTE_FEASIBILITY_PROCESS_URI_AND_LATEST_VERSION = PROFILE_HIGHMED_TASK_COMPUTE_FEASIBILITY_PROCESS_URI
54+
+ VERSION;
5555
String PROFILE_HIGHMED_TASK_COMPUTE_FEASIBILITY_MESSAGE_NAME = "computeFeasibilityMessage";
5656

5757
String PROFILE_HIGHMED_TASK_SINGLE_MEDIC_RESULT_FEASIBILITY = "http://highmed.org/fhir/StructureDefinition/task-single-medic-result-feasibility";

‎dsf-bpe-process-feasibility/src/main/java/org/highmed/dsf/bpe/FeasibilityProcessPluginDefinition.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
import org.highmed.dsf.fhir.resources.ResourceProvider;
1414
import org.highmed.dsf.fhir.resources.StructureDefinitionResource;
1515
import org.highmed.dsf.fhir.resources.ValueSetResource;
16+
import org.springframework.core.env.PropertyResolver;
1617

1718
import ca.uhn.fhir.context.FhirContext;
1819

1920
public class FeasibilityProcessPluginDefinition implements ProcessPluginDefinition
2021
{
21-
public static final String VERSION = "0.4.1";
22+
public static final String VERSION = "0.5.0";
2223

2324
@Override
2425
public String getName()
@@ -45,7 +46,8 @@ public Stream<Class<?>> getSpringConfigClasses()
4546
}
4647

4748
@Override
48-
public ResourceProvider getResourceProvider(FhirContext fhirContext, ClassLoader classLoader)
49+
public ResourceProvider getResourceProvider(FhirContext fhirContext, ClassLoader classLoader,
50+
PropertyResolver resolver)
4951
{
5052
var aCom = ActivityDefinitionResource.file("fhir/ActivityDefinition/highmed-computeFeasibility.xml");
5153
var aExe = ActivityDefinitionResource.file("fhir/ActivityDefinition/highmed-executeFeasibility.xml");
@@ -65,12 +67,11 @@ public ResourceProvider getResourceProvider(FhirContext fhirContext, ClassLoader
6567
var vF = ValueSetResource.file("fhir/ValueSet/highmed-feasibility.xml");
6668

6769
Map<String, List<AbstractResource>> resourcesByProcessKeyAndVersion = Map.of(
68-
"computeFeasibility/" + VERSION, Arrays.asList(aCom, cF, sTCom, sTResS, vF),
69-
"executeFeasibility/" + VERSION, Arrays.asList(aExe, cF, sTExe, vF),
70-
"requestFeasibility/" + VERSION, Arrays.asList(aReq, cF, sTReq, sTResM, sTErr, vF));
70+
"highmedorg_computeFeasibility/" + VERSION, Arrays.asList(aCom, cF, sTCom, sTResS, vF),
71+
"highmedorg_executeFeasibility/" + VERSION, Arrays.asList(aExe, cF, sTExe, vF),
72+
"highmedorg_requestFeasibility/" + VERSION, Arrays.asList(aReq, cF, sTReq, sTResM, sTErr, vF));
7173

72-
return ResourceProvider
73-
.read(VERSION, () -> fhirContext.newXmlParser().setStripVersionsFromReferences(false), classLoader,
74-
resourcesByProcessKeyAndVersion);
74+
return ResourceProvider.read(VERSION, () -> fhirContext.newXmlParser().setStripVersionsFromReferences(false),
75+
classLoader, resolver, resourcesByProcessKeyAndVersion);
7576
}
7677
}

‎dsf-bpe-process-feasibility/src/main/java/org/highmed/dsf/bpe/message/SendMedicRequest.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import org.camunda.bpm.engine.delegate.DelegateExecution;
1616
import org.highmed.dsf.bpe.variables.BloomFilterConfig;
17+
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
1718
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
1819
import org.highmed.dsf.fhir.organization.OrganizationProvider;
1920
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
@@ -28,9 +29,9 @@
2829
public class SendMedicRequest extends AbstractTaskMessageSend
2930
{
3031
public SendMedicRequest(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
31-
OrganizationProvider organizationProvider, FhirContext fhirContext)
32+
ReadAccessHelper readAccessHelper, OrganizationProvider organizationProvider, FhirContext fhirContext)
3233
{
33-
super(clientProvider, taskHelper, organizationProvider, fhirContext);
34+
super(clientProvider, taskHelper, readAccessHelper, organizationProvider, fhirContext);
3435
}
3536

3637
@Override
@@ -45,14 +46,12 @@ protected Stream<ParameterComponent> getAdditionalInputParameters(DelegateExecut
4546
new Reference().setReference(researchStudyId.toVersionless().getValueAsString()));
4647

4748
boolean needsConsentCheck = (boolean) execution.getVariable(BPMN_EXECUTION_VARIABLE_NEEDS_CONSENT_CHECK);
48-
ParameterComponent inputNeedsConsentCheck = getTaskHelper()
49-
.createInput(CODESYSTEM_HIGHMED_FEASIBILITY, CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_NEEDS_CONSENT_CHECK,
50-
needsConsentCheck);
49+
ParameterComponent inputNeedsConsentCheck = getTaskHelper().createInput(CODESYSTEM_HIGHMED_FEASIBILITY,
50+
CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_NEEDS_CONSENT_CHECK, needsConsentCheck);
5151

5252
boolean needsRecordLinkage = (boolean) execution.getVariable(BPMN_EXECUTION_VARIABLE_NEEDS_RECORD_LINKAGE);
53-
ParameterComponent inputNeedsRecordLinkage = getTaskHelper()
54-
.createInput(CODESYSTEM_HIGHMED_FEASIBILITY, CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_NEEDS_RECORD_LINKAGE,
55-
needsRecordLinkage);
53+
ParameterComponent inputNeedsRecordLinkage = getTaskHelper().createInput(CODESYSTEM_HIGHMED_FEASIBILITY,
54+
CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_NEEDS_RECORD_LINKAGE, needsRecordLinkage);
5655

5756
if (needsRecordLinkage)
5857
{

‎dsf-bpe-process-feasibility/src/main/java/org/highmed/dsf/bpe/message/SendMultiMedicErrors.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.stream.Stream;
77

88
import org.camunda.bpm.engine.delegate.DelegateExecution;
9+
import org.highmed.dsf.fhir.authorization.read.ReadAccessHelper;
910
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
1011
import org.highmed.dsf.fhir.organization.OrganizationProvider;
1112
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
@@ -20,23 +21,23 @@
2021
public class SendMultiMedicErrors extends AbstractTaskMessageSend
2122
{
2223
public SendMultiMedicErrors(FhirWebserviceClientProvider clientProvider, TaskHelper taskHelper,
23-
OrganizationProvider organizationProvider, FhirContext fhirContext)
24+
ReadAccessHelper readAccessHelper, OrganizationProvider organizationProvider, FhirContext fhirContext)
2425
{
25-
super(clientProvider, taskHelper, organizationProvider, fhirContext);
26+
super(clientProvider, taskHelper, readAccessHelper, organizationProvider, fhirContext);
2627
}
2728

2829
@Override
2930
protected Stream<ParameterComponent> getAdditionalInputParameters(DelegateExecution execution)
3031
{
3132
Task task = getLeadingTaskFromExecutionVariables();
3233

33-
String taskUrl = new Reference(new IdType(getFhirWebserviceClientProvider().getLocalBaseUrl() + "/Task" , task.getIdElement().getIdPart()))
34-
.getReference();
34+
String taskUrl = new Reference(new IdType(getFhirWebserviceClientProvider().getLocalBaseUrl() + "/Task",
35+
task.getIdElement().getIdPart())).getReference();
3536

36-
Task.ParameterComponent input = getTaskHelper()
37-
.createInput(CODESYSTEM_HIGHMED_BPMN, CODESYSTEM_HIGHMED_BPMN_VALUE_ERROR,
38-
"An error occurred while calculating the multi medic feasibility result for "
39-
+ "all defined cohorts, see task with url='" + taskUrl + "'");
37+
Task.ParameterComponent input = getTaskHelper().createInput(CODESYSTEM_HIGHMED_BPMN,
38+
CODESYSTEM_HIGHMED_BPMN_VALUE_ERROR,
39+
"An error occurred while calculating the multi medic feasibility result for "
40+
+ "all defined cohorts, see task with url='" + taskUrl + "'");
4041
return Stream.of(input);
4142
}
4243
}

0 commit comments

Comments
 (0)