status fixes
This commit is contained in:
@@ -2,6 +2,7 @@ package zw.qantra.tm.domain.controllers;
|
|||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import net.kaczmarzyk.spring.data.jpa.domain.Equal;
|
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.And;
|
||||||
import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
|
import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
@@ -27,6 +28,7 @@ public class PaymentProcessorController {
|
|||||||
public ResponseEntity getAllPaymentProcessors(
|
public ResponseEntity getAllPaymentProcessors(
|
||||||
@And({
|
@And({
|
||||||
@Spec(path = "label", spec = Equal.class),
|
@Spec(path = "label", spec = Equal.class),
|
||||||
|
@Spec(path = "label", params = "labelIn", paramSeparator = ',', spec = In.class),
|
||||||
@Spec(path = "currency", spec = Equal.class),
|
@Spec(path = "currency", spec = Equal.class),
|
||||||
})Specification<PaymentProcessor> specification, Pageable pageable) {
|
})Specification<PaymentProcessor> specification, Pageable pageable) {
|
||||||
return ResponseEntity.ok(paymentProcessorService.getAllPaymentProcessors(specification, pageable));
|
return ResponseEntity.ok(paymentProcessorService.getAllPaymentProcessors(specification, pageable));
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import lombok.RequiredArgsConstructor;
|
|||||||
import org.apache.commons.lang3.RandomStringUtils;
|
import org.apache.commons.lang3.RandomStringUtils;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import zw.qantra.tm.domain.enums.Status;
|
import zw.qantra.tm.domain.enums.Status;
|
||||||
import zw.qantra.tm.domain.models.Transaction;
|
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.TransactionService;
|
||||||
import zw.qantra.tm.domain.services.VelocityPaymentService;
|
import zw.qantra.tm.domain.services.VelocityPaymentService;
|
||||||
import zw.qantra.tm.domain.services.processors.TransactionProcessorInterface;
|
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")
|
@Service("REQUEST_WALLET_REMOTE")
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@@ -32,6 +26,7 @@ public class CityWalletRemotePaymentProcessor implements TransactionProcessorInt
|
|||||||
|
|
||||||
if(settingService.getBooleanSetting("SIMULATE_WALLET_SUCCESS")) {
|
if(settingService.getBooleanSetting("SIMULATE_WALLET_SUCCESS")) {
|
||||||
transaction.setStatus(Status.SUCCESS);
|
transaction.setStatus(Status.SUCCESS);
|
||||||
|
transaction.setPaymentStatus(Status.SUCCESS);
|
||||||
transaction.setResponseCode("02");
|
transaction.setResponseCode("02");
|
||||||
transaction.setPaymentProcessorRef(RandomStringUtils.randomNumeric(10));
|
transaction.setPaymentProcessorRef(RandomStringUtils.randomNumeric(10));
|
||||||
transaction.setDebitRef(RandomStringUtils.randomNumeric(10));
|
transaction.setDebitRef(RandomStringUtils.randomNumeric(10));
|
||||||
@@ -65,6 +60,7 @@ public class CityWalletRemotePaymentProcessor implements TransactionProcessorInt
|
|||||||
|
|
||||||
if(settingService.getBooleanSetting("SIMULATE_WALLET_SUCCESS")) {
|
if(settingService.getBooleanSetting("SIMULATE_WALLET_SUCCESS")) {
|
||||||
transaction.setStatus(Status.SUCCESS);
|
transaction.setStatus(Status.SUCCESS);
|
||||||
|
transaction.setPollingStatus(Status.SUCCESS);
|
||||||
transaction.setResponseCode("02");
|
transaction.setResponseCode("02");
|
||||||
transaction.setTargetUrl("/home");
|
transaction.setTargetUrl("/home");
|
||||||
return transaction;
|
return transaction;
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import java.nio.charset.StandardCharsets;
|
|||||||
import org.apache.commons.lang3.RandomStringUtils;
|
import org.apache.commons.lang3.RandomStringUtils;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
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.TransactionService;
|
||||||
import zw.qantra.tm.domain.services.VelocityPaymentService;
|
import zw.qantra.tm.domain.services.VelocityPaymentService;
|
||||||
import zw.qantra.tm.domain.services.processors.TransactionProcessorInterface;
|
import zw.qantra.tm.domain.services.processors.TransactionProcessorInterface;
|
||||||
import zw.qantra.tm.rest.RestService;
|
|
||||||
|
|
||||||
@Service("REQUEST_ECOCASH_REMOTE")
|
@Service("REQUEST_ECOCASH_REMOTE")
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@@ -33,6 +31,7 @@ public class EcocashRemotePaymentProcessor implements TransactionProcessorInterf
|
|||||||
|
|
||||||
if(settingService.getBooleanSetting("SIMULATE_ECOCASH_SUCCESS")) {
|
if(settingService.getBooleanSetting("SIMULATE_ECOCASH_SUCCESS")) {
|
||||||
transaction.setStatus(Status.SUCCESS);
|
transaction.setStatus(Status.SUCCESS);
|
||||||
|
transaction.setPaymentStatus(Status.SUCCESS);
|
||||||
transaction.setResponseCode("02");
|
transaction.setResponseCode("02");
|
||||||
transaction.setPaymentProcessorRef(RandomStringUtils.randomNumeric(10));
|
transaction.setPaymentProcessorRef(RandomStringUtils.randomNumeric(10));
|
||||||
transaction.setDebitRef(RandomStringUtils.randomNumeric(10));
|
transaction.setDebitRef(RandomStringUtils.randomNumeric(10));
|
||||||
@@ -66,6 +65,7 @@ public class EcocashRemotePaymentProcessor implements TransactionProcessorInterf
|
|||||||
|
|
||||||
if(settingService.getBooleanSetting("SIMULATE_ECOCASH_SUCCESS")) {
|
if(settingService.getBooleanSetting("SIMULATE_ECOCASH_SUCCESS")) {
|
||||||
transaction.setStatus(Status.SUCCESS);
|
transaction.setStatus(Status.SUCCESS);
|
||||||
|
transaction.setPollingStatus(Status.SUCCESS);
|
||||||
transaction.setResponseCode("02");
|
transaction.setResponseCode("02");
|
||||||
transaction.setTargetUrl("/home");
|
transaction.setTargetUrl("/home");
|
||||||
return transaction;
|
return transaction;
|
||||||
|
|||||||
@@ -4,28 +4,17 @@ import lombok.RequiredArgsConstructor;
|
|||||||
import org.apache.commons.lang3.RandomStringUtils;
|
import org.apache.commons.lang3.RandomStringUtils;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.http.HttpHeaders;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import zw.qantra.tm.domain.dtos.SdkActionDto;
|
|
||||||
import zw.qantra.tm.domain.enums.Status;
|
import zw.qantra.tm.domain.enums.Status;
|
||||||
import zw.qantra.tm.domain.models.Transaction;
|
import zw.qantra.tm.domain.models.Transaction;
|
||||||
import zw.qantra.tm.domain.services.SettingService;
|
import zw.qantra.tm.domain.services.SettingService;
|
||||||
import zw.qantra.tm.domain.services.TransactionService;
|
import zw.qantra.tm.domain.services.TransactionService;
|
||||||
import zw.qantra.tm.domain.services.VelocityPaymentService;
|
import zw.qantra.tm.domain.services.VelocityPaymentService;
|
||||||
import zw.qantra.tm.domain.services.processors.TransactionProcessorInterface;
|
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.nio.charset.StandardCharsets;
|
||||||
import java.security.MessageDigest;
|
import java.security.MessageDigest;
|
||||||
import java.security.NoSuchAlgorithmException;
|
import java.security.NoSuchAlgorithmException;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
@Service("REQUEST_MPGS_WEB")
|
@Service("REQUEST_MPGS_WEB")
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@@ -41,6 +30,7 @@ public class MPGSWebPaymentProcessor implements TransactionProcessorInterface {
|
|||||||
|
|
||||||
if(settingService.getBooleanSetting("SIMULATE_MPGS_SUCCESS")) {
|
if(settingService.getBooleanSetting("SIMULATE_MPGS_SUCCESS")) {
|
||||||
transaction.setStatus(Status.SUCCESS);
|
transaction.setStatus(Status.SUCCESS);
|
||||||
|
transaction.setPaymentStatus(Status.SUCCESS);
|
||||||
transaction.setResponseCode("02");
|
transaction.setResponseCode("02");
|
||||||
transaction.setPaymentProcessorRef(RandomStringUtils.randomNumeric(10));
|
transaction.setPaymentProcessorRef(RandomStringUtils.randomNumeric(10));
|
||||||
transaction.setDebitRef(RandomStringUtils.randomNumeric(10));
|
transaction.setDebitRef(RandomStringUtils.randomNumeric(10));
|
||||||
|
|||||||
Reference in New Issue
Block a user