Skip to content

Commit e6707c7

Browse files
hhundhhund
authored
Merge pull request #19 from highmed/hotfix/18_case-sensitive-aql
Hotfix/18 case sensitive aql
2 parents d957d49 + 1835dde commit e6707c7

File tree

54 files changed

+67
-66
lines changed

Some content is hidden

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

54 files changed

+67
-66
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<artifactId>dsf-bpe-highmed-processes-pom</artifactId>
1010
<groupId>org.highmed.dsf</groupId>
11-
<version>0.4.0</version>
11+
<version>0.4.1</version>
1212
</parent>
1313

1414
<dependencies>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public interface ConstantsFeasibility
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 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";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
public class FeasibilityProcessPluginDefinition implements ProcessPluginDefinition
2020
{
21-
public static final String VERSION = "0.4.0";
21+
public static final String VERSION = "0.4.1";
2222

2323
@Override
2424
public String getName()

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ protected void doExecute(DelegateExecution execution) throws Exception
4848
Map<String, String> queries = new HashMap<>();
4949

5050
Task leadingTask = getLeadingTaskFromExecutionVariables();
51-
cohorts.forEach(group -> {
52-
String aqlQuery = groupHelper.extractAqlQuery(group).toLowerCase();
51+
cohorts.forEach(group ->
52+
{
53+
String aqlQuery = groupHelper.extractAqlQuery(group);
5354

5455
String groupId = group.getId();
5556
if (!aqlQuery.startsWith(ConstantsFeasibility.FEASIBILITY_QUERY_PREFIX))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ private Map<String, String> modifyQueries(Map<String, String> queries)
6464
protected String replaceSelectCountWithSelectMpiId(String value)
6565
{
6666
// TODO Implement correct replacement for default id query
67-
return value.replace("select count(e)", "select e" + ehrIdColumnPath + " as EHRID");
67+
return value.replace("SELECT COUNT(e)", "SELECT e" + ehrIdColumnPath + " as EHRID");
6868
}
6969
}

‎dsf-bpe-process-feasibility/src/main/resources/bpe/computeFeasibility.bpmn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1yff9tp" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.1">
3-
<bpmn:process id="computeFeasibility" isExecutable="true" camunda:versionTag="0.4.0">
3+
<bpmn:process id="computeFeasibility" isExecutable="true" camunda:versionTag="0.4.1">
44
<bpmn:subProcess id="SubProcess_1gopxt4">
55
<bpmn:incoming>SequenceFlow_1lfe4wr</bpmn:incoming>
66
<bpmn:outgoing>SequenceFlow_0xxpamp</bpmn:outgoing>
@@ -47,7 +47,7 @@
4747
<camunda:inputOutput>
4848
<camunda:inputParameter name="processDefinitionKey">requestFeasibility</camunda:inputParameter>
4949
<camunda:inputParameter name="profile">http://highmed.org/fhir/StructureDefinition/task-multi-medic-result-feasibility</camunda:inputParameter>
50-
<camunda:inputParameter name="versionTag">0.4.0</camunda:inputParameter>
50+
<camunda:inputParameter name="versionTag">0.4.1</camunda:inputParameter>
5151
<camunda:inputParameter name="messageName">resultMultiMedicFeasibilityMessage</camunda:inputParameter>
5252
</camunda:inputOutput>
5353
</bpmn:extensionElements>
@@ -99,7 +99,7 @@
9999
<camunda:inputOutput>
100100
<camunda:inputParameter name="processDefinitionKey">requestFeasibility</camunda:inputParameter>
101101
<camunda:inputParameter name="profile">http://highmed.org/fhir/StructureDefinition/task-multi-medic-error-feasibility</camunda:inputParameter>
102-
<camunda:inputParameter name="versionTag">0.4.0</camunda:inputParameter>
102+
<camunda:inputParameter name="versionTag">0.4.1</camunda:inputParameter>
103103
<camunda:inputParameter name="messageName">errorMultiMedicFeasibilityMessage</camunda:inputParameter>
104104
</camunda:inputOutput>
105105
</bpmn:extensionElements>

‎dsf-bpe-process-feasibility/src/main/resources/bpe/executeFeasibility.bpmn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_0drkcb5" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.1">
3-
<bpmn:process id="executeFeasibility" isExecutable="true" camunda:versionTag="0.4.0">
3+
<bpmn:process id="executeFeasibility" isExecutable="true" camunda:versionTag="0.4.1">
44
<bpmn:serviceTask id="checkResults" name="check results" camunda:class="org.highmed.dsf.bpe.service.CheckSingleMedicResults">
55
<bpmn:incoming>SequenceFlow_0q803rh</bpmn:incoming>
66
<bpmn:outgoing>SequenceFlow_04ouilq</bpmn:outgoing>
@@ -25,7 +25,7 @@
2525
<bpmn:extensionElements>
2626
<camunda:inputOutput>
2727
<camunda:inputParameter name="messageName">resultSingleMedicFeasibilityMessage</camunda:inputParameter>
28-
<camunda:inputParameter name="versionTag">0.4.0</camunda:inputParameter>
28+
<camunda:inputParameter name="versionTag">0.4.1</camunda:inputParameter>
2929
<camunda:inputParameter name="processDefinitionKey">computeFeasibility</camunda:inputParameter>
3030
<camunda:inputParameter name="profile">http://highmed.org/fhir/StructureDefinition/task-single-medic-result-feasibility</camunda:inputParameter>
3131
</camunda:inputOutput>

‎dsf-bpe-process-feasibility/src/main/resources/bpe/requestFeasibility.bpmn‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_0inb4ax" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.1">
3-
<bpmn:process id="requestFeasibility" isExecutable="true" camunda:versionTag="0.4.0">
3+
<bpmn:process id="requestFeasibility" isExecutable="true" camunda:versionTag="0.4.1">
44
<bpmn:startEvent id="StartEvent" name="start">
55
<bpmn:outgoing>SequenceFlow_11k77gx</bpmn:outgoing>
66
<bpmn:messageEventDefinition id="MessageEventDefinition_10c2suu" messageRef="Message_1pq9qxp" />
@@ -13,7 +13,7 @@
1313
<bpmn:extensionElements>
1414
<camunda:inputOutput>
1515
<camunda:inputParameter name="processDefinitionKey">executeFeasibility</camunda:inputParameter>
16-
<camunda:inputParameter name="versionTag">0.4.0</camunda:inputParameter>
16+
<camunda:inputParameter name="versionTag">0.4.1</camunda:inputParameter>
1717
<camunda:inputParameter name="messageName">executeFeasibilityMessage</camunda:inputParameter>
1818
<camunda:inputParameter name="profile">http://highmed.org/fhir/StructureDefinition/task-execute-feasibility</camunda:inputParameter>
1919
</camunda:inputOutput>
@@ -34,7 +34,7 @@
3434
<bpmn:extensionElements>
3535
<camunda:inputOutput>
3636
<camunda:inputParameter name="processDefinitionKey">computeFeasibility</camunda:inputParameter>
37-
<camunda:inputParameter name="versionTag">0.4.0</camunda:inputParameter>
37+
<camunda:inputParameter name="versionTag">0.4.1</camunda:inputParameter>
3838
<camunda:inputParameter name="messageName">computeFeasibilityMessage</camunda:inputParameter>
3939
<camunda:inputParameter name="profile">http://highmed.org/fhir/StructureDefinition/task-compute-feasibility</camunda:inputParameter>
4040
</camunda:inputOutput>

‎dsf-bpe-process-feasibility/src/main/resources/fhir/ActivityDefinition/highmed-computeFeasibility.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<!-- status managed by bpe -->
7979
<status value="unknown" />
8080
<experimental value="false" />
81-
<date value="2021-01-26" />
81+
<date value="2021-04-20" />
8282
<publisher value="HiGHmed" />
8383
<contact>
8484
<name value="HiGHmed" />

‎dsf-bpe-process-feasibility/src/main/resources/fhir/ActivityDefinition/highmed-executeFeasibility.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<!-- status managed by bpe -->
5353
<status value="unknown" />
5454
<experimental value="false" />
55-
<date value="2021-01-26" />
55+
<date value="2021-04-20" />
5656
<publisher value="HiGHmed" />
5757
<contact>
5858
<name value="HiGHmed" />

0 commit comments

Comments
 (0)