diff --git a/pom.xml b/pom.xml
index 4af24f51..ad45f74b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
8023
${server.port} ${management.port}
UTF-8
- 1.0.7
+ 1.0.9
0.3.1
1.128-79c32f2
1.7-6d29f86
diff --git a/src/main/java/dev/vality/fraudbusters/fraud/payment/aggregator/clickhouse/CountAggregatorImpl.java b/src/main/java/dev/vality/fraudbusters/fraud/payment/aggregator/clickhouse/CountAggregatorImpl.java
index d64c7031..8253be41 100644
--- a/src/main/java/dev/vality/fraudbusters/fraud/payment/aggregator/clickhouse/CountAggregatorImpl.java
+++ b/src/main/java/dev/vality/fraudbusters/fraud/payment/aggregator/clickhouse/CountAggregatorImpl.java
@@ -78,7 +78,7 @@ public Integer countError(
FieldModel resolve = databasePaymentFieldResolver.resolve(checkedField, paymentModel);
List eventFields = databasePaymentFieldResolver.resolveListFields(paymentModel, list);
if (Objects.isNull(resolve.getValue())) {
- return CURRENT_ONE;
+ return 0;
}
Integer count = paymentRepository.countOperationErrorWithGroupBy(
resolve.getName(),
@@ -113,7 +113,7 @@ public Integer countError(PaymentCheckedField checkedField,
FieldModel resolve = databasePaymentFieldResolver.resolve(checkedField, paymentModel);
List eventFields = databasePaymentFieldResolver.resolveListFields(paymentModel, list);
if (Objects.isNull(resolve.getValue())) {
- return CURRENT_ONE;
+ return 0;
}
Integer count = paymentRepository.countOperationErrorWithGroupBy(
resolve.getName(),
diff --git a/src/test/java/dev/vality/fraudbusters/resource/payment/handler/FraudInspectorHandlerTest.java b/src/test/java/dev/vality/fraudbusters/resource/payment/handler/FraudInspectorHandlerTest.java
index 5081afcb..18107aa6 100644
--- a/src/test/java/dev/vality/fraudbusters/resource/payment/handler/FraudInspectorHandlerTest.java
+++ b/src/test/java/dev/vality/fraudbusters/resource/payment/handler/FraudInspectorHandlerTest.java
@@ -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;
@@ -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() {
@@ -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;
- }
}