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

credit-tracker.properties

@@ -65,6 +65,7 @@ ct.load-dir=/opt/app/reports
 
 # min
 ct.monitoring-interval=${MONITORING_INTERVAL:15}
+ct.monitoring-membercodes=${MONITORING_MEMBERCODES:0001XX,0001BB}
 # days
 ct.update-flags-cron-expression=${UPDATE_FLAGS_CRON_EXPRESSION:0 25 18 * * *}
 ct.new-flags-cron-expression=${NEW_FLAGS_CRON_EXPRESSION:0 25 18 * * *}

docker_compose/credit_tracker_config.env

@@ -72,6 +72,7 @@ SIGNALS_USER=0001ZZ000001
 
 # min
 MONITORING_INTERVAL=15
+MONITORING_MEMBERCODES=0001XX,0001BB
 # days
 DAYS_TO_UPDATE_FLAGS=30
 

docker_compose/docker-compose.yml

@@ -64,6 +64,7 @@ services:
       - SIGNALS_TOKEN=${SIGNALS_TOKEN}
       - SIGNALS_USER=${SIGNALS_USER}
       - MONITORING_INTERVAL=${MONITORING_INTERVAL}
+      - MONITORING_MEMBERCODES=${MONITORING_MEMBERCODES}
       - UPDATE_FLAGS_CRON_EXPRESSION=${UPDATE_FLAGS_CRON_EXPRESSION}
       - NEW_FLAGS_CRON_EXPRESSION=${NEW_FLAGS_CRON_EXPRESSION}
       - UPDATE_FIDS_CRON_EXPRESSION=${UPDATE_FIDS_CRON_EXPRESSION}

pom.xml

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

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

@@ -1,5 +1,6 @@
 package ru.nbch.credit_tracker.config.settings;
 
+import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -33,6 +34,7 @@ public class CreditTrackerSettings {
     private Long maxXmlFileSize;
     private String loadDir;
     private Long monitoringInterval;
+    private List<String> monitoringMembercodes;
     private String updateFlagsCronExpression;
     private Integer daysToUpdateFlags;
     private Long daysToUpdateFids;

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

@@ -29,6 +29,7 @@ public interface UserPackageMapper {
     List<UserPackage> findUserPackages(@Param("userId") String userId, @Param("statuses") List<String> status);
 
     List<UserPackage> findAllPackagesByStatus(@Param("statuses") String... statuses);
+    List<UserPackage> findOnMonitoringByMemberCode(List<String> membercodes);
 
     List<UserPackage> findAllPackagesByUserId(@Param("userId") String userId);
     UserPackage findByPackageName(@Param("packageName") String packageName);

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

@@ -35,7 +35,6 @@ import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response.
 import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response.Signal;
 import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response.Signals;
 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.UserPackageMapper;
 import ru.nbch.credit_tracker.service.signal.HitsService;
@@ -88,8 +87,7 @@ public class MonitoringService {
     private void monitor() {
         try {
             log.info("Start monitoring");
-            List<UserPackage> packages = userPackageMapper.findAllPackagesByStatus(Status.ON_MONITORING.name(),
+            List<UserPackage> packages = userPackageMapper.findOnMonitoringByMemberCode(config.getMonitoringMembercodes());
-                Status.PROCESSING_REPEATED.name());
             for (UserPackage userPackage : packages) {
                 MDC.put("ru.nbch.credit_tracker.log.mdc.key", "[" + userPackage.getPackageName() + "]");
                 processPackage(userPackage);

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

@@ -229,6 +229,24 @@
         </foreach>
     </select>
 
+    <select id="findOnMonitoringByMemberCode" resultMap="packageDataResultMap">
+        SELECT id,
+        membercode,
+        package_name,
+        created_at,
+        status,
+        deactivated_at,
+        last_downloaded_report,
+        monitoring_at,
+        reject_status,
+        signal_types
+        FROM signals_user_packages
+        WHERE status in ('ON_MONITORING', 'PROCESSING_REPEATED') and LEFT(membercode, 6) in
+        <foreach collection="membercodes" item="membercode" separator="," open="(" close=")">
+            #{membercode}
+        </foreach>
+    </select>
+
     <select id="findByMemberCodeAndPackageName" resultMap="packageDataResultMap">
         SELECT id,
                membercode,