[NFDIV-5200] No Respondent Address / Pre-issue service applications (Base Branch)

Jenkinsfile_CNP

@@ -72,7 +72,7 @@ withPipeline(type, product, component) {
   }
 
   // uncomment to connect backend PR
-  //onPR {
-  // env.CASE_TYPE="NFD-4798"
-  //}
+  onPR {
+    env.CASE_TYPE="NFD-4806"
+  }
 }

charts/nfdiv-frontend/values.preview.template.yaml

@@ -10,7 +10,7 @@ nodejs:
     enabled: false
   environment:
     IDAM_TOKEN_CACHE: true
-#    CASE_TYPE: NFD-4798 # Uncomment to connect to backend PR, don't forget Jenkinsfile_CNP too
+    CASE_TYPE: NFD-4806 # Uncomment to connect to backend PR, don't forget Jenkinsfile_CNP too
   keyVaults:
     nfdiv:
       resourceGroup: nfdiv

src/main/app/case/case.ts

@@ -211,6 +211,10 @@ export const formFieldsToCaseMapping: Partial<Record<keyof Case, keyof CaseData>
   serviceApplicationAnswers: 'serviceApplicationAnswers',
   applicant1InterimApplicationType: 'applicant1InterimApplicationType',
   applicant1InterimAppsStatementOfTruth: 'applicant1InterimAppsStatementOfTruth',
+  applicant1NoRespAddressHasFoundAddress: 'applicant1NoRespAddressHasFoundAddress',
+  applicant1NoRespAddressHasWayToContact: 'applicant1NoRespAddressHasWayToContact',
+  applicant1NoRespAddressWillApplyAltService: 'applicant1NoRespAddressWillApplyAltService',
+  applicant1NoRespAddressEmail: 'applicant1NoRespAddressEmail',
   applicant1NoResponseOwnSearches: 'applicant1NoResponseOwnSearches',
   applicant1NoResponseRespondentAddressInEnglandWales: 'applicant1NoResponseRespondentAddressInEnglandWales',
   applicant1NoResponsePartnerInUkOrReceivingBenefits: 'applicant1NoResponsePartnerInUkOrReceivingBenefits',
@@ -355,6 +359,7 @@ export const formFieldsToCaseMapping: Partial<Record<keyof Case, keyof CaseData>
   withdrawApplicationReason: 'withdrawApplicationReason',
   applicant2ConfirmWithdrawApplication: 'applicant2ConfirmWithdrawApplication',
   applicant2WithdrawApplicationReason: 'applicant2WithdrawApplicationReason',
