D11 General Applications Base PR

Jenkinsfile_CNP

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

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-4970 # Uncomment to connect to backend PR, don't forget Jenkinsfile_CNP too
   keyVaults:
     nfdiv:
       resourceGroup: nfdiv

config/default.yaml

@@ -31,6 +31,8 @@ fees:
   updateApplication: DivorceAmendPetition
   finalOrderApplicationFee: GAOnNotice
   searchDecreeNisiOrFinalOrder: SearchIndexDivCentral
+  generalAppWithoutHearing: GeneralAppWithoutNotice
+  generalAppWithHearing: GAOnNotice
 services:
   authProvider:
     url: 'http://rpe-service-auth-provider-aat.service.core-compute-aat.internal'
@@ -127,4 +129,4 @@ govukUrls:
   getHelpWithCourtFeesCY: 'https://www.gov.uk/help-i-dalu-ffioedd-llysoedd-a-thribiwnlysoedd'
   certifiedTranslation: 'https://www.gov.uk/certifying-a-document#certifying-a-translation'
   searchForDecreeAbsoluteOrFinalOrder: 'https://www.gov.uk/copy-decree-absolute-final-order/do-not-know-which-court'
-  serviceOfDocuments: 'https://www.gov.uk/guidance/service-of-documents-and-taking-of-evidence'
+  serviceOfDocuments: 'https://www.gov.uk/guidance/service-of-documents-and-taking-of-evidence'

src/main/app/case/case.ts

