From d87444dac1f67eef7df89a6d7c5e3ad801ef893e Mon Sep 17 00:00:00 2001 From: etreschenkov Date: Tue, 16 Dec 2025 17:25:47 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/BKI-3241 --- .../config/task/PipelineStarterConfig.java | 7 +- .../entities/app/PackagesRecordsMap.java | 20 ++ .../entities/app/PhoneFidMap.java | 41 --- .../entities/app/PhonesMap.java | 29 ++ .../mapper/signal/PackagesRecordsMapper.java | 14 + .../mapper/signal/PhoneFidMapMapper.java | 39 --- .../MonitoringErrorProcesingService.java | 6 +- .../service/MonitoringService.java | 14 +- .../UpdateProcessingPackagesService.java | 8 +- .../service/indic/PhoneService2.java | 38 +-- .../service/task/impl/FidNameEnricher.java | 7 +- .../service/task/impl/KickPipeLine.java | 14 +- .../task/impl/KickPipeLineDefaultImpl.java | 8 +- .../impl/KickPipeLineRepeatedRestoreImpl.java | 27 +- .../task/impl/KickPipeLineRestoreImpl.java | 31 +-- .../service/task/impl/Saver.java | 4 +- .../mapper/signal/PackageRecordsMapper.xml | 64 +++++ .../mapper/signal/PhoneFidMapMapper.xml | 249 ------------------ .../mapper/signal/SignalsPhonesMapMapper.xml | 82 ++++++ src/main/resources/sql/v2.21.ddl | 53 +++- .../service/PhoneService2Test.java | 50 ++-- .../service/PhoneServiceTest.java | 38 +-- .../ru/nbch/credit_tracker/stax/StaxTest.java | 8 +- 23 files changed, 371 insertions(+), 480 deletions(-) create mode 100644 src/main/java/ru/nbch/credit_tracker/entities/app/PackagesRecordsMap.java delete mode 100644 src/main/java/ru/nbch/credit_tracker/entities/app/PhoneFidMap.java create mode 100644 src/main/java/ru/nbch/credit_tracker/entities/app/PhonesMap.java create mode 100644 src/main/java/ru/nbch/credit_tracker/mapper/signal/PackagesRecordsMapper.java delete mode 100644 src/main/java/ru/nbch/credit_tracker/mapper/signal/PhoneFidMapMapper.java create mode 100644 src/main/resources/mybatis/mapper/signal/PackageRecordsMapper.xml delete mode 100644 src/main/resources/mybatis/mapper/signal/PhoneFidMapMapper.xml create mode 100644 src/main/resources/mybatis/mapper/signal/SignalsPhonesMapMapper.xml diff --git a/src/main/java/ru/nbch/credit_tracker/config/task/PipelineStarterConfig.java b/src/main/java/ru/nbch/credit_tracker/config/task/PipelineStarterConfig.java index 462ba1d..4fc5644 100644 --- a/src/main/java/ru/nbch/credit_tracker/config/task/PipelineStarterConfig.java +++ b/src/main/java/ru/nbch/credit_tracker/config/task/PipelineStarterConfig.java @@ -5,7 +5,7 @@ import java.util.function.Supplier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; -import ru.nbch.credit_tracker.mapper.signal.PhoneFidMapMapper; +import ru.nbch.credit_tracker.mapper.signal.PackagesRecordsMapper; import ru.nbch.credit_tracker.mapper.signal.UserPackageMapper; import ru.nbch.credit_tracker.model.impl.PartFilePayload; import ru.nbch.credit_tracker.model.impl.SignalXmlFilePayload; @@ -13,7 +13,6 @@ import ru.nbch.credit_tracker.model.impl.SubjectPayload; import ru.nbch.credit_tracker.service.task.SetupParam; import ru.nbch.credit_tracker.service.task.impl.KickPipeLineDefaultImpl; import ru.nbch.credit_tracker.service.task.impl.KickPipeLineRepeatedRestoreImpl; -import ru.nbch.credit_tracker.service.task.impl.KickPipeLineRestoreImpl; import ru.nbch.credit_tracker.service.task.impl.XmlMergeCoordinator; import ru.nbch.credit_tracker.service.task.setup.IPipeLineStarter; import ru.nbch.credit_tracker.service.task.setup.IPipeLineTerminator; @@ -25,12 +24,12 @@ public class PipelineStarterConfig { public Function> pipelineStarterFactory(StaxXmlProcessor xml, CreditTrackerSettings creditTrackerSettings, UserPackageMapper userPackageMapper, - PhoneFidMapMapper phoneFidMapMapper) { + PackagesRecordsMapper phoneFidMapMapper) { return (setupParam) -> switch (setupParam.mode()) { case DEFAULT -> new KickPipeLineDefaultImpl(xml, setupParam, userPackageMapper, phoneFidMapMapper, creditTrackerSettings); case RESTORE -> - new KickPipeLineRestoreImpl(xml, setupParam, userPackageMapper, phoneFidMapMapper, creditTrackerSettings); + new KickPipeLineDefaultImpl(xml, setupParam, userPackageMapper, phoneFidMapMapper, creditTrackerSettings); case REPEATED_RESTORE -> new KickPipeLineRepeatedRestoreImpl(xml, setupParam, userPackageMapper, phoneFidMapMapper, creditTrackerSettings); }; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/app/PackagesRecordsMap.java b/src/main/java/ru/nbch/credit_tracker/entities/app/PackagesRecordsMap.java new file mode 100644 index 0000000..1d91ea0 --- /dev/null +++ b/src/main/java/ru/nbch/credit_tracker/entities/app/PackagesRecordsMap.java @@ -0,0 +1,20 @@ +package ru.nbch.credit_tracker.entities.app; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class PackagesRecordsMap { + private Long id; + private Long packageId; + private String subjectId; + private String phone; + private String errorText; +} diff --git a/src/main/java/ru/nbch/credit_tracker/entities/app/PhoneFidMap.java b/src/main/java/ru/nbch/credit_tracker/entities/app/PhoneFidMap.java deleted file mode 100644 index bc2a232..0000000 --- a/src/main/java/ru/nbch/credit_tracker/entities/app/PhoneFidMap.java +++ /dev/null @@ -1,41 +0,0 @@ -package ru.nbch.credit_tracker.entities.app; - -import java.util.UUID; -import lombok.*; - -import java.time.LocalDate; -import java.time.LocalDateTime; - -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class PhoneFidMap { - private Long id; - private Long packageId; - private UUID recUuid; - private String subjectId; - private String phone; - private Integer fid; - private Integer flagDebt5000; - private Integer flag90days; - private LocalDateTime calculatedAt; - private String errorText; - - // NAME data - private String firstName; - private String lastName; - private String middleName; - private LocalDate birthDate; - private LocalDate fileSinceDate; - //ID data - private String serNum; - private String idNum; - private LocalDate issDate; - private String idType; - private String idType2; - private LocalDate IdfileSinceDate; - - boolean isFullFilled = false; -} diff --git a/src/main/java/ru/nbch/credit_tracker/entities/app/PhonesMap.java b/src/main/java/ru/nbch/credit_tracker/entities/app/PhonesMap.java new file mode 100644 index 0000000..9a74b46 --- /dev/null +++ b/src/main/java/ru/nbch/credit_tracker/entities/app/PhonesMap.java @@ -0,0 +1,29 @@ +package ru.nbch.credit_tracker.entities.app; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class PhonesMap { + private Long id; + private Integer fid; + private String name1; + private String first; + private String middle; + private LocalDate birthDt; + private String serNum; + private String idType; + private Integer flagDebt5000; + private Integer flag90days; + private LocalDateTime searchedAt; + private LocalDateTime calculatedAt; +} diff --git a/src/main/java/ru/nbch/credit_tracker/mapper/signal/PackagesRecordsMapper.java b/src/main/java/ru/nbch/credit_tracker/mapper/signal/PackagesRecordsMapper.java new file mode 100644 index 0000000..ad57725 --- /dev/null +++ b/src/main/java/ru/nbch/credit_tracker/mapper/signal/PackagesRecordsMapper.java @@ -0,0 +1,14 @@ +package ru.nbch.credit_tracker.mapper.signal; + +import java.util.List; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import ru.nbch.credit_tracker.entities.app.PackagesRecordsMap; + +@Mapper +public interface PackagesRecordsMapper { + void setErrorJson(@Param("json") String json); + List registerJson(@Param("json") String json); + List findFullPhoneFidMap(@Param("packageId") Long packageId, @Param("limit") int limit, @Param("offset") int offset); + Long deleteByPackageId(@Param("packageId") Long id); +} diff --git a/src/main/java/ru/nbch/credit_tracker/mapper/signal/PhoneFidMapMapper.java b/src/main/java/ru/nbch/credit_tracker/mapper/signal/PhoneFidMapMapper.java deleted file mode 100644 index 081b297..0000000 --- a/src/main/java/ru/nbch/credit_tracker/mapper/signal/PhoneFidMapMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package ru.nbch.credit_tracker.mapper.signal; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import ru.nbch.credit_tracker.entities.app.PhoneFidMap; -import ru.nbch.credit_tracker.entities.user_request.monitoring_request.Subject; - -import java.util.Collection; -import java.util.List; - -@Mapper -public interface PhoneFidMapMapper { - - void registerSubjects(@Param("subjects") List subjects, @Param("packageId") Long packageId); - void register(@Param("phoneFidMap") List phoneFidMap); - List registerJson(@Param("json") String json); - void setFidJson(@Param("json") String json); - void setErrorJson(@Param("json") String json); - void registerWithId(@Param("phoneFidMap") List phoneFidMap); - - List findFullPhoneFidMap(@Param("packageId") Long packageId, @Param("limit") int limit, @Param("offset") int offset); - List findNullFidPhoneFidMap(@Param("packageId") Long packageId, @Param("limit") int limit, @Param("offset") int offset); - List findNotNullFidPhoneFidMap(@Param("packageId") Long packageId, @Param("limit") int limit, @Param("offset") int offset); - - List pageByPackageIdAndOlderThanN(@Param("packageId") Long packageId, @Param("limit") int limit, @Param("offset") int offset, @Param("daysCount") Integer daysCount); - List pageByPackageIdAndNewerThanN(@Param("packageId") Long packageId, @Param("limit") int limit, @Param("offset") int offset, @Param("daysCount") Integer daysCount); - void updatePhoneFidMaps(@Param("subjects") Collection subjects); - void updateOne(@Param("subject") PhoneFidMap subject); - void updateFid(@Param("subjects") Collection subjects); - - void updatePhoneFidMapsErrors(@Param("subjects") List subjects); - - PhoneFidMap findPhoneFidMapById(@Param("id") Long packageId); - - boolean hasNonNullFids(@Param("packageId") Long packageId); - - Long deleteByPackageId(@Param("packageId") Long id); - boolean hasOldRow(@Param("packageId") Long packageId, @Param("daysCount") Integer daysCount); -} diff --git a/src/main/java/ru/nbch/credit_tracker/service/MonitoringErrorProcesingService.java b/src/main/java/ru/nbch/credit_tracker/service/MonitoringErrorProcesingService.java index a977393..1df3594 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/MonitoringErrorProcesingService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/MonitoringErrorProcesingService.java @@ -12,7 +12,7 @@ import org.springframework.aop.framework.AopContext; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.stereotype.Service; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; -import ru.nbch.credit_tracker.entities.app.PhoneFidMap; +import ru.nbch.credit_tracker.entities.app.PackagesRecordsMap; import ru.nbch.credit_tracker.entities.app.UserPackage; import ru.nbch.credit_tracker.entities.external_response.monitoring_report_error.MonitoringReportErrors; import ru.nbch.credit_tracker.enums.RejectedStatus; @@ -75,9 +75,9 @@ public class MonitoringErrorProcesingService { staxXmlProcessor.read(in, MonitoringReportErrors.class, request -> { if (!request.getPersons().isEmpty()) { - List subjects = request.getPersons().stream().map(p -> { + List subjects = request.getPersons().stream().map(p -> { log.warn("Ошибка при формировании субъекта. package_id = {}, id = {}. Описание: {}", packageId, p.getUid(), p.getValue()); - return PhoneFidMap.builder() + return PackagesRecordsMap.builder() .id(p.getUid()) .errorText(p.getValue()) .build(); diff --git a/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java b/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java index 5eae5f9..c2371cc 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java @@ -34,7 +34,7 @@ import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response. import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response.Subject; import ru.nbch.credit_tracker.enums.Status; import ru.nbch.credit_tracker.mapper.signal.FlagDetailMapper; -import ru.nbch.credit_tracker.mapper.signal.PhoneFidMapMapper; +import ru.nbch.credit_tracker.mapper.signal.PackagesRecordsMapper; import ru.nbch.credit_tracker.mapper.signal.UserPackageMapper; import ru.nbch.credit_tracker.service.signal.HitsService; import ru.nbch.credit_tracker.service.signal.SignalRestService; @@ -57,7 +57,7 @@ public class MonitoringService { private final UserPackageMapper userPackageMapper; private final StaxXmlProcessor staxXmlProcessor; private final HitsService hitsService; - private final PhoneFidMapMapper phoneFidMapMapper; + private final PackagesRecordsMapper phoneFidMapMapper; private final CreditTrackerSettings config; public MonitoringService(SignalRestService signalRestService, @@ -65,7 +65,7 @@ public class MonitoringService { UserPackageMapper userPackageMapper, StaxXmlProcessor staxXmlProcessor, HitsService hitsService, - PhoneFidMapMapper phoneFidMapMapper, + PackagesRecordsMapper phoneFidMapMapper, CreditTrackerSettings config) { this.signalRestService = signalRestService; this.flagDetailMapper = flagDetailMapper; @@ -100,10 +100,10 @@ public class MonitoringService { private void processPackage(UserPackage userPackage) { log.info("Processing package"); - if (!phoneFidMapMapper.hasNonNullFids(userPackage.getId())) { - log.info("Package has no fids. Package will be skipped."); - return; - } +// if (!phoneFidMapMapper.hasNonNullFids(userPackage.getId())) { +// log.info("Package has no fids. Package will be skipped."); +// return; +// } SgnlOnlineReport onlineReports = signalRestService.getReports(userPackage.getUserId().substring(0, 6) + "_" + userPackage.getPackageName()); if (onlineReports == null) { diff --git a/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java b/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java index 686cbc7..96498e4 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; import ru.nbch.credit_tracker.entities.app.UserPackage; import ru.nbch.credit_tracker.enums.Status; -import ru.nbch.credit_tracker.mapper.signal.PhoneFidMapMapper; +import ru.nbch.credit_tracker.mapper.signal.PackagesRecordsMapper; import ru.nbch.credit_tracker.mapper.signal.UserPackageMapper; import ru.nbch.credit_tracker.service.task.Pipeline; import ru.nbch.credit_tracker.service.task.PipelinePackageFabric; @@ -30,7 +30,7 @@ import ru.nbch.credit_tracker.utils.error.ExceptionUtils; public class UpdateProcessingPackagesService { private final UserPackageMapper userPackageMapper; - private final PhoneFidMapMapper phoneFidMapMapper; + private final PackagesRecordsMapper phoneFidMapMapper; private final PipelinePackageFabric pipelinePackageManager; private final PipelinePackageOrchestrator pipelineOrchestrator; private final CreditTrackerSettings creditTrackerSettings; @@ -39,7 +39,7 @@ public class UpdateProcessingPackagesService { private final ExecutorService saverExecutorService; public UpdateProcessingPackagesService(UserPackageMapper userPackageMapper, - PhoneFidMapMapper phoneFidMapMapper, + PackagesRecordsMapper phoneFidMapMapper, PipelinePackageFabric pipelinePackageManager, PipelinePackageOrchestrator pipelineOrchestrator, CreditTrackerSettings creditTrackerSettings, Saver saver, @@ -87,7 +87,7 @@ public class UpdateProcessingPackagesService { log.debug("Found {} packages in status PROCESSING and rejected_status = null", packages.size()); for (UserPackage userPackage : packages) { try { - Pipeline pipeline = pipelinePackageManager.build(new SetupParam(userPackage.getId(), null, PipelineMode.RESTORE)); + Pipeline pipeline = pipelinePackageManager.build(new SetupParam(userPackage.getId(), null, PipelineMode.DEFAULT)); pipelineOrchestrator.startOrDelay(pipeline, userPackage.getId()); } catch (Exception e) { log.error("Error build restore pipeline for packageId {}: {}", userPackage.getId(), ExceptionUtils.getStackTrace(e)); diff --git a/src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService2.java b/src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService2.java index 7feeb2b..1d4a270 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService2.java +++ b/src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService2.java @@ -12,10 +12,11 @@ import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import ru.nbch.credit_tracker.entities.app.PhoneFidMap; +import ru.nbch.credit_tracker.entities.app.PackagesRecordsMap; +import ru.nbch.credit_tracker.entities.app.PhonesMap; import ru.nbch.credit_tracker.entities.indic.Name; import ru.nbch.credit_tracker.mapper.signal.FlagDetailMapper; -import ru.nbch.credit_tracker.mapper.signal.PhoneFidMapMapper; +import ru.nbch.credit_tracker.mapper.signal.PackagesRecordsMapper; import ru.nbch.credit_tracker.model.SubjectProfile; import ru.nbch.credit_tracker.repository.PhoneRepository; import ru.nbch.credit_tracker.utils.CTUtil; @@ -25,7 +26,7 @@ import ru.nbch.credit_tracker.utils.CTUtil; public class PhoneService2 { private final PhoneRepository phoneRepository; - private final PhoneFidMapMapper phoneFidMapMapper; + private final PackagesRecordsMapper phoneFidMapMapper; private final FlagDetailMapper flagDetailMapper; private final ObjectMapper entityToJsonMapper; private final Comparator byDateThenIdNullSafe = @@ -33,7 +34,7 @@ public class PhoneService2 { .thenComparing(Name::getFid); public PhoneService2(PhoneRepository phoneRepository, - PhoneFidMapMapper phoneFidMapMapper, + PackagesRecordsMapper phoneFidMapMapper, FlagDetailMapper flagDetailMapper, ObjectMapper entityToJsonMapper) { this.phoneRepository = phoneRepository; @@ -93,7 +94,7 @@ public class PhoneService2 { )); } - public List registerSubjects(List subjects) { + public List registerSubjects(List subjects) { try { String json = entityToJsonMapper.writeValueAsString(subjects.stream() .map(phoneFidMap -> new HashMap() {{ @@ -109,7 +110,8 @@ public class PhoneService2 { } } - public void updateFid(List subjects) { + + public void updateFid(List subjects) { try { //регистрация в signals_phone_fid_map String json = entityToJsonMapper.writeValueAsString(subjects.stream() @@ -118,30 +120,14 @@ public class PhoneService2 { put("fid", phoneFidMap.getFid()); put("searched_at", phoneFidMap.getCalculatedAt()); }}).toList()); - phoneFidMapMapper.setFidJson(json); + //fixme теперь апдейтится(insert) signals_phones_map +// phoneFidMapMapper.setFidJson(json); } catch (JsonProcessingException e) { throw new RuntimeException(e); } } - public void registerSignals(List subjects) { - try { - //регистрация в signals_flags - апдейтим при FlagsEnricher - String jsonFlagDetail = entityToJsonMapper.writeValueAsString(subjects.stream() - .filter(phoneFidMap -> phoneFidMap.getFid() != null) - .map(subject -> new HashMap() {{ - put("subject_id", subject.getSubjectId()); - put("fid", subject.getFid()); - put("phone", subject.getPhone()); - put("map_id", subject.getId()); - }}).toList()); - flagDetailMapper.updateCalcFlags(jsonFlagDetail); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - } - - public void updateOnError(List subjects) { + public void updateOnError(List subjects) { try { String json = entityToJsonMapper.writeValueAsString(subjects.stream() .map(phoneFidMap -> new HashMap() {{ @@ -154,7 +140,7 @@ public class PhoneService2 { } } - public List pageByPackageId(Long packageId, Integer limit, Integer offset) { + public List pageByPackageId(Long packageId, Integer limit, Integer offset) { return phoneFidMapMapper.findFullPhoneFidMap(packageId, limit, offset); } diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameEnricher.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameEnricher.java index be9ce06..d11c256 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameEnricher.java +++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameEnricher.java @@ -6,7 +6,7 @@ import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; -import ru.nbch.credit_tracker.entities.app.PhoneFidMap; +import ru.nbch.credit_tracker.entities.app.PhonesMap; import ru.nbch.credit_tracker.entities.indic.Name; import ru.nbch.credit_tracker.model.NameData; import ru.nbch.credit_tracker.model.SubjectProfile; @@ -51,7 +51,7 @@ public class FidNameEnricher implements Handler private void processByNumber(List subjects) { LocalDateTime now = LocalDateTime.now(); Map nameByPhone = phoneService2.findNameByNumber(subjects); - List subjectForSave = subjects.stream().map(subject -> { + List subjectForSave = subjects.stream().map(subject -> { Name name = nameByPhone.get(CTUtil.normalizePhoneNumber(subject.getPhone())); if (name != null) { NameData nameData = NameData.builder() @@ -68,7 +68,7 @@ public class FidNameEnricher implements Handler subject.setFid(null); } - return PhoneFidMap.builder() + return PhonesMap.builder() .id(subject.getMapId()) .fid(subject.getFid()) .calculatedAt(now) @@ -76,7 +76,6 @@ public class FidNameEnricher implements Handler }).toList(); phoneService2.updateFid(subjectForSave); - phoneService2.registerSignals(subjectForSave); } private void processByFid(List subjects) { diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLine.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLine.java index da367ed..24431cd 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLine.java +++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLine.java @@ -6,11 +6,11 @@ import java.util.concurrent.BlockingQueue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; -import ru.nbch.credit_tracker.entities.app.PhoneFidMap; +import ru.nbch.credit_tracker.entities.app.PackagesRecordsMap; import ru.nbch.credit_tracker.entities.app.UserPackage; import ru.nbch.credit_tracker.enums.PoisonType; import ru.nbch.credit_tracker.exceptions.SignalClientException; -import ru.nbch.credit_tracker.mapper.signal.PhoneFidMapMapper; +import ru.nbch.credit_tracker.mapper.signal.PackagesRecordsMapper; import ru.nbch.credit_tracker.mapper.signal.UserPackageMapper; import ru.nbch.credit_tracker.model.PipelineContext; import ru.nbch.credit_tracker.model.SubjectProfile; @@ -27,7 +27,7 @@ public abstract class KickPipeLine implements IPipeLineStarter { private final Path pkgPath; private final StaxXmlProcessor xmlProcessor; protected final UserPackageMapper userPackageMapper; - protected final PhoneFidMapMapper phoneFidMapMapper; + protected final PackagesRecordsMapper phoneFidMapMapper; protected final CreditTrackerSettings creditTrackerSettings; private final int BATCH_SIZE; private boolean isInterrupted = false; @@ -38,7 +38,7 @@ public abstract class KickPipeLine implements IPipeLineStarter { public KickPipeLine(StaxXmlProcessor xmlProcessor, SetupParam setupParam, UserPackageMapper userPackageMapper, - PhoneFidMapMapper phoneFidMapMapper, + PackagesRecordsMapper phoneFidMapMapper, CreditTrackerSettings creditTrackerSettings) { this.packageId = setupParam.packageId(); this.pkgPath = setupParam.xmlReqPath(); @@ -68,14 +68,12 @@ public abstract class KickPipeLine implements IPipeLineStarter { context.store(PackageVariable.packageId, packageId); int limit = BATCH_SIZE; UserPackage userPackage = userPackageMapper.findPackage(packageId); - List page = nextPage(limit); + List page = nextPage(limit); while (!page.isEmpty()) { log.debug("Get page {}", page.size()); List subjectProfiles = page.stream().map(phoneFidMap -> SubjectProfile.builder() .mapId(phoneFidMap.getId()) .identifier(phoneFidMap.getSubjectId()) - //наличие этого поля зависит от выборки, в определенных select намеренно опущено это поле - .fid(phoneFidMap.getFid()) .phone(phoneFidMap.getPhone()) .build()).toList(); try { @@ -108,5 +106,5 @@ public abstract class KickPipeLine implements IPipeLineStarter { } protected abstract PipelineMode mode(); - protected abstract List nextPage(Integer limit); + protected abstract List nextPage(Integer limit); } diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLineDefaultImpl.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLineDefaultImpl.java index 89012b5..b27563b 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLineDefaultImpl.java +++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLineDefaultImpl.java @@ -2,8 +2,8 @@ package ru.nbch.credit_tracker.service.task.impl; import java.util.List; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; -import ru.nbch.credit_tracker.entities.app.PhoneFidMap; -import ru.nbch.credit_tracker.mapper.signal.PhoneFidMapMapper; +import ru.nbch.credit_tracker.entities.app.PackagesRecordsMap; +import ru.nbch.credit_tracker.mapper.signal.PackagesRecordsMapper; import ru.nbch.credit_tracker.mapper.signal.UserPackageMapper; import ru.nbch.credit_tracker.service.task.SetupParam; import ru.nbch.credit_tracker.service.xml.stax.StaxXmlProcessor; @@ -13,7 +13,7 @@ public class KickPipeLineDefaultImpl extends KickPipeLine { public KickPipeLineDefaultImpl(StaxXmlProcessor xmlProcessor, SetupParam setupParam, UserPackageMapper userPackageMapper, - PhoneFidMapMapper phoneFidMapMapper, + PackagesRecordsMapper phoneFidMapMapper, CreditTrackerSettings creditTrackerSettings) { super(xmlProcessor, setupParam, userPackageMapper, phoneFidMapMapper, creditTrackerSettings); } @@ -24,7 +24,7 @@ public class KickPipeLineDefaultImpl extends KickPipeLine { } @Override - protected List nextPage(Integer limit) { + protected List nextPage(Integer limit) { return phoneFidMapMapper.findFullPhoneFidMap(packageId, limit, offset); } diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLineRepeatedRestoreImpl.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLineRepeatedRestoreImpl.java index f850af6..143ee6a 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLineRepeatedRestoreImpl.java +++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLineRepeatedRestoreImpl.java @@ -3,8 +3,8 @@ package ru.nbch.credit_tracker.service.task.impl; import java.util.ArrayList; import java.util.List; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; -import ru.nbch.credit_tracker.entities.app.PhoneFidMap; -import ru.nbch.credit_tracker.mapper.signal.PhoneFidMapMapper; +import ru.nbch.credit_tracker.entities.app.PackagesRecordsMap; +import ru.nbch.credit_tracker.mapper.signal.PackagesRecordsMapper; import ru.nbch.credit_tracker.mapper.signal.UserPackageMapper; import ru.nbch.credit_tracker.service.task.SetupParam; import ru.nbch.credit_tracker.service.xml.stax.StaxXmlProcessor; @@ -16,7 +16,7 @@ public class KickPipeLineRepeatedRestoreImpl extends KickPipeLine { public KickPipeLineRepeatedRestoreImpl(StaxXmlProcessor xmlProcessor, SetupParam setupParam, UserPackageMapper userPackageMapper, - PhoneFidMapMapper phoneFidMapMapper, + PackagesRecordsMapper phoneFidMapMapper, CreditTrackerSettings creditTrackerSettings) { super(xmlProcessor, setupParam, userPackageMapper, phoneFidMapMapper, creditTrackerSettings); this.daysToUpdateFlags = creditTrackerSettings.getDaysToUpdateFlags().intValue(); @@ -28,16 +28,17 @@ public class KickPipeLineRepeatedRestoreImpl extends KickPipeLine { } @Override - protected List nextPage(Integer limit) { - List pageWithNullFids = new ArrayList<>(); - if (!oldRowsWereFound) { - pageWithNullFids = phoneFidMapMapper.pageByPackageIdAndOlderThanN(packageId, limit, offset, daysToUpdateFlags); - } - if (pageWithNullFids.isEmpty()) { - oldRowsWereFound = true; - offset = 0; - return phoneFidMapMapper.pageByPackageIdAndNewerThanN(packageId, limit, offset, daysToUpdateFlags); - } + protected List nextPage(Integer limit) { + List pageWithNullFids = new ArrayList<>(); + //fixme здесь должен быть запрос к таблице signals_phones_map, см. xml маппер +// if (!oldRowsWereFound) { +// pageWithNullFids = phoneFidMapMapper.pageByPackageIdAndOlderThanN(packageId, limit, offset, daysToUpdateFlags); +// } +// if (pageWithNullFids.isEmpty()) { +// oldRowsWereFound = true; +// offset = 0; +// return phoneFidMapMapper.pageByPackageIdAndNewerThanN(packageId, limit, offset, daysToUpdateFlags); +// } return pageWithNullFids; } } diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLineRestoreImpl.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLineRestoreImpl.java index 7b56915..7abfb22 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLineRestoreImpl.java +++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/KickPipeLineRestoreImpl.java @@ -3,8 +3,8 @@ package ru.nbch.credit_tracker.service.task.impl; import java.util.ArrayList; import java.util.List; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; -import ru.nbch.credit_tracker.entities.app.PhoneFidMap; -import ru.nbch.credit_tracker.mapper.signal.PhoneFidMapMapper; +import ru.nbch.credit_tracker.entities.app.PackagesRecordsMap; +import ru.nbch.credit_tracker.mapper.signal.PackagesRecordsMapper; import ru.nbch.credit_tracker.mapper.signal.UserPackageMapper; import ru.nbch.credit_tracker.service.task.SetupParam; import ru.nbch.credit_tracker.service.xml.stax.StaxXmlProcessor; @@ -15,7 +15,7 @@ public class KickPipeLineRestoreImpl extends KickPipeLine { public KickPipeLineRestoreImpl(StaxXmlProcessor xmlProcessor, SetupParam setupParam, UserPackageMapper userPackageMapper, - PhoneFidMapMapper phoneFidMapMapper, + PackagesRecordsMapper phoneFidMapMapper, CreditTrackerSettings creditTrackerSettings) { super(xmlProcessor, setupParam, userPackageMapper, phoneFidMapMapper, creditTrackerSettings); } @@ -26,18 +26,19 @@ public class KickPipeLineRestoreImpl extends KickPipeLine { } @Override - protected List nextPage(Integer limit) { - List page = new ArrayList<>(); - if (!nullFidsWereFound) { - page = phoneFidMapMapper.findNullFidPhoneFidMap(packageId, limit, offset); - } - if (page.isEmpty()) { - if (!nullFidsWereFound) { - nullFidsWereFound = true; - offset = 0; - } - return phoneFidMapMapper.findNotNullFidPhoneFidMap(packageId, limit, offset); - } + protected List nextPage(Integer limit) { + //todo рассмотреть к удалению + List page = new ArrayList<>(); +// if (!nullFidsWereFound) { +// page = phoneFidMapMapper.findNullFidPhoneFidMap(packageId, limit, offset); +// } +// if (page.isEmpty()) { +// if (!nullFidsWereFound) { +// nullFidsWereFound = true; +// offset = 0; +// } +// return phoneFidMapMapper.findNotNullFidPhoneFidMap(packageId, limit, offset); +// } return page; } } diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/Saver.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/Saver.java index c8ea7fb..cd56ee7 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/Saver.java +++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/Saver.java @@ -9,7 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; -import ru.nbch.credit_tracker.entities.app.PhoneFidMap; +import ru.nbch.credit_tracker.entities.app.PackagesRecordsMap; import ru.nbch.credit_tracker.entities.user_request.monitoring_request.MonitoringRequest; import ru.nbch.credit_tracker.enums.Status; import ru.nbch.credit_tracker.mapper.signal.UserPackageMapper; @@ -43,7 +43,7 @@ public class Saver { request -> { if (!request.getSubjects().getSubject().isEmpty()) { log.trace("Reading subject's {} batch. PackageId: {}", request.getSubjects().getSubject().size(), packageId); - List subjectForSave = request.getSubjects().getSubject().stream().map(subject -> PhoneFidMap.builder() + List subjectForSave = request.getSubjects().getSubject().stream().map(subject -> PackagesRecordsMap.builder() .subjectId(subject.getId()) .packageId(packageId) .phone(subject.getClientId()) diff --git a/src/main/resources/mybatis/mapper/signal/PackageRecordsMapper.xml b/src/main/resources/mybatis/mapper/signal/PackageRecordsMapper.xml new file mode 100644 index 0000000..3470efe --- /dev/null +++ b/src/main/resources/mybatis/mapper/signal/PackageRecordsMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + update signals_packages_records dst + set error_text = src.error_text + FROM json_to_recordset(#{json}::json) AS src( + id bigint, + error_text text + ) + where dst.id = src.id; + + + + DELETE + FROM signals_packages_records + WHERE package_id = #{packageId} + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/signal/PhoneFidMapMapper.xml b/src/main/resources/mybatis/mapper/signal/PhoneFidMapMapper.xml deleted file mode 100644 index 48e7207..0000000 --- a/src/main/resources/mybatis/mapper/signal/PhoneFidMapMapper.xml +++ /dev/null @@ -1,249 +0,0 @@ - - - - - - - - - - - - - - - - - - - INSERT INTO signals_phone_fid_map (subject_id, phone, fid, package_id) - values - - (#{subject.id}, #{subject.clientId}, NULL, #{packageId}) - - - - - INSERT INTO signals_phone_fid_map (subject_id, fid, phone, package_id, flag_debt5000, flag_90_12, calculated_at) - values - - (#{phoneFid.subjectId}, #{phoneFid.fid}, #{phoneFid.phone}, #{phoneFid.packageId}, #{phoneFid.flagDebt5000}, - #{phoneFid.flag90days}, #{phoneFid.calculatedAt}) - - - - - - - - - - - - - - - - - - - - - update signals_phone_fid_map dst - set fid = src.fid, - searched_at = now(), - error_text = null - FROM json_to_recordset(#{json}::json) AS src( - id bigint, - fid int - ) - where dst.id = src.id; - - - - update signals_phone_fid_map dst - set error_text = src.error_text - FROM json_to_recordset(#{json}::json) AS src( - id bigint, - error_text text - ) - where dst.id = src.id; - - - - DELETE - FROM signals_phone_fid_map - WHERE package_id = #{packageId} - - - - INSERT INTO signals_phone_fid_map (subject_id, phone, package_id) - values - - (#{phoneFid.subjectId}, #{phoneFid.phone}, #{phoneFid.packageId}) - - - - - - - UPDATE signals_phone_fid_map - SET - package_id = #{subject.packageId}, - subject_id = #{subject.subjectId}, - phone = #{subject.phone}, - fid = #{subject.fid}, - flag_debt5000 = #{subject.flagDebt5000}, - flag_90_12 = #{subject.flag90days}, - calculated_at = #{subject.calculatedAt}, - error_text = #{subject.errorText} - WHERE id = #{subject.id} - - - - - UPDATE signals_phone_fid_map - SET package_id = #{subject.packageId}, - subject_id = #{subject.subjectId}, - phone = #{subject.phone}, - fid = #{subject.fid2}, - flag_debt5000 = #{subject.flagDebt5000}, - flag_90_12 = #{subject.flag90days}, - calculated_at = #{subject.calculatedAt}, - error_text = #{subject.errorText} - WHERE id = #{subject.id} - - - - - UPDATE signals_phone_fid_map - SET - fid = #{subject.fid} - WHERE rec_uuid = #{subject.id} - - - - - - UPDATE signals_phone_fid_map - SET - error_text = #{subject.errorText} - WHERE id = #{subject.recUuid} - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/signal/SignalsPhonesMapMapper.xml b/src/main/resources/mybatis/mapper/signal/SignalsPhonesMapMapper.xml new file mode 100644 index 0000000..eb29088 --- /dev/null +++ b/src/main/resources/mybatis/mapper/signal/SignalsPhonesMapMapper.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + update signals_phones_map dst + set fid = src.fid, + searched_at = now() + FROM json_to_recordset(#{json}::json) AS src( + id bigint, + fid int + ) + where dst.id = src.id; + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/sql/v2.21.ddl b/src/main/resources/sql/v2.21.ddl index 1e8bffc..385c2f7 100644 --- a/src/main/resources/sql/v2.21.ddl +++ b/src/main/resources/sql/v2.21.ddl @@ -1,12 +1,12 @@ - -CREATE TABLE app_version ( +CREATE TABLE app_version +( DB_VERSION varchar(12) ); alter table signals_user_packages - add LAST_SEARCHED_AT timestamp; + add LAST_SEARCHED_AT timestamp; alter table signals_user_packages - add REJECT_STATUS varchar(255); + add REJECT_STATUS varchar(255); alter table signals_phone_fid_map add SEARCHED_AT timestamp; @@ -15,16 +15,43 @@ alter table signals_hits add PHONE bigint; -CREATE TABLE signals_flags ( - ID SERIAL PRIMARY KEY, - MAP_ID bigint, - SUBJECT_ID varchar(255), - PHONE varchar(255), - FID int, +CREATE TABLE signals_flags +( + ID SERIAL PRIMARY KEY, + MAP_ID bigint, + SUBJECT_ID varchar(255), + PHONE varchar(255), + FID int, FLAG_DEBT5000 smallint, - FLAG_90_12 smallint, + FLAG_90_12 smallint, CALCULATED_AT timestamp ); -ALTER TABLE signals_flags -ADD CONSTRAINT signals_flags_map_id_key UNIQUE(map_id); \ No newline at end of file +CREATE TABLE signals_phones_map +( + ID SERIAL PRIMARY KEY, + FID int, + PHONE bigint, + NAME_1 varchar(255), + FIRST varchar(255), + MIDDLE varchar(255), + BIRTH_DT timestamp, + SER_NUM varchar(255), + ID_TYPE varchar(255), + FLAG_DEBT5000 smallint, + FLAG_90_12 smallint, + SEARCHED_AT timestamp, + CALCULATED_AT timestamp +); + +ALTER TABLE signals_phones_map + ADD CONSTRAINT signals_phones_map_phone_key UNIQUE (PHONE); + +alter table signals_phone_fid_map rename to signals_packages_records; +alter table signals_packages_records drop column fid; +alter table signals_packages_records drop column flag_debt5000; +alter table signals_packages_records drop column flag_90_12; +alter table signals_packages_records drop column calculated_at; +alter table signals_packages_records drop column rec_uuid; +alter table signals_packages_records drop column searched_at; +-- todo alter indexes and other constrains diff --git a/src/test/java/ru/nbch/credit_tracker/service/PhoneService2Test.java b/src/test/java/ru/nbch/credit_tracker/service/PhoneService2Test.java index 53c44c7..5c24d52 100644 --- a/src/test/java/ru/nbch/credit_tracker/service/PhoneService2Test.java +++ b/src/test/java/ru/nbch/credit_tracker/service/PhoneService2Test.java @@ -10,7 +10,7 @@ import static org.mockito.ArgumentMatchers.any; import org.mockito.Mock; import static org.mockito.Mockito.when; import org.mockito.junit.jupiter.MockitoExtension; -import ru.nbch.credit_tracker.entities.app.PhoneFidMap; +import ru.nbch.credit_tracker.entities.app.PackagesRecordsMap; import ru.nbch.credit_tracker.repository.PhoneRepository; @ExtendWith(MockitoExtension.class) @@ -26,12 +26,12 @@ public class PhoneService2Test { fidsDataWithEqualSinceDt.sort(byDbOrder); when(phoneRepository.findFids(any())).thenReturn(fidsDataWithEqualSinceDt); - 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()); - phoneFidMap.add(PhoneFidMap.builder().phone("1115").build()); + List phoneFidMap = new ArrayList<>(); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1111").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1112").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1113").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1114").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1115").build()); //todo // Map res = phoneService.defineFidByPhone(phoneFidMap); @@ -49,12 +49,12 @@ public class PhoneService2Test { fidsDataWithEqualSinceDt.sort(byDbOrder); when(phoneRepository.findFids(any())).thenReturn(fidsDataWithEqualSinceDt2); - 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()); - phoneFidMap.add(PhoneFidMap.builder().phone("1115").build()); + List phoneFidMap = new ArrayList<>(); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1111").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1112").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1113").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1114").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1115").build()); //todo // Map res = phoneService.defineFidByPhone(phoneFidMap); @@ -71,12 +71,12 @@ public class PhoneService2Test { fidsDataWithEqualSinceDt.sort(byDbOrder); when(phoneRepository.findFids(any())).thenReturn(fidsDataWithEqualSinceDt3); - 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()); - phoneFidMap.add(PhoneFidMap.builder().phone("1115").build()); + List phoneFidMap = new ArrayList<>(); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1111").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1112").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1113").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1114").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1115").build()); //todo // Map res = phoneService.defineFidByPhone(phoneFidMap); @@ -125,12 +125,12 @@ public class PhoneService2Test { // fidsDataWithNameEqualSinceDt.sort(byDbOrderWithName); // when(phoneRepository.findFidsWithName(any())).thenReturn(fidsDataWithNameEqualSinceDt); - 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()); - phoneFidMap.add(PhoneFidMap.builder().phone("1115").build()); + List phoneFidMap = new ArrayList<>(); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1111").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1112").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1113").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1114").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1115").build()); //todo // Map res = phoneService.defineFidsAndNameByPhone(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 94cbb0e..3b21c46 100644 --- a/src/test/java/ru/nbch/credit_tracker/service/PhoneServiceTest.java +++ b/src/test/java/ru/nbch/credit_tracker/service/PhoneServiceTest.java @@ -10,7 +10,7 @@ import static org.mockito.ArgumentMatchers.any; import org.mockito.Mock; import static org.mockito.Mockito.when; import org.mockito.junit.jupiter.MockitoExtension; -import ru.nbch.credit_tracker.entities.app.PhoneFidMap; +import ru.nbch.credit_tracker.entities.app.PackagesRecordsMap; import ru.nbch.credit_tracker.repository.PhoneRepository; @ExtendWith(MockitoExtension.class) @@ -26,12 +26,12 @@ public class PhoneServiceTest { fidsDataWithEqualSinceDt.sort(byDbOrder); when(phoneRepository.findFidsLong(any())).thenReturn(fidsDataWithEqualSinceDt); - 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()); - phoneFidMap.add(PhoneFidMap.builder().phone("1115").build()); + List phoneFidMap = new ArrayList<>(); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1111").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1112").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1113").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1114").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1115").build()); //todo // Map res = phoneService.defineFidByPhone(phoneFidMap); @@ -49,12 +49,12 @@ public class PhoneServiceTest { fidsDataWithEqualSinceDt.sort(byDbOrder); when(phoneRepository.findFidsLong(any())).thenReturn(fidsDataWithEqualSinceDt2); - 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()); - phoneFidMap.add(PhoneFidMap.builder().phone("1115").build()); + List phoneFidMap = new ArrayList<>(); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1111").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1112").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1113").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1114").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1115").build()); //todo // Map res = phoneService.defineFidByPhone(phoneFidMap); @@ -71,12 +71,12 @@ public class PhoneServiceTest { fidsDataWithEqualSinceDt.sort(byDbOrder); when(phoneRepository.findFidsLong(any())).thenReturn(fidsDataWithEqualSinceDt3); - 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()); - phoneFidMap.add(PhoneFidMap.builder().phone("1115").build()); + List phoneFidMap = new ArrayList<>(); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1111").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1112").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1113").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1114").build()); + phoneFidMap.add(PackagesRecordsMap.builder().phone("1115").build()); //todo // Map res = phoneService.defineFidByPhone(phoneFidMap); diff --git a/src/test/java/ru/nbch/credit_tracker/stax/StaxTest.java b/src/test/java/ru/nbch/credit_tracker/stax/StaxTest.java index b63d6e2..a75fac6 100644 --- a/src/test/java/ru/nbch/credit_tracker/stax/StaxTest.java +++ b/src/test/java/ru/nbch/credit_tracker/stax/StaxTest.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import ru.nbch.credit_tracker.entities.app.PhoneFidMap; +import ru.nbch.credit_tracker.entities.app.PackagesRecordsMap; import ru.nbch.credit_tracker.entities.external_response.monitoring_report_error.MonitoringReportErrors; import ru.nbch.credit_tracker.entities.external_response.online_download.Person; import ru.nbch.credit_tracker.entities.external_response.online_download.Persons; @@ -156,12 +156,12 @@ public class StaxTest { @Test void testMonitoringReportErrors() { - List subjects = new ArrayList<>(); + List subjects = new ArrayList<>(); staxXmlProcessor.read(getClass().getResourceAsStream("/monitoring_request/xml/report_errors.xml"), MonitoringReportErrors.class, request -> { if (!request.getPersons().isEmpty()) { - List batch = request.getPersons().stream().map(p -> { - return PhoneFidMap.builder() + List batch = request.getPersons().stream().map(p -> { + return PackagesRecordsMap.builder() .id(p.getUid()) .errorText(p.getValue()) .build();