From 7c2237f9c6b3f1c3846aaceea30fda6d0599eb5a Mon Sep 17 00:00:00 2001
From: struga <kennny007@yandex.ru>
Date: Fri, 17 Jun 2022 21:28:15 +0300
Subject: [PATCH] Add trs id from respnse (#41)

---
 pom.xml                                                     | 2 +-
 .../vality/adapter/flow/lib/processor/RetryProcessor.java   | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8d78cbe..42db730 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     </parent>
 
     <artifactId>adapter-flow-lib</artifactId>
-    <version>0.1.11</version>
+    <version>0.1.12</version>
     <packaging>jar</packaging>
 
     <name>adapter-flow-lib</name>
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 692441b..3c2c656 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
@@ -7,6 +7,7 @@ import dev.vality.adapter.flow.lib.model.ExitStateModel;
 import dev.vality.adapter.flow.lib.utils.ErrorUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -21,7 +22,10 @@ public class RetryProcessor implements Processor<ExitStateModel, BaseResponseMod
             log.debug("Start redirect process response: {} entryStateModel: {}", response, entryStateModel);
             ExitStateModel exitStateModel = new ExitStateModel();
             exitStateModel.setLastOperationStatus(response.getStatus());
-            exitStateModel.setProviderTrxId(entryStateModel.getBaseRequestModel().getProviderTrxId());
+            exitStateModel.setProviderTrxId(
+                    StringUtils.hasText(response.getProviderTrxId())
+                            ? response.getProviderTrxId()
+                            : entryStateModel.getBaseRequestModel().getProviderTrxId());
             exitStateModel.setTrxExtra(response.getSaveData());
             exitStateModel.setAdditionalTrxInfo(response.getAdditionalTrxInfo());
             log.debug("Finish redirect process response: {} entryStateModel: {}", response, entryStateModel);