Move dashboard store and lpa link type (#1409)

* Move dashboard store and lpa link type * Move donordata task calculations to donordata package
ministryofjustice · Aug 8, 2024 · 35c226f · 35c226f
1 parent fede2e9
commit 35c226f
Show file tree

Hide file tree

Showing 31 changed files with 1,193 additions and 172 deletions.
diff --git a/.mockery.yaml b/.mockery.yaml
@@ -8,16 +8,17 @@ all: true
 packages:
   github.com/ministryofjustice/opg-modernising-lpa/cmd/event-received:
   github.com/ministryofjustice/opg-modernising-lpa/internal/app:
-  github.com/ministryofjustice/opg-modernising-lpa/internal/attorney:
   github.com/ministryofjustice/opg-modernising-lpa/internal/attorney/attorneydata:
   github.com/ministryofjustice/opg-modernising-lpa/internal/attorney/attorneypage:
-  github.com/ministryofjustice/opg-modernising-lpa/internal/certificateprovider:
+  github.com/ministryofjustice/opg-modernising-lpa/internal/attorney:
   github.com/ministryofjustice/opg-modernising-lpa/internal/certificateprovider/certificateproviderdata:
   github.com/ministryofjustice/opg-modernising-lpa/internal/certificateprovider/certificateproviderpage:
+  github.com/ministryofjustice/opg-modernising-lpa/internal/certificateprovider:
+  github.com/ministryofjustice/opg-modernising-lpa/internal/dashboard:
   github.com/ministryofjustice/opg-modernising-lpa/internal/document:
-  github.com/ministryofjustice/opg-modernising-lpa/internal/donor:
   github.com/ministryofjustice/opg-modernising-lpa/internal/donor/donordata:
   github.com/ministryofjustice/opg-modernising-lpa/internal/donor/donorpage:
+  github.com/ministryofjustice/opg-modernising-lpa/internal/donor:
   github.com/ministryofjustice/opg-modernising-lpa/internal/dynamo:
   github.com/ministryofjustice/opg-modernising-lpa/internal/event:
   github.com/ministryofjustice/opg-modernising-lpa/internal/lambda:
@@ -32,8 +33,8 @@ packages:
   github.com/ministryofjustice/opg-modernising-lpa/internal/secrets:
   github.com/ministryofjustice/opg-modernising-lpa/internal/sesh:
   github.com/ministryofjustice/opg-modernising-lpa/internal/sharecode:
-  github.com/ministryofjustice/opg-modernising-lpa/internal/supporter:
   github.com/ministryofjustice/opg-modernising-lpa/internal/supporter/supporterdata:
   github.com/ministryofjustice/opg-modernising-lpa/internal/supporter/supporterpage:
+  github.com/ministryofjustice/opg-modernising-lpa/internal/supporter:
   github.com/ministryofjustice/opg-modernising-lpa/internal/uid:
   github.com/ministryofjustice/opg-modernising-lpa/internal/validation:
diff --git a/internal/app/app.go b/internal/app/app.go
@@ -14,6 +14,7 @@ import (
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/attorney/attorneypage"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/certificateprovider"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/certificateprovider/certificateproviderpage"
+	"github.com/ministryofjustice/opg-modernising-lpa/internal/dashboard"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/document"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/donor"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/donor/donorpage"
@@ -98,7 +99,7 @@ func App(
 	certificateProviderStore := certificateprovider.NewStore(lpaDynamoClient)
 	attorneyStore := attorney.NewStore(lpaDynamoClient)
 	shareCodeStore := sharecode.NewStore(lpaDynamoClient)
-	dashboardStore := &dashboardStore{dynamoClient: lpaDynamoClient, lpaStoreResolvingService: lpastore.NewResolvingService(donorStore, lpaStoreClient)}
+	dashboardStore := dashboard.NewStore(lpaDynamoClient, lpastore.NewResolvingService(donorStore, lpaStoreClient))
 	evidenceReceivedStore := &evidenceReceivedStore{dynamoClient: lpaDynamoClient}
 	organisationStore := supporter.NewOrganisationStore(lpaDynamoClient)
 	memberStore := supporter.NewMemberStore(lpaDynamoClient)

diff --git a/internal/attorney/store.go b/internal/attorney/store.go
@@ -10,6 +10,7 @@ import (
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/actor"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/appcontext"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/attorney/attorneydata"
+	"github.com/ministryofjustice/opg-modernising-lpa/internal/dashboard/dashboarddata"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/dynamo"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/sharecode"
 )
@@ -66,7 +67,7 @@ func (s *Store) Create(ctx context.Context, shareCode sharecode.Data, email stri
 
 	transaction := dynamo.NewTransaction().
 		Create(attorney).
-		Create(actor.LpaLink{
+		Create(dashboarddata.LpaLink{
 			PK:        dynamo.LpaKey(data.LpaID),
 			SK:        dynamo.SubKey(data.SessionID),
 			DonorKey:  shareCode.LpaOwnerKey,

diff --git a/internal/attorney/store_test.go b/internal/attorney/store_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/actor/actoruid"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/appcontext"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/attorney/attorneydata"
+	"github.com/ministryofjustice/opg-modernising-lpa/internal/dashboard/dashboarddata"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/dynamo"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/sharecode"
 	"github.com/stretchr/testify/assert"
@@ -57,7 +58,7 @@ func TestAttorneyStoreCreate(t *testing.T) {
 			expectedTransaction := &dynamo.Transaction{
 				Creates: []any{
 					details,
-					actor.LpaLink{
+					dashboarddata.LpaLink{
 						PK:        dynamo.LpaKey("123"),
 						SK:        dynamo.SubKey("456"),
 						DonorKey:  dynamo.LpaOwnerKey(dynamo.DonorKey("donor")),

diff --git a/internal/certificateprovider/store.go b/internal/certificateprovider/store.go
@@ -10,6 +10,7 @@ import (
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/actor"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/appcontext"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/certificateprovider/certificateproviderdata"
+	"github.com/ministryofjustice/opg-modernising-lpa/internal/dashboard/dashboarddata"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/dynamo"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/sharecode"
 )
@@ -64,7 +65,7 @@ func (s *Store) Create(ctx context.Context, shareCode sharecode.Data, email stri
 
 	transaction := dynamo.NewTransaction().
 		Create(certificateProvider).
-		Create(actor.LpaLink{
+		Create(dashboarddata.LpaLink{
 			PK:        dynamo.LpaKey(data.LpaID),
 			SK:        dynamo.SubKey(data.SessionID),
 			DonorKey:  shareCode.LpaOwnerKey,

diff --git a/internal/certificateprovider/store_test.go b/internal/certificateprovider/store_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/actor/actoruid"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/appcontext"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/certificateprovider/certificateproviderdata"
+	"github.com/ministryofjustice/opg-modernising-lpa/internal/dashboard/dashboarddata"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/dynamo"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/sharecode"
 	"github.com/stretchr/testify/assert"
@@ -32,7 +33,7 @@ func TestCertificateProviderStoreCreate(t *testing.T) {
 	expectedTransaction := &dynamo.Transaction{
 		Creates: []any{
 			details,
-			actor.LpaLink{
+			dashboarddata.LpaLink{
 				PK:        dynamo.LpaKey("lpa-id"),
 				SK:        dynamo.SubKey("session-id"),
 				DonorKey:  shareCode.LpaOwnerKey,

diff --git a/internal/actor/lpa_link.go → internal/dashboard/dashboarddata/lpa_link.go b/internal/actor/lpa_link.go → internal/dashboard/dashboarddata/lpa_link.go
@@ -1,9 +1,10 @@
-package actor
+package dashboarddata
 
 import (
 	"strings"
 	"time"
 
+	"github.com/ministryofjustice/opg-modernising-lpa/internal/actor"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/dynamo"
 )
 
@@ -16,7 +17,7 @@ type LpaLink struct {
 	// DonorKey is the donorKey for the donor
 	DonorKey dynamo.LpaOwnerKeyType
 	// ActorType is the type for the current user
-	ActorType Type
+	ActorType actor.Type
 	// UpdatedAt is set to allow this data to be queried from SKUpdatedAtIndex
 	UpdatedAt time.Time
 }