MLPAB-1381: Replace flow to print evidence form with email and post g…

…uidance (#733)

internal/app/donor_store.go

@@ -171,25 +171,6 @@ func (s *donorStore) Put(ctx context.Context, lpa *page.Lpa) error {
 		}
 	}
 
-	if lpa.UID != "" && lpa.EvidenceFormAddress.Line1 != "" && !lpa.HasSentEvidenceFormRequiredEvent {
-		if err := s.eventClient.Send(ctx, "evidence-form-required", evidenceFormRequiredEvent{
-			UID:        lpa.UID,
-			FirstNames: lpa.Donor.FirstNames,
-			LastName:   lpa.Donor.LastName,
-			Address: address{
-				Line1:      lpa.EvidenceFormAddress.Line1,
-				Line2:      lpa.EvidenceFormAddress.Line2,
-				Line3:      lpa.EvidenceFormAddress.Line3,
-				TownOrCity: lpa.EvidenceFormAddress.TownOrCity,
-				Postcode:   lpa.EvidenceFormAddress.Postcode,
-			},
-		}); err != nil {
-			s.logger.Print(err)
-		} else {
-			lpa.HasSentEvidenceFormRequiredEvent = true
-		}
-	}
-
 	if lpa.UID != "" && lpa.Tasks.PayForLpa.IsPending() && lpa.HasUnsentReducedFeesEvidence() {
 		var unsentKeys []string
 

internal/app/donor_store_test.go

@@ -453,127 +453,6 @@ func TestDonorStorePutWhenPreviousApplicationLinkedWhenError(t *testing.T) {
 	assert.Nil(t, err)
 }
 
-func TestDonorStorePutWhenEvidenceFormRequired(t *testing.T) {
-	ctx := context.Background()
-	now := time.Now()
-
-	dynamoClient := newMockDynamoClient(t)
-	dynamoClient.
-		On("Put", ctx, &page.Lpa{
-			PK:        "LPA#5",
-			SK:        "#DONOR#an-id",
-			ID:        "5",
-			UID:       "M-1111",
-			UpdatedAt: now,
-			Donor: actor.Donor{
-				FirstNames: "John",
-				LastName:   "Smithe",
-			},
-			EvidenceFormAddress: place.Address{
-				Line1:      "line1",
-				Line2:      "line2",
-				Line3:      "line3",
-				TownOrCity: "town",
-				Postcode:   "post",
-			},
-			HasSentApplicationUpdatedEvent:   true,
-			HasSentEvidenceFormRequiredEvent: true,
-		}).
-		Return(nil)
-
-	eventClient := newMockEventClient(t)
-	eventClient.
-		On("Send", ctx, "evidence-form-required", evidenceFormRequiredEvent{
-			UID:        "M-1111",
-			FirstNames: "John",
-			LastName:   "Smithe",
-			Address: address{
-				Line1:      "line1",
-				Line2:      "line2",
-				Line3:      "line3",
-				TownOrCity: "town",
-				Postcode:   "post",
-			},
-		}).
-		Return(nil)
-
-	donorStore := &donorStore{dynamoClient: dynamoClient, eventClient: eventClient, now: func() time.Time { return now }}
-
-	err := donorStore.Put(ctx, &page.Lpa{
-		PK:  "LPA#5",
-		SK:  "#DONOR#an-id",
-		ID:  "5",
-		UID: "M-1111",
-		Donor: actor.Donor{
-			FirstNames: "John",
-			LastName:   "Smithe",
-		},
-		EvidenceFormAddress: place.Address{
-			Line1:      "line1",
-			Line2:      "line2",
-			Line3:      "line3",
-			TownOrCity: "town",
-			Postcode:   "post",
-		},
-		HasSentApplicationUpdatedEvent: true,
-	})
-	assert.Nil(t, err)
-}
-
-func TestDonorStorePutWhenEvidenceFormRequiredWontResend(t *testing.T) {
-	ctx := context.Background()
-	now := time.Now()
-
-	dynamoClient := newMockDynamoClient(t)
-	dynamoClient.
-		On("Put", ctx, mock.Anything).
-		Return(nil)
-
-	donorStore := &donorStore{dynamoClient: dynamoClient, now: func() time.Time { return now }}
-
-	err := donorStore.Put(ctx, &page.Lpa{
-		PK:                               "LPA#5",
-		SK:                               "#DONOR#an-id",
-		ID:                               "5",
-		UID:                              "M-1111",
-		EvidenceFormAddress:              place.Address{Line1: "line"},
-		HasSentApplicationUpdatedEvent:   true,
-		HasSentEvidenceFormRequiredEvent: true,
-	})
-	assert.Nil(t, err)
-}
-
-func TestDonorStorePutWhenEvidenceFormRequiredWhenError(t *testing.T) {
-	ctx := context.Background()
-	now := time.Now()
-
-	dynamoClient := newMockDynamoClient(t)
-	dynamoClient.
-		On("Put", ctx, mock.Anything).
-		Return(nil)
-
-	eventClient := newMockEventClient(t)
-	eventClient.
-		On("Send", ctx, "evidence-form-required", mock.Anything).
-		Return(expectedError)
-
-	logger := newMockLogger(t)
-	logger.
-		On("Print", expectedError)
-
-	donorStore := &donorStore{dynamoClient: dynamoClient, eventClient: eventClient, logger: logger, now: func() time.Time { return now }}
-
-	err := donorStore.Put(ctx, &page.Lpa{
-		PK:                             "LPA#5",
-		SK:                             "#DONOR#an-id",
-		ID:                             "5",
-		UID:                            "M-1111",
-		EvidenceFormAddress:            place.Address{Line1: "line"},
-		HasSentApplicationUpdatedEvent: true,
-	})
-	assert.Nil(t, err)
-}
-
 func TestDonorStorePutWhenReducedFeeRequested(t *testing.T) {
 	ctx := context.Background()
 	now := time.Now()

internal/page/data.go

@@ -187,7 +187,6 @@ type Lpa struct {
 
 	HasSentApplicationUpdatedEvent        bool
 	HasSentPreviousApplicationLinkedEvent bool
-	HasSentEvidenceFormRequiredEvent      bool
 }
 
 type Evidence struct {

internal/page/donor/can_evidence_be_uploaded.go

@@ -30,7 +30,7 @@ func CanEvidenceBeUploaded(tmpl template.Template) Handler {
 				if form.YesNo.IsYes() {
 					return appData.Redirect(w, r, lpa, page.Paths.UploadEvidence.Format(lpa.ID))
 				} else {
-					return appData.Redirect(w, r, lpa, page.Paths.PrintEvidenceForm.Format(lpa.ID))
+					return appData.Redirect(w, r, lpa, page.Paths.HowToEmailOrPostEvidence.Format(lpa.ID))
 				}
 			}
 		}

internal/page/donor/can_evidence_be_uploaded_test.go

@@ -71,7 +71,7 @@ func TestGetCanEvidenceBeUploadedWhenTemplateErrors(t *testing.T) {
 func TestPostCanEvidenceBeUploaded(t *testing.T) {
 	testcases := map[form.YesNo]page.LpaPath{
 		form.Yes: page.Paths.UploadEvidence,
-		form.No:  page.Paths.PrintEvidenceForm,
+		form.No:  page.Paths.HowToEmailOrPostEvidence,
 	}
 
 	for yesNo, redirect := range testcases {

internal/page/donor/how_to_send_evidence.go → internal/page/donor/how_to_email_or_post_evidence.go

@@ -8,14 +8,14 @@ import (
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/validation"
 )
 
-type howToSendEvidenceData struct {
+type howToEmailOrPostEvidenceData struct {
 	App    page.AppData
 	Errors validation.List
 }
 
-func HowToSendEvidence(tmpl template.Template, payer Payer) Handler {
+func HowToEmailOrPostEvidence(tmpl template.Template, payer Payer) Handler {
 	return func(appData page.AppData, w http.ResponseWriter, r *http.Request, lpa *page.Lpa) error {
-		data := &howToSendEvidenceData{
+		data := &howToEmailOrPostEvidenceData{
 			App: appData,
 		}
 

internal/page/donor/how_to_send_evidence_test.go → internal/page/donor/how_to_email_or_post_evidence_test.go

@@ -11,39 +11,39 @@ import (
 	"github.com/stretchr/testify/mock"
 )
 
-func TestGetHowToSendEvidence(t *testing.T) {
+func TestGetHowToEmailOrPostEvidence(t *testing.T) {
 	w := httptest.NewRecorder()
 	r, _ := http.NewRequest(http.MethodGet, "/about-payment", nil)
 
 	template := newMockTemplate(t)
 	template.
-		On("Execute", w, &howToSendEvidenceData{App: testAppData}).
+		On("Execute", w, &howToEmailOrPostEvidenceData{App: testAppData}).
 		Return(nil)
 
-	err := HowToSendEvidence(template.Execute, nil)(testAppData, w, r, &page.Lpa{})
+	err := HowToEmailOrPostEvidence(template.Execute, nil)(testAppData, w, r, &page.Lpa{})
 	resp := w.Result()
 
 	assert.Nil(t, err)
 	assert.Equal(t, http.StatusOK, resp.StatusCode)
 }
 
-func TestGetHowToSendEvidenceWhenTemplateErrors(t *testing.T) {
+func TestGetHowToEmailOrPostEvidenceWhenTemplateErrors(t *testing.T) {
 	w := httptest.NewRecorder()
 	r, _ := http.NewRequest(http.MethodGet, "/about-payment", nil)
 
 	template := newMockTemplate(t)
 	template.
-		On("Execute", w, &howToSendEvidenceData{App: testAppData}).
+		On("Execute", w, &howToEmailOrPostEvidenceData{App: testAppData}).
 		Return(expectedError)
 
-	err := HowToSendEvidence(template.Execute, nil)(testAppData, w, r, &page.Lpa{})
+	err := HowToEmailOrPostEvidence(template.Execute, nil)(testAppData, w, r, &page.Lpa{})
 	resp := w.Result()
 
 	assert.Equal(t, expectedError, err)
 	assert.Equal(t, http.StatusOK, resp.StatusCode)
 }
 
-func TestPostHowToSendEvidence(t *testing.T) {
+func TestPostHowToEmailOrPostEvidence(t *testing.T) {
 	w := httptest.NewRecorder()
 	r, _ := http.NewRequest(http.MethodPost, "/about-payment", nil)
 
@@ -54,11 +54,11 @@ func TestPostHowToSendEvidence(t *testing.T) {
 		On("Pay", testAppData, w, r, lpa).
 		Return(nil)
 
-	err := HowToSendEvidence(nil, payer)(testAppData, w, r, lpa)
+	err := HowToEmailOrPostEvidence(nil, payer)(testAppData, w, r, lpa)
 	assert.Nil(t, err)
 }
 
-func TestPostHowToSendEvidenceWhenPayerErrors(t *testing.T) {
+func TestPostHowToEmailOrPostEvidenceWhenPayerErrors(t *testing.T) {
 	w := httptest.NewRecorder()
 	r, _ := http.NewRequest(http.MethodPost, "/about-payment", nil)
 
@@ -67,6 +67,6 @@ func TestPostHowToSendEvidenceWhenPayerErrors(t *testing.T) {
 		On("Pay", testAppData, w, r, mock.Anything).
 		Return(expectedError)
 
-	err := HowToSendEvidence(nil, payer)(testAppData, w, r, &page.Lpa{})
+	err := HowToEmailOrPostEvidence(nil, payer)(testAppData, w, r, &page.Lpa{})
 	assert.Equal(t, expectedError, err)
 }