completed contribution dto support for xml parser

Author: ppazos

src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParser.groovy

@@ -238,7 +238,7 @@ class OpenEhrJsonParser {
             throw new JsonCompositionParseException("Can't parse JSON if root node doesn't have a value for _type")
          }
 
-         method = 'parse'+ type // ORIGINAL_VERSION, IMPORTED_VERSION
+         method = 'parse'+ type
          contribution.versions << this."$method"(version_map)
       }
 

src/main/groovy/com/cabolabs/openehr/formats/OpenEhrXmlParser.groovy

@@ -24,6 +24,7 @@ import com.cabolabs.openehr.rm_1_0_2.data_types.quantity.date_time.*
 import com.cabolabs.openehr.rm_1_0_2.data_types.text.*
 import com.cabolabs.openehr.rm_1_0_2.data_types.uri.*
 import com.cabolabs.openehr.rm_1_0_2.support.identification.*
+import com.cabolabs.openehr.dto_1_0_2.common.change_control.ContributionDto
 
 // Old Groovy
 import groovy.util.XmlSlurper
@@ -115,32 +116,53 @@ class OpenEhrXmlParser {
       return versions
    }
 
-   Contribution parseContribution(String xml)
+   ContributionDto parseContributionDto(String xml)
    {
       def slurper = new XmlSlurper(false, false)
       def gpath   = slurper.parseText(xml)
       String type, method
       Version version
 
-      def contribution = new Contribution(versions: new HashSet())
-
-
-      // NOTE: POST /contribution doesn't have uid, so this will fail to parse that, might need to relax the schema
-      contribution.uid = this.parseHIER_OBJECT_ID(gpath.uid)
+      def contribution = new ContributionDto(versions: [])
 
+      // in the DTO the uid is optional
+      if (!gpath.uid.isEmpty())
+      {
+         contribution.uid = this.parseHIER_OBJECT_ID(gpath.uid)
+      }
 
       gpath.versions.each { version_gpath ->
 
-         type = version_gpath.'@xsi:type'.text()
+         type = version_gpath.'@xsi:type'.text() // ORIGINAL_VERSION, IMPORTED_VERSION
 
          if (!type)
          {
             throw new XmlCompositionParseException("Can't parse XML if node doesn't have a xsi:type")
          }
 
          method = 'parse'+ type
-         version = this."$method"(version_gpath)
-         contribution.versions << this.parseVersionToObjectRef(version) // contribiution has objectrefs
+         contribution.versions << this."$method"(version_gpath)
+      }
+
+      contribution.audit = this.parseAUDIT_DETAILS(gpath.audit)
+
+      return contribution
+   }
+
+   Contribution parseContribution(String xml)
+   {
+      def slurper = new XmlSlurper(false, false)
+      def gpath   = slurper.parseText(xml)
+      String type, method
+
+      def contribution = new Contribution(versions: new HashSet())
+
+      // note for the RM the uid is mandatory, in the DTO the uid is optional
+      contribution.uid = this.parseHIER_OBJECT_ID(gpath.uid)
+      
+      gpath.versions.each { version_gpath ->
+
+         contribution.versions << this.parseOBJECT_REF(version_gpath) // contribiution has objectrefs
       }
 
       contribution.audit = this.parseAUDIT_DETAILS(gpath.audit)

src/main/resources/canonical_xml/test_all_datatypes.contribution.en.xml

@@ -0,0 +1,37 @@
+<contribution xmlns="http://schemas.openehr.org/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <uid xsi:type="HIER_OBJECT_ID">
+    <value>44afee41-197b-aaaa-cccc-90bdcf29bc35</value>
+  </uid>
+  <versions xsi:type="OBJECT_REF">
+    <id xsi:type="HIER_OBJECT_ID">
+      <value>12345678-197b-4d3b-b567-90bdcf29bc35</value>
+    </id>
+    <namespace>EHR</namespace>
+    <type>VERSION</type>
+  </versions>
+  <audit>
+    <system_id>CABOLABS_EHR</system_id>
+    <committer xsi:type="PARTY_IDENTIFIED">
+      <external_ref>
+        <id xsi:type="HIER_OBJECT_ID">
+          <value>44afee41-197b-4d3b-b567-90bdcf29bc35</value>
+        </id>
+        <namespace>DEMOGRAPHIC</namespace>
+        <type>PERSON</type>
+      </external_ref>
+      <name>Dr. House</name>
+    </committer>
+    <time_committed>
+      <value>20210718T171614,212-0300</value>
+    </time_committed>
+    <change_type>
+      <value>creation</value>
+      <defining_code>
+        <terminology_id>
+          <value>openehr</value>
+        </terminology_id>
+        <code_string>249</code_string>
+      </defining_code>
+    </change_type>
+  </audit>
+</contribution>

src/test/groovy/com/cabolabs/openehr/opt/OpenEhrJsonParserTest.groovy

@@ -31,6 +31,8 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.cabolabs.openehr.opt.instance_validation.JsonInstanceValidation
 import com.cabolabs.openehr.rm_1_0_2.ehr.EhrStatus
 
+import com.cabolabs.openehr.dto_1_0_2.common.change_control.ContributionDto
+
 import groovy.json.JsonSlurper
 import com.cedarsoftware.util.io.JsonWriter
 
@@ -299,7 +301,8 @@ class OpenEhrJsonParserTest extends GroovyTestCase {
       //println out
    }
 
-   void testJsonParserApiContribution()
+   // this is the contribution from the RM
+   void testJsonParserContribution()
    {
       String path = PS +"canonical_json"+ PS +"contribution_test_all_datatypes_en.json"
       File file = new File(getClass().getResource(path).toURI())
@@ -312,6 +315,21 @@ class OpenEhrJsonParserTest extends GroovyTestCase {
       assert contribution.versions.size() == 1
       assert contribution.versions[0].id.value == 'fb458d9c-1323-42bc-b7f8-787f3660a0b5::CABOLABS::1'
    }
+
+   // this is the contribution used in the API
+   void testJsonParserContributionDto()
+   {
+      String path = PS +"canonical_json"+ PS +"contribution_dto_test_all_datatypes_en.json"
+      File file = new File(getClass().getResource(path).toURI())
+      String json = file.text
+      def parser = new OpenEhrJsonParser()
+      ContributionDto contribution = parser.parseContributionDto(json)
+
+      // TODO: check internals
+
+      assert contribution.versions.size() == 1
+      assert contribution.versions[0].uid.value == '93bbff8b-cdd5-43a3-8d71-194a735cc704::CABOLABS::1'
+   }
 
    // TODO: move to the XML test suite
    /*

src/test/groovy/com/cabolabs/openehr/opt/OpenEhrXmlParserTest.groovy

@@ -19,6 +19,7 @@ import groovy.util.GroovyTestCase
 import groovy.xml.*
 import groovy.json.JsonOutput
 import com.cabolabs.openehr.rm_1_0_2.common.change_control.*
+import com.cabolabs.openehr.dto_1_0_2.common.change_control.ContributionDto
 
 class OpenEhrXmlParserTest extends GroovyTestCase {
 
@@ -133,15 +134,27 @@ class OpenEhrXmlParserTest extends GroovyTestCase {
       assert c.content[0].data.events[0].dataPath == '/content[0]/data/events[0]'
    }
 
-   void testXmlParserApiContribution()
+   void testXmlParserContributionDto()
    {
       String path = PS +"canonical_xml"+ PS +"test_all_datatypes.api_contribution.en.xml"
       File file = new File(getClass().getResource(path).toURI())
       String xml = file.text
       def parser = new OpenEhrXmlParser()
+      ContributionDto contribution = parser.parseContributionDto(xml)
+
+      assert contribution.versions.size() == 1
+      assert contribution.versions[0].uid.value == '553c1d04-6d78-4f42-a07d-34a9344ca71d::CABOLABS::1'
+   }
+
+   void testXmlParserContribution()
+   {
+      String path = PS +"canonical_xml"+ PS +"test_all_datatypes.contribution.en.xml"
+      File file = new File(getClass().getResource(path).toURI())
+      String xml = file.text
+      def parser = new OpenEhrXmlParser()
       Contribution contribution = parser.parseContribution(xml)
 
       assert contribution.versions.size() == 1
-      assert contribution.versions[0].id.value == '553c1d04-6d78-4f42-a07d-34a9344ca71d::CABOLABS::1'
+      assert contribution.versions[0].id.value == '12345678-197b-4d3b-b567-90bdcf29bc35'
    }
 }