http://jira.mfd.msk:8088/browse/BKI-3341

credit-tracker.properties

@@ -66,7 +66,7 @@ ct.load-dir=/opt/app/reports
 # min
 ct.monitoring-interval=${MONITORING_INTERVAL:15}
 # days
-ct.update-flags-interval=${UPDATE_FLAGS_INTERVAL:1}
+ct.update-flags-cron-expression=${UPDATE_FLAGS_CRON_EXPRESSION:0 0 22 * * *}
 ct.days-to-update-flags=${DAYS_TO_UPDATE_FLAGS:30}
 
 ct.encoding=windows-1251

docker_compose/credit_tracker_config.env

@@ -1,5 +1,5 @@
 #commons
-APP_VERSION=1.20
+APP_VERSION=1.24
 REGISTRY_URL=rh8-vm3.nbki.msk:5000
 JMX_PORT=
 JMX_HOSTNAME=
@@ -71,7 +71,7 @@ SIGNALS_USER=0001ZZ000001
 # min
 MONITORING_INTERVAL=15
 # days
-UPDATE_FLAGS_INTERVAL=1
+UPDATE_FLAGS_CRON_EXPRESSION=0 22 * * *
 DAYS_TO_UPDATE_FLAGS=30
 
 

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>ru.nbch</groupId>
     <artifactId>credit-tracker</artifactId>
-    <version>1.20</version>
+    <version>1.24</version>
     <name>credit_tracker</name>
     <description>Credit Tracker Application</description>
 

src/main/java/ru/nbch/credit_tracker/CreditTrackerApplication.java

@@ -15,9 +15,9 @@ public class CreditTrackerApplication {
 		UpdateProcessingPackagesService updateProcessingPackagesService = ctx.getBean(UpdateProcessingPackagesService.class);
 		MonitoringService monitoringService = ctx.getBean(MonitoringService.class);
 		UpdatingFlagsService updatingFlagsService = ctx.getBean(UpdatingFlagsService.class);
-		updateProcessingPackagesService.run();
 		monitoringService.run();
 		updatingFlagsService.run();
+		updateProcessingPackagesService.run();
 	}
 
 }

src/main/java/ru/nbch/credit_tracker/config/settings/CreditTrackerSettings.java

@@ -29,7 +29,7 @@ public class CreditTrackerSettings {
     private Long maxXmlFileSize;
     private String loadDir;
     private Long monitoringInterval;
-    private Long updateFlagsInterval;
+    private String updateFlagsCronExpression;
     private Long daysToUpdateFlags;
 
     private String encoding;

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

@@ -21,4 +21,5 @@ public interface PhoneFidMapMapper {
     PhoneFidMap findPhoneFidMapById(@Param("id") Long packageId);
 
     boolean hasNonNullFids(@Param("packageId") Long packageId);
+    boolean hasOldRow(@Param("packageId") Long packageId, @Param("daysCount") Integer daysCount);
 }

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

@@ -1,22 +1,18 @@
 package ru.nbch.credit_tracker.service;
 
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.MDC;
-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;
-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 lombok.extern.slf4j.Slf4j;
-import java.util.concurrent.ScheduledExecutorService;
+import org.slf4j.MDC;
-import java.util.concurrent.TimeUnit;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
-import java.util.function.Predicate;
+import org.springframework.scheduling.support.CronTrigger;
+import org.springframework.stereotype.Service;
+import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings;
+import ru.nbch.credit_tracker.entities.dto.UserPackage;
+import ru.nbch.credit_tracker.enums.Status;
+import ru.nbch.credit_tracker.mapper.signal.PhoneFidMapMapper;
+import ru.nbch.credit_tracker.service.signal.SignalRestService;
 
 /**
  * Сервис периодического обновления фидов и флагов просрочек по пакетам находящимся в статусе ON_MONITORING
@@ -30,31 +26,40 @@ public class UpdatingFlagsService {
     private final SignalRestService signalRestService;
     private final MonitoringErrorProcesingService monitoringErrorProcesingService;
     private final Long daysToUpdateFlags;
-    private final Long updateFlagsInterval;
+    private final String updateFlagsCronExpression;
+    private final PhoneFidMapMapper phoneFidMapMapper;
 
     public UpdatingFlagsService(SignalService signalService,
                                 SignalRestService signalRestService,
                                 MonitoringErrorProcesingService monitoringErrorProcesingService,
-                                CreditTrackerSettings config) {
+                                CreditTrackerSettings config,
+                                PhoneFidMapMapper phoneFidMapMapper) {
         this.signalService = signalService;
         this.signalRestService = signalRestService;
         this.monitoringErrorProcesingService = monitoringErrorProcesingService;
         this.daysToUpdateFlags = config.getDaysToUpdateFlags() != null ? config.getDaysToUpdateFlags() : 1;
-        this.updateFlagsInterval = config.getUpdateFlagsInterval() != null ? config.getUpdateFlagsInterval() : 1;
+        this.updateFlagsCronExpression = config.getUpdateFlagsCronExpression() != null ? config.getUpdateFlagsCronExpression() : "*/10 * * * * *";
+        this.phoneFidMapMapper = phoneFidMapMapper;
     }
 
     public void run() {
-        ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(new CustomizableThreadFactory("updating-flags-"));
+        ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
-        scheduler.scheduleAtFixedRate(this::update, 0, updateFlagsInterval, TimeUnit.DAYS);
+        scheduler.setPoolSize(1);
+        scheduler.initialize();
+        scheduler.schedule(this::update, new CronTrigger(updateFlagsCronExpression));
     }
 
