From 2b2d1788508c732d459e27f0e251946ae3237cd6 Mon Sep 17 00:00:00 2001
From: etreshenkov <etreshenkov@mfd.ru>
Date: Tue, 23 May 2023 15:22:40 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-290

---
 .../ru/spcex/clearing/service/EventsReceiver.java   | 13 ++++++++++---
 .../session/stage/PrimaryAuctionBnSession.java      |  7 -------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java
index 19774c888..758b9be7b 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/EventsReceiver.java
@@ -9,19 +9,23 @@ import ru.spcex.clearing.platform.messaging.domain.cud.clearing.Sdf04Request;
 import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonIdRequest;
 import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest;
 import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
+import ru.spcex.clearing.session.stage.PrimaryAuctionBnSession;
 import ru.spcex.platform.enumeration.Task;
 
 @Service
 public class EventsReceiver extends QueueConsumer implements InitializingBean {
     private final ClearingService clearingService;
     private final RegistryService registryService;
+    private final PrimaryAuctionBnSession primaryAuctionBnSession;
 
     public EventsReceiver(Consumer<String, Object> kafkaQueue,
                           ClearingService clearingService,
-                          RegistryService registryService) {
+                          RegistryService registryService,
+                          PrimaryAuctionBnSession primaryAuctionBnSession) {
         super(kafkaQueue);
         this.clearingService = clearingService;
         this.registryService = registryService;
+        this.primaryAuctionBnSession = primaryAuctionBnSession;
     }
 
     @Override
@@ -38,12 +42,15 @@ public class EventsReceiver extends QueueConsumer implements InitializingBean {
         callback(LauncherCommandRequest.class)
                 .setConsumer(event -> clearingService.executeVerification())
                 .forDestination(Task.getVerification.topic(), callbacks::put);
-        callback(Object.class) //todo check Object suitable
-                .setConsumer(event -> clearingService.executeClearing())
+        callback(Object.class)
+                .setConsumer(primaryAuctionBnSession::runSession)
                 .forDestination(Task.startOfClearing.topic(), callbacks::put);
         callback(CommonIdRequest.class)
                 .setConsumer(clearingService::continueClearing)
                 .forDestination(Consts.CONTINUE_CLEARING, callbacks::put);
+        callback(Object.class)
+                .setConsumer(primaryAuctionBnSession::continueSession)
+                .forDestination(Consts.SDF57_PROCESS, callbacks::put);
         callback(Object.class)
                 .setConsumer(event -> clearingService.executeSTrade())
                 .forDestination(Task.getOfTrades.topic(), callbacks::put);
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java
index 68f3730bb..736648dc3 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java
@@ -10,7 +10,6 @@ import ru.clearing.classes.statics.data.execution.ExecutionCommon;
 import ru.clearing.classes.statics.data.misc.Session;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
-import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
 import ru.spcex.clearing.session.stage.impl.*;
 import ru.spcex.clearing.session.stage.task.*;
@@ -74,12 +73,6 @@ public class PrimaryAuctionBnSession extends QueueConsumer implements Initializi
 
     @Override
     public void afterPropertiesSet() throws Exception {
-        callback(Object.class)
-                .setConsumer(this::continueSession)
-                .forDestination(Consts.SDF57_PROCESS, callbacks::put);
-        callback(Object.class)
-                .setConsumer(this::runSession)
-                .forDestination(ru.spcex.platform.enumeration.Task.startOfClearing.topic(), callbacks::put);
         init();
     }