Commit 64463080 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'legacy-0.6' into dev

parents 828d2b83 927f04ef

pom.xml

+13 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


	<properties>

		<!-- REDMIC -->

		<redmic.models.version>0.6.1</redmic.models.version>

		<redmic.models.version>0.6.1-legacy-0.6</redmic.models.version>

		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>

		<redmic.utils.version>0.6.0</redmic.utils.version>
@@ -92,6 +92,18 @@ 
			<version>${commons-io.version}</version>

		</dependency>



		<!-- Logs -->

		<dependency>

			<groupId>org.apache.logging.log4j</groupId>

			<artifactId>log4j-api</artifactId>

			<scope>provided</scope>

		</dependency>

		<dependency>

			<groupId>org.apache.logging.log4j</groupId>

			<artifactId>log4j-core</artifactId>

			<scope>provided</scope>

		</dependency>



		<!-- tests -->

		<dependency>

			<groupId>org.skyscreamer</groupId>

src/main/java/es/redmic/es/administrative/mapper/ActivityESMapper.java

+8 −0
Original line number Diff line number Diff line
@@ -29,8 +29,10 @@ import es.redmic.es.maintenance.domain.administrative.service.ActivityRankESServ 
import es.redmic.es.maintenance.domain.administrative.service.ActivityTypeESService;

import es.redmic.models.es.administrative.dto.ActivityBaseDTO;

import es.redmic.models.es.administrative.dto.ActivityDTO;

import es.redmic.models.es.administrative.dto.ActivityResourceDTO;

import es.redmic.models.es.administrative.model.Activity;

import es.redmic.models.es.administrative.model.Project;

import es.redmic.models.es.administrative.model.ActivityResource;

import es.redmic.models.es.common.dto.DomainDTO;

import es.redmic.models.es.common.dto.DomainImplDTO;

import es.redmic.models.es.common.model.DomainES;
@@ -59,6 +61,9 @@ public class ActivityESMapper extends ActivityBaseESMapper<Activity, ActivityDTO 


		b.setParent(mapperFacade.map(getParent(a), ActivityBaseDTO.class));



		if (a.getResources() != null)

			b.setResources(mapperFacade.mapAsList(a.getResources(), ActivityResourceDTO.class));



		super.mapAtoB(a, b, context);

	}
@@ -74,6 +79,9 @@ public class ActivityESMapper extends ActivityBaseESMapper<Activity, ActivityDTO 
				DataMapperUtils.getObjectFactoryContext(activityTypeESService)));



		a.setPath(getPath(b));



		a.setResources(mapperFacade.mapAsList(b.getResources(), ActivityResource.class));



		super.mapBtoA(b, a, context);

	}

src/test/resources/data/administrative/activity/dto/activity.json

+7 −1
Original line number Diff line number Diff line
@@ -4,6 +4,12 @@ 
	"name": "Volcado de citas del documento BibOAG-00697",

	"code": "VDOC-00697",

	"endDate": "2014-10-06T09:00:00.000+00:00",

	"resources": [{

		"id": 1,

		"name": "Dataset",

		"description": "Descarga de dataset en CKAN",

		"urlResource": "https://ckan.redmic.es"

	}],

	"accessibility": {

		"id": 2,

		"name": "Libre",

src/test/resources/data/administrative/activity/dto/searchWrapperActivityDTO.json

+8 −2
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ 
			"name": "Volcado de citas del documento BibOAG-00697",

			"code": "VDOC-00697",

			"endDate": "2014-10-06T09:00:00.000+00:00",

			"resources": [{

				"id": 1,

				"name": "Dataset",

				"description": "Descarga de dataset en CKAN",

				"urlResource": "https://ckan.redmic.es"

			}],

			"accessibility": {

				"id": 2,

				"name": "Libre",

src/test/resources/data/administrative/activity/model/activity.json

+7 −1
Original line number Diff line number Diff line
@@ -9,6 +9,12 @@ 
	},

	"code": "VDOC-00697",

	"endDate": "2014-10-06T09:00:00.000+00:00",

	"resources": [{

		"id": 1,

		"name": "Dataset",

		"description": "Descarga de dataset en CKAN",

		"urlResource": "https://ckan.redmic.es"

	}],

	"accessibility": {

		"id": 2,

		"name": "Libre",