Skip to content

Add filter #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stdevman91 merged 3 commits into from
Aug 20, 2026
Merged

Add filter #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
987d525
Add filter
stdevman91 Aug 20, 2026
51e0c27
Up lib
stdevman91 Aug 20, 2026
0c05571
Fix tests
stdevman91 Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
<db.password>postgres</db.password>
<db.schema>af</db.schema>
<wb.list.proto.version>1.44-5dbd6d4</wb.list.proto.version>
<fraudbusters.proto.version>1.112-e9d16e0</fraudbusters.proto.version>
<fraudbusters.proto.version>1.134-b64531d</fraudbusters.proto.version>
<fraudo.version>1.0.7</fraudo.version>
<swag-fraudbusters-management.version>1.141-b9f3cf6-server</swag-fraudbusters-management.version>
<swag-fraudbusters-management.version>1.160-e326aa8</swag-fraudbusters-management.version>
<fraudbusters.notificator.proto.version>1.27-4907168</fraudbusters.notificator.proto.version>
<warehouse.proto.version>1.12-afdcd48</warehouse.proto.version>
<fraud.data.crawler.proto.version>1.6-326f056</fraud.data.crawler.proto.version>
Expand All @@ -43,7 +43,7 @@
<!--rbkmoney-->
<dependency>
<groupId>dev.vality</groupId>
<artifactId>swag-fraudbusters-management</artifactId>
<artifactId>swag-fraudbusters-management-server</artifactId>
<version>${swag-fraudbusters-management.version}</version>
</dependency>
<dependency>
Expand Down
1 change: 1 addition & 0 deletions ...ev/vality/fraudbusters/management/resource/notificator/converter/ValidationConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public class ValidationConverter
public ValidationResponse convert(
dev.vality.damsel.fraudbusters_notificator.ValidationResponse validationResponse) {
ValidationResponse response = new ValidationResponse();
response.setErrors(null);
if (validationResponse.isSetErrors()) {
List<String> errors = validationResponse.getErrors();
List<ValidationError> validationErrors = errors.stream()
Expand Down
32 changes: 20 additions & 12 deletions ...va/dev/vality/fraudbusters/management/resource/payment/PaymentHistoricalDataResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,19 @@ public ResponseEntity<PaymentsResponse> filterPayments(String from, String to,
String email, String providerCountry,
String cardToken, String fingerprint,
String terminal, String invoiceId,
String maskedPan) {
String maskedPan, String template,
String rule) {
log.info("-> filterPaymentsInfo continuationId: {} size: {} partyId: {} shopId: {} paymentId: {} status: {} " +
"email: {} providerCountry: {} cardToken: {} fingerprint: {} terminal: {}",
"email: {} providerCountry: {} cardToken: {} fingerprint: {} terminal: {} " +
"template: {} rule: {}",
continuationId, size, partyId, shopId, paymentId, status, email, providerCountry, cardToken,
fingerprint,
terminal);
fingerprint, terminal, template, rule);
var filter = createFilter(createTimestampInterval(from, to), partyId, shopId, paymentId, status, email,
providerCountry, cardToken, fingerprint, terminal)
.setTemplate(template)
.setRule(rule);
var payments = historicalDataServiceSrv.getPayments(
createFilter(createTimestampInterval(from, to), partyId, shopId, paymentId, status, email,
providerCountry, cardToken, fingerprint, terminal),
filter,
createPage(continuationId, size),
createSort(sortOrder, sortBy));
var paymentsResponse = new PaymentsResponse()
Expand Down Expand Up @@ -130,16 +134,20 @@ public ResponseEntity<InspectResultsResponse> filterInspectResults(String from,
String cardToken,
String fingerprint,
String terminal, String invoiceId,
String maskedPan) {
String maskedPan, String template,
String rule) {
log.info(
"-> filterInspectResults continuationId: {} size: {} partyId: {} shopId: {} paymentId: {} status: {} " +
"email: {} providerCountry: {} cardToken: {} fingerprint: {} terminal: {}",
"email: {} providerCountry: {} cardToken: {} fingerprint: {} terminal: {} " +
"template: {} rule: {}",
continuationId, size, partyId, shopId, paymentId, status, email, providerCountry, cardToken,
fingerprint,
terminal);
fingerprint, terminal, template, rule);
var filter = createFilter(createTimestampInterval(from, to), partyId, shopId, paymentId, status, email,
providerCountry, cardToken, fingerprint, terminal)
.setTemplate(template)
.setRule(rule);
var fraudResults = historicalDataServiceSrv.getFraudResults(
createFilter(createTimestampInterval(from, to), partyId, shopId, paymentId, status, email,
providerCountry, cardToken, fingerprint, terminal),
filter,
createPage(continuationId, size),
createSort(sortOrder, sortBy));
var inspectResultsResponse = new InspectResultsResponse()
Expand Down
18 changes: 18 additions & 0 deletions ...ev/vality/fraudbusters/management/resource/payment/PaymentHistoricalDataResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package dev.vality.fraudbusters.management.resource.payment;

import dev.vality.damsel.fraudbusters.Filter;
import dev.vality.damsel.fraudbusters.HistoricalDataResponse;
import dev.vality.damsel.fraudbusters.HistoricalDataServiceSrv;
import dev.vality.fraudbusters.management.resource.utils.ExternalModelBeanFactory;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
Expand All @@ -18,7 +20,9 @@
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.util.LinkedMultiValueMap;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
Expand All @@ -44,6 +48,8 @@ public void filterPaymentsInfo() throws Exception {
when(iface.getPayments(any(), any(), any())).thenReturn(new HistoricalDataResponse()
.setData(ExternalModelBeanFactory.createHistoricalData()));
LinkedMultiValueMap<String, String> params = createParams();
params.add("template", "shop-template");
params.add("rule", "many_emails_per_card");
this.mockMvc.perform(get("/payments-historical-data/payments-info")
.queryParams(params))
.andDo(print())
Expand All @@ -59,6 +65,11 @@ public void filterPaymentsInfo() throws Exception {
"\"paymentTool\":\"BankCard(token:null, payment_system:PaymentSystemRef(id:visa)," +
" bin:1234, last_digits:null, bank_name:test)\",\"provider\":{\"providerId\":\"test\"" +
",\"terminalId\":\"1234\",\"country\":\"RUS\"}}]}"));

ArgumentCaptor<Filter> filterCaptor = ArgumentCaptor.forClass(Filter.class);
verify(iface).getPayments(filterCaptor.capture(), any(), any());
assertEquals("shop-template", filterCaptor.getValue().getTemplate());
assertEquals("many_emails_per_card", filterCaptor.getValue().getRule());
}

@Test
Expand Down Expand Up @@ -87,6 +98,8 @@ public void filterInspectResults() throws Exception {
when(iface.getFraudResults(any(), any(), any())).thenReturn(new HistoricalDataResponse()
.setData(ExternalModelBeanFactory.createHistoricalDataInspectResults()));
LinkedMultiValueMap<String, String> params = createParams();
params.add("template", "shop-template");
params.add("rule", "many_emails_per_card");
this.mockMvc.perform(get("/payments-historical-data/inspect-results")
.queryParams(params))
.andDo(print())
Expand All @@ -104,6 +117,11 @@ public void filterInspectResults() throws Exception {
"\"terminalId\":\"1234\",\"country\":\"RUS\"}},\"checkedTemplate\":null," +
"\"resultStatus\":\"accept\",\"ruleChecked\":null," +
"\"notificationsRule\":null}]}"));

ArgumentCaptor<Filter> filterCaptor = ArgumentCaptor.forClass(Filter.class);
verify(iface).getFraudResults(filterCaptor.capture(), any(), any());
assertEquals("shop-template", filterCaptor.getValue().getTemplate());
assertEquals("many_emails_per_card", filterCaptor.getValue().getRule());
}

@Test
Expand Down
Loading