From 23c1665f0ec63648208283c0497d6077a73efdcd Mon Sep 17 00:00:00 2001
From: Egor Cherniak <cherniak3@yandex.ru>
Date: Mon, 5 Jun 2023 11:19:46 +0300
Subject: [PATCH] Add additional info + custom context (#68)

---
 pom.xml                                            |  2 +-
 .../ExitStateModelToTemporaryContextConverter.java |  1 +
 .../converter/entry/CtxToEntryModelConverter.java  | 14 ++++++++++++++
 .../flow/lib/handler/payment/DoNothingHandler.java |  1 +
 .../adapter/flow/lib/model/BaseRequestModel.java   |  8 ++++++++
 .../adapter/flow/lib/model/BaseResponseModel.java  |  4 ++++
 .../adapter/flow/lib/model/ExitStateModel.java     |  1 +
 .../adapter/flow/lib/model/TemporaryContext.java   |  1 +
 .../adapter/flow/lib/processor/ErrorProcessor.java |  1 +
 .../flow/lib/processor/RedirectProcessor.java      |  1 +
 .../adapter/flow/lib/processor/RetryProcessor.java |  1 +
 .../flow/lib/processor/SuccessFinishProcessor.java |  1 +
 12 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4332de0..da15417 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     </parent>
 
     <artifactId>adapter-flow-lib</artifactId>
-    <version>0.1.24</version>
+    <version>0.1.25</version>
     <packaging>jar</packaging>
 
     <name>adapter-flow-lib</name>
diff --git a/src/main/java/dev/vality/adapter/flow/lib/converter/ExitStateModelToTemporaryContextConverter.java b/src/main/java/dev/vality/adapter/flow/lib/converter/ExitStateModelToTemporaryContextConverter.java
index c4f97f0..bdb4aa4 100644
--- a/src/main/java/dev/vality/adapter/flow/lib/converter/ExitStateModelToTemporaryContextConverter.java
+++ b/src/main/java/dev/vality/adapter/flow/lib/converter/ExitStateModelToTemporaryContextConverter.java
@@ -12,6 +12,7 @@ public class ExitStateModelToTemporaryContextConverter implements Converter<Exit
                 .providerTrxId(source.getProviderTrxId())
                 .nextStep(source.getNextStep())
                 .pollingInfo(source.getPollingInfo())
+                .customContext(source.getCustomContext())
                 .build();
     }
 
diff --git a/src/main/java/dev/vality/adapter/flow/lib/converter/entry/CtxToEntryModelConverter.java b/src/main/java/dev/vality/adapter/flow/lib/converter/entry/CtxToEntryModelConverter.java
index 19cccd7..49ff494 100644
--- a/src/main/java/dev/vality/adapter/flow/lib/converter/entry/CtxToEntryModelConverter.java
+++ b/src/main/java/dev/vality/adapter/flow/lib/converter/entry/CtxToEntryModelConverter.java
@@ -17,6 +17,7 @@ import dev.vality.adapter.flow.lib.utils.TargetStatusResolver;
 import dev.vality.cds.storage.Auth3DS;
 import dev.vality.cds.storage.CardData;
 import dev.vality.cds.storage.SessionData;
+import dev.vality.damsel.domain.AdditionalTransactionInfo;
 import dev.vality.damsel.domain.BankCard;
 import dev.vality.damsel.domain.InvoiceDetails;
 import dev.vality.damsel.domain.TransactionInfo;
@@ -88,6 +89,7 @@ public class CtxToEntryModelConverter implements Converter<PaymentContext, Entry
                         .adapterConfigurations(adapterConfigurations)
                         .providerTrxId(trx != null ? trx.getId() : temporaryContext.getProviderTrxId())
                         .savedData(trx != null ? trx.getExtra() : new HashMap<>())
+                        .additionalTrxInfo(getAdditionalTrxInfo(context))
                         .successRedirectUrl(getSuccessRedirectUrl(payment, adapterConfigurations))
                         .failedRedirectUrl(getFailureRedirectUrl(payment, adapterConfigurations))
                         .threeDsDataFromMpiCallback(temporaryContext.getThreeDsData())
@@ -186,5 +188,17 @@ public class CtxToEntryModelConverter implements Converter<PaymentContext, Entry
         return cardDataService.getCardDataProxyModelFromCds(context);
     }
 
