test complete opt with participations

CaboLabs · Nov 27, 2024 · 2e1bc11 · 2e1bc11
1 parent 513537f
commit 2e1bc11
Show file tree

Hide file tree

Showing 8 changed files with 3,999 additions and 14 deletions.
diff --git a/a_opt_complete.json b/a_opt_complete.json
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-version = 2.0.3
+version = 2.0.4
 group = com.cabolabs
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/instance_generator/RmInstanceGenerator.groovy b/src/main/groovy/com/cabolabs/openehr/opt/instance_generator/RmInstanceGenerator.groovy
@@ -669,8 +669,8 @@ class RmInstanceGenerator {
          }
 
          // TEST
-         println "Generates for "+ obj.dataPath
-         if (obj.archetypeId) println obj.ownerArchetypeRoot.getText('at0000')
+         //println "Generates for "+ obj.dataPath
+         //if (obj.archetypeId) println obj.ownerArchetypeRoot.getText('at0000')
 
          // NOTE: this is always one object
          //println "instance: "+ instances.size()

diff --git a/src/main/groovy/com/cabolabs/openehr/rm_1_0_2/Model.groovy b/src/main/groovy/com/cabolabs/openehr/rm_1_0_2/Model.groovy
@@ -16,10 +16,11 @@ class Model {
          'context': 'EVENT_CONTEXT' // if no other_context is specified the event context is not on the OPT, we need to check if it is or not to avoid double indexing.
       ],
       'EVENT_CONTEXT': [
-         'setting': 'DV_CODED_TEXT',
-         'location': 'String',
-         'start_time': 'DV_DATE_TIME',
-         'end_time': 'DV_DATE_TIME'
+         'setting':        'DV_CODED_TEXT',
+         'location':       'String',
+         'start_time':     'DV_DATE_TIME',
+         'end_time':       'DV_DATE_TIME',
+         'participations': 'PARTICIPATION'
       ],
       'ACTION': [
          'time': 'DV_DATE_TIME',
@@ -108,6 +109,9 @@ class Model {
       COMPOSITION: [
          'content'
       ],
+      EVENT_CONTEXT: [
+         'participations'
+      ],
       SECTION: [
          'items'
       ],
@@ -539,14 +543,21 @@ class Model {
          value: 'String'
       ],
 
+      PARTICIPATION: [
+         function:  'DV_TEXT',
+         mode:      'DV_CODED_TEXT',
+         time:      'DV_INTERVAL<DV_DATE_TIME>',
+         performer: ['PARTY_IDENTIFIED', 'PARTY_RELATED', 'PARTY_SELF']
+      ],
+
       DV_BOOLEAN: [
          value: 'Boolean'
       ],
       DV_IDENTIFIER: [
-         issuer: 'String',
+         issuer:   'String',
          assigner: 'String',
-         id: 'String',
-         type: 'String'
+         id:       'String',
+         type:     'String'
       ],
 
       DV_TEXT: [

diff --git a/src/main/groovy/com/cabolabs/openehr/rm_1_0_2/common/change_control/OriginalVersion.groovy b/src/main/groovy/com/cabolabs/openehr/rm_1_0_2/common/change_control/OriginalVersion.groovy
@@ -10,7 +10,8 @@ import com.cabolabs.openehr.rm_1_0_2.support.identification.HierObjectId
 
 class OriginalVersion extends Version {
 
-   List<Attestation> attestations = []
+   List<Attestation> attestations
+   Set<ObjectVersionId> other_input_version_uids
 
 
    HierObjectId owner_id()

diff --git a/src/main/groovy/com/cabolabs/openehr/rm_1_0_2/common/change_control/Version.groovy b/src/main/groovy/com/cabolabs/openehr/rm_1_0_2/common/change_control/Version.groovy
@@ -20,8 +20,6 @@ abstract class Version {
    ObjectRef contribution
    String signature
 
-   //abstract List<ObjectVersionId> other_input_version_uids() // ???
-
    abstract HierObjectId owner_id()
    abstract Boolean is_branch()
    abstract String canonical_form()

diff --git a/src/main/resources/canonical_json/contribution_lab_results_w_attestation.json b/src/main/resources/canonical_json/contribution_lab_results_w_attestation.json
diff --git a/src/test/groovy/com/cabolabs/openehr/opt/OPTParserTest.groovy b/src/test/groovy/com/cabolabs/openehr/opt/OPTParserTest.groovy
@@ -182,7 +182,7 @@ class OPTParserTest extends GroovyTestCase {
       opt.complete()
       toJson.serialize(opt)
       def complete = toJson.get(true)
-      //new File('complete.json') << toJson.get(true)
+      new File('a_opt_complete.json') << toJson.get(true)
 
       assert incomplete.size() < complete.size()
    }