diff --git a/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java b/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java index f84f93b..ca5485a 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/UpdatingFlagsService.java @@ -4,6 +4,7 @@ import java.util.List; import lombok.extern.slf4j.Slf4j; import org.slf4j.MDC; import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; import ru.nbch.credit_tracker.entities.app.UserPackage; @@ -46,8 +47,8 @@ public class UpdatingFlagsService { this.pipelineRecalcPDOrchestrator = pipelineRecalcPDOrchestrator; } -// @Scheduled(cron = "${ct.update-flags-cron-expression}") - private void updateOld() { + @Scheduled(cron = "${ct.update-flags-cron-expression}") + private void update() { log.info("Start updating flags"); List packages = userPackageMapper.findAllPackagesByStatus(Status.ON_MONITORING.name()); for (UserPackage userPackage : packages) { @@ -68,15 +69,4 @@ public class UpdatingFlagsService { } log.info("Finish updating flags"); } - -// @Scheduled(cron = "${ct.update-flags-cron-expression}") - public void update() { - log.info("Start updating flags"); - try { - Pipeline pipeline = pipelinePackageManager.buildRecalculationPD(new SetupParam(null, null, PipelineMode.RECALC_PERSONAL_DATA)); - pipelineRecalcPDOrchestrator.startOrReject(pipeline); - } catch (Exception e) { - log.error("Failed to build pipeline", e); - } - } } diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/PipelinePackageFabric.java b/src/main/java/ru/nbch/credit_tracker/service/task/PipelinePackageFabric.java index 21ce561..53b3154 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/task/PipelinePackageFabric.java +++ b/src/main/java/ru/nbch/credit_tracker/service/task/PipelinePackageFabric.java @@ -80,7 +80,6 @@ public class PipelinePackageFabric implements InitializingBean { public Pipeline build(SetupParam setupParam) throws Exception { return PipeLineBuilderV2.first(nameEnricherQueueFactory.getObject(), idEnricherQueueFactory.getObject()) .handler(fidNameEnricher) - .handlerResult(flagsEnricherV2) .andThen() .stage(sendSignalQueueFactory.getObject()) .handler(fidIdEnricherHandler) diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameUpdater.java b/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameUpdater.java index d6c450f..edd4546 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameUpdater.java +++ b/src/main/java/ru/nbch/credit_tracker/service/task/impl/FidNameUpdater.java @@ -77,8 +77,6 @@ public class FidNameUpdater implements Handler { userPackageService.setFidChanged(packageIds); } } - //2.set new fid name and id data in signals_phones_map - //2.2 set FID_CHANGED = 1 for this package(select by phone) return new SubjectPayload(null, null, null, changingFidPhones); }