Functions refactored for defensive coding

UCSF-IGHS · Nov 15, 2023 · 5ebcbfc · 5ebcbfc
1 parent f20548e
commit 5ebcbfc
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 23 deletions.
diff --git a/packages/esm-form-render-app/src/form-validator.test.ts b/packages/esm-form-render-app/src/form-validator.test.ts
diff --git a/packages/esm-form-render-app/src/form-validator.ts b/packages/esm-form-render-app/src/form-validator.ts
@@ -5,35 +5,49 @@ export const handleFormValidation = async (schema, configObject) => {
   const errors = [];
   const warnings = [];
 
-  if (schema) {
-    const parsedForm = typeof schema == 'string' ? JSON.parse(schema) : schema;
-
-    const asyncTasks = [];
+  if (!schema) {
+    throw new Error('Invalid argument: "schema" cannot be null or undefined. Please provide a valid object.');
+  }
 
-    parsedForm.pages?.forEach((page) =>
-      page.sections?.forEach((section) =>
-        section.questions?.forEach((question) => {
-          asyncTasks.push(
-            handleQuestionValidation(question, errors, configObject, warnings),
-            handleAnswerValidation(question, errors, warnings),
+  const parsedForm = typeof schema == 'string' ? JSON.parse(schema) : schema;
+
+  const asyncTasks = [];
+
+  parsedForm.pages?.forEach((page) =>
+    page.sections?.forEach((section) =>
+      section.questions?.forEach((question) => {
+        asyncTasks.push(
+          handleQuestionValidation(question, errors, configObject, warnings),
+          handleAnswerValidation(question, errors, warnings),
+        );
+        question.type === 'obsGroup' &&
+          question.questions?.forEach((obsGrpQuestion) =>
+            asyncTasks.push(
+              handleQuestionValidation(obsGrpQuestion, errors, configObject, warnings),
+              handleAnswerValidation(question, errors, warnings),
+            ),
           );
-          question.type === 'obsGroup' &&
-            question.questions?.forEach((obsGrpQuestion) =>
-              asyncTasks.push(
-                handleQuestionValidation(obsGrpQuestion, errors, configObject, warnings),
-                handleAnswerValidation(question, errors, warnings),
-              ),
-            );
-        }),
-      ),
-    );
-    await Promise.all(asyncTasks);
+      }),
+    ),
+  );
+  await Promise.all(asyncTasks);
 
-    return [errors, warnings];
-  }
+  return [errors, warnings];
 };
 
 const handleQuestionValidation = async (conceptObject, errorsArray, configObject, warningsArray) => {
+  if (!configObject || !Object.keys(configObject)?.length) {
+    throw new Error(
+      'Invalid argument: "configObject" cannot be null, undefined or an empty object. Please provide a valid object.',
+    );
+  }
+
+  if (!conceptObject || !Object.keys(conceptObject)?.length) {
+    throw new Error(
+      'Invalid argument: "conceptObject" cannot be null, undefined or an empty object. Please provide a valid object.',
+    );
+  }
+
   const conceptRepresentation =
     'custom:(uuid,display,datatype,answers,conceptMappings:(conceptReferenceTerm:(conceptSource:(name),code)))';