From a3ac454cb30868fd96dc12a7ce8541b0d68d1aa5 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Tue, 12 Sep 2023 11:20:06 +0300 Subject: [PATCH] =?UTF-8?q?scheduler-service=20LauncherSender=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=B4=D0=B0=D1=87=D1=83=20=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D0=BD=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20=D0=BF?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=BE=D0=B2=20CLS-29?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduler/service/LauncherSender.java | 15 +++++++++++---- .../clearing/scheduler/service/TaskManager.java | 2 +- .../scheduler/service/TaskManagerTest.java | 10 +++++----- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherSender.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherSender.java index e58529cc9..9dc370d41 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherSender.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/LauncherSender.java @@ -8,6 +8,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import ru.clearing.classes.statics.data.scheduler.PlannerAllToday; import ru.spcex.clearing.platform.messaging.domain.ActionType; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest; @@ -30,10 +31,16 @@ public class LauncherSender { this.idGenerator = imdgProvider.getImdgIdGenerator(); } - protected BaseRequest makeCmdRequest(Task byTask, Long userId) { + protected BaseRequest makeCmdRequest(PlannerAllToday byTask, Long userId) { Object toRequest; LauncherCommandRequest taskRunnerCommandRequest = new LauncherCommandRequest(); - taskRunnerCommandRequest.setTaskName(byTask.getKey()); + taskRunnerCommandRequest.setTaskName(byTask.getTask()); +// taskRunnerCommandRequest.setMarket(byTask.getMarket()); + taskRunnerCommandRequest.setSection(byTask.getSection()); + taskRunnerCommandRequest.setSessionType(byTask.getSessionType()); + taskRunnerCommandRequest.setCompanyId(byTask.getCompanyId()); + taskRunnerCommandRequest.setSecurityId(byTask.getSecurityId()); + taskRunnerCommandRequest.setUserId(userId); toRequest = taskRunnerCommandRequest; BaseRequest request = new BaseRequest<>(); @@ -44,8 +51,8 @@ public class LauncherSender { return request; } - public void sendCommandToQueue(Task toTaskQueue, Long userId) { - BaseRequest request = makeCmdRequest(toTaskQueue, userId); + public void sendCommandToQueue(Task toTaskQueue, PlannerAllToday task, Long userId) { + BaseRequest request = makeCmdRequest(task, userId); String destination = toTaskQueue.topic(); // "launcher-" + getKey() log.debug("Send command {} to {}", toTaskQueue, destination); Future send = kafka.send(new ProducerRecord<>(destination, request)); diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/TaskManager.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/TaskManager.java index 628c289f0..9b0cd4010 100644 --- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/TaskManager.java +++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/TaskManager.java @@ -228,7 +228,7 @@ public class TaskManager implements InitializingBean, AutoCloseable { launcher.setUpdated(created); launcherMap.insert(launcher); // 2. отправить сообщение - launcherSender.sendCommandToQueue(taskE, systemId); + launcherSender.sendCommandToQueue(taskE, task, systemId); log.debug("Successfully processed, new id {}", launcher.getId()); } } diff --git a/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/TaskManagerTest.java b/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/TaskManagerTest.java index 80a9b8e5e..05dce2934 100644 --- a/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/TaskManagerTest.java +++ b/clearing-parent/scheduler-service/src/test/java/ru/spcex/clearing/scheduler/service/TaskManagerTest.java @@ -48,7 +48,7 @@ class TaskManagerTest extends AbstractServiceTest { //ACT addToPlannerQueue(TaskManager.Process.add, plannerAllToday); //ASSERT - waitingWhenAddedLauncherCommandRequestAndCheckIt(getEnumByKey(Task.class, plannerAllToday.getTask()), systemId); + waitingWhenAddedLauncherCommandRequestAndCheckIt(getEnumByKey(Task.class, plannerAllToday.getTask()), plannerAllToday, systemId); } /** @@ -67,7 +67,7 @@ class TaskManagerTest extends AbstractServiceTest { //ACT addToPlannerQueue(TaskManager.Process.update, oldPlanner); //ASSERT - waitingWhenAddedLauncherCommandRequestAndCheckIt(getEnumByKey(Task.class, plannerAllToday.getTask()), systemId); + waitingWhenAddedLauncherCommandRequestAndCheckIt(getEnumByKey(Task.class, plannerAllToday.getTask()), plannerAllToday, systemId); } @@ -86,7 +86,7 @@ class TaskManagerTest extends AbstractServiceTest { //ACT addToPlannerQueue(TaskManager.Process.add, plannerAllToday); //ASSERT - waitingWhenAddedLauncherCommandRequestAndCheckIt(getEnumByKey(Task.class, plannerAllToday.getTask()), systemId); + waitingWhenAddedLauncherCommandRequestAndCheckIt(getEnumByKey(Task.class, plannerAllToday.getTask()), plannerAllToday, systemId); } protected PlannerAllToday getPlannerAllToday(String task) { @@ -98,8 +98,8 @@ class TaskManagerTest extends AbstractServiceTest { return plannerAllToday; } - public void waitingWhenAddedLauncherCommandRequestAndCheckIt(Task toTaskQueue, Long userId) { - BaseRequest predictableBaseRequest = launcherSender.makeCmdRequest(toTaskQueue, userId); + public void waitingWhenAddedLauncherCommandRequestAndCheckIt(Task toTaskQueue, PlannerAllToday plannerAllToday, Long userId) { + BaseRequest predictableBaseRequest = launcherSender.makeCmdRequest(plannerAllToday, userId); ArgumentCaptor producerRecord = getCaptor(mockProducer); //waiting for kafka producer send message (finale event)