Commit 60edd2c4 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

feature-realTime

See merge request redmic-project/server/library/models!8
parents 53d06aa0 c073e6f0

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
	<groupId>es.redmic.lib</groupId>

	<artifactId>models</artifactId>

	<packaging>jar</packaging>

	<version>0.8.0</version>

	<version>0.8.1</version>

	<name>Models</name>

	<description>Input-output classes and models</description>

src/main/java/es/redmic/models/es/common/constraintvalidate/phone/PhoneNumberValidator.java

+3 −2
Original line number Diff line number Diff line
@@ -7,8 +7,9 @@ import javax.validation.ConstraintValidatorContext; 


public class PhoneNumberValidator implements ConstraintValidator<ValidatePhoneNumber, String> {



	private static final Pattern REGEX_PATTERN = Pattern

			.compile("^(00\\d\\d|\\+\\d\\d)? ?(\\d\\d\\d)-? ?(\\d\\d)-? ?(\\d)-? ?(\\d)-? ?(\\d\\d)$", Pattern.MULTILINE);

	private static final Pattern REGEX_PATTERN = Pattern.compile(

			"^(\\+\\d{1,3}|\\d{4})? ?(\\d{3,5})-? ?(\\d{2,3})-? ?(\\d{1,2})-? ?(\\d{1,2})-? ?(\\d{2,3})$",

			Pattern.MULTILINE);



	@Override

	public boolean isValid(String phoneNumber, ConstraintValidatorContext cvc) {

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/administrative/dto/PlatformDTOTest.java

+5 −5
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public class PlatformDTOTest extends DTOBaseTest<PlatformDTO> { 
	@Test

	public void validationDTO_ReturnSizeError_IfContactPhoneExceedsSize() {



		dto.setContactPhone("453455544334");

		dto.setContactPhone("45345554433423445553");



		checkDTOHasError(dto, PHONE_NUMBER_MESSAGE_TEMPLATE);

	}