Commit cac2fa65 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!24
parents 61ff78dd 548ce934
......@@ -58,9 +58,5 @@ allprojects {
compile "ee.sm.ti.teis:service-common-lib:${commonsVersion}"
compile "ee.sm.ti.teis:domain-request-lib:${commonsVersion}"
compile "ee.sm.ti.teis:admin-api-gateway-lib:${adminApiGatewayVersion}"
implementation "org.mapstruct:mapstruct:${mapstructVersion}"
annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
testAnnotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
}
}
theGroup=ee.sm.ti.teis
theVersion=1.10.0
theVersion=1.11.0
commonsVersion=1.10.0
commonApiGatewayVersion=1.8.0
adminApiGatewayVersion=1.5.0
......
......@@ -19,10 +19,13 @@ dependencies {
compile 'org.springframework.boot:spring-boot-starter-validation'
compile 'org.springframework.boot:spring-boot-starter-aop'
// BPM
compile 'org.camunda.bpm.springboot:camunda-bpm-spring-boot-starter-webapp:3.2.1'
testImplementation("org.camunda.bpm.extension.mockito:camunda-bpm-mockito:4.10.0")
implementation "org.mapstruct:mapstruct:${mapstructVersion}"
annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
testAnnotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
}
// Define the main class for the application
......
package ee.sm.ti.teis;
import ee.sm.ti.teis.servicerequest.RequestMetaDTO;
import ee.sm.ti.teis.servicerequest.UserType;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.util.TestPropertyValues;
......@@ -13,9 +11,6 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.junit.jupiter.Testcontainers;
import java.util.List;
import java.util.UUID;
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = SchedulerServiceApp.class)
@ActiveProfiles("integtest")
......@@ -30,19 +25,6 @@ public abstract class SchedulerAppTestBase {
rabbitMQContainer.start();
}
protected RequestMetaDTO createRequestMeta(String userId, UserType userType, String companyId, List<String> privileges) {
RequestMetaDTO requestMeta = RequestMetaDTO.builder()
.requestId(UUID.randomUUID().toString())
.userId(userId)
.userType(userType)
.companyId(companyId)
.build();
if (privileges != null) {
requestMeta.setPrivileges(privileges);
}
return requestMeta;
}
static class Initializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
@Override
public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
......
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