+  applicant1FoundApplicant2Address: 'applicant1FoundApplicant2Address',
 };
 
 export function formatCase<OutputFormat>(fields: FieldFormats, data: Partial<Case> | CaseData): OutputFormat {
@@ -666,6 +671,20 @@ export interface Case {
   applicant1InterimApplicationType?: InterimApplicationType;
   applicant2InterimApplicationType?: InterimApplicationType;
   applicant1InterimAppsStatementOfTruth?: Checkbox;
+  applicant1NoRespAddressHasFoundAddress: YesOrNo;
+  applicant1NoRespAddressHasWayToContact: YesOrNo;
+  applicant1NoRespAddressWillApplyAltService: YesOrNo;
+  applicant1NoRespAddressAddress?: AddressGlobalUK;
+  applicant1NoRespAddressAddress1?: string;
+  applicant1NoRespAddressAddress2?: string;
+  applicant1NoRespAddressAddress3?: string;
+  applicant1NoRespAddressAddressTown?: string;
+  applicant1NoRespAddressAddressCounty?: string;
+  applicant1NoRespAddressAddressCountry?: string;
+  applicant1NoRespAddressAddressPostcode?: string;
+  applicant1NoRespAddressAddressOverseas?: YesOrNo;
+  applicant1NoRespAddressEmail?: string;
+  applicant1NoRespAddressDoesNotKnowEmailAddress?: Checkbox;
   applicant1NoResponseOwnSearches?: NoResponseOwnSearches;
   applicant1NoResponseRespondentAddressInEnglandWales?: Checkbox;
   applicant1NoResponsePartnerInUkOrReceivingBenefits?: YesOrNo;
@@ -789,6 +808,7 @@ export interface Case {
   withdrawApplicationReason?: string;
   applicant2ConfirmWithdrawApplication?: YesOrNo;
   applicant2WithdrawApplicationReason?: string;
+  applicant1FoundApplicant2Address: YesOrNo;
 }
 
 export interface CaseWithId extends Case {

src/main/app/case/definition.ts

@@ -1124,6 +1124,13 @@ export interface CaseData {
   applicant1SearchGovRecordsPartnerAdditionalAddressDates1: string;
   applicant1SearchGovRecordsPartnerAdditionalAddress2?: string;
   applicant1SearchGovRecordsPartnerAdditionalAddressDates2?: string;
+  applicant1NoRespAddressHasFoundAddress: YesOrNo;
+  applicant1NoRespAddressHasWayToContact: YesOrNo;
+  applicant1NoRespAddressWillApplyAltService: YesOrNo;
+  applicant1NoRespAddressAddress: AddressGlobalUK;
+  applicant1NoRespAddressAddressOverseas: YesOrNo;
+  applicant1NoRespAddressEmail: string;
+  applicant1NoRespAddressKnowsEmail: YesOrNo;
   applicant1NoResponseOwnSearches: NoResponseOwnSearches;
   applicant1NoResponseRespondentAddressInEnglandWales: YesOrNo;
   applicant1NoResponsePartnerInUkOrReceivingBenefits: YesOrNo;
@@ -1183,6 +1190,7 @@ export interface CaseData {
   withdrawApplicationReason: string;
   applicant2ConfirmWithdrawApplication: YesOrNo;
   applicant2WithdrawApplicationReason: string;
+  applicant1FoundApplicant2Address: YesOrNo;
 }
 
 export interface CaseDocuments {
@@ -3029,6 +3037,7 @@ export const CASEWORKER_REQUEST_FOR_INFORMATION = 'caseworker-request-for-inform
 export const CASEWORKER_ISSUE_APPLICATION = 'caseworker-issue-application';
 export const CASEWORKER_REISSUE_APPLICATION = 'caseworker-reissue-application';
 export const UPDATE_CONTACT_DETAILS_AND_REISSUE = 'update-partner-details-or-reissue';
+export const CITIZEN_ADD_PARTNER_DETAILS = 'citizen-add-partner-details';
 export const SYSTEM_REMIND_APPLICANT2 = 'system-remind-applicant2';
 export const SYSTEM_LINK_APPLICANT_2 = 'system-link-applicant2';
 export const SYSTEM_LINK_APPLICANT_1 = 'system-link-applicant1';

src/main/app/case/formatter/address.ts

@@ -9,6 +9,7 @@ export const fromApi = (
     | 'applicant1NoResponsePartner'
     | 'applicant1DispenseLivedTogether'
     | 'applicant1SearchGovRecordsPartnerLastKnown'
+    | 'applicant1NoRespAddress'
 ): Partial<Case> => {
   const fullAddress = data[`${addressPrefix}Address`];
 
@@ -31,6 +32,7 @@ const toApiAddress = (
     | 'applicant1NoResponsePartner'
     | 'applicant1DispenseLivedTogether'
     | 'applicant1SearchGovRecordsPartnerLastKnown'
+    | 'applicant1NoRespAddress'
 ): AddressGlobalUK => ({
   AddressLine1: data[`${addressPrefix}Address1`] || '',
   AddressLine2: data[`${addressPrefix}Address2`] || '',
@@ -60,3 +62,7 @@ export const applicant1NoResponsePartnerAddressToApi = (data: Partial<Case>): Pa
 export const applicant1SearchGovRecordsPartnerLastKnownAddressToApi = (data: Partial<Case>): Partial<CaseData> => ({
   applicant1SearchGovRecordsPartnerLastKnownAddress: toApiAddress(data, 'applicant1SearchGovRecordsPartnerLastKnown'),
 });
+
+export const applicant1NoRespAddressAddressToApi = (data: Partial<Case>): Partial<CaseData> => ({
+  applicant1NoRespAddressAddress: toApiAddress(data, 'applicant1NoRespAddress'),
+});

src/main/app/case/from-api-format.test.ts

@@ -24,6 +24,7 @@ describe('from-api-format', () => {
     applicant1ContactDetailsType: ContactDetailsType.PRIVATE,
     applicant1InRefuge: YesOrNo.NO,
     applicant1KnowsApplicant2EmailAddress: YesOrNo.NO,
+    applicant1NoRespAddressKnowsEmail: YesOrNo.NO,
     applicant1WantsToHavePapersServedAnotherWay: undefined,
     applicant1LanguagePreferenceWelsh: YesOrNo.YES,
     applicant2LanguagePreferenceWelsh: YesOrNo.YES,
@@ -58,6 +59,7 @@ describe('from-api-format', () => {
     applicant1LanguagePreferenceWelsh: YesOrNo.NO,
     applicant2LanguagePreferenceWelsh: YesOrNo.NO,
     applicant1KnowsApplicant2EmailAddress: YesOrNo.YES,
+    applicant1NoRespAddressKnowsEmail: YesOrNo.YES,
     applicant1ContactDetailsType: ContactDetailsType.PUBLIC,
     applicant2ContactDetailsType: ContactDetailsType.PUBLIC,
     applicant1PrayerDissolveDivorce: [],
@@ -77,6 +79,7 @@ describe('from-api-format', () => {
       applicant1AddressPrivate: YesOrNo.YES,
       applicant1InRefuge: YesOrNo.NO,
       applicant1DoesNotKnowApplicant2EmailAddress: Checkbox.Checked,
+      applicant1NoRespAddressDoesNotKnowEmailAddress: Checkbox.Checked,
       applicant2AddressPrivate: YesOrNo.NO,
       iWantToHavePapersServedAnotherWay: undefined,
       applicant1EnglishOrWelsh: LanguagePreference.Welsh,
@@ -115,6 +118,7 @@ describe('from-api-format', () => {
       applicant1EnglishOrWelsh: LanguagePreference.English,
       applicant2EnglishOrWelsh: LanguagePreference.English,
       applicant1DoesNotKnowApplicant2EmailAddress: Checkbox.Unchecked,
+      applicant1NoRespAddressDoesNotKnowEmailAddress: Checkbox.Unchecked,
       applicant1AddressPrivate: YesOrNo.NO,
       applicant2AddressPrivate: YesOrNo.NO,
       applicant1IConfirmPrayer: Checkbox.Unchecked,
@@ -158,6 +162,7 @@ describe('from-api-format', () => {
       applicant1AddressPrivate: YesOrNo.YES,
       applicant1InRefuge: YesOrNo.NO,
       applicant1DoesNotKnowApplicant2EmailAddress: Checkbox.Checked,
+      applicant1NoRespAddressDoesNotKnowEmailAddress: Checkbox.Checked,
       applicant2AddressPrivate: YesOrNo.NO,
       iWantToHavePapersServedAnotherWay: undefined,
       disputeApplication: YesOrNo.YES,
@@ -230,6 +235,7 @@ describe('from-api-format', () => {
       applicant1AddressPrivate: YesOrNo.YES,
       applicant1InRefuge: YesOrNo.NO,
       applicant1DoesNotKnowApplicant2EmailAddress: Checkbox.Checked,
+      applicant1NoRespAddressDoesNotKnowEmailAddress: Checkbox.Checked,
       applicant2AddressPrivate: YesOrNo.NO,
       iWantToHavePapersServedAnotherWay: undefined,
       disputeApplication: null,
@@ -277,6 +283,7 @@ describe('from-api-format', () => {
       applicant1AddressPrivate: YesOrNo.YES,
       applicant1InRefuge: YesOrNo.NO,
       applicant1DoesNotKnowApplicant2EmailAddress: Checkbox.Checked,
+      applicant1NoRespAddressDoesNotKnowEmailAddress: Checkbox.Checked,
       applicant2AddressPrivate: YesOrNo.NO,
       iWantToHavePapersServedAnotherWay: undefined,
       disputeApplication: YesOrNo.NO,
@@ -380,6 +387,29 @@ describe('from-api-format', () => {
       });
     });
 
+    test('converts to UK format for applicant1NoRespAddress', () => {
+      const nfdivFormat = fromApiFormat({
+        ...results,
+        applicant1NoRespAddressAddress: {
+          AddressLine1: 'Line 1',
+          AddressLine2: 'Line 2',
+          PostTown: 'Town',
+          County: 'County',
+          PostCode: 'Postcode',
+        },
+        applicant1NoRespAddressAddressOverseas: YesOrNo.NO,
+      } as unknown as CaseData);
+
+      expect(nfdivFormat).toMatchObject({
+        applicant1NoRespAddressAddress1: 'Line 1',
+        applicant1NoRespAddressAddress2: 'Line 2',
+        applicant1NoRespAddressAddressTown: 'Town',
+        applicant1NoRespAddressAddressCounty: 'County',
+        applicant1NoRespAddressAddressPostcode: 'Postcode',
+        applicant1NoRespAddressAddressOverseas: YesOrNo.NO,
+      });
+    });
+
     test('converts to UK format for applicant1DispenseLivedTogether', () => {
       const nfdivFormat = fromApiFormat({
         ...results,

src/main/app/case/from-api-format.ts

@@ -224,6 +224,14 @@ const fields: FromApiConverters = {
   }),
   applicant1SearchGovRecordsPartnerLastKnownAddress: data =>
     formatAddress(data, 'applicant1SearchGovRecordsPartnerLastKnown'),
+  applicant1NoRespAddressAddressOverseas: ({ applicant1NoRespAddressAddressOverseas }) => ({
+    applicant1NoRespAddressAddressOverseas: applicant1NoRespAddressAddressOverseas ?? YesOrNo.NO,
+  }),
+  applicant1NoRespAddressKnowsEmail: data => ({
+    applicant1NoRespAddressDoesNotKnowEmailAddress:
+      data.applicant1NoRespAddressKnowsEmail === YesOrNo.YES ? Checkbox.Unchecked : Checkbox.Checked,
+  }),
+  applicant1NoRespAddressAddress: data => formatAddress(data, 'applicant1NoRespAddress'),
 };
 
 const fromApiDate = date => {

src/main/app/case/to-api-format.test.ts

@@ -53,6 +53,7 @@ describe('to-api-format', () => {
     applicant2FoHelpPayingNeeded: YesOrNo.YES,
     applicant1AgreeToReceiveEmails: Checkbox.Checked,
     applicant1DoesNotKnowApplicant2EmailAddress: Checkbox.Checked,
+    applicant1NoRespAddressDoesNotKnowEmailAddress: Checkbox.Checked,
     applicant1AddressPrivate: YesOrNo.YES,
     applicant1InRefuge: YesOrNo.YES,
     applicant1KnowsApplicant2Address: YesOrNo.NO,
@@ -103,6 +104,7 @@ describe('to-api-format', () => {
 
   const resultsWithSecondaryValues: OrNull<Partial<Case>> = {
     applicant1DoesNotKnowApplicant2EmailAddress: Checkbox.Unchecked,
+    applicant1NoRespAddressDoesNotKnowEmailAddress: Checkbox.Unchecked,
     applicant1IConfirmPrayer: Checkbox.Unchecked,
     applicant2IConfirmPrayer: Checkbox.Unchecked,
     applicant1AddressPrivate: YesOrNo.NO,
@@ -169,7 +171,9 @@ describe('to-api-format', () => {
       applicant1ContactDetailsType: ContactDetailsType.PRIVATE,
       applicant1InRefuge: YesOrNo.YES,
       applicant1KnowsApplicant2Address: YesOrNo.NO,
+      applicant1FoundApplicant2Address: YesOrNo.NO,
       applicant1KnowsApplicant2EmailAddress: YesOrNo.NO,
+      applicant1NoRespAddressKnowsEmail: YesOrNo.NO,
       applicant1WantsToHavePapersServedAnotherWay: null,
       applicant1LanguagePreferenceWelsh: 'No',
       applicant2LanguagePreferenceWelsh: 'No',
@@ -235,6 +239,7 @@ describe('to-api-format', () => {
     expect(apiFormat).toStrictEqual({
       applicant1ContactDetailsType: ContactDetailsType.PUBLIC,
       applicant1KnowsApplicant2EmailAddress: YesOrNo.YES,
+      applicant1NoRespAddressKnowsEmail: YesOrNo.YES,
       applicant2ContactDetailsType: ContactDetailsType.PUBLIC,
       applicant1PrayerDissolveDivorce: [],
       applicant1PrayerEndCivilPartnership: [],

src/main/app/case/to-api-format.ts

@@ -27,6 +27,7 @@ import {
 import {
   applicant1AddressToApi,
   applicant1DispenseLivedTogetherAddressToApi,
+  applicant1NoRespAddressAddressToApi,
   applicant1NoResponsePartnerAddressToApi,
   applicant1SearchGovRecordsPartnerLastKnownAddressToApi,
   applicant2AddressToApi,
@@ -182,6 +183,14 @@ const fields: ToApiConverters = {
   iWantToHavePapersServedAnotherWay: data => ({
     applicant1WantsToHavePapersServedAnotherWay: checkboxConverter(data.iWantToHavePapersServedAnotherWay),
   }),
+  applicant1FoundApplicant2Address: data => ({
+    applicant1KnowsApplicant2Address: data.applicant1FoundApplicant2Address,
+    applicant1FoundApplicant2Address: data.applicant1FoundApplicant2Address,
+    applicant1WantsToHavePapersServedAnotherWay:
+      data.applicant1FoundApplicant2Address === YesOrNo.YES
+        ? YesOrNo.NO
+        : checkboxConverter(data.iWantToHavePapersServedAnotherWay),
+  }),
   applicant1NameChangedHowOtherDetails: data => ({
     applicant1NameChangedHowOtherDetails: data.applicant1NameChangedHow?.includes(ChangedNameHow.OTHER)
       ? data.applicant1NameChangedHowOtherDetails
@@ -361,6 +370,11 @@ const fields: ToApiConverters = {
   }),
   applicant1KnowsApplicant2Address: data => ({
     applicant1KnowsApplicant2Address: data.applicant1KnowsApplicant2Address,
+    applicant1FoundApplicant2Address: data.applicant1KnowsApplicant2Address,
+    applicant1WantsToHavePapersServedAnotherWay:
+      data.applicant1KnowsApplicant2Address === YesOrNo.YES
+        ? YesOrNo.NO
+        : checkboxConverter(data.iWantToHavePapersServedAnotherWay),
     ...(data.applicant1KnowsApplicant2Address === YesOrNo.NO
       ? applicant2AddressToApi(
           setUnreachableAnswersToNull([
@@ -725,6 +739,14 @@ const fields: ToApiConverters = {
         ? data.applicant1DispenseChildMaintenanceResults
         : null,
   }),
+  applicant1NoRespAddressDoesNotKnowEmailAddress: data => ({
+    applicant1NoRespAddressKnowsEmail:
+      data.applicant1NoRespAddressDoesNotKnowEmailAddress === Checkbox.Checked ? YesOrNo.NO : YesOrNo.YES,
+  }),
+  applicant1NoRespAddressAddressOverseas: ({ applicant1NoRespAddressAddressOverseas }) => ({
+    applicant1NoRespAddressAddressOverseas: applicant1NoRespAddressAddressOverseas ?? YesOrNo.NO,
+  }),
+  applicant1NoRespAddressAddressPostcode: applicant1NoRespAddressAddressToApi,
 };
 
 const toApiDate = (date: CaseDate | undefined | string) => {

src/main/app/document/FileUploadJourneyConfiguration.ts

@@ -1,9 +1,10 @@
-import { UPLOAD_EVIDENCE_ALTERNATIVE } from '../../steps/urls';
+import { UPLOAD_EVIDENCE_ALTERNATIVE, UPLOAD_EVIDENCE_DISPENSE } from '../../steps/urls';
 import { ApplicationType } from '../case/definition';
 import type { AppRequest } from '../controller/AppRequest';
 
 export enum FileUploadJourney {
   ALTERNATIVE_SERVICE = 'alternativeService',
+  DISPENSE_SERVICE = 'dispenseService',
 }
 
 export enum FileUploadPath {
@@ -22,6 +23,11 @@ const FileUploadJourneyConfigurationMap: Record<FileUploadJourney, FileUploadJou
     getRedirectPath: () => UPLOAD_EVIDENCE_ALTERNATIVE,
     validateUpload: req => validateServiceApplicationDocumentUpload(req),
   },
+  [FileUploadJourney.DISPENSE_SERVICE]: {
+    uploadPath: FileUploadPath.APPLICANT_1_INTERIM_APPS_EVIDENCE,
+    getRedirectPath: () => UPLOAD_EVIDENCE_DISPENSE,
+    validateUpload: req => validateServiceApplicationDocumentUpload(req),
+  },
 };
 
 export const validateServiceApplicationDocumentUpload = (req: AppRequest): boolean => {

src/main/routes.ts

@@ -14,6 +14,7 @@ import { getUserSequence, stepsWithContent } from './steps';
 import { AccessibilityStatementGetController } from './steps/accessibility-statement/get';
 import * as applicant1AccessCodeContent from './steps/applicant1/enter-your-access-code/content';
 import { Applicant1AccessCodeGetController } from './steps/applicant1/enter-your-access-code/get';
+import { PartnerContactDetailsUpdatedGetController } from './steps/applicant1/interim-applications/no-respondent-address/details-updated/get';
 import { PostcodeLookupPostController } from './steps/applicant1/postcode-lookup/post';
 import { ApplicationWithdrawnPreIssueGetController } from './steps/applicant1/withdraw-pre-issue/application-withdrawn/get';
 import * as applicant2AccessCodeContent from './steps/applicant2/enter-your-access-code/content';
@@ -54,6 +55,7 @@ import {
   HOME_URL,
   HUB_PAGE,
   NO_RESPONSE_YET,
+  NO_RESP_ADDRESS_DETAILS_UPDATED,
   POSTCODE_LOOKUP,
   PRIVACY_POLICY_URL,
   REQUEST_FOR_INFORMATION_SAVE_AND_SIGN_OUT,
@@ -104,6 +106,8 @@ export class Routes {
     app.get(CONTACT_US, errorHandler(new ContactUsGetController().get));
     app.post(POSTCODE_LOOKUP, errorHandler(new PostcodeLookupPostController().post));
 
+    app.get(NO_RESP_ADDRESS_DETAILS_UPDATED, errorHandler(new PartnerContactDetailsUpdatedGetController().get));
+
     const documentManagerController = new DocumentManagerController();
     app.post(DOCUMENT_MANAGER, handleUploads.array('files[]', 5), errorHandler(documentManagerController.post));
     app.get(`${DOCUMENT_MANAGER}/delete/:index`, errorHandler(documentManagerController.delete));
@@ -123,7 +127,11 @@ export class Routes {
         const postController = fs.existsSync(`${step.stepDir}/post${ext}`)
           ? require(`${step.stepDir}/post${ext}`).default
           : PostController;
-        app.post(step.url, errorHandler(new postController(step.form.fields).post));
+        app.post(
+          step.url,
+          this.isRouteForUser as RequestHandler,
+          errorHandler(new postController(step.form.fields).post)
+        );
       }
     }