refactor: make one line if statement, remove try catch, add success to expanddatatype

Author: david-roper

apps/api/src/instrument-records/instrument-records.service.ts

@@ -27,11 +27,16 @@ import { SubjectsService } from '@/subjects/subjects.service';
 
 import { InstrumentMeasuresService } from './instrument-measures.service';
 
-type ExpandDataType = {
-  measure: string;
-  measureValue: boolean | Date | number | string | undefined;
-  success: true;
-};
+type ExpandDataType =
+  | {
+      measure: string;
+      measureValue: boolean | Date | number | string | undefined;
+      success: true;
+    }
+  | {
+      success: false;
+      message: string;
+    };
 
 @Injectable()
 export class InstrumentRecordsService {
@@ -161,30 +166,11 @@ export class InstrumentRecordsService {
         instruments.set(record.instrumentId, instrument);
       }
       for (const [measureKey, measureValue] of Object.entries(record.computedMeasures)) {
-        //early return statement
-        if (Array.isArray(measureValue) && measureValue.length >= 1) {
-          try {
-            const arrayResult = this.expandData(measureValue);
-            arrayResult.map((arrayEntry: ExpandDataType) => {
-              data.push({
-                groupId: record.subject.groupIds[0] ?? DEFAULT_GROUP_NAME,
-                instrumentEdition: instrument.internal.edition,
-                instrumentName: instrument.internal.name,
-                measure: arrayEntry.measure,
-                sessionDate: record.session.date.toISOString(),
-                sessionId: record.session.id,
-                sessionType: record.session.type,
-                subjectAge: record.subject.dateOfBirth ? yearsPassed(record.subject.dateOfBirth) : null,
-                subjectId: record.subject.id,
-                subjectSex: record.subject.sex,
-                timestamp: record.date.toISOString(),
-                value: arrayEntry.measureValue
-              });
-            });
-          } catch (e) {
-            throw new Error((e as Error).message);
-          }
-        } else {
+        if (!measureValue) {
+          continue;
+        }
+
+        if (!Array.isArray(measureValue)) {
           data.push({
             groupId: record.subject.groupIds[0] ?? DEFAULT_GROUP_NAME,
             instrumentEdition: instrument.internal.edition,
@@ -200,6 +186,29 @@ export class InstrumentRecordsService {
             value: measureValue
           });
         }
+
+        if (Array.isArray(measureValue) && measureValue.length < 1) continue;
+
+        if (Array.isArray(measureValue) && measureValue.length >= 1) {
+          const arrayResult = this.expandData(measureValue);
+          arrayResult.map((arrayEntry: ExpandDataType) => {
+            if (!arrayEntry.success) throw new Error(arrayEntry.message);
+            data.push({
+              groupId: record.subject.groupIds[0] ?? DEFAULT_GROUP_NAME,
+              instrumentEdition: instrument.internal.edition,
+              instrumentName: instrument.internal.name,
+              measure: arrayEntry.measure,
+              sessionDate: record.session.date.toISOString(),
+              sessionId: record.session.id,
+              sessionType: record.session.type,
+              subjectAge: record.subject.dateOfBirth ? yearsPassed(record.subject.dateOfBirth) : null,
+              subjectId: record.subject.id,
+              subjectSex: record.subject.sex,
+              timestamp: record.date.toISOString(),
+              value: arrayEntry.measureValue
+            });
+          });
+        }
       }
     }
     return data;
@@ -416,7 +425,10 @@ export class InstrumentRecordsService {
       for (const [dataKey, dataValue] of Object.entries(objectEntry as { [key: string]: any })) {
         const parseResult = $RecordArrayFieldValue.safeParse(dataValue);
         if (!parseResult.success) {
-          throw new Error(`Invalid data type ${dataKey} for Record array entry at key ${dataKey}`);
+          validRecordArrayList.push({
+            message: `Error interpreting value ${dataValue} and record array key ${dataKey}`,
+            success: false
+          });
         }
         validRecordArrayList.push({
           measure: dataKey,