Update transformation logic to better handle partial records and pare…

…nt ids

api/src/json-schema/transformation-schema.test.ts

@@ -49,7 +49,8 @@ describe('example submission transformation schema', () => {
       {
         condition: {
           if: {
-            columns: ['Lone Cows']
+            columns: ['Lone Cows'],
+            not: true
           }
         },
         transformations: [

api/src/json-schema/transformation-schema.ts

@@ -56,12 +56,16 @@ export const submissionTransformationSchema = {
             properties: {
               if: {
                 type: 'object',
+                required: ['columns'],
                 properties: {
                   columns: {
                     type: 'array',
                     items: {
                       type: 'string'
                     }
+                  },
+                  not: {
+                    type: 'boolean'
                   }
                 },
                 additionalProperties: false

api/src/utils/media/xlsx/transformation/transformation-schema-parser.ts

@@ -21,6 +21,7 @@ export type TransformationFieldsSchema = {
 export type Condition = {
   if: {
     columns: string[];
+    not?: boolean;
   };
 };
 

api/src/utils/media/xlsx/transformation/xlsx-transformation.ts

@@ -506,17 +506,24 @@ export class XLSXTransformation {
     const columnValueParts = this._getColumnValueParts(rowObject, condition.if.columns);
 
     if (!columnValueParts || !columnValueParts.length) {
+      if (condition.if.not) {
+        // return true if no condition column values are defined, when condition is inverted
+        return true;
+      }
+
+      // return false if no condition column values are defined
       return false;
     }
 
-    for (const columnValuePart in columnValueParts) {
-      if (columnValuePart === undefined || columnValuePart === null || columnValuePart === '') {
-        return false;
-      }
+    if (condition.if.not) {
+      // return false if any condition column values are defined, when condition is inverted
+      return false;
     }
 
-    // all conditions met
-    return true;
+    // return true if all condition columns are defined
+    return !columnValueParts.every(
+      (columnValuePart) => columnValuePart === undefined || columnValuePart === null || columnValuePart === ''
+    );
   }
 
   /**
@@ -565,15 +572,8 @@ export class XLSXTransformation {
           }
         }
 
-        const newRowObjectKeys = Object.keys(newRowObject);
-
-        if (
-          parseSchema?.condition &&
-          !parseSchema?.condition?.if?.columns.every((conditionalFields) =>
-            newRowObjectKeys.includes(conditionalFields)
-          )
-        ) {
-          // If the `newRowObject` is missing any of the conditional fields, skip this record
+        if (!Object.keys(newRowObject).length) {
+          // row object is empty, skip
           return;
         }