Skip to content

Commit 136a573

Browse files
wetretwetret
committed
refactors namings in constants and fhir profiles, exclude data sharing processes in 3medic-ttp vm's, add script to shutdown all vm's
1 parent 0d3a17c commit 136a573

File tree

102 files changed

+834
-784
lines changed

Some content is hidden

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

102 files changed

+834
-784
lines changed

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

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
package org.highmed.dsf.bpe;
22

3-
import static org.highmed.dsf.bpe.ConstantsBase.PROCESS_URI_BASE;
3+
import static org.highmed.dsf.bpe.ConstantsBase.PROCESS_HIGHMED_URI_BASE;
44
import static org.highmed.dsf.bpe.FeasibilityProcessPluginDefinition.VERSION;
55

66
public interface ConstantsFeasibility
77
{
8-
String VARIABLE_BLOOM_FILTER_CONFIG = "bloomFilterConfig";
9-
String VARIABLE_QUERY_RESULTS = "queryResults";
10-
String VARIABLE_FINAL_QUERY_RESULTS = "finalQueryResults";
11-
String VARIABLE_RESEARCH_STUDY = "researchStudy";
12-
String VARIABLE_COHORTS = "cohorts";
13-
String VARIABLE_QUERIES = "queries";
14-
String VARIABLE_NEEDS_CONSENT_CHECK = "needsConsentCheck";
15-
String VARIABLE_NEEDS_RECORD_LINKAGE = "needsRecordLinkage";
8+
String BPMN_EXECUTION_VARIABLE_RESEARCH_STUDY = "researchStudy";
9+
String BPMN_EXECUTION_VARIABLE_NEEDS_CONSENT_CHECK = "needsConsentCheck";
10+
String BPMN_EXECUTION_VARIABLE_NEEDS_RECORD_LINKAGE = "needsRecordLinkage";
11+
String BPMN_EXECUTION_VARIABLE_BLOOM_FILTER_CONFIG = "bloomFilterConfig";
12+
String BPMN_EXECUTION_VARIABLE_COHORTS = "cohorts";
13+
String BPMN_EXECUTION_VARIABLE_QUERIES = "queries";
14+
String BPMN_EXECUTION_VARIABLE_QUERY_RESULTS = "queryResults";
15+
String BPMN_EXECUTION_VARIABLE_FINAL_QUERY_RESULTS = "finalQueryResults";
1616

17-
String ERROR_CODE_MULTI_MEDIC_RESULT = "errorMultiMedicSimpleFeasibilityResult";
17+
String BPMN_EXECUTION_ERROR_CODE_MULTI_MEDIC_RESULT = "errorMultiMedicFeasibilityResult";
1818

1919
// Must be 3 or larger, as otherwise it is possible to draw conclusions about the individual MeDICs
2020
// (if I already know the cohort size in my MeDIC)
2121
int MIN_PARTICIPATING_MEDICS = 3;
2222
int MIN_COHORT_DEFINITIONS = 1;
23-
String SIMPLE_FEASIBILITY_QUERY_PREFIX = "select count";
23+
String FEASIBILITY_QUERY_PREFIX = "select count";
2424

2525
String CODESYSTEM_HIGHMED_FEASIBILITY = "http://highmed.org/fhir/CodeSystem/feasibility";
2626
String CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_PARTICIPATING_MEDIC_CORRELATION_KEY = "medic-correlation-key";
@@ -34,37 +34,41 @@ public interface ConstantsFeasibility
3434
String CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_MULTI_MEDIC_RESULT = "multi-medic-result";
3535
String CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_RESEARCH_STUDY_REFERENCE = "research-study-reference";
3636

37-
String EXTENSION_PARTICIPATING_MEDIC_URI = "http://highmed.org/fhir/StructureDefinition/participating-medic";
38-
String EXTENSION_PARTICIPATING_TTP_URI = "http://highmed.org/fhir/StructureDefinition/participating-ttp";
39-
String EXTENSION_GROUP_ID_URI = "http://highmed.org/fhir/StructureDefinition/group-id";
37+
String EXTENSION_HIGHMED_PARTICIPATING_MEDIC = "http://highmed.org/fhir/StructureDefinition/extension-participating-medic";
38+
String EXTENSION_HIGHMED_PARTICIPATING_TTP = "http://highmed.org/fhir/StructureDefinition/extension-participating-ttp";
39+
String EXTENSION_HIGHMED_GROUP_ID = "http://highmed.org/fhir/StructureDefinition/extension-group-id";
4040

41-
String GROUP_PROFILE = "http://highmed.org/fhir/StructureDefinition/highmed-group";
42-
String FEASIBILITY_RESEARCH_STUDY_PROFILE = "http://highmed.org/fhir/StructureDefinition/highmed-research-study-feasibility";
43-
String RESEARCH_STUDY_IDENTIFIER_SYSTEM = "http://highmed.org/fhir/NamingSystem/research-study-identifier";
41+
String PROFILE_HIGHMED_GROUP = "http://highmed.org/fhir/StructureDefinition/group";
42+
String PROFILE_HIGHEMD_RESEARCH_STUDY_FEASIBILITY = "http://highmed.org/fhir/StructureDefinition/research-study-feasibility";
4443

45-
String REQUEST_FEASIBILITY_TASK_PROFILE = "http://highmed.org/fhir/StructureDefinition/highmed-task-request-simple-feasibility";
46-
String REQUEST_FEASIBILITY_PROCESS_URI = PROCESS_URI_BASE + "requestSimpleFeasibility/";
47-
String REQUEST_FEASIBILITY_PROCESS_URI_AND_LATEST_VERSION = REQUEST_FEASIBILITY_PROCESS_URI + VERSION;
48-
String REQUEST_FEASIBILITY_MESSAGE_NAME = "requestSimpleFeasibilityMessage";
44+
String PROFILE_HIGHMED_TASK_REQUEST_FEASIBILITY = "http://highmed.org/fhir/StructureDefinition/task-request-feasibility";
45+
String PROFILE_HIGHMED_TASK_REQUEST_FEASIBILITY_PROCESS_URI = PROCESS_HIGHMED_URI_BASE + "requestFeasibility/";
46+
String PROFILE_HIGHMED_TASK_REQUEST_FEASIBILITY_PROCESS_URI_AND_LATEST_VERSION =
47+
PROFILE_HIGHMED_TASK_REQUEST_FEASIBILITY_PROCESS_URI + VERSION;
48+
String PROFILE_HIGHMED_TASK_REQUEST_FEASIBILITY_MESSAGE_NAME = "requestFeasibilityMessage";
4949

50-
String EXECUTE_FEASIBILITY_TASK_PROFILE = "http://highmed.org/fhir/StructureDefinition/highmed-task-execute-simple-feasibility";
51-
String EXECUTE_FEASIBILITY_PROCESS_URI = PROCESS_URI_BASE + "executeSimpleFeasibility/";
52-
String EXECUTE_FEASIBILITY_PROCESS_URI_AND_LATEST_VERSION = EXECUTE_FEASIBILITY_PROCESS_URI + VERSION;
53-
String EXECUTE_FEASIBILITY_MESSAGE_NAME = "executeSimpleFeasibilityMessage";
50+
String PROFILE_HIGHMED_TASK_LOCAL_SERVICES_PROCESS_URI = PROCESS_HIGHMED_URI_BASE + "localServicesIntegration/";
5451

55-
String COMPUTE_FEASIBILITY_TASK_PROFILE = "http://highmed.org/fhir/StructureDefinition/highmed-task-compute-simple-feasibility";
56-
String COMPUTE_FEASIBILITY_PROCESS_URI = PROCESS_URI_BASE + "computeSimpleFeasibility/";
57-
String COMPUTE_FEASIBILITY_PROCESS_URI_AND_LATEST_VERSION = COMPUTE_FEASIBILITY_PROCESS_URI + VERSION;
58-
String COMPUTE_FEASIBILITY_MESSAGE_NAME = "computeSimpleFeasibilityMessage";
52+
String PROFILE_HIGHMED_TASK_EXECUTE_FEASIBILITY = "http://highmed.org/fhir/StructureDefinition/task-execute-feasibility";
53+
String PROFILE_HIGHMED_TASK_EXECUTE_FEASIBILITY_PROCESS_URI = PROCESS_HIGHMED_URI_BASE + "executeFeasibility/";
54+
String PROFILE_HIGHMED_TASK_EXECUTE_FEASIBILITY_PROCESS_URI_AND_LATEST_VERSION =
55+
PROFILE_HIGHMED_TASK_EXECUTE_FEASIBILITY_PROCESS_URI + VERSION;
56+
String PROFILE_HIGHMED_TASK_EXECUTE_FEASIBILITY_MESSAGE_NAME = "executeFeasibilityMessage";
5957

60-
String SINGLE_MEDIC_RESULT_FEASIBILITY_TASK_PROFILE = "http://highmed.org/fhir/StructureDefinition/highmed-task-single-medic-result-simple-feasibility";
61-
String SINGLE_MEDIC_RESULT_FEASIBILITY_MESSAGE_NAME = "resultSingleMedicSimpleFeasibilityMessage";
58+
String PROFILE_HIGHMED_TASK_COMPUTE_FEASIBILITY = "http://highmed.org/fhir/StructureDefinition/task-compute-feasibility";
59+
String PROFILE_HIGHMED_TASK_COMPUTE_FEASIBILITY_PROCESS_URI = PROCESS_HIGHMED_URI_BASE + "computeFeasibility/";
60+
String PROFILE_HIGHMED_TASK_COMPUTE_FEASIBILITY_PROCESS_URI_AND_LATEST_VERSION =
61+
PROFILE_HIGHMED_TASK_COMPUTE_FEASIBILITY_PROCESS_URI + VERSION;
62+
String PROFILE_HIGHMED_TASK_COMPUTE_FEASIBILITY_MESSAGE_NAME = "computeFeasibilityMessage";
6263

63-
String MULTI_MEDIC_RESULT_FEASIBILITY_TASK_PROFILE = "http://highmed.org/fhir/StructureDefinition/highmed-task-multi-medic-result-simple-feasibility";
64-
String MULTI_MEDIC_RESULT_FEASIBILITY_MESSAGE_NAME = "resultMultiMedicSimpleFeasibilityMessage";
64+
String PROFILE_HIGHMED_TASK_SINGLE_MEDIC_RESULT_FEASIBILITY = "http://highmed.org/fhir/StructureDefinition/task-single-medic-result-feasibility";
65+
String PROFILE_HIGHMED_TASK_SINGLE_MEDIC_RESULT_FEASIBILITY_MESSAGE_NAME = "resultSingleMedicFeasibilityMessage";
6566

66-
String ERROR_FEASIBILITY_TASK_PROFILE = "http://highmed.org/fhir/StructureDefinition/highmed-task-multi-medic-error-simple-feasibility";
67-
String ERROR_FEASIBILITY_MESSAGE_NAME = "errorMultiMedicSimpleFeasibilityMessage";
67+
String PROFILE_HIGHMED_TASK_MULTI_MEDIC_RESULT_FEASIBILITY = "http://highmed.org/fhir/StructureDefinition/task-multi-medic-result-feasibility";
68+
String PROFILE_HIGHMED_TASK_MULTI_MEDIC_RESULT_FEASIBILITY_MESSAGE_NAME = "resultMultiMedicFeasibilityMessage";
6869

69-
String LOCAL_SERVICES_PROCESS_URI = PROCESS_URI_BASE + "localServicesIntegration/";
70+
String PROFILE_HIGHMED_TASK_ERROR_FEASIBILITY = "http://highmed.org/fhir/StructureDefinition/task-multi-medic-error-feasibility";
71+
String PROFILE_HIGHMED_TASK_ERROR_FEASIBILITY_MESSAGE_NAME = "errorMultiMedicFeasibilityMessage";
72+
73+
String NAMINGSYSTEM_HIGHMED_RESEARCH_STUDY_IDENTIFIER = "http://highmed.org/fhir/NamingSystem/research-study-identifier";
7074
}

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

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ public String getVersion()
3636
@Override
3737
public Stream<String> getBpmnFiles()
3838
{
39-
return Stream.of("bpe/requestSimpleFeasibility.bpmn", "bpe/computeSimpleFeasibility.bpmn",
40-
"bpe/executeSimpleFeasibility.bpmn");
39+
return Stream.of("bpe/requestFeasibility.bpmn", "bpe/computeFeasibility.bpmn", "bpe/executeFeasibility.bpmn");
4140
}
4241