+    private AdditionalTrxInfo getAdditionalTrxInfo(PaymentContext context) {
+        TransactionInfo trx = context.getPaymentInfo().getPayment().getTrx();
+        if (trx == null || trx.getAdditionalInfo() == null) {
+            return null;
+        }
+        AdditionalTransactionInfo additionalTransactionInfo = trx.getAdditionalInfo();
+        return AdditionalTrxInfo.builder()
+                .approvalCode(additionalTransactionInfo.getApprovalCode())
+                .rrn(additionalTransactionInfo.getRrn())
+                .build();
+    }
+
 }
 
diff --git a/src/main/java/dev/vality/adapter/flow/lib/handler/payment/DoNothingHandler.java b/src/main/java/dev/vality/adapter/flow/lib/handler/payment/DoNothingHandler.java
index b5ecc39..f19b495 100644
--- a/src/main/java/dev/vality/adapter/flow/lib/handler/payment/DoNothingHandler.java
+++ b/src/main/java/dev/vality/adapter/flow/lib/handler/payment/DoNothingHandler.java
@@ -16,6 +16,7 @@ public class DoNothingHandler implements CommonHandler<ExitStateModel, EntryStat
         exitStateModel.setProviderTrxId(entryStateModel.getBaseRequestModel().getProviderTrxId());
         exitStateModel.setNextStep(Step.DO_NOTHING);
         exitStateModel.setTrxExtra(entryStateModel.getBaseRequestModel().getSavedData());
+        exitStateModel.setAdditionalTrxInfo(entryStateModel.getBaseRequestModel().getAdditionalTrxInfo());
         if (entryStateModel.getBaseRequestModel().getRecurrentPaymentData().isMakeRecurrent()) {
             exitStateModel.setRecToken(entryStateModel.getBaseRequestModel().getRecurrentPaymentData().getRecToken());
         }
diff --git a/src/main/java/dev/vality/adapter/flow/lib/model/BaseRequestModel.java b/src/main/java/dev/vality/adapter/flow/lib/model/BaseRequestModel.java
index 93229f6..8322743 100644
--- a/src/main/java/dev/vality/adapter/flow/lib/model/BaseRequestModel.java
+++ b/src/main/java/dev/vality/adapter/flow/lib/model/BaseRequestModel.java
@@ -86,10 +86,18 @@ public class BaseRequestModel {
      * Data that you send to save on previous steps.
      */
     private Map<String, String> savedData;
+    /**
+     * Additional trx info from previous steps.
+     */
+    private AdditionalTrxInfo additionalTrxInfo;
     /**
      * Data that comes in a callback from mpi after the 3ds step.
      * Parameter names can be unique to your implementation, only you can know.
      */
     private Map<String, String> threeDsDataFromMpiCallback;
+    /**
+     * Custom data for more flexibility
+     */
+    private byte[] customContext;
 
 }
diff --git a/src/main/java/dev/vality/adapter/flow/lib/model/BaseResponseModel.java b/src/main/java/dev/vality/adapter/flow/lib/model/BaseResponseModel.java
index fa4b969..f8c8899 100644
--- a/src/main/java/dev/vality/adapter/flow/lib/model/BaseResponseModel.java
+++ b/src/main/java/dev/vality/adapter/flow/lib/model/BaseResponseModel.java
@@ -42,5 +42,9 @@ public class BaseResponseModel {
      * Data for support about transactions.
      */
     private AdditionalTrxInfo additionalTrxInfo;
+    /**
+     * Custom data for more flexibility
+     */
+    private byte[] customContext;
 
 }
\ No newline at end of file
diff --git a/src/main/java/dev/vality/adapter/flow/lib/model/ExitStateModel.java b/src/main/java/dev/vality/adapter/flow/lib/model/ExitStateModel.java
index 50cfdd6..3ed2f01 100644
--- a/src/main/java/dev/vality/adapter/flow/lib/model/ExitStateModel.java
+++ b/src/main/java/dev/vality/adapter/flow/lib/model/ExitStateModel.java
@@ -29,6 +29,7 @@ public class ExitStateModel {
     private AdditionalTrxInfo additionalTrxInfo;
 
     private String recToken;
+    private byte[] customContext;
 
 
 }
