Commit 87cc6898 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/officials-service!43
parents 3e0c31aa e0bb5ce5
theGroup=ee.sm.ti.teis theGroup=ee.sm.ti.teis
theVersion=1.6.0 theVersion=1.7.0
commonsVersion=1.8.0 commonsVersion=1.10.0
officeApiGatewayVersion=1.8.0 officeApiGatewayVersion=1.8.0
pluginVersion=1.1.1 pluginVersion=1.1.1
mapstructVersion=1.3.0.Final mapstructVersion=1.3.0.Final
......
...@@ -9,11 +9,7 @@ import ee.sm.ti.teis.configuration.TeisQueue; ...@@ -9,11 +9,7 @@ import ee.sm.ti.teis.configuration.TeisQueue;
import ee.sm.ti.teis.domain.officials.Office; import ee.sm.ti.teis.domain.officials.Office;
import ee.sm.ti.teis.domain.officials.OfficialUser; import ee.sm.ti.teis.domain.officials.OfficialUser;
import ee.sm.ti.teis.domain.officials.OfficialsGroup; import ee.sm.ti.teis.domain.officials.OfficialsGroup;
import ee.sm.ti.teis.domainrequest.DomainCreateDTO; import ee.sm.ti.teis.domainrequest.*;
import ee.sm.ti.teis.domainrequest.DomainDeleteDTO;
import ee.sm.ti.teis.domainrequest.DomainQueryDTO;
import ee.sm.ti.teis.domainrequest.DomainRequestDTO;
import ee.sm.ti.teis.domainrequest.DomainUpdateDTO;
import ee.sm.ti.teis.officegateway.official.request.*; import ee.sm.ti.teis.officegateway.official.request.*;
import ee.sm.ti.teis.servicecommon.util.TestDataImportService; import ee.sm.ti.teis.servicecommon.util.TestDataImportService;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
...@@ -55,7 +51,7 @@ public class QueueConfig implements QueueList { ...@@ -55,7 +51,7 @@ public class QueueConfig implements QueueList {
@Override @Override
public void updateQueues(ArrayList<TeisQueue> queues) { public void updateQueues(ArrayList<TeisQueue> queues) {
String queueName = "officials-service" + TestDataImportService.RESET_TEST_DATA_QUEUE_SUFIX; String queueName = "officials-service" + TestDataImportService.RESET_TEST_DATA_QUEUE_SUFFIX;
addGwQueue(queues, "gwResetTestData", TestDataImportService.RESET_TEST_DATA_ROUTING_KEY, queueName); addGwQueue(queues, "gwResetTestData", TestDataImportService.RESET_TEST_DATA_ROUTING_KEY, queueName);
addGwQueue(queues, "gwCreateUserQueue", CreateOfficialUserRequest.ROUTING_KEY, GW_CREATE_OFFICIAL_USER_QUEUE); addGwQueue(queues, "gwCreateUserQueue", CreateOfficialUserRequest.ROUTING_KEY, GW_CREATE_OFFICIAL_USER_QUEUE);
......
...@@ -2,18 +2,21 @@ package ee.sm.ti.teis.officials.test; ...@@ -2,18 +2,21 @@ package ee.sm.ti.teis.officials.test;
import ee.sm.ti.teis.servicecommon.util.TestDataImportService; import ee.sm.ti.teis.servicecommon.util.TestDataImportService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.context.annotation.Profile; import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import static ee.sm.ti.teis.servicecommon.util.TestDataImportService.*;
@Service @Service
@AllArgsConstructor @RequiredArgsConstructor
@Profile({"dev", "local", "test"}) @Profile({"dev", "local", "test"})
public class ResetTestDataListener { public class ResetTestDataListener {
private TestDataImportService testDataImportService; private final TestDataImportService testDataImportService;
@RabbitListener(queues = {"officials-service" + TestDataImportService.RESET_TEST_DATA_QUEUE_SUFIX}) @RabbitListener(queues = {"officials-service" + RESET_TEST_DATA_QUEUE_SUFFIX})
public void resetTestData(String providedMagicString) { public void resetTestData(String providedMagicString) {
testDataImportService.resetTestData(providedMagicString); testDataImportService.resetTestData(providedMagicString);
} }
......
Markdown is supported
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