identifiedPath use path and root

NUM-Forschungsdatenplattform · May 22, 2024 · 94bc1d7 · 94bc1d7
1 parent 59afef2
commit 94bc1d7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/src/app/shared/models/aqb/aqb-select-item-ui.model.ts b/src/app/shared/models/aqb/aqb-select-item-ui.model.ts
@@ -26,7 +26,7 @@ export class AqbSelectItemUiModel {
     this.name = item.name || item.archetypeId
     this.givenName = ''
     this.rmType = item.rmType
-    this.aqlPath = item.aqlPath || ''
+    this.aqlPath = (item.aqlPath || '').replace(/^\//, '')
     this.humanReadablePath = item.humanReadablePath
     this.compositionReferenceId = compositionReferenceId
     this.archetypeReferenceId = archetypeReferenceId
@@ -39,10 +39,8 @@ export class AqbSelectItemUiModel {
       _type: AqbNodeType.SelectExpression,
       columnExpression: {
         _type: AqbNodeType.IdentifiedPath,
-        root: {
-          _type: 'Containment',
-          identifier: `${this.isComposition ? 'c' : 'o'}${this.archetypeReferenceId}${this.aqlPath}`,
-        },
+        root: `${this.isComposition ? 'c' : 'o'}${this.archetypeReferenceId}`,
+        path: this.aqlPath,
       },
       ...(this.givenName && { alias: this.givenName }),
     }

diff --git a/src/app/shared/models/aqb/aqb-where-item-ui.model.ts b/src/app/shared/models/aqb/aqb-where-item-ui.model.ts
@@ -52,7 +52,7 @@ export class AqbWhereItemUiModel {
     this.givenName = item.name || item.archetypeId
     this.rmType = item.rmType
     this.identifier = identifier
-    this.aqlPath = this.configurePath(item.aqlPath || '')
+    this.aqlPath = this.configurePath(item.aqlPath || '').replace(/^\//, '')
     this.humanReadablePath = item.humanReadablePath
     this.compositionReferenceId = compositionReferenceId
     this.archetypeReferenceId = archetypeReferenceId
@@ -174,7 +174,8 @@ export class AqbWhereItemUiModel {
   convertFieldToApi(): IAqbIdentifiedPathValueNode {
     return {
       _type: AqbNodeType.IdentifiedPath,
-      root: { _type: 'Containment', identifier: this.identifier + this.aqlPath },
+      root: this.identifier,
+      path: this.aqlPath,
     }
   }
 }
diff --git a/...models/archetype-query-builder/builder-request/aqb-IdentifiedPath-value-node.interface.ts b/...models/archetype-query-builder/builder-request/aqb-IdentifiedPath-value-node.interface.ts
@@ -9,9 +9,7 @@ export interface IAqbIdentifiedPathValueNode {
    */
   _type: AqbNodeType.IdentifiedPath
 
-  root: {
-    _type: 'Containment'
-    // necessary, because backend (openEhrSDK) not allow to add path with JSON
-    identifier: string
-  }
+  path: string
+
+  root: string
 }