fixed ehr.system_id representation

Author: ppazos

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

@@ -41,15 +41,12 @@ class OpenEhrJsonParser {
 
       def ehr = new Ehr()
 
-      ehr.system_id = map.system_id // NOTE: this is HIER_OBJECT_ID in newer specs, we might need to check the type, though in RM 1.0.2 this is a string
+      ehr.system_id = this.parseHIER_OBJECT_ID(map.system_id)
 
       ehr.ehr_id = this.parseHIER_OBJECT_ID(map.ehr_id)
 
       ehr.time_created = this.parseDV_DATE_TIME(map.time_created)
 
-      // TODO
-      //ehr.ehr_status = this.parseEhrStatus(map.ehr_status)
-
       ehr.ehr_status = this.parseOBJECT_REF(map.ehr_status)
 
       // the references to versioned objects are not parsed, for instance, this is the right parsing for a rest EHR response

src/main/groovy/com/cabolabs/openehr/rm_1_0_2/ehr/Ehr.groovy

@@ -13,7 +13,7 @@ import com.cabolabs.openehr.rm_1_0_2.support.identification.ObjectRef
  */
 class Ehr {
 
-   String system_id
+   HierObjectId system_id
    HierObjectId ehr_id
    DvDateTime time_created
    ObjectRef ehr_status

src/main/groovy/com/cabolabs/openehr/rm_1_0_2/support/identification/HierObjectId.groovy

@@ -2,23 +2,4 @@ package com.cabolabs.openehr.rm_1_0_2.support.identification
 
 class HierObjectId extends UIDBasedId {
 
-   UID getObjectId()
-   {
-      // TODO
-   }
-
-   VersionTreeId getVersionTreeId()
-   {
-      // TODO
-   }
-
-   UID getCreatingSystemId()
-   {
-      // TODO
-   }
-
-   boolean isBranch()
-   {
-      // TODO
-   }
 }

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

@@ -41,7 +41,9 @@ class OpenEhrJsonParserTest extends GroovyTestCase {
       // NOTE: in RM 1.0.2 system_id is a string, in newer specs it is a HIER_OBJECT_ID
       def json_ehr = $/
          {
-           "system_id": "d60e2348-b083-48ce-93b9-916cef1d3a5a",
+           "system_id": {
+             "value": "d60e2348-b083-48ce-93b9-916cef1d3a5a"
+           },
            "ehr_id": {
              "value": "7d44b88c-4199-4bad-97dc-d78268e01398"
            },
@@ -62,7 +64,7 @@ class OpenEhrJsonParserTest extends GroovyTestCase {
       def parser = new OpenEhrJsonParser()
       Ehr ehr = parser.parseEhr(json_ehr)
 
-      assert ehr.system_id == "d60e2348-b083-48ce-93b9-916cef1d3a5a"
+      assert ehr.system_id.value == "d60e2348-b083-48ce-93b9-916cef1d3a5a"
 
       assert ehr.ehr_status.id.value == "8849182c-82ad-4088-a07f-48ead4180515::openEHRSys.example.com::1"
       assert ehr.ehr_status.type == "EHR_STATUS"