valitydev/adapter-flow-lib
14
0
Fork 0
mirror of https://github.com/valitydev/adapter-flow-lib.git synced 2024-11-06 00:05:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add trxInfo for error flow (#67)

Browse Source 
* add trxInfo for error flow

* add trxInfo for error flow
This commit is contained in:
Anatolii Karlov 2023-05-18 20:12:16 +06:00 committed by GitHub
parent 540e49b59e
commit 4c10c52e06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -12,7 +12,7 @@
</parent> </parent>
<artifactId>adapter-flow-lib</artifactId> <artifactId>adapter-flow-lib</artifactId>
<version>0.1.23</version> <version>0.1.24</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>adapter-flow-lib</name> <name>adapter-flow-lib</name>

23
src/main/java/dev/vality/adapter/flow/lib/converter/exit/ExitModelToProxyResultConverter.java
View File

@ -28,23 +28,26 @@ public class ExitModelToProxyResultConverter implements Converter<ExitStateModel
@Override @Override
public PaymentProxyResult convert(ExitStateModel exitStateModel) { public PaymentProxyResult convert(ExitStateModel exitStateModel) {
if (StringUtils.hasText(exitStateModel.getErrorCode())) { if (StringUtils.hasText(exitStateModel.getErrorCode())) {
return new PaymentProxyResult(intentResultFactory.createFinishIntentFailed(exitStateModel)); return new PaymentProxyResult(intentResultFactory.createFinishIntentFailed(exitStateModel))
.setTrx(StringUtils.hasText(exitStateModel.getProviderTrxId())
? getTransactionInfo(exitStateModel)
: null);
} }
Intent intent = resultIntentResolver.initIntentByStep(exitStateModel); Intent intent = resultIntentResolver.initIntentByStep(exitStateModel);
return new PaymentProxyResult(intent) return new PaymentProxyResult(intent)
.setNextState(serializer.writeByte(contextConverter.convert(exitStateModel))) .setNextState(serializer.writeByte(contextConverter.convert(exitStateModel)))
.setTrx( .setTrx(getTransactionInfo(exitStateModel));
new TransactionInfo()
.setId(exitStateModel.getProviderTrxId())
.setExtra(exitStateModel.getTrxExtra() != null
? exitStateModel.getTrxExtra()
: new HashMap<>())
.setAdditionalInfo(AdditionalInfoUtils.initAdditionalTrxInfo(exitStateModel))
);
} }
private TransactionInfo getTransactionInfo(ExitStateModel exitStateModel) {
return new TransactionInfo()
.setId(exitStateModel.getProviderTrxId())
.setExtra(exitStateModel.getTrxExtra() != null
? exitStateModel.getTrxExtra()
: new HashMap<>())
.setAdditionalInfo(AdditionalInfoUtils.initAdditionalTrxInfo(exitStateModel));
}
} }

24
src/main/java/dev/vality/adapter/flow/lib/converter/exit/ExitModelToRecTokenProxyResultConverter.java
View File

@ -11,6 +11,7 @@ import dev.vality.damsel.proxy_provider.RecurrentTokenIntent;
import dev.vality.damsel.proxy_provider.RecurrentTokenProxyResult; import dev.vality.damsel.proxy_provider.RecurrentTokenProxyResult;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.converter.Converter;
import org.springframework.util.StringUtils;
import java.util.HashMap; import java.util.HashMap;
@ -28,23 +29,26 @@ public class ExitModelToRecTokenProxyResultConverter implements Converter<ExitSt
return new RecurrentTokenProxyResult( return new RecurrentTokenProxyResult(
recurrentIntentResultFactory.createFinishIntentFailed( recurrentIntentResultFactory.createFinishIntentFailed(
exitStateModel.getErrorCode(), exitStateModel.getErrorCode(),
exitStateModel.getErrorMessage()) exitStateModel.getErrorMessage()))
); .setTrx(StringUtils.hasText(exitStateModel.getProviderTrxId())
? getTransactionInfo(exitStateModel)
: null);
} }
RecurrentTokenIntent intent = recurrentResultIntentResolver.initIntentByStep(exitStateModel); RecurrentTokenIntent intent = recurrentResultIntentResolver.initIntentByStep(exitStateModel);
return new RecurrentTokenProxyResult(intent) return new RecurrentTokenProxyResult(intent)
.setNextState(serializer.writeByte(contextConverter.convert(exitStateModel))) .setNextState(serializer.writeByte(contextConverter.convert(exitStateModel)))
.setTrx( .setTrx(getTransactionInfo(exitStateModel));
new TransactionInfo()
.setId(exitStateModel.getProviderTrxId())
.setExtra(exitStateModel.getTrxExtra() != null
? exitStateModel.getTrxExtra()
: new HashMap<>())
.setAdditionalInfo(AdditionalInfoUtils.initAdditionalTrxInfo(exitStateModel))
);
} }
private TransactionInfo getTransactionInfo(ExitStateModel exitStateModel) {
return new TransactionInfo()
.setId(exitStateModel.getProviderTrxId())
.setExtra(exitStateModel.getTrxExtra() != null
? exitStateModel.getTrxExtra()
: new HashMap<>())
.setAdditionalInfo(AdditionalInfoUtils.initAdditionalTrxInfo(exitStateModel));
}
} }

5
src/main/java/dev/vality/adapter/flow/lib/processor/ErrorProcessor.java
View File

@ -6,6 +6,7 @@ import dev.vality.adapter.flow.lib.model.ExitStateModel;
import dev.vality.adapter.flow.lib.utils.ErrorUtils; import dev.vality.adapter.flow.lib.utils.ErrorUtils;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.util.StringUtils;
@Slf4j @Slf4j
@RequiredArgsConstructor @RequiredArgsConstructor
@ -20,6 +21,10 @@ public class ErrorProcessor implements Processor<ExitStateModel, BaseResponseMod
exitStateModel.setErrorCode(String.valueOf(response.getErrorCode())); exitStateModel.setErrorCode(String.valueOf(response.getErrorCode()));
exitStateModel.setErrorMessage(response.getErrorMessage()); exitStateModel.setErrorMessage(response.getErrorMessage());
exitStateModel.setAdditionalTrxInfo(response.getAdditionalTrxInfo()); exitStateModel.setAdditionalTrxInfo(response.getAdditionalTrxInfo());
exitStateModel.setProviderTrxId(
StringUtils.hasText(response.getProviderTrxId())
? response.getProviderTrxId()
: entryStateModel.getBaseRequestModel().getProviderTrxId());
log.debug("Finish error process response: {} entryStateModel: {}", response, entryStateModel); log.debug("Finish error process response: {} entryStateModel: {}", response, entryStateModel);
return exitStateModel; return exitStateModel;
} }