Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<management.port>8023</management.port>
<exposed.ports>${server.port} ${management.port}</exposed.ports>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<fraudo.version>1.0.7</fraudo.version>
<fraudo.version>1.0.9</fraudo.version>
<clickhouse-jdbc.version>0.3.1</clickhouse-jdbc.version>
<fraudbusters-proto.version>1.128-79c32f2</fraudbusters-proto.version>
<trusted.tokens.proto.version>1.7-6d29f86</trusted.tokens.proto.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public Integer countError(
FieldModel resolve = databasePaymentFieldResolver.resolve(checkedField, paymentModel);
List<FieldModel> eventFields = databasePaymentFieldResolver.resolveListFields(paymentModel, list);
if (Objects.isNull(resolve.getValue())) {
return CURRENT_ONE;
return 0;
}
Integer count = paymentRepository.countOperationErrorWithGroupBy(
resolve.getName(),
Expand Down Expand Up @@ -113,7 +113,7 @@ public Integer countError(PaymentCheckedField checkedField,
FieldModel resolve = databasePaymentFieldResolver.resolve(checkedField, paymentModel);
List<FieldModel> eventFields = databasePaymentFieldResolver.resolveListFields(paymentModel, list);
if (Objects.isNull(resolve.getValue())) {
return CURRENT_ONE;
return 0;
}
Integer count = paymentRepository.countOperationErrorWithGroupBy(
resolve.getName(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.context.junit.jupiter.SpringExtension;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -50,15 +50,15 @@ void isExistInBlackList() throws TException {

when(wbListServiceSrv.isExist(any())).thenReturn(false);
boolean existInBlackList = fraudInspectorHandler.isBlacklisted(createBlackListContext());
assertEquals(false, existInBlackList);
assertFalse(existInBlackList);

when(wbListServiceSrv.isExist(any())).thenReturn(true);
existInBlackList = fraudInspectorHandler.isBlacklisted(createBlackListContext());
assertEquals(true, existInBlackList);
assertTrue(existInBlackList);

when(wbListServiceSrv.isExist(any())).thenThrow(new ListNotFound());
existInBlackList = fraudInspectorHandler.isBlacklisted(createBlackListContext());
assertEquals(false, existInBlackList);
assertFalse(existInBlackList);
}

private BlackListContext createBlackListContext() {
Expand All @@ -68,10 +68,4 @@ private BlackListContext createBlackListContext() {
.setFirstId("test_id")
.setSecondId("test_sec_id");
}

private CheckedResultModel createCheckedResult(ResultStatus status) {
CheckedResultModel checkedResultModel = new CheckedResultModel();
checkedResultModel.setResultModel(new ConcreteResultModel(status, null, null));
return checkedResultModel;
}
}
Loading