From 08fd8cfde572cdd70f36fe0f6b63e5a9cfb68815 Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Fri, 22 Aug 2025 17:40:02 +0300 Subject: [PATCH 1/4] Up lib --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e93eb14..d268936 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ dev.vality service-parent-pom - 3.1.0 + 3.1.6 fraudbusters From e19fc8fe98ea03f39cf48a20fe7a4bb9ea39ff58 Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Fri, 22 Aug 2025 17:46:19 +0300 Subject: [PATCH 2/4] Up lib --- .../dev/vality/fraudbusters/util/PayerFieldExtractor.java | 8 +------- .../fraudbusters/util/PaymentTypeByContextResolver.java | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/dev/vality/fraudbusters/util/PayerFieldExtractor.java b/src/main/java/dev/vality/fraudbusters/util/PayerFieldExtractor.java index 86e9f7d..b22a1ee 100644 --- a/src/main/java/dev/vality/fraudbusters/util/PayerFieldExtractor.java +++ b/src/main/java/dev/vality/fraudbusters/util/PayerFieldExtractor.java @@ -17,8 +17,6 @@ public class PayerFieldExtractor { public static Optional getContactInfo(Payer payer) { if (payer.isSetPaymentResource()) { return Optional.ofNullable(payer.getPaymentResource().getContactInfo()); - } else if (payer.isSetCustomer()) { - return Optional.ofNullable(payer.getCustomer().getContactInfo()); } else if (payer.isSetRecurrent()) { return Optional.ofNullable(payer.getRecurrent().getContactInfo()); } @@ -26,9 +24,7 @@ public static Optional getContactInfo(Payer payer) { } public static Optional getBankCard(Payer payer) { - if (payer.isSetCustomer() && payer.getCustomer().getPaymentTool().isSetBankCard()) { - return Optional.ofNullable(payer.getCustomer().getPaymentTool().getBankCard()); - } else if (payer.isSetPaymentResource() + if (payer.isSetPaymentResource() && payer.getPaymentResource().getResource().getPaymentTool().isSetBankCard()) { return Optional.ofNullable(payer.getPaymentResource().getResource().getPaymentTool().getBankCard()); } else if (payer.isSetRecurrent() && payer.getRecurrent().getPaymentTool().isSetBankCard()) { @@ -49,8 +45,6 @@ public static String getPayerType(Payer payer) { return PayerType.PAYMENT_RESOURCE.name(); } else if (payer.isSetRecurrent()) { return PayerType.RECURRENT.name(); - } else if (payer.isSetCustomer()) { - return PayerType.CUSTOMER.name(); } else { return ClickhouseUtilsValue.UNKNOWN; } diff --git a/src/main/java/dev/vality/fraudbusters/util/PaymentTypeByContextResolver.java b/src/main/java/dev/vality/fraudbusters/util/PaymentTypeByContextResolver.java index c15a684..48b0418 100644 --- a/src/main/java/dev/vality/fraudbusters/util/PaymentTypeByContextResolver.java +++ b/src/main/java/dev/vality/fraudbusters/util/PaymentTypeByContextResolver.java @@ -8,7 +8,7 @@ public class PaymentTypeByContextResolver { public boolean isRecurrent(Payer payer) { - return payer.isSetRecurrent() || payer.isSetCustomer(); + return payer.isSetRecurrent(); } public boolean isMobile(BankCard bankCard) { From 5190f88d4ee2ce06be7cc491428e292dedee4d09 Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Fri, 22 Aug 2025 17:50:00 +0300 Subject: [PATCH 3/4] Up lib --- src/test/java/dev/vality/fraudbusters/util/BeanUtil.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/test/java/dev/vality/fraudbusters/util/BeanUtil.java b/src/test/java/dev/vality/fraudbusters/util/BeanUtil.java index 5b47de5..4768bcb 100644 --- a/src/test/java/dev/vality/fraudbusters/util/BeanUtil.java +++ b/src/test/java/dev/vality/fraudbusters/util/BeanUtil.java @@ -56,16 +56,13 @@ public static Context createContext(String paymentId) { new Shop( ID_VALUE_SHOP, new Category("pizza", "no category"), - new ShopDetails("pizza-sushi"), + "pizza-sushi", location ), new InvoicePayment( paymentId, TypeUtil.temporalToString(Instant.now()), - Payer.customer( - new CustomerPayer("custId", "1", "rec_paym_tool", createPaymentTool(), - contactInfo - )), + Payer.payment_resource(new PaymentResourcePayer()), new Cash( 9000L, new CurrencyRef("RUB") From dae3ccaf5353aa0bb8406dbdde2e8dbcbfac9419 Mon Sep 17 00:00:00 2001 From: kostyastruga Date: Mon, 25 Aug 2025 17:13:27 +0300 Subject: [PATCH 4/4] Fix test --- src/test/java/dev/vality/fraudbusters/util/BeanUtil.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/java/dev/vality/fraudbusters/util/BeanUtil.java b/src/test/java/dev/vality/fraudbusters/util/BeanUtil.java index 4768bcb..89f7dd9 100644 --- a/src/test/java/dev/vality/fraudbusters/util/BeanUtil.java +++ b/src/test/java/dev/vality/fraudbusters/util/BeanUtil.java @@ -62,7 +62,11 @@ public static Context createContext(String paymentId) { new InvoicePayment( paymentId, TypeUtil.temporalToString(Instant.now()), - Payer.payment_resource(new PaymentResourcePayer()), + Payer.payment_resource(new PaymentResourcePayer() + .setResource(new DisposablePaymentResource() + .setPaymentTool(createPaymentTool())) + .setContactInfo(new ContactInfo() + .setEmail("test@test"))), new Cash( 9000L, new CurrencyRef("RUB")