refactor(approvals): Migrate DynamoDBContext initialization to builder pattern

Author: sliedig

Unicorn.Approvals/ApprovalsService/ContractStatusChangedEventHandler.cs

@@ -9,7 +9,6 @@
 using Amazon.Lambda.Core;
 using Amazon.Util;
 using Amazon.XRay.Recorder.Handlers.AwsSdk;
-using DynamoDBContextConfig = Amazon.DynamoDBv2.DataModel.DynamoDBContextConfig;
 using AWS.Lambda.Powertools.Logging;
 using AWS.Lambda.Powertools.Tracing;
 
@@ -39,8 +38,10 @@ public ContractStatusChangedEventHandler()
         AWSConfigsDynamoDB.Context.TypeMappings[typeof(ContractStatusChangedEvent)] =
             new TypeMapping(typeof(ContractStatusChangedEvent), dynamodbTable);
 
-        var config = new DynamoDBContextConfig { Conversion = DynamoDBEntryConversion.V2 };
-        _dynamoDbContext = new DynamoDBContext(new AmazonDynamoDBClient(), config);
+        _dynamoDbContext = new DynamoDBContextBuilder()
+            .WithDynamoDBClient(() => new AmazonDynamoDBClient())
+            .ConfigureContext(config => config.Conversion = DynamoDBEntryConversion.V2)
+            .Build();
     }
 
 

Unicorn.Approvals/ApprovalsService/PropertiesApprovalSyncFunction.cs

@@ -11,7 +11,6 @@
 using Amazon.StepFunctions.Model;
 using Amazon.Util;
 using Amazon.XRay.Recorder.Handlers.AwsSdk;
-using DynamoDBContextConfig = Amazon.DynamoDBv2.DataModel.DynamoDBContextConfig;
 using AWS.Lambda.Powertools.Logging;
 using AWS.Lambda.Powertools.Metrics;
 using AWS.Lambda.Powertools.Tracing;
@@ -45,8 +44,10 @@ public PropertiesApprovalSyncFunction()
         AWSConfigsDynamoDB.Context.TypeMappings[typeof(ContractStatusItem)] =
             new TypeMapping(typeof(ContractStatusItem), dynamodbTable);
 
-        var config = new DynamoDBContextConfig { Conversion = DynamoDBEntryConversion.V2 };
-        _dynamoDbContext = new DynamoDBContext(new AmazonDynamoDBClient(), config);
+        _dynamoDbContext = new DynamoDBContextBuilder()
+            .WithDynamoDBClient(() => new AmazonDynamoDBClient())
+            .ConfigureContext(config => config.Conversion = DynamoDBEntryConversion.V2)
+            .Build();
 
         // Initialise Step Functions client
         _amazonStepFunctionsClient = new AmazonStepFunctionsClient();

Unicorn.Approvals/ApprovalsService/WaitForContractApprovalFunction.cs

@@ -8,7 +8,6 @@
 using Amazon.Lambda.Core;
 using Amazon.Util;
 using Amazon.XRay.Recorder.Handlers.AwsSdk;
-using DynamoDBContextConfig = Amazon.DynamoDBv2.DataModel.DynamoDBContextConfig;
 using AWS.Lambda.Powertools.Logging;
 using AWS.Lambda.Powertools.Metrics;
 using AWS.Lambda.Powertools.Tracing;
@@ -42,8 +41,10 @@ public WaitForContractApprovalFunction()
         AWSConfigsDynamoDB.Context.TypeMappings[typeof(ContractStatusItem)] =
             new TypeMapping(typeof(ContractStatusItem), dynamodbTable);
 
-        var config = new DynamoDBContextConfig { Conversion = DynamoDBEntryConversion.V2 };
-        _dynamoDbContext = new DynamoDBContext(new AmazonDynamoDBClient(), config);
+        _dynamoDbContext = new DynamoDBContextBuilder()
+            .WithDynamoDBClient(() => new AmazonDynamoDBClient())
+            .ConfigureContext(config => config.Conversion = DynamoDBEntryConversion.V2)
+            .Build();
     }
 
 

Unicorn.Web/PublicationManagerService/RequestApprovalFunction.cs

@@ -17,7 +17,6 @@
 using AWS.Lambda.Powertools.Metrics;
 using AWS.Lambda.Powertools.Tracing;
 using Unicorn.Web.Common;
-using DynamoDBContextConfig = Amazon.DynamoDBv2.DataModel.DynamoDBContextConfig;
 
 // Assembly attribute to enable the Lambda function's JSON input to be converted into a .NET class.
 [assembly: LambdaSerializer(typeof(Amazon.Lambda.Serialization.SystemTextJson.DefaultLambdaJsonSerializer))]
@@ -49,8 +48,10 @@ public RequestApprovalFunction()
         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()
+            .WithDynamoDBClient(() => new AmazonDynamoDBClient())
+            .ConfigureContext(config => config.Conversion = DynamoDBEntryConversion.V2)
+            .Build();
 
         // Initialise EventBridge client
         _eventBindingClient = new AmazonEventBridgeClient();