Fix PhoneService
This commit is contained in:
parent
3f9fff5baa
commit
669236e696
2 changed files with 7 additions and 1 deletions
|
|
@ -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<FidsData> phonesByFid = mapper.findFids(phones);
|
||||
Iterator<FidsData> iterator = phonesByFid.iterator();
|
||||
log.debug("Start merging fids");
|
||||
for (PhoneFidMap phoneFid : subjects) {
|
||||
Iterator<FidsData> 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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ public class PhoneServiceTest {
|
|||
List<PhoneFidMap> 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<Integer, PhoneFidMap> res = phoneService.defineFidByPhone(phoneFidMap);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue