Skip to content

Refactor to use Result<T> pattern for queries and handlers #411

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
Feb 13, 2026
Merged

Refactor to use Result<T> pattern for queries and handlers #411

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
c6ec82b
Refactor to use Result<T> pattern for queries and handlers
StuartFerguson Feb 12, 2026
354e1eb
oops
StuartFerguson Feb 12, 2026
160e58e
:|
StuartFerguson Feb 12, 2026
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
3 changes: 2 additions & 1 deletion EstateReportingAPI.BusinessLogic/EstateReportingAPI.BusinessLogic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
<ItemGroup>
<PackageReference Include="MediatR" Version="14.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.DynamicLinq" Version="10.7.1" />
<PackageReference Include="Shared" Version="2025.12.2" />
<PackageReference Include="Shared" Version="2026.2.1" />
<PackageReference Include="Shared.Results" Version="2026.2.1" />
<PackageReference Include="TransactionProcessor.Database" Version="2025.12.2-build270" />
</ItemGroup>

Expand Down
576 changes: 387 additions & 189 deletions EstateReportingAPI.BusinessLogic/ReportingManager.cs
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 8 additions & 21 deletions EstateReportingAPI.BusinessLogic/RequestHandlers/CalendarRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using EstateReportingAPI.BusinessLogic.Queries;
using EstateReportingAPI.Models;
using MediatR;
using Shared.Results;
using SimpleResults;

namespace EstateReportingAPI.BusinessLogic.RequestHandlers;
Expand All @@ -13,35 +14,21 @@ public CalendarRequestHandler(IReportingManager manager) {
}
public async Task<Result<List<Calendar>>> Handle(CalendarQueries.GetAllDatesQuery request,
CancellationToken cancellationToken) {
List<Calendar> result = await this.Manager.GetCalendarDates(request, cancellationToken);

if (result.Any() == false) {
return Result.NotFound("No calendar dates found");
}

return Result.Success(result);

return await this.Manager.GetCalendarDates(request, cancellationToken);
}

public async Task<Result<List<Calendar>>> Handle(CalendarQueries.GetComparisonDatesQuery request,
CancellationToken cancellationToken) {
List<Calendar> result = await this.Manager.GetCalendarComparisonDates(request, cancellationToken);
if (result.Any() == false)
{
return Result.NotFound("No calendar comparison dates found");
}
Result<List<Calendar>> result = await this.Manager.GetCalendarComparisonDates(request, cancellationToken);

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

return Result.Success(result.Data);
}

public async Task<Result<List<Int32>>> Handle(CalendarQueries.GetYearsQuery request,
CancellationToken cancellationToken) {
List<Int32> result = await this.Manager.GetCalendarYears(request, cancellationToken);
if (result.Any() == false)
{
return Result.NotFound("No calendar years found");
}

return Result.Success(result);
return await this.Manager.GetCalendarYears(request, cancellationToken);
}
}
8 changes: 3 additions & 5 deletions EstateReportingAPI.BusinessLogic/RequestHandlers/ContractRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,19 @@ public ContractRequestHandler(IReportingManager manager)
}
public async Task<Result<List<Contract>>> Handle(ContractQueries.GetRecentContractsQuery request,
CancellationToken cancellationToken) {
var result = await this.Manager.GetRecentContracts(request, cancellationToken);
return Result.Success(result);
return await this.Manager.GetRecentContracts(request, cancellationToken);
}

public async Task<Result<List<Contract>>> Handle(ContractQueries.GetContractsQuery request,
CancellationToken cancellationToken)
{
var result = await this.Manager.GetContracts(request, cancellationToken);
return Result.Success(result);
return result;
}

public async Task<Result<Contract>> Handle(ContractQueries.GetContractQuery request,
CancellationToken cancellationToken)
{
var result = await this.Manager.GetContract(request, cancellationToken);
return Result.Success(result);
return await this.Manager.GetContract(request, cancellationToken);
}
}
6 changes: 2 additions & 4 deletions EstateReportingAPI.BusinessLogic/RequestHandlers/EstateRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,11 @@ public EstateRequestHandler(IReportingManager manager)
public async Task<Result<Estate>> Handle(EstateQueries.GetEstateQuery request,
CancellationToken cancellationToken)
{
var result = await this.Manager.GetEstate(request, cancellationToken);
return Result.Success(result);
return await this.Manager.GetEstate(request, cancellationToken);
}

public async Task<Result<List<EstateOperator>>> Handle(EstateQueries.GetEstateOperatorsQuery request,
CancellationToken cancellationToken) {
var result = await this.Manager.GetEstateOperators(request, cancellationToken);
return Result.Success(result);
return await this.Manager.GetEstateOperators(request, cancellationToken);
}
}
25 changes: 7 additions & 18 deletions EstateReportingAPI.BusinessLogic/RequestHandlers/MerchantRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,47 +21,36 @@ public MerchantRequestHandler(IReportingManager manager)

public async Task<Result<List<Merchant>>> Handle(MerchantQueries.GetRecentMerchantsQuery request,
CancellationToken cancellationToken) {
var result = await this.Manager.GetRecentMerchants(request, cancellationToken);
return Result.Success(result);
return await this.Manager.GetRecentMerchants(request, cancellationToken);
}
public async Task<Result<MerchantKpi>> Handle(MerchantQueries.GetTransactionKpisQuery request,
CancellationToken cancellationToken)
{
var result = await this.Manager.GetMerchantsTransactionKpis(request, cancellationToken);
return Result.Success(result);
return await this.Manager.GetMerchantsTransactionKpis(request, cancellationToken);
}

