Merge branch 'develop'

samply · Oct 12, 2023 · dfbd1ee · dfbd1ee
2 parents 58303e8 + 1ba469b
commit dfbd1ee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/packages/lib/src/cql-translator-service/ast-to-cql-translator.ts b/packages/lib/src/cql-translator-service/ast-to-cql-translator.ts
@@ -73,6 +73,7 @@ const resolveOperation = (operation: AstElement): string => {
   }
 
   'children' in operation && operation.children.forEach((element: AstElement, index) => {
+    console.log(element);
     if ('children' in element) {
       expression += resolveOperation(element)
     }
@@ -92,6 +93,7 @@ const resolveOperation = (operation: AstElement): string => {
 
 const getSingleton = (criterion: AstBottomLayerValue): string => {
   let expression: string = "";
+  console.log(criterion)
   const myCriterion = criterionMap.get(criterion.key)
 
   if (myCriterion) {

diff --git a/packages/lib/src/helpers/ast-transformer.ts b/packages/lib/src/helpers/ast-transformer.ts
@@ -85,17 +85,6 @@ if (Array.isArray(item)) {
     }
   }
 
-  /**
-   * return bottom level object of an entity (aggregatedValue)
-   */
-  if ('key' in topLayerItem && 'value' in item && typeof item.value === 'string') {
-    return {
-      key: topLayerItem.key,
-      type: 'EQUALS',
-      system: '',
-      value: item.value,
-    }
-  }
   /**
     * return bottom level object of other QueryValues (string | {min: number, max: number})
     */
@@ -107,6 +96,18 @@ if (Array.isArray(item)) {
       value: item.value,
     }
   }
+
+  /**
+   * return bottom level object of an entity (aggregatedValue)
+   */
+  if ('value' in item && typeof item.value === 'string') {
+    return {
+      key: item.value,
+      type: 'EQUALS',
+      system: '',
+      value: item.name,
+    }
+  }
 
   return
 }