Commit 0642880f authored by Noel Alonso's avatar Noel Alonso
Browse files

Adapta código a cambios de modelo

parent c83ced1c

atlas-commands/src/main/java/es/redmic/atlascommands/mapper/LayerWMSMapper.java

+7 −8
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import org.mapstruct.Mapper; 
import org.mapstruct.Mapping;

import org.mapstruct.Named;



import es.redmic.atlaslib.dto.layer.ActivityDTO;

import es.redmic.atlaslib.dto.layer.AttributionDTO;

import es.redmic.atlaslib.dto.layer.DimensionDTO;

import es.redmic.atlaslib.dto.layer.LogoURLDTO;
@@ -68,7 +67,7 @@ public interface LayerWMSMapper { 
	@Mapping(source = "layer", target = "elevationDimension", qualifiedByName = "elevationDimension")

	@Mapping(source = "layer", target = "stylesLayer", qualifiedByName = "stylesLayer")

	@Mapping(source = "layer", target = "abstractLayer", qualifiedByName = "abstractLayer")

	@Mapping(source = "layer", target = "activities", qualifiedByName = "activities")

	//@Mapping(source = "layer", target = "activities", qualifiedByName = "activities")

	@Mapping(source = "layer", target = "geometry", qualifiedByName = "geometry")

	@Mapping(source = "layer", target = "keywords", qualifiedByName = "keywords")

	@Mapping(source = "layer", target = "attribution", qualifiedByName = "attribution")
@@ -138,7 +137,7 @@ public interface LayerWMSMapper { 
		return abstractLayer;

	}



	@Named("activities")

	/*-@Named("activities")

	default List<ActivityDTO> getActivities(Layer layer, @Context String urlSource) {



		if (layer.get_abstract() == null)
@@ -165,7 +164,7 @@ public interface LayerWMSMapper { 
			activities.add(activity);

		}

		return activities;

	}

	}-*/



	@Named("geometry")

	default Polygon getGeometry(Layer layer, @Context String urlSource) {

atlas-commands/src/main/resources/application.properties

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ controller.mapping.EDIT_SCHEMA=/_schema 


controller.mapping.DISCOVER_LAYERS=/discover-layers



controller.mapping.ACTIVITY=/activities



#Alert

broker.topic.alert=alert

alert.email=alerts@redmic.es

atlas-commands/src/test/java/es/redmic/test/atlascommands/unit/aggregate/capabilities/CapabilitiesTest.java

+2 −43
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ package es.redmic.test.atlascommands.unit.aggregate.capabilities; 
 */



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNull;



import java.io.File;

import java.io.IOException;
@@ -95,7 +94,6 @@ public class CapabilitiesTest { 
		LayerWMSDTO layerDTO = (LayerWMSDTO) layers.values().toArray()[0];



		assertEquals(expectedLayer.getAbstractLayer(), layerDTO.getAbstractLayer());

		assertEquals(expectedLayer.getActivities(), layerDTO.getActivities());



		assertEquals(expectedLayer.getElevationDimension(), layerDTO.getElevationDimension());

		assertEquals(expectedLayer.getFormats(), layerDTO.getFormats());
@@ -155,43 +153,4 @@ public class CapabilitiesTest { 
		layerDTO = Mappers.getMapper(LayerWMSMapper.class).map(layer, urlSource);

		assertEquals(layerDTO.getAbstractLayer(), "");

	}



	@Test

	public void activities_ContainExpectedIds_IfMapperIsCorrect() throws IOException, ServiceException {



		Layer layer = new Layer();



		String urlSource = "";



		layer.set_abstract("Isolíneas batimétricas " + "\n(Batimetría de las Islas Canarias)\nref#817#");

		LayerWMSDTO layerDTO = Mappers.getMapper(LayerWMSMapper.class).map(layer, urlSource);

		assertEquals(layerDTO.getActivities().size(), 1);

		assertEquals(layerDTO.getActivities().get(0).getId(), "817");



		layer.set_abstract("Isolíneas batimétricas ref#817,201,54556# (Batimetría de las Islas Canarias)");

		layerDTO = Mappers.getMapper(LayerWMSMapper.class).map(layer, urlSource);

		assertEquals(layerDTO.getActivities().size(), 3);

		assertEquals(layerDTO.getActivities().get(0).getId(), "817");

		assertEquals(layerDTO.getActivities().get(1).getId(), "201");

		assertEquals(layerDTO.getActivities().get(2).getId(), "54556");



		layer.set_abstract("Isolíneas batimétricas " + "\n(Batimetría de las Islas Canarias)\nref#155,# aaaaaaaaaa");

		layerDTO = Mappers.getMapper(LayerWMSMapper.class).map(layer, urlSource);

		assertEquals(layerDTO.getActivities().size(), 1);

		assertEquals(layerDTO.getActivities().get(0).getId(), "155");



		layer.set_abstract("ref#155,#\nIsolíneas batimétricas (Batimetría de las Islas Canarias)\n");

		layerDTO = Mappers.getMapper(LayerWMSMapper.class).map(layer, urlSource);

		assertEquals(layerDTO.getActivities().size(), 1);

		assertEquals(layerDTO.getActivities().get(0).getId(), "155");



		layer.set_abstract("ref#155#");

		layerDTO = Mappers.getMapper(LayerWMSMapper.class).map(layer, urlSource);

		assertEquals(layerDTO.getActivities().size(), 1);

		assertEquals(layerDTO.getActivities().get(0).getId(), "155");



		layer.set_abstract("Isolíneas batimétricas " + "\n(Batimetría de las Islas Canarias)\n");

		layerDTO = Mappers.getMapper(LayerWMSMapper.class).map(layer, urlSource);

		assertNull(layerDTO.getActivities());

	}

}

atlas-commands/src/test/resources/data/layers/layerDTO.json

+2 −4
Original line number Diff line number Diff line
@@ -147,7 +147,5 @@ 
	"alias": "Batimetrías by operator",

	"atlas": true,

	"refresh": "1",

	"urlSource": "file:/home/REDMIC/redmic_project/server/atlas/atlas-commands/src/test/resources/data/capabilities/wms.xml",

	"name": "batimetriaGlobal",

	"id": "layer-1234"

}

atlas-commands/src/test/resources/data/layers/layerInfoDTO.json

+6 −1
Original line number Diff line number Diff line
@@ -3,6 +3,11 @@ 
		"id": "category-213423",

		"name": "Batimetrías"

	},

	"activities": [

		{

			"id": "817"

		}

	],

	"themeInspire": {

		"id": "themeInspire-el",

		"code": "el",