Skip to content

more fixes #122

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 2 commits into from
Dec 8, 2025
Merged

more fixes #122

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1237098
more fixes
StuartFerguson Dec 8, 2025
eaa1c34
Merge branch 'master' into task/#104_net_10_upgrade
StuartFerguson Dec 8, 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
26 changes: 7 additions & 19 deletions TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,7 @@
public class PataPawaPrePaidController : ControllerBase{
private readonly IDbContextResolver<PataPawaContext> ContextResolver;
private const String PataPawaReadModelKey = "PataPawaReadModel";
#region Fields

//private List<(String username, String password, String key, String balance)> users = new();

#endregion


#region Constructors

public PataPawaPrePaidController(IDbContextResolver<PataPawaContext> contextResolver) {
Expand Down Expand Up @@ -179,7 +174,7 @@ private async Task<IActionResult> HandleBalanceRequest(IFormCollection requestFo

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

var response = new BalanceResponse{
BalanceResponse response = new BalanceResponse{
status = 0,
msg = "success",
balance = user.Balance.ToString(),
Expand All @@ -188,8 +183,6 @@ private async Task<IActionResult> HandleBalanceRequest(IFormCollection requestFo
}

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

(PrePayMeter meterDetails, IActionResult result) meterValidation = await this.ValidateMeterDetails(meter, cancellationToken);
Expand All @@ -207,7 +200,7 @@ private async Task<IActionResult> HandleLastVendRequest(RequestType xlatedReques
Database.PataPawa.Transaction transaction = await transactions.OrderByDescending(t => t.Date).SingleOrDefaultAsync(cancellationToken);

if (transaction == null){
VendResponse response = new VendResponse{
VendResponse response = new() {
status = 0,
msg = "Record not found"
};
Expand All @@ -228,7 +221,7 @@ private async Task<IActionResult> HandleLoginRequest(IFormCollection requestForm
PrePayUser user = await resolvedContext.Context.PrePayUsers.SingleOrDefaultAsync(u => u.UserName == username && u.Password == password, cancellationToken);

if (user == default){
LoginResponse errorResponse = new LoginResponse{
LoginResponse errorResponse = new() {
status = 1,
msg = "Wrong Username or Password"
};
Expand All @@ -245,15 +238,13 @@ private async Task<IActionResult> HandleLoginRequest(IFormCollection requestForm
}

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

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

MeterResponse response = new MeterResponse{
MeterResponse response = new() {
status = 0,
msg = "success",
customerName = meterValidation.meterDetails.CustomerName
Expand All @@ -262,11 +253,8 @@ private async Task<IActionResult> HandleMeterRequest(IFormCollection requestForm
}

private async Task<IActionResult> HandleVendRequest(IFormCollection requestForm, CancellationToken cancellationToken){
String username = requestForm["username"].ToString();
String meter = requestForm["meter"].ToString();
String key = requestForm["key"].ToString();
String amount = requestForm["amount"].ToString();
String customerName = requestForm["customerName"].ToString();

(PrePayMeter meterDetails, IActionResult result) meterValidation = await this.ValidateMeterDetails(meter, cancellationToken);
if (meterValidation.result != null)
Expand Down Expand Up @@ -325,11 +313,11 @@ private RequestType TranslateRequestType(String formRequest){
PrePayMeter meterDetails = await resolvedContext.Context.PrePayMeters.SingleOrDefaultAsync(m => m.MeterNumber == meterNumber, cancellationToken);

if (meterDetails == default){
MeterResponse errorReponse = new MeterResponse{
MeterResponse errorResponse = new() {
status = 1,
msg = "Meter number not found"
};
return (null, this.Ok(errorReponse));
return (null, this.Ok(errorResponse));
}

return (meterDetails, null);
Expand Down
Loading