From 760ccdd7465cdf5776651c8020c91f3766434f44 Mon Sep 17 00:00:00 2001
From: struga <kennny007@yandex.ru>
Date: Mon, 28 Feb 2022 15:56:26 +0300
Subject: [PATCH] Fix get card data (#5)

---
 pom.xml                                       |  2 +-
 .../entry/CtxToEntryModelConverter.java       | 55 +++++++++----------
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0066b61..1bfc86c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     </parent>
 
     <artifactId>adapter-flow-lib</artifactId>
-    <version>0.0.1</version>
+    <version>0.0.2</version>
     <packaging>jar</packaging>
 
     <name>adapter-flow-lib</name>
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 2b4118f..61f524d 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
@@ -45,8 +45,16 @@ public class CtxToEntryModelConverter implements Converter<PaymentContext, Entry
 
         Step currentStep = temporaryContext.getNextStep();
         TargetStatus targetStatus = TargetStatusResolver.extractTargetStatus(context.getSession().getTarget());
-        var cardData = initCardData(context, paymentResource, currentStep, targetStatus);
-        var mobilePaymentData = initMobilePaymentData(context, paymentResource, currentStep, targetStatus);
+
+        dev.vality.adapter.flow.lib.model.CardData cardData = null;
+        MobilePaymentData mobilePaymentData = null;
+        if (paymentResource.isSetDisposablePaymentResource()
+                && currentStep == null
+                && targetStatus == TargetStatus.PROCESSED) {
+            SessionData sessionData = cdsStorage.getSessionData(context);
+            cardData = initCardData(context, paymentResource, sessionData);
+            mobilePaymentData = initMobilePaymentData(sessionData);
+        }
 
         TransactionInfo trx = payment.getTrx();
         RecurrentPaymentData recurrentPaymentData = initRecurrentPaymentData(payment, paymentResource, trx);
@@ -84,42 +92,33 @@ public class CtxToEntryModelConverter implements Converter<PaymentContext, Entry
 
     private dev.vality.adapter.flow.lib.model.CardData initCardData(PaymentContext context,
                                                                     PaymentResource paymentResource,
-                                                                    Step currentStep,
-                                                                    TargetStatus targetStatus) {
+                                                                    SessionData sessionData) {
         var cardDataBuilder = dev.vality.adapter.flow.lib.model.CardData.builder();
-        if (paymentResource.isSetDisposablePaymentResource()
-                && currentStep == null
-                && targetStatus == TargetStatus.PROCESSED) {
-            SessionData sessionData = cdsStorage.getSessionData(context);
-            if (!sessionData.isSetAuthData()) {
-                CardDataProxyModel cardData = getCardData(context, paymentResource);
-                cardDataBuilder.cardHolder(cardData.getCardholderName())
-                        .pan(cardData.getPan())
-                        .cvv2(CardDataUtils.extractCvv2(sessionData))
-                        .expYear(cardData.getExpYear())
-                        .expMonth(cardData.getExpMonth());
-            }
+        if (!isMobilePay(sessionData)) {
+            CardDataProxyModel cardData = getCardData(context, paymentResource);
+            cardDataBuilder.cardHolder(cardData.getCardholderName())
+                    .pan(cardData.getPan())
+                    .cvv2(CardDataUtils.extractCvv2(sessionData))
+                    .expYear(cardData.getExpYear())
+                    .expMonth(cardData.getExpMonth());
         }
         return cardDataBuilder.build();
     }
 
-    private MobilePaymentData initMobilePaymentData(PaymentContext context,
-                                                    PaymentResource paymentResource,
-                                                    Step currentStep, TargetStatus targetStatus) {
+    private MobilePaymentData initMobilePaymentData(SessionData sessionData) {
         var mobilePaymentDataBuilder = MobilePaymentData.builder();
-        if (paymentResource.isSetDisposablePaymentResource()
-                && currentStep == null
-                && targetStatus == TargetStatus.PROCESSED) {
-            SessionData sessionData = cdsStorage.getSessionData(context);
-            if (sessionData.isSetAuthData() && sessionData.getAuthData().isSetAuth3ds()) {
-                Auth3DS auth3ds = sessionData.getAuthData().getAuth3ds();
-                mobilePaymentDataBuilder.cryptogram(auth3ds.getCryptogram())
-                        .eci(auth3ds.getEci());
-            }
+        if (isMobilePay(sessionData)) {
+            Auth3DS auth3ds = sessionData.getAuthData().getAuth3ds();
+            mobilePaymentDataBuilder.cryptogram(auth3ds.getCryptogram())
+                    .eci(auth3ds.getEci());
         }
         return mobilePaymentDataBuilder.build();
     }
 
+    private boolean isMobilePay(SessionData sessionData) {
+        return sessionData.isSetAuthData() && sessionData.getAuthData().isSetAuth3ds();
+    }
+
     private RefundData initRefundData(PaymentInfo paymentInfo) {
         RefundData refundData = null;
         if (paymentInfo.isSetRefund()) {