Añade campos + adapta tests (4455e748) · Commits · REDMIC Project / Server / Library / Models

src/main/java/es/redmic/models/es/administrative/dto/ActivityDTO.java

+55 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaUrl;

		import es.redmic.models.es.common.deserializer.CustomRelationDeserializer;
		import es.redmic.models.es.maintenance.administrative.dto.ActivityTypeDTO;
		import es.redmic.models.es.maintenance.administrative.dto.ThemeInspireDTO;

		public class ActivityDTO extends ActivityBaseDTO {

		@@ -42,6 +43,12 @@ public class ActivityDTO extends ActivityBaseDTO {
		@JsonSchemaUrl(value = "controller.mapping.PROJECT")
		private AncestorActivityDTO parent;

		@JsonIgnoreProperties(value = { "_meta" })
		@JsonSerialize(as = AncestorActivityDTO.class)
		@JsonDeserialize(using = CustomRelationDeserializer.class)
		@JsonSchemaIgnore
		private AncestorActivityDTO grandparent;

		@JsonIgnoreProperties(value = { "_meta" })
		@NotNull
		@JsonDeserialize(using = CustomRelationDeserializer.class)
		@@ -54,6 +61,14 @@ public class ActivityDTO extends ActivityBaseDTO {
		@JsonSchemaUniqueItemsByRequiredProperties
		private List<ActivityResourceDTO> resources;

		private ThemeInspireDTO themeInspire;

		private String license;

		private String spatialExtension;

		private Boolean starred;

		public ActivityDTO() {
		super();
		this.resources = new ArrayList<>();
		@@ -67,6 +82,14 @@ public class ActivityDTO extends ActivityBaseDTO {
		this.parent = parent;
		}

		public AncestorActivityDTO getGrandparent() {
		return this.grandparent;
		}

		public void setGrandparent(AncestorActivityDTO grandparent) {
		this.grandparent = grandparent;
		}

		public ActivityTypeDTO getActivityType() {
		return activityType;
		}
		@@ -90,4 +113,36 @@ public class ActivityDTO extends ActivityBaseDTO {
		public void setResources(List<ActivityResourceDTO> resources) {
		this.resources = resources;
		}

		public ThemeInspireDTO getThemeInspire() {
		return this.themeInspire;
		}

		public void setThemeInspire(ThemeInspireDTO themeInspire) {
		this.themeInspire = themeInspire;
		}

		public String getLicense() {
		return this.license;
		}

		public void setLicense(String license) {
		this.license = license;
		}

		public String getSpatialExtension() {
		return this.spatialExtension;
		}

		public void setSpatialExtension(String spatialExtension) {
		this.spatialExtension = spatialExtension;
		}

		public Boolean getStarred() {
		return this.starred;
		}

		public void setStarred(Boolean starred) {
		this.starred = starred;
		}
		}

src/main/java/es/redmic/models/es/administrative/model/Activity.java

+61 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
		import com.fasterxml.jackson.annotation.JsonProperty;

		import es.redmic.models.es.maintenance.administrative.model.ActivityType;
		import es.redmic.models.es.maintenance.administrative.model.ThemeInspire;



		@@ -43,6 +44,18 @@ public class Activity extends ActivityBase {

		private List<ActivityResource> resources;

		private ThemeInspire themeInspire;

		private String license;

		private String spatialExtension;

		private Boolean starred;

		private ActivityCompact parent;

		private ActivityCompact grandparent;

		public Activity() {
		super();
		}
		@@ -70,4 +83,52 @@ public class Activity extends ActivityBase {
		public void setResources(List<ActivityResource> resources) {
		this.resources = resources;
		}

		public ThemeInspire getThemeInspire() {
		return this.themeInspire;
		}

		public void setThemeInspire(ThemeInspire themeInspire) {
		this.themeInspire = themeInspire;
		}

		public String getLicense() {
		return this.license;
		}

		public void setLicense(String license) {
		this.license = license;
		}

		public String getSpatialExtension() {
		return this.spatialExtension;
		}

		public void setSpatialExtension(String spatialExtension) {
		this.spatialExtension = spatialExtension;
		}

		public Boolean getStarred() {
		return this.starred;
		}

		public void setStarred(Boolean starred) {
		this.starred = starred;
		}

		public ActivityCompact getParent() {
		return this.parent;
		}

		public void setParent(ActivityCompact parent) {
		this.parent = parent;
		}

		public ActivityCompact getGrandparent() {
		return this.grandparent;
		}

		public void setGrandparent(ActivityCompact grandparent) {
		this.grandparent = grandparent;
		}
		}

src/main/java/es/redmic/models/es/administrative/model/Project.java

+13 −3

Original line number	Diff line number	Diff line
		@@ -32,8 +32,18 @@ import es.redmic.models.es.common.model.DomainES;
		@JsonIgnoreProperties(ignoreUnknown = true)
		public class Project extends ActivityBase {

		private ActivityCompact parent;

		public DomainES projectGroup;

		public ActivityCompact getParent() {
		return this.parent;
		}

		public void setParent(ActivityCompact parent) {
		this.parent = parent;
		}

		public DomainES getProjectGroup() {
		return projectGroup;
		}

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

+11 −2

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ import es.redmic.models.es.maintenance.administrative.dto.OrganisationTypeDTO;
		import es.redmic.models.es.maintenance.administrative.dto.PlatformTypeDTO;
		import es.redmic.models.es.maintenance.administrative.dto.ProjectGroupDTO;
		import es.redmic.models.es.maintenance.administrative.dto.RoleDTO;
		import es.redmic.models.es.maintenance.administrative.dto.ThemeInspireDTO;
		import es.redmic.models.es.maintenance.areas.dto.AreaClassificationDTO;
		import es.redmic.models.es.maintenance.areas.dto.ThematicTypeBaseDTO;
		import es.redmic.models.es.maintenance.areas.dto.ThematicTypeDTO;
		@@ -114,12 +115,20 @@ public class CompleteDTOUtils {

		ActivityFieldDTO activityFieldDTO = new ActivityFieldDTO();

		ThemeInspireDTO themeInspire = new ThemeInspireDTO();

		activityFieldDTO.setName("name");
		activityFieldDTO.setName_en("name");
		activityTypeDTO.setActivityField(activityFieldDTO);
		activityDTO.setActivityType(activityTypeDTO);
		activityDTO.setStartDate(new DateTime("2015-03-17T00:00:00.000Z"));
		activityDTO.setParent(completeProjectDTO());
		activityDTO.setGrandparent(completeProgramDTO());
		activityDTO.setThemeInspire(themeInspire);
		activityDTO.setLicense("license");
		activityDTO.setSpatialExtension("spatialExtension");
		activityDTO.setStarred(false);
		activityDTO.setResources(new ArrayList<>());

		return activityDTO;
		}