diff --git a/src/main/java/dev/vality/fraudbusters/config/CachingConfig.java b/src/main/java/dev/vality/fraudbusters/config/CachingConfig.java index d2bef9ba..1d8ddc87 100644 --- a/src/main/java/dev/vality/fraudbusters/config/CachingConfig.java +++ b/src/main/java/dev/vality/fraudbusters/config/CachingConfig.java @@ -15,7 +15,7 @@ public class CachingConfig { @Bean public CacheManager cacheManager() { - CaffeineCacheManager cacheManager = new CaffeineCacheManager("resolveCountry"); + CaffeineCacheManager cacheManager = new CaffeineCacheManager("resolveCountry", "isNewShop"); cacheManager.setCaffeine(Caffeine.newBuilder() .initialCapacity(200) .maximumSize(500) diff --git a/src/main/java/dev/vality/fraudbusters/service/ShopManagementService.java b/src/main/java/dev/vality/fraudbusters/service/ShopManagementService.java index 0b117469..4b85dc27 100644 --- a/src/main/java/dev/vality/fraudbusters/service/ShopManagementService.java +++ b/src/main/java/dev/vality/fraudbusters/service/ShopManagementService.java @@ -30,7 +30,7 @@ public boolean isNewShop(String partyId, String shopId) { } Long to = Instant.now().toEpochMilli(); Long from = Instant.now().minus(properties.getCountToCheckDays(), ChronoUnit.DAYS).toEpochMilli(); - return repository.isExistByField("shopId", shopId, from, to); + return !repository.isExistByField("shopId", shopId, from, to); } private boolean hasReferenceInPools(String partyId, String shopId) { diff --git a/src/test/java/dev/vality/fraudbusters/service/ShopManagementServiceTest.java b/src/test/java/dev/vality/fraudbusters/service/ShopManagementServiceTest.java index e50644c8..d745d75e 100644 --- a/src/test/java/dev/vality/fraudbusters/service/ShopManagementServiceTest.java +++ b/src/test/java/dev/vality/fraudbusters/service/ShopManagementServiceTest.java @@ -68,7 +68,7 @@ public void testCreateDefaultReference() { @Test public void testIsNewShop() { - when(fraudResultRepository.isExistByField(anyString(), anyString(), anyLong(), anyLong())).thenReturn(false); + when(fraudResultRepository.isExistByField(anyString(), anyString(), anyLong(), anyLong())).thenReturn(true); shopManagementService.isNewShop("partyId", "s1"); verify(fraudResultRepository).isExistByField(anyString(), anyString(), anyLong(), anyLong()); @@ -77,7 +77,7 @@ public void testIsNewShop() { assertFalse(newShop); referencePoolImpl.remove("partyId"); - when(fraudResultRepository.isExistByField(anyString(), anyString(), anyLong(), anyLong())).thenReturn(true); + when(fraudResultRepository.isExistByField(anyString(), anyString(), anyLong(), anyLong())).thenReturn(false); newShop = shopManagementService.isNewShop("partyId", "s1"); assertTrue(newShop); }