update forms to use new express validator classes

ministryofjustice · Jun 5, 2023 · fdc5263 · fdc5263
1 parent b456c03
commit fdc5263
Show file tree

Hide file tree

Showing 21 changed files with 70 additions and 140 deletions.
diff --git a/server/routes/amendAReferral/accessibility-needs/amendAccessibilityNeedsForm.ts b/server/routes/amendAReferral/accessibility-needs/amendAccessibilityNeedsForm.ts
@@ -72,13 +72,7 @@ export default class AmendAccessibilityNeedsForm {
       return null
     }
 
-    return {
-      errors: validationResult.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(validationResult)
   }
 
   private checkForNoChangesError(validationResult: Result<ValidationError>): boolean | null {

diff --git a/server/routes/amendAReferral/additionalInformation/amendAdditionalInformationForm.ts b/server/routes/amendAReferral/additionalInformation/amendAdditionalInformationForm.ts
@@ -80,12 +80,6 @@ export default class AmendAdditionalInformationForm {
       return null
     }
 
-    return {
-      errors: validationResult.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(validationResult)
   }
 }
diff --git a/server/routes/amendAReferral/complexityLevel/amendComplexityLevelForm.ts b/server/routes/amendAReferral/complexityLevel/amendComplexityLevelForm.ts
@@ -49,12 +49,6 @@ export default class AmendComplexityLevelForm {
       return null
     }
 
-    return {
-      errors: validationResult.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(validationResult)
   }
 }
diff --git a/server/routes/amendAReferral/desired-outcomes/amendDesiredOutcomesForm.ts b/server/routes/amendAReferral/desired-outcomes/amendDesiredOutcomesForm.ts
@@ -69,13 +69,7 @@ export default class AmendDesiredOutcomesForm {
       return null
     }
 
-    return {
-      errors: validationResult.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(validationResult)
   }
 
   private checkForNoChangesError(validationResult: Result<ValidationError>): boolean | null {

diff --git a/.../routes/amendAReferral/employment-responsibilities/amendEmploymentResponsibilitiesForm.ts b/.../routes/amendAReferral/employment-responsibilities/amendEmploymentResponsibilitiesForm.ts
@@ -74,13 +74,7 @@ export default class AmendEmploymentResponsibilitiesForm {
       return null
     }
 
-    return {
-      errors: validationResult.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(validationResult)
   }
 
   private checkForNoChangesError(validationResult: Result<ValidationError>): boolean | null {

diff --git a/server/routes/amendAReferral/interpreter-required/amendNeedsAndRequirementsIntepreterForm.ts b/server/routes/amendAReferral/interpreter-required/amendNeedsAndRequirementsIntepreterForm.ts
@@ -81,13 +81,7 @@ export default class AmendNeedsAndRequirementsIntepreterForm {
       return null
     }
 
-    return {
-      errors: validationResult.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(validationResult)
   }
 
   private checkForNoChangesError(validationResult: Result<ValidationError>): boolean | null {

diff --git a/server/routes/appointments/feedback/shared/attendance/attendanceFeedbackForm.ts b/server/routes/appointments/feedback/shared/attendance/attendanceFeedbackForm.ts
@@ -42,12 +42,6 @@ export default class AttendanceFeedbackForm {
       return null
     }
 
-    return {
-      errors: validationResult.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(validationResult)
   }
 }
diff --git a/server/routes/appointments/feedback/shared/behaviour/behaviourFeedbackForm.ts b/server/routes/appointments/feedback/shared/behaviour/behaviourFeedbackForm.ts
@@ -51,13 +51,7 @@ export default class BehaviourFeedbackForm {
       return null
     }
 
-    return {
-      errors: validationResult.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(validationResult)
   }
 
   private get notifyProbationPractitioner(): boolean {

diff --git a/server/routes/caseNotes/add/AddNewCaseNoteForm.ts b/server/routes/caseNotes/add/AddNewCaseNoteForm.ts
@@ -57,12 +57,6 @@ export default class AddNewCaseNoteForm {
       return null
     }
 
-    return {
-      errors: validationResult.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(validationResult)
   }
 }
diff --git a/server/routes/makeAReferral/current-location/currentLocationForm.ts b/server/routes/makeAReferral/current-location/currentLocationForm.ts
@@ -51,12 +51,6 @@ export default class CurrentLocationForm {
       return null
     }
 
-    return {
-      errors: this.result.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(this.result)
   }
 }
diff --git a/server/routes/makeAReferral/enforceable-days/enforceableDaysForm.ts b/server/routes/makeAReferral/enforceable-days/enforceableDaysForm.ts
@@ -59,12 +59,6 @@ export default class EnforceableDaysForm {
       return null
     }
 
-    return {
-      errors: validationResult.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(validationResult)
   }
 }
diff --git a/server/routes/makeAReferral/expected-release-date/expectedReleaseDateForm.ts b/server/routes/makeAReferral/expected-release-date/expectedReleaseDateForm.ts
@@ -96,13 +96,7 @@ export default class ExpectedReleaseDateForm {
       return null
     }
 
-    return {
-      errors: validationResult.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(validationResult)
   }
 
   private get expectedReleaseDate(): boolean {

diff --git a/server/routes/makeAReferral/needs-and-requirements/needsAndRequirementsForm.ts b/server/routes/makeAReferral/needs-and-requirements/needsAndRequirementsForm.ts
@@ -69,12 +69,6 @@ export default class NeedsAndRequirementsForm {
       return null
     }
 
-    return {
-      errors: this.result.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(this.result)
   }
 }
