Skip to content

Commit 7fa498d

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #329 from TransactionProcessing/task/#328_reqnroll_and_docker_helper_updates
Reqnroll upgraded
2 parents 0e2cab4 + 0491423 commit 7fa498d

26 files changed

+499
-862
lines changed

‎FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj‎

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

77
<ItemGroup>
8-
<PackageReference Include="EstateManagement.Database" Version="2023.12.2-build66" />
8+
<PackageReference Include="EstateManagement.Database" Version="2024.3.5-build77" />
99
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.7" />
10-
<PackageReference Include="EstateManagement.Client" Version="2023.12.2-build66" />
11-
<PackageReference Include="SecurityService.Client" Version="2023.12.1" />
12-
<PackageReference Include="Shared" Version="2023.12.2" />
13-
<PackageReference Include="Shared.DomainDrivenDesign" Version="2023.12.2" />
10+
<PackageReference Include="EstateManagement.Client" Version="2024.3.5-build77" />
11+
<PackageReference Include="SecurityService.Client" Version="2023.12.2-build58" />
12+
<PackageReference Include="Shared" Version="2024.3.3" />
13+
<PackageReference Include="Shared.DomainDrivenDesign" Version="2024.3.3" />
1414
<PackageReference Include="MediatR" Version="12.0.1" />
15-
<PackageReference Include="Shared.EventStore" Version="2023.12.2" />
15+
<PackageReference Include="Shared.EventStore" Version="2024.3.3" />
1616
<PackageReference Include="System.IO.Abstractions" Version="19.2.29" />
17-
<PackageReference Include="TransactionProcessor.Client" Version="2023.12.3-build79" />
17+
<PackageReference Include="TransactionProcessor.Client" Version="2024.3.3-build95" />
1818
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.7" />
1919
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.7" />
2020
</ItemGroup>

‎FileProcessor.BusinessLogic/Services/IFileProcessorDomainService.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,7 @@ public interface IFileProcessorDomainService
1414

1515
Task ProcessUploadedFile(ProcessUploadedFileRequest request,
1616
CancellationToken cancellationToken);
17-
18-
//Task ProcessSafaricomTopup(SafaricomTopupRequest request,
19-
// CancellationToken cancellationToken);
20-
21-
//Task ProcessVoucher(VoucherRequest request, CancellationToken cancellationToken);
22-
17+
2318
Task ProcessTransactionForFileLine(ProcessTransactionForFileLineRequest request,
2419
CancellationToken cancellationToken);
2520
}

‎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.12.2" />
9+
<PackageReference Include="ClientProxyBase" Version="2024.3.3" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎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.12.2" />
8+
<PackageReference Include="Shared.DomainDrivenDesign" Version="2024.3.3" />
99
</ItemGroup>
1010

1111
</Project>

‎FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
<ItemGroup>
88
<PackageReference Include="Grpc.Net.Client" Version="2.53.0" />
9-
<PackageReference Include="Shared.DomainDrivenDesign" Version="2023.12.2" />
10-
<PackageReference Include="Shared.EventStore" Version="2023.12.2" />
9+
<PackageReference Include="Shared.DomainDrivenDesign" Version="2024.3.3" />
10+
<PackageReference Include="Shared.EventStore" Version="2024.3.3" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎FileProcessor.FileImportLog.DomainEvents/FileProcessor.FileImportLog.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.12.2" />
8+
<PackageReference Include="Shared.DomainDrivenDesign" Version="2024.3.3" />
99
</ItemGroup>
1010

1111
</Project>

‎FileProcessor.FileImportLogAggregate/FileProcessor.FileImportLogAggregate.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<ItemGroup>
88
<PackageReference Include="Grpc.Net.Client" Version="2.53.0" />
9-
<PackageReference Include="Shared.EventStore" Version="2023.12.2" />
9+
<PackageReference Include="Shared.EventStore" Version="2024.3.3" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎FileProcessor.IntegrationTesting.Helpers/Class1.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,16 @@ public Guid GetFileId(String originalFileName)
3131
return this.FileImportLogFiles.Single(o => o.OriginalFileName == originalFileName).FileId;
3232
}
3333
}
34+
35+
public static class SubscriptionsHelper
36+
{
37+
public static List<(String streamName, String groupName, Int32 maxRetries)> GetSubscriptions()
38+
{
39+
List<(String streamName, String groupName, Int32 maxRetries)> subscriptions = new(){
40+
("$ce-FileImportLogAggregate", "File Processor", 0),
41+
("$ce-FileAggregate", "File Processor", 0)
42+
};
43+
return subscriptions;
44+
}
45+
}
3446
}

‎FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj‎

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

