Skip to content
GitLab
Commit 4fecaf66 authored by Siiri Tann's avatar Siiri Tann
Browse files

Merge branch 'develop' into 'master' 

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

See merge request teis/xroad-gateway!110
parents 55d8be78 b6293b2d
Hide whitespace changes
Inline Side-by-side
CHANGELOG.md
View file @ 4fecaf66
# Changelog
## [1.14.0] - 2022-03-28
* TEIS-2791: implemented functionality for updating classifier item cache in batches
* TEIS-2786: added functionality for sending collected drivers inspections data to LJVIS, refactored test functionality
* TEIS-2909: added TORTI get id request
* TEIS-2909: added TORTI xroad classes
* TEIS-2585: added test data
* TEIS-2756: added methods to get representations from RR
## [1.13.0] - 2022-03-10
* TEIS-2875: new logic for getting TVLs from KIRST
......
gradle.properties
View file @ 4fecaf66
theGroup=ee.sm.ti.teis
theVersion=1.13.0
commonsVersion=1.32.0
commonApiGatewayVersion=1.32.0
pluginVersion=1.4.4
theVersion=1.14.0
commonsVersion=1.33.0
commonApiGatewayVersion=1.33.0
pluginVersion=1.5.0
jaxbVersion=2.3.1
service/src/integTest/java/ee/sm/ti/teis/xroadgateway/ljvis/LJVISGwTestListenerTest.java 0 → 100644
View file @ 4fecaf66
package ee.sm.ti.teis.xroadgateway.ljvis;
import ee.sm.ti.teis.XroadGatewayAppTestBase;
import ee.sm.ti.teis.commongateway.xroadgateway.XroadResponse;
import ee.sm.ti.teis.commongateway.xroadgateway.dto.AdditionalDriversInspectionDataDto;
import ee.sm.ti.teis.commongateway.xroadgateway.ljvis.LJVISDriversInspectionDataDto;
import ee.sm.ti.teis.commongateway.xroadgateway.ljvis.SendDriversInspectionToLJVISXroadTestRequest;
import ee.sm.ti.teis.exceptions.TeisValidationException;
import ee.sm.ti.teis.servicerequest.RequestMetaDTO;
import ee.sm.ti.teis.xroadgateway.ljvis.listener.LJVISGwTestListener;
import ee.sm.ti.teis.xroadgateway.ljvis.service.LJVISXroadService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import java.time.LocalDate;
import java.util.List;
import static ee.sm.ti.teis.servicerequest.UserType.OFFICIAL_USER;
import static ee.sm.ti.teis.types.enums.RolePrivilegeCode.TI_MANAGE_COMPANIES;
import static ee.sm.ti.teis.types.enums.classifier.DriversInspectionType.GOODS;
import static ee.sm.ti.teis.utils.TestUtils.assertBadRequest;
import static ee.sm.ti.teis.utils.TestUtils.createRequestMeta;
import static ee.sm.ti.teis.xroadgateway.ljvis.LJVISErrorCode.LJVIS_TECHNICAL_ERROR;
import static java.util.UUID.randomUUID;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doThrow;
public class LJVISGwTestListenerTest extends XroadGatewayAppTestBase {
private static final String TECHNICAL_ERROR_FROM_LJVIS = "Technical error from LJVIS";
private static final String LEGAL_PERSON_NAME = "Sirel";
@Autowired
LJVISGwTestListener listener;
@MockBean
LJVISXroadService xroadService;
RequestMetaDTO requestMetaDTO;
SendDriversInspectionToLJVISXroadTestRequest request;
XroadResponse response;
LJVISDriversInspectionDataDto payload;
@BeforeEach
void setUp() {
requestMetaDTO = createRequestMeta(randomUUID().toString(), OFFICIAL_USER, null,
List.of(TI_MANAGE_COMPANIES.name()));
request = new SendDriversInspectionToLJVISXroadTestRequest();
request.setRequestMetaDTO(requestMetaDTO);
}
@Test
void send_success() {
String misdemeanorRefNumber = "12894";
payload = composeDto(misdemeanorRefNumber);
request.setPayload(payload, requestMetaDTO);
response = listener.sendDriversInspectionToLJVIS(request);
String payload = response.getPayload();
assertThat(payload).contains(misdemeanorRefNumber);
assertThat(payload).contains(LEGAL_PERSON_NAME);
assertThat(response.getError()).isNull();
}
@Test
void send_badRequest() {
payload = composeDto("7");
request.setPayload(payload, requestMetaDTO);
response = listener.sendDriversInspectionToLJVIS(request);
assertBadRequest(response.getError());
}
@Test
void send_technicalError() {
payload = composeDto("8");
doThrow(new TeisValidationException(LJVIS_TECHNICAL_ERROR, TECHNICAL_ERROR_FROM_LJVIS))
.when(xroadService).sendInspectionDataToLJVIS(any());
request.setPayload(payload, requestMetaDTO);
response = listener.sendDriversInspectionToLJVIS(request);
assertThat(response.getError()).isNotNull();
assertThat(response.getError().getCode()).isEqualTo(LJVISErrorCode.LJVIS_TECHNICAL_ERROR.getCode());
}
private LJVISDriversInspectionDataDto composeDto(String misdemeanorRefNumber) {
return LJVISDriversInspectionDataDto.builder()
.convictedPersonCode("12")
.convictedPersonName("Kana")
.driversTotal(12)
.earning(getAdditionalData())
.goods(getAdditionalData())
.inspectionType(GOODS.getId())
.legalPersonName(LEGAL_PERSON_NAME)
.legalPersonRegCode("38976")
.misdemeanorRefNumber(misdemeanorRefNumber)
.numberOfVehicles(43)
.officialUsersText("Juustupea")
.ownPurposes(getAdditionalData())
.passengers(getAdditionalData())
.precept(true)
.proceduralActConductingTime(LocalDate.now())
.proceduralActNumber("276340")
.build();
}
private AdditionalDriversInspectionDataDto getAdditionalData() {
return AdditionalDriversInspectionDataDto.builder()
.driversAM(2)
.driversDM(2)
.driversSM(3)
.workingdaysAM(3)
.workingdaysDM(3)
.workingdaysSM(4)
.build();
}
}
service/src/integTest/java/ee/sm/ti/teis/xroadgateway/ljvis/LjvisMsListenerTest.java → service/src/integTest/java/ee/sm/ti/teis/xroadgateway/ljvis/LJVISMsListenerTest.java
View file @ 4fecaf66
......@@ -2,14 +2,17 @@ package ee.sm.ti.teis.xroadgateway.ljvis;
import ee.sm.ti.teis.XroadGatewayAppTestBase;
import ee.sm.ti.teis.domain.ljvis.AdditionalDriversInspectionData;
import ee.sm.ti.teis.domain.ljvis.LjvisDriversInspectionData;
import ee.sm.ti.teis.domain.ljvis.LJVISDriversInspectionData;
import ee.sm.ti.teis.exceptions.TeisValidationException;
import ee.sm.ti.teis.serviceclient.xroad.XroadLJVISServiceClient.SendToLJVISXroadMsRequest;
import ee.sm.ti.teis.serviceclient.xroad.XroadLJVISServiceClient.SendToLJVISXroadMsResponse;
import ee.sm.ti.teis.servicerequest.RequestMetaDTO;
import ee.sm.ti.teis.xroadgateway.config.LjvisQueueConfig.SendToLjvisXroadMsRequest;
import ee.sm.ti.teis.xroadgateway.config.LjvisQueueConfig.SendToLjvisXroadMsResponse;
import ee.sm.ti.teis.xroadgateway.ljvis.listener.LjvisMsListener;
import ee.sm.ti.teis.xroadgateway.ljvis.listener.LJVISMsListener;
import ee.sm.ti.teis.xroadgateway.ljvis.service.LJVISXroadService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import java.time.LocalDate;
import java.util.List;
......@@ -19,68 +22,72 @@ import static ee.sm.ti.teis.types.enums.RolePrivilegeCode.TI_MANAGE_COMPANIES;
import static ee.sm.ti.teis.types.enums.classifier.DriversInspectionType.GOODS;
import static ee.sm.ti.teis.utils.TestUtils.assertBadRequest;
import static ee.sm.ti.teis.utils.TestUtils.createRequestMeta;
import static ee.sm.ti.teis.xroadgateway.ljvis.LJVISErrorCode.LJVIS_TECHNICAL_ERROR;
import static java.util.UUID.randomUUID;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doThrow;
public class LjvisMsListenerTest extends XroadGatewayAppTestBase {
public class LJVISMsListenerTest extends XroadGatewayAppTestBase {
private static final String TECHNICAL_ERROR_FROM_LJVIS = "Technical error from LJVIS";
@Autowired
LjvisMsListener listener;
LJVISMsListener listener;
@MockBean
LJVISXroadService xroadService;
RequestMetaDTO requestMetaDTO;
SendToLjvisXroadMsRequest request;
SendToLjvisXroadMsResponse response;
SendToLJVISXroadMsRequest request;
SendToLJVISXroadMsResponse response;
LJVISDriversInspectionData payload;
@BeforeEach
void setUp() {
requestMetaDTO = createRequestMeta(randomUUID().toString(), OFFICIAL_USER, randomUUID().toString(),
requestMetaDTO = createRequestMeta(randomUUID().toString(), OFFICIAL_USER, null,
List.of(TI_MANAGE_COMPANIES.name()));
request = new SendToLjvisXroadMsRequest();
request = new SendToLJVISXroadMsRequest();
request.setRequestMetaDTO(requestMetaDTO);
}
@Test
void send_success() {
LjvisDriversInspectionData dto = composeDto("2");
request.setPayload(dto, requestMetaDTO);
response = listener.sendDriversInspectionToLjvis(request);
payload = composeData("2");
request.setPayload(payload, requestMetaDTO);
response = listener.sendDriversInspectionToLJVIS(request);
assertThat(response.getError()).isNull();
}
@Test
void send_badRquest() {
LjvisDriversInspectionData dto = composeDto("7");
request.setPayload(dto, requestMetaDTO);
response = listener.sendDriversInspectionToLjvis(request);
void send_badRequest() {
payload = composeData("7");
payload.setProceduralActConductingTime(null);
request.setPayload(payload, requestMetaDTO);
response = listener.sendDriversInspectionToLJVIS(request);
assertBadRequest(response.getError());
}
@Test
void send_technicalError() {
LjvisDriversInspectionData dto = composeDto("8");
request.setPayload(dto, requestMetaDTO);
response = listener.sendDriversInspectionToLjvis(request);
assertThat(response.getError()).isNotNull();
assertThat(response.getError().getCode()).isEqualTo(LjvisErrorCode.LJVIS_TECHNICAL_ERROR.getCode());
}
payload = composeData("8");
doThrow(new TeisValidationException(LJVIS_TECHNICAL_ERROR, TECHNICAL_ERROR_FROM_LJVIS))
.when(xroadService).sendInspectionDataToLJVIS(eq(payload));
request.setPayload(payload, requestMetaDTO);
private AdditionalDriversInspectionData getAdditionalData() {
return AdditionalDriversInspectionData.builder()
.driversAM(2)
.driversDM(2)
.driversSM(3)
.workingdaysAM(3)
.workingdaysDM(3)
.workingdaysSM(4)
.build();
response = listener.sendDriversInspectionToLJVIS(request);
assertThat(response.getError()).isNotNull();
assertThat(response.getError().getCode()).isEqualTo(LJVISErrorCode.LJVIS_TECHNICAL_ERROR.getCode());
}
private LjvisDriversInspectionData composeDto(String misdemeanorRefNumber) {
return LjvisDriversInspectionData.builder()
private LJVISDriversInspectionData composeData(String misdemeanorRefNumber) {
return LJVISDriversInspectionData.builder()
.convictedPersonCode("12")
.convictedPersonName("Kana")
.driversTotal(12)
.earnings(getAdditionalData())
.earning(getAdditionalData())
.goods(getAdditionalData())
.inspectionType(GOODS.getId())
.legalPersonName("Sirel")
......@@ -96,4 +103,15 @@ public class LjvisMsListenerTest extends XroadGatewayAppTestBase {
.build();
}
private AdditionalDriversInspectionData getAdditionalData() {
return AdditionalDriversInspectionData.builder()
.driversAM(2)
.driversDM(2)
.driversSM(3)
.workingdaysAM(3)
.workingdaysDM(3)
.workingdaysSM(4)
.build();
}
}
service/src/integTest/java/ee/sm/ti/teis/xroadgateway/rr/GetPersonFromRrGwListenerTest.java → service/src/integTest/java/ee/sm/ti/teis/xroadgateway/rr/GetPersonFromRRGwListenerTest.java
View file @ 4fecaf66
......@@ -9,7 +9,7 @@ import ee.sm.ti.teis.commongateway.xroadgateway.XroadResponse;
import ee.sm.ti.teis.domain.person.IndividualPerson;
import ee.sm.ti.teis.domain.person.rr.RrPerson;
import ee.sm.ti.teis.servicerequest.RequestMetaDTO;
import ee.sm.ti.teis.xroadgateway.rr.listener.RrGwListener;
import ee.sm.ti.teis.xroadgateway.rr.listener.RRGwListener;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -28,12 +28,12 @@ import static java.util.UUID.randomUUID;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.doReturn;
public class GetPersonFromRrGwListenerTest extends XroadGatewayAppTestBase {
public class GetPersonFromRRGwListenerTest extends XroadGatewayAppTestBase {
private static final String PERSON_ID = "25411860487";
@Autowired
RrGwListener listener;
RRGwListener listener;
@Autowired
ObjectMapper objectMapper;
@MockBean
......
service/src/integTest/java/ee/sm/ti/teis/xroadgateway/rr/GetPersonFromRrMsListenerTest.java → service/src/integTest/java/ee/sm/ti/teis/xroadgateway/rr/GetPersonFromRRMsListenerTest.java
View file @ 4fecaf66
......@@ -6,7 +6,7 @@ import ee.sm.ti.teis.cache.person.PersonService;
import ee.sm.ti.teis.domain.person.rr.RrPerson;
import ee.sm.ti.teis.servicerequest.RequestMetaDTO;
import ee.sm.ti.teis.xroadgateway.config.RrQueueConfig.GetPersonFromRrMsRequest;
import ee.sm.ti.teis.xroadgateway.rr.listener.RrMsListener;
import ee.sm.ti.teis.xroadgateway.rr.listener.RRMsListener;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -23,12 +23,12 @@ import static ee.sm.ti.teis.xroadgateway.config.RrQueueConfig.GetPersonFromRrMsR
import static java.util.UUID.randomUUID;
import static org.assertj.core.api.Assertions.assertThat;
public class GetPersonFromRrMsListenerTest extends XroadGatewayAppTestBase {
public class GetPersonFromRRMsListenerTest extends XroadGatewayAppTestBase {
private static final String PERSON_ID = "25411860487";
@Autowired
RrMsListener listener;
RRMsListener listener;
@Autowired
ObjectMapper objectMapper;
@MockBean
......
service/src/integTest/java/ee/sm/ti/teis/xroadgateway/rr/GetRepresentationsFromRrGwTestListenerTest.java → service/src/integTest/java/ee/sm/ti/teis/xroadgateway/rr/GetRepresentationsFromRRGwTestListenerTest.java
View file @ 4fecaf66
......@@ -11,7 +11,7 @@ import ee.sm.ti.teis.domain.rr.RrRepresentations;
import ee.sm.ti.teis.servicerequest.RequestMetaDTO;
import ee.sm.ti.teis.types.enums.PersonType;
import ee.sm.ti.teis.utils.JsonMapper;
import ee.sm.ti.teis.xroadgateway.rr.listener.RrGwTestListener;
import ee.sm.ti.teis.xroadgateway.rr.listener.RRGwTestListener;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
......@@ -29,7 +29,7 @@ import static java.util.UUID.randomUUID;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.doReturn;
public class GetRepresentationsFromRrGwTestListenerTest extends XroadGatewayAppTestBase {
public class GetRepresentationsFromRRGwTestListenerTest extends XroadGatewayAppTestBase {
private static final UUID PERSON_ID = UUID.fromString("5d3bbd37-a4ae-417a-a1e0-ba8a1bdeebc9");
......@@ -39,7 +39,7 @@ public class GetRepresentationsFromRrGwTestListenerTest extends XroadGatewayAppT
PersonService personService;
@Autowired
@InjectMocks
RrGwTestListener listener;
RRGwTestListener listener;
GetRepresentationsFromRrXroadTestRequest request;
XroadResponse response;
......@@ -55,13 +55,13 @@ public class GetRepresentationsFromRrGwTestListenerTest extends XroadGatewayAppT
@Test
void getRepresentationsFromRr_success() {
Person person = new Person();
IndividualPerson person = new IndividualPerson();
ClassifierItemLight country = ClassifierItemLight.builder()
.id("COUNTRY__EE").code("EE").name("Eesti").build();
person.setIndividualPerson(IndividualPerson.builder().country(country).build());
person.setCountry(country);
person.setPersonType(PersonType.I);
doReturn(person)
.when(personService).getPerson(PERSON_ID, requestMetaDTO);
.when(personService).getIndividualPerson(PERSON_ID, requestMetaDTO);
request.setPayload(PERSON_ID, requestMetaDTO);
response = listener.getRepresentationsFromRr(request);
......
service/src/integTest/java/ee/sm/ti/teis/xroadgateway/rr/GetRepresentationsFromRrMsListenerTest.java → service/src/integTest/java/ee/sm/ti/teis/xroadgateway/rr/GetRepresentationsFromRRMsListenerTest.java
View file @ 4fecaf66
......@@ -11,7 +11,7 @@ import ee.sm.ti.teis.servicerequest.RequestMetaDTO;
import ee.sm.ti.teis.types.enums.PersonType;
import ee.sm.ti.teis.xroadgateway.config.RrQueueConfig.GetRrRepresentationsMsRequest;
import ee.sm.ti.teis.xroadgateway.config.RrQueueConfig.GetRrRepresentationsMsResponse;
import ee.sm.ti.teis.xroadgateway.rr.listener.RrMsListener;
import ee.sm.ti.teis.xroadgateway.rr.listener.RRMsListener;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -28,12 +28,12 @@ import static java.util.UUID.randomUUID;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.doReturn;
public class GetRepresentationsFromRrMsListenerTest extends XroadGatewayAppTestBase {
public class GetRepresentationsFromRRMsListenerTest extends XroadGatewayAppTestBase {
private static final UUID PERSON_ID = UUID.fromString("5d3bbd37-a4ae-417a-a1e0-ba8a1bdeebc9");
@Autowired
RrMsListener listener;
RRMsListener listener;
@MockBean
PersonService personService;
......@@ -52,13 +52,13 @@ public class GetRepresentationsFromRrMsListenerTest extends XroadGatewayAppTestB
@Test
void getRepresentationsFromRr_success() {
Person person = new Person();
IndividualPerson person = new IndividualPerson();
ClassifierItemLight country = ClassifierItemLight.builder()
.id("COUNTRY__EE").code("EE").name("Eesti").build();
person.setIndividualPerson(IndividualPerson.builder().country(country).build());
person.setCountry(country);
person.setPersonType(PersonType.I);
doReturn(person)
.when(personService).getPerson(PERSON_ID, requestMetaDTO);
.when(personService).getIndividualPerson(PERSON_ID, requestMetaDTO);
request.setPayload(GetRrRepresentations.builder().id(PERSON_ID).build(), requestMetaDTO);
response = listener.getRepresentationsFromRR(request);
......
service/src/integTest/java/ee/sm/ti/teis/xroadgateway/torti/GetIdFromTORTIGwTestListenerTest.java 0 → 100644
View file @ 4fecaf66
package ee.sm.ti.teis.xroadgateway.torti;
import ee.sm.ti.teis.XroadGatewayAppTestBase;
import ee.sm.ti.teis.commongateway.xroadgateway.XroadResponse;
import ee.sm.ti.teis.commongateway.xroadgateway.torti.dto.GetIdFromTORTITestDto;
import ee.sm.ti.teis.commongateway.xroadgateway.torti.request.GetIdFromTORTIXroadTestRequest;
import ee.sm.ti.teis.domain.torti.InitialTORTIResponse;
import ee.sm.ti.teis.servicerequest.RequestMetaDTO;
import ee.sm.ti.teis.utils.JsonMapper;
import ee.sm.ti.teis.xroadgateway.torti.listener.TORTIGwTestListener;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
import static ee.sm.ti.teis.servicerequest.UserType.OFFICIAL_USER;
import static ee.sm.ti.teis.types.enums.RolePrivilegeCode.TI_MANAGE_COMPANIES;
import static ee.sm.ti.teis.utils.TestUtils.createRequestMeta;
import static java.util.UUID.randomUUID;
import static org.assertj.core.api.Assertions.assertThat;
public class GetIdFromTORTIGwTestListenerTest extends XroadGatewayAppTestBase {
@Autowired
TORTIGwTestListener listener;
@Autowired
JsonMapper jsonMapper;
GetIdFromTORTIXroadTestRequest request;
XroadResponse response;
RequestMetaDTO requestMetaDTO;
@BeforeEach
void setUp() {
requestMetaDTO = createRequestMeta(randomUUID().toString(), OFFICIAL_USER, randomUUID().toString(),
List.of(TI_MANAGE_COMPANIES.name()));
request = new GetIdFromTORTIXroadTestRequest();
request.setRequestMetaDTO(requestMetaDTO);
}
@Test
void get_success() {
request.setPayload(GetIdFromTORTITestDto.builder().regCode("regCode").build(), requestMetaDTO);
response = listener.getId(request);
InitialTORTIResponse payload = jsonMapper.readObject(response.getPayload(), InitialTORTIResponse.class);
assertThat(payload.getInitialResponseId()).isEqualTo("3f1f70d3-dde0-47af-bae2-2d99d4eb1a25");
assertThat(payload.getResultResponseCode()).isEqualTo("0");
}
}
service/src/integTest/java/ee/sm/ti/teis/xroadgateway/torti/GetIdFromTORTIMsListenerTest.java 0 → 100644
View file @ 4fecaf66
package ee.sm.ti.teis.xroadgateway.torti;
import ee.sm.ti.teis.XroadGatewayAppTestBase;
import ee.sm.ti.teis.domain.torti.GetIdFromTORTIRequest;
import ee.sm.ti.teis.generated.torti.TortiResponseType;
import ee.sm.ti.teis.servicerequest.RequestMetaDTO;
import ee.sm.ti.teis.xroadgateway.torti.listener.TORTIMsListener;
import ee.sm.ti.teis.xroadgateway.torti.service.TORTIXroadService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import java.util.List;
import static ee.sm.ti.teis.servicerequest.UserType.OFFICIAL_USER;
import static ee.sm.ti.teis.types.enums.RolePrivilegeCode.TI_MANAGE_COMPANIES;
import static ee.sm.ti.teis.utils.TestUtils.createRequestMeta;
import static ee.sm.ti.teis.xroadgateway.config.TORTIQueueConfig.GetIdFromTORTIMsRequest;
import static ee.sm.ti.teis.xroadgateway.config.TORTIQueueConfig.GetIdFromTORTIMsResponse;
import static java.util.UUID.randomUUID;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.doReturn;
public class GetIdFromTORTIMsListenerTest extends XroadGatewayAppTestBase {
private static final String INITIAL_RESPONSE_ID = "0f220bce-6d45-4479-90a3-4f065f6d17ca";
@Autowired
TORTIMsListener listener;
@MockBean
TORTIXroadService tortiXroadService;
GetIdFromTORTIMsRequest request;
GetIdFromTORTIMsResponse response;
RequestMetaDTO requestMetaDTO;
@BeforeEach
void setUp() {
requestMetaDTO = createRequestMeta(randomUUID().toString(), OFFICIAL_USER, randomUUID().toString(),
List.of(TI_MANAGE_COMPANIES.name()));
request = new GetIdFromTORTIMsRequest();
request.setRequestMetaDTO(requestMetaDTO);
TortiResponseType responseType = new TortiResponseType();
responseType.setInitialResponseId(INITIAL_RESPONSE_ID);
responseType.setResultResponseCode("0");
doReturn(responseType).when(tortiXroadService).getTORTIResponse(requestMetaDTO);
}
@Test
void get_success() {
request.setPayload(new GetIdFromTORTIRequest(), requestMetaDTO);
response = listener.getId(request);
assertThat(response.getPayload().getInitialResponseId()).isEqualTo(INITIAL_RESPONSE_ID);
assertThat(response.getPayload().getResultResponseCode()).isEqualTo("0");
}
}
service/src/integTest/resources/application-integtest.yaml
View file @ 4fecaf66
......@@ -11,3 +11,6 @@ spring:
password: seis
change-log: classpath:/db/changelog/db.changelog-integtest.xml
contexts: integtest
teis:
cache:
reinitialize-enabled: false
service/src/main/java/ee/sm/ti/teis/generated/ljvis/JuhtideKontrollimine.java 0 → 100644
View file @ 4fecaf66
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.1
// See <a href="https://javaee.github.io/jaxb-v2/">https://javaee.github.io/jaxb-v2/</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2022.03.15 at 04:05:23 PM EET
//
package ee.sm.ti.teis.generated.ljvis;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;