Commit 033d4aea authored by Enriko Käsper's avatar Enriko Käsper

Merge branch 'develop' into 'master'

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

See merge request teis/officials-service!44
parents 87cc6898 67263eb9
# Official users and groups service
# Officials service
The service maintains Tööinspektsioon official users and groups data.
\ No newline at end of file
Officials service is a microservice which provides official user and group management for TeIS application users.
## Features
Officials service is a Spring Boot application providing the following functionality:
* official users management
* official groups management
## Requirements
* [OpenJDK 11](https://openjdk.java.net/projects/jdk/11/)
* [Rabbit MQ](https://www.rabbitmq.com/)
* [PostgreSQL](https://www.postgresql.org/)
See [how to run required dependencies](../../docs/blob/master/run-requirements.md).
Officials service depends on other TeIS libraries:
* [TeIS Gradle plugin](../../teis-gradle-plugin)
* [TeIS public commons libraries](../../commons-public)
* [TeIS commons libraries](../../commons)
* [TeIS office API gateway library](../../office-api-gateway)
## Run application
Spring Boot project can be run directly from [OfficialsServiceApp.main()](service/src/main/java/ee/sm/ti/teis/OfficialsServiceApp.java)
method or via executable jar file. More info on running Spring applications:
[running your application.](https://docs.spring.io/spring-boot/docs/current/reference/html/using-boot-running-your-application.html)
Visit [how to run application](../../docs/blob/master/run-application.md).
## Build and configure
Visit [how to build](../../docs/blob/master/build-configure.md) for more info.
## Default profiles
Visit [environment profiles](../../docs/blob/master/default-profiles.md) for more info.
## Tests
Run [integration](service/src/integTest) and [unit tests](service/src/test) via IDE or with Gradle in command line:
```jshelllanguage
./gradlew test
```
\ No newline at end of file
......@@ -63,19 +63,5 @@ allprojects {
compile "ee.sm.ti.teis:domain-cache-lib:${commonsVersion}"
compile("com.querydsl:querydsl-core:${querydslVersion}")
compile("com.querydsl:querydsl-jpa:${querydslVersion}")
// Annotation processors
annotationProcessor (
"org.mapstruct:mapstruct-processor:${mapstructVersion}",
"com.querydsl:querydsl-apt:${querydslVersion}:jpa",
"org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final",
"javax.annotation:javax.annotation-api:1.3.2"
)
// Tests
testAnnotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
// Misc
implementation "org.mapstruct:mapstruct:${mapstructVersion}"
}
}
theGroup=ee.sm.ti.teis
theVersion=1.7.0
theVersion=1.8.0
commonsVersion=1.10.0
officeApiGatewayVersion=1.8.0
pluginVersion=1.1.1
......
......@@ -18,10 +18,24 @@ dependencies {
compile 'org.springframework.security:spring-security-config'
// BPM
compile "org.camunda.bpm.springboot:camunda-bpm-spring-boot-starter-webapp:3.2.1"
// Annotation processors
annotationProcessor (
"org.mapstruct:mapstruct-processor:${mapstructVersion}",
"com.querydsl:querydsl-apt:${querydslVersion}:jpa",
"org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final",
"javax.annotation:javax.annotation-api:1.3.2"
)
// Tests
testAnnotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
// Misc
implementation "org.mapstruct:mapstruct:${mapstructVersion}"
}
// Define the main class for the application
mainClassName = 'ee.sm.ti.teis.officials.OfficialsServiceApp'
mainClassName = 'ee.sm.ti.teis.OfficialsServiceApp'
test {
testLogging {
......
......@@ -22,7 +22,7 @@ public abstract class OfficialsAppTestBase {
private static final GenericContainer rabbitMQContainer;
// to speed up tests, lets use static container, it is used in alla test classes that are executed inside one Spring Context
// to speed up tests, lets use static container, it is used in all test classes that are executed inside one Spring Context
static {
rabbitMQContainer = new GenericContainer("rabbitmq:latest").withExposedPorts(5672);
rabbitMQContainer.start();
......
......@@ -28,7 +28,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.http.HttpStatus.BAD_REQUEST;
import static org.springframework.http.HttpStatus.NOT_FOUND;
@SuppressWarnings("squid:S00100")
@Transactional
class OfficialsGroupGwListenerTest extends OfficialsAppTestBase {
......
......@@ -22,7 +22,6 @@ import static ee.sm.ti.teis.types.enums.ObjectStatus.DELETED;
import static java.util.Set.of;
import static org.assertj.core.api.Assertions.assertThat;
@SuppressWarnings("squid:S00100")
@Transactional
class OfficialsListenerTest extends OfficialsAppTestBase {
......
......@@ -20,7 +20,6 @@ import static ee.sm.ti.teis.officials.config.QueueConfig.*;
import static ee.sm.ti.teis.types.enums.ObjectStatus.DELETED;
import static org.assertj.core.api.Assertions.assertThat;
@SuppressWarnings("squid:S00100")
@Transactional
class OfficialsMsListenerTest extends OfficialsAppTestBase {
......
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