PP-13312 reuse sanitisedArray

alphagov · Dec 19, 2024 · 846fee9 · 846fee9
1 parent a248bc0
commit 846fee9
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/app/controllers/simplified-account/settings/card-types/card-types.controller.js b/app/controllers/simplified-account/settings/card-types/card-types.controller.js
@@ -32,13 +32,19 @@ async function post (req, res, next) {
   const accountType = req.account.type
   const currentAcceptedCardTypeIds = req.body.currentAcceptedCardTypeIds?.split(',') || []
 
+  let selectedCardTypeIds
   const sanitiseToArray = value => Array.isArray(value) ? value : (value ? [value] : [])
   const validations = [
     body('debit').customSanitizer(sanitiseToArray),
     body('credit').customSanitizer(sanitiseToArray),
     body()
-      .custom((_, { req }) => (req.body.debit?.length ?? 0) + (req.body.credit?.length ?? 0) > 0)
-      .withMessage('You must choose at least one card')
+      .custom((_, { req }) => {
+        selectedCardTypeIds = sanitiseToArray(req.body.debit).concat(sanitiseToArray(req.body.credit))
+        if (selectedCardTypeIds < 1) {
+          throw new Error('You must choose at least one card')
+        }
+        return true
+      })
   ]
   await Promise.all(validations.map(validation => validation.run(req)))
   const validationErrors = validationResult(req)
@@ -56,7 +62,6 @@ async function post (req, res, next) {
     })
   }
 
-  const selectedCardTypeIds = sanitiseToArray(req.body.debit).concat(sanitiseToArray(req.body.credit))
   const noChangesToAcceptedCardTypes = (
     currentAcceptedCardTypeIds.length === selectedCardTypeIds.length &&
     currentAcceptedCardTypeIds.every(item => selectedCardTypeIds.includes(item))