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

Adapta modelo y búsquedas por cambio en propiedad

parent f88917af

atlas-view/src/main/java/es/redmic/atlasview/model/layer/LayerWMS.java

+5 −5
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public class LayerWMS extends BaseAbstractStringES { 
	private List<String> srs;

	private List<StyleLayer> stylesLayer;

	private Contact contact;

	private List<LayerActivity> activities;

	private List<LayerActivity> relatedActivities;

	private List<String> formats;

	private Polygon geometry;

	private String legend;
@@ -130,12 +130,12 @@ public class LayerWMS extends BaseAbstractStringES { 
		this.contact = contact;

	}



	public List<LayerActivity> getActivities() {

		return activities;

	public List<LayerActivity> getRelatedActivities() {

		return relatedActivities;

	}



	public void setActivities(List<LayerActivity> activities) {

		this.activities = activities;

	public void setRelatedActivities(List<LayerActivity> relatedActivities) {

		this.relatedActivities = relatedActivities;

	}



	public List<String> getFormats() {

atlas-view/src/main/java/es/redmic/atlasview/repository/layer/LayerESRepository.java

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ public class LayerESRepository extends RWDataESRepository<Layer, GeoDataQueryDTO 
		if (terms.containsKey("activities")) {



			List<Integer> ids = (List<Integer>) terms.get("activities");

			query.must(QueryBuilders.nestedQuery("activities", QueryBuilders.boolQuery().filter(QueryBuilders.termsQuery("activities.activity.id", ids)),

			query.must(QueryBuilders.nestedQuery("relatedActivities", QueryBuilders.boolQuery().filter(QueryBuilders.termsQuery("relatedActivities.activity.id", ids)),

				ScoreMode.Avg));

		}

		return super.getTermQuery(terms, query);

atlas-view/src/main/resources/mappings/layer/_doc.json

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
						}

					}

				},

				"activities": {

				"relatedActivities": {

					"dynamic": false,

					"type": "nested",

					"properties": {

atlas-view/src/test/java/es/redmic/test/atlasview/integration/controller/LayerControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ public class LayerControllerTest extends DocumentationViewBaseTest { 
		activity.setId("135");

		layerActivity.setActivity(activity);

		activities.add(layerActivity);

		layerAtlas.setActivities(activities);

		layerAtlas.setRelatedActivities(activities);

		repository.save(layerAtlas, PARENT_ID);

atlas-view/src/test/resources/data/dto/layer/layer.json

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
		"fax": "",

		"address": "Edf. Puerto Ciudad S/C de Tenerife 38101 España "

	},

	"activities": [

	"relatedActivities": [

		{

			"activity": {

				"id": "12"