Merge branch 'dev' into 'master' (ac2fecd2) · Commits · REDMIC Project / Server / API

.gitlab-ci.yml

+0 −1

Original line number	Diff line number	Diff line
		@@ -210,7 +210,6 @@ variables:
		.deploy-external-service:
		variables:
		STACK: ${PROJECT_PARENT_NAME}
		DD_AWS_REGION: ${AWS_REGION}

		.scheduled-run:
		variables:

deploy/docker-compose.prod.yml

+3 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,9 @@ services:
		environment:
		SPRING_PROFILES_ACTIVE: prod
		deploy:
		placement:
		constraints:
		- node.role == worker
		resources:
		limits:
		cpus: '${RESOURCES_LIMITS_CPUS:-2}'

src/main/resources/mappings/domains/theme-inspire.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@
		"dynamic": false,
		"properties": {
		"id": {
		"type": "keyword"
		"type": "long"
		},
		"code": {
		"type": "keyword"

src/test/java/es/redmic/test/integration/translations/ExceptionsTranslationTest.java

+2 −19

Original line number	Diff line number	Diff line
		@@ -99,23 +99,6 @@ public class ExceptionsTranslationTest {
		}
		}

		@Test
		public void getRussianLanguageMessage_returnDefaultI18nMessage_WhenI18nFileNotExist() {

		try {
		repository.findById("1");
		} catch (ItemNotFoundException e) {

		String code = e.getCode().toString();

		String[] fields = (String[]) e.getFieldErrors().toArray();

		String mess = messageSource.getMessage(code, fields, new Locale("ru", "RU"));

		Assert.assertEquals(getMessage(code, fields, resourcePathSpanish), mess);
		}
		}

		@Test
		public void getMessage_returnCode_WhenCodeNotInI18nFile() {

src/test/resources/data/jsonschema/activityJsonschema.json

+15 −15

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		"maxLength": 500
		},
		"parent": {
		"type": "string",
		"type": "integer",
		"url": "/operator/projects/"
		},
		"code": {
		@@ -51,18 +51,18 @@
		}
		},
		"accessibility": {
		"type": "string",
		"type": "integer",
		"url": "/operator/accessibilities/"
		},
		"scope": {
		"type": [
		"string",
		"integer",
		"null"
		],
		"url": "/operator/scopes/"
		},
		"activityType": {
		"type": "string",
		"type": "integer",
		"url": "/operator/activitytypes"
		},
		"startDate": {
		@@ -148,7 +148,7 @@
		},
		"themeInspire": {
		"type": [
		"string",
		"integer",
		"null"
		],
		"url": "/operator/themeinspire"
		@@ -169,7 +169,7 @@
		"type": ["integer", "null"]
		},
		"resourceType": {
		"type": "string",
		"type": "integer",
		"url": "/operator/resourcetype"
		},
		"urlResource": {
		@@ -190,7 +190,7 @@
		]
		},
		"document": {
		"type": "string",
		"type": "integer",
		"url": "/operator/documents/"
		}
		},
		@@ -208,15 +208,15 @@
		]
		},
		"platform": {
		"type": "string",
		"type": "integer",
		"url": "/operator/platforms/"
		},
		"contact": {
		"type": "string",
		"type": "integer",
		"url": "/operator/contacts/"
		},
		"role": {
		"type": "string",
		"type": "integer",
		"url": "/operator/contactroles/"
		},
		"endDate": {
		@@ -250,15 +250,15 @@
		]
		},
		"contact": {
		"type": "string",
		"type": "integer",
		"url": "/operator/contacts/"
		},
		"organisation": {
		"type": "string",
		"type": "integer",
		"url": "/operator/organisations/"
		},
		"role": {
		"type": "string",
		"type": "integer",
		"url": "/operator/contactroles/"
		},
		"endDate": {
		@@ -292,11 +292,11 @@
		]
		},
		"organisation": {
		"type": "string",
		"type": "integer",
		"url": "/operator/organisations/"
		},
		"role": {
		"type": "string",
		"type": "integer",
		"url": "/operator/organisationroles/"
		},
		"endDate": {