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

Añade activityId a propiedades de geodata 

elimina campo de parent por eliminación de la herencia y adapta tests
parent a0a60496

src/main/java/es/redmic/models/es/geojson/common/model/Feature.java

+2 −17
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ import javax.validation.constraints.Size; 


import org.locationtech.jts.geom.Geometry;



import com.fasterxml.jackson.annotation.JsonIgnore;



import es.redmic.models.es.common.model.BaseAbstractES;

import es.redmic.models.es.geojson.GeoJSONFeatureType;
@@ -36,9 +34,6 @@ public class Feature<TProperties extends Properties, TGeometry extends Geometry> 
	@Size(min = 1, max = 50)

	private String uuid;



	@JsonIgnore

	private String _parentId;



	protected GeoJSONFeatureType type;



	private TProperties properties;
@@ -57,16 +52,6 @@ public class Feature<TProperties extends Properties, TGeometry extends Geometry> 
		this.uuid = uuid;

	}



	@JsonIgnore

	public String get_parentId() {

		return _parentId;

	}



	@JsonIgnore

	public void set_parentId(String _parent) {

		this._parentId = _parent;

	}



	public void setType(GeoJSONFeatureType type) {

		this.type = type;

	}

src/main/java/es/redmic/models/es/geojson/common/model/GeoHitWrapper.java

+2 −12
Original line number Diff line number Diff line
@@ -29,20 +29,10 @@ import es.redmic.models.es.common.model.HitWrapper; 
@JsonIgnoreProperties(ignoreUnknown = true)

public class GeoHitWrapper<TProperties extends Properties, TGeometry extends Geometry> extends HitWrapper {



	private String _parent;



	private Feature<TProperties, TGeometry> _source;



	private InnerHits inner_hits;



	public String get_parent() {

		return _parent;

	}



	public void set_parent(String _parent) {

		this._parent = _parent;

	}



	public Feature<TProperties, TGeometry> get_source() {

		return _source;

	}

src/main/java/es/redmic/models/es/geojson/common/model/Properties.java

+11 −2
Original line number Diff line number Diff line
@@ -25,4 +25,13 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 
@JsonIgnoreProperties(ignoreUnknown=true)

public abstract class Properties {



	private String activityId;



	public String getActivityId() {

		return activityId;

	}



	public void setActivityId(String activityId) {

		this.activityId = activityId;

	}

}

src/test/java/es/redmic/test/unit/geodata/common/dto/FeatureTest.java

+2 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ public class FeatureTest extends DTOBaseTest<Feature<?, ?>> { 


		dto = new Feature();

		dto.setUuid("sdewewewe13-sdsd");

		dto.set_parentId("dddd");

	}



	@Test

src/test/resources/geodata/model/ResponseDataES.json

+2 −3
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
				"_type": "geodata",

				"_id": "f9a86738-7077-4551-b166-83bbc144e700",

				"_score": 1,

				"_routing": "48",

				"_parent": "48",

				"_source": {

					"id": 14,

					"uuid": "sdsd323sdds_3ed",
@@ -30,6 +28,7 @@ 
						]

					},

					"properties": {

						"activityId": "48",

						"inTrackIds": [

							"tr-124"

						],