Skip to content

Completed refactor of aggregates to records, other nuget updates #144

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 1 commit into from
Jun 12, 2023
Merged

Completed refactor of aggregates to records, other nuget updates #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Lamar" Version="10.0.1" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Shouldly" Version="4.1.0" />
<PackageReference Include="Lamar" Version="12.0.0" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="3.2.0">
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
12 changes: 6 additions & 6 deletions MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NLog.Extensions.Logging" Version="5.1.0" />
<PackageReference Include="MediatR" Version="11.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.2" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.0" />
<PackageReference Include="MediatR" Version="12.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
57 changes: 22 additions & 35 deletions MessagingService.BusinessLogic/RequestHandlers/MessagingRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
namespace MessagingService.BusinessLogic.RequestHandlers
{
using System;
namespace MessagingService.BusinessLogic.RequestHandlers{
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using MediatR;
using Requests;
using Services;
using EmailAttachment = Models.EmailAttachment;
using FileType = Models.FileType;

/// <summary>
///
/// </summary>
/// <seealso cref="MediatR.IRequestHandler{MessagingService.BusinessLogic.Requests.SendEmailRequest, System.String}" />
public class MessagingRequestHandler : IRequestHandler<SendEmailRequest>,
public class MessagingRequestHandler : IRequestHandler<SendEmailRequest>,
IRequestHandler<SendSMSRequest>,
IRequestHandler<ResendEmailRequest>,
IRequestHandler<ResendSMSRequest>
{
IRequestHandler<ResendSMSRequest>{
#region Fields

/// <summary>
Expand All @@ -33,8 +31,7 @@ public class MessagingRequestHandler : IRequestHandler<SendEmailRequest>,
/// Initializes a new instance of the <see cref="MessagingRequestHandler" /> class.
/// </summary>
/// <param name="messagingDomainService">The messaging domain service.</param>
public MessagingRequestHandler(IMessagingDomainService messagingDomainService)
{
public MessagingRequestHandler(IMessagingDomainService messagingDomainService){
this.MessagingDomainService = messagingDomainService;
}

Expand All @@ -50,9 +47,9 @@ public MessagingRequestHandler(IMessagingDomainService messagingDomainService)
/// <returns>
/// Response from the request
/// </returns>
public async Task<Unit> Handle(SendEmailRequest request,
CancellationToken cancellationToken){
List<EmailAttachment> attachments = new List<Models.EmailAttachment>();
public async Task Handle(SendEmailRequest request,
CancellationToken cancellationToken){
List<EmailAttachment> attachments = new List<EmailAttachment>();

foreach (Requests.EmailAttachment requestEmailAttachment in request.EmailAttachments){
attachments.Add(new EmailAttachment{
Expand All @@ -61,7 +58,7 @@ public async Task<Unit> Handle(SendEmailRequest request,
Filename = requestEmailAttachment.Filename,
});
}

await this.MessagingDomainService.SendEmailMessage(request.ConnectionIdentifier,
request.MessageId,
request.FromAddress,
Expand All @@ -71,46 +68,36 @@ await this.MessagingDomainService.SendEmailMessage(request.ConnectionIdentifier,
request.IsHtml,
attachments,
cancellationToken);

return Unit.Value;
}

public async Task<Unit> Handle(SendSMSRequest request,
CancellationToken cancellationToken)
{
public async Task Handle(SendSMSRequest request,
CancellationToken cancellationToken){
await this.MessagingDomainService.SendSMSMessage(request.ConnectionIdentifier,
request.MessageId,
request.Sender,
request.Destination,
request.Message,
cancellationToken);
return Unit.Value;
}

#endregion

public async Task<Unit> Handle(ResendEmailRequest request,
CancellationToken cancellationToken) {
public async Task Handle(ResendEmailRequest request,
CancellationToken cancellationToken){
await this.MessagingDomainService.ResendEmailMessage(request.ConnectionIdentifier, request.MessageId, cancellationToken);
}

return Unit.Value;
public async Task Handle(ResendSMSRequest request, CancellationToken cancellationToken){
await this.MessagingDomainService.ResendSMSMessage(request.ConnectionIdentifier, request.MessageId, cancellationToken);
}

private Models.FileType ConvertFileType(FileType emailAttachmentFileType)
{
switch (emailAttachmentFileType)
{
case FileType.PDF:
return Models.FileType.PDF;
private FileType ConvertFileType(Requests.FileType emailAttachmentFileType){
switch(emailAttachmentFileType){
case Requests.FileType.PDF:
return FileType.PDF;
default:
return Models.FileType.None;
return FileType.None;
}
}

public async Task<Unit> Handle(ResendSMSRequest request, CancellationToken cancellationToken){
await this.MessagingDomainService.ResendSMSMessage(request.ConnectionIdentifier, request.MessageId, cancellationToken);

return Unit.Value;
}
#endregion
}
}
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,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2023.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="ClientProxyBase" Version="2023.6.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Shared.EventStore" Version="2023.1.0" />
<PackageReference Include="Shouldly" Version="4.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
<PackageReference Include="Shared.EventStore" Version="2023.6.1" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="3.2.0">
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
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 @@ -5,8 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Shared" Version="2023.1.0" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2023.1.0" />
<PackageReference Include="Shared" Version="2023.6.1" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2023.6.1" />
</ItemGroup>

</Project>
Loading