feat: Improve formatting on submit

[OCR-SCAN]

Author: alexszilagyi

frontend/src/app/pages/resource-ocr/encounter-form/encounter-form.component.ts

@@ -50,7 +50,7 @@ import { ResponseWrapper } from 'src/app/models/response-wrapper';
 import { Router } from '@angular/router';
 import {
   flattenTextFields,
-  normalizeDates,
+  normalizeFormValues,
   parsePractitionerName,
 } from 'src/lib/utils/format_functions';
 
@@ -375,12 +375,6 @@ export class EncounterFormComponent implements OnInit {
       };
 
       medicationGroup.get('data')?.setValue(nlmSearchResult);
-    } else {
-      medicationGroup.get('data')?.setValue({
-        id: uuidV4(),
-        text: enrichedMed.extracted_name,
-        identifier: [uuidV4()],
-      });
     }
 
     // Set up the value change subscription for dosage enabling
@@ -910,22 +904,27 @@ export class EncounterFormComponent implements OnInit {
 
   onSubmit() {
     this.form.markAllAsTouched();
-    if (this.form.valid) {
-      this.submitWizardLoading = true;
+    if (!this.form.valid) {
+      // Exit early if the form is invalid
+      return;
+    }
+
+    this.submitWizardLoading = true;
+    this.error = null; // Clear previous errors
 
+    try {
+      // --- Synchronous Data Processing ---
       let formValue = this.form.getRawValue();
 
-      // Normalize only organizations and practitioners
+      // Normalize organizations and practitioners
       formValue.organizations = formValue.organizations.map((org: any) => ({
         ...org,
         data: flattenTextFields(org.data),
       }));
 
       formValue.practitioners = formValue.practitioners.map((prac: any) => {
         const flattenedData = flattenTextFields(prac.data);
-
         const parsedName = parsePractitionerName(flattenedData.name);
-
         return {
           ...prac,
           data: {
@@ -935,42 +934,35 @@ export class EncounterFormComponent implements OnInit {
         };
       });
 
-      // Normalize dates in the entire form
-      formValue = normalizeDates(formValue);
-
-      let resourceStorage = GenerateR4ResourceLookup(formValue);
+      // Normalize dates and addresses and generate resource lookup
+      formValue = normalizeFormValues(formValue);
+      const resourceStorage = GenerateR4ResourceLookup(formValue);
 
-      //generate a ndjson file from the resourceList
-      //make sure we extract the encounter resource
-
-      let fhirListResource = {
+      // --- FHIR Resource Construction ---
+      const fhirListResource = {
         resourceType: 'List',
         entry: [],
         encounter: null,
         contained: [],
       } as List;
 
       let encounter = null;
-      for (let resourceType in resourceStorage) {
+      for (const resourceType in resourceStorage) {
         if (resourceType === 'Encounter') {
-          //set the encounter to the first encounter
-          let [encounterId] = Object.keys(resourceStorage[resourceType]);
+          const [encounterId] = Object.keys(resourceStorage[resourceType]);
           encounter = resourceStorage[resourceType][encounterId];
-
           if (!(encounter.type && encounter.reference)) {
-            //this is not a reference
             fhirListResource.contained.push(encounter);
           }
           continue;
         }
 
-        for (let resourceId in resourceStorage[resourceType]) {
-          let resourceFromStorage = resourceStorage[resourceType][resourceId];
+        for (const resourceId in resourceStorage[resourceType]) {
+          const resourceFromStorage = resourceStorage[resourceType][resourceId];
           if (
             (resourceFromStorage as Reference).type &&
             (resourceFromStorage as Reference).reference
           ) {
-            //this is a reference
             fhirListResource.entry.push({
               item: {
                 reference:
@@ -980,35 +972,42 @@ export class EncounterFormComponent implements OnInit {
               },
             });
           } else {
-            //this is not a reference
             fhirListResource.contained.push(
               resourceFromStorage as FhirResource
             );
           }
         }
       }
 
-      //set the encounter reference
+      // Set the encounter reference
       fhirListResource.encounter = {
         reference: generateReferenceUriFromResourceOrReference(encounter),
       };
 
       this.fastenApi
         .createRelatedResourcesFastenSource(fhirListResource)
-        .subscribe(
-          (resp) => {
+        .subscribe({
+          next: (resp) => {
             this.submitWizardLoading = false;
-            // Redirect user to /medical-history after successful submission
+
+            // On success, redirect the user
             this.router.navigate(['/medical-history']);
           },
-          (err) => {
+          error: (err) => {
+            // Handle HTTP errors from the API call
             this.error =
               err?.error?.message ||
               'An error occurred while submitting the form. Please try again.';
-            console.error(err);
+            console.error('API Error:', err);
             this.submitWizardLoading = false;
-          }
-        );
+          },
+        });
+    } catch (err) {
+      // Catches errors from the data processing steps above.
+      this.error =
+        'An unexpected error occurred while preparing your data. Please check the form and try again.';
+      console.error('Data Processing Error:', err);
+      this.submitWizardLoading = false; // Ensure loading is stopped
     }
   }
 

frontend/src/lib/utils/format_functions.ts

@@ -36,23 +36,50 @@ export function flattenTextFields(obj: any): any {
   return newObj;
 }
 
-export function normalizeDates(obj: any): any {
+export function normalizeFormValues(
+  obj: any,
+  parentKey: string | null = null
+): any {
+  // Return primitives and null values as is
+  if (obj === null || typeof obj !== 'object') {
+    return obj;
+  }
+
+  // If it's an array, recursively process each item
   if (Array.isArray(obj)) {
-    return obj.map(normalizeDates);
-  } else if (obj !== null && typeof obj === 'object') {
-    // Handle Angular datepicker object {year, month, day}
-    if ('year' in obj && 'month' in obj && 'day' in obj) {
+    return obj.map((item) => normalizeFormValues(item, parentKey));
+  }
+
+  // --- Logic from normalizeDates --- //
+
+  // Skip processing children of 'medications'
+  if (parentKey === 'medications') {
+    return obj;
+  }
+
+  // Handle Angular datepicker object: {year, month, day}
+  if ('year' in obj && 'month' in obj && 'day' in obj) {
+    // A simple check to avoid matching objects that coincidentally have these keys
+    if (Object.keys(obj).length === 3) {
       const date = new Date(obj.year, obj.month - 1, obj.day);
       return date.toISOString();
     }
+  }
 
-    const newObj: any = {};
-    for (const key of Object.keys(obj)) {
-      newObj[key] = normalizeDates(obj[key]);
+  // --- Combined Recursive Logic --- //
+  const newObj: any = {};
+  for (const key of Object.keys(obj)) {
+    // Logic from normalizeAddresses: if the key is 'address' and the value
+    // is a single object, wrap it in an array after processing its contents.
+    if (key === 'address' && obj[key] && !Array.isArray(obj[key])) {
+      newObj[key] = [normalizeFormValues(obj[key], key)];
+    } else {
+      // Recursively process all other key-value pairs
+      newObj[key] = normalizeFormValues(obj[key], key);
     }
-    return newObj;
   }
-  return obj;
+
+  return newObj;
 }
 
 export function parsePractitionerName(fullName: string) {