-    private void update() {
+    public void update() {
         log.info("Start updating flags");
         List<UserPackage> packages = signalService.findPackagesOnMonitoring();
         for (UserPackage userPackage : packages) {
-            log.info("Updating flags for Package {}", userPackage.getPackageName());
             MDC.put("ru.nbch.credit_tracker.log.mdc.key", "[" + userPackage.getPackageName() +"]");
+            log.info("Check on updating flags for Package {}", userPackage.getPackageName());
+            boolean hasOldRow = phoneFidMapMapper.hasOldRow(userPackage.getId(), daysToUpdateFlags.intValue());
+            log.info("There are {} old rows", hasOldRow ? "exist" : "doesn't exist");
+            if (hasOldRow) {
                 updateFlags(userPackage);
+            }
             MDC.remove("ru.nbch.credit_tracker.log.mdc.key");
         }
         log.info("Finish updating flags");
@@ -65,8 +70,7 @@ public class UpdatingFlagsService {
         String packageName = userPackage.getPackageName();
         try {
             signalService.updatePackageStatus(packageId, Status.PROCESSING);
-            Predicate<PhoneFidMap> filter = subject -> subject.getCalculatedAt() != null && hasDaysPassed(subject.getCalculatedAt());
+            SignalService.UpdateResult updateResult = signalService.updateSubjects(packageId, null);
-            SignalService.UpdateResult updateResult = signalService.updateSubjects(packageId, filter);
             if (updateResult.isUpdated()) {
                 if (signalRestService.setupMonitoring(packageId)) {
                     LocalDateTime monitoringAt = userPackage.getMonitoringAt() != null ? userPackage.getMonitoringAt() : LocalDateTime.now();

src/main/resources/mybatis/mapper/indic/FlagsMapper.xml

@@ -11,70 +11,45 @@
     </resultMap>
 
     <select id="findFlagsDebt5000" resultMap="FlagsFidDataResultMap">
-        SELECT rp.FID  as fid,
+        SELECT
-               CASE
+            FID as fid,
-                   WHEN EXISTS (SELECT 1
+            (case when (sum(case when AMT_PAST_DUE > 5000 then 1 else 0 end) = 0) then 0 else 1 end) as flag
-                                FROM RU_PASTDUEARREAR rp2
+        FROM
-                                WHERE rp2.FID = rp.FID
+            (select FID, AMT_PAST_DUE, rank() over (partition by FID, ACC_SERIAL_NUM order by REPORTED_DT desc) rn
-                                  AND rp2.ACC_SERIAL_NUM = rp.ACC_SERIAL_NUM
-                                  AND rp2.REPORTED_DT = rp.MAX_REP_DATE
-                                  AND rp2.AMT_PAST_DUE > 5000) THEN 1
-                   ELSE 0
-                   END as flag
-        FROM (SELECT FID,
-                     ACC_SERIAL_NUM,
-                     MAX(REPORTED_DT) as MAX_REP_DATE
              FROM RU_PASTDUEARREAR
              WHERE FID IN
                     <foreach item="fid" collection="fids" open="(" separator="," close=")">
                         #{fid}
                     </foreach>
-              GROUP BY FID, ACC_SERIAL_NUM) rp
+              )
-        GROUP BY rp.FID, rp.ACC_SERIAL_NUM, rp.MAX_REP_DATE
+        where rn=1
+        group by FID
         WITH UR
     </select>
 
     <select id="findFlag90ByPastDueArrear" resultMap="FlagsFidDataResultMap">
-        SELECT rp.FID  as fid,
+        SELECT
-               CASE
+            FID as fid,
-                   WHEN EXISTS (SELECT 1
+            (case when (sum(case when (REPORTED_DT >= #{reportedDate} and DAYS_PAST_DUE > 90) then 1 else 0 end) = 0) then 0 else 1 end) as flag
-                                FROM RU_PASTDUEARREAR rp2
-                                WHERE rp2.FID = rp.FID
-                                  AND rp2.REPORTED_DT >= #{reportedDate}
-                                  AND rp2.DAYS_PAST_DUE > 90) THEN 1
-                   ELSE 0
-                   END as flag
-        FROM (SELECT FID,
-                     DAYS_PAST_DUE
         FROM RU_PASTDUEARREAR
         WHERE FID IN
             <foreach item="fid" collection="fids" open="(" separator="," close=")">
                 #{fid}
             </foreach>
-              GROUP BY FID, DAYS_PAST_DUE) rp
+        GROUP BY FID
-        GROUP BY rp.FID, rp.DAYS_PAST_DUE
         WITH UR
     </select>
 
     <select id="findFlag90ByRuPaymt" resultMap="FlagsFidDataResultMap">
-        SELECT rp.FID  as fid,
+        SELECT
-               CASE
+            FID as fid,
-                   WHEN EXISTS (SELECT 1
+            (case when (sum(case when (REPORTED_DT >= #{reportedDate} and DAYS_PAST_DUE > 90) then 1 else 0 end) = 0) then 0 else 1 end) as flag
-                                FROM RU_PAYMT rp2
-                                WHERE rp2.FID = rp.FID
-                                  AND rp2.REPORTED_DT >= #{reportedDate}
-                                  AND rp2.DAYS_PAST_DUE > 90) THEN 1
-                   ELSE 0
-                   END as flag
-        FROM (SELECT FID,
-                     DAYS_PAST_DUE
         FROM RU_PAYMT
         WHERE FID IN
             <foreach item="fid" collection="fids" open="(" separator="," close=")">
                 #{fid}
             </foreach>
-              GROUP BY FID, DAYS_PAST_DUE) rp
+        GROUP BY FID
-        GROUP BY rp.FID, rp.DAYS_PAST_DUE
         WITH UR
     </select>
 </mapper>

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

@@ -88,5 +88,11 @@
         where package_id = #{packageId} AND fid is not null
     </select>
 
-
+    <select id="hasOldRow" resultType="java.lang.Boolean">
+        select EXISTS(SELECT 1
+        FROM signals_phone_fid_map
+        WHERE package_id = #{packageId}
+        AND calculated_at &lt; now() - make_interval(days => #{daysCount})
+        )
+    </select>
 </mapper>

src/main/resources/sql/v1.22.ddl

@@ -0,0 +1,3 @@
+CREATE INDEX IF NOT EXISTS
+    idx_signals_phone_fid_map_calculated_at
+    ON signals_phone_fid_map (calculated_at);