4342
@Override
@@ -49,14 +48,14 @@ public Stream<Class<?>> getSpringConfigClasses()
4948
@Override
5049
public ResourceProvider getResourceProvider(FhirContext fhirContext, ClassLoader classLoader)
5150
{
52-
var aCom = ActivityDefinitionResource.file("fhir/ActivityDefinition/computeSimpleFeasibility.xml");
53-
var aExe = ActivityDefinitionResource.file("fhir/ActivityDefinition/executeSimpleFeasibility.xml");
54-
var aReq = ActivityDefinitionResource.file("fhir/ActivityDefinition/requestSimpleFeasibility.xml");
51+
var aCom = ActivityDefinitionResource.file("fhir/ActivityDefinition/highmed-computeFeasibility.xml");
52+
var aExe = ActivityDefinitionResource.file("fhir/ActivityDefinition/highmed-executeFeasibility.xml");
53+
var aReq = ActivityDefinitionResource.file("fhir/ActivityDefinition/highmed-requestFeasibility.xml");
5554

56-
var cF = CodeSystemResource.file("fhir/CodeSystem/feasibility.xml");
57-
var cQT = CodeSystemResource.file("fhir/CodeSystem/query-type.xml");
55+
var cF = CodeSystemResource.file("fhir/CodeSystem/highmed-feasibility.xml");
56+
var cQT = CodeSystemResource.file("fhir/CodeSystem/highmed-query-type.xml");
5857

59-
var n = NamingSystemResource.file("fhir/NamingSystem/highmed-research-study.xml");
58+
var n = NamingSystemResource.file("fhir/NamingSystem/highmed-research-study-identifier.xml");
6059

6160
var sExtG = StructureDefinitionResource.file("fhir/StructureDefinition/highmed-extension-group-id.xml");
6261
var sExtPartMeDic = StructureDefinitionResource
@@ -66,31 +65,25 @@ public ResourceProvider getResourceProvider(FhirContext fhirContext, ClassLoader
6665
var sExtQ = StructureDefinitionResource.file("fhir/StructureDefinition/highmed-extension-query.xml");
6766
var sG = StructureDefinitionResource.file("fhir/StructureDefinition/highmed-group.xml");
6867
var sR = StructureDefinitionResource.file("fhir/StructureDefinition/highmed-research-study-feasibility.xml");
69-
var sTCom = StructureDefinitionResource
70-
.file("fhir/StructureDefinition/highmed-task-compute-simple-feasibility.xml");
71-
var sTErr = StructureDefinitionResource
72-
.file("fhir/StructureDefinition/highmed-task-error-simple-feasibility.xml");
73-
var sTExe = StructureDefinitionResource
74-
.file("fhir/StructureDefinition/highmed-task-execute-simple-feasibility.xml");
68+
var sTCom = StructureDefinitionResource.file("fhir/StructureDefinition/highmed-task-compute-feasibility.xml");
69+
var sTErr = StructureDefinitionResource.file("fhir/StructureDefinition/highmed-task-error-feasibility.xml");
70+
var sTExe = StructureDefinitionResource.file("fhir/StructureDefinition/highmed-task-execute-feasibility.xml");
7571
var sTResM = StructureDefinitionResource
76-
.file("fhir/StructureDefinition/highmed-task-multi-medic-result-simple-feasibility.xml");
77-
var sTReq = StructureDefinitionResource
78-
.file("fhir/StructureDefinition/highmed-task-request-simple-feasibility.xml");
72+
.file("fhir/StructureDefinition/highmed-task-multi-medic-result-feasibility.xml");
73+
var sTReq = StructureDefinitionResource.file("fhir/StructureDefinition/highmed-task-request-feasibility.xml");
7974
var sTResS = StructureDefinitionResource
80-
.file("fhir/StructureDefinition/highmed-task-single-medic-result-simple-feasibility.xml");
75+
.file("fhir/StructureDefinition/highmed-task-single-medic-result-feasibility.xml");
8176

82-
var vF = ValueSetResource.file("fhir/ValueSet/feasibility.xml");
83-
var vQT = ValueSetResource.file("fhir/ValueSet/query-type.xml");
77+
var vF = ValueSetResource.file("fhir/ValueSet/highmed-feasibility.xml");
78+
var vQT = ValueSetResource.file("fhir/ValueSet/highmed-query-type.xml");
8479

8580
Map<String, List<AbstractResource>> resourcesByProcessKeyAndVersion = Map.of(
86-
"computeSimpleFeasibility/" + VERSION, Arrays.asList(aCom, sTCom, vF, cF, sTResS, sExtG, sG),
87-
"executeSimpleFeasibility/" + VERSION,
88-
Arrays.asList(aExe, sTExe, vF, cF, sR, sExtPartTtp, sExtPartMeDic, n, sG, sExtQ, vQT, cQT),
89-
"requestSimpleFeasibility/" + VERSION, Arrays.asList(aReq, sTReq, vF, cF, sR, sExtPartTtp,
90-
sExtPartMeDic, n, sG, sExtQ, vQT, cQT, sTResM, sExtG, sTErr));
81+
"computeFeasibility/" + VERSION, Arrays.asList(aCom, cF, sExtG, sG, sTCom, sTResS, vF),
82+
"executeFeasibility/" + VERSION, Arrays.asList(aExe, cF, cQT, n, sR, sExtPartMeDic, sExtPartTtp, sExtQ, sG, sTExe, vF, vQT),
83+
"requestFeasibility/" + VERSION, Arrays.asList(aReq, cF, cQT, n, sExtG, sExtPartMeDic, sExtPartTtp, sG, sR, sExtQ, sTReq, sTResM, sTErr, vF, vQT));
9184

92-
return ResourceProvider.read(VERSION,
93-
() -> fhirContext.newXmlParser().setStripVersionsFromReferences(false),
94-
classLoader, resourcesByProcessKeyAndVersion);
85+
return ResourceProvider
86+
.read(VERSION, () -> fhirContext.newXmlParser().setStripVersionsFromReferences(false), classLoader,
87+
resourcesByProcessKeyAndVersion);
9588
}
9689
}

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import java.util.stream.Stream;
44

