Removed unused methods; Uncommented schedulers

src/main/java/ru/nbch/credit_tracker/mapper/signal/PhoneFidMapMapper.java

@@ -15,7 +15,6 @@ public interface PhoneFidMapMapper {
     List<PhoneFidMap> findFullPhoneFidMap(@Param("packageId") Integer packageId, @Param("offset") int offset, @Param("limit") int limit);
 
     void updatePhoneFidMaps(@Param("subjects") List<PhoneFidMap> subjects);
-    void updatePhoneFid(@Param("subject") PhoneFidMap subject);
 
     void updatePhoneFidMapsErrors(@Param("subjects") List<PhoneFidMap> subjects);
 

src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java

@@ -1,22 +1,8 @@
 package ru.nbch.credit_tracker.service;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
 import org.springframework.stereotype.Service;
 import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings;
 import ru.nbch.credit_tracker.entities.dto.Hit;
@@ -36,6 +22,21 @@ import ru.nbch.credit_tracker.service.xml.stax.MonitoringSignalResponseStaxXmlWr
 import ru.nbch.credit_tracker.service.xml.stax.StaxXmlProcessor;
 import ru.nbch.credit_tracker.utils.CTUtil;
 
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
 /**
  * Сервис периодического опроса официального сервиса сигналов на наличие новых отчетов по пакетам находящимся в статусе ON_MONITORING
  */
@@ -59,9 +60,9 @@ public class MonitoringService {
     }
 
     public void run() {
-//        ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(new CustomizableThreadFactory("monitoring-"));
+        ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(new CustomizableThreadFactory("monitoring-"));
-//        long period = config.getMonitoringInterval() != null ? config.getMonitoringInterval() : 15;
+        long period = config.getMonitoringInterval() != null ? config.getMonitoringInterval() : 15;
-//        scheduler.scheduleAtFixedRate(this::monitor, 0, period, TimeUnit.MINUTES);
+        scheduler.scheduleAtFixedRate(this::monitor, 0, period, TimeUnit.MINUTES);
     }
 
     private void monitor() {

src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java

@@ -2,9 +2,12 @@ package ru.nbch.credit_tracker.service;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import ru.nbch.credit_tracker.entities.dto.UserPackage;
 import ru.nbch.credit_tracker.enums.Status;
 import ru.nbch.credit_tracker.service.signal.SignalRestService;
 
+import java.util.List;
+
 /**
  * Сервис для завершения обработки пакетов находящихся в статусе PROCESSING
  * Запускается при старте приложения и отрабатывает 1 раз
@@ -26,13 +29,13 @@ public class UpdateProcessingPackagesService {
     }
 
     public void run() {
-//        log.info("Start updating processing packages");
+        log.info("Start updating processing packages");
-//        List<UserPackage> packages = signalService.findPackagesOnProcessing();
+        List<UserPackage> packages = signalService.findPackagesOnProcessing();
-//        for (UserPackage userPackage : packages) {
+        for (UserPackage userPackage : packages) {
-//            log.info("Updating flags for Package {}", userPackage.getPackageName());
+            log.info("Updating flags for Package {}", userPackage.getPackageName());
-//            process(userPackage.getId(), userPackage.getPackageName());
+            process(userPackage.getId(), userPackage.getPackageName());
-//        }
+        }
-//        log.info("Finish updating processing packages");
+        log.info("Finish updating processing packages");
     }
 
     private void process(Integer packageId, String packageName) {

src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java

@@ -1,10 +1,7 @@
 package ru.nbch.credit_tracker.service;
 
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.List;
-import java.util.function.Predicate;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
 import org.springframework.stereotype.Service;
 import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings;
 import ru.nbch.credit_tracker.entities.dto.PhoneFidMap;
@@ -12,6 +9,14 @@ import ru.nbch.credit_tracker.entities.dto.UserPackage;
 import ru.nbch.credit_tracker.enums.Status;
 import ru.nbch.credit_tracker.service.signal.SignalRestService;
 
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
+
 /**
  * Сервис периодического обновления фидов и флагов просрочек по пакетам находящимся в статусе ON_MONITORING
  * По обновленным пакетам формируется новый запрос постановки на мониторинг в официальный сервис сигналов
@@ -38,8 +43,8 @@ public class UpdatingFlagsService {
     }
 
     public void run() {
-//        ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(new CustomizableThreadFactory("updating-flags-"));
+        ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(new CustomizableThreadFactory("updating-flags-"));
-//        scheduler.scheduleAtFixedRate(this::update, 0, updateFlagsInterval, TimeUnit.DAYS);
+        scheduler.scheduleAtFixedRate(this::update, 0, updateFlagsInterval, TimeUnit.DAYS);
     }
 
     private void update() {

src/main/java/ru/nbch/credit_tracker/service/indic/PhoneService.java

@@ -11,7 +11,6 @@ import ru.nbch.credit_tracker.mapper.indic.PhoneMapper;
 
 import java.time.LocalDate;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -25,13 +24,8 @@ public class PhoneService {
 
     /**
      * Ищет фиды по номерам телефона
-     * @return Map: key - номер телефона; value - fid
+     * @return Map: key - fid; value - {@link PhoneFidMap}
      */
-    public Map<String, Integer> findFidsPhoneData(List<PhoneFidMap> subjects) {
-        List<String> phones = subjects.stream().map(subject -> "9" + subject.getPhone()).toList();
-        return convertFidsDataToMap(mapper.findFids(phones));
-    }
-
     public Map<Integer, PhoneFidMap> defineFidByPhone(List<PhoneFidMap> subjects) {
         Map<Integer, PhoneFidMap> phoneFidMap = new HashMap<>();
         List<String> phones = subjects.stream().
@@ -65,23 +59,6 @@ public class PhoneService {
         return phoneFidMap;
     }
 
-    private Map<String, Integer> convertFidsDataToMap(List<FidsData> fidsData) {
-        if (fidsData == null || fidsData.isEmpty()) {
-            return new HashMap<>();
-        }
-        return fidsData.stream()
-                .collect(Collectors.groupingBy(
-                        FidsData::getPhone,
-                        Collectors.collectingAndThen(
-                                Collectors.maxBy(
-                                        Comparator.comparing(FidsData::getFileSinceDate)
-                                                .thenComparing(FidsData::getFid)
-                                ),
-                                data -> data.map(FidsData::getFid).orElse(null)
-                        )
-                ));
-    }
-
     @Getter
     @Setter
     @AllArgsConstructor

src/main/resources/mybatis/mapper/signal/PhoneFidMapMapper.xml

@@ -42,17 +42,6 @@
         </foreach>
     </update>
 
-    <update id="updatePhoneFid" parameterType="ru.nbch.credit_tracker.entities.dto.PhoneFidMap">
-            UPDATE signals_phone_fid_map
-            SET
-            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>
-
     <update id="updatePhoneFidMapsErrors" parameterType="java.util.List">
         <foreach collection="subjects" item="subject" separator=";">
             UPDATE signals_phone_fid_map