Skip to content

Refactor email and SMS aggregate handling #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 9, 2025
Merged

Refactor email and SMS aggregate handling #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c1ea9f
Refactor email and SMS aggregate handling
StuartFerguson Jan 9, 2025
463f3b6
Merge branch 'master' into bug/#187_no_error_thrown_on_duplicate_send
StuartFerguson Jan 9, 2025
aa37eb3
fix nuget versions
StuartFerguson Jan 9, 2025
672b09b
Merge branch 'bug/#187_no_error_thrown_on_duplicate_send' of ssh://gi…
StuartFerguson Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MessagingService.Client/MessagingService.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2024.11.4" />
<PackageReference Include="ClientProxyBase" Version="2025.1.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

Expand All @@ -16,7 +16,7 @@

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Shared.EventStore">
<Version>2024.11.4</Version>
<Version>2025.1.2</Version>
</PackageReference>
</ItemGroup>

Expand Down
137 changes: 0 additions & 137 deletions MessagingService.EmailAggregate.Tests/EmailAggregateDomainEventTests.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions MessagingService.EmailAggregate.Tests/EmailAggregateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ public void EmailAggregate_SendRequestToProvider_RequestSent() {
}

[Fact]
public void EmailAggregate_SendRequestToProvider_RequestAlreadySent_ErrorThrown() {
public void EmailAggregate_SendRequestToProvider_RequestAlreadySent_NoErrorThrown() {
EmailAggregate emailAggregate = EmailAggregate.Create(TestData.MessageId);

emailAggregate.SendRequestToProvider(TestData.FromAddress, TestData.ToAddresses, TestData.Subject, TestData.Body, TestData.IsHtmlTrue, TestData.EmailAttachmentModels);

Should.Throw<InvalidOperationException>(() => {
Should.NotThrow(() => {
emailAggregate.SendRequestToProvider(TestData.FromAddress,
TestData.ToAddresses,
TestData.Subject,
Expand Down
2 changes: 1 addition & 1 deletion MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Shared.EventStore" Version="2024.11.4" />
<PackageReference Include="Shared.EventStore" Version="2025.1.2" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
Expand Down
4 changes: 2 additions & 2 deletions MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Shared" Version="2024.11.4" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2024.11.4" />
<PackageReference Include="Shared" Version="2025.1.2" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.1.2" />
</ItemGroup>

</Project>
5 changes: 2 additions & 3 deletions MessagingService.EmailMessageAggregate/EmailAggregate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,8 @@ public static void SendRequestToProvider(this EmailAggregate aggregate, String f
Boolean isHtml,
List<EmailAttachment> attachments)
{
if (aggregate.DeliveryStatusList[aggregate.ResendCount] != MessageStatus.NotSet)
{
throw new InvalidOperationException("Cannot send a message to provider that has already been sent");
if (aggregate.DeliveryStatusList[aggregate.ResendCount] != MessageStatus.NotSet) {
return;
}

RequestSentToEmailProviderEvent requestSentToProviderEvent = new RequestSentToEmailProviderEvent(aggregate.AggregateId, fromAddress, toAddresses, subject, body, isHtml);
Expand Down
4 changes: 2 additions & 2 deletions MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

<ItemGroup>
<PackageReference Include="Grpc.Net.Client" Version="2.61.0" />
<PackageReference Include="Shared" Version="2024.11.4" />
<PackageReference Include="Shared.EventStore" Version="2024.11.4" />
<PackageReference Include="Shared" Version="2025.1.2" />
<PackageReference Include="Shared.EventStore" Version="2025.1.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...gingService.IntegrationTesting.Helpers/MessagingService.IntegrationTesting.Helpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Shared.IntegrationTesting" Version="2024.11.4" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.1.2" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2024.11.4" />
<PackageReference Include="ClientProxyBase" Version="2025.1.2" />
<PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Reqnroll.Tools.MsBuild.Generation" Version="1.0.1" />
<PackageReference Include="NUnit" Version="4.1.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Reqnroll" Version="1.0.1" />
<PackageReference Include="Reqnroll.NUnit" Version="1.0.1" />
<PackageReference Include="SecurityService.Client" Version="2024.88.2-build73" />
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2024.88.2-build73" />
<PackageReference Include="Shared.IntegrationTesting" Version="2024.11.4" />
<PackageReference Include="SecurityService.Client" Version="2025.1.1" />
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2025.1.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.1.2" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
Expand Down
95 changes: 0 additions & 95 deletions MessagingService.SMSAggregate.Tests/SMSAggregateDomainEventTests.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions MessagingService.SMSAggregate.Tests/SMSAggregateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ public void SMSAggregate_SendRequestToProvider_RequestSent()
}

[Fact]
public void SMSAggregate_SendRequestToProvider_RequestAlreadySent_ErrorThrown()
public void SMSAggregate_SendRequestToProvider_RequestAlreadySent_NoErrorThrown()
{
SMSAggregate smsAggregate = SMSAggregate.Create(TestData.MessageId);

smsAggregate.SendRequestToProvider(TestData.Sender, TestData.Destination, TestData.Message);

Should.Throw<InvalidOperationException>(() =>
Should.NotThrow(() =>
{
smsAggregate.SendRequestToProvider(TestData.Sender, TestData.Destination, TestData.Message);
});
Expand Down
2 changes: 1 addition & 1 deletion MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Shared.DomainDrivenDesign" Version="2024.11.4" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.1.2" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>
<PackageReference Include="Grpc.Net.Client" Version="2.61.0" />
<PackageReference Include="Shared.EventStore" Version="2024.11.4" />
<PackageReference Include="Shared.EventStore" Version="2025.1.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion MessagingService.SMSMessageAggregate/SMSAggregate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public static void SendRequestToProvider(this SMSAggregate aggregate,
String destination,
String message){
if (aggregate.DeliveryStatusList[aggregate.ResendCount] != MessageStatus.NotSet){
throw new InvalidOperationException("Cannot send a message to provider that has already been sent");
return;
}

RequestSentToSMSProviderEvent requestSentToProviderEvent = new RequestSentToSMSProviderEvent(aggregate.AggregateId, sender, destination, message);
Expand Down
2 changes: 1 addition & 1 deletion MessagingService/MessagingService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.3" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
<PackageReference Include="Shared" Version="2024.11.4" />
<PackageReference Include="Shared" Version="2025.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
Expand Down
Loading