55
import org.camunda.bpm.engine.delegate.DelegateExecution;
6+
import org.highmed.dsf.bpe.ConstantsFeasibility;
7+
import org.highmed.dsf.bpe.variables.BloomFilterConfig;
68
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
79
import org.highmed.dsf.fhir.organization.OrganizationProvider;
810
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
911
import org.highmed.dsf.fhir.task.TaskHelper;
10-
import org.highmed.dsf.bpe.ConstantsFeasibility;
11-
import org.highmed.dsf.bpe.variables.BloomFilterConfig;
1212
import org.hl7.fhir.r4.model.IdType;
1313
import org.hl7.fhir.r4.model.Reference;
1414
import org.hl7.fhir.r4.model.ResearchStudy;
@@ -28,7 +28,7 @@ public SendMedicRequest(FhirWebserviceClientProvider clientProvider, TaskHelper
2828
protected Stream<ParameterComponent> getAdditionalInputParameters(DelegateExecution execution)
2929
{
3030
ResearchStudy researchStudy = (ResearchStudy) execution
31-
.getVariable(ConstantsFeasibility.VARIABLE_RESEARCH_STUDY);
31+
.getVariable(ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_RESEARCH_STUDY);
3232
IdType researchStudyId = new IdType(
3333
getFhirWebserviceClientProvider().getLocalBaseUrl() + "/" + researchStudy.getId());
3434

@@ -37,14 +37,15 @@ protected Stream<ParameterComponent> getAdditionalInputParameters(DelegateExecut
3737
ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_RESEARCH_STUDY_REFERENCE,
3838
new Reference().setReference(researchStudyId.toVersionless().getValueAsString()));
3939

40-
boolean needsConsentCheck = (boolean) execution.getVariable(ConstantsFeasibility.VARIABLE_NEEDS_CONSENT_CHECK);
40+
boolean needsConsentCheck = (boolean) execution
41+
.getVariable(ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_NEEDS_CONSENT_CHECK);
4142
ParameterComponent inputNeedsConsentCheck = getTaskHelper()
4243
.createInput(ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY,
4344
ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_NEEDS_CONSENT_CHECK,
4445
needsConsentCheck);
4546

4647
boolean needsRecordLinkage = (boolean) execution
47-
.getVariable(ConstantsFeasibility.VARIABLE_NEEDS_RECORD_LINKAGE);
48+
.getVariable(ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_NEEDS_RECORD_LINKAGE);
4849
ParameterComponent inputNeedsRecordLinkage = getTaskHelper()
4950
.createInput(ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY,
5051
ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_NEEDS_RECORD_LINKAGE,
@@ -53,7 +54,7 @@ protected Stream<ParameterComponent> getAdditionalInputParameters(DelegateExecut
5354
if (needsRecordLinkage)
5455
{
5556
BloomFilterConfig bloomFilterConfig = (BloomFilterConfig) execution
56-
.getVariable(ConstantsFeasibility.VARIABLE_BLOOM_FILTER_CONFIG);
57+
.getVariable(ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_BLOOM_FILTER_CONFIG);
5758
ParameterComponent inputBloomFilterConfig = getTaskHelper()
5859
.createInput(ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY,
5960
ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_BLOOM_FILTER_CONFIG,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public SendMultiMedicResults(FhirWebserviceClientProvider clientProvider, TaskHe
3434
protected Stream<ParameterComponent> getAdditionalInputParameters(DelegateExecution execution)
3535
{
3636
FinalFeasibilityQueryResults results = (FinalFeasibilityQueryResults) execution
37-
.getVariable(ConstantsFeasibility.VARIABLE_FINAL_QUERY_RESULTS);
37+
.getVariable(ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_FINAL_QUERY_RESULTS);
3838

3939
Stream<ParameterComponent> resultInputs = results.getResults().stream().flatMap(this::toInputs);
4040
Stream<ParameterComponent> errorInput = getErrorInput(execution);
@@ -61,7 +61,7 @@ private Stream<ParameterComponent> toInputs(FinalFeasibilityQueryResult result)
6161

6262
private Extension createCohortIdExtension(String cohortId)
6363
{
64-
return new Extension(ConstantsFeasibility.EXTENSION_GROUP_ID_URI, new Reference(cohortId));
64+
return new Extension(ConstantsFeasibility.EXTENSION_HIGHMED_GROUP_ID, new Reference(cohortId));
6565
}
6666

6767
private Stream<ParameterComponent> getErrorInput(DelegateExecution execution)

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import java.util.stream.Stream;
44

55
import org.camunda.bpm.engine.delegate.DelegateExecution;
6+
import org.highmed.dsf.bpe.ConstantsFeasibility;
7+
import org.highmed.dsf.bpe.variables.FeasibilityQueryResult;
8+
import org.highmed.dsf.bpe.variables.FeasibilityQueryResults;
69
import org.highmed.dsf.fhir.client.FhirWebserviceClientProvider;
710
import org.highmed.dsf.fhir.organization.OrganizationProvider;
811
import org.highmed.dsf.fhir.task.AbstractTaskMessageSend;
912
import org.highmed.dsf.fhir.task.TaskHelper;
10-
import org.highmed.dsf.bpe.ConstantsFeasibility;
11-
import org.highmed.dsf.bpe.variables.FeasibilityQueryResult;
12-
import org.highmed.dsf.bpe.variables.FeasibilityQueryResults;
1313
import org.hl7.fhir.r4.model.Extension;
1414
import org.hl7.fhir.r4.model.Reference;
1515
import org.hl7.fhir.r4.model.Task;
@@ -33,7 +33,7 @@ public SendSingleMedicResults(FhirWebserviceClientProvider clientProvider, TaskH
3333
protected Stream<Task.ParameterComponent> getAdditionalInputParameters(DelegateExecution execution)
3434
{
3535
FeasibilityQueryResults results = (FeasibilityQueryResults) execution
36-
.getVariable(ConstantsFeasibility.VARIABLE_QUERY_RESULTS);
36+
.getVariable(ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_QUERY_RESULTS);
3737

3838
return results.getResults().stream().map(result -> toInput(result));
3939
}
@@ -69,6 +69,6 @@ else if (result.isIdResultSetUrlResult())
6969

7070
private Extension createCohortIdExtension(String cohortId)
7171
{
72-
return new Extension(ConstantsFeasibility.EXTENSION_GROUP_ID_URI, new Reference(cohortId));
72+
return new Extension(ConstantsFeasibility.EXTENSION_HIGHMED_GROUP_ID, new Reference(cohortId));
7373
}
7474
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ public SendTtpRequest(FhirWebserviceClientProvider clientProvider, TaskHelper ta
2525
@Override
2626
protected Stream<Task.ParameterComponent> getAdditionalInputParameters(DelegateExecution execution)
2727
{
28-
Targets multiInstanceTargets = (Targets) execution.getVariable(ConstantsBase.VARIABLE_TARGETS);
28+
Targets multiInstanceTargets = (Targets) execution.getVariable(ConstantsBase.BPMN_EXECUTION_VARIABLE_TARGETS);
2929

3030
Stream<Task.ParameterComponent> inputTargets = multiInstanceTargets.getEntries().stream()
3131
.map(target -> getTaskHelper().createInput(ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY,
3232
ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_PARTICIPATING_MEDIC_CORRELATION_KEY,
3333
target.getCorrelationKey()));
3434

3535
boolean needsRecordLinkage = (boolean) execution
36-
.getVariable(ConstantsFeasibility.VARIABLE_NEEDS_RECORD_LINKAGE);
36+
.getVariable(ConstantsFeasibility.BPMN_EXECUTION_VARIABLE_NEEDS_RECORD_LINKAGE);
3737
Task.ParameterComponent inputNeedsRecordLinkage = getTaskHelper()
3838
.createInput(ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY,
3939
ConstantsFeasibility.CODESYSTEM_HIGHMED_FEASIBILITY_VALUE_NEEDS_RECORD_LINKAGE,

0 commit comments

Comments
 (0)