Merge branch 'feature/add-observability' into 'release/0.0.1-RELEASE'

Feature/add observability

See merge request vusumuzik/qpay-transaction-manager-spring-boot!6

src/main/java/zw/qantra/tm/domain/dtos/BillPaymentDto.java

@@ -31,4 +31,6 @@ public class BillPaymentDto {
     private String creditPhone;
     private String billName;
     private String trace;
+    private String billProductName;
+    private String productUid;
 }

src/main/java/zw/qantra/tm/domain/services/processors/confirmations/EconetBroadbandConfirmationProcessor.java

@@ -0,0 +1,26 @@
+package zw.qantra.tm.domain.services.processors.confirmations;
+
+import lombok.RequiredArgsConstructor;
+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.dtos.BillPaymentDto;
+import zw.qantra.tm.domain.enums.RequestType;
+import zw.qantra.tm.domain.enums.Status;
+import zw.qantra.tm.domain.models.AdditionalData;
+import zw.qantra.tm.domain.models.Transaction;
+import zw.qantra.tm.domain.services.AdditionalDataService;
+import zw.qantra.tm.domain.services.TransactionService;
+import zw.qantra.tm.domain.services.processors.TransactionProcessorInterface;
+import zw.qantra.tm.rest.RestService;
+import zw.qantra.tm.utils.Utils;
+
+import java.util.LinkedHashMap;
+
+@Service("CONFIRM_ECONET_BROADBAND")
+public class EconetBroadbandConfirmationProcessor extends EconetConfirmationProcessor{
+    public EconetBroadbandConfirmationProcessor(RestService restService, TransactionService transactionService, AdditionalDataService additionalDataService) {
+        super(restService, transactionService, additionalDataService);
+    }
+}

src/main/java/zw/qantra/tm/domain/services/processors/confirmations/EconetConfirmationProcessor.java

@@ -55,6 +55,8 @@ public class EconetConfirmationProcessor implements TransactionProcessorInterfac
                 .creditAccount(transaction.getCreditAccount()) // customer's phone number
                 .creditPhone(transaction.getCreditPhone()) // customer's contact phone number
                 .billName(transaction.getBillName())
+                .billProductName(transaction.getBillProductName())
+                .productUid(transaction.getProductUid())
                 .build();
 
         String url = aggregatorUrl + "/merchant/aggregation/transaction";

src/main/java/zw/qantra/tm/domain/services/processors/confirmations/NetoneConfirmationProcessor.java

@@ -0,0 +1,13 @@
+package zw.qantra.tm.domain.services.processors.confirmations;
+
+import org.springframework.stereotype.Service;
+import zw.qantra.tm.domain.services.AdditionalDataService;
+import zw.qantra.tm.domain.services.TransactionService;
+import zw.qantra.tm.rest.RestService;
+
+@Service("CONFIRM_NETONE")
+public class NetoneConfirmationProcessor extends EconetConfirmationProcessor{
+    public NetoneConfirmationProcessor(RestService restService, TransactionService transactionService, AdditionalDataService additionalDataService) {
+        super(restService, transactionService, additionalDataService);
+    }
+}

src/main/java/zw/qantra/tm/domain/services/processors/integrations/StewardIntegrationProcessor.java

@@ -77,6 +77,8 @@ public class StewardIntegrationProcessor implements TransactionProcessorInterfac
                 .creditAccount(transaction.getCreditAccount()) // customer's zesa meter number
                 .creditPhone(transaction.getCreditPhone()) // customer's contact phone number
                 .billName(transaction.getBillName())
+                .billProductName(transaction.getBillProductName())
+                .productUid(transaction.getProductUid())
                 .build();
 
         if(Objects.equals(powertelClientId, transaction.getBillClientId())) {

src/main/java/zw/qantra/tm/domain/workflows/TransactionWorkflow.java

@@ -225,7 +225,8 @@ public class TransactionWorkflow extends WorkflowDefinition {
             // polling has already happened
             if(transaction.getPollingStatus() == Status.SUCCESS){
                 return NextAction.moveToState(DONE,
-                        "Polling already complete");
+                        "Purchase invoice payment generated - id: " + transaction.getErpPurchasePaymentRef() + ". " +
+                        "Not proceeding because polling already complete");
             }
             return NextAction.moveToState(PURCHASE_INVOICE_PAYMENT_SUCCESS,
                     "Purchase invoice payment generated - id: " + transaction.getErpPurchasePaymentRef());