Commit 66359ce7 authored by Noel Alonso's avatar Noel Alonso
Browse files

Añade campo dashboard a model y dto + tests

parent 22889edf

src/main/java/es/redmic/models/es/geojson/properties/model/Site.java

+21 −11
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ public class Site extends PointCommonFields { 


	private String url;



	private String dashboard;



	public String getPath() {

		return path;

	}
@@ -116,4 +118,12 @@ public class Site extends PointCommonFields { 
	public void setUrl(String url) {

		this.url = url;

	}



	public String getDashboard() {

		return dashboard;

	}



	public void setDashboard(String dashboard) {

		this.dashboard = dashboard;

	}

}

src/main/java/es/redmic/models/es/maintenance/survey/dto/FixedSurveyDTO.java

+15 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ import javax.validation.constraints.Size; 
import com.fasterxml.jackson.annotation.JsonIgnore;

import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaIgnore;



import es.redmic.models.es.common.constraintvalidate.url.ValidateUrl;

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



public class FixedSurveyDTO extends HierarchicalDTO {
@@ -25,6 +26,12 @@ public class FixedSurveyDTO extends HierarchicalDTO { 
	@Size(min = 0, max = 250)

	private String description;



	// TODO: añadir @JsonSchemaFormat("url"). Url compleja que no cumple con la

	// validación

	@ValidateUrl

	@Size(min = 0, max = 500)

	private String dashboard;



	public String getCode() {

		return code;

	}
@@ -57,4 +64,12 @@ public class FixedSurveyDTO extends HierarchicalDTO { 
	public void setDescription(String description) {

		this.description = description;

	}



	public String getDashboard() {

		return dashboard;

	}



	public void setDashboard(String dashboard) {

		this.dashboard = dashboard;

	}

}

src/test/java/es/redmic/test/unit/common/dto/CompleteDTOUtils.java

+1 −0
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ public class CompleteDTOUtils { 
		station.setCode("TGr00");

		station.setPath("r.TGr00");

		station.setPrefixType("pb");

		station.setDashboard("http://redmic.net/dashboard");



		return station;

	}

src/test/java/es/redmic/test/unit/geodata/geofixedtimeseries/dto/GeoFixedTimeSeriesPropertiesDTOTest.java

+16 −0
Original line number Diff line number Diff line
@@ -60,4 +60,20 @@ public class GeoFixedTimeSeriesPropertiesDTOTest extends DTOBaseTest<FixedSurvey 


		checkDTOHasError(dto, SIZE_MESSAGE_TEMPLATE);

	}



	@Test

	public void validationDTO_ReturnSizeError_IfDashboardExceedsSize() {



		dto.getSite().setDashboard("http://" + generateString(501) + ".com");



		checkDTOHasError(dto, SIZE_MESSAGE_TEMPLATE);

	}



	@Test

	public void validationDTO_ReturnFormatError_IfDashboardUrlIsBadFormat() {



		dto.getSite().setDashboard("htttp//:ff.cc");



		checkDTOHasError(dto, URL_MESSAGE_TEMPLATE);

	}

}

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

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
			"path": "r.ft-14",

			"name": "Boya OAG Granadilla",

			"description": "Estación Boya del OAG en Granadilla con múltiples dispositivos",

			"dashboard": "https://redmic.es/dashboard",

			"classification": [

				{

					"type": {