Skip to content

fix various codacy isses #682

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 1 commit into from
Aug 21, 2026
Merged

fix various codacy isses #682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 18 additions & 29 deletions TransactionProcessor.Mobile.BusinessLogic/Common/Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public static class Extensions
{
public static TransactionRecord ToTransactionRecord(this TransactionCommands.PerformLogonCommand request,
Boolean isTrainingMode) {
TransactionRecord transactionRecord = new TransactionRecord {
TransactionRecord transactionRecord = new() {
TransactionDateTime = request.TransactionDateTime,
TransactionType = 1,
IsTrainingMode = isTrainingMode
Expand All @@ -22,7 +22,7 @@ public static TransactionRecord ToTransactionRecord(this TransactionCommands.Per

public static TransactionRecord ToTransactionRecord(this TransactionCommands.PerformMobileTopupCommand request,
Boolean isTrainingMode) {
TransactionRecord transactionRecord = new TransactionRecord {
TransactionRecord transactionRecord = new() {
TransactionDateTime = request.TransactionDateTime,
TransactionType = 2,
Amount = request.TopupAmount,
Expand All @@ -38,7 +38,7 @@ public static TransactionRecord ToTransactionRecord(this TransactionCommands.Per
}

public static TransactionRecord ToTransactionRecord(this TransactionCommands.PerformVoucherIssueCommand request, Boolean isTrainingMode) {
TransactionRecord transactionRecord = new TransactionRecord {
TransactionRecord transactionRecord = new() {
TransactionDateTime = request.TransactionDateTime,
TransactionType = 2,
Amount = request.VoucherAmount,
Expand All @@ -55,8 +55,7 @@ public static TransactionRecord ToTransactionRecord(this TransactionCommands.Per
}

public static TransactionRecord ToTransactionRecord(this TransactionCommands.PerformBillPaymentGetAccountCommand request, Boolean isTrainingMode) {
TransactionRecord transactionRecord = new TransactionRecord
{
TransactionRecord transactionRecord = new() {
TransactionDateTime = request.TransactionDateTime,
TransactionType = 2,
Amount = 0,
Expand All @@ -70,8 +69,7 @@ public static TransactionRecord ToTransactionRecord(this TransactionCommands.Per
}

public static TransactionRecord ToTransactionRecord(this TransactionCommands.PerformBillPaymentMakePostPaymentCommand request, Boolean isTrainingMode) {
TransactionRecord transactionRecord = new TransactionRecord
{
TransactionRecord transactionRecord = new() {
TransactionDateTime = request.TransactionDateTime,
TransactionType = 2,
Amount = 0,
Expand All @@ -86,8 +84,7 @@ public static TransactionRecord ToTransactionRecord(this TransactionCommands.Per

public static TransactionRecord ToTransactionRecord(this TransactionCommands.PerformBillPaymentMakePrePaymentCommand request, Boolean isTrainingMode)
{
TransactionRecord transactionRecord = new TransactionRecord
{
TransactionRecord transactionRecord = new() {
TransactionDateTime = request.TransactionDateTime,
TransactionType = 2,
Amount = 0,
Expand All @@ -102,8 +99,7 @@ public static TransactionRecord ToTransactionRecord(this TransactionCommands.Per

public static TransactionRecord ToTransactionRecord(this TransactionCommands.PerformBillPaymentGetMeterCommand request, Boolean isTrainingMode)
{
TransactionRecord transactionRecord = new TransactionRecord
{
TransactionRecord transactionRecord = new() {
TransactionDateTime = request.TransactionDateTime,
TransactionType = 2,
Amount = 0,
Expand Down Expand Up @@ -169,8 +165,7 @@ public static TransactionRecord UpdateFrom(this TransactionRecord transactionRec

public static LogonTransactionRequestMessage ToLogonTransactionRequest(this PerformLogonRequestModel model)
{
LogonTransactionRequestMessage logonTransactionRequest = new LogonTransactionRequestMessage
{
LogonTransactionRequestMessage logonTransactionRequest = new() {
ApplicationVersion = model.ApplicationVersion,
DeviceIdentifier = model.DeviceIdentifier,
TransactionDateTime = model.TransactionDateTime,
Expand All @@ -182,8 +177,7 @@ public static LogonTransactionRequestMessage ToLogonTransactionRequest(this Perf

public static ReconciliationRequestMessage ToReconciliationRequest(this PerformReconciliationRequestModel model)
{
ReconciliationRequestMessage reconciliationRequest = new ReconciliationRequestMessage
{
ReconciliationRequestMessage reconciliationRequest = new() {
ApplicationVersion = model.ApplicationVersion,
TransactionDateTime = model.TransactionDateTime,
DeviceIdentifier = model.DeviceIdentifier,
Expand All @@ -207,8 +201,7 @@ public static ReconciliationRequestMessage ToReconciliationRequest(this PerformR

public static SaleTransactionRequestMessage ToSaleTransactionRequest(this PerformVoucherIssueRequestModel model)
{
SaleTransactionRequestMessage saleTransactionRequest = new SaleTransactionRequestMessage
{
SaleTransactionRequestMessage saleTransactionRequest = new() {
ProductId = model.ProductId,
OperatorId = model.OperatorId,
ApplicationVersion = model.ApplicationVersion,
Expand All @@ -231,8 +224,7 @@ public static SaleTransactionRequestMessage ToSaleTransactionRequest(this Perfor

public static SaleTransactionRequestMessage ToSaleTransactionRequest(this PerformMobileTopupRequestModel model)
{
SaleTransactionRequestMessage saleTransactionRequest = new SaleTransactionRequestMessage
{
SaleTransactionRequestMessage saleTransactionRequest = new() {
ProductId = model.ProductId,
OperatorId = model.OperatorId,
ApplicationVersion = model.ApplicationVersion,
Expand All @@ -253,8 +245,7 @@ public static SaleTransactionRequestMessage ToSaleTransactionRequest(this Perfor
}

public static SaleTransactionRequestMessage ToSaleTransactionRequest(this PerformBillPaymentGetAccountModel model) {
SaleTransactionRequestMessage saleTransactionRequest = new SaleTransactionRequestMessage
{
SaleTransactionRequestMessage saleTransactionRequest = new() {
ProductId = model.ProductId,
OperatorId = model.OperatorId,
ApplicationVersion = model.ApplicationVersion,
Expand All @@ -274,8 +265,7 @@ public static SaleTransactionRequestMessage ToSaleTransactionRequest(this Perfor

public static SaleTransactionRequestMessage ToSaleTransactionRequest(this PerformBillPaymentMakePaymentModel model)
{
SaleTransactionRequestMessage saleTransactionRequest = new SaleTransactionRequestMessage
{
SaleTransactionRequestMessage saleTransactionRequest = new() {
ProductId = model.ProductId,
OperatorId = model.OperatorId,
ApplicationVersion = model.ApplicationVersion,
Expand Down Expand Up @@ -308,8 +298,7 @@ public static SaleTransactionRequestMessage ToSaleTransactionRequest(this Perfor

public static SaleTransactionRequestMessage ToSaleTransactionRequest(this PerformBillPaymentGetMeterModel model)
{
SaleTransactionRequestMessage saleTransactionRequest = new SaleTransactionRequestMessage
{
SaleTransactionRequestMessage saleTransactionRequest = new() {
ProductId = model.ProductId,
OperatorId = model.OperatorId,
ApplicationVersion = model.ApplicationVersion,
Expand All @@ -331,7 +320,7 @@ public static T ExtractFieldFromMetadata<T>(this Dictionary<String, String> addi
String fieldName)
{
// Create a case insensitive version of the dictionary
Dictionary<String, String> caseInsensitiveDictionary = new Dictionary<String, String>(StringComparer.InvariantCultureIgnoreCase);
Dictionary<String, String> caseInsensitiveDictionary = new(StringComparer.InvariantCultureIgnoreCase);
foreach (KeyValuePair<String, String> keyValuePair in additionalTransactionMetadata)
{
caseInsensitiveDictionary.Add(keyValuePair.Key, keyValuePair.Value);
Expand All @@ -350,7 +339,7 @@ public static T ExtractFieldFromMetadata<T>(this Dictionary<String, String> addi

public static BillDetails ToBillDetails(this Dictionary<String, String> additionalTransactionMetadata)
{
BillDetails billDetails = new BillDetails();
BillDetails billDetails = new();

billDetails.AccountName = additionalTransactionMetadata.ExtractFieldFromMetadata<String>("customerAccountName");
billDetails.AccountNumber = additionalTransactionMetadata.ExtractFieldFromMetadata<String>("customerAccountNumber");
Expand All @@ -362,10 +351,10 @@ public static BillDetails ToBillDetails(this Dictionary<String, String> addition

public static MeterDetails ToMeterDetails(this Dictionary<String, String> additionalTransactionMetadata, String meterNumber)
{
MeterDetails meterDetails = new MeterDetails();
MeterDetails meterDetails = new();

meterDetails.MeterNumber = meterNumber;
meterDetails.CustomerName = additionalTransactionMetadata.ExtractFieldFromMetadata<String>("pataPawaPrePaidCustomerName"); ;
meterDetails.CustomerName = additionalTransactionMetadata.ExtractFieldFromMetadata<String>("pataPawaPrePaidCustomerName");

return meterDetails;
}
Expand Down
2 changes: 0 additions & 2 deletions TransactionProcessor.Mobile.BusinessLogic/RequestHandlers/MerchantRequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ public async Task<Result<MerchantDetailsModel>> Handle(MerchantQueries.GetMercha
IMerchantService merchantService = this.MerchantServiceResolver(useTrainingMode);

Result<MerchantDetailsModel> merchantDetails = await merchantService.GetMerchantDetails(cancellationToken);

//merchantDetails.Data.MerchantReportingId = 1;
if (merchantDetails.IsSuccess) {
this.ApplicationCache.SetMerchantDetails(merchantDetails.Data, BuildCacheEntryOptions());
}
Expand Down
29 changes: 19 additions & 10 deletions TransactionProcessor.Mobile.BusinessLogic/ViewModels/LoginPageViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,23 +281,28 @@
}

[ExcludeFromCodeCoverage]
private async void AccessTokenExpired(Object key,
private async Task AccessTokenExpired(Object key,
Object value,
EvictionReason reason,
Object state)
{
if (reason == EvictionReason.Expired || reason == EvictionReason.TokenExpired)
{
// access token has expired need to make another call to get new one
TokenResponseModel token = value as TokenResponseModel;
try {
if (reason == EvictionReason.Expired || reason == EvictionReason.TokenExpired) {
// access token has expired need to make another call to get new one
TokenResponseModel token = value as TokenResponseModel;

LogonCommands.RefreshTokenCommand command = new (token.RefreshToken);
Result<TokenResponseModel> newTokenResult = await this.Mediator.Send(command, CancellationToken.None);
LogonCommands.RefreshTokenCommand command = new(token.RefreshToken);
Result<TokenResponseModel> newTokenResult = await this.Mediator.Send(command, CancellationToken.None);

if (newTokenResult.IsSuccess) {
this.CacheAccessToken(newTokenResult.Data);
if (newTokenResult.IsSuccess) {
this.CacheAccessToken(newTokenResult.Data);
}
}
}
catch (Exception ex)
{
Logger.LogError("Failed to refresh access token after cache eviction.", ex);
}
}

private void CacheAccessToken(TokenResponseModel token)
Expand All @@ -312,7 +317,11 @@
// Force eviction to run
.AddExpirationToken(expirationToken)
// Add eviction callback
.RegisterPostEvictionCallback(callback:this.AccessTokenExpired);
.RegisterPostEvictionCallback(
(key, value, reason, state) =>
{
_ = AccessTokenExpired(key, value, reason, state);
}); ;

Check notice on line 324 in TransactionProcessor.Mobile.BusinessLogic/ViewModels/LoginPageViewModel.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

TransactionProcessor.Mobile.BusinessLogic/ViewModels/LoginPageViewModel.cs#L324 

Remove this empty statement.

this.ApplicationCache.SetAccessToken(token, cacheEntryOptions);
}
Expand Down
2 changes: 1 addition & 1 deletion TransactionProcessor.Mobile/UIServices/ApplicationInfoService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ public class ApplicationInfoService : IApplicationInfoService

public Version Version => AppInfo.Version;

public String VersionString => "1.0.5"; //AppInfo.VersionString;
public String VersionString => AppInfo.VersionString;
}
3 changes: 1 addition & 2 deletions TransactionProcessor.Mobile/UIServices/DeviceService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ public String GetIdentifier(){
String Id = deviceInformation.Id.ToString();
return Id.Replace("-","");;
#endif
return "stagingmerchant1device";
//return this.DeviceIdProvider.GetDeviceId().Replace("-","");
return this.DeviceIdProvider.GetDeviceId().Replace("-","");
}

public String GetModel()
Expand Down
Loading