From e634ff11c7ac2fab4c60ee81c5682ffd87b3da2a Mon Sep 17 00:00:00 2001 From: Vusa Date: Mon, 29 Jun 2026 17:46:34 +0200 Subject: [PATCH] status fixes --- .../controllers/PaymentProcessorController.java | 2 ++ .../payments/CityWalletRemotePaymentProcessor.java | 8 ++------ .../payments/EcocashRemotePaymentProcessor.java | 4 ++-- .../processors/payments/MPGSWebPaymentProcessor.java | 12 +----------- 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/main/java/zw/qantra/tm/domain/controllers/PaymentProcessorController.java b/src/main/java/zw/qantra/tm/domain/controllers/PaymentProcessorController.java index fe6a1fb..9298b33 100644 --- a/src/main/java/zw/qantra/tm/domain/controllers/PaymentProcessorController.java +++ b/src/main/java/zw/qantra/tm/domain/controllers/PaymentProcessorController.java @@ -2,6 +2,7 @@ package zw.qantra.tm.domain.controllers; import lombok.RequiredArgsConstructor; import net.kaczmarzyk.spring.data.jpa.domain.Equal; +import net.kaczmarzyk.spring.data.jpa.domain.In; import net.kaczmarzyk.spring.data.jpa.web.annotation.And; import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; import org.springframework.data.domain.Page; @@ -27,6 +28,7 @@ public class PaymentProcessorController { public ResponseEntity getAllPaymentProcessors( @And({ @Spec(path = "label", spec = Equal.class), + @Spec(path = "label", params = "labelIn", paramSeparator = ',', spec = In.class), @Spec(path = "currency", spec = Equal.class), })Specification specification, Pageable pageable) { return ResponseEntity.ok(paymentProcessorService.getAllPaymentProcessors(specification, pageable)); diff --git a/src/main/java/zw/qantra/tm/domain/services/processors/payments/CityWalletRemotePaymentProcessor.java b/src/main/java/zw/qantra/tm/domain/services/processors/payments/CityWalletRemotePaymentProcessor.java index 07a8087..ad804ed 100644 --- a/src/main/java/zw/qantra/tm/domain/services/processors/payments/CityWalletRemotePaymentProcessor.java +++ b/src/main/java/zw/qantra/tm/domain/services/processors/payments/CityWalletRemotePaymentProcessor.java @@ -4,7 +4,6 @@ import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.RandomStringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import zw.qantra.tm.domain.enums.Status; import zw.qantra.tm.domain.models.Transaction; @@ -12,11 +11,6 @@ import zw.qantra.tm.domain.services.SettingService; import zw.qantra.tm.domain.services.TransactionService; import zw.qantra.tm.domain.services.VelocityPaymentService; import zw.qantra.tm.domain.services.processors.TransactionProcessorInterface; -import zw.qantra.tm.rest.RestService; - -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; @Service("REQUEST_WALLET_REMOTE") @RequiredArgsConstructor @@ -32,6 +26,7 @@ public class CityWalletRemotePaymentProcessor implements TransactionProcessorInt if(settingService.getBooleanSetting("SIMULATE_WALLET_SUCCESS")) { transaction.setStatus(Status.SUCCESS); + transaction.setPaymentStatus(Status.SUCCESS); transaction.setResponseCode("02"); transaction.setPaymentProcessorRef(RandomStringUtils.randomNumeric(10)); transaction.setDebitRef(RandomStringUtils.randomNumeric(10)); @@ -65,6 +60,7 @@ public class CityWalletRemotePaymentProcessor implements TransactionProcessorInt if(settingService.getBooleanSetting("SIMULATE_WALLET_SUCCESS")) { transaction.setStatus(Status.SUCCESS); + transaction.setPollingStatus(Status.SUCCESS); transaction.setResponseCode("02"); transaction.setTargetUrl("/home"); return transaction; diff --git a/src/main/java/zw/qantra/tm/domain/services/processors/payments/EcocashRemotePaymentProcessor.java b/src/main/java/zw/qantra/tm/domain/services/processors/payments/EcocashRemotePaymentProcessor.java index cf3acb5..cfb48a2 100644 --- a/src/main/java/zw/qantra/tm/domain/services/processors/payments/EcocashRemotePaymentProcessor.java +++ b/src/main/java/zw/qantra/tm/domain/services/processors/payments/EcocashRemotePaymentProcessor.java @@ -7,7 +7,6 @@ import java.nio.charset.StandardCharsets; import org.apache.commons.lang3.RandomStringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import lombok.RequiredArgsConstructor; @@ -17,7 +16,6 @@ import zw.qantra.tm.domain.services.SettingService; import zw.qantra.tm.domain.services.TransactionService; import zw.qantra.tm.domain.services.VelocityPaymentService; import zw.qantra.tm.domain.services.processors.TransactionProcessorInterface; -import zw.qantra.tm.rest.RestService; @Service("REQUEST_ECOCASH_REMOTE") @RequiredArgsConstructor @@ -33,6 +31,7 @@ public class EcocashRemotePaymentProcessor implements TransactionProcessorInterf if(settingService.getBooleanSetting("SIMULATE_ECOCASH_SUCCESS")) { transaction.setStatus(Status.SUCCESS); + transaction.setPaymentStatus(Status.SUCCESS); transaction.setResponseCode("02"); transaction.setPaymentProcessorRef(RandomStringUtils.randomNumeric(10)); transaction.setDebitRef(RandomStringUtils.randomNumeric(10)); @@ -66,6 +65,7 @@ public class EcocashRemotePaymentProcessor implements TransactionProcessorInterf if(settingService.getBooleanSetting("SIMULATE_ECOCASH_SUCCESS")) { transaction.setStatus(Status.SUCCESS); + transaction.setPollingStatus(Status.SUCCESS); transaction.setResponseCode("02"); transaction.setTargetUrl("/home"); return transaction; diff --git a/src/main/java/zw/qantra/tm/domain/services/processors/payments/MPGSWebPaymentProcessor.java b/src/main/java/zw/qantra/tm/domain/services/processors/payments/MPGSWebPaymentProcessor.java index ddd7ef3..b8b0eae 100644 --- a/src/main/java/zw/qantra/tm/domain/services/processors/payments/MPGSWebPaymentProcessor.java +++ b/src/main/java/zw/qantra/tm/domain/services/processors/payments/MPGSWebPaymentProcessor.java @@ -4,28 +4,17 @@ import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.RandomStringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpHeaders; import org.springframework.stereotype.Service; -import zw.qantra.tm.domain.dtos.SdkActionDto; import zw.qantra.tm.domain.enums.Status; import zw.qantra.tm.domain.models.Transaction; import zw.qantra.tm.domain.services.SettingService; import zw.qantra.tm.domain.services.TransactionService; import zw.qantra.tm.domain.services.VelocityPaymentService; import zw.qantra.tm.domain.services.processors.TransactionProcessorInterface; -import zw.qantra.tm.rest.RestService; -import zw.qantra.tm.utils.Utils; -import java.math.BigDecimal; -import java.math.BigInteger; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Random; @Service("REQUEST_MPGS_WEB") @RequiredArgsConstructor @@ -41,6 +30,7 @@ public class MPGSWebPaymentProcessor implements TransactionProcessorInterface { if(settingService.getBooleanSetting("SIMULATE_MPGS_SUCCESS")) { transaction.setStatus(Status.SUCCESS); + transaction.setPaymentStatus(Status.SUCCESS); transaction.setResponseCode("02"); transaction.setPaymentProcessorRef(RandomStringUtils.randomNumeric(10)); transaction.setDebitRef(RandomStringUtils.randomNumeric(10));