MLPAB-2098: Add correspondent to fixture progress, protect against op…

…ensearch not being ready (#1233)

Makefile

@@ -163,4 +163,7 @@ terraform-update-docs: ##@terraform updates all terraform-docs managed documenta
 	terraform-docs --config terraform/account/region/.terraform-docs.yml ./terraform/account/region
 
 delete-all-from-lpa-index: ##@opensearch clears all items from the lpa index
-	curl -X POST 'http://localhost:9200/lpas/_delete_by_query/?conflicts=proceed&pretty' -H 'Content-Type: application/json' -d '{"query": {"match_all": {}}}'
+	curl -X POST "http://localhost:9200/lpas/_delete_by_query/?conflicts=proceed&pretty" -H 'Content-Type: application/json' -d '{"query": {"match_all": {}}}'
+
+delete-lpa-index: ##@opensearch deletes the lpa index
+	curl -XDELETE "http://localhost:9200/lpas"

cypress/e2e/donor/confirm-your-certificate-provider-is-not-related.cy.js

@@ -1,6 +1,6 @@
 describe('Confirm your certificate provider is not related', () => {
   beforeEach(() => {
-    cy.visit('/fixtures?redirect=/your-details&progress=peopleToNotifyAboutYourLpa');
+    cy.visit('/fixtures?redirect=/your-details&progress=addCorrespondent');
     cy.get('#f-last-name').clear().type('Cooper');
     cy.contains('button', 'Continue').click();
     cy.visitLpa('/task-list');

docker/docker-compose.yml

@@ -47,7 +47,8 @@ services:
       context: ..
       dockerfile: docker/localstack/Dockerfile
     depends_on:
-      - opensearch
+      opensearch:
+        condition: service_healthy
     container_name: localstack
     ports:
       - "127.0.0.1:4566:4566"            # LocalStack Gateway
@@ -68,12 +69,6 @@ services:
       default:
         aliases:
           - my-domain.eu-west-1.opensearch.localhost.localstack.cloud
-    healthcheck:
-      test: "curl --silent --fail http://my-domain.eu-west-1.opensearch.localhost.localstack.cloud:4566 | grep 'cluster_name'"
-      interval: 20s
-      retries: 10
-      start_period: 20s
-      timeout: 10s
 
   opensearch:
     container_name: opensearch
@@ -93,6 +88,12 @@ services:
         hard: -1
     volumes:
       - data01:/usr/share/opensearch/data
+#    To ensure opensearch is ready for localstack-init commands
+    healthcheck:
+      test: "curl --silent --fail localhost:9200/_cluster/health | grep 'cluster_name'"
+      interval: 5s
+      retries: 6
+      timeout: 5s
 
   mock-lpa-store:
     build:

docker/localstack/localstack-init.sh

@@ -1,4 +1,9 @@
 #!/usr/bin/env bash
+echo 'configuring opensearch'
+awslocal opensearch create-domain --region eu-west-1 --domain-name my-domain
+
+echo 'deleting opensearch lpas index'
+curl -XDELETE "http://opensearch:9200/lpas"
 
 echo 'generating key pair'
 openssl genpkey -algorithm RSA -out /tmp/private_key.pem -pkeyopt rsa_keygen_bits:2048
@@ -37,6 +42,3 @@ awslocal lambda wait function-active-v2 --region eu-west-1 --function-name event
 
 awslocal events put-rule --region eu-west-1 --name receive-events-mlpa --event-bus-name default --event-pattern '{"source":["opg.poas.makeregister"],"detail-type":["uid-requested"]}'
 awslocal events put-targets --region eu-west-1 --event-bus-name default --rule receive-events-mlpa --targets "Id"="receive-events-sirius","Arn"="arn:aws:lambda:eu-west-1:000000000000:function:event-received"
-
-echo 'configuring opensearch'
-awslocal opensearch create-domain --region eu-west-1 --domain-name my-domain

internal/page/fixtures/donor.go

@@ -44,6 +44,7 @@ var progressValues = []string{
 	"addRestrictionsToTheLpa",
 	"chooseYourCertificateProvider",
 	"peopleToNotifyAboutYourLpa",
+	"addCorrespondent",
 	"checkAndSendToYourCertificateProvider",
 	"payForTheLpa",
 	"confirmYourIdentity",
@@ -301,6 +302,15 @@ func updateLPAProgress(
 		}
 
 		donorDetails.Tasks.PeopleToNotify = actor.TaskCompleted
+	}
+
+	if data.Progress >= slices.Index(progressValues, "addCorrespondent") {
+		donorDetails.AddCorrespondent = form.Yes
+		donorDetails.Correspondent = makeCorrespondent(Name{
+			Firstnames: "Jonathan",
+			Lastname:   "Ashfurlong",
+		})
+
 		donorDetails.Tasks.AddCorrespondent = actor.TaskCompleted
 	}
 

internal/page/fixtures/fixtures.go

@@ -169,6 +169,26 @@ func makePersonToNotify(name Name) actor.PersonToNotify {
 	}
 }
 
+func makeCorrespondent(name Name) actor.Correspondent {
+	return actor.Correspondent{
+		FirstNames: name.Firstnames,
+		LastName:   name.Lastname,
+		Address: place.Address{
+			Line1:      "5 RICHMOND PLACE",
+			Line2:      "KINGS HEATH",
+			Line3:      "WEST MIDLANDS",
+			TownOrCity: "BIRMINGHAM",
+			Postcode:   "B14 7ED",
+			Country:    "GB",
+		},
+		Organisation: "Ashfurlong and partners",
+		WantAddress:  form.Yes,
+		Share:        actor.CorrespondentShareAttorneys | actor.CorrespondentShareCertificateProvider,
+		Email:        testEmail,
+		Telephone:    testMobile,
+	}
+}
+
 func makeUID() string {
 	return strings.ToUpper("M-" + "FAKE" + "-" + random.String(4) + "-" + random.String(4))
 }

internal/page/fixtures/supporter.go

@@ -312,7 +312,7 @@ func waitForLPAIndex(searchClient *search.Client, organisationCtx context.Contex
 			PageSize: 1,
 		})
 		if err != nil {
-			log.Println(err)
+			log.Println("error waiting for LPA Index:", err)
 		}
 
 		if count > 10 {

web/template/fixtures.gohtml

@@ -58,6 +58,7 @@
         (item "addRestrictionsToTheLpa" "addRestrictionsToTheLpa")
         (item "chooseYourCertificateProvider" "chooseYourCertificateProvider")
         (item "peopleToNotifyAboutYourLpa" "peopleToNotifyAboutYourLpa")
+        (item "addCorrespondent" "addCorrespondent")
         (item "checkAndSendToYourCertificateProvider" "checkAndSendToYourCertificateProvider")
         (item "payForTheLpa" "payForTheLpa")
         (item "confirmYourIdentity" "Confirm your identity")