Skip to content

client refactor completed #616

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 7, 2025
Merged

client refactor completed #616

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
6408e15
client refactor completed
StuartFerguson Nov 6, 2025
0c7fa0f
oops
StuartFerguson Nov 7, 2025
788ae6d
a little careless :|
StuartFerguson Nov 7, 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 FileProcessor.BusinessLogic.Tests/FileProcessor.BusinessLogic.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.10" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="22.0.14" />
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="22.0.16" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
16 changes: 8 additions & 8 deletions FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.5" />
<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.7.2" />
<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="MediatR" Version="12.5.0" />
<PackageReference Include="MediatR" Version="13.1.0" />
<PackageReference Include="Shared.EventStore" Version="2025.11.5" />
<PackageReference Include="System.IO.Abstractions" Version="22.0.14" />
<PackageReference Include="TransactionProcessor.Client" Version="2025.7.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
<PackageReference Include="TransactionProcessor.Database" Version="2025.7.2" />
<PackageReference Include="System.IO.Abstractions" Version="22.0.16" />
<PackageReference Include="TransactionProcessor.Client" Version="2025.10.1" />
<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" />
</ItemGroup>

<ItemGroup>
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.7.13" />
<PackageReference Include="Shared.Results" Version="2025.7.13" />
<PackageReference Include="ClientProxyBase" Version="2025.11.5" />
<PackageReference Include="Shared.Results" Version="2025.11.5" />
</ItemGroup>

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

try {
// Add the access token header
this.HttpClient.DefaultRequestHeaders.Authorization =
new AuthenticationHeaderValue("Bearer", accessToken);

// Make the Http Call here
HttpResponseMessage httpResponse = await this.HttpClient.GetAsync(requestUri, cancellationToken);

// Process the response
Result<String> result = await this.HandleResponseX(httpResponse, cancellationToken);
Result<FileDetails> result = await this.SendGetRequest<FileDetails> (requestUri, accessToken, cancellationToken);

if (result.IsFailed)
return ResultHelpers.CreateFailure(result);

ResponseData<FileDetails> responseData =
HandleResponseContent<FileDetails>(result.Data);

// call was successful so now deserialise the body to the response object
return Result.Success(responseData.Data);
return result;
}
catch (Exception ex) {
// An exception has occurred, add some additional information to the message
Expand Down Expand Up @@ -110,24 +98,12 @@ public async Task<Result<FileImportLog>> GetFileImportLog(String accessToken,
}

try {
// Add the access token header
this.HttpClient.DefaultRequestHeaders.Authorization =
new AuthenticationHeaderValue("Bearer", accessToken);

// Make the Http Call here
HttpResponseMessage httpResponse = await this.HttpClient.GetAsync(requestUri, cancellationToken);

// Process the response
Result<String> result = await this.HandleResponseX(httpResponse, cancellationToken);
Result<FileImportLog> result = await this.SendGetRequest<FileImportLog>(requestUri, accessToken, cancellationToken);

if (result.IsFailed)
return ResultHelpers.CreateFailure(result);

ResponseData<FileImportLog> responseData =
HandleResponseContent<FileImportLog>(result.Data);

// call was successful so now deserialise the body to the response object
return Result.Success(responseData.Data);
return result;
}
catch (Exception ex) {
// An exception has occurred, add some additional information to the message
Expand Down Expand Up @@ -162,23 +138,12 @@ public async Task<Result<FileImportLogList>> GetFileImportLogs(String accessToke
}

try {
// Add the access token header
this.HttpClient.DefaultRequestHeaders.Authorization =
new AuthenticationHeaderValue("Bearer", accessToken);
Result<FileImportLogList> result = await this.SendGetRequest<FileImportLogList>(requestUri, accessToken, cancellationToken);

// Make the Http Call here
HttpResponseMessage httpResponse = await this.HttpClient.GetAsync(requestUri, cancellationToken);

// Process the response
Result<String> result = await this.HandleResponseX(httpResponse, cancellationToken);
if (result.IsFailed)
return ResultHelpers.CreateFailure(result);

ResponseData<FileImportLogList> responseData =
HandleResponseContent<FileImportLogList>(result.Data);

// call was successful so now deserialise the body to the response object
return Result.Success(responseData.Data);
return result;
}
catch (Exception ex) {
// An exception has occurred, add some additional information to the message
Expand Down Expand Up @@ -229,11 +194,11 @@ public async Task<Result<Guid>> UploadFile(String accessToken,
if (result.IsFailed)
return ResultHelpers.CreateFailure(result);

ResponseData<Guid> responseData =
HandleResponseContent<Guid>(result.Data);

Guid responseData = JsonConvert.DeserializeObject<Guid>(result.Data);

// call was successful so now deserialise the body to the response object
return Result.Success(responseData.Data);
return Result.Success(responseData);

}
catch (Exception ex) {
// An exception has occurred, add some additional information to the message
Expand Down
7 changes: 5 additions & 2 deletions FileProcessor.DataTransferObjects/Responses/FileImportLogList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace FileProcessor.DataTransferObjects.Responses
using Newtonsoft.Json;

namespace FileProcessor.DataTransferObjects.Responses
{
using System.Collections.Generic;

Expand All @@ -12,7 +14,8 @@ public class FileImportLogList
/// <summary>
/// The file import logs
/// </summary>
public List<FileImportLog> FileImportLogs;
[JsonProperty("file_import_logs")]
public List<FileImportLog> FileImportLogs { get; set; }

#endregion
}
Expand Down
4 changes: 2 additions & 2 deletions FileProcessor.FileAggregate.Tests/FileProcessor.FileAggregate.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions FileProcessor.FileImportLogAggregate.Tests/FileProcessor.FileImportLogAggregate.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
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.7.13" />
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.7.2" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.11.5" />
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2025.10.1" />
</ItemGroup>

<ItemGroup>
Expand Down
16 changes: 8 additions & 8 deletions FileProcessor.IntegrationTests/Common/DockerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ 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);
}
//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){

Expand Down
57 changes: 33 additions & 24 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