99
<ItemGroup>
10-
<PackageReference Include="EstateManagement.IntegrationTesting.Helpers" Version="2023.12.2-build66" />
11-
<PackageReference Include="Shared.IntegrationTesting" Version="2023.12.2" />
10+
<PackageReference Include="EstateManagement.IntegrationTesting.Helpers" Version="2024.3.5-build77" />
11+
<PackageReference Include="Shared.IntegrationTesting" Version="2024.3.3" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎FileProcessor.IntegrationTesting.Helpers/FileProcessorSteps.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ await this.FileProcessorClient.UploadFile(accessToken,
6464

6565
public async Task WhenIGetTheImportLogsBetweenAndTheFollowingDataIsReturned(String accessToken, String startDateString, String endDateString, String estateName, List<EstateDetails1> estateDetailsList, List<(DateTime, Int32)> expectedImportLogs)
6666
{
67-
DateTime queryStartDate = SpecflowTableHelper.GetDateForDateString(startDateString, DateTime.Now);
68-
DateTime queryEndDate = SpecflowTableHelper.GetDateForDateString(endDateString, DateTime.Now);
67+
DateTime queryStartDate = ReqnrollTableHelper.GetDateForDateString(startDateString, DateTime.Now);
68+
DateTime queryEndDate = ReqnrollTableHelper.GetDateForDateString(endDateString, DateTime.Now);
6969
EstateDetails1 estate = estateDetailsList.SingleOrDefault(e => e.EstateDetails.EstateName == estateName);
7070
estate.ShouldNotBeNull();
7171

@@ -94,7 +94,7 @@ public async Task WhenIGetTheImportLogForTheFollowingFileInformationIsReturned(S
9494
EstateDetails1 estate = estateDetailsList.SingleOrDefault(e => e.EstateDetails.EstateName == estateName);
9595
estate.ShouldNotBeNull();
9696

97-
DateTime queryStartDate = SpecflowTableHelper.GetDateForDateString(startDate, DateTime.Now);
97+
DateTime queryStartDate = ReqnrollTableHelper.GetDateForDateString(startDate, DateTime.Now);
9898
FileImportLogList importLogList = await this.FileProcessorClient.GetFileImportLogs(accessToken,
9999
estate.EstateDetails.EstateId,
100100
queryStartDate,
@@ -129,7 +129,7 @@ public async Task WhenIGetTheImportLogForEstateTheDateOnTheImportLogIs(String ac
129129
EstateDetails1 estate = estateDetailsList.SingleOrDefault(e => e.EstateDetails.EstateName == estateName);
130130
estate.ShouldNotBeNull();
131131

132-
DateTime expectedDate = SpecflowTableHelper.GetDateForDateString(expectedDateString, DateTime.Now);
132+
DateTime expectedDate = ReqnrollTableHelper.GetDateForDateString(expectedDateString, DateTime.Now);
133133

134134
FileImportLogList? importLogs = await this.FileProcessorClient.GetFileImportLogs(accessToken,
135135
estate.EstateDetails.EstateId,
@@ -142,7 +142,7 @@ public async Task WhenIGetTheImportLogForEstateTheDateOnTheImportLogIs(String ac
142142
i.ShouldNotBeNull();
143143
}
144144

145-
public async Task WhenIGetTheFileForEstateTheFollowingFileInformationIsReturned(String accessToken, String fileName, String estateName, List<EstateDetails1> estateDetailsList, SpecflowExtensions.FileProcessingSummary fileSummary){
145+
public async Task WhenIGetTheFileForEstateTheFollowingFileInformationIsReturned(String accessToken, String fileName, String estateName, List<EstateDetails1> estateDetailsList, ReqnrollExtensions.FileProcessingSummary fileSummary){
146146
EstateDetails1 estate = estateDetailsList.SingleOrDefault(e => e.EstateDetails.EstateName == estateName);
147147
estate.ShouldNotBeNull();
148148

@@ -163,7 +163,7 @@ await Retry.For(async () =>
163163
}, TimeSpan.FromMinutes(4), TimeSpan.FromSeconds(30));
164164
}
165165

166-
public async Task WhenIGetTheFileForEstateTheFollowingFileLinesAreReturned(String accessToken, String fileName, String estateName, List<EstateDetails1> estateDetailsList, List<SpecflowExtensions.FileLineDetails> fileLineDetails){
166+
public async Task WhenIGetTheFileForEstateTheFollowingFileLinesAreReturned(String accessToken, String fileName, String estateName, List<EstateDetails1> estateDetailsList, List<ReqnrollExtensions.FileLineDetails> fileLineDetails){
167167
EstateDetails1 estate = estateDetailsList.SingleOrDefault(e => e.EstateDetails.EstateName == estateName);
168168
estate.ShouldNotBeNull();
169169

@@ -173,7 +173,7 @@ await Retry.For(async () => {
173173
FileDetails fileDetails = await this.FileProcessorClient.GetFile(accessToken, estate.EstateDetails.EstateId, fileId, CancellationToken.None);
174174
fileDetails.ShouldNotBeNull();
175175

176-
foreach (SpecflowExtensions.FileLineDetails fileLineDetail in fileLineDetails){
176+
foreach (ReqnrollExtensions.FileLineDetails fileLineDetail in fileLineDetails){
177177

178178
FileLine? lineToVerify = fileDetails.FileLines.SingleOrDefault(fl => fl.LineNumber == fileLineDetail.LineNumber);
179179
lineToVerify.ShouldNotBeNull();

0 commit comments

Comments
 (0)