From 161dbc8d1555cb368fb64d574bef023eb7daf4e2 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Tue, 31 Mar 2026 18:51:17 +0100 Subject: [PATCH 1/4] more fixes --- .../Controllers/PataPawaPrePaidController.cs | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs b/TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs index 4e8d675..44b41fb 100644 --- a/TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs +++ b/TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs @@ -14,11 +14,11 @@ using System.Threading.Tasks; internal static class FormKeys { - internal const String Key = "key"; - internal const String Meter = "meter"; - internal const String Amount = "amount"; - internal const String UserName = "username"; - internal const String Password = "password"; + internal const String FormKeyName = "key"; + internal const String FormMeterName = "meter"; + internal const String FormAmountName = "amount"; + internal const String FormUserName = "username"; + internal const String FormPasswordName = "password"; } internal static class Responses { @@ -29,7 +29,6 @@ internal static class Responses { [ApiController] public class PataPawaPrePaidController : ControllerBase{ private readonly IDbContextResolver ContextResolver; - private const String PataPawaReadModelKey = "PataPawaReadModel"; #region Constructors @@ -171,10 +170,10 @@ private VendResponse CreateVendResponse(Database.PataPawa.Transaction transactio } private async Task HandleBalanceRequest(IFormCollection requestForm, CancellationToken cancellationToken){ - String username = requestForm[FormKeys.UserName].ToString(); - String key = requestForm[FormKeys.Key].ToString(); + String username = requestForm[FormKeys.FormUserName].ToString(); + String key = requestForm[FormKeys.FormKeyName].ToString(); - using ResolvedDbContext? resolvedContext = this.ContextResolver.Resolve(PataPawaReadModelKey); + using ResolvedDbContext? resolvedContext = this.ContextResolver.Resolve(Constants.PataPawaReadModelConfig); PrePayUser user = await resolvedContext.Context.PrePayUsers.SingleOrDefaultAsync(u => u.UserName == username && u.Key == key, cancellationToken); @@ -187,13 +186,13 @@ private async Task HandleBalanceRequest(IFormCollection requestFo } private async Task HandleLastVendRequest(RequestType xlatedRequestType, IFormCollection requestForm, CancellationToken cancellationToken){ - String meter = requestForm[FormKeys.Meter].ToString(); + String meter = requestForm[FormKeys.FormMeterName].ToString(); (PrePayMeter meterDetails, IActionResult result) meterValidation = await this.ValidateMeterDetails(meter, cancellationToken); if (meterValidation.result != null) return meterValidation.result; - using ResolvedDbContext? resolvedContext = this.ContextResolver.Resolve(PataPawaReadModelKey); + using ResolvedDbContext? resolvedContext = this.ContextResolver.Resolve(Constants.PataPawaReadModelConfig); IQueryable transactions = resolvedContext.Context.Transactions.Where(t => t.MeterNumber == meter).AsQueryable(); @@ -217,10 +216,10 @@ private async Task HandleLastVendRequest(RequestType xlatedReques } private async Task HandleLoginRequest(IFormCollection requestForm, CancellationToken cancellationToken){ - String username = requestForm[FormKeys.UserName].ToString(); - String password = requestForm[FormKeys.Password].ToString(); + String username = requestForm[FormKeys.FormUserName].ToString(); + String password = requestForm[FormKeys.FormPasswordName].ToString(); - using ResolvedDbContext? resolvedContext = this.ContextResolver.Resolve(PataPawaReadModelKey); + using ResolvedDbContext? resolvedContext = this.ContextResolver.Resolve(Constants.PataPawaReadModelConfig); PrePayUser user = await resolvedContext.Context.PrePayUsers.SingleOrDefaultAsync(u => u.UserName == username && u.Password == password, cancellationToken); @@ -242,7 +241,7 @@ private async Task HandleLoginRequest(IFormCollection requestForm } private async Task HandleMeterRequest(IFormCollection requestForm, CancellationToken cancellationToken){ - String meter = requestForm[FormKeys.Meter].ToString(); + String meter = requestForm[FormKeys.FormMeterName].ToString(); (PrePayMeter meterDetails, IActionResult result) meterValidation = await this.ValidateMeterDetails(meter, cancellationToken); if (meterValidation.result != null) @@ -257,14 +256,14 @@ private async Task HandleMeterRequest(IFormCollection requestForm } private async Task HandleVendRequest(IFormCollection requestForm, CancellationToken cancellationToken){ - String meter = requestForm[FormKeys.Meter].ToString(); - String amount = requestForm[FormKeys.Amount].ToString(); + String meter = requestForm[FormKeys.FormMeterName].ToString(); + String amount = requestForm[FormKeys.FormAmountName].ToString(); (PrePayMeter meterDetails, IActionResult result) meterValidation = await this.ValidateMeterDetails(meter, cancellationToken); if (meterValidation.result != null) return meterValidation.result; - using ResolvedDbContext? resolvedContext = this.ContextResolver.Resolve(PataPawaReadModelKey); + using ResolvedDbContext? resolvedContext = this.ContextResolver.Resolve(Constants.PataPawaReadModelConfig); Database.PataPawa.Transaction transaction = this.CreateTransactionRecord(amount, meterValidation.meterDetails); @@ -312,7 +311,7 @@ private RequestType TranslateRequestType(String formRequest){ })); } - using ResolvedDbContext? resolvedContext = this.ContextResolver.Resolve(PataPawaReadModelKey); + using ResolvedDbContext? resolvedContext = this.ContextResolver.Resolve(Constants.PataPawaReadModelConfig); PrePayMeter meterDetails = await resolvedContext.Context.PrePayMeters.SingleOrDefaultAsync(m => m.MeterNumber == meterNumber, cancellationToken); From 0a7c2d30b9f3b154ada42d79f4ef001c8cc6b2d9 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Wed, 1 Apr 2026 07:33:30 +0100 Subject: [PATCH 2/4] try this --- .../Controllers/PataPawaPrePaidController.cs | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs b/TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs index 44b41fb..9f9d797 100644 --- a/TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs +++ b/TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs @@ -14,11 +14,11 @@ using System.Threading.Tasks; internal static class FormKeys { - internal const String FormKeyName = "key"; - internal const String FormMeterName = "meter"; - internal const String FormAmountName = "amount"; - internal const String FormUserName = "username"; - internal const String FormPasswordName = "password"; + internal const String KeyFieldName = "key"; + internal const String MeterFieldName = "meter"; + internal const String AmountFieldName = "amount"; + internal const String UserNameFieldName = "username"; + internal const String PasswordFieldName = "password"; } internal static class Responses { @@ -170,8 +170,8 @@ private VendResponse CreateVendResponse(Database.PataPawa.Transaction transactio } private async Task HandleBalanceRequest(IFormCollection requestForm, CancellationToken cancellationToken){ - String username = requestForm[FormKeys.FormUserName].ToString(); - String key = requestForm[FormKeys.FormKeyName].ToString(); + String username = requestForm[FormKeys.UserNameFieldName].ToString(); + String key = requestForm[FormKeys.KeyFieldName].ToString(); using ResolvedDbContext? resolvedContext = this.ContextResolver.Resolve(Constants.PataPawaReadModelConfig); @@ -186,7 +186,7 @@ private async Task HandleBalanceRequest(IFormCollection requestFo } private async Task HandleLastVendRequest(RequestType xlatedRequestType, IFormCollection requestForm, CancellationToken cancellationToken){ - String meter = requestForm[FormKeys.FormMeterName].ToString(); + String meter = requestForm[FormKeys.MeterFieldName].ToString(); (PrePayMeter meterDetails, IActionResult result) meterValidation = await this.ValidateMeterDetails(meter, cancellationToken); if (meterValidation.result != null) @@ -216,8 +216,8 @@ private async Task HandleLastVendRequest(RequestType xlatedReques } private async Task HandleLoginRequest(IFormCollection requestForm, CancellationToken cancellationToken){ - String username = requestForm[FormKeys.FormUserName].ToString(); - String password = requestForm[FormKeys.FormPasswordName].ToString(); + String username = requestForm[FormKeys.UserNameFieldName].ToString(); + String password = requestForm[FormKeys.PasswordFieldName].ToString(); using ResolvedDbContext? resolvedContext = this.ContextResolver.Resolve(Constants.PataPawaReadModelConfig); @@ -241,7 +241,7 @@ private async Task HandleLoginRequest(IFormCollection requestForm } private async Task HandleMeterRequest(IFormCollection requestForm, CancellationToken cancellationToken){ - String meter = requestForm[FormKeys.FormMeterName].ToString(); + String meter = requestForm[FormKeys.MeterFieldName].ToString(); (PrePayMeter meterDetails, IActionResult result) meterValidation = await this.ValidateMeterDetails(meter, cancellationToken); if (meterValidation.result != null) @@ -256,8 +256,8 @@ private async Task HandleMeterRequest(IFormCollection requestForm } private async Task HandleVendRequest(IFormCollection requestForm, CancellationToken cancellationToken){ - String meter = requestForm[FormKeys.FormMeterName].ToString(); - String amount = requestForm[FormKeys.FormAmountName].ToString(); + String meter = requestForm[FormKeys.MeterFieldName].ToString(); + String amount = requestForm[FormKeys.AmountFieldName].ToString(); (PrePayMeter meterDetails, IActionResult result) meterValidation = await this.ValidateMeterDetails(meter, cancellationToken); if (meterValidation.result != null) From 72afb65b22841370eec18c7ba13218d6107aa643 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Wed, 1 Apr 2026 08:01:39 +0100 Subject: [PATCH 3/4] :\ --- TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs b/TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs index 9f9d797..8a0b8d9 100644 --- a/TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs +++ b/TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs @@ -18,7 +18,7 @@ internal static class FormKeys { internal const String MeterFieldName = "meter"; internal const String AmountFieldName = "amount"; internal const String UserNameFieldName = "username"; - internal const String PasswordFieldName = "password"; + internal const String FormPasswordFieldName = "password"; } internal static class Responses { @@ -217,7 +217,7 @@ private async Task HandleLastVendRequest(RequestType xlatedReques private async Task HandleLoginRequest(IFormCollection requestForm, CancellationToken cancellationToken){ String username = requestForm[FormKeys.UserNameFieldName].ToString(); - String password = requestForm[FormKeys.PasswordFieldName].ToString(); + String password = requestForm[FormKeys.FormPasswordFieldName].ToString(); using ResolvedDbContext? resolvedContext = this.ContextResolver.Resolve(Constants.PataPawaReadModelConfig); From 392dc97c2daa1059192a92a574901a659579c64e Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Wed, 1 Apr 2026 08:22:10 +0100 Subject: [PATCH 4/4] :( --- .../Controllers/PataPawaPrePaidController.cs | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs b/TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs index 8a0b8d9..b15cad0 100644 --- a/TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs +++ b/TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs @@ -13,14 +13,6 @@ using System.Threading; using System.Threading.Tasks; - internal static class FormKeys { - internal const String KeyFieldName = "key"; - internal const String MeterFieldName = "meter"; - internal const String AmountFieldName = "amount"; - internal const String UserNameFieldName = "username"; - internal const String FormPasswordFieldName = "password"; - } - internal static class Responses { internal const String Success = "success"; } @@ -170,8 +162,8 @@ private VendResponse CreateVendResponse(Database.PataPawa.Transaction transactio } private async Task HandleBalanceRequest(IFormCollection requestForm, CancellationToken cancellationToken){ - String username = requestForm[FormKeys.UserNameFieldName].ToString(); - String key = requestForm[FormKeys.KeyFieldName].ToString(); + String username = requestForm["username"].ToString(); + String key = requestForm["key"].ToString(); using ResolvedDbContext? resolvedContext = this.ContextResolver.Resolve(Constants.PataPawaReadModelConfig); @@ -186,7 +178,7 @@ private async Task HandleBalanceRequest(IFormCollection requestFo } private async Task HandleLastVendRequest(RequestType xlatedRequestType, IFormCollection requestForm, CancellationToken cancellationToken){ - String meter = requestForm[FormKeys.MeterFieldName].ToString(); + String meter = requestForm["meter"].ToString(); (PrePayMeter meterDetails, IActionResult result) meterValidation = await this.ValidateMeterDetails(meter, cancellationToken); if (meterValidation.result != null) @@ -216,8 +208,8 @@ private async Task HandleLastVendRequest(RequestType xlatedReques } private async Task HandleLoginRequest(IFormCollection requestForm, CancellationToken cancellationToken){ - String username = requestForm[FormKeys.UserNameFieldName].ToString(); - String password = requestForm[FormKeys.FormPasswordFieldName].ToString(); + String username = requestForm["username"].ToString(); + String password = requestForm["password"].ToString(); using ResolvedDbContext? resolvedContext = this.ContextResolver.Resolve(Constants.PataPawaReadModelConfig); @@ -241,7 +233,7 @@ private async Task HandleLoginRequest(IFormCollection requestForm } private async Task HandleMeterRequest(IFormCollection requestForm, CancellationToken cancellationToken){ - String meter = requestForm[FormKeys.MeterFieldName].ToString(); + String meter = requestForm["meter"].ToString(); (PrePayMeter meterDetails, IActionResult result) meterValidation = await this.ValidateMeterDetails(meter, cancellationToken); if (meterValidation.result != null) @@ -256,8 +248,8 @@ private async Task HandleMeterRequest(IFormCollection requestForm } private async Task HandleVendRequest(IFormCollection requestForm, CancellationToken cancellationToken){ - String meter = requestForm[FormKeys.MeterFieldName].ToString(); - String amount = requestForm[FormKeys.AmountFieldName].ToString(); + String meter = requestForm["meter"].ToString(); + String amount = requestForm["amount"].ToString(); (PrePayMeter meterDetails, IActionResult result) meterValidation = await this.ValidateMeterDetails(meter, cancellationToken); if (meterValidation.result != null)