Commit 729bc3f5 authored by Enriko Käsper's avatar Enriko Käsper
Browse files

Merge branch 'develop' into 'master'

Release: merge 'develop' into 'master' created by Enriko Käsper

See merge request teis/scheduler-service!22
parents 16a192cd ccf2fa2e
theGroup=ee.sm.ti.teis
theVersion=1.8.0
commonsVersion=1.8.0
theVersion=1.9.0
commonsVersion=1.10.0
commonApiGatewayVersion=1.8.0
adminApiGatewayVersion=1.4.0
pluginVersion=1.1.1
......
......@@ -28,7 +28,7 @@ public class QueueConfig implements QueueList {
@Override
public void updateQueues(ArrayList<TeisQueue> queues) {
String queueName = "scheduler-service" + TestDataImportService.RESET_TEST_DATA_QUEUE_SUFIX;
String queueName = "scheduler-service" + TestDataImportService.RESET_TEST_DATA_QUEUE_SUFFIX;
addMsQueue(queues, "msSystemJobStartedQueue", new SystemJobStartedRequest().routingKey(), MS_SYSTEM_JOB_STARTED_QUEUE, of(JOBS_EVENT_QUEUE_TTL));
addMsQueue(queues, "msSystemJobFinishedQueue", new SystemJobFinishedRequest().routingKey(), MS_SYSTEM_JOB_FINISHED_QUEUE, of(JOBS_EVENT_QUEUE_TTL));
......
......@@ -2,18 +2,21 @@ package ee.sm.ti.teis.scheduler.test;
import ee.sm.ti.teis.servicecommon.util.TestDataImportService;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
import static ee.sm.ti.teis.servicecommon.util.TestDataImportService.*;
@Service
@AllArgsConstructor
@RequiredArgsConstructor
@Profile({"dev", "local", "test"})
public class ResetTestDataListener {
private TestDataImportService testDataImportService;
private final TestDataImportService testDataImportService;
@RabbitListener(queues = {"scheduler-service" + TestDataImportService.RESET_TEST_DATA_QUEUE_SUFIX})
@RabbitListener(queues = {"scheduler-service" + RESET_TEST_DATA_QUEUE_SUFFIX})
public void resetTestData(String providedMagicString) {
testDataImportService.resetTestData(providedMagicString);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment