Merge branch 'dev' into 'master' (6d312f18) · Commits · REDMIC Project / Server / Library / Models

src/main/java/es/redmic/models/es/common/model/BaseTimeDataAbstractES.java

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		package es.redmic.models.es.common.model;

		import org.joda.time.DateTime;

		import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
		import com.fasterxml.jackson.databind.annotation.JsonSerialize;

		import es.redmic.models.es.common.deserializer.CustomDateTimeDeserializer;
		import es.redmic.models.es.common.serializer.CustomDateTimeSerializer;

		public abstract class BaseTimeDataAbstractES extends BaseUpdatableES {

		private DateTime date;

		@JsonSerialize(using = CustomDateTimeSerializer.class)
		public DateTime getDate() {
		return date;
		}

		@JsonDeserialize(using = CustomDateTimeDeserializer.class)
		public void setDate(DateTime date) {
		this.date = date;
		}
		}

+12 −0

Original line number	Diff line number	Diff line
		@@ -20,11 +20,22 @@ public class DataAccessibilityQueryDTO extends MetadataQueryDTO {
		super();
		}

		@JsonView(value = { JsonViewsForQueryDTO.Guest.class })
		private String activityId;

		@JsonView(value = { JsonViewsForQueryDTO.Administrator.class })
		@Size(max = 4)
		@JsonSchemaDefault("[2]")
		private List<Long> accessibilityIds;

		public String getActivityId() {
		return activityId;
		}

		public void setActivityId(String activityId) {
		this.activityId = activityId;
		}

		public List<Long> getAccessibilityIds() {
		return accessibilityIds;
		}
		@@ -33,6 +44,7 @@ public class DataAccessibilityQueryDTO extends MetadataQueryDTO {
		this.accessibilityIds = accessibilityIds;
		}

		@Override
		public void addAccessibilityIds(List<Long> accessibilityIds) {

		if (accessibilityIds != null && accessibilityIds.size() > 0) {