Merge ea5769d into 580ca41

ministryofjustice · Jul 8, 2024 · abee72a · abee72a
2 parents 580ca41 + ea5769d
commit abee72a
Show file tree

Hide file tree

Showing 24 changed files with 175 additions and 147 deletions.
diff --git a/cypress/e2e/donor/confirm-person-allowed-to-vouch.cy.js b/cypress/e2e/donor/confirm-person-allowed-to-vouch.cy.js
@@ -1,15 +1,16 @@
 describe('Enter voucher', () => {
   beforeEach(() => {
     cy.visit('/fixtures?redirect=/enter-voucher&progress=payForTheLpa');
-  });
 
-  it('can confirm', () => {
     cy.get('#f-first-names').type('Sam');
     cy.get('#f-last-name').type('Smith');
     cy.get('#f-email').type('[email protected]');
     cy.contains('button', 'Save and continue').click();
 
     cy.url().should('contain', '/confirm-person-allowed-to-vouch');
+  });
+
+  it('can confirm', () => {
     cy.checkA11yApp();
 
     cy.contains('You have entered a name which matches your name, Sam Smith.');
@@ -20,11 +21,6 @@ describe('Enter voucher', () => {
   });
 
   it('can select another', () => {
-    cy.get('#f-first-names').type('Sam');
-    cy.get('#f-last-name').type('Smith');
-    cy.get('#f-email').type('[email protected]');
-    cy.contains('button', 'Save and continue').click();
-
     cy.get('input[name=yes-no]').check('no');
     cy.contains('button', 'Save and continue').click();
 
@@ -33,4 +29,17 @@ describe('Enter voucher', () => {
     cy.get('#f-last-name').should('have.value', '');
     cy.get('#f-email').should('have.value', '');
   });
+
+  it('errors when not selected', () => {
+    cy.contains('button', 'Save and continue').click();
+
+    cy.url().should('contain', '/confirm-person-allowed-to-vouch');
+    cy.checkA11yApp();
+
+    cy.get('.govuk-error-summary').within(() => {
+      cy.contains('Select yes, if the person is allowed to vouch for you');
+    });
+
+    cy.contains('.govuk-fieldset .govuk-error-message', 'Select yes, if the person is allowed to vouch for you');
+  });
 });
diff --git a/cypress/e2e/donor/what-you-can-do-now.cy.js b/cypress/e2e/donor/what-you-can-do-now.cy.js
@@ -43,7 +43,15 @@ describe('what you can do now', () => {
         cy.url().should('contain', '/task-list')
         cy.checkA11yApp()
 
-        cy.contains('li', "Confirm your identity and sign the LPA").should('contain', 'In progress');
+        cy.contains('li', "Confirm your identity and sign the LPA").should('contain', 'In progress').click();
+
+        cy.url().should('contain', '/what-happens-next-registering-with-court-of-protection')
+        cy.checkA11yApp()
+
+        cy.contains('a', 'Continue').click();
+
+        cy.url().should('contain', '/read-your-lpa')
+        cy.checkA11yApp()
     })
 
     it('errors when option not selected', () => {

diff --git a/go.sum b/go.sum
diff --git a/internal/actor/enum_attorneysact.go b/internal/actor/enum_attorneysact.go
diff --git a/internal/actor/enum_certificateproviderrelationship.go b/internal/actor/enum_certificateproviderrelationship.go
diff --git a/internal/actor/enum_channel.go b/internal/actor/enum_channel.go
diff --git a/internal/actor/enum_identitytask.go b/internal/actor/enum_identitytask.go
diff --git a/internal/actor/enum_lifesustainingtreatment.go b/internal/actor/enum_lifesustainingtreatment.go
diff --git a/internal/actor/enum_lpatype.go b/internal/actor/enum_lpatype.go
diff --git a/internal/actor/enum_replacementattorneysstepin.go b/internal/actor/enum_replacementattorneysstepin.go
diff --git a/internal/actor/enum_yesnomaybe.go b/internal/actor/enum_yesnomaybe.go
diff --git a/internal/actor/task_state.go b/internal/actor/task_state.go
@@ -43,6 +43,7 @@ type IdentityTask uint8
 const (
 	IdentityTaskNotStarted IdentityTask = iota
 	IdentityTaskInProgress
+	IdentityTaskPending
 	IdentityTaskProblem
 	IdentityTaskCompleted
 )
diff --git a/internal/localize/enum_lang.go b/internal/localize/enum_lang.go
diff --git a/internal/page/donor/task_list.go b/internal/page/donor/task_list.go
@@ -178,6 +178,10 @@ func taskListSignSection(donor *actor.DonorProvidedDetails) taskListSection {
 			if donor.RegisteringWithCourtOfProtection {
 				signPath = page.Paths.WhatHappensNextRegisteringWithCourtOfProtection
 			}
+
+			if !donor.SignedAt.IsZero() {
+				signPath = page.Paths.YouHaveSubmittedYourLpa
+			}
 		}
 	default:
 		signPath = page.Paths.HowToConfirmYourIdentityAndSign

diff --git a/internal/page/donor/task_list_test.go b/internal/page/donor/task_list_test.go
@@ -173,6 +173,24 @@ func TestGetTaskList(t *testing.T) {
 				return sections
 			},
 		},
+		"is applying to court of protection and has signed": {
+			appData: testAppData,
+			donor: &actor.DonorProvidedDetails{
+				LpaID:                            "lpa-id",
+				Donor:                            actor.Donor{LastName: "a", Address: place.Address{Line1: "x"}},
+				DonorIdentityUserData:            identity.UserData{Status: identity.StatusInsufficientEvidence, LastName: "a"},
+				WantVoucher:                      form.No,
+				RegisteringWithCourtOfProtection: true,
+				SignedAt:                         testNow,
+			},
+			expected: func(sections []taskListSection) []taskListSection {
+				sections[2].Items = []taskListItem{
+					{Name: "confirmYourIdentityAndSign", Path: page.Paths.YouHaveSubmittedYourLpa.Format("lpa-id")},
+				}
+
+				return sections
+			},
+		},
 		"attorneys under 18": {
 			appData: testAppData,
 			donor: &actor.DonorProvidedDetails{

diff --git a/internal/page/donor/witnessing_as_certificate_provider.go b/internal/page/donor/witnessing_as_certificate_provider.go
@@ -52,6 +52,10 @@ func WitnessingAsCertificateProvider(
 
 			if data.Errors.None() {
 				donor.Tasks.ConfirmYourIdentityAndSign = actor.IdentityTaskCompleted
+				if donor.RegisteringWithCourtOfProtection {
+					donor.Tasks.ConfirmYourIdentityAndSign = actor.IdentityTaskPending
+				}
+
 				donor.WitnessCodeLimiter = nil
 				if donor.WitnessedByCertificateProviderAt.IsZero() {
 					donor.WitnessedByCertificateProviderAt = now()

diff --git a/internal/page/donor/witnessing_as_certificate_provider_test.go b/internal/page/donor/witnessing_as_certificate_provider_test.go
@@ -81,54 +81,74 @@ func TestGetWitnessingAsCertificateProviderWhenTemplateErrors(t *testing.T) {
 }
 
 func TestPostWitnessingAsCertificateProvider(t *testing.T) {
-	form := url.Values{
-		"witness-code": {"1234"},
-	}
-
-	w := httptest.NewRecorder()
-	r, _ := http.NewRequest(http.MethodPost, "/", strings.NewReader(form.Encode()))
-	r.Header.Add("Content-Type", page.FormUrlEncoded)
-	now := time.Now()
-
-	donor := &actor.DonorProvidedDetails{
-		LpaID:                            "lpa-id",
-		DonorIdentityUserData:            identity.UserData{Status: identity.StatusConfirmed},
-		CertificateProviderCodes:         actor.WitnessCodes{{Code: "1234", Created: now}},
-		CertificateProvider:              actor.CertificateProvider{FirstNames: "Fred"},
-		WitnessedByCertificateProviderAt: now,
-		Tasks: actor.DonorTasks{
-			ConfirmYourIdentityAndSign: actor.IdentityTaskCompleted,
-			PayForLpa:                  actor.PaymentTaskCompleted,
+	testcases := map[string]struct {
+		registeringWithCOP                bool
+		expectedIdentityAndSignTaskStatus actor.IdentityTask
+	}{
+		"registering with COP": {
+			registeringWithCOP:                true,
+			expectedIdentityAndSignTaskStatus: actor.IdentityTaskPending,
+		},
+		"proved ID": {
+			expectedIdentityAndSignTaskStatus: actor.IdentityTaskCompleted,
 		},
 	}
 
-	donorStore := newMockDonorStore(t)
-	donorStore.EXPECT().
-		Put(r.Context(), donor).
-		Return(nil)
-
-	shareCodeSender := newMockShareCodeSender(t)
-	shareCodeSender.EXPECT().
-		SendCertificateProviderPrompt(r.Context(), testAppData, donor).
-		Return(nil)
-
-	lpaStoreClient := newMockLpaStoreClient(t)
-	lpaStoreClient.EXPECT().
-		SendLpa(r.Context(), donor).
-		Return(nil)
+	for name, tc := range testcases {
+		t.Run(name, func(t *testing.T) {
+			form := url.Values{
+				"witness-code": {"1234"},
+			}
+
+			w := httptest.NewRecorder()
+			r, _ := http.NewRequest(http.MethodPost, "/", strings.NewReader(form.Encode()))
+			r.Header.Add("Content-Type", page.FormUrlEncoded)
+			now := time.Now()
+
+			donor := &actor.DonorProvidedDetails{
+				LpaID:                            "lpa-id",
+				DonorIdentityUserData:            identity.UserData{Status: identity.StatusConfirmed},
+				CertificateProviderCodes:         actor.WitnessCodes{{Code: "1234", Created: now}},
+				CertificateProvider:              actor.CertificateProvider{FirstNames: "Fred"},
+				WitnessedByCertificateProviderAt: now,
+				Tasks: actor.DonorTasks{
+					ConfirmYourIdentityAndSign: tc.expectedIdentityAndSignTaskStatus,
+					PayForLpa:                  actor.PaymentTaskCompleted,
+				},
+				RegisteringWithCourtOfProtection: tc.registeringWithCOP,
+			}
+
+			donorStore := newMockDonorStore(t)
+			donorStore.EXPECT().
+				Put(r.Context(), donor).
+				Return(nil)
+
+			shareCodeSender := newMockShareCodeSender(t)
+			shareCodeSender.EXPECT().
+				SendCertificateProviderPrompt(r.Context(), testAppData, donor).
+				Return(nil)
+
+			lpaStoreClient := newMockLpaStoreClient(t)
+			lpaStoreClient.EXPECT().
+				SendLpa(r.Context(), donor).
+				Return(nil)
+
+			err := WitnessingAsCertificateProvider(nil, donorStore, shareCodeSender, lpaStoreClient, func() time.Time { return now })(testAppData, w, r, &actor.DonorProvidedDetails{
+				LpaID:                            "lpa-id",
+				DonorIdentityUserData:            identity.UserData{Status: identity.StatusConfirmed},
+				CertificateProviderCodes:         actor.WitnessCodes{{Code: "1234", Created: now}},
+				CertificateProvider:              actor.CertificateProvider{FirstNames: "Fred"},
+				Tasks:                            actor.DonorTasks{PayForLpa: actor.PaymentTaskCompleted},
+				RegisteringWithCourtOfProtection: tc.registeringWithCOP,
+			})
+			resp := w.Result()
 
-	err := WitnessingAsCertificateProvider(nil, donorStore, shareCodeSender, lpaStoreClient, func() time.Time { return now })(testAppData, w, r, &actor.DonorProvidedDetails{
-		LpaID:                    "lpa-id",
-		DonorIdentityUserData:    identity.UserData{Status: identity.StatusConfirmed},
-		CertificateProviderCodes: actor.WitnessCodes{{Code: "1234", Created: now}},
-		CertificateProvider:      actor.CertificateProvider{FirstNames: "Fred"},
-		Tasks:                    actor.DonorTasks{PayForLpa: actor.PaymentTaskCompleted},
-	})
-	resp := w.Result()
+			assert.Nil(t, err)
+			assert.Equal(t, http.StatusFound, resp.StatusCode)
+			assert.Equal(t, page.Paths.YouHaveSubmittedYourLpa.Format("lpa-id"), resp.Header.Get("Location"))
+		})
+	}
 
-	assert.Nil(t, err)
-	assert.Equal(t, http.StatusFound, resp.StatusCode)
-	assert.Equal(t, page.Paths.YouHaveSubmittedYourLpa.Format("lpa-id"), resp.Header.Get("Location"))
 }
 
 func TestPostWitnessingAsCertificateProviderWhenPaymentPending(t *testing.T) {

diff --git a/internal/page/paths.go b/internal/page/paths.go
@@ -87,7 +87,7 @@ func (p LpaPath) canVisit(donor *actor.DonorProvidedDetails) bool {
 		Paths.WitnessingAsCertificateProvider,
 		Paths.WitnessingAsIndependentWitness,
 		Paths.YouHaveSubmittedYourLpa:
-		return donor.DonorIdentityConfirmed()
+		return donor.DonorIdentityConfirmed() || donor.RegisteringWithCourtOfProtection
 
 	case Paths.ConfirmYourCertificateProviderIsNotRelated,
 		Paths.CheckYourLpa:

diff --git a/internal/pay/enum_evidencedelivery.go b/internal/pay/enum_evidencedelivery.go