Commit 6d662a7e authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'feature-addActivityEmbeddedContent' into 'dev' 

Modifica test de jsonschema

See merge request redmic-project/server/api!40
parents a1f5c7f4 9e11827a

pom.xml

+4 −4
Original line number Diff line number Diff line
@@ -13,17 +13,17 @@ 
	<modelVersion>4.0.0</modelVersion>

	<artifactId>api</artifactId>

	<packaging>jar</packaging>

	<version>0.13.1</version>

	<version>0.13.1-feature-addActivityEmbeddedContent</version>

	<name>API</name>

	<description>RESTful web services</description>



	<properties>

		<!-- REDMIC -->

		<redmic.db.version>0.9.0</redmic.db.version>

		<redmic.elasticsearch.version>0.10.0</redmic.elasticsearch.version>

		<redmic.db.version>0.9.0-feature-addActivityEmbeddedContent</redmic.db.version>

		<redmic.elasticsearch.version>0.10.0-feature-addActivityEmbeddedContent</redmic.elasticsearch.version>

		<redmic.exceptions.version>0.10.0</redmic.exceptions.version>

		<redmic.utils.version>0.10.0-feature-changeJtsVersion</redmic.utils.version>

		<redmic.models.version>0.14.0</redmic.models.version>

		<redmic.models.version>0.14.0-feature-addActivityEmbeddedContent</redmic.models.version>

		<redmic.mediastorage.version>0.7.0</redmic.mediastorage.version>



		<redmic.test-utils.version>0.11.0</redmic.test-utils.version>

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

+25 −0
Original line number Diff line number Diff line
@@ -50,6 +50,17 @@ 
				"$ref": "#/definitions/ActivityResourceDTO"

			}

		},

		"embeddedContents": {

			"type": [

				"array",

				"null"

			],

			"uniqueItemsByRequiredProperties": true,

			"uniqueItems": true,

			"items": {

				"$ref": "#/definitions/ActivityEmbeddedContentDTO"

			}

		},

		"accessibility": {

			"type": "integer",

			"url": "/operator/accessibilities/"
@@ -180,6 +191,20 @@ 
			},

			"required": ["resourceType", "urlResource"]

		},

		"ActivityEmbeddedContentDTO": {

			"type": "object",

			"properties": {

				"id": {

					"type": ["integer", "null"]

				},

				"embeddedContent": {

					"type": "string",

					"minLength": 1,

					"maxLength": 50000

				}

			},

			"required": ["embeddedContent"]

		},

		"ActivityDocumentDTO": {

			"type": "object",

			"properties": {