Skip to content

Commit 71b2df3

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #258 from TransactionProcessing/task/#255_aggregaterefactoring
Aggregate refactoring and nuget updates
2 parents e3ba3dd + cc179f3 commit 71b2df3

19 files changed

Lines changed: 323 additions & 512 deletions

File tree

‎FileProcessor.BusinessLogic.Tests/FileProcessor.BusinessLogic.Tests.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
13-
<PackageReference Include="Moq" Version="4.18.1" />
14-
<PackageReference Include="Shouldly" Version="4.1.0" />
15-
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="17.0.15" />
16-
<PackageReference Include="xunit" Version="2.4.1" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
13+
<PackageReference Include="Moq" Version="4.18.4" />
14+
<PackageReference Include="Shouldly" Version="4.2.1" />
15+
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="19.2.29" />
16+
<PackageReference Include="xunit" Version="2.4.2" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
<PrivateAssets>all</PrivateAssets>
2020
</PackageReference>
21-
<PackageReference Include="coverlet.msbuild" Version="3.1.2">
21+
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
</PackageReference>

‎FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />
9-
<PackageReference Include="EstateManagement.Client" Version="2022.12.3-build32" />
8+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
9+
<PackageReference Include="EstateManagement.Client" Version="2023.6.1" />
1010
<PackageReference Include="EstateReporting.Database" Version="1.1.8-build15" />
11-
<PackageReference Include="SecurityService.Client" Version="2022.12.2-build34" />
12-
<PackageReference Include="Shared" Version="2023.1.0" />
13-
<PackageReference Include="Shared.DomainDrivenDesign" Version="2023.1.0" />
14-
<PackageReference Include="MediatR" Version="10.0.1" />
15-
<PackageReference Include="Shared.EventStore" Version="2023.1.0" />
16-
<PackageReference Include="System.IO.Abstractions" Version="17.0.15" />
17-
<PackageReference Include="TransactionProcessor.Client" Version="2022.12.3-build49" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
19-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
11+
<PackageReference Include="SecurityService.Client" Version="2023.6.1" />
12+
<PackageReference Include="Shared" Version="2023.6.1" />
13+
<PackageReference Include="Shared.DomainDrivenDesign" Version="2023.6.1" />
14+
<PackageReference Include="MediatR" Version="12.0.1" />
15+
<PackageReference Include="Shared.EventStore" Version="2023.6.1" />
16+
<PackageReference Include="System.IO.Abstractions" Version="19.2.29" />
17+
<PackageReference Include="TransactionProcessor.Client" Version="2023.6.2" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎FileProcessor.BusinessLogic/RequestHandlers/FileRequestHandler.cs‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,31 +59,25 @@ public async Task<Guid> Handle(UploadFileRequest request,
5959
return await this.DomainService.UploadFile(request, cancellationToken);
6060
}
6161

62-
public async Task<Unit> Handle(ProcessUploadedFileRequest request, CancellationToken cancellationToken)
62+
public async Task Handle(ProcessUploadedFileRequest request, CancellationToken cancellationToken)
6363
{
6464
await this.DomainService.ProcessUploadedFile(request, cancellationToken);
65-
66-
return new Unit();
65+
6766
}
68-
public async Task<Unit> Handle(SafaricomTopupRequest request,
67+
public async Task Handle(SafaricomTopupRequest request,
6968
CancellationToken cancellationToken) {
7069
await this.DomainService.ProcessSafaricomTopup(request, cancellationToken);
71-
72-
return new Unit();
7370
}
7471

75-
public async Task<Unit> Handle(ProcessTransactionForFileLineRequest request,
72+
public async Task Handle(ProcessTransactionForFileLineRequest request,
7673
CancellationToken cancellationToken) {
7774
await this.DomainService.ProcessTransactionForFileLine(request, cancellationToken);
78-
return new Unit();
7975
}
8076

81-
public async Task<Unit> Handle(VoucherRequest request,
77+
public async Task Handle(VoucherRequest request,
8278
CancellationToken cancellationToken)
8379
{
8480
await this.DomainService.ProcessVoucher(request, cancellationToken);
85-
86-
return new Unit();
8781
}
8882
}
8983
}

‎FileProcessor.Client/FileProcessor.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="ClientProxyBase" Version="2023.1.0" />
9+
<PackageReference Include="ClientProxyBase" Version="2023.6.1" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎FileProcessor.DataTransferObjects/FileProcessor.DataTransferObjects.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
9+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1010
</ItemGroup>
1111

1212
</Project>

‎FileProcessor.DomainEvents.Tests/FileProcessor.DomainEvents.Tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
12-
<PackageReference Include="Shouldly" Version="4.1.0" />
13-
<PackageReference Include="xunit" Version="2.4.1" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.5" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
12+
<PackageReference Include="Shouldly" Version="4.2.1" />
13+
<PackageReference Include="xunit" Version="2.4.2" />
1414
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
<PrivateAssets>all</PrivateAssets>
1717
</PackageReference>
18-
<PackageReference Include="coverlet.msbuild" Version="3.1.2">
18+
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
1919
<PrivateAssets>all</PrivateAssets>
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
</PackageReference>

‎FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Shared.DomainDrivenDesign" Version="2023.1.0" />
8+
<PackageReference Include="Shared.DomainDrivenDesign" Version="2023.6.1" />
99
</ItemGroup>
1010

1111
</Project>

‎FileProcessor.FileAggregate.Tests/FileProcessor.FileAggregate.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
11-
<PackageReference Include="Shouldly" Version="4.1.0" />
12-
<PackageReference Include="xunit" Version="2.4.1" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
11+
<PackageReference Include="Shouldly" Version="4.2.1" />
12+
<PackageReference Include="xunit" Version="2.4.2" />
1313
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
<PrivateAssets>all</PrivateAssets>
1616
</PackageReference>
17-
<PackageReference Include="coverlet.msbuild" Version="3.1.2">
17+
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>

0 commit comments

Comments
 (0)