Skip to content

Task/#104 net 10 upgrade #123

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

Task/#104 net 10 upgrade #123

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e46ba8e
more fixes
StuartFerguson Dec 8, 2025
3d2fecc
Merge branch 'task/#104_net_10_upgrade' of ssh://github.com/StuartFer…
StuartFerguson Dec 8, 2025
a3829f4
Merge branch 'master' into task/#104_net_10_upgrade
StuartFerguson Dec 8, 2025
e9e4e2f
:|
StuartFerguson Dec 8, 2025
3a1f63e
Merge branch 'task/#104_net_10_upgrade' of ssh://github.com/StuartFer…
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
41 changes: 26 additions & 15 deletions TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@
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";

Check failure on line 20 in TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

TestHosts/TestHosts/Controllers/PataPawaPrePaidController.cs#L20 

Hardcoded passwords are a security risk.
}

internal static class Responses {
internal const String Success = "success";
}

[Route("api/patapawaprepay")]
[ApiController]
public class PataPawaPrePaidController : ControllerBase{
Expand Down Expand Up @@ -86,7 +98,7 @@
Database.PataPawa.Transaction CreateSuccessfulTransaction(){
return new Database.PataPawa.Transaction{
Status = 0,
Messaage = "success",
Messaage = Responses.Success,
Vendor = "support",
MeterNumber = meter.MeterNumber,
ResultCode = "elec000",
Expand Down Expand Up @@ -126,7 +138,7 @@
}

private VendResponse CreateVendResponse(Database.PataPawa.Transaction transaction){
VendResponse response = new VendResponse{
VendResponse response = new() {
status = transaction.Status,
msg = transaction.Messaage,
transaction = new Transaction{
Expand Down Expand Up @@ -166,24 +178,23 @@
}

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

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

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

BalanceResponse response = new BalanceResponse{
BalanceResponse response = new() {
status = 0,
msg = "success",
msg = Responses.Success,
balance = user.Balance.ToString(),
};
return this.Ok(response);
}

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

(PrePayMeter meterDetails, IActionResult result) meterValidation = await this.ValidateMeterDetails(meter, cancellationToken);
if (meterValidation.result != null)
Expand Down Expand Up @@ -213,8 +224,8 @@
}

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

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

Expand All @@ -230,31 +241,31 @@

LoginResponse response = new LoginResponse{
status = 0,
msg = "success",
msg = Responses.Success,
balance = user.Balance.ToString(),
key = user.Key,
};
return this.Ok(response);
}

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

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

MeterResponse response = new() {
status = 0,
msg = "success",
msg = Responses.Success,
customerName = meterValidation.meterDetails.CustomerName
};
return this.Ok(response);
}

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

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