MLPAB-2321 test fix

ministryofjustice · Nov 26, 2024 · 0589032 · 0589032
1 parent a819bb3
commit 0589032
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 99 deletions.
diff --git a/cmd/event-received/mock_dynamodbClient_test.go b/cmd/event-received/mock_dynamodbClient_test.go
diff --git a/internal/app/mock_DynamoClient_test.go b/internal/app/mock_DynamoClient_test.go
diff --git a/internal/dynamo/client_test.go b/internal/dynamo/client_test.go
@@ -974,7 +974,7 @@ func TestAllScheduledEventsByUID(t *testing.T) {
 			},
 			ExpressionAttributeValues: map[string]types.AttributeValue{
 				":LpaUID": &types.AttributeValueMemberS{Value: "lpa-uid"},
-				":SK":     &types.AttributeValueMemberS{Value: scheduledPrefix},
+				":SK":     &types.AttributeValueMemberS{Value: "partial-sk"},
 			},
 			KeyConditionExpression: aws.String("#LpaUID = :LpaUID"),
 			FilterExpression:       aws.String("begins_with(#SK, :SK)"),
@@ -984,7 +984,7 @@ func TestAllScheduledEventsByUID(t *testing.T) {
 	c := &Client{table: "this", svc: dynamoDB}
 
 	var v []map[string]string
-	err := c.AllByLpaUIDAndPartialSK(ctx, "lpa-uid", &v)
+	err := c.AllByLpaUIDAndPartialSK(ctx, "lpa-uid", "partial-sk", &v)
 	assert.Nil(t, err)
 }
 
@@ -997,7 +997,7 @@ func TestAllScheduledEventsByUIDWhenQueryError(t *testing.T) {
 	c := &Client{table: "this", svc: dynamoDB}
 
 	var v []map[string]string
-	err := c.AllByLpaUIDAndPartialSK(ctx, "lpa-uid", &v)
+	err := c.AllByLpaUIDAndPartialSK(ctx, "lpa-uid", "partial-sk", &v)
 	assert.Equal(t, fmt.Errorf("failed to query scheduled event by UID: %w", expectedError), err)
 }
 
@@ -1010,7 +1010,7 @@ func TestAllScheduledEventsByUIDWhenNoResults(t *testing.T) {
 	c := &Client{table: "this", svc: dynamoDB}
 
 	var v []map[string]string
-	err := c.AllByLpaUIDAndPartialSK(ctx, "lpa-uid", &v)
+	err := c.AllByLpaUIDAndPartialSK(ctx, "lpa-uid", "partial-sk", &v)
 	assert.Equal(t, NotFoundError{}, err)
 }
 
@@ -1026,7 +1026,7 @@ func TestAllScheduledEventsByUIDWhenUnmarshalError(t *testing.T) {
 	c := &Client{table: "this", svc: dynamoDB}
 
 	var v []map[string]string
-	err := c.AllByLpaUIDAndPartialSK(ctx, "lpa-uid", v)
+	err := c.AllByLpaUIDAndPartialSK(ctx, "lpa-uid", "partial-sk", v)
 	assert.Error(t, err)
 }
 

diff --git a/internal/scheduled/mock_DynamoClient_test.go b/internal/scheduled/mock_DynamoClient_test.go
diff --git a/internal/scheduled/mock_test.go b/internal/scheduled/mock_test.go
@@ -4,11 +4,19 @@ import (
 	"context"
 
 	"github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue"
+	"github.com/ministryofjustice/opg-modernising-lpa/internal/dynamo"
 )
 
-func (c *mockDynamoClient_AllScheduledEventsByUID_Call) SetData(data any) {
-	c.Run(func(_ context.Context, _ string, v any) {
+func (c *mockDynamoClient_AllByLpaUIDAndPartialSK_Call) SetData(data any) {
+	c.Run(func(_ context.Context, _, _ string, v any) {
 		b, _ := attributevalue.Marshal(data)
 		attributevalue.Unmarshal(b, v)
 	})
 }
+
+func (c *mockDynamoClient_AnyByPK_Call) SetData(row *Event) {
+	c.Run(func(_ context.Context, _ dynamo.PK, v any) {
+		b, _ := attributevalue.Marshal(row)
+		attributevalue.Unmarshal(b, v)
+	})
+}
diff --git a/internal/scheduled/store_test.go b/internal/scheduled/store_test.go
@@ -1,23 +1,14 @@
 package scheduled
 
 import (
-	"context"
 	"testing"
 	"time"
 
-	"github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue"
 	"github.com/ministryofjustice/opg-modernising-lpa/internal/dynamo"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )
 
-func (c *mockDynamoClient_AnyByPK_Call) SetData(row *Event) {
-	c.Run(func(_ context.Context, _ dynamo.PK, v any) {
-		b, _ := attributevalue.Marshal(row)
-		attributevalue.Unmarshal(b, v)
-	})
-}
-
 func TestNewStore(t *testing.T) {
 	dynamoClient := newMockDynamoClient(t)
 	store := NewStore(dynamoClient)
@@ -112,7 +103,7 @@ func TestDeleteAllByUID(t *testing.T) {
 
 	dynamoClient := newMockDynamoClient(t)
 	dynamoClient.EXPECT().
-		AllScheduledEventsByUID(ctx, "lpa-uid", mock.Anything).
+		AllByLpaUIDAndPartialSK(ctx, "lpa-uid", dynamo.PartialScheduleKey(), mock.Anything).
 		Return(nil).
 		SetData([]Event{
 			{LpaUID: "lpa-uid", PK: dynamo.ScheduledDayKey(now), SK: dynamo.ScheduledKey(now, 98)},
@@ -131,10 +122,10 @@ func TestDeleteAllByUID(t *testing.T) {
 	assert.Nil(t, err)
 }
 
-func TestDeleteAllByUIDWhenAllScheduledEventsByUIDErrors(t *testing.T) {
+func TestDeleteAllByUIDWhenAllByLpaUIDAndPartialSKErrors(t *testing.T) {
 	dynamoClient := newMockDynamoClient(t)
 	dynamoClient.EXPECT().
-		AllScheduledEventsByUID(ctx, mock.Anything, mock.Anything).
+		AllByLpaUIDAndPartialSK(ctx, mock.Anything, mock.Anything, mock.Anything).
 		Return(expectedError)
 
 	store := &Store{dynamoClient: dynamoClient, now: testNowFn}
@@ -146,7 +137,7 @@ func TestDeleteAllByUIDWhenAllScheduledEventsByUIDErrors(t *testing.T) {
 func TestDeleteAllByUIDWhenNoEventsFound(t *testing.T) {
 	dynamoClient := newMockDynamoClient(t)
 	dynamoClient.EXPECT().
-		AllScheduledEventsByUID(ctx, mock.Anything, mock.Anything).
+		AllByLpaUIDAndPartialSK(ctx, mock.Anything, mock.Anything, mock.Anything).
 		Return(nil).
 		SetData([]Event{})
 
@@ -159,7 +150,7 @@ func TestDeleteAllByUIDWhenNoEventsFound(t *testing.T) {
 func TestDeleteAllByUIDWhenDeleteManyByUIDErrors(t *testing.T) {
 	dynamoClient := newMockDynamoClient(t)
 	dynamoClient.EXPECT().
-		AllScheduledEventsByUID(ctx, mock.Anything, mock.Anything).
+		AllByLpaUIDAndPartialSK(ctx, mock.Anything, mock.Anything, mock.Anything).
 		Return(nil).
 		SetData([]Event{{LpaUID: "lpa-uid"}})
 	dynamoClient.EXPECT().