Remove 'temporary' and use 'appcontext' more (#1397)

* Remove temporary package

* Remove old attorney store file

* Use appcontext everywhere and rename SessionData to Session

* Move AppData to appcontext package

cmd/event-received/factory.go

@@ -10,6 +10,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/app"
+	"github.com/ministryofjustice/opg-modernising-lpa/internal/appcontext"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/donor/donordata"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/event"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/lambda"
@@ -37,9 +38,9 @@ type SecretsClient interface {
 }
 
 type ShareCodeSender interface {
-	SendCertificateProviderInvite(context.Context, page.AppData, page.CertificateProviderInvite) error
-	SendCertificateProviderPrompt(context.Context, page.AppData, *donordata.Provided) error
-	SendAttorneys(context.Context, page.AppData, *lpastore.Lpa) error
+	SendCertificateProviderInvite(context.Context, appcontext.Data, page.CertificateProviderInvite) error
+	SendCertificateProviderPrompt(context.Context, appcontext.Data, *donordata.Provided) error
+	SendAttorneys(context.Context, appcontext.Data, *lpastore.Lpa) error
 }
 
 type UidStore interface {
@@ -68,7 +69,7 @@ type Factory struct {
 	eventClient           EventClient
 
 	// previously constructed values
-	appData         *page.AppData
+	appData         *appcontext.Data
 	lambdaClient    LambdaClient
 	secretsClient   SecretsClient
 	shareCodeSender ShareCodeSender
@@ -89,15 +90,15 @@ func (f *Factory) UuidString() func() string {
 	return f.uuidString
 }
 
-func (f *Factory) AppData() (page.AppData, error) {
+func (f *Factory) AppData() (appcontext.Data, error) {
 	if f.appData == nil {
 		bundle, err := localize.NewBundle("./lang/en.json", "./lang/cy.json")
 		if err != nil {
-			return page.AppData{}, err
+			return appcontext.Data{}, err
 		}
 
 		//TODO do this in handleFeeApproved when/if we save lang preference in LPA
-		f.appData = &page.AppData{Localizer: bundle.For(localize.En)}
+		f.appData = &appcontext.Data{Localizer: bundle.For(localize.En)}
 	}
 
 	return *f.appData, nil

cmd/event-received/factory_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/ministryofjustice/opg-modernising-lpa/internal/page"
+	"github.com/ministryofjustice/opg-modernising-lpa/internal/appcontext"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/secrets"
 	"github.com/stretchr/testify/assert"
 )
@@ -33,11 +33,11 @@ func TestAppData(t *testing.T) {
 
 	appData, err := factory.AppData()
 	assert.Error(t, err)
-	assert.Equal(t, page.AppData{}, appData)
+	assert.Equal(t, appcontext.Data{}, appData)
 }
 
 func TestAppDataWhenSet(t *testing.T) {
-	expected := page.AppData{Page: "hi"}
+	expected := appcontext.Data{Page: "hi"}
 	factory := &Factory{appData: &expected}
 
 	appData, err := factory.AppData()

cmd/event-received/main.go

@@ -17,9 +17,9 @@ import (
 	dynamodbtypes "github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/app"
+	"github.com/ministryofjustice/opg-modernising-lpa/internal/appcontext"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/dynamo"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/event"
-	"github.com/ministryofjustice/opg-modernising-lpa/internal/page"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/random"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/s3"
 )
@@ -32,7 +32,7 @@ type factory interface {
 	Now() func() time.Time
 	DynamoClient() dynamodbClient
 	UuidString() func() string
-	AppData() (page.AppData, error)
+	AppData() (appcontext.Data, error)
 	ShareCodeSender(ctx context.Context) (ShareCodeSender, error)
 	LpaStoreClient() (LpaStoreClient, error)
 	UidStore() (UidStore, error)

cmd/event-received/sirius_event_handler.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/aws/aws-lambda-go/events"
+	"github.com/ministryofjustice/opg-modernising-lpa/internal/appcontext"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/donor/donordata"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/dynamo"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/page"
@@ -94,7 +95,7 @@ func handleEvidenceReceived(ctx context.Context, client dynamodbClient, event ev
 	return nil
 }
 
-func handleFeeApproved(ctx context.Context, client dynamodbClient, event events.CloudWatchEvent, shareCodeSender ShareCodeSender, lpaStoreClient LpaStoreClient, appData page.AppData, now func() time.Time) error {
+func handleFeeApproved(ctx context.Context, client dynamodbClient, event events.CloudWatchEvent, shareCodeSender ShareCodeSender, lpaStoreClient LpaStoreClient, appData appcontext.Data, now func() time.Time) error {
 	var v uidEvent
 	if err := json.Unmarshal(event.Detail, &v); err != nil {
 		return fmt.Errorf("failed to unmarshal detail: %w", err)
@@ -181,7 +182,7 @@ func handleFeeDenied(ctx context.Context, client dynamodbClient, event events.Cl
 	return nil
 }
 
-func handleDonorSubmissionCompleted(ctx context.Context, client dynamodbClient, event events.CloudWatchEvent, shareCodeSender ShareCodeSender, appData page.AppData, lpaStoreClient LpaStoreClient, uuidString func() string, now func() time.Time) error {
+func handleDonorSubmissionCompleted(ctx context.Context, client dynamodbClient, event events.CloudWatchEvent, shareCodeSender ShareCodeSender, appData appcontext.Data, lpaStoreClient LpaStoreClient, uuidString func() string, now func() time.Time) error {
 	var v uidEvent
 	if err := json.Unmarshal(event.Detail, &v); err != nil {
 		return fmt.Errorf("failed to unmarshal detail: %w", err)