C8 refuge epic

charts/prl-citizen-frontend/values.preview.template.yaml

@@ -17,10 +17,10 @@ nodejs:
     SERVICE_AUTH_PROVIDER_URL: 'http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal'
     IDAM_WEB_URL: 'https://idam-web-public.{{ .Values.global.environment }}.platform.hmcts.net/login'
     IDAM_API_URL: 'https://idam-api.{{ .Values.global.environment }}.platform.hmcts.net/o/token'
+    CCD_URL: 'https://ccd-data-store-api-prl-ccd-definitions-pr-2429.preview.platform.hmcts.net'
     EQUALITY_URL: 'https://pcq.aat.platform.hmcts.net'
-    CCD_URL: 'http://ccd-data-store-api-aat.service.core-compute-aat.internal'
-    DOCUMENT_MANAGEMENT_URL: 'http://ccd-case-document-am-api-aat.service.core-compute-aat.internal'
-    COS_URL: 'http://prl-cos-aat.service.core-compute-aat.internal'
+    DOCUMENT_MANAGEMENT_URL: 'https://ccd-case-document-am-api-prl-ccd-definitions-pr-2429.preview.platform.hmcts.net'
+    COS_URL: 'https://prl-cos-pr-2740.preview.platform.hmcts.net'
     REASONABLE_ADJUSTMENTS: 'https://cui-ra.aat.platform.hmcts.net'
     FACT_URL: 'http://fact-api-aat.service.core-compute-aat.internal'
     REDIS_HOST: 'prl-citizen-frontend-secondary-redis-{{ .Values.global.environment }}.redis.cache.windows.net'

config/development.yaml

@@ -21,11 +21,11 @@ services:
   citizen:
     uploadDocsEmail: UPLOAD_DOCUMENTS_EMAIL
   case:
-    url: 'http://ccd-data-store-api-aat.service.core-compute-aat.internal'
+    url: 'https://ccd-data-store-api-prl-ccd-definitions-pr-2429.preview.platform.hmcts.net'
   cos:
-    url: 'http://prl-cos-aat.service.core-compute-aat.internal'
+    url: 'https://prl-cos-pr-2740.preview.platform.hmcts.net'
   documentManagement:
-    url: 'http://ccd-case-document-am-api-aat.service.core-compute-aat.internal'
+    url: 'https://ccd-case-document-am-api-prl-ccd-definitions-pr-2429.preview.platform.hmcts.net'
   fact:
     url: 'http://fact-api-aat.service.core-compute-aat.internal'
   reasonableAdjustments:

src/main/app/case/case.ts

