refactor: update DynamoDB context initialization to use DynamoDBContextBuilder (AWSSDK.DynamoDBv2 v4) and adjust query operation config in tests

Author: sliedig

Unicorn.Web/ApprovalService.Tests/RequestApprovalFunctionTest.cs

@@ -32,7 +32,6 @@ public async Task Publish_event_when_property_status_is_pending_or_declined()
             .Build();
 
         var context = TestHelpers.NewLambdaContext();
-
         var dynamoDbContext = Substitute.For<IDynamoDBContext>();
         var eventBindingClient = Substitute.For<IAmazonEventBridge>();
 
@@ -72,7 +71,7 @@ public async Task Publish_event_when_property_status_is_pending_or_declined()
         };
 
         dynamoDbContext
-            .FromQueryAsync<PropertyRecord>(Arg.Any<QueryOperationConfig>(), Arg.Any<DynamoDBOperationConfig>())
+            .FromQueryAsync<PropertyRecord>(Arg.Any<Amazon.DynamoDBv2.DocumentModel.QueryOperationConfig>())
             .Returns(TestHelpers.NewDynamoDBSearchResult(searchResult));
 
         eventBindingClient.PutEventsAsync(Arg.Any<PutEventsRequest>(), Arg.Any<CancellationToken>())
@@ -84,7 +83,7 @@ public async Task Publish_event_when_property_status_is_pending_or_declined()
 
         // Assert
         dynamoDbContext.Received(1)
-            .FromQueryAsync<PropertyRecord>(Arg.Any<QueryOperationConfig>(), Arg.Any<DynamoDBOperationConfig>());
+            .FromQueryAsync<PropertyRecord>(Arg.Any<Amazon.DynamoDBv2.DocumentModel.QueryOperationConfig>());
 
         await eventBindingClient.Received(1)
             .PutEventsAsync(
@@ -136,11 +135,11 @@ public async Task Do_not_publish_event_when_property_status_is_approved()
         // Assert
 
         dynamoDbContext
-            .FromQueryAsync<PropertyRecord>(Arg.Any<QueryOperationConfig>(), Arg.Any<DynamoDBOperationConfig>())
+            .FromQueryAsync<PropertyRecord>(Arg.Any<Amazon.DynamoDBv2.DocumentModel.QueryOperationConfig>())
             .Returns(TestHelpers.NewDynamoDBSearchResult(searchResult));
 
         dynamoDbContext.Received(1)
-            .FromQueryAsync<PropertyRecord>(Arg.Any<QueryOperationConfig>(), Arg.Any<DynamoDBOperationConfig>());
+            .FromQueryAsync<PropertyRecord>(Arg.Any<Amazon.DynamoDBv2.DocumentModel.QueryOperationConfig>());
 
         eventBindingClient.PutEventsAsync(Arg.Any<PutEventsRequest>(), Arg.Any<CancellationToken>())
             .Returns(new PutEventsResponse { FailedEntryCount = 0 });

Unicorn.Web/ApprovalService/PublicationApprovedEventHandler.cs

@@ -36,8 +36,9 @@ public PublicationApprovedEventHandler()
         AWSConfigsDynamoDB.Context.TypeMappings[typeof(PropertyRecord)] =
             new TypeMapping(typeof(PropertyRecord), dynamodbTable);
 
-        var config = new DynamoDBContextConfig { Conversion = DynamoDBEntryConversion.V2 };
-        _dynamoDbContext = new DynamoDBContext(new AmazonDynamoDBClient(), config);
+        _dynamoDbContext = new DynamoDBContextBuilder()
+            .ConfigureContext(c => c.Conversion=DynamoDBEntryConversion.V2)
+            .Build();
     }
 
     /// <summary>

Unicorn.Web/ApprovalService/RequestApprovalFunction.cs

@@ -48,8 +48,10 @@ public RequestApprovalFunction()
         // Initialise DDB client
         AWSConfigsDynamoDB.Context.TypeMappings[typeof(PropertyRecord)] =
             new TypeMapping(typeof(PropertyRecord), _dynamodbTable);
-        var config = new DynamoDBContextConfig { Conversion = DynamoDBEntryConversion.V2 };
-        _dynamoDbContext = new DynamoDBContext(new AmazonDynamoDBClient(), config);
+        
+        _dynamoDbContext = new DynamoDBContextBuilder()
+            .ConfigureContext(c => c.Conversion=DynamoDBEntryConversion.V2)
+            .Build();
 
         // Initialise EventBridge client
         _eventBindingClient = new AmazonEventBridgeClient();

Unicorn.Web/SearchService.Tests/PropertySearchFunctionTest.cs

@@ -25,7 +25,8 @@ public async Task PropertySearchFunction_SearchByStreet_ReturnsResults()
         // Arrange
         var request = TestHelpers.LoadApiGatewayProxyRequest("./events/search_by_street_event.json");
         var context = TestHelpers.NewLambdaContext();
-
+        var dynamoDbContext = Substitute.For<IDynamoDBContext>();
+        
         var searchResult = new List<PropertyRecord>
         {
             new()
@@ -44,8 +45,8 @@ public async Task PropertySearchFunction_SearchByStreet_ReturnsResults()
             }
         };
 
-        var mockDynamoDbContext = Substitute.For<IDynamoDBContext>();
-        mockDynamoDbContext.FromQueryAsync<PropertyRecord>(Arg.Any<QueryOperationConfig>(), Arg.Any<DynamoDBOperationConfig>())
+        dynamoDbContext
+            .FromQueryAsync<PropertyRecord>(Arg.Any<Amazon.DynamoDBv2.DocumentModel.QueryOperationConfig>())
             .Returns(TestHelpers.NewDynamoDBSearchResult(searchResult));
 
         var expectedResponse = new APIGatewayProxyResponse
@@ -59,16 +60,16 @@ public async Task PropertySearchFunction_SearchByStreet_ReturnsResults()
         };
 
         // Act
-        var function = new PropertySearchFunction(mockDynamoDbContext);
+        var function = new PropertySearchFunction(dynamoDbContext);
         var response = await function.FunctionHandler(request, context);
 
         // Assert
         Assert.Equal(expectedResponse.Headers, response.Headers);
         Assert.Equal(expectedResponse.StatusCode, response.StatusCode);
         Assert.NotEmpty(response.Body);
 
-        mockDynamoDbContext.Received(1)
-            .FromQueryAsync<PropertyRecord>(Arg.Any<QueryOperationConfig>(), Arg.Any<DynamoDBOperationConfig>());
+        dynamoDbContext.Received(1)
+            .FromQueryAsync<PropertyRecord>(Arg.Any<Amazon.DynamoDBv2.DocumentModel.QueryOperationConfig>());
 
         var items = JsonSerializer.Deserialize<List<PropertyDto>>(response.Body);
         Assert.NotNull(items);