Merge branch 'sprint-1/issue-75' into 'rc'

[SPRINT-1][Issue-75] Fix integer issue on algorithms selection

See merge request sibmip/gateway!108

api/src/engine/connectors/exareme/converters.ts

@@ -47,7 +47,7 @@ export const dataToDataset = (data: Entity): Dataset => {
 
 //FIXME: Dirty workaround should be improved
 const lookupTypes = {
-  integer: 'int',
+  int: 'integer',
 };
 
 export const dataToVariable = (data: VariableEntity): Variable => {

api/src/engine/connectors/exareme/transformations/algorithms/index.ts

@@ -6,7 +6,11 @@ const transformToAlgorithms = jsonata(`
         'integer': 'NumberParameter',
         'real': 'NumberParameter'
     };
+    $dictTypes:= {
+        'int': 'integer'
+    };
     $checkVal:= function($val) { $val ? $val : undefined};
+    $getOrDefault:= function($v, $d) { $v ? $v : $d };
     $excludedParams:= ['centers', 'formula'];
     $includes:= ['ANOVA_ONEWAY','ANOVA','LINEAR_REGRESSION',
     'LOGISTIC_REGRESSION', 'LOGISTIC_REGRESSION_CV','TTEST_INDEPENDENT','TTEST_PAIRED',
@@ -20,15 +24,17 @@ const transformToAlgorithms = jsonata(`
         $v='true' ? true : ($v='false'? false : undefined)
     )};
     $extract:= function($v) {
-        $v?
-        {
-           "hint": $v.desc,
-           "isRequired": $truthy($checkVal($v.valueNotBlank)),
-           "hasMultiple": $truthy($checkVal($v.valueMultiple)),
-           "allowedTypes": $v.columnValuesIsCategorical = '' and $v.columnValuesSQLType = '' ?
-           undefined : $append($v.columnValuesIsCategorical = '' ?
-           ['nominal'] : [], $truthy($v.columnValuesIsCategorical) ? 'nominal' : $map(($checkVal($v.columnValuesSQLType) ~> $split(',')), $trim))
-       } : undefined
+        (
+            $categorical:=$v.columnValuesIsCategorical;
+            $varTypes:= ($split($getOrDefault($v.columnValuesSQLType, ''), ',')[]) ~> $map($trim) ~> $map(function($value) { $getOrDefault($lookup($dictTypes, $value), $value) });
+            $v?
+            {
+                "hint": $v.desc,
+                "isRequired": $truthy($checkVal($v.valueNotBlank)),
+                "hasMultiple": $truthy($checkVal($v.valueMultiple)),
+                "allowedTypes": $categorical = '' and $v.columnValuesSQLType = '' ? undefined : $append($categorical = '' ? ['nominal'] : [], $truthy($categorical) ? 'nominal' : $varTypes)
+            } : undefined
+        )
     };
 
    $[name in $includes].{