diff --git a/server/routes/makeAReferral/risk-information/oasys/confirmOasysRiskInformationForm.ts b/server/routes/makeAReferral/risk-information/oasys/confirmOasysRiskInformationForm.ts
@@ -40,12 +40,6 @@ export default class ConfirmOasysRiskInformationForm {
       return null
     }
 
-    return {
-      errors: this.result.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(this.result)
   }
 }
diff --git a/server/routes/makeAReferral/risk-information/oasys/edit/editOasysRiskInformationForm.ts b/server/routes/makeAReferral/risk-information/oasys/edit/editOasysRiskInformationForm.ts
@@ -45,12 +45,6 @@ export default class EditOasysRiskInformationForm {
       return null
     }
 
-    return {
-      errors: this.result.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(this.result)
   }
 }
diff --git a/server/routes/makeAReferral/service-categories/updateServiceCategoriesForm.ts b/server/routes/makeAReferral/service-categories/updateServiceCategoriesForm.ts
@@ -41,12 +41,6 @@ export default class UpdateServiceCategoriesForm {
       return null
     }
 
-    return {
-      errors: validationResult.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(validationResult)
   }
 }
diff --git a/server/routes/makeAReferral/service-category/complexity-level/complexityLevelForm.ts b/server/routes/makeAReferral/service-category/complexity-level/complexityLevelForm.ts
@@ -41,12 +41,6 @@ export default class ComplexityLevelForm {
       return null
     }
 
-    return {
-      errors: validationResult.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(validationResult)
   }
 }
diff --git a/server/routes/makeAReferral/service-category/desired-outcomes/desiredOutcomesForm.ts b/server/routes/makeAReferral/service-category/desired-outcomes/desiredOutcomesForm.ts
@@ -41,12 +41,6 @@ export default class DesiredOutcomesForm {
       return null
     }
 
-    return {
-      errors: validationResult.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(validationResult)
   }
 }
diff --git a/server/routes/referral/cancellation/reason/referralCancellationReasonForm.ts b/server/routes/referral/cancellation/reason/referralCancellationReasonForm.ts
@@ -41,12 +41,6 @@ export default class ReferralCancellationReasonForm {
       return null
     }
 
-    return {
-      errors: validationResult.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(validationResult)
   }
 }
diff --git a/.../routes/service-provider/action-plan/number-of-sessions/actionPlanNumberOfSessionsForm.ts b/.../routes/service-provider/action-plan/number-of-sessions/actionPlanNumberOfSessionsForm.ts
@@ -4,6 +4,7 @@ import { UpdateDraftActionPlanParams } from '../../../../services/interventionsS
 import errorMessages from '../../../../utils/errorMessages'
 import FormUtils from '../../../../utils/formUtils'
 import { FormValidationError } from '../../../../utils/formValidationError'
+import {forEach} from "iterall";
 
 export default class ActionPlanNumberOfSessionsForm {
   private constructor(private readonly request: Request, private readonly result: Result<ValidationError>) {}
@@ -42,13 +43,7 @@ export default class ActionPlanNumberOfSessionsForm {
       return null
     }
 
-    return {
-      errors: this.result.array().map(validationError => ({
-        formFields: [validationError.param],
-        errorSummaryLinkedField: validationError.param,
-        message: validationError.msg,
-      })),
-    }
+    return FormUtils.getFormValidationError(this.result)
   }
 
   get paramsForUpdate(): Partial<UpdateDraftActionPlanParams> {

diff --git a/server/utils/formUtils.ts b/server/utils/formUtils.ts
@@ -45,4 +45,53 @@ export default class FormUtils {
       })),
     }
   }
+
+  static getFormValidationError( result: Result<ValidationError>): FormValidationError{
+    let summaryError:FormValidationError = {errors: []}
+    let errors = result.array()
+    errors.forEach(function (value) {
+      summaryError.errors.push(FormUtils.errorSummary(value))
+    })
+    return summaryError
+  }
+
+  static errorSummary(validationError: ValidationError) {
+    switch (validationError.type){
+      case 'field':
+        return{
+          formFields: [validationError.path],
+          errorSummaryLinkedField: validationError.path,
+          message: validationError.msg
+        }
+        // case 'alternative':
+        //   return validationError.nestedErrors.map(error => ({
+        //     formFields: [error.path],
+        //     errorSummaryLinkedField: error.path,
+        //     message: error.msg
+        //   })
+        //   )
+        //       return null
+        // case 'alternative_grouped':
+        //   // validationError.nestedErrors.map(error => ({
+        //   //   formFields: [error.],
+        //   //   errorSummaryLinkedField: error.path,
+        //   //   message: error.msg
+        //   // })
+        //   // return{
+        //   //   formFields: [validationError],
+        //   //   errorSummaryLinkedField: validationError.path,
+        //   //   message: validationError.msg
+        //   // }
+        //   // this is an AlternativeValidationError or GroupedAlternativeValidationError
+        //       return null
+        // case 'unknown_fields':
+        //   // this is an UnknownFieldValidationError
+        //   const fields = validationError.fields.map(field => field.path).join(', ');
+        //   return null
+
+      default:
+        // Not a known type.
+        throw new Error(`Not a known express-validator error: ${validationError}`);
+    }
+  }
 }