diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 03df2323..05325293 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"csharpier": {
- "version": "1.2.1",
+ "version": "1.2.3",
"commands": [
"csharpier"
],
diff --git a/Directory.Build.props b/Directory.Build.props
index 424c7228..ad8a7606 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -5,7 +5,7 @@
enable
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Processor/Models/Ipaffs/ClearanceRequest.cs b/src/Processor/Models/Ipaffs/ClearanceRequest.cs
index 1b240e65..fb289844 100644
--- a/src/Processor/Models/Ipaffs/ClearanceRequest.cs
+++ b/src/Processor/Models/Ipaffs/ClearanceRequest.cs
@@ -66,7 +66,8 @@ private static ClearanceRequestItem[] MapItems(Commodity[]? commodities)
DocumentControl = document.DocumentControl,
DocumentQuantity = document.DocumentQuantity,
})
- .ToArray() ?? [],
+ .ToArray()
+ ?? [],
Checks =
commodity
.Checks?.Select(check => new ClearanceRequestCheck
@@ -74,7 +75,8 @@ private static ClearanceRequestItem[] MapItems(Commodity[]? commodities)
CheckCode = check.CheckCode,
DepartmentCode = check.DepartmentCode,
})
- .ToArray() ?? [],
+ .ToArray()
+ ?? [],
})
.ToArray();
}
diff --git a/src/Processor/Processor.csproj b/src/Processor/Processor.csproj
index c87d982f..73bf47ea 100644
--- a/src/Processor/Processor.csproj
+++ b/src/Processor/Processor.csproj
@@ -19,25 +19,25 @@
-
+
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/tests/Processor.IntegrationTests/Consumers/ResourceEventsConsumerTests.cs b/tests/Processor.IntegrationTests/Consumers/ResourceEventsConsumerTests.cs
index 24e722d8..38735afd 100644
--- a/tests/Processor.IntegrationTests/Consumers/ResourceEventsConsumerTests.cs
+++ b/tests/Processor.IntegrationTests/Consumers/ResourceEventsConsumerTests.cs
@@ -77,7 +77,11 @@ await SendMessage(
MRN,
JsonSerializer.Serialize(resourceEvent, _jsonSerializerOptions),
ResourceEventsQueueUrl,
- WithResourceEventAttributes("CustomsDeclaration", "ClearanceDecision", MRN),
+ WithResourceEventAttributes>(
+ "CustomsDeclaration",
+ "ClearanceDecision",
+ MRN
+ ),
false
);
@@ -161,7 +165,11 @@ await SendMessage(
MRN,
JsonSerializer.Serialize(resourceEvent),
ResourceEventsQueueUrl,
- WithResourceEventAttributes("CustomsDeclaration", "ClearanceRequest", MRN),
+ WithResourceEventAttributes>(
+ "CustomsDeclaration",
+ "ClearanceRequest",
+ MRN
+ ),
false
);
@@ -206,7 +214,11 @@ await SendMessage(
MRN,
JsonSerializer.Serialize(resourceEvent),
ResourceEventsQueueUrl,
- WithResourceEventAttributes("CustomsDeclaration", "Finalisation", MRN),
+ WithResourceEventAttributes>(
+ "CustomsDeclaration",
+ "Finalisation",
+ MRN
+ ),
false
);
diff --git a/tests/Processor.IntegrationTests/Endpoints/Admin/AdminTests.cs b/tests/Processor.IntegrationTests/Endpoints/Admin/AdminTests.cs
index c5217c7a..e5119040 100644
--- a/tests/Processor.IntegrationTests/Endpoints/Admin/AdminTests.cs
+++ b/tests/Processor.IntegrationTests/Endpoints/Admin/AdminTests.cs
@@ -1,4 +1,5 @@
using System.Net;
+using Defra.TradeImportsDataApi.Domain.Events;
using Defra.TradeImportsProcessor.Processor.IntegrationTests.Helpers;
using Defra.TradeImportsProcessor.Processor.IntegrationTests.TestBase;
using Defra.TradeImportsProcessor.Processor.IntegrationTests.TestUtils;
@@ -24,7 +25,11 @@ await SendMessage(
mrn,
resourceEvent,
ResourceEventsDeadLetterQueueUrl,
- WithResourceEventAttributes("CustomsDeclaration", "ClearanceDecision", mrn),
+ WithResourceEventAttributes>(
+ "CustomsDeclaration",
+ "ClearanceDecision",
+ mrn
+ ),
false
);
@@ -64,7 +69,11 @@ await SendMessage(
mrn,
resourceEvent,
ResourceEventsDeadLetterQueueUrl,
- WithResourceEventAttributes("CustomsDeclaration", "ClearanceDecision", mrn),
+ WithResourceEventAttributes>(
+ "CustomsDeclaration",
+ "ClearanceDecision",
+ mrn
+ ),
false
);
@@ -108,7 +117,11 @@ public async Task When_message_processing_fails_and_moved_to_dlq_Then_message_ca
mrn,
resourceEvent,
ResourceEventsDeadLetterQueueUrl,
- WithResourceEventAttributes("CustomsDeclaration", "ClearanceDecision", mrn),
+ WithResourceEventAttributes>(
+ "CustomsDeclaration",
+ "ClearanceDecision",
+ mrn
+ ),
false
);
@@ -152,7 +165,11 @@ await SendMessage(
mrn,
resourceEvent,
InboundCustomsDeclarationsDeadLetterQueueUrl,
- WithResourceEventAttributes("CustomsDeclaration", "ClearanceDecision", mrn)
+ WithResourceEventAttributes>(
+ "CustomsDeclaration",
+ "ClearanceDecision",
+ mrn
+ )
);
var messagesOnDeadLetterQueue = await AsyncWaiter.WaitForAsync(async () =>
@@ -195,7 +212,11 @@ await SendMessage(
mrn,
resourceEvent,
InboundCustomsDeclarationsDeadLetterQueueUrl,
- WithResourceEventAttributes("CustomsDeclaration", "ClearanceDecision", mrn)
+ WithResourceEventAttributes>(
+ "CustomsDeclaration",
+ "ClearanceDecision",
+ mrn
+ )
);
var messagesOnDeadLetterQueue = await AsyncWaiter.WaitForAsync(async () =>
@@ -239,7 +260,11 @@ public async Task When_customs_declarations_message_processing_fails_and_moved_t
mrn,
resourceEvent,
InboundCustomsDeclarationsDeadLetterQueueUrl,
- WithResourceEventAttributes("CustomsDeclaration", "ClearanceDecision", mrn)
+ WithResourceEventAttributes>(
+ "CustomsDeclaration",
+ "ClearanceDecision",
+ mrn
+ )
);
var messagesOnDeadLetterQueue = await AsyncWaiter.WaitForAsync(async () =>
diff --git a/tests/Processor.IntegrationTests/Processor.IntegrationTests.csproj b/tests/Processor.IntegrationTests/Processor.IntegrationTests.csproj
index acfb1070..d979f18d 100644
--- a/tests/Processor.IntegrationTests/Processor.IntegrationTests.csproj
+++ b/tests/Processor.IntegrationTests/Processor.IntegrationTests.csproj
@@ -7,12 +7,12 @@
Defra.TradeImportsProcessor.Processor.IntegrationTests
-
+
-
-
-
+
+
+
diff --git a/tests/Processor.IntegrationTests/TestBase/SqsTestBase.cs b/tests/Processor.IntegrationTests/TestBase/SqsTestBase.cs
index 866b5c0a..28fda0e9 100644
--- a/tests/Processor.IntegrationTests/TestBase/SqsTestBase.cs
+++ b/tests/Processor.IntegrationTests/TestBase/SqsTestBase.cs
@@ -4,7 +4,9 @@
using Amazon.SQS.Model;
using Defra.TradeImportsProcessor.Processor.Extensions;
using Defra.TradeImportsProcessor.Processor.IntegrationTests.Helpers;
+using SlimMessageBus.Host;
using Xunit.Abstractions;
+using Assert = Xunit.Assert;
namespace Defra.TradeImportsProcessor.Processor.IntegrationTests.TestBase;
@@ -108,7 +110,7 @@ protected async Task SendMessage(
return result.MessageId;
}
- protected static Dictionary WithResourceEventAttributes(
+ protected static Dictionary WithResourceEventAttributes(
string resourceType,
string? subResourceType,
string resourceId
@@ -116,6 +118,14 @@ string resourceId
{
var messageAttributes = new Dictionary
{
+ {
+ "MessageType",
+ new MessageAttributeValue
+ {
+ DataType = "String",
+ StringValue = new AssemblyQualifiedNameMessageTypeResolver().ToName(typeof(T)),
+ }
+ },
{
MessageBusHeaders.ResourceTypeHeader,
new MessageAttributeValue { DataType = "String", StringValue = resourceType }
diff --git a/tests/Processor.Tests/Processor.Tests.csproj b/tests/Processor.Tests/Processor.Tests.csproj
index 3f345f0f..e59a3055 100644
--- a/tests/Processor.Tests/Processor.Tests.csproj
+++ b/tests/Processor.Tests/Processor.Tests.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/tests/Testing/Testing.csproj b/tests/Testing/Testing.csproj
index 6619d03c..b6cb6451 100644
--- a/tests/Testing/Testing.csproj
+++ b/tests/Testing/Testing.csproj
@@ -10,8 +10,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
@@ -20,10 +20,10 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
-
+