From 9cb5a16490e8a552c169f90e66aa95cf71f44edd Mon Sep 17 00:00:00 2001
From: etreschenkov <ETreschenkov@mfd.ru>
Date: Fri, 31 Oct 2025 13:25:26 +0300
Subject: [PATCH] some refactoring :]

---
 .../credit_tracker/service/task/PipelinePackageManager.java | 6 ++++--
 .../service/task/impl/SaveSubjectHandler.java               | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/PipelinePackageManager.java b/src/main/java/ru/nbch/credit_tracker/service/task/PipelinePackageManager.java
index 2a1601c..7c598b4 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/task/PipelinePackageManager.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/task/PipelinePackageManager.java
@@ -28,21 +28,23 @@ public class PipelinePackageManager {
     private final StaxXmlProcessor xmlProcessor;
     private final StageQueueFactory<SubjectPayload> saveSubjectQueueFactory;
     private final StageQueueFactory<SubjectPayload> idEnricherQueueFactory;
+    private final SaveSubjectHandler saveSubjectHandler;
     private final ExecutorService executorService = Executors.newFixedThreadPool(10);
     private final static int BATCH_SIZE = 10_000;
 
     public PipelinePackageManager(ApplicationContext applicationContext,
                                   StaxXmlProcessor xmlProcessor,
                                   @Qualifier("saveSubjectQueueFactory") StageQueueFactory<SubjectPayload> saveSubjectQueueFactory,
-                                  @Qualifier("idEnricherQueueFactory") StageQueueFactory<SubjectPayload> idEnricherQueueFactory) {
+                                  @Qualifier("idEnricherQueueFactory") StageQueueFactory<SubjectPayload> idEnricherQueueFactory,
+                                  SaveSubjectHandler saveSubjectHandler) {
         this.applicationContext = applicationContext;
         this.xmlProcessor = xmlProcessor;
         this.saveSubjectQueueFactory = saveSubjectQueueFactory;
         this.idEnricherQueueFactory = idEnricherQueueFactory;
+        this.saveSubjectHandler = saveSubjectHandler;
     }
 
     public void buildAndRun(Long packageId, String pkgPath) throws Exception {
-        SaveSubjectHandler saveSubjectHandler = applicationContext.getBean(SaveSubjectHandler.class);
         BlockingQueue<SubjectPayload> saveSubjectQueue = saveSubjectQueueFactory.getObject();
         BlockingQueue<SubjectPayload> idEnricherQueue = idEnricherQueueFactory.getObject();
 
diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/SaveSubjectHandler.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/SaveSubjectHandler.java
index e89fca3..84155e9 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/SaveSubjectHandler.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/SaveSubjectHandler.java
@@ -42,6 +42,7 @@ public class SaveSubjectHandler implements Handler<SubjectPayload, SubjectPayloa
         phoneFidMapService.register(subjects, nameByPhone, packageId);
 
         //fill name info
+        //todo сделать один проход для установки FID для вставки в PHONE_FID_MAP и одновременного заполнения инфо из Name для дальнейшей обработки
         subjects.stream()
             .filter(subject -> nameByPhone.containsKey(CTUtil.normalizePhoneNumber(subject.getPhone())))
             .forEach(subject -> {