\ No newline at end of file
diff --git a/src/main/java/dev/vality/adapter/flow/lib/model/TemporaryContext.java b/src/main/java/dev/vality/adapter/flow/lib/model/TemporaryContext.java
index 2da377c..41c8eac 100644
--- a/src/main/java/dev/vality/adapter/flow/lib/model/TemporaryContext.java
+++ b/src/main/java/dev/vality/adapter/flow/lib/model/TemporaryContext.java
@@ -18,5 +18,6 @@ public class TemporaryContext {
     private String providerTrxId;
     private PollingInfo pollingInfo;
     private Map<String, String> threeDsData;
+    private byte[] customContext;
 
 }
diff --git a/src/main/java/dev/vality/adapter/flow/lib/processor/ErrorProcessor.java b/src/main/java/dev/vality/adapter/flow/lib/processor/ErrorProcessor.java
index 7612173..ab7336f 100644
--- a/src/main/java/dev/vality/adapter/flow/lib/processor/ErrorProcessor.java
+++ b/src/main/java/dev/vality/adapter/flow/lib/processor/ErrorProcessor.java
@@ -21,6 +21,7 @@ public class ErrorProcessor implements Processor<ExitStateModel, BaseResponseMod
             exitStateModel.setErrorCode(String.valueOf(response.getErrorCode()));
             exitStateModel.setErrorMessage(response.getErrorMessage());
             exitStateModel.setAdditionalTrxInfo(response.getAdditionalTrxInfo());
+            exitStateModel.setCustomContext(response.getCustomContext());
             exitStateModel.setProviderTrxId(
                     StringUtils.hasText(response.getProviderTrxId())
                             ? response.getProviderTrxId()
diff --git a/src/main/java/dev/vality/adapter/flow/lib/processor/RedirectProcessor.java b/src/main/java/dev/vality/adapter/flow/lib/processor/RedirectProcessor.java
index 5ea04b9..ced8492 100644
--- a/src/main/java/dev/vality/adapter/flow/lib/processor/RedirectProcessor.java
+++ b/src/main/java/dev/vality/adapter/flow/lib/processor/RedirectProcessor.java
@@ -27,6 +27,7 @@ public class RedirectProcessor implements Processor<ExitStateModel, BaseResponse
             exitStateModel.setProviderTrxId(response.getProviderTrxId());
             exitStateModel.setTrxExtra(response.getSaveData());
             exitStateModel.setAdditionalTrxInfo(response.getAdditionalTrxInfo());
+            exitStateModel.setCustomContext(response.getCustomContext());
             log.debug("Finish redirect process response: {} entryStateModel: {}", response, entryStateModel);
             return exitStateModel;
         }
diff --git a/src/main/java/dev/vality/adapter/flow/lib/processor/RetryProcessor.java b/src/main/java/dev/vality/adapter/flow/lib/processor/RetryProcessor.java
index 3c2c656..ce1a243 100644
--- a/src/main/java/dev/vality/adapter/flow/lib/processor/RetryProcessor.java
+++ b/src/main/java/dev/vality/adapter/flow/lib/processor/RetryProcessor.java
@@ -28,6 +28,7 @@ public class RetryProcessor implements Processor<ExitStateModel, BaseResponseMod
                             : entryStateModel.getBaseRequestModel().getProviderTrxId());
             exitStateModel.setTrxExtra(response.getSaveData());
             exitStateModel.setAdditionalTrxInfo(response.getAdditionalTrxInfo());
+            exitStateModel.setCustomContext(response.getCustomContext());
             log.debug("Finish redirect process response: {} entryStateModel: {}", response, entryStateModel);
             return exitStateModel;
         }
diff --git a/src/main/java/dev/vality/adapter/flow/lib/processor/SuccessFinishProcessor.java b/src/main/java/dev/vality/adapter/flow/lib/processor/SuccessFinishProcessor.java
index 03d110b..8fd3603 100644
--- a/src/main/java/dev/vality/adapter/flow/lib/processor/SuccessFinishProcessor.java
+++ b/src/main/java/dev/vality/adapter/flow/lib/processor/SuccessFinishProcessor.java
@@ -31,6 +31,7 @@ public class SuccessFinishProcessor
                     : entryStateModel.getBaseRequestModel().getProviderTrxId());
             exitStateModel.setLastOperationStatus(response.getStatus());
             exitStateModel.setAdditionalTrxInfo(response.getAdditionalTrxInfo());
+            exitStateModel.setCustomContext(response.getCustomContext());
             Map<String, String> saveData = response.getSaveData();
             if (entryStateModel.getBaseRequestModel().getRecurrentPaymentData() != null
                     && entryStateModel.getBaseRequestModel().getRecurrentPaymentData().isMakeRecurrent()) {