From b3ec9753e7b8dae04dd4f735783a378aa996d2ca Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Thu, 28 Aug 2025 18:17:18 +0300 Subject: [PATCH 1/3] Up libs --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d268936..ff03e52 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ dev.vality service-parent-pom - 3.1.6 + 3.1.7 fraudbusters From d9e7c82e3e820d1261cb02ff9ea949b42c5fa550 Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Thu, 28 Aug 2025 18:19:15 +0300 Subject: [PATCH 2/3] Up libs --- .../converter/ContextToFraudRequestConverter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/dev/vality/fraudbusters/converter/ContextToFraudRequestConverter.java b/src/main/java/dev/vality/fraudbusters/converter/ContextToFraudRequestConverter.java index 9360476..78dbd77 100644 --- a/src/main/java/dev/vality/fraudbusters/converter/ContextToFraudRequestConverter.java +++ b/src/main/java/dev/vality/fraudbusters/converter/ContextToFraudRequestConverter.java @@ -31,7 +31,7 @@ public FraudRequest convert(Context context) { PaymentModel paymentModel = new PaymentModel(); PaymentInfo payment = context.getPayment(); Party party = payment.getParty(); - paymentModel.setPartyId(party.getPartyId()); + paymentModel.setPartyId(party.getPartyRef().getId()); Payer payer = context.getPayment().getPayment().getPayer(); PayerFieldExtractor.getBankCard(payer) .ifPresent(bankCard -> { @@ -56,7 +56,7 @@ public FraudRequest convert(Context context) { } ); - paymentModel.setShopId(payment.getShop().getId()); + paymentModel.setShopId(payment.getShop().getShopRef().getId()); Cash cost = payment.getPayment().getCost(); paymentModel.setAmount(cost.getAmount()); paymentModel.setCurrency(cost.getCurrency().symbolic_code); From 8529db5a1e56a3cc39ae61ec8bd43911b324ae0e Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Thu, 28 Aug 2025 18:22:51 +0300 Subject: [PATCH 3/3] Up libs --- .../fraudbusters/EndToEndIntegrationTest.java | 8 +++++--- .../dev/vality/fraudbusters/util/BeanUtil.java | 16 ++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/test/java/dev/vality/fraudbusters/EndToEndIntegrationTest.java b/src/test/java/dev/vality/fraudbusters/EndToEndIntegrationTest.java index d391c1d..db98013 100644 --- a/src/test/java/dev/vality/fraudbusters/EndToEndIntegrationTest.java +++ b/src/test/java/dev/vality/fraudbusters/EndToEndIntegrationTest.java @@ -1,7 +1,9 @@ package dev.vality.fraudbusters; import dev.vality.columbus.ColumbusServiceSrv; +import dev.vality.damsel.domain.PartyConfigRef; import dev.vality.damsel.domain.RiskScore; +import dev.vality.damsel.domain.ShopConfigRef; import dev.vality.damsel.fraudbusters.*; import dev.vality.damsel.proxy_inspector.Context; import dev.vality.damsel.proxy_inspector.InspectorProxySrv; @@ -220,8 +222,8 @@ private void testFraudRules() throws URISyntaxException, InterruptedException, T //test chargeback functions String chargeTest = "charge-test"; context = BeanUtil.createContext(chargeTest); - context.getPayment().getShop().setId(chargeTest); - context.getPayment().getParty().setPartyId(chargeTest); + context.getPayment().getShop().setShopRef(new ShopConfigRef(chargeTest)); + context.getPayment().getParty().setPartyRef(new PartyConfigRef(chargeTest)); riskScore = client.inspectPayment(context); assertEquals(RiskScore.high, riskScore); @@ -236,7 +238,7 @@ private void testFraudRules() throws URISyntaxException, InterruptedException, T //test refund functions String refundShopId = "refund-test"; - context.getPayment().getShop().setId(refundShopId); + context.getPayment().getShop().setShopRef(new ShopConfigRef(refundShopId)); riskScore = client.inspectPayment(context); assertEquals(RiskScore.high, riskScore); diff --git a/src/test/java/dev/vality/fraudbusters/util/BeanUtil.java b/src/test/java/dev/vality/fraudbusters/util/BeanUtil.java index 89f7dd9..ee2de81 100644 --- a/src/test/java/dev/vality/fraudbusters/util/BeanUtil.java +++ b/src/test/java/dev/vality/fraudbusters/util/BeanUtil.java @@ -54,7 +54,7 @@ public static Context createContext(String paymentId) { location.setUrl("http://www.pizza-sushi.com/"); PaymentInfo payment = new PaymentInfo( new Shop( - ID_VALUE_SHOP, + new ShopConfigRef(ID_VALUE_SHOP), new Category("pizza", "no category"), "pizza-sushi", location @@ -78,7 +78,7 @@ public static Context createContext(String paymentId) { "", new InvoiceDetails("drugs guns murder") ), - new Party(paymentId) + new Party(new PartyConfigRef(paymentId)) ); return new Context(payment); @@ -205,8 +205,8 @@ public static Chargeback convertContextToChargeback(Context context, String stat Payer payer = context.getPayment().getPayment().getPayer(); ReferenceInfo referenceInfo = new ReferenceInfo(); referenceInfo.setMerchantInfo(new MerchantInfo() - .setPartyId(context.getPayment().getParty().getPartyId()) - .setShopId(context.getPayment().getShop().getId())); + .setPartyId(context.getPayment().getParty().getPartyRef().id) + .setShopId(context.getPayment().getShop().getShopRef().id)); chargeback.setReferenceInfo(referenceInfo); chargeback.setPayerType(PayerType.payment_resource); ClientInfo clientInfo = new ClientInfo(); @@ -241,8 +241,8 @@ public static Refund convertContextToRefund(Context context, String status) { Payer payer = context.getPayment().getPayment().getPayer(); ReferenceInfo referenceInfo = new ReferenceInfo(); referenceInfo.setMerchantInfo(new MerchantInfo() - .setPartyId(context.getPayment().getParty().getPartyId()) - .setShopId(context.getPayment().getShop().getId())); + .setPartyId(context.getPayment().getParty().getPartyRef().id) + .setShopId(context.getPayment().getShop().getShopRef().id)); refund.setReferenceInfo(referenceInfo); refund.setPayerType(PayerType.payment_resource); ClientInfo clientInfo = new ClientInfo(); @@ -296,8 +296,8 @@ public static CheckedPayment convertContextToPayment(Context context, String sta payment.setEmail(contactInfo.getEmail()); payment.setPhone(contactInfo.getPhoneNumber()); }); - payment.setPartyId(context.getPayment().getParty().getPartyId()); - payment.setShopId(context.getPayment().getShop().getId()); + payment.setPartyId(context.getPayment().getParty().getPartyRef().id); + payment.setShopId(context.getPayment().getShop().getShopRef().id); return payment; }