Merge pull request #315 from ehrbase/feature/fix_db_ser_event

Feature/fix db ser event
ehrbase · Feb 3, 2022 · ef824e1 · ef824e1
2 parents f4c6447 + 915ddc4
commit ef824e1
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 135 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,8 +10,12 @@ Note: version releases in the 0.x.y range may introduce breaking changes.
 - Upgrade to Archie 1.0.4 ([#292](https://github.com/ehrbase/openEHR_SDK/pull/292))
 - cleanup created templates (https://github.com/ehrbase/openEHR_SDK/issues/298)
 - WebTemplate based validation (see https://github.com/ehrbase/openEHR_SDK/pull/309)
-- flat: created conformance tests (see https://github.com/ehrbase/openEHR_SDK/pull/310; https://github.com/ehrbase/openEHR_SDK/pull/305; https://github.com/ehrbase/openEHR_SDK/pull/304; https://github.com/ehrbase/openEHR_SDK/pull/301) 
-- db-serialising: created conformance test (see https://github.com/ehrbase/openEHR_SDK/pull/311) 
+- flat: created conformance tests (see https://github.com/ehrbase/openEHR_SDK/pull/310
+  ; https://github.com/ehrbase/openEHR_SDK/pull/305; https://github.com/ehrbase/openEHR_SDK/pull/304
+  ; https://github.com/ehrbase/openEHR_SDK/pull/301)
+- db-serialising: created conformance test (see https://github.com/ehrbase/openEHR_SDK/pull/311)
+- db-serialising: fix handing of guideline_id & work_flow_id &
+  wf_definition (https://github.com/ehrbase/openEHR_SDK/pull/315)
 
 ### Fixed
 

diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/attributes/CareEntryAttributes.java b/serialisation/src/main/java/org/ehrbase/serialisation/attributes/CareEntryAttributes.java
@@ -20,10 +20,12 @@
 import com.nedap.archie.rm.composition.CareEntry;
 import org.ehrbase.serialisation.dbencoding.CompositionSerializer;
 import org.ehrbase.serialisation.dbencoding.ItemStack;
+import org.ehrbase.serialisation.dbencoding.RmObjectEncoding;
 
 import java.util.Map;
 
 import static org.ehrbase.serialisation.dbencoding.CompositionSerializer.TAG_GUIDELINE_ID;
+
 /** populate the attributes for RM CareEntry */
 public abstract class CareEntryAttributes extends EntryAttributes {
 
@@ -34,8 +36,10 @@ public CareEntryAttributes(
 
   public Map<String, Object> toMap(CareEntry careEntry) {
 
-    if (careEntry.getGuidelineId() != null)
-      map = toMap(TAG_GUIDELINE_ID, careEntry.getGuidelineId(), careEntry.getName());
+    if (careEntry.getGuidelineId() != null) {
+
+      map.put(TAG_GUIDELINE_ID, new RmObjectEncoding(careEntry.getGuidelineId()).toMap());
+    }
 
     map = super.toMap(careEntry);
 

diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/attributes/EntryAttributes.java b/serialisation/src/main/java/org/ehrbase/serialisation/attributes/EntryAttributes.java
@@ -51,8 +51,10 @@ protected Map<String, Object> toMap(Entry entry){
             map.put(TAG_ENCODING, new RmObjectEncoding(entry.getEncoding()).toMap());
         }
 
-        if (entry.getWorkflowId() != null)
-            map = toMap(TAG_WORKFLOW_ID, entry.getWorkflowId(), entry.getName());
+    if (entry.getWorkflowId() != null) {
+
+      map.put(TAG_WORKFLOW_ID, new RmObjectEncoding(entry.getWorkflowId()).toMap());
+    }
 
         if (entry.getOtherParticipations() != null && !entry.getOtherParticipations().isEmpty()){
             map.put(TAG_OTHER_PARTICIPATIONS, new OtherParticipationAttributes(entry.getOtherParticipations(), compositionSerializer).toMap());

diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/attributes/InstructionAttributes.java b/serialisation/src/main/java/org/ehrbase/serialisation/attributes/InstructionAttributes.java
@@ -17,15 +17,15 @@
 
 package org.ehrbase.serialisation.attributes;
 
-import static org.ehrbase.serialisation.dbencoding.CompositionSerializer.TAG_EXPIRY_TIME;
-import static org.ehrbase.serialisation.dbencoding.CompositionSerializer.TAG_NARRATIVE;
-
 import com.nedap.archie.rm.composition.Instruction;
-import java.util.Map;
 import org.ehrbase.serialisation.dbencoding.CompositionSerializer;
 import org.ehrbase.serialisation.dbencoding.ItemStack;
 import org.ehrbase.serialisation.dbencoding.RmObjectEncoding;
 
+import java.util.Map;
+
+import static org.ehrbase.serialisation.dbencoding.CompositionSerializer.*;
+
 /**
  * populate the attributes for RM Instruction (narrative)
  */
@@ -45,6 +45,9 @@ public Map<String, Object> toMap(Instruction instruction) {
     if (instruction.getExpiryTime() != null) {
       map.put(TAG_EXPIRY_TIME, new RmObjectEncoding(instruction.getExpiryTime()).toMap());
     }
+    if (instruction.getWfDefinition() != null) {
+      map.put(TAG_WF_DEFINITION, new RmObjectEncoding(instruction.getWfDefinition()).toMap());
+    }
 
     map = super.toMap(instruction);
 

diff --git a/serialisation/src/main/java/org/ehrbase/serialisation/dbencoding/CompositionSerializer.java b/serialisation/src/main/java/org/ehrbase/serialisation/dbencoding/CompositionSerializer.java
@@ -96,6 +96,7 @@ public enum WalkerOutputMode {
   public static final String TAG_ISM_TRANSITION_REASON = "/careflow_step";
   public static final String TAG_TRANSITION = "/transition";
   public static final String TAG_WORKFLOW_ID = "/workflow_id";
+  public static final String TAG_WF_DEFINITION = "/wf_definition";
   public static final String TAG_GUIDELINE_ID = "/guideline_id";
   public static final String TAG_OTHER_PARTICIPATIONS = "/other_participations";
   public static final String TAG_PROVIDER = "/provider"; // care entry provider

diff --git a/...ion_conformance_test/src/test/java/org/ehrbase/conformance_test/db/DbConformanceTest.java b/...ion_conformance_test/src/test/java/org/ehrbase/conformance_test/db/DbConformanceTest.java
@@ -80,131 +80,6 @@ private static List<Arguments> testRoundTripArguments(){
                           new String[] {}));
                   break;
 
-                case EHRBASE_CONFORMANCE_OBSERVATION:
-                case EHRBASE_CONFORMANCE_FEEDER_AUDIT_MULTIMEDIA:
-                  arguments.add(
-                      Arguments.of(
-                          test,
-                          new String[] {},
-                          new String[] {
-                            // see https://jira.vitagroup.ag/browse/CDR-219
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_observation/_guideline_id|type, value: GUIDELINE",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_observation/_guideline_id|namespace, value: HOSPITAL-NS",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_observation/_guideline_id|id, value: 3445",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_observation/_guideline_id|id_scheme, value: HOSPITAL-NS",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_observation/_work_flow_id|type, value: WORKFLOW",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_observation/_work_flow_id|namespace, value: HOSPITAL-NS",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_observation/_work_flow_id|id, value: 335645",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_observation/_work_flow_id|id_scheme, value: HOSPITAL-NS"
-                          },
-                          new String[] {
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-OBSERVATION.conformance_observation.v0, 1]/workflow_id/id",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-OBSERVATION.conformance_observation.v0, 1]/workflow_id/type",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-OBSERVATION.conformance_observation.v0, 1]/workflow_id/namespace",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-OBSERVATION.conformance_observation.v0, 1]/guideline_id/namespace",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-OBSERVATION.conformance_observation.v0, 1]/guideline_id/id",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-OBSERVATION.conformance_observation.v0, 1]/guideline_id/type"
-                          }));
-                  break;
-
-                case EHRBASE_CONFORMANCE_EVALUATION:
-                  arguments.add(
-                      Arguments.of(
-                          test,
-                          new String[] {},
-                          new String[] {
-                            // see https://jira.vitagroup.ag/browse/CDR-219
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_evaluation/_guideline_id|type, value: GUIDELINE",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_evaluation/_guideline_id|namespace, value: HOSPITAL-NS",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_evaluation/_guideline_id|id, value: 3445",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_evaluation/_guideline_id|id_scheme, value: HOSPITAL-NS",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_evaluation/_work_flow_id|type, value: WORKFLOW",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_evaluation/_work_flow_id|namespace, value: HOSPITAL-NS",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_evaluation/_work_flow_id|id, value: 335645",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_evaluation/_work_flow_id|id_scheme, value: HOSPITAL-NS"
-                          },
-                          new String[] {
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-EVALUATION.conformance_evaluation.v0, 1]/workflow_id/id",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-EVALUATION.conformance_evaluation.v0, 1]/workflow_id/type",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-EVALUATION.conformance_evaluation.v0, 1]/workflow_id/namespace",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-EVALUATION.conformance_evaluation.v0, 1]/guideline_id/namespace",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-EVALUATION.conformance_evaluation.v0, 1]/guideline_id/id",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-EVALUATION.conformance_evaluation.v0, 1]/guideline_id/type"
-                          }));
-                  break;
-                case EHRBASE_CONFORMANCE_ACTION:
-                  arguments.add(
-                      Arguments.of(
-                          test,
-                          new String[] {},
-                          new String[] {
-                            // see https://jira.vitagroup.ag/browse/CDR-219
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_action/_guideline_id|type, value: GUIDELINE",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_action/_guideline_id|namespace, value: HOSPITAL-NS",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_action/_guideline_id|id, value: 3445",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_action/_guideline_id|id_scheme, value: HOSPITAL-NS",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_action/_work_flow_id|type, value: WORKFLOW",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_action/_work_flow_id|namespace, value: HOSPITAL-NS",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_action/_work_flow_id|id, value: 335645",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_action/_work_flow_id|id_scheme, value: HOSPITAL-NS"
-                          },
-                          new String[] {
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-ACTION.conformance_action_.v0, 1]/workflow_id/id",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-ACTION.conformance_action_.v0, 1]/workflow_id/type",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-ACTION.conformance_action_.v0, 1]/workflow_id/namespace",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-ACTION.conformance_action_.v0, 1]/guideline_id/namespace",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-ACTION.conformance_action_.v0, 1]/guideline_id/id",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-ACTION.conformance_action_.v0, 1]/guideline_id/type"
-                          }));
-                  break;
-                case EHRBASE_CONFORMANCE_INSTRUCTION:
-                  arguments.add(
-                      Arguments.of(
-                          test,
-                          new String[] {},
-                          new String[] {
-                            // see https://jira.vitagroup.ag/browse/CDR-219
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_instruction/_guideline_id|type, value: GUIDELINE",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_instruction/_guideline_id|namespace, value: HOSPITAL-NS",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_instruction/_guideline_id|id, value: 3445",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_instruction/_guideline_id|id_scheme, value: HOSPITAL-NS",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_instruction/_work_flow_id|type, value: WORKFLOW",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_instruction/_work_flow_id|namespace, value: HOSPITAL-NS",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_instruction/_work_flow_id|id, value: 335645",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_instruction/_work_flow_id|id_scheme, value: HOSPITAL-NS",
-                            // https://jira.vitagroup.ag/browse/CDR-221
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_instruction/_wf_definition|value, value: wf_definition",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_instruction/_wf_definition|formalism, value: formalism"
-                          },
-                          new String[] {
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-INSTRUCTION.conformance_instruction.v0, 1]/workflow_id/id",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-INSTRUCTION.conformance_instruction.v0, 1]/workflow_id/type",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-INSTRUCTION.conformance_instruction.v0, 1]/workflow_id/namespace",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-INSTRUCTION.conformance_instruction.v0, 1]/guideline_id/namespace",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-INSTRUCTION.conformance_instruction.v0, 1]/guideline_id/id",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-INSTRUCTION.conformance_instruction.v0, 1]/guideline_id/type"
-                          }));
-                  break;
-
-                case EHRBASE_CONFORMANCE_ADMIN_ENTRY:
-                  arguments.add(
-                      Arguments.of(
-                          test,
-                          new String[] {},
-                          new String[] {
-                            // see https://jira.vitagroup.ag/browse/CDR-219
-
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_admin_entry/_work_flow_id|type, value: WORKFLOW",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_admin_entry/_work_flow_id|namespace, value: HOSPITAL-NS",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_admin_entry/_work_flow_id|id, value: 335645",
-                            "Extra path: conformance-ehrbase.de.v0/conformance_section/conformance_admin_entry/_work_flow_id|id_scheme, value: HOSPITAL-NS"
-                          },
-                          new String[] {
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-ADMIN_ENTRY.conformance_admin_entry.v0, 1]/workflow_id/id",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-ADMIN_ENTRY.conformance_admin_entry.v0, 1]/workflow_id/type",
-                            "/content[openEHR-EHR-SECTION.conformance_section.v0, 1]/items[openEHR-EHR-ADMIN_ENTRY.conformance_admin_entry.v0, 1]/workflow_id/namespace"
-                          }));
-                  break;
 
                 case EHRBASE_CONFORMANCE_DATA_TYPES_DV_EHR_URI:
                   // see https://jira.vitagroup.ag/browse/CDR-214