treshenkov/credit_tracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix PhoneService

Browse source
This commit is contained in:
Mikhail Trofimov 2025-09-23 18:18:48 +03:00
parent 3f9fff5baa
commit 669236e696
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService.java
View file

@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.nbch.credit_tracker.entities.dto.PhoneFidMap; import ru.nbch.credit_tracker.entities.dto.PhoneFidMap;
import ru.nbch.credit_tracker.mapper.indic.PhoneMapper; import ru.nbch.credit_tracker.mapper.indic.PhoneMapper;
@ -12,6 +13,7 @@ import java.time.LocalDate;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Slf4j
@Service @Service
public class PhoneService { public class PhoneService {
@ -45,8 +47,9 @@ public class PhoneService {
//отсортированный список по NUMBER, FID и FILE_SINCE_DT //отсортированный список по NUMBER, FID и FILE_SINCE_DT
List<FidsData> phonesByFid = mapper.findFids(phones); List<FidsData> phonesByFid = mapper.findFids(phones);
Iterator<FidsData> iterator = phonesByFid.iterator(); log.debug("Start merging fids");
for (PhoneFidMap phoneFid : subjects) { for (PhoneFidMap phoneFid : subjects) {
Iterator<FidsData> iterator = phonesByFid.iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
FidsData fidsData = iterator.next(); FidsData fidsData = iterator.next();
if (fidsData.getPhone().equals(9 + phoneFid.getPhone())) { if (fidsData.getPhone().equals(9 + phoneFid.getPhone())) {
@ -57,6 +60,8 @@ public class PhoneService {
} }
} }
} }
log.debug("End merging fids");
return phoneFidMap; return phoneFidMap;
} }

1
src/test/java/ru/nbch/credit_tracker/service/PhoneServiceTest.java
View file

@ -34,6 +34,7 @@ public class PhoneServiceTest {
List<PhoneFidMap> phoneFidMap = new ArrayList<>(); List<PhoneFidMap> phoneFidMap = new ArrayList<>();
phoneFidMap.add(PhoneFidMap.builder().phone("1111").build()); phoneFidMap.add(PhoneFidMap.builder().phone("1111").build());
phoneFidMap.add(PhoneFidMap.builder().phone("1112").build()); phoneFidMap.add(PhoneFidMap.builder().phone("1112").build());
phoneFidMap.add(PhoneFidMap.builder().phone("1113").build());
phoneFidMap.add(PhoneFidMap.builder().phone("1114").build()); phoneFidMap.add(PhoneFidMap.builder().phone("1114").build());
Map<Integer, PhoneFidMap> res = phoneService.defineFidByPhone(phoneFidMap); Map<Integer, PhoneFidMap> res = phoneService.defineFidByPhone(phoneFidMap);