@defra/fcp-sfd-frontend-engine 0.22.0 → 0.23.0

package/dist/index.cjs

@@ -102,6 +102,52 @@ var BUSINESS_EMAIL_ADDRESS = "You have updated your business email address";
 var BUSINESS_NAME = "You have updated your business name";
 var BUSINESS_PHONE_NUMBERS = "You have updated your business phone numbers";
 
+// src/constants/interrupter-journey.js
+var PERSONAL_SECTION_FIELD_ORDER = {
+  name: ["first", "middle", "last"],
+  dob: ["day", "month", "year"],
+  address: ["address1", "address2", "address3", "city", "county", "postcode", "country"],
+  phone: ["personalTelephone", "personalMobile"],
+  email: ["personalEmail"]
+};
+var BUSINESS_SECTION_FIELD_ORDER = {
+  name: ["businessName"],
+  address: ["address1", "address2", "address3", "city", "county", "postcode", "country"],
+  phone: ["businessTelephone", "businessMobile"],
+  email: ["businessEmail"],
+  vat: ["vatNumber"]
+};
+var PERSONAL_SECTION_ORDER = ["name", "dob", "address", "phone", "email"];
+var BUSINESS_SECTION_ORDER = ["name", "address", "phone", "email", "vat"];
+var PERSONAL_SECTION_LABELS = {
+  name: "full name",
+  dob: "date of birth",
+  address: "personal address",
+  phone: "personal phone number",
+  email: "personal email address"
+};
+var BUSINESS_SECTION_LABELS = {
+  name: "business name",
+  address: "business address",
+  phone: "at least one business phone number",
+  email: "business email address",
+  vat: "business VAT number"
+};
+var PERSONAL_UPDATE_TEXT_LABELS = {
+  name: "your full name",
+  dob: "your date of birth",
+  address: "your personal address",
+  phone: "at least one personal phone number",
+  email: "your personal email address"
+};
+var BUSINESS_UPDATE_TEXT_LABELS = {
+  name: "your business name",
+  address: "your business address",
+  phone: "at least one business phone number",
+  email: "your business email address",
+  vat: "your business VAT number"
+};
+
 // src/constants/index.js
 var constants = {
   statusCodes: {
@@ -139,6 +185,16 @@ var constants = {
     BUSINESS_EMAIL_ADDRESS,
     BUSINESS_NAME,
     BUSINESS_PHONE_NUMBERS
+  },
+  interrupterJourney: {
+    PERSONAL_SECTION_FIELD_ORDER,
+    BUSINESS_SECTION_FIELD_ORDER,
+    PERSONAL_SECTION_ORDER,
+    BUSINESS_SECTION_ORDER,
+    PERSONAL_SECTION_LABELS,
+    BUSINESS_SECTION_LABELS,
+    PERSONAL_UPDATE_TEXT_LABELS,
+    BUSINESS_UPDATE_TEXT_LABELS
   }
 };
 
@@ -736,7 +792,7 @@ var updateBusinessNameMutation = `
 
 // src/mutations/business/update-business-phone-numbers.js
 var updateBusinessPhoneNumbersMutation = `
-  mutation UpdateBusinessPhoneNumbers($input: UpdateBusinessPhoneNumbersInput!) {
+  mutation UpdateBusinessPhoneNumbers($input: UpdateBusinessPhoneInput!) {
     updateBusinessPhone(input: $input) {
       business {
         info {
@@ -1481,11 +1537,117 @@ var nullIfUndefined = (value) => {
   return value ?? null;
 };
 
+// src/services/check-interrupter-journey-session-service.js
+var checkInterrupterJourneySessionService = (yar, journeyKey) => {
+  const sessionData = yar.get(journeyKey);
+  if (!sessionData) {
+    return false;
+  }
+  if (Array.isArray(sessionData.orderedSectionsToFix)) {
+    return true;
+  }
+  return false;
+};
+
+// src/services/initialise-fix-journey-service.js
+var initialiseFixJourneyService = (yar, source, journeyType) => {
+  let sessionKey;
+  let sectionOrder = [];
+  if (journeyType === "business") {
+    sessionKey = "businessDetailsValidation";
+    sectionOrder = BUSINESS_SECTION_ORDER;
+  }
+  if (journeyType === "personal") {
+    sessionKey = "personalDetailsValidation";
+    sectionOrder = PERSONAL_SECTION_ORDER;
+  }
+  const sessionData = yar.get(sessionKey);
+  if (!(sessionData == null ? void 0 : sessionData.sectionsNeedingUpdate)) {
+    return sessionData;
+  }
+  const orderedSectionsToFix = orderSectionsToFix(
+    sessionData.sectionsNeedingUpdate,
+    source,
+    sectionOrder
+  );
+  updateSessionData(sessionData, source, orderedSectionsToFix);
+  yar.set(sessionKey, sessionData);
+  return sessionData;
+};
+var updateSessionData = (sessionData, source, orderedSectionsToFix) => {
+  sessionData.orderedSectionsToFix = orderedSectionsToFix;
+  delete sessionData.sectionsNeedingUpdate;
+  delete sessionData.personalFixUpdates;
+  delete sessionData.businessFixUpdates;
+  if (source) {
+    sessionData.source = source;
+  }
+};
+var orderSectionsToFix = (sectionsNeedingUpdate, source, SECTION_ORDER) => {
+  const sections = SECTION_ORDER.filter((section) => {
+    return sectionsNeedingUpdate.includes(section);
+  });
+  if (!source) {
+    return sections;
+  }
+  if (!SECTION_ORDER.includes(source)) {
+    return sections;
+  }
+  return [
+    source,
+    ...sections.filter((section) => section !== source)
+  ];
+};
+
+// src/services/validate-fix-details-service.js
+var validateFixDetailsService = (payload, orderedSectionsToFix, schemas2) => {
+  const errors = [];
+  for (const section of orderedSectionsToFix) {
+    const schema = schemas2[section];
+    const result = schema.validate(payload, {
+      abortEarly: false,
+      allowUnknown: true
+    });
+    if (result.error) {
+      errors.push(...result.error.details);
+    }
+  }
+  if (errors.length > 0) {
+    return {
+      error: {
+        details: errors
+      }
+    };
+  }
+  return { value: payload };
+};
+
+// src/services/set-fix-session-data-service.js
+var setFixSessionDataService = (yar, sessionData, payload, journeyKey, updateKey) => {
+  const orderedSectionsToFix = sessionData.orderedSectionsToFix;
+  const type = journeyKey === "businessDetailsValidation" ? "business" : "personal";
+  const SECTION_FIELD_ORDER = type === "business" ? BUSINESS_SECTION_FIELD_ORDER : PERSONAL_SECTION_FIELD_ORDER;
+  const fixUpdates = {};
+  for (const section of orderedSectionsToFix) {
+    const fields = SECTION_FIELD_ORDER[section];
+    fixUpdates[section] = {};
+    for (const field of fields) {
+      fixUpdates[section][field] = payload[field] ?? "";
+    }
+  }
+  sessionData[updateKey] = fixUpdates;
+  yar.set(journeyKey, sessionData);
+};
+
 // src/services/services.js
 var services = {
   addressLookup: addressLookupService,
   buildUprnAddress,
-  buildManualAddress
+  buildManualAddress,
+  checkInterrupterJourneySession: checkInterrupterJourneySessionService,
+  initialiseFixJourney: initialiseFixJourneyService,
+  validateFixDetails: validateFixDetailsService,
+  setFixSessionData: setFixSessionDataService
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.js

@@ -61,6 +61,52 @@ var BUSINESS_EMAIL_ADDRESS = "You have updated your business email address";
 var BUSINESS_NAME = "You have updated your business name";
 var BUSINESS_PHONE_NUMBERS = "You have updated your business phone numbers";
 
+// src/constants/interrupter-journey.js
+var PERSONAL_SECTION_FIELD_ORDER = {
+  name: ["first", "middle", "last"],
+  dob: ["day", "month", "year"],
+  address: ["address1", "address2", "address3", "city", "county", "postcode", "country"],
+  phone: ["personalTelephone", "personalMobile"],
+  email: ["personalEmail"]
+};
+var BUSINESS_SECTION_FIELD_ORDER = {
+  name: ["businessName"],
+  address: ["address1", "address2", "address3", "city", "county", "postcode", "country"],
+  phone: ["businessTelephone", "businessMobile"],
+  email: ["businessEmail"],
+  vat: ["vatNumber"]
+};
+var PERSONAL_SECTION_ORDER = ["name", "dob", "address", "phone", "email"];
+var BUSINESS_SECTION_ORDER = ["name", "address", "phone", "email", "vat"];
+var PERSONAL_SECTION_LABELS = {
+  name: "full name",
+  dob: "date of birth",
+  address: "personal address",
+  phone: "personal phone number",
+  email: "personal email address"
+};
+var BUSINESS_SECTION_LABELS = {
+  name: "business name",
+  address: "business address",
+  phone: "at least one business phone number",
+  email: "business email address",
+  vat: "business VAT number"
+};
+var PERSONAL_UPDATE_TEXT_LABELS = {
+  name: "your full name",
+  dob: "your date of birth",
+  address: "your personal address",
+  phone: "at least one personal phone number",
+  email: "your personal email address"
+};
+var BUSINESS_UPDATE_TEXT_LABELS = {
+  name: "your business name",
+  address: "your business address",
+  phone: "at least one business phone number",
+  email: "your business email address",
+  vat: "your business VAT number"
+};
+
 // src/constants/index.js
 var constants = {
   statusCodes: {
@@ -98,6 +144,16 @@ var constants = {
     BUSINESS_EMAIL_ADDRESS,
     BUSINESS_NAME,
     BUSINESS_PHONE_NUMBERS
+  },
+  interrupterJourney: {
+    PERSONAL_SECTION_FIELD_ORDER,
+    BUSINESS_SECTION_FIELD_ORDER,
+    PERSONAL_SECTION_ORDER,
+    BUSINESS_SECTION_ORDER,
+    PERSONAL_SECTION_LABELS,
+    BUSINESS_SECTION_LABELS,
+    PERSONAL_UPDATE_TEXT_LABELS,
+    BUSINESS_UPDATE_TEXT_LABELS
   }
 };
 
@@ -695,7 +751,7 @@ var updateBusinessNameMutation = `
 
 // src/mutations/business/update-business-phone-numbers.js
 var updateBusinessPhoneNumbersMutation = `
-  mutation UpdateBusinessPhoneNumbers($input: UpdateBusinessPhoneNumbersInput!) {
+  mutation UpdateBusinessPhoneNumbers($input: UpdateBusinessPhoneInput!) {
     updateBusinessPhone(input: $input) {
       business {
         info {
@@ -1440,11 +1496,117 @@ var nullIfUndefined = (value) => {
   return value ?? null;
 };
 
+// src/services/check-interrupter-journey-session-service.js
+var checkInterrupterJourneySessionService = (yar, journeyKey) => {
+  const sessionData = yar.get(journeyKey);
+  if (!sessionData) {
+    return false;
+  }
+  if (Array.isArray(sessionData.orderedSectionsToFix)) {
+    return true;
+  }
+  return false;
+};
+
+// src/services/initialise-fix-journey-service.js
+var initialiseFixJourneyService = (yar, source, journeyType) => {
+  let sessionKey;
+  let sectionOrder = [];
+  if (journeyType === "business") {
+    sessionKey = "businessDetailsValidation";
+    sectionOrder = BUSINESS_SECTION_ORDER;
+  }
+  if (journeyType === "personal") {
+    sessionKey = "personalDetailsValidation";
+    sectionOrder = PERSONAL_SECTION_ORDER;
+  }
+  const sessionData = yar.get(sessionKey);
+  if (!(sessionData == null ? void 0 : sessionData.sectionsNeedingUpdate)) {
+    return sessionData;
+  }
+  const orderedSectionsToFix = orderSectionsToFix(
+    sessionData.sectionsNeedingUpdate,
+    source,
+    sectionOrder
+  );
+  updateSessionData(sessionData, source, orderedSectionsToFix);
+  yar.set(sessionKey, sessionData);
+  return sessionData;
+};
+var updateSessionData = (sessionData, source, orderedSectionsToFix) => {
+  sessionData.orderedSectionsToFix = orderedSectionsToFix;
+  delete sessionData.sectionsNeedingUpdate;
+  delete sessionData.personalFixUpdates;
+  delete sessionData.businessFixUpdates;
+  if (source) {
+    sessionData.source = source;
+  }
+};
+var orderSectionsToFix = (sectionsNeedingUpdate, source, SECTION_ORDER) => {
+  const sections = SECTION_ORDER.filter((section) => {
+    return sectionsNeedingUpdate.includes(section);
+  });
+  if (!source) {
+    return sections;
+  }
+  if (!SECTION_ORDER.includes(source)) {
+    return sections;
+  }
+  return [
+    source,
+    ...sections.filter((section) => section !== source)
+  ];
+};
+
+// src/services/validate-fix-details-service.js
+var validateFixDetailsService = (payload, orderedSectionsToFix, schemas2) => {
+  const errors = [];
+  for (const section of orderedSectionsToFix) {
+    const schema = schemas2[section];
+    const result = schema.validate(payload, {
+      abortEarly: false,
+      allowUnknown: true
+    });
+    if (result.error) {
+      errors.push(...result.error.details);
+    }
+  }
+  if (errors.length > 0) {
+    return {
+      error: {
+        details: errors
+      }
+    };
+  }
+  return { value: payload };
+};
+
+// src/services/set-fix-session-data-service.js
+var setFixSessionDataService = (yar, sessionData, payload, journeyKey, updateKey) => {
+  const orderedSectionsToFix = sessionData.orderedSectionsToFix;
+  const type = journeyKey === "businessDetailsValidation" ? "business" : "personal";
+  const SECTION_FIELD_ORDER = type === "business" ? BUSINESS_SECTION_FIELD_ORDER : PERSONAL_SECTION_FIELD_ORDER;
+  const fixUpdates = {};
+  for (const section of orderedSectionsToFix) {
+    const fields = SECTION_FIELD_ORDER[section];
+    fixUpdates[section] = {};
+    for (const field of fields) {
+      fixUpdates[section][field] = payload[field] ?? "";
+    }
+  }
+  sessionData[updateKey] = fixUpdates;
+  yar.set(journeyKey, sessionData);
+};
+
 // src/services/services.js
 var services = {
   addressLookup: addressLookupService,
   buildUprnAddress,
-  buildManualAddress
+  buildManualAddress,
+  checkInterrupterJourneySession: checkInterrupterJourneySessionService,
+  initialiseFixJourney: initialiseFixJourneyService,
+  validateFixDetails: validateFixDetailsService,
+  setFixSessionData: setFixSessionDataService
 };
 export {
   constants,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/fcp-sfd-frontend-engine",
-  "version": "0.22.0",
+  "version": "0.23.0",
   "description": "Shared frontend engine used by both the internal and external frontend applications.",
   "main": "./dist/index.cjs",
   "exports": {

package/src/constants/index.js

@@ -39,6 +39,18 @@ import {
   BUSINESS_PHONE_NUMBERS
 } from './success-messages.js'
 
+// Interrupter journey constants
+import {
+  PERSONAL_SECTION_FIELD_ORDER,
+  BUSINESS_SECTION_FIELD_ORDER,
+  PERSONAL_SECTION_ORDER,
+  BUSINESS_SECTION_ORDER,
+  PERSONAL_SECTION_LABELS,
+  BUSINESS_SECTION_LABELS,
+  PERSONAL_UPDATE_TEXT_LABELS,
+  BUSINESS_UPDATE_TEXT_LABELS
+} from './interrupter-journey.js'
+
 export const constants = {
   statusCodes: {
     BAD_REQUEST,
@@ -75,5 +87,15 @@ export const constants = {
     BUSINESS_EMAIL_ADDRESS,
     BUSINESS_NAME,
     BUSINESS_PHONE_NUMBERS
+  },
+  interrupterJourney: {
+    PERSONAL_SECTION_FIELD_ORDER,
+    BUSINESS_SECTION_FIELD_ORDER,
+    PERSONAL_SECTION_ORDER,
+    BUSINESS_SECTION_ORDER,
+    PERSONAL_SECTION_LABELS,
+    BUSINESS_SECTION_LABELS,
+    PERSONAL_UPDATE_TEXT_LABELS,
+    BUSINESS_UPDATE_TEXT_LABELS
   }
 }

package/src/constants/interrupter-journey.js

@@ -0,0 +1,62 @@
+/**
+ * Constants for the interrupter journey.
+ *
+ * Defines the field order for personal and business detail sections,
+ * display labels, and the consistent ordering of sections for the fix journey.
+ *
+ * The ordering defined here is used throughout the fix journey to ensure
+ * consistent presentation of sections and error ordering.
+ *
+ * @module interrupter-journey-constants
+ */
+
+export const PERSONAL_SECTION_FIELD_ORDER = {
+  name: ['first', 'middle', 'last'],
+  dob: ['day', 'month', 'year'],
+  address: ['address1', 'address2', 'address3', 'city', 'county', 'postcode', 'country'],
+  phone: ['personalTelephone', 'personalMobile'],
+  email: ['personalEmail']
+}
+
+export const BUSINESS_SECTION_FIELD_ORDER = {
+  name: ['businessName'],
+  address: ['address1', 'address2', 'address3', 'city', 'county', 'postcode', 'country'],
+  phone: ['businessTelephone', 'businessMobile'],
+  email: ['businessEmail'],
+  vat: ['vatNumber']
+}
+
+export const PERSONAL_SECTION_ORDER = ['name', 'dob', 'address', 'phone', 'email']
+export const BUSINESS_SECTION_ORDER = ['name', 'address', 'phone', 'email', 'vat']
+
+export const PERSONAL_SECTION_LABELS = {
+  name: 'full name',
+  dob: 'date of birth',
+  address: 'personal address',
+  phone: 'personal phone number',
+  email: 'personal email address'
+}
+
+export const BUSINESS_SECTION_LABELS = {
+  name: 'business name',
+  address: 'business address',
+  phone: 'at least one business phone number',
+  email: 'business email address',
+  vat: 'business VAT number'
+}
+
+export const PERSONAL_UPDATE_TEXT_LABELS = {
+  name: 'your full name',
+  dob: 'your date of birth',
+  address: 'your personal address',
+  phone: 'at least one personal phone number',
+  email: 'your personal email address'
+}
+
+export const BUSINESS_UPDATE_TEXT_LABELS = {
+  name: 'your business name',
+  address: 'your business address',
+  phone: 'at least one business phone number',
+  email: 'your business email address',
+  vat: 'your business VAT number'
+}

package/src/mutations/business/update-business-phone-numbers.js

@@ -1,5 +1,5 @@
 export const updateBusinessPhoneNumbersMutation = `
-  mutation UpdateBusinessPhoneNumbers($input: UpdateBusinessPhoneNumbersInput!) {
+  mutation UpdateBusinessPhoneNumbers($input: UpdateBusinessPhoneInput!) {
     updateBusinessPhone(input: $input) {
       business {
         info {

package/src/services/check-interrupter-journey-session-service.js

@@ -0,0 +1,37 @@
+/**
+ * Validates that an interrupter journey session is still usable.
+ *
+ * Ensures the expected session structure exists before allowing
+ * the user to continue a fix journey.
+ *
+ * If the session has been cleared or is incomplete (for example,
+ * due to multi-tab usage), the journey should be restarted.
+ *
+ * @module checkInterrupterJourneySessionService
+ */
+
+/**
+ * Returns true if the session contains valid data for the given journey.
+ * Returns false if the session is missing or incomplete.
+ *
+ * @param {Object} yar - Hapi session object
+ * @param {string} journeyKey - Session key for the journey (e.g., 'personalDetailsValidation')
+ * @returns {boolean} True if session has orderedSectionsToFix array, false otherwise
+ */
+const checkInterrupterJourneySessionService = (yar, journeyKey) => {
+  const sessionData = yar.get(journeyKey)
+
+  if (!sessionData) {
+    return false
+  }
+
+  if (Array.isArray(sessionData.orderedSectionsToFix)) {
+    return true
+  }
+
+  return false
+}
+
+export {
+  checkInterrupterJourneySessionService
+}

package/src/services/initialise-fix-journey-service.js

@@ -0,0 +1,125 @@
+/**
+ * Initialises the fix journey in the user's session.
+ *
+ * This service is the single place where the fix journey order is defined.
+ * It calculates and stores the ordered list of either personal or business
+ * detail sections that the user needs to fix.
+ *
+ * This sets:
+ * - orderedSectionsToFix: the ordered list of sections to fix
+ * - source: the section the user selected to start the journey (if provided)
+ *
+ * If a source is provided, that section is placed first, followed by the
+ * remaining sections in the order defined by this service.
+ *
+ * Downstream routes and presenters read this data from the session and
+ * don't reorder it.
+ *
+ * @module initialiseFixJourneyService
+ */
+
+import {
+  PERSONAL_SECTION_ORDER,
+  BUSINESS_SECTION_ORDER
+} from '../constants/interrupter-journey.js'
+
+/**
+ * Initialises the fix journey session data.
+ *
+ * @param {Object} yar - Hapi session object
+ * @param {string} source - The section user clicked to fix (optional)
+ * @param {string} journeyType - Either 'personal' or 'business'
+ * @returns {Object|undefined} Updated session data, or undefined if session data does not exist
+ */
+const initialiseFixJourneyService = (yar, source, journeyType) => {
+  // Determined by journeyType
+  let sessionKey
+  let sectionOrder = []
+
+  if (journeyType === 'business') {
+    sessionKey = 'businessDetailsValidation'
+    sectionOrder = BUSINESS_SECTION_ORDER
+  }
+
+  if (journeyType === 'personal') {
+    sessionKey = 'personalDetailsValidation'
+    sectionOrder = PERSONAL_SECTION_ORDER
+  }
+
+  const sessionData = yar.get(sessionKey)
+
+  if (!sessionData?.sectionsNeedingUpdate) {
+    return sessionData
+  }
+
+  const orderedSectionsToFix = orderSectionsToFix(
+    sessionData.sectionsNeedingUpdate,
+    source,
+    sectionOrder
+  )
+
+  updateSessionData(sessionData, source, orderedSectionsToFix)
+
+  yar.set(sessionKey, sessionData)
+
+  return sessionData
+}
+
+/**
+ * Updates session data with the ordered sections and clears temporary fields.
+ *
+ * @param {Object} sessionData - The session data to update
+ * @param {string} source - The selected section (optional)
+ * @param {Array<string>} orderedSectionsToFix - Ordered list of sections to fix
+ */
+const updateSessionData = (sessionData, source, orderedSectionsToFix) => {
+  sessionData.orderedSectionsToFix = orderedSectionsToFix
+
+  // Clean up temporary fields used only during validation
+  delete sessionData.sectionsNeedingUpdate
+  delete sessionData.personalFixUpdates
+  delete sessionData.businessFixUpdates
+
+  if (source) {
+    sessionData.source = source
+  }
+}
+
+/**
+ * Returns an ordered list of sections that the user needs to fix.
+ *
+ * Sections are ordered based on how the personal/business details data
+ * is presented on the main page.
+ *
+ * If a source is provided, that section is moved to the top of the list.
+ * Source indicates which link the user clicked to get to the fix list page.
+ *
+ * @param {Array<string>} sectionsNeedingUpdate - Sections identified as needing fixes
+ * @param {string} source - The section user clicked on (optional)
+ * @param {Array<string>} SECTION_ORDER - The defined order for sections
+ * @returns {Array<string>} Ordered list of sections to fix
+ */
+const orderSectionsToFix = (sectionsNeedingUpdate, source, SECTION_ORDER) => {
+  const sections = SECTION_ORDER.filter((section) => {
+    return sectionsNeedingUpdate.includes(section)
+  })
+
+  if (!source) {
+    return sections
+  }
+
+  // Source comes from a URL query param, so only allow known section keys
+  // for this journey type to avoid injecting unexpected values into session state.
+  if (!SECTION_ORDER.includes(source)) {
+    return sections
+  }
+
+  return [
+    source,
+    ...sections.filter(section => section !== source)
+  ]
+}
+
+export {
+  initialiseFixJourneyService
+}

package/src/services/services.js

@@ -1,8 +1,16 @@
 import { addressLookupService } from './os-places/address-lookup-service.js'
 import { buildUprnAddress, buildManualAddress } from './build-address-variables-service.js'
+import { checkInterrupterJourneySessionService } from './check-interrupter-journey-session-service.js'
+import { initialiseFixJourneyService } from './initialise-fix-journey-service.js'
+import { validateFixDetailsService } from './validate-fix-details-service.js'
+import { setFixSessionDataService } from './set-fix-session-data-service.js'
 
 export const services = {
   addressLookup: addressLookupService,
   buildUprnAddress,
-  buildManualAddress
+  buildManualAddress,
+  checkInterrupterJourneySession: checkInterrupterJourneySessionService,
+  initialiseFixJourney: initialiseFixJourneyService,
+  validateFixDetails: validateFixDetailsService,
+  setFixSessionData: setFixSessionDataService
 }

package/src/services/set-fix-session-data-service.js

@@ -0,0 +1,124 @@
+/**
+ * Stores fix journey data on the session.
+ *
+ * This service is used during the interrupter journey to persist form data
+ * as users progress through multiple steps. When users provide updates to
+ * invalid personal or business details, their input is stored in the session
+ * so it can be reviewed and submitted in later steps.
+ *
+ * The service automatically determines whether this is a personal or business
+ * journey by examining the journeyKey parameter, then structures the payload
+ * data according to the appropriate section-based schema.
+ *
+ * Why this matters:
+ * - Users may need to fix multiple detail sections (e.g., name + address + email)
+ * - Each section has its own set of fields defined in SECTION_FIELD_ORDER
+ * - By organizing data by section, the review page can easily iterate and
+ *   display each section with its corresponding fields
+ * - Session storage preserves form state across page navigations
+ *
+ * Data structure example:
+ * For personal details with sections ['name', 'email']:
+ * {
+ *   personalFixUpdates: {
+ *     name: { first: 'John', middle: '', last: 'Doe' },
+ *     email: { personalEmail: 'john@example.com' }
+ *   }
+ * }
+ *
+ * @module setFixSessionDataService
+ */
+
+import {
+  PERSONAL_SECTION_FIELD_ORDER,
+  BUSINESS_SECTION_FIELD_ORDER
+} from '../constants/interrupter-journey.js'
+
+/**
+ * Maps form payload data into session storage, organized by detail sections.
+ *
+ * This function takes flat form submission data and restructures it into a
+ * hierarchical object where each section (e.g., 'name', 'email', 'address')
+ * contains its corresponding fields. Any fields missing from the payload
+ * are populated with empty strings, ensuring the session always has a
+ * complete structure for downstream presenters and services.
+ *
+ * The section-based structure is essential because:
+ * 1. The fix journey is organized by sections that need fixing
+ * 2. The review page displays each section separately
+ * 3. The mutation needs to know which fields belong to which section
+ * 4. Presenters can easily iterate sections and their fields
+ *
+ * @param {Object} yar - Hapi session object with get/set methods
+ * @param {Object} sessionData - Current session data object to be mutated; expects sessionData.orderedSectionsToFix to exist
+ * @param {Object} payload - Flat form submission data (e.g., { first: 'John', last: 'Doe', personalEmail: '...' })
+ *                        Example: ['name', 'address', 'email'] - order matches the presentation order
+ * @param {string} journeyKey - Session key that identifies the journey type
+ *                              - 'personalDetailsValidation' for personal details
+ *                              - 'businessDetailsValidation' for business details
+ *                              This key is used to auto-detect the journey type
+ * @param {string} updateKey - Object key where the structured updates are stored
+ *                              - 'personalFixUpdates' for personal details
+ *                              - 'businessFixUpdates' for business details
+ *
+ * @returns {void} Modifies sessionData in place and persists via yar.set()
+ *
+ * @example
+ * // Store personal detail updates
+ * setFixSessionDataService(
+ *   yar,
+ *   sessionData,
+ *   { first: 'Jane', last: '', personalEmail: 'jane@example.com' },
+ *   'personalDetailsValidation',
+ *   'personalFixUpdates'
+ * )
+ * // Result: sessionData.personalFixUpdates = {
+ * //   name: { first: 'Jane', middle: '', last: '' },
+ * //   email: { personalEmail: 'jane@example.com' }
+ * // }
+ */
+const setFixSessionDataService = (
+  yar,
+  sessionData,
+  payload,
+  journeyKey,
+  updateKey
+) => {
+  const orderedSectionsToFix = sessionData.orderedSectionsToFix
+  // Determine type from journey key
+  // This allows the service to auto-select the correct field schema
+  const type = journeyKey === 'businessDetailsValidation' ? 'business' : 'personal'
+
+  // Select the appropriate field order based on type
+  // Each type (personal/business) has different fields for each section
+  const SECTION_FIELD_ORDER = type === 'business' ? BUSINESS_SECTION_FIELD_ORDER : PERSONAL_SECTION_FIELD_ORDER
+
+  const fixUpdates = {}
+
+  // Loop through each section that needs fixing (e.g. name, email)
+  // The order is preserved from orderedSectionsToFix
+  for (const section of orderedSectionsToFix) {
+    const fields = SECTION_FIELD_ORDER[section]
+
+    fixUpdates[section] = {}
+
+    // Loop through each field in the section (e.g. firstName, lastName)
+    // This ensures all expected fields are present in the session,
+    // even if they weren't provided in the form submission
+    for (const field of fields) {
+      // Map the payload value to the session data, defaulting to an empty string if not provided
+      // Empty strings are used as defaults to maintain a consistent structure
+      // for downstream presenters and mutation builders
+      fixUpdates[section][field] = payload[field] ?? ''
+    }
+  }
+
+  // Store the structured updates in the session under the appropriate key
+  sessionData[updateKey] = fixUpdates
+  // Persist the updated session data
+  yar.set(journeyKey, sessionData)
+}
+
+export {
+  setFixSessionDataService
+}

package/src/services/validate-fix-details-service.js

@@ -0,0 +1,59 @@
+/**
+ * Validates fix payload data for personal or business details.
+ *
+ * This service validates the payload for each section the user is fixing
+ * (e.g. name, date of birth, email, business details), running each provided
+ * Joi schema separately and collecting any validation errors.
+ *
+ * The schemas are passed into the service and validated individually rather
+ * than being combined into a single Joi schema. Combining schemas previously
+ * caused issues with custom validation logic. For example, the date of birth
+ * schema includes custom validation to check for real and valid dates. When
+ * schemas were combined, failures in other schemas could prevent this custom
+ * validation from running, meaning some errors were not surfaced.
+ *
+ * By validating each schema independently (and allowing unknown fields), we
+ * ensure that all section-specific validation logic runs correctly and that
+ * all relevant errors are returned to the user.
+ *
+ * @module validateFixDetailsService
+ */
+
+/**
+ * Validates payload against multiple schemas for different sections.
+ *
+ * @param {Object} payload - The form data to validate
+ * @param {Array<string>} orderedSectionsToFix - List of sections being fixed
+ * @param {Object} schemas - Map of section names to Joi schemas
+ * @returns {Object} Joi validation result with combined errors
+ */
+const validateFixDetailsService = (payload, orderedSectionsToFix, schemas) => {
+  const errors = []
+
+  for (const section of orderedSectionsToFix) {
+    const schema = schemas[section]
+
+    const result = schema.validate(payload, {
+      abortEarly: false,
+      allowUnknown: true
+    })
+
+    if (result.error) {
+      errors.push(...result.error.details)
+    }
+  }
+
+  if (errors.length > 0) {
+    return {
+      error: {
+        details: errors
+      }
+    }
+  }
+
+  return { value: payload }
+}
+
+export {
+  validateFixDetailsService
+}