MLPAB-1406 MLPAB-1407 MLPAB-1412 MLPAB-1409 Previous application changes

cypress/e2e/donor/lpa-type.cy.js

@@ -7,7 +7,7 @@ describe('LPA type', () => {
         cy.checkA11yApp();
 
         cy.contains('button', 'Continue').click();
-        cy.url().should('contain', '/application-reason');
+        cy.url().should('contain', '/task-list');
     });
 
     it('errors when unselected', () => {

cypress/e2e/donor/previous-application-number.cy.js

@@ -1,23 +1,35 @@
 describe('Previous application number', () => {
-    it('can be submitted', () => {
+    beforeEach(() => {
         cy.visit('/fixtures?redirect=/previous-application-number');
+    });
+
+    it('can be submitted', () => {
         cy.checkA11yApp();
 
-        cy.get('#f-previous-application-number').type('ABC');
+        cy.get('#f-previous-application-number').type('MABC');
+        cy.contains('button', 'Save and continue').click();
 
-        cy.contains('button', 'Continue').click();
-        cy.url().should('contain', '/task-list');
+        cy.url().should('contain', '/what-happens-after-no-fee');
     });
 
     it('errors when unselected', () => {
-        cy.visit('/fixtures?redirect=/previous-application-number');
+        cy.contains('button', 'Save and continue').click();
 
-        cy.contains('button', 'Continue').click();
+        cy.get('.govuk-error-summary').within(() => {
+            cy.contains('Enter previous reference number');
+        });
+
+        cy.contains('.govuk-error-message', 'Enter previous reference number');
+    });
+
+    it('errors when not correct format', () => {
+        cy.get('#f-previous-application-number').type('ABC');
+        cy.contains('button', 'Save and continue').click();
 
         cy.get('.govuk-error-summary').within(() => {
-            cy.contains('Enter previousApplicationNumber');
+            cy.contains('Previous reference number must begin with 7 or M');
         });
 
-        cy.contains('.govuk-fieldset .govuk-error-message', 'Enter previousApplicationNumber');
+        cy.contains('.govuk-error-message', 'Previous reference number must begin with 7 or M');
     });
 });

internal/app/donor_store.go

@@ -162,7 +162,6 @@ func (s *donorStore) Put(ctx context.Context, lpa *page.Lpa) error {
 	if lpa.UID != "" && lpa.PreviousApplicationNumber != "" && !lpa.HasSentPreviousApplicationLinkedEvent {
 		if err := s.eventClient.Send(ctx, "previous-application-linked", previousApplicationLinkedEvent{
 			UID:                       lpa.UID,
-			ApplicationReason:         lpa.ApplicationReason.String(),
 			PreviousApplicationNumber: lpa.PreviousApplicationNumber,
 		}); err != nil {
 			s.logger.Print(err)
@@ -256,7 +255,6 @@ type applicationUpdatedEventDonor struct {
 
 type previousApplicationLinkedEvent struct {
 	UID                       string `json:"uid"`
-	ApplicationReason         string `json:"applicationReason"`
 	PreviousApplicationNumber string `json:"previousApplicationNumber"`
 }
 

internal/app/donor_store_test.go

@@ -373,7 +373,6 @@ func TestDonorStorePutWhenPreviousApplicationLinked(t *testing.T) {
 	eventClient.
 		On("Send", ctx, "previous-application-linked", previousApplicationLinkedEvent{
 			UID:                       "M-1111",
-			ApplicationReason:         "remake",
 			PreviousApplicationNumber: "5555",
 		}).
 		Return(nil)
@@ -386,7 +385,6 @@ func TestDonorStorePutWhenPreviousApplicationLinked(t *testing.T) {
 			ID:                                    "5",
 			UID:                                   "M-1111",
 			UpdatedAt:                             now,
-			ApplicationReason:                     page.RemakeOfInvalidApplication,
 			PreviousApplicationNumber:             "5555",
 			HasSentApplicationUpdatedEvent:        true,
 			HasSentPreviousApplicationLinkedEvent: true,
@@ -400,7 +398,6 @@ func TestDonorStorePutWhenPreviousApplicationLinked(t *testing.T) {
 		SK:                             "#DONOR#an-id",
 		ID:                             "5",
 		UID:                            "M-1111",
-		ApplicationReason:              page.RemakeOfInvalidApplication,
 		PreviousApplicationNumber:      "5555",
 		HasSentApplicationUpdatedEvent: true,
 	})
@@ -423,7 +420,6 @@ func TestDonorStorePutWhenPreviousApplicationLinkedWontResend(t *testing.T) {
 		SK:                                    "#DONOR#an-id",
 		ID:                                    "5",
 		UID:                                   "M-1111",
-		ApplicationReason:                     page.RemakeOfInvalidApplication,
 		PreviousApplicationNumber:             "5555",
 		HasSentApplicationUpdatedEvent:        true,
 		HasSentPreviousApplicationLinkedEvent: true,
@@ -456,7 +452,6 @@ func TestDonorStorePutWhenPreviousApplicationLinkedWhenError(t *testing.T) {
 		SK:                             "#DONOR#an-id",
 		ID:                             "5",
 		UID:                            "M-1111",
-		ApplicationReason:              page.RemakeOfInvalidApplication,
 		PreviousApplicationNumber:      "5555",
 		HasSentApplicationUpdatedEvent: true,
 	})

internal/page/data.go

@@ -66,15 +66,6 @@ const (
 	ReplacementAttorneysStepInAnotherWay                                                  // other
 )
 
-//go:generate enumerator -type ApplicationReason -linecomment -empty
-type ApplicationReason uint8
-
-const (
-	NewApplication             ApplicationReason = iota + 1 // new-application
-	RemakeOfInvalidApplication                              // remake
-	AdditionalApplication                                   // additional-application
-)
-
 //go:generate enumerator -type FeeType
 type FeeType uint8
 
@@ -119,8 +110,6 @@ type Lpa struct {
 	CertificateProvider actor.CertificateProvider
 	// Type of LPA being drafted
 	Type LpaType
-	// ApplicationReason is why the application is being made
-	ApplicationReason ApplicationReason
 	// PreviousApplicationNumber if the application is related to an existing application
 	PreviousApplicationNumber string
 	// Whether the applicant wants to add replacement attorneys