Skip to content

more fixes #152

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 5 commits into from
Apr 1, 2026
Merged

more fixes #152

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
161dbc8
more fixes
StuartFerguson Mar 31, 2026
0a7c2d3
try this
StuartFerguson Apr 1, 2026
72afb65
:\
StuartFerguson Apr 1, 2026
392dc97
:(
StuartFerguson Apr 1, 2026
0400939
Merge branch 'master' into task/#143_codact_password_issues
StuartFerguson Apr 1, 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
35 changes: 13 additions & 22 deletions TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
using System.Threading;
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 static class Responses {
internal const String Success = "success";
}
Expand All @@ -29,7 +21,6 @@
[ApiController]
public class PataPawaPrePaidController : ControllerBase{
private readonly IDbContextResolver<PataPawaContext> ContextResolver;
private const String PataPawaReadModelKey = "PataPawaReadModel";

#region Constructors

Expand Down Expand Up @@ -171,10 +162,10 @@
}

private async Task<IActionResult> HandleBalanceRequest(IFormCollection requestForm, CancellationToken cancellationToken){
String username = requestForm[FormKeys.UserName].ToString();
String key = requestForm[FormKeys.Key].ToString();
String username = requestForm["username"].ToString();
String key = requestForm["key"].ToString();

using ResolvedDbContext<PataPawaContext>? resolvedContext = this.ContextResolver.Resolve(PataPawaReadModelKey);
using ResolvedDbContext<PataPawaContext>? resolvedContext = this.ContextResolver.Resolve(Constants.PataPawaReadModelConfig);

PrePayUser user = await resolvedContext.Context.PrePayUsers.SingleOrDefaultAsync(u => u.UserName == username && u.Key == key, cancellationToken);

Expand All @@ -187,13 +178,13 @@
}

private async Task<IActionResult> HandleLastVendRequest(RequestType xlatedRequestType, IFormCollection requestForm, CancellationToken cancellationToken){
String meter = requestForm[FormKeys.Meter].ToString();
String meter = requestForm["meter"].ToString();

Check warning on line 181 in TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs#L181 

Define a constant instead of using this literal 'meter' 4 times.

(PrePayMeter meterDetails, IActionResult result) meterValidation = await this.ValidateMeterDetails(meter, cancellationToken);
if (meterValidation.result != null)
return meterValidation.result;

using ResolvedDbContext<PataPawaContext>? resolvedContext = this.ContextResolver.Resolve(PataPawaReadModelKey);
using ResolvedDbContext<PataPawaContext>? resolvedContext = this.ContextResolver.Resolve(Constants.PataPawaReadModelConfig);

IQueryable<Database.PataPawa.Transaction> transactions = resolvedContext.Context.Transactions.Where(t => t.MeterNumber == meter).AsQueryable();

Expand All @@ -217,10 +208,10 @@
}

private async Task<IActionResult> HandleLoginRequest(IFormCollection requestForm, CancellationToken cancellationToken){
String username = requestForm[FormKeys.UserName].ToString();
String password = requestForm[FormKeys.Password].ToString();
String username = requestForm["username"].ToString();
String password = requestForm["password"].ToString();

using ResolvedDbContext<PataPawaContext>? resolvedContext = this.ContextResolver.Resolve(PataPawaReadModelKey);
using ResolvedDbContext<PataPawaContext>? resolvedContext = this.ContextResolver.Resolve(Constants.PataPawaReadModelConfig);

PrePayUser user = await resolvedContext.Context.PrePayUsers.SingleOrDefaultAsync(u => u.UserName == username && u.Password == password, cancellationToken);

Expand All @@ -242,7 +233,7 @@
}

private async Task<IActionResult> HandleMeterRequest(IFormCollection requestForm, CancellationToken cancellationToken){
String meter = requestForm[FormKeys.Meter].ToString();
String meter = requestForm["meter"].ToString();

(PrePayMeter meterDetails, IActionResult result) meterValidation = await this.ValidateMeterDetails(meter, cancellationToken);
if (meterValidation.result != null)
Expand All @@ -257,14 +248,14 @@
}

private async Task<IActionResult> HandleVendRequest(IFormCollection requestForm, CancellationToken cancellationToken){
String meter = requestForm[FormKeys.Meter].ToString();
String amount = requestForm[FormKeys.Amount].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)
return meterValidation.result;

using ResolvedDbContext<PataPawaContext>? resolvedContext = this.ContextResolver.Resolve(PataPawaReadModelKey);
using ResolvedDbContext<PataPawaContext>? resolvedContext = this.ContextResolver.Resolve(Constants.PataPawaReadModelConfig);

Database.PataPawa.Transaction transaction = this.CreateTransactionRecord(amount, meterValidation.meterDetails);

Expand Down Expand Up @@ -312,7 +303,7 @@
}));
}

using ResolvedDbContext<PataPawaContext>? resolvedContext = this.ContextResolver.Resolve(PataPawaReadModelKey);
using ResolvedDbContext<PataPawaContext>? resolvedContext = this.ContextResolver.Resolve(Constants.PataPawaReadModelConfig);

PrePayMeter meterDetails = await resolvedContext.Context.PrePayMeters.SingleOrDefaultAsync(m => m.MeterNumber == meterNumber, cancellationToken);

Expand Down
Loading