@@ -21,6 +21,8 @@ import {
   FinancialOrderFor,
   Gender,
   GeneralApplication,
+  GeneralApplicationHearingNotRequired,
+  GeneralApplicationType,
   InterimApplicationType,
   JurisdictionConnections,
   LegalAdvisorDecision,
@@ -211,6 +213,8 @@ export const formFieldsToCaseMapping: Partial<Record<keyof Case, keyof CaseData>
   serviceApplicationAnswers: 'serviceApplicationAnswers',
   applicant1InterimApplicationType: 'applicant1InterimApplicationType',
   applicant1InterimAppsStatementOfTruth: 'applicant1InterimAppsStatementOfTruth',
+  applicant2InterimApplicationType: 'applicant2InterimApplicationType',
+  applicant2InterimAppsStatementOfTruth: 'applicant2InterimAppsStatementOfTruth',
   applicant1NoResponseOwnSearches: 'applicant1NoResponseOwnSearches',
   applicant1NoResponseRespondentAddressInEnglandWales: 'applicant1NoResponseRespondentAddressInEnglandWales',
   applicant1NoResponsePartnerInUkOrReceivingBenefits: 'applicant1NoResponsePartnerInUkOrReceivingBenefits',
@@ -231,6 +235,13 @@ export const formFieldsToCaseMapping: Partial<Record<keyof Case, keyof CaseData>
   applicant1InterimAppsHwfRefNumber: 'applicant1InterimAppsHwfRefNumber',
   applicant1InterimAppsEvidenceDocs: 'applicant1InterimAppsEvidenceDocs',
   applicant1InterimAppsCannotUploadDocs: 'applicant1InterimAppsCannotUploadDocs',
+  applicant2InterimAppsIUnderstand: 'applicant2InterimAppsIUnderstand',
+  applicant2InterimAppsUseHelpWithFees: 'applicant2InterimAppsUseHelpWithFees',
+  applicant2InterimAppsHaveHwfReference: 'applicant2InterimAppsHaveHwfReference',
+  applicant2InterimAppsCanUploadEvidence: 'applicant2InterimAppsCanUploadEvidence',
+  applicant2InterimAppsHwfRefNumber: 'applicant2InterimAppsHwfRefNumber',
+  applicant2InterimAppsEvidenceDocs: 'applicant2InterimAppsEvidenceDocs',
+  applicant2InterimAppsCannotUploadDocs: 'applicant2InterimAppsCannotUploadDocs',
   applicant1DeemedEvidenceDetails: 'applicant1DeemedEvidenceDetails',
   applicant1DeemedNoEvidenceStatement: 'applicant1DeemedNoEvidenceStatement',
   applicant1BailiffPartnersName: 'applicant1BailiffPartnersName',
@@ -306,6 +317,7 @@ export const formFieldsToCaseMapping: Partial<Record<keyof Case, keyof CaseData>
   applicant1SearchGovRecordsPartnerAdditionalAddress2: 'applicant1SearchGovRecordsPartnerAdditionalAddress2',
   applicant1SearchGovRecordsPartnerAdditionalAddressDates2: 'applicant1SearchGovRecordsPartnerAdditionalAddressDates2',
   generalApplications: 'generalApplications',
+  generalReferralType: 'generalReferralType',
   applicant1GeneralAppServiceRequest: 'applicant1GeneralAppServiceRequest',
   applicant2GeneralAppServiceRequest: 'applicant2GeneralAppServiceRequest',
   applicant1GeneralAppPayments: 'applicant1GeneralAppPayments',
@@ -355,6 +367,22 @@ export const formFieldsToCaseMapping: Partial<Record<keyof Case, keyof CaseData>
   withdrawApplicationReason: 'withdrawApplicationReason',
   applicant2ConfirmWithdrawApplication: 'applicant2ConfirmWithdrawApplication',
   applicant2WithdrawApplicationReason: 'applicant2WithdrawApplicationReason',
+  applicant1GenAppCannotUploadAgreedEvidence: 'applicant1GenAppCannotUploadAgreedEvidence',
+  applicant1GenAppHearingNotRequired: 'applicant1GenAppHearingNotRequired',
+  applicant1GenAppPartnerAgreesDocs: 'applicant1GenAppPartnerAgreesDocs',
+  applicant1GenAppPartnerDetailsCorrect: 'applicant1GenAppPartnerDetailsCorrect',
+  applicant1GenAppReason: 'applicant1GenAppReason',
+  applicant1GenAppStatementOfEvidence: 'applicant1GenAppStatementOfEvidence',
+  applicant1GenAppType: 'applicant1GenAppType',
+  applicant1GenAppTypeOtherDetails: 'applicant1GenAppTypeOtherDetails',
+  applicant2GenAppCannotUploadAgreedEvidence: 'applicant2GenAppCannotUploadAgreedEvidence',
+  applicant2GenAppHearingNotRequired: 'applicant2GenAppHearingNotRequired',
+  applicant2GenAppPartnerAgreesDocs: 'applicant2GenAppPartnerAgreesDocs',
+  applicant2GenAppPartnerDetailsCorrect: 'applicant2GenAppPartnerDetailsCorrect',
+  applicant2GenAppReason: 'applicant2GenAppReason',
+  applicant2GenAppStatementOfEvidence: 'applicant2GenAppStatementOfEvidence',
+  applicant2GenAppType: 'applicant2GenAppType',
+  applicant2GenAppTypeOtherDetails: 'applicant2GenAppTypeOtherDetails',
 };
 
 export function formatCase<OutputFormat>(fields: FieldFormats, data: Partial<Case> | CaseData): OutputFormat {
@@ -629,6 +657,14 @@ export interface Case {
   applicant1InterimAppsEvidenceUploadedFiles?: UploadedFile[];
   applicant1InterimAppsEvidenceDocs?: ListValue<Partial<DivorceDocument> | null>[];
   applicant1InterimAppsCannotUploadDocs?: Checkbox;
+  applicant2InterimAppsIUnderstand?: Checkbox;
+  applicant2InterimAppsUseHelpWithFees?: YesOrNo;
+  applicant2InterimAppsHaveHwfReference?: YesOrNo;
+  applicant2InterimAppsCanUploadEvidence?: YesOrNo;
+  applicant2InterimAppsHwfRefNumber?: string;
+  applicant2InterimAppsEvidenceUploadedFiles?: UploadedFile[];
+  applicant2InterimAppsEvidenceDocs?: ListValue<Partial<DivorceDocument> | null>[];
+  applicant2InterimAppsCannotUploadDocs?: Checkbox;
   applicant1DeemedEvidenceDetails?: string;
   applicant1DeemedNoEvidenceStatement?: string;
   applicant1BailiffPartnerInARefuge: YesOrNoOrNotKnown;
@@ -666,6 +702,7 @@ export interface Case {
   applicant1InterimApplicationType?: InterimApplicationType;
   applicant2InterimApplicationType?: InterimApplicationType;
   applicant1InterimAppsStatementOfTruth?: Checkbox;
+  applicant2InterimAppsStatementOfTruth?: Checkbox;
   applicant1NoResponseOwnSearches?: NoResponseOwnSearches;
   applicant1NoResponseRespondentAddressInEnglandWales?: Checkbox;
   applicant1NoResponsePartnerInUkOrReceivingBenefits?: YesOrNo;
@@ -724,6 +761,7 @@ export interface Case {
   applicant1SearchGovRecordsPartnerAdditionalAddress2?: string;
   applicant1SearchGovRecordsPartnerAdditionalAddressDates2?: string;
   generalApplications?: ListValue<GeneralApplication>[];
+  generalReferralType?: string;
   applicant1GeneralAppServiceRequest?: string;
   applicant2GeneralAppServiceRequest?: string;
   applicant1GeneralAppPayments?: ListValue<Payment>[];
@@ -789,6 +827,24 @@ export interface Case {
   withdrawApplicationReason?: string;
   applicant2ConfirmWithdrawApplication?: YesOrNo;
   applicant2WithdrawApplicationReason?: string;
+  applicant1GenAppCannotUploadAgreedEvidence?: Checkbox;
+  applicant1GenAppHearingNotRequired?: GeneralApplicationHearingNotRequired;
+  applicant1GenAppPartnerAgreesDocs?: ListValue<Partial<DivorceDocument> | null>[];
+  applicant1GenAppPartnerAgreesUploadedFiles?: UploadedFile[];
+  applicant1GenAppPartnerDetailsCorrect?: YesOrNo;
+  applicant1GenAppReason?: string;
+  applicant1GenAppStatementOfEvidence?: string;
+  applicant1GenAppType?: GeneralApplicationType | null;
+  applicant1GenAppTypeOtherDetails?: string;
+  applicant2GenAppCannotUploadAgreedEvidence?: Checkbox;
+  applicant2GenAppHearingNotRequired?: GeneralApplicationHearingNotRequired;
+  applicant2GenAppPartnerAgreesDocs?: ListValue<Partial<DivorceDocument> | null>[];
+  applicant2GenAppPartnerAgreesUploadedFiles?: UploadedFile[];
+  applicant2GenAppPartnerDetailsCorrect?: YesOrNo;
+  applicant2GenAppReason?: string;
+  applicant2GenAppStatementOfEvidence?: string;
+  applicant2GenAppType?: GeneralApplicationType | null;
+  applicant2GenAppTypeOtherDetails?: string;
 }
 
 export interface CaseWithId extends Case {

src/main/app/case/definition.ts

@@ -527,9 +527,9 @@ export interface CaseData {
   applicant1NameDifferentToMarriageCertificateMethod: ChangedNameHow[];
   applicant1NameDifferentToMarriageCertificateOtherDetails: string;
   applicant1WhyNameDifferent: ChangedNameWhy[];
-  applicant1WhyNameDifferentOtherDetails: string,
+  applicant1WhyNameDifferentOtherDetails: string;
   applicant2WhyNameDifferent: ChangedNameWhy[];
-  applicant2WhyNameDifferentOtherDetails: string,
+  applicant2WhyNameDifferentOtherDetails: string;
   applicant1NameChangedHow: ChangedNameHow[];
   applicant1NameChangedHowOtherDetails: string;
   applicant1Address: AddressGlobalUK;
@@ -964,7 +964,7 @@ export interface CaseData {
   alternativeServiceFeeRequired: YesOrNo;
   serviceApplicationAnswers: DivorceDocument;
   servicePayments: ListValue<Payment>[];
-  serviceApplicationSubmittedOnline: YesOrNo,
+  serviceApplicationSubmittedOnline: YesOrNo;
   servicePaymentFeePaymentMethod: ServicePaymentMethod;
   servicePaymentFeeAccountNumber: string;
   servicePaymentFeeDateOfPayment: DateAsString;
@@ -1068,6 +1068,13 @@ export interface CaseData {
   applicant1InterimAppsHwfRefNumber: string;
   applicant1InterimAppsEvidenceDocs: ListValue<DivorceDocument>[];
   applicant1InterimAppsCannotUploadDocs: YesOrNo;
+  applicant2InterimAppsIUnderstand: YesOrNo;
+  applicant2InterimAppsUseHelpWithFees: YesOrNo;
+  applicant2InterimAppsHaveHwfReference: YesOrNo;
+  applicant2InterimAppsCanUploadEvidence: YesOrNo;
+  applicant2InterimAppsHwfRefNumber: string;
+  applicant2InterimAppsEvidenceDocs: ListValue<DivorceDocument>[];
+  applicant2InterimAppsCannotUploadDocs: YesOrNo;
   applicant1DeemedEvidenceDetails: string;
   applicant1DeemedNoEvidenceStatement: string;
   applicant1BailiffPartnersName: string;
@@ -1105,6 +1112,7 @@ export interface CaseData {
   applicant1InterimApplicationType: InterimApplicationType;
   applicant2InterimApplicationType: InterimApplicationType;
   applicant1InterimAppsStatementOfTruth: YesOrNo;
+  applicant2InterimAppsStatementOfTruth: YesOrNo;
   applicant1NoResponsePartnerAddress: AddressGlobalUK;
   applicant1NoResponsePartnerAddressOverseas: YesOrNo;
   applicant1NoResponsePartnerEmailAddress: string;
@@ -1151,7 +1159,7 @@ export interface CaseData {
   applicant1DispensePartnerLastSeenOver2YearsAgo: YesOrNo;
   applicant1DispensePartnerLastSeenDescription: string;
   applicant1DispenseHavePartnerEmailAddresses: YesOrNo;
-  applicant1DispenseHaveSearchedFinalOrder: YesOrNo
+  applicant1DispenseHaveSearchedFinalOrder: YesOrNo;
   applicant1DispenseWhyNoFinalOrderSearch: string;
   applicant1DispensePartnerEmailAddresses: string;
   applicant1DispenseHavePartnerPhoneNumbers: YesOrNo;
@@ -1183,6 +1191,22 @@ export interface CaseData {
   withdrawApplicationReason: string;
   applicant2ConfirmWithdrawApplication: YesOrNo;
   applicant2WithdrawApplicationReason: string;
+  applicant1GenAppCannotUploadAgreedEvidence: YesOrNo;
+  applicant1GenAppHearingNotRequired: GeneralApplicationHearingNotRequired;
+  applicant1GenAppPartnerAgreesDocs: ListValue<DivorceDocument>[];
+  applicant1GenAppPartnerDetailsCorrect: YesOrNo;
+  applicant1GenAppReason: string;
+  applicant1GenAppStatementOfEvidence: string;
+  applicant1GenAppType: GeneralApplicationType;
+  applicant1GenAppTypeOtherDetails: string;
+  applicant2GenAppCannotUploadAgreedEvidence: YesOrNo;
+  applicant2GenAppHearingNotRequired: GeneralApplicationHearingNotRequired;
+  applicant2GenAppPartnerAgreesDocs: ListValue<DivorceDocument>[];
+  applicant2GenAppPartnerDetailsCorrect: YesOrNo;
+  applicant2GenAppReason: string;
+  applicant2GenAppStatementOfEvidence: string;
+  applicant2GenAppType: GeneralApplicationType;
+  applicant2GenAppTypeOtherDetails: string;
 }
 
 export interface CaseDocuments {
@@ -1532,6 +1556,7 @@ export interface GeneralApplication {
   generalApplicationSubmittedOnline?: string;
   generalApplicationReceivedDate?: DateAsString;
   generalApplicationDocsUploadedPreSubmission?: YesOrNo;
+  generalApplicationFeeHasCompletedOnlinePayment?: YesOrNo;
 }
 
 export interface GeneralEmail {
@@ -2098,6 +2123,7 @@ export const enum InterimApplicationType {
   BAILIFF_SERVICE = 'bailiffService',
   SEARCH_GOV_RECORDS = 'searchGovRecords',
   PROCESS_SERVER_SERVICE = 'processServerService',
+  DIGITISED_GENERAL_APPLICATION_D11 = 'digitisedGeneralApplicationD11',
 }
 
 export const enum SearchGovRecordsWhichDepartment {
@@ -2115,6 +2141,10 @@ export const enum GeneralApplicationType {
   OTHER = 'other',
   BAILIFF_SERVICE = 'bailiffService',
   SEARCH_GOV_RECORDS = 'disclosureViaDwp',
+  WITHDRAW_POST_ISSUE = 'withdrawPostIssue',
+  DELAY = 'delay',
+  EXTEND = 'extend',
+  AMEND_APPLICATION = 'amendApplication',
 }
 
 export const enum GeneralOrderDivorceParties {
@@ -2134,6 +2164,7 @@ export const enum GeneralOrderJudgeOrLegalAdvisorType {
 
 export const enum GeneralParties {
   APPLICANT = 'applicant',
+  APPLICANT2 = 'applicant2',
   RESPONDENT = 'respondent',
   OTHER = 'other',
 }
@@ -2170,6 +2201,13 @@ export const enum JudgeCostsClaimGranted {
   ADJOURN = 'Adjourn',
 }
 
+export const enum GeneralApplicationHearingNotRequired {
+  YES_PARTNER_AGREES_WITH_APPLICATION = 'yesPartnerAgreesWithApplication',
+  YES_PARTNER_AGREES_WITH_NO_HEARING = 'yesPartnerAgreesWithNoHearing',
+  YES_DOES_NOT_NEED_CONSENT = 'yesDoesNotNeedConsent',
+  NO = 'no',
+}
+
 /**
  * Values:
  * - `A` - APP_1_APP_2_RESIDENT
@@ -2347,6 +2385,7 @@ export const enum State {
   AwaitingFinalOrder = 'AwaitingFinalOrder',
   AwaitingGeneralConsideration = 'AwaitingGeneralConsideration',
   AwaitingGeneralReferralPayment = 'AwaitingGeneralReferralPayment',
+  AwaitingGenAppDocuments = 'AwaitingGenAppDocuments',
   AwaitingGenAppHWFEvidence = 'AwaitingGenAppHWFEvidence',
   AwaitingGenAppHWFPartPayment = 'AwaitingGenAppHWFPartPayment',
   AwaitingHWFDecision = 'AwaitingHWFDecision',
@@ -2405,10 +2444,6 @@ export const FINAL_ORDER_PAYMENT_STATES: Set<State> = new Set([State.AwaitingFin
 
 export const SERVICE_PAYMENT_STATES: Set<State> = new Set([State.AwaitingServicePayment]);
 
-export const GENERAL_APPLICATION_PAYMENT_STATES: Set<State> = new Set([
-  State.AwaitingGeneralApplicationPayment
-]);
-
 export const enum SupplementaryCaseType {
   NA = 'notApplicable',
   JUDICIAL_SEPARATION = 'judicialSeparation',
@@ -3024,6 +3059,7 @@ export const SYSTEM_LINK_WITH_BULK_CASE = 'system-link-with-bulk-case';
 export const SYSTEM_ISSUE_SOLICITOR_SERVICE_PACK = 'system-issue-solicitor-service-pack';
 export const CITIZEN_WITHDRAWN = 'citizen-withdrawn';
 export const WITHDRAW_SERVICE_APPLICATION = 'service-application-withdrawn';
+export const WITHDRAW_D11_APPLICATION = 'general-application-withdrawn';
 export const CASEWORKER_SYSTEM_USER_UPDATE_ISSUE_DATE = 'system-update-issue-date';
 export const CASEWORKER_REQUEST_FOR_INFORMATION = 'caseworker-request-for-information';
 export const CASEWORKER_ISSUE_APPLICATION = 'caseworker-issue-application';

src/main/app/case/formatter/uploaded-files.test.ts

@@ -60,6 +60,19 @@ describe('uploadedFilesFromApiApplicant1', () => {
     expect(result.applicant1InterimAppsEvidenceUploadedFiles?.[0].id).toBe('1');
     expect(result.applicant1InterimAppsEvidenceUploadedFiles?.[1].id).toBe('2');
   });
+
+  it('converts general application partner agrees evidence documents', async () => {
+    const result = fromApiApplicant1({
+      applicant1GenAppPartnerAgreesDocs: [
+        { id: '1', value: { documentFileName: 'filename' } as DivorceDocument },
+        { id: '2', value: { documentFileName: 'filename' } as DivorceDocument },
+      ],
+    });
+
+    expect(result.applicant1GenAppPartnerAgreesUploadedFiles?.length).toBe(2);
+    expect(result.applicant1GenAppPartnerAgreesUploadedFiles?.[0].id).toBe('1');
+    expect(result.applicant1GenAppPartnerAgreesUploadedFiles?.[1].id).toBe('2');
+  });
 });
 
 describe('uploadedFilesFromApiApplicant2', () => {

src/main/app/case/formatter/uploaded-files.ts

@@ -29,6 +29,12 @@ export const fromApiApplicant1 = (data: Partial<CaseData>): Partial<Case> => ({
       id: `${file.id}`,
       name: `${getFilename(file.value)}`,
     })) || [],
+  applicant1GenAppPartnerAgreesDocs: data.applicant1GenAppPartnerAgreesDocs,
+  applicant1GenAppPartnerAgreesUploadedFiles:
+    data.applicant1GenAppPartnerAgreesDocs?.map(file => ({
+      id: `${file.id}`,
+      name: `${getFilename(file.value)}`,
+    })) || [],
 });
 
 export const fromApiApplicant2 = (data: Partial<CaseData>): Partial<Case> => ({
@@ -53,6 +59,18 @@ export const fromApiApplicant2 = (data: Partial<CaseData>): Partial<Case> => ({
       name: `${getFilename(file.value)}`,
     })) || [],
   applicant2UnableToUploadEvidence: checkboxConverter(data.applicant2UnableToUploadEvidence),
+  applicant2InterimAppsEvidenceDocs: data.applicant2InterimAppsEvidenceDocs,
+  applicant2InterimAppsEvidenceUploadedFiles:
+    data.applicant2InterimAppsEvidenceDocs?.map(file => ({
+      id: `${file.id}`,
+      name: `${getFilename(file.value)}`,
+    })) || [],
+  applicant2GenAppPartnerAgreesDocs: data.applicant2GenAppPartnerAgreesDocs,
+  applicant2GenAppPartnerAgreesUploadedFiles:
+    data.applicant2GenAppPartnerAgreesDocs?.map(file => ({
+      id: `${file.id}`,
+      name: `${getFilename(file.value)}`,
+    })) || [],
 });
 
 export const getFilename = (document: Partial<DivorceDocument> | undefined | null): string | undefined => {