Merge pull request #1352 from NASA-AMMOS/pass_through_null_expansion

Handle 'null' values when deserializing for command expansion
NASA-AMMOS · Mar 1, 2024 · c137793 · c137793
2 parents 2fc7204 + f388aba
commit c137793
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/sequencing-server/src/lib/batchLoaders/simulatedActivityBatchLoader.ts b/sequencing-server/src/lib/batchLoaders/simulatedActivityBatchLoader.ts
@@ -231,30 +231,42 @@ export function mapGraphQLActivityInstance(
 function convertType(value: any, schema: Schema): any {
   switch (schema.type) {
     case SchemaTypes.Int:
+      if (value === null) {
+        return value;
+      }
       if (value > Number.MAX_SAFE_INTEGER || value < Number.MIN_SAFE_INTEGER) {
         return value.toString();
       }
       return parseInt(value, 10);
     case SchemaTypes.Real:
       return value;
     case SchemaTypes.Duration:
-      return Temporal.Duration.from(parse(value).toISOString());
+      if (value !== null) {
+        return Temporal.Duration.from(parse(value).toISOString());
+      }
+      return value;
     case SchemaTypes.Boolean:
       return value;
     case SchemaTypes.Path:
       return value;
     case SchemaTypes.String:
       return value;
     case SchemaTypes.Series:
+      if (value === null) {
+        return value;
+      }
       return value.map((value: any) => convertType(value, schema.items));
     case SchemaTypes.Struct:
+      if (value === null) {
+        return value;
+      }
       const struct: { [attributeName: string]: any } = {};
       for (const [attributeKey, attributeSchema] of Object.entries(schema.items)) {
         struct[attributeKey] = convertType(value[attributeKey], attributeSchema);
       }
       return struct;
     case SchemaTypes.Variant:
-      if (schema.variants.length === 1 && schema.variants[0]?.key === 'VOID') {
+      if (value === null || (schema.variants.length === 1 && schema.variants[0]?.key === 'VOID')) {
         return null;
       }
       return value;