From a633a0d6054c60f633e3b474314124a6f19e52d8 Mon Sep 17 00:00:00 2001 From: Mikhail Trofimov Date: Tue, 23 Sep 2025 14:56:00 +0300 Subject: [PATCH] Fix tests; Added extra logs --- .../component/MapperTimingAspect.java | 2 +- .../config/rest/GlobalExceptionHandler.java | 2 +- .../credit_tracker/service/SignalService.java | 8 ++++-- src/main/resources/logback.xml | 4 +-- .../service/PhoneServiceTest.java | 28 ++++++++++--------- .../utils/ValidationUtilTest.java | 4 +-- 6 files changed, 26 insertions(+), 22 deletions(-) diff --git a/src/main/java/ru/nbch/credit_tracker/component/MapperTimingAspect.java b/src/main/java/ru/nbch/credit_tracker/component/MapperTimingAspect.java index e0f818a..05902b2 100644 --- a/src/main/java/ru/nbch/credit_tracker/component/MapperTimingAspect.java +++ b/src/main/java/ru/nbch/credit_tracker/component/MapperTimingAspect.java @@ -18,7 +18,7 @@ public class MapperTimingAspect { } finally { long tookMs = (System.nanoTime() - start) / 1_000_000; String method = pjp.getSignature().toShortString(); - if (tookMs > 500) { + if (tookMs > 1000) { log.warn("Slow mapper call {} took {} ms", method, tookMs); } else { log.debug("Mapper call {} took {} ms", method, tookMs); diff --git a/src/main/java/ru/nbch/credit_tracker/config/rest/GlobalExceptionHandler.java b/src/main/java/ru/nbch/credit_tracker/config/rest/GlobalExceptionHandler.java index 2762bdb..b0824b1 100644 --- a/src/main/java/ru/nbch/credit_tracker/config/rest/GlobalExceptionHandler.java +++ b/src/main/java/ru/nbch/credit_tracker/config/rest/GlobalExceptionHandler.java @@ -55,7 +55,7 @@ public class GlobalExceptionHandler { commonError.setErrorText(errorText); if (ex instanceof SignalClientException) { - log.warn(errorText); + log.warn("Response error: {}", errorText); return new ResponseEntity<>(commonError, headers, HttpStatus.BAD_REQUEST); } else { Exception cause = ((SignalServerException) ex).getCause(); diff --git a/src/main/java/ru/nbch/credit_tracker/service/SignalService.java b/src/main/java/ru/nbch/credit_tracker/service/SignalService.java index f468fd1..4306402 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/SignalService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/SignalService.java @@ -131,7 +131,9 @@ public class SignalService { if (!filteredItems.isEmpty()) { Map fidsMapByBatch = phoneService.defineFidByPhone(filteredItems); - if (fidsMapByBatch.size() + phonesByFidToProcessing.size() < batchSize) { + log.debug("Actual fids size by phone's batch: {}", fidsMapByBatch.size()); + + if (fidsMapByBatch.size() + phonesByFidToProcessing.size() <= batchSize) { phonesByFidToProcessing.putAll(fidsMapByBatch); } else { boolean fidsFound = updateFlags(phonesByFidToProcessing, packageId); @@ -161,7 +163,7 @@ public class SignalService { */ // TODO Добавить отдельный метод. Если не нашелся фид, надо обновить в базе fid = null и флаги = null calculated_at=now() public boolean updateFlags(Map fidsMap, Integer packageId) { - log.info("Start calculating fids and flags for subjects batch. PackageId: {}", packageId); + log.info("Start calculating flags for subjects batch. PackageId: {}", packageId); Map flagsDataMap = flagsService.findFlags(fidsMap.keySet().stream().toList()); for (Map.Entry entry : flagsDataMap.entrySet()) { Integer fid = entry.getKey(); @@ -175,7 +177,7 @@ public class SignalService { phoneFidMapMapper.updatePhoneFid(phoneFidMap); } - log.info("Finish calculating fids and flags for subjects. PackageId: {}. Batch size: {}", packageId, fidsMap.size()); + log.info("Finish calculating flags for subjects. PackageId: {}. Batch size: {}", packageId, fidsMap.size()); return !fidsMap.isEmpty(); } diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 88ce91c..5b9cf16 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -63,12 +63,12 @@ - + - + diff --git a/src/test/java/ru/nbch/credit_tracker/service/PhoneServiceTest.java b/src/test/java/ru/nbch/credit_tracker/service/PhoneServiceTest.java index cba98b0..d552d1c 100644 --- a/src/test/java/ru/nbch/credit_tracker/service/PhoneServiceTest.java +++ b/src/test/java/ru/nbch/credit_tracker/service/PhoneServiceTest.java @@ -1,20 +1,22 @@ package ru.nbch.credit_tracker.service; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; +import ru.nbch.credit_tracker.entities.dto.PhoneFidMap; +import ru.nbch.credit_tracker.mapper.indic.PhoneMapper; +import ru.nbch.credit_tracker.service.indic.PhoneService; + import java.time.LocalDate; import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.Map; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mock; -import org.mockito.Mockito; + import static org.mockito.Mockito.when; -import org.mockito.junit.jupiter.MockitoExtension; -import ru.nbch.credit_tracker.entities.dto.PhoneFidMap; -import ru.nbch.credit_tracker.mapper.indic.PhoneMapper; -import ru.nbch.credit_tracker.service.indic.PhoneService; @ExtendWith(MockitoExtension.class) public class PhoneServiceTest { @@ -43,10 +45,10 @@ public class PhoneServiceTest { private final List fidsDataWithEqualSinceDt = new ArrayList<>( List.of( - new PhoneService.FidsData(123, "1111", LocalDate.of(2025, 9, 10)), - new PhoneService.FidsData(124, "1111", LocalDate.of(2025, 9, 10)), - new PhoneService.FidsData(125, "1112", LocalDate.of(2024, 10, 10)), - new PhoneService.FidsData(126, "1114", LocalDate.of(2024, 10, 11)) + new PhoneService.FidsData(123, "91111", LocalDate.of(2025, 9, 10)), + new PhoneService.FidsData(124, "91111", LocalDate.of(2025, 9, 10)), + new PhoneService.FidsData(125, "91112", LocalDate.of(2024, 10, 10)), + new PhoneService.FidsData(126, "91114", LocalDate.of(2024, 10, 11)) ) ); diff --git a/src/test/java/ru/nbch/credit_tracker/utils/ValidationUtilTest.java b/src/test/java/ru/nbch/credit_tracker/utils/ValidationUtilTest.java index b8146f3..aea414b 100644 --- a/src/test/java/ru/nbch/credit_tracker/utils/ValidationUtilTest.java +++ b/src/test/java/ru/nbch/credit_tracker/utils/ValidationUtilTest.java @@ -69,12 +69,12 @@ public class ValidationUtilTest { Arguments.of( "/monitoring_request/invalid_phone_request.zip", SignalError.ERROR_003, - Collections.emptyList().toArray(new Object[0]) + new Object[]{"abc123"} ), Arguments.of( "/monitoring_request/invalid_id_request.zip", SignalError.ERROR_010, - Collections.emptyList().toArray(new Object[0]) + new Object[]{"#####"} ) ); }