Change select

src/main/java/dev/vality/fraudbusters/fraud/localstorage/LocalResultStorageRepository.java

@@ -246,6 +246,18 @@ public Long sumOperationErrorWithGroupBy(String fieldName,
                 .sum();
     }
 
+    @Override
+    public Boolean isExistByField(String fieldName, Object value, Long from, Long to) {
+        List<CheckedPayment> checkedPayments = localStorage.get();
+        int count = (int) checkedPayments.stream()
+                .filter(checkedPayment -> checkedPayment.getEventTime() >= from
+                                          && checkedPayment.getEventTime() <= to
+                                          && paymentFieldValueFilter.filter(fieldName, value, checkedPayment))
+                .count();
+        log.debug("LocalResultStorageRepository countOperationByField: {}", count);
+        return count != 0;
+    }
+
     private boolean filterByStatusAndFields(
             Long from,
             Long to,

src/main/java/dev/vality/fraudbusters/repository/PaymentRepository.java

@@ -57,4 +57,6 @@ Long sumOperationErrorWithGroupBy(
             Long to,
             List<FieldModel> fieldModels);
 
+
+    Boolean isExistByField(String fieldName, Object value, Long from, Long to);
 }

src/main/java/dev/vality/fraudbusters/repository/clickhouse/impl/FraudResultRepository.java

@@ -273,4 +273,15 @@ public Long sumOperationErrorWithGroupBy(String fieldName, Object value, Long fr
         return sumOperationErrorWithGroupBy(fieldName, value, from, to, fieldModels, null);
     }
 
+    @Override
+    public Boolean isExistByField(String fieldName, Object value, Long from, Long to) {
+        return aggregationGeneralRepository.countOperationByField(
+                EventSource.FRAUD_EVENTS_UNIQUE.getTable(),
+                fieldName,
+                value,
+                from,
+                to
+        ) != 0;
+    }
+
 }

src/main/java/dev/vality/fraudbusters/repository/clickhouse/impl/PaymentRepositoryImpl.java

@@ -332,4 +332,20 @@ public Long sumOperationErrorWithGroupBy(String fieldName,
         return jdbcTemplate.query(resultSql.toString(), params.toArray(), new SumExtractor());
     }
 
+    @Override
+    public Boolean isExistByField(String fieldName, Object value, Long from, Long to) {
+        String sql = String.format("""
+                select 1 as cnt
+                from %2$s
+                where timestamp >= ?
+                and timestamp <= ?
+                and eventTime >= ?
+                and eventTime <= ?
+                and %1$s = ?
+                limit 1""", fieldName, TABLE);
+        List<Object> params = AggregationUtil.generateParams(from, to, value);
+        log.debug("AggregationGeneralRepositoryImpl isExistByField sql: {} params: {}", sql, params);
+        return jdbcTemplate.query(sql, params.toArray(), new CountExtractor()) != 0;
+    }
+
 }

src/main/java/dev/vality/fraudbusters/service/ShopManagementService.java

@@ -6,6 +6,7 @@
 import dev.vality.fraudbusters.util.ReferenceKeyGenerator;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.time.Instant;
@@ -22,13 +23,14 @@ public class ShopManagementService {
     private final Pool<String> referencePoolImpl;
     private final Pool<String> groupReferencePoolImpl;
 
+    @Cacheable(value = "isNewShop")
     public boolean isNewShop(String partyId, String shopId) {
         if (hasReferenceInPools(partyId, shopId)) {
             return false;
         }
         Long to = Instant.now().toEpochMilli();
         Long from = Instant.now().minus(properties.getCountToCheckDays(), ChronoUnit.DAYS).toEpochMilli();
-        return repository.countOperationByField("shopId", shopId, from, to) == 0;
+        return repository.isExistByField("shopId", shopId, from, to);
     }
 
     private boolean hasReferenceInPools(String partyId, String shopId) {

src/test/java/dev/vality/fraudbusters/repository/PaymentRepositoryTest.java

@@ -35,6 +35,7 @@
 import static dev.vality.fraudbusters.extension.ClickHouseContainerExtension.CLICKHOUSE_CONTAINER;
 import static dev.vality.fraudbusters.util.BeanUtil.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @Slf4j
 @ActiveProfiles("full-prod")
@@ -77,6 +78,12 @@ public void countOperationByPhoneTest() throws SQLException {
         assertEquals(1, count);
     }
 
+    @Test
+    public void isExistTest() throws SQLException {
+        Boolean isExist = paymentRepository.isExistByField(EventField.phone.name(), PHONE, FROM, TO);
+        assertTrue(isExist);
+    }
+
     @Test
     public void countOperationByEmailTestWithGroupBy() throws SQLException {
         PaymentModel paymentModel = createFraudModelSecond();

src/test/java/dev/vality/fraudbusters/service/ShopManagementServiceTest.java

@@ -68,15 +68,16 @@ public void testCreateDefaultReference() {
 
     @Test
     public void testIsNewShop() {
-        when(fraudResultRepository.countOperationByField(anyString(), anyString(), anyLong(), anyLong())).thenReturn(0);
+        when(fraudResultRepository.isExistByField(anyString(), anyString(), anyLong(), anyLong())).thenReturn(false);
         shopManagementService.isNewShop("partyId", "s1");
-        verify(fraudResultRepository).countOperationByField(anyString(), anyString(), anyLong(), anyLong());
+        verify(fraudResultRepository).isExistByField(anyString(), anyString(), anyLong(), anyLong());
 
         referencePoolImpl.add("partyId", "test");
         boolean newShop = shopManagementService.isNewShop("partyId", "s1");
         assertFalse(newShop);
 
         referencePoolImpl.remove("partyId");
+        when(fraudResultRepository.isExistByField(anyString(), anyString(), anyLong(), anyLong())).thenReturn(true);
         newShop = shopManagementService.isNewShop("partyId", "s1");
         assertTrue(newShop);
     }