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

INT-193: Add FailedUrl filling (#43)

Browse Source
This commit is contained in:
Baikov Dmitrii 2022-07-28 04:46:42 -07:00 committed by GitHub
parent d72bb3eccd
commit ddea6b66c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 6 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>
<artifactId>adapter-flow-lib</artifactId>
<version>0.1.13</version>
<version>0.1.14</version>
<packaging>jar</packaging>
<name>adapter-flow-lib</name>

1
src/main/java/dev/vality/adapter/flow/lib/constant/OptionFields.java
View File

@ -4,5 +4,6 @@ public enum OptionFields {
STAGE,
CARD_HOLDER_FROM_FILE,
FAILED_URL
}

18
src/main/java/dev/vality/adapter/flow/lib/converter/entry/CtxToEntryModelConverter.java
View File

@ -4,14 +4,13 @@ import dev.vality.adapter.common.cds.CdsStorageClient;
import dev.vality.adapter.common.cds.model.CardDataProxyModel;
import dev.vality.adapter.common.damsel.ProxyProviderPackageCreators;
import dev.vality.adapter.common.damsel.ProxyProviderPackageExtractors;
import dev.vality.adapter.flow.lib.constant.MetaData;
import dev.vality.adapter.flow.lib.constant.Step;
import dev.vality.adapter.flow.lib.constant.TargetStatus;
import dev.vality.adapter.flow.lib.constant.*;
import dev.vality.adapter.flow.lib.model.*;
import dev.vality.adapter.flow.lib.serde.TemporaryContextDeserializer;
import dev.vality.adapter.flow.lib.service.CardDataService;
import dev.vality.adapter.flow.lib.service.IdGenerator;
import dev.vality.adapter.flow.lib.service.TemporaryContextService;
import dev.vality.adapter.flow.lib.utils.AdapterProperties;
import dev.vality.adapter.flow.lib.utils.CallbackUrlExtractor;
import dev.vality.adapter.flow.lib.utils.CardDataUtils;
import dev.vality.adapter.flow.lib.utils.TargetStatusResolver;
@ -24,6 +23,7 @@ import dev.vality.damsel.domain.TransactionInfo;
import dev.vality.damsel.proxy_provider.*;
import lombok.RequiredArgsConstructor;
import org.springframework.core.convert.converter.Converter;
import org.springframework.util.StringUtils;
import java.util.HashMap;
import java.util.Map;
@ -38,6 +38,7 @@ public class CtxToEntryModelConverter implements Converter<PaymentContext, Entry
private final TemporaryContextService temporaryContextService;
private final CallbackUrlExtractor callbackUrlExtractor;
private final CardDataService cardDataService;
private final AdapterProperties adapterProperties;
@Override
public EntryStateModel convert(PaymentContext context) {
@ -86,6 +87,7 @@ public class CtxToEntryModelConverter implements Converter<PaymentContext, Entry
.providerTrxId(trx != null ? trx.getId() : temporaryContext.getProviderTrxId())
.savedData(trx != null ? trx.getExtra() : new HashMap<>())
.successRedirectUrl(getSuccessRedirectUrl(payment, adapterConfigurations))
.failedRedirectUrl(getFailureRedirectUrl(payment, adapterConfigurations))
.threeDsDataFromMpiCallback(temporaryContext.getThreeDsData())
.build())
.targetStatus(targetStatus)
@ -106,6 +108,16 @@ public class CtxToEntryModelConverter implements Converter<PaymentContext, Entry
: null);
}
private String getFailureRedirectUrl(InvoicePayment payment, Map<String, String> adapterConfigurations) {
String redirectUrl = payment.isSetPayerSessionInfo()
? payment.getPayerSessionInfo().getRedirectUrl()
: null;
return StringUtils.hasText(redirectUrl)
? redirectUrl
: adapterConfigurations.getOrDefault(
OptionFields.FAILED_URL.name(), adapterProperties.getFailedRedirectUrl());
}
private dev.vality.adapter.flow.lib.model.CardData initCardData(PaymentContext context,
PaymentResource paymentResource,
SessionData sessionData) {

6
src/test/java/dev/vality/adapter/flow/lib/flow/config/HandlerConfig.java
View File

@ -101,13 +101,15 @@ public class HandlerConfig {
IdGenerator idGenerator,
TemporaryContextService temporaryContextService,
CallbackUrlExtractor callbackUrlExtractor,
CardDataServiceWithHolderNamesImpl cardDataService) {
CardDataServiceWithHolderNamesImpl cardDataService,
AdapterProperties adapterProperties) {
return new CtxToEntryModelConverter(cdsStorageClient,
adapterDeserializer,
idGenerator,
temporaryContextService,
callbackUrlExtractor,
cardDataService);
cardDataService,
adapterProperties);
}
@Bean