Commit b68de5cb authored by Kristel Meikas's avatar Kristel Meikas
Browse files

Merge branch 'develop' into 'master'

Release: merge 'develop' into 'master' created by Kristel Meikas

See merge request teis/officials-service!71
parents 9fde8409 9f871f69
# Changelog
## [2.2.0] - 2022-11-04
* TEIS-3056: added new officials sequence for minors employment
## [2.1.0] - 2022-09-26
* TEIS-3411: fixed cache reinitialize bug
## [2.0.0] - 2022-08-12
* Upgraded to java 17, gradle 7.4.2, spring boot 2.6.8 and others; uses TEIS Gradle plugin 2.3.0
......
theGroup=ee.sm.ti.teis
theVersion=2.1.0
commonsVersion=2.6.0
officeApiGatewayVersion=2.5.0
theVersion=2.2.0
commonsVersion=2.12.0
officeApiGatewayVersion=2.10.0
pluginVersion=2.3.0
......@@ -4,11 +4,11 @@ spring:
datasource:
driver-class-name: org.testcontainers.jdbc.ContainerDatabaseDriver
url: jdbc:tc:postgresql://localhost:5432/teis
username: teis
password: seis
username: testUser
password: testPass
liquibase:
user: teis
password: seis
user: testUser
password: testPass
change-log: classpath:/db/changelog/db.changelog-integtest.xml
contexts: integtest
teis:
......
......@@ -6,7 +6,6 @@ import ee.sm.ti.teis.configuration.TeisQueue;
import ee.sm.ti.teis.domain.officials.OfficialUser;
import ee.sm.ti.teis.domainrequest.*;
import ee.sm.ti.teis.officegateway.officials.officialuser.request.*;
import ee.sm.ti.teis.servicecommon.util.TestDataImportService;
import org.springframework.context.annotation.Configuration;
import java.util.ArrayList;
......@@ -33,9 +32,6 @@ public class OfficialUserQueueConfig implements QueueList {
@Override
public void updateQueues(ArrayList<TeisQueue> queues) {
String queueName = "officials-service" + TestDataImportService.RESET_TEST_DATA_QUEUE_SUFFIX;
addGwQueue(queues, "gwResetTestData", TestDataImportService.RESET_TEST_DATA_ROUTING_KEY, queueName);
addGwQueue(queues, "gwCreateUserQueue", CreateOfficialUserRequest.ROUTING_KEY, GW_CREATE_OFFICIAL_USER_QUEUE);
addGwQueue(queues, "gwFindUserQueue", OfficialUserRequest.ROUTING_KEY, GW_OFFICIAL_USER_QUEUE);
addGwQueue(queues, "gwFindUsersQueue", OfficialUsersRequest.ROUTING_KEY, GW_OFFICIAL_USERS_QUEUE);
......
......@@ -3,6 +3,7 @@ package ee.sm.ti.teis.officials.config;
import ee.sm.ti.teis.configuration.QueueList;
import ee.sm.ti.teis.configuration.TeisQueue;
import ee.sm.ti.teis.officegateway.officials.officialinsequence.request.GetOfficialFromSequenceTestRequest;
import ee.sm.ti.teis.servicecommon.util.TestDataImportService;
import org.springframework.context.annotation.Profile;
import java.util.ArrayList;
......@@ -14,6 +15,9 @@ public class TestQueueConfig implements QueueList {
@Override
public void updateQueues(ArrayList<TeisQueue> queues) {
String queueName = "officials-service" + TestDataImportService.RESET_TEST_DATA_QUEUE_SUFFIX;
addGwQueue(queues, "gwResetTestData", TestDataImportService.RESET_TEST_DATA_ROUTING_KEY, queueName);
addGwQueue(queues, "gwGetOfficialFromSequenceTestQueue", GetOfficialFromSequenceTestRequest.ROUTING_KEY,
GW_GET_OFFICIAL_FROM_SEQUENCE_TEST_QUEUE);
}
......
......@@ -37,7 +37,6 @@ spring:
management:
endpoint:
restart.enabled: true
health:
enabled: true
show-details: always
......@@ -57,6 +56,7 @@ teis:
ms-exchange-reply-timeout: ${RABBIT_TEMPLATE_MS_EXCHANGE_REPLY_TIMEOUT:5000}
cs-exchange-name: cache_exchange
od-exchange-name: od-disabled
ws-exchange-name: ws_exchange
test:
data:
resetmagic: ${TEST_DATA_RESET_MAGIC:}
......
--liquibase formatted sql
--changeset siiri:2022-10-18.TEIS-3056.add-officials-sequence
INSERT INTO officials_sequence (id, code, title, object_status, created_at, created_by) VALUES
('a5fcb0c2-0004-4165-b6d1-0d6cf86b74ac', 'MINORS_ADMINISTRATORS', 'Alaealiste töötamise registreeringute menetlejad', 'CURRENT', now(), 'SYSTEM');
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