diff --git a/src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService.java b/src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService.java index fe7c623..fa3b27c 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService.java @@ -4,6 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import ru.nbch.credit_tracker.entities.dto.PhoneFidMap; import ru.nbch.credit_tracker.mapper.indic.PhoneMapper; @@ -12,6 +13,7 @@ import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; +@Slf4j @Service public class PhoneService { @@ -45,8 +47,9 @@ public class PhoneService { //отсортированный список по NUMBER, FID и FILE_SINCE_DT List phonesByFid = mapper.findFids(phones); - Iterator iterator = phonesByFid.iterator(); + log.debug("Start merging fids"); for (PhoneFidMap phoneFid : subjects) { + Iterator iterator = phonesByFid.iterator(); while (iterator.hasNext()) { FidsData fidsData = iterator.next(); if (fidsData.getPhone().equals(9 + phoneFid.getPhone())) { @@ -57,6 +60,8 @@ public class PhoneService { } } } + log.debug("End merging fids"); + return phoneFidMap; } 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 d552d1c..b3973e6 100644 --- a/src/test/java/ru/nbch/credit_tracker/service/PhoneServiceTest.java +++ b/src/test/java/ru/nbch/credit_tracker/service/PhoneServiceTest.java @@ -34,6 +34,7 @@ public class PhoneServiceTest { List phoneFidMap = new ArrayList<>(); phoneFidMap.add(PhoneFidMap.builder().phone("1111").build()); phoneFidMap.add(PhoneFidMap.builder().phone("1112").build()); + phoneFidMap.add(PhoneFidMap.builder().phone("1113").build()); phoneFidMap.add(PhoneFidMap.builder().phone("1114").build()); Map res = phoneService.defineFidByPhone(phoneFidMap);