public async Task<Result<List<Merchant>>> Handle(MerchantQueries.GetMerchantsQuery request,
CancellationToken cancellationToken) {
var result = await this.Manager.GetMerchants(request, cancellationToken);
return Result.Success(result);
return await this.Manager.GetMerchants(request, cancellationToken);
}

public async Task<Result<Merchant>> Handle(MerchantQueries.GetMerchantQuery request,
CancellationToken cancellationToken) {
var result = await this.Manager.GetMerchant(request, cancellationToken);

if (result == null)
return Result.NotFound();

return Result.Success(result);
return await this.Manager.GetMerchant(request, cancellationToken);
}

public async Task<Result<List<MerchantContract>>> Handle(MerchantQueries.GetMerchantContractsQuery request,
CancellationToken cancellationToken) {
var result = await this.Manager.GetMerchantContracts(request, cancellationToken);
return Result.Success(result);
return await this.Manager.GetMerchantContracts(request, cancellationToken);
}

public async Task<Result<List<MerchantOperator>>> Handle(MerchantQueries.GetMerchantOperatorsQuery request,
CancellationToken cancellationToken) {
var result = await this.Manager.GetMerchantOperators(request, cancellationToken);
return Result.Success(result);
return await this.Manager.GetMerchantOperators(request, cancellationToken);
}

public async Task<Result<List<MerchantDevice>>> Handle(MerchantQueries.GetMerchantDevicesQuery request,
CancellationToken cancellationToken) {
var result = await this.Manager.GetMerchantDevices(request, cancellationToken);
return Result.Success(result);
return await this.Manager.GetMerchantDevices(request, cancellationToken);
}
}
6 changes: 2 additions & 4 deletions EstateReportingAPI.BusinessLogic/RequestHandlers/OperatorRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ public OperatorRequestHandler(IReportingManager manager) {

public async Task<Result<List<Operator>>> Handle(OperatorQueries.GetOperatorsQuery request,
CancellationToken cancellationToken) {
List<Operator> result = await this.Manager.GetOperators(request, cancellationToken);
return Result.Success(result);
return await this.Manager.GetOperators(request, cancellationToken);
}

public async Task<Result<Operator>> Handle(OperatorQueries.GetOperatorQuery request,
CancellationToken cancellationToken) {
Operator result = await this.Manager.GetOperator(request, cancellationToken);
return Result.Success(result);
return await this.Manager.GetOperator(request, cancellationToken);
}
}
9 changes: 3 additions & 6 deletions EstateReportingAPI.BusinessLogic/RequestHandlers/TransactionRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,16 @@ public TransactionRequestHandler(IReportingManager manager) {

public async Task<Result<TodaysSales>> Handle(TransactionQueries.TodaysFailedSales request,
CancellationToken cancellationToken) {
var result = await this.Manager.GetTodaysFailedSales(request, cancellationToken);
return Result.Success(result);
return await this.Manager.GetTodaysFailedSales(request, cancellationToken);
}

public async Task<Result<TodaysSales>> Handle(TransactionQueries.TodaysSalesQuery request,
CancellationToken cancellationToken) {
var result = await this.Manager.GetTodaysSales(request, cancellationToken);
return Result.Success(result);
return await this.Manager.GetTodaysSales(request, cancellationToken);
}

public async Task<Result<TransactionDetailReportResponse>> Handle(TransactionQueries.TransactionDetailReportQuery request,
CancellationToken cancellationToken) {
var result = await this.Manager.GetTransactionDetailReport(request, cancellationToken);
return Result.Success(result);
return await this.Manager.GetTransactionDetailReport(request, cancellationToken);
}
}
4 changes: 2 additions & 2 deletions EstateReportingAPI.Client/EstateReportingAPI.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ClientProxyBase" Version="2025.12.2" />
<PackageReference Include="ClientProxyBase" Version="2026.2.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Shared.Results" Version="2025.12.2" />
<PackageReference Include="Shared.Results" Version="2026.2.1" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions EstateReportingAPI.IntegrationTests/EstateReportingAPI.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="Shared" Version="2025.12.2" />
<PackageReference Include="Shared.Logger" Version="2025.12.2" />
<PackageReference Include="Shared.IntegrationTesting" Version="2025.12.2" />
<PackageReference Include="Shared" Version="2026.2.1" />
<PackageReference Include="Shared.Logger" Version="2026.2.1" />
<PackageReference Include="Shared.IntegrationTesting" Version="2026.2.1" />
<PackageReference Include="Ductus.FluentDocker" Version="2.85.0" />
<PackageReference Include="NLog" Version="6.0.7" />
<PackageReference Include="NLog.Extensions.Logging" Version="6.1.0" />
Expand Down
6 changes: 3 additions & 3 deletions EstateReportingAPI/EstateReportingAPI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@

<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
<PackageReference Include="Shared.Results" Version="2025.12.2" />
<PackageReference Include="Shared.Results.Web" Version="2025.12.2" />
<PackageReference Include="Shared.Results" Version="2026.2.1" />
<PackageReference Include="Shared.Results.Web" Version="2026.2.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Lamar" Version="15.0.1" />
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="15.0.1" />
<PackageReference Include="NLog.Extensions.Logging" Version="6.1.0" />
<PackageReference Include="Shared" Version="2025.12.2" />
<PackageReference Include="Shared" Version="2026.2.1" />
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
<PackageReference Include="AspNetCore.HealthChecks.UI.InMemory.Storage" Version="9.0.0" />
Expand Down
Loading