From 26dee31032dc93850fec53ace1d03b4a6723e12f Mon Sep 17 00:00:00 2001
From: Manuel Spuhler <manuel.spuhler@gmail.com>
Date: Tue, 2 Nov 2021 15:46:46 +0000
Subject: [PATCH] Descriptive analysis transformation fix

---
 .../engine/connectors/exareme/transformations.ts    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/api/src/engine/connectors/exareme/transformations.ts b/api/src/engine/connectors/exareme/transformations.ts
index b124790..4b35520 100644
--- a/api/src/engine/connectors/exareme/transformations.ts
+++ b/api/src/engine/connectors/exareme/transformations.ts
@@ -77,25 +77,26 @@ $fn := function($o, $prefix) {
 export const descriptiveModelToTables = jsonata(`
 (   
     ${headerDescriptivie}
-
-    $vars := $count(data.single.*)-1;
-    $varName := $keys(data.single);
+    
+    $vars := $count($keys(data.model.*.data))-1;
+    $varNames := $keys(data.model.*.data);
     $model := data.model;
 
     [[0..$vars].(
         $i := $;
+        $varName := $varNames[$i];
         $ks := $keys($model.*.data.*[$i][$type($) = 'object']);
         {
-            'name': $varName[$i],
+            'name': $varName,
             'headers': $append("", $keys($$.data.model)).{
                 'name': $,
                 'type': 'string'
             },
             'data': [
-                [$varName[$i], $model.*.($e(num_total))],
+                [$varName, $model.*.($e(num_total))],
                 ['Datapoints', $model.*.($e(num_datapoints))],
                 ['Nulls', $model.*.($e(num_nulls))],
-                 $model.*.data.($fn($.*[$i])) ~> $reduce(function($a, $b) {
+                 $lookup($model.*.data, $varName).($fn($)) ~> $reduce(function($a, $b) {
                     $map($ks, function($k) {(
                         {
                             $k : [$e($lookup($a,$k), "No data"), $e($lookup($b,$k), "No data")]
-- 
GitLab