@@ -456,6 +456,8 @@ export interface Case {
   citizenUserPhoneNumberText?: string;
   citizenUserDateOfBirth?: CaseDate;
   citizenUserDateOfBirthText?: string;
+  citizenUserLivingInRefugeText?: string;
+  refugeDocumentText?: string;
   applicant1Occupation?: string;
   citizenUserSelectAddress?: string;
   citizenUserPlaceOfBirth?: string;
@@ -475,6 +477,7 @@ export interface Case {
   citizenUserManualAddressTown?: string;
   citizenUserManualAddressCounty?: string;
   citizenUserManualAddressPostcode?: string;
+  isCitizenLivingInRefuge?: YesOrNo;
 
   //applicant1LanguagePreference?: LanguagePreference;
   //support you need during the case
@@ -691,6 +694,8 @@ export interface Case {
   awp_supportingDocuments?: DocumentInfo[];
   awp_applicationType?: AWPApplicationType;
   awp_applicationReason?: AWPApplicationReason;
+  refugeDocument?: Document;
+  reUploadRefugeDocument?: YesOrNo;
 }
 
 export interface CitizenNotification {

src/main/app/case/definition.ts

@@ -113,6 +113,8 @@ export interface PartyDetails {
   contactPreferences?: ContactPreference | null;
   isRemoveLegalRepresentativeRequested?: YesOrNo;
   partyId: string;
+  liveInRefuge: YesOrNo;
+  refugeConfidentialityC8Form?: Document | null;
 }
 
 export interface User {
@@ -672,6 +674,8 @@ export type C100Applicant = {
   applicantAddressTown?: string;
   applicantAddressCounty?: string;
   country?: string;
+  liveInRefuge?: YesOrNo;
+  refugeConfidentialityC8Form?: Document;
   applicantAddressHistory?: YesOrNo;
   applicantProvideDetailsOfPreviousAddresses?: string;
   personalDetails: {
@@ -696,12 +700,12 @@ export interface RelationshipToChildren {
 }
 
 export interface ContactDetail {
-  canProvideEmail?: YesNoEmpty;
+  canProvideEmail?: YesOrNo | null;
   emailAddress?: string;
-  canProvideTelephoneNumber?: YesNoEmpty;
+  canProvideTelephoneNumber?: YesOrNo | null;
   telephoneNumber?: string;
   canNotProvideTelephoneNumberReason?: string;
-  canLeaveVoiceMail?: YesNoEmpty;
+  canLeaveVoiceMail?: YesOrNo | null;
   applicantContactPreferences?: string;
 }
 
@@ -2767,6 +2771,8 @@ export type C100RebuildPartyDetails = {
     donKnowTelephoneNumber?: YesOrNo;
   };
   addressUnknown?: YesOrNo;
+  liveInRefuge?: YesOrNo;
+  refugeConfidentialityC8Form?: Document;
 };
 
 export interface RelationshipToChildren {
@@ -2965,6 +2971,7 @@ export enum PaymentErrorContext {
 export enum RootContext {
   C100_REBUILD = 'c100-rebuild',
   RESPONDENT = 'respondent',
+  APPLICANT = 'applicant'
 }
 
 export enum DomesticAbuseExemptions {

src/main/routes.ts

@@ -15,6 +15,7 @@ import { routeGuard } from './steps/application-within-proceedings/routeGuard';
 import { processAWPApplication } from './steps/application-within-proceedings/utils';
 import CaseDataController from './steps/common/CaseDataController';
 import DownloadDocumentController from './steps/common/documents/download/DownloadDocumentController';
+import { C8RefugeSequence } from './steps/common/refuge/sequence';
 import { AohSequence } from './steps/common/safety-concerns/sequence';
 import CaseDetailsGetController from './steps/common/task-list/controllers/CaseDetailsGetController';
 import TaskListGetController from './steps/common/task-list/controllers/TaskListGetController';
@@ -110,6 +111,7 @@ export class Routes {
       ...stepsWithContent,
       ...getStepsWithContent(AohSequence.getSequence(), '/common'),
       ...getStepsWithContent(await RAProvider.getSequence(), '/common'),
+      ...getStepsWithContent(C8RefugeSequence.getSequence(), '/common'),
     ];
 
     for (const step of steps) {

src/main/steps/applicant/confirm-contact-details/checkanswers/content.test.ts

@@ -13,6 +13,8 @@ const en = {
     citizenUserFullName: 'Name',
     citizenUserDateOfBirthText: 'Date of birth',
     citizenUserPlaceOfBirthText: 'Place of birth',
+    citizenUserLivingInRefugeText: 'Living in refuge',
+    refugeDocumentText: 'C8 refuge document',
     citizenUserAddressText: 'Address',
     citizenUserAddressHistory: 'Address history',
     citizenUserPhoneNumberText: 'Phone number',

src/main/steps/c100-rebuild/applicant/add-applicants/postController.ts

@@ -168,12 +168,12 @@ export default class AddApplicantPostController extends PostController<AnyObject
         applicantPlaceOfBirth: '',
       },
       applicantContactDetail: {
-        canProvideEmail: YesNoEmpty.EMPTY,
+        canProvideEmail: null,
         emailAddress: '',
-        canProvideTelephoneNumber: YesNoEmpty.EMPTY,
+        canProvideTelephoneNumber: null,
         telephoneNumber: '',
         canNotProvideTelephoneNumberReason: '',
-        canLeaveVoiceMail: YesNoEmpty.EMPTY,
+        canLeaveVoiceMail: null,
       },
       reasonableAdjustmentsFlags: [],
     } as C100Applicant;

src/main/steps/c100-rebuild/applicant/contact-detail/content.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { CaseWithId } from '../../../../app/case/case';
-import { C100Applicant, YesNoEmpty } from '../../../../app/case/definition';
+import { C100Applicant, YesOrNo } from '../../../../app/case/definition';
 import { TranslationFn } from '../../../../app/controller/GetController';
 import { FormContent, GenerateDynamicFormFields } from '../../../../app/form/Form';
 import { isAlphaNumeric, isEmailValid, isFieldFilledIn, isPhoneNoValid } from '../../../../app/form/validation';
@@ -133,8 +133,8 @@ export const generateFormFields = (
       values: [
         {
           label: l => l.canProvideEmailLabel,
-          selected: canProvideEmail === YesNoEmpty.YES,
-          value: YesNoEmpty.YES,
+          selected: canProvideEmail === YesOrNo.YES,
+          value: YesOrNo.YES,
           subFields: {
             emailAddress: {
               type: 'text',
@@ -147,8 +147,8 @@ export const generateFormFields = (
         },
         {
           label: l => l.canNotProvideEmailLabel,
-          selected: canProvideEmail === YesNoEmpty.NO,
-          value: YesNoEmpty.NO,
+          selected: canProvideEmail === YesOrNo.NO,
+          value: YesOrNo.NO,
         },
       ],
       validator: isFieldFilledIn,
@@ -159,8 +159,8 @@ export const generateFormFields = (
       values: [
         {
           label: l => l.canProvideTelephoneNumberLabel,
-          selected: canProvideTelephoneNumber === YesNoEmpty.YES,
-          value: YesNoEmpty.YES,
+          selected: canProvideTelephoneNumber === YesOrNo.YES,
+          value: YesOrNo.YES,
           subFields: {
             telephoneNumber: {
               type: 'text',
@@ -173,8 +173,8 @@ export const generateFormFields = (
         },
         {
           label: l => l.canNotProvideTelephoneNumberLabel,
-          selected: canProvideTelephoneNumber === YesNoEmpty.NO,
-          value: YesNoEmpty.NO,
+          selected: canProvideTelephoneNumber === YesOrNo.NO,
+          value: YesOrNo.NO,
           subFields: {
             canNotProvideTelephoneNumberReason: {
               type: 'text',
@@ -197,13 +197,13 @@ export const generateFormFields = (
       values: [
         {
           label: l => l.voiceMailYesLabel,
-          selected: canLeaveVoiceMail === YesNoEmpty.YES,
-          value: YesNoEmpty.YES,
+          selected: canLeaveVoiceMail === YesOrNo.YES,
+          value: YesOrNo.YES,
         },
         {
           label: l => l.voiceMailNoLabel,
-          selected: canLeaveVoiceMail === YesNoEmpty.NO,
-          value: YesNoEmpty.NO,
+          selected: canLeaveVoiceMail === YesOrNo.NO,
+          value: YesOrNo.NO,
         },
       ],
       validator: isFieldFilledIn,

src/main/steps/c100-rebuild/applicant/contact-detail/postController.ts

@@ -1,7 +1,7 @@
 import autobind from 'autobind-decorator';
 import { Response } from 'express';
 
-import { C100Applicant, YesNoEmpty } from '../../../../app/case/definition';
+import { C100Applicant, YesOrNo } from '../../../../app/case/definition';
 import { AppRequest } from '../../../../app/controller/AppRequest';
 import { AnyObject, PostController } from '../../../../app/controller/PostController';
 import { Form, FormFields, FormFieldsFn } from '../../../../app/form/Form';
@@ -24,12 +24,12 @@ export default class ContactDetailPostController extends PostController<AnyObjec
     const applicantIndex = req.session.userCase?.appl_allApplicants?.findIndex(i => i.id === applicantId) as number;
     req.session.userCase.appl_allApplicants![applicantIndex].applicantContactDetail = {
       ...req.session.userCase?.appl_allApplicants?.[applicantIndex].applicantContactDetail,
-      canProvideEmail: req.body['canProvideEmail'] as YesNoEmpty,
-      emailAddress: formData['canProvideEmail'] === YesNoEmpty.NO ? '' : (req.body['emailAddress'] as string),
-      canProvideTelephoneNumber: req.body['canProvideTelephoneNumber'] as YesNoEmpty,
+      canProvideEmail: req.body['canProvideEmail'] as YesOrNo,
+      emailAddress: formData['canProvideEmail'] === YesOrNo.NO ? '' : (req.body['emailAddress'] as string),
+      canProvideTelephoneNumber: req.body['canProvideTelephoneNumber'] as YesOrNo,
       telephoneNumber: req.body['telephoneNumber'] as string,
-      canNotProvideTelephoneNumberReason: req.body['canNotProvideTelephoneNumberReason'] as YesNoEmpty,
-      canLeaveVoiceMail: req.body['canLeaveVoiceMail'] as YesNoEmpty,
+      canNotProvideTelephoneNumberReason: req.body['canNotProvideTelephoneNumberReason'] as YesOrNo,
+      canLeaveVoiceMail: req.body['canLeaveVoiceMail'] as YesOrNo,
     };
     if (onlycontinue) {
       req.session.errors = form.getErrors(formData);

src/main/steps/c100-rebuild/applicant/navigationController.test.ts

@@ -96,7 +96,7 @@ describe('ApplicantDetailsNavigationController', () => {
     ).toBe('/c100-rebuild/applicant/2cd885a0-135e-45f1-85b7-aa46a1f78f46/contact-preference');
   });
 
-  test('From RELATIONSHIP CHILD screen -> navigate to ADDRESS LOOKUP screen', async () => {
+  test('From RELATIONSHIP CHILD screen -> navigate to refuge screen', async () => {
     dummyRequest.params.childId = '7483640e-0817-4ddc-b709-6723f7925635';
     dummyRequest.params.applicantId = '2cd885a0-135e-45f1-85b7-aa46a1f78f46';
     expect(
@@ -105,7 +105,7 @@ describe('ApplicantDetailsNavigationController', () => {
         dummyRequest.session.userCase,
         dummyRequest.params
       )
-    ).toBe('/c100-rebuild/applicant/2cd885a0-135e-45f1-85b7-aa46a1f78f46/address/lookup');
+    ).toBe('/c100-rebuild/refuge/staying-in-refuge/2cd885a0-135e-45f1-85b7-aa46a1f78f46?');
   });
 
   test('From CONFIDENTIALITY START ALT -> navigate to FEEDBACK screen', async () => {

src/main/steps/c100-rebuild/applicant/navigationController.ts

@@ -1,5 +1,5 @@
 import { Case } from '../../../app/case/case';
-import { C100Applicant, ChildrenDetails, YesOrNo } from '../../../app/case/definition';
+import { C100Applicant, ChildrenDetails, RootContext, YesOrNo } from '../../../app/case/definition';
 import { applyParms } from '../../common/url-parser';
 import {
   C100_APPLICANTS_PERSONAL_DETAILS,
@@ -16,6 +16,7 @@ import {
   C100_APPLICANT_RELATIONSHIP_TO_CHILD,
   C100_RESPONDENT_DETAILS_ADD,
   PageLink,
+  STAYING_IN_REFUGE,
 } from '../../urls';
 import { getPartyDetails } from '../people/util';
 
@@ -94,8 +95,9 @@ class ApplicantNavigationController {
               applicantId: this.applicantId,
               childId: nextChild?.id,
             })
-          : applyParms(C100_APPLICANT_ADDRESS_LOOKUP, {
-              applicantId: this.applicantId,
+          : applyParms(STAYING_IN_REFUGE, {
+              root: RootContext.C100_REBUILD,
+              id: this.applicantId,
             });
         break;
       }

src/main/steps/c100-rebuild/c100sequence.test.ts

@@ -525,7 +525,7 @@ describe('C100Sequence', () => {
     );
     expect(C100Sequence[91].showInSection).toBe('c100');
     expect(C100Sequence[91].getNextStep(otherPersonMockData.session.userCase, otherPersonMockData)).toBe(
-      '/c100-rebuild/other-person-details/7228444b-ef3f-4202-a1e7-cdcd2316e1f6/address/lookup'
+      '/c100-rebuild/refuge/staying-in-refuge/7228444b-ef3f-4202-a1e7-cdcd2316e1f6?'
     );
 
     expect(C100Sequence[92].url).toBe('/c100-rebuild/child-details/:childId/live-with/mainly-live-with');
@@ -569,5 +569,19 @@ describe('C100Sequence', () => {
     expect(C100Sequence[99].url).toBe('/c100-rebuild/check-your-answers');
     expect(C100Sequence[99].showInSection).toBe('c100');
     expect(C100Sequence[99].getNextStep({})).toBe('/c100-rebuild/check-your-answers');
+
+    expect(C100Sequence[100].url).toBe('/c100-rebuild/applicant/:applicantId/contact-preference');
+    expect(C100Sequence[100].showInSection).toBe('c100');
+    expect(C100Sequence[100].getNextStep(applicantMockRequest.session.userCase, applicantMockRequest)).toBe(
+      '/c100-rebuild/applicant/2cd885a0-135e-45f1-85b7-aa46a1f78f46/confidentiality/details-know'
+    );
+
+    expect(C100Sequence[101].url).toBe('/c100-rebuild/:caseId/withdraw');
+    expect(C100Sequence[101].showInSection).toBe('c100');
+    expect(C100Sequence[101].getNextStep({})).toBe('/task-list/applicant');
+
+    expect(C100Sequence[102].url).toBe('/c100-rebuild/withdraw/confirmation');
+    expect(C100Sequence[102].showInSection).toBe('c100');
+    expect(C100Sequence[102].getNextStep({})).toBe('/');
   });
 });

src/main/steps/c100-rebuild/check-your-answers/CheckYourAnswersGetController.test.ts

@@ -91,6 +91,33 @@ describe('DocumentUpload Get Controller', () => {
   //   expect(req.session.paymentError).toStrictEqual({ hasError: true, errorContext: 'defaultPaymentError' });
   // });
 
+  test('should save errors when refuge is yes but documents not present', async () => {
+    req.session.userCase = {
+      ...req.session.userCase,
+      appl_allApplicants: [
+        {
+          id: '6b792169-84df-4e9a-8299-c2c77c9b7e58',
+          applicantFirstName: 'Test',
+          applicantLastName: 'Applicant',
+          liveInRefuge: 'Yes',
+        },
+      ],
+      oprs_otherPersons: [
+        {
+          id: '6b792169-84df-4e9a-8299-c2c77c9b7e58',
+          firstName: 'Test',
+          lastName: 'Other',
+          liveInRefuge: 'Yes',
+        },
+      ],
+    };
+    req.locals.C100Api.saveC100DraftApplication = jest.fn();
+    updateCaserMock.mockResolvedValue(req.session.userCase);
+
+    await controller.get(req, res);
+    expect(req.session.save).toHaveBeenCalled();
+  });
+
   test('should catch errors and set payment error for successful payment', async () => {
     req.session.userCase.paymentSuccessDetails = {
       amount: 'MOCK_AMOUNT',
@@ -104,7 +131,7 @@ describe('DocumentUpload Get Controller', () => {
       payment_group_reference: 'PAYMENT_GROUP_REFERENCE',
     };
     req.session.paymentError = { hasError: false, errorContext: null };
-    req.locals.C100Api.updateCase.mockImplementation(() => {
+    req.locals.C100Api.saveC100DraftApplication.mockImplementation(() => {
       throw new Error();
     });