Skip to content

shared nugets updated #642

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
StuartFerguson merged 3 commits into from
Nov 25, 2025
Merged

shared nugets updated #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85ac02b
shared nugets updated
StuartFerguson Nov 25, 2025
6be7d9f
:|
StuartFerguson Nov 25, 2025
03dc237
run all tests on nightly
StuartFerguson Nov 25, 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
10 changes: 5 additions & 5 deletions .github/workflows/nightlybuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ jobs:
run: docker build . --file FileProcessor/Dockerfile --tag fileprocessor:latest

- name: Run Integration Tests
run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=Nightly
run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj"

- name: Run Integration Tests 1
run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=Nightly1
#- name: Run Integration Tests 1
#run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=Nightly1

- name: Run Integration Tests 2
run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=Nightly2
#- name: Run Integration Tests 2
#run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=Nightly2

- uses: actions/[email protected]
if: ${{ failure() }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pullrequest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ jobs:
- name: Run Integration Tests
run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=PRTest

- name: Run Integration Tests 1
run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=PRTest1
#- name: Run Integration Tests 1
# run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=PRTest1

- name: Run Integration Tests 2
run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=PRTest2
#- name: Run Integration Tests 2
# run: dotnet test "FileProcessor.IntegrationTests\FileProcessor.IntegrationTests.csproj" --filter Category=PRTest2

- uses: actions/[email protected]
if: ${{ failure() }}
Expand Down
8 changes: 4 additions & 4 deletions FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
<PackageReference Include="SecurityService.Client" Version="2025.10.1" />
<PackageReference Include="Shared" Version="2025.11.5" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.5" />
<PackageReference Include="Shared" Version="2025.11.11" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.11" />
<PackageReference Include="MediatR" Version="13.1.0" />
<PackageReference Include="Shared.EventStore" Version="2025.11.5" />
<PackageReference Include="Shared.EventStore" Version="2025.11.11" />
<PackageReference Include="System.IO.Abstractions" Version="22.0.16" />
<PackageReference Include="TransactionProcessor.Client" Version="2025.10.1" />
<PackageReference Include="TransactionProcessor.Client" Version="2025.10.2-build261" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.10" />
<PackageReference Include="TransactionProcessor.Database" Version="2025.10.1" />
Expand Down
4 changes: 2 additions & 2 deletions FileProcessor.Client/FileProcessor.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="2025.11.5" />
<PackageReference Include="Shared.Results" Version="2025.11.5" />
<PackageReference Include="ClientProxyBase" Version="2025.11.11" />
<PackageReference Include="Shared.Results" Version="2025.11.11" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions FileProcessor.Client/FileProcessorClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public async Task<Result<FileDetails>> GetFile(String accessToken,
String requestUri = this.BuildRequestUrl($"/api/files/{fileId}?estateId={estateId}");

try {
Result<FileDetails> result = await this.SendGetRequest<FileDetails> (requestUri, accessToken, cancellationToken);
Result<FileDetails> result = await this.SendHttpGetRequest<FileDetails> (requestUri, accessToken, cancellationToken);

if (result.IsFailed)
return ResultHelpers.CreateFailure(result);
Expand Down Expand Up @@ -98,7 +98,7 @@ public async Task<Result<FileImportLog>> GetFileImportLog(String accessToken,
}

try {
Result<FileImportLog> result = await this.SendGetRequest<FileImportLog>(requestUri, accessToken, cancellationToken);
Result<FileImportLog> result = await this.SendHttpGetRequest<FileImportLog>(requestUri, accessToken, cancellationToken);

if (result.IsFailed)
return ResultHelpers.CreateFailure(result);
Expand Down Expand Up @@ -138,7 +138,7 @@ public async Task<Result<FileImportLogList>> GetFileImportLogs(String accessToke
}

try {
Result<FileImportLogList> result = await this.SendGetRequest<FileImportLogList>(requestUri, accessToken, cancellationToken);
Result<FileImportLogList> result = await this.SendHttpGetRequest<FileImportLogList>(requestUri, accessToken, cancellationToken);

if (result.IsFailed)
return ResultHelpers.CreateFailure(result);
Expand Down
2 changes: 1 addition & 1 deletion FileProcessor.File.DomainEvents/FileProcessor.File.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="2025.11.5" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.11" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ItemGroup>
<PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.5" />
<PackageReference Include="Shared.EventStore" Version="2025.11.5" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.11" />
<PackageReference Include="Shared.EventStore" Version="2025.11.11" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion FileProcessor.FileImportLog.DomainEvents/FileProcessor.FileImportLog.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="2025.11.5" />
<PackageReference Include="Shared.DomainDrivenDesign" Version="2025.11.11" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion FileProcessor.FileImportLogAggregate/FileProcessor.FileImportLogAggregate.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
<PackageReference Include="Shared.EventStore" Version="2025.11.5" />
<PackageReference Include="Shared.EventStore" Version="2025.11.11" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions FileProcessor.IntegrationTesting.Helpers/FileProcessor.IntegrationTesting.Helpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Shared.IntegrationTesting" Version="2025.11.5" />
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.10.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.11.11" />
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.10.2-build261" />
</ItemGroup>

<ItemGroup>
Expand Down
11 changes: 1 addition & 10 deletions FileProcessor.IntegrationTests/Common/DockerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace FileProcessor.IntegrationTests.Common
using Shared.IntegrationTesting;
using TransactionProcessor.Client;

public class DockerHelper : global::Shared.IntegrationTesting.DockerHelper{
public class DockerHelper : global::Shared.IntegrationTesting.TestContainers.DockerHelper{
#region Fields

public HttpClient TestHostHttpClient;
Expand Down Expand Up @@ -63,15 +63,6 @@ public override async Task CreateSubscriptions(){
}
}

//protected override EventStoreClientSettings ConfigureEventStoreSettings()
//{
// string str = $"esdb://127.0.0.1:{this.EventStoreHttpPort}?tls=false&tlsVerifyCert=false&defaultDeadline=30000";
// if (this.IsSecureEventStore) {
// str = $"esdb://admin:[email protected]:{this.EventStoreHttpPort}?tls=true&tlsVerifyCert=false&defaultDeadline=30000";
// }
// return EventStoreClientSettings.Create(str);
//}

public override async Task StartContainersForScenarioRun(String scenarioName, DockerServices dockerServices){

await base.StartContainersForScenarioRun(scenarioName, dockerServices);
Expand Down
4 changes: 1 addition & 3 deletions FileProcessor.IntegrationTests/Common/GenericSteps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ public async Task StartSystem()

await Setup.GlobalSetup(this.TestingContext.DockerHelper);

this.TestingContext.DockerHelper.SqlServerContainer = Setup.DatabaseServerContainer;
this.TestingContext.DockerHelper.SqlServerNetwork = Setup.DatabaseServerNetwork;
this.TestingContext.DockerHelper.DockerCredentials = Setup.DockerCredentials;
this.TestingContext.DockerHelper.SqlCredentials = Setup.SqlCredentials;
this.TestingContext.DockerHelper.SqlServerContainerName = "sharedsqlserver";
Expand All @@ -64,7 +62,7 @@ public async Task StartSystem()

[AfterScenario]
public async Task StopSystem(){
DockerServices shareDockerServices = DockerServices.SqlServer;
DockerServices shareDockerServices = DockerServices.None;

this.TestingContext.Logger.LogInformation("About to Stop Containers for Scenario Run");
await this.TestingContext.DockerHelper.StopContainersForScenarioRun(shareDockerServices).ConfigureAwait(false);
Expand Down
32 changes: 0 additions & 32 deletions FileProcessor.IntegrationTests/Common/Setup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,44 +21,12 @@
[Binding]
public class Setup
{
public static IContainerService DatabaseServerContainer;
public static INetworkService DatabaseServerNetwork;
public static (String usename, String password) SqlCredentials = ("sa", "thisisalongpassword123!");
public static (String url, String username, String password) DockerCredentials = ("https://www.docker.com", "stuartferguson", "Sc0tland");

static object padLock = new object(); // Object to lock on

public static async Task GlobalSetup(DockerHelper dockerHelper)
{
Environment.SetEnvironmentVariable("FLUENTDOCKER_LOGLEVEL", "trace");
Environment.SetEnvironmentVariable("FLUENTDOCKER_NOSUDO", "true");
Environment.SetEnvironmentVariable("FLUENTDOCKER_PATH", "/usr/bin/docker");

ShouldlyConfiguration.DefaultTaskTimeout = TimeSpan.FromMinutes(1);
dockerHelper.SqlCredentials = Setup.SqlCredentials;
dockerHelper.DockerCredentials = Setup.DockerCredentials;
dockerHelper.SqlServerContainerName = "sharedsqlserver";

lock (Setup.padLock)
{
Setup.DatabaseServerNetwork = dockerHelper.SetupTestNetwork("sharednetwork");

dockerHelper.Logger.LogInformation("in start SetupSqlServerContainer");
Setup.DatabaseServerContainer = dockerHelper.SetupSqlServerContainer(Setup.DatabaseServerNetwork).Result;
}
}

public static String GetConnectionString(String databaseName)
{
return $"server={Setup.DatabaseServerContainer.Name};database={databaseName};user id={Setup.SqlCredentials.usename};password={Setup.SqlCredentials.password}";
}

public static String GetLocalConnectionString(String databaseName)
{
Int32 databaseHostPort = Setup.DatabaseServerContainer.ToHostExposedEndpoint("1433/tcp").Port;

return $"server=localhost,{databaseHostPort};database={databaseName};user id={Setup.SqlCredentials.usename};password={Setup.SqlCredentials.password}";
}

}
}
2 changes: 1 addition & 1 deletion FileProcessor.IntegrationTests/Features/GetFileImportDetails.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Background:
| Deposit1 | 300.00 | Today | Test Merchant 1 | Test Estate 1 |
| Deposit1 | 300.00 | Today | Test Merchant 2 | Test Estate 1 |

@PRTest1
@PRTest
@Nightly1
Scenario: Get File Import Log Details
Given I have a file named 'SafarcomTopup1.txt' with the following contents
Expand Down
34 changes: 18 additions & 16 deletions FileProcessor.IntegrationTests/Features/GetFileImportDetails.feature.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading