Commit cb221883 authored by Noel Alonso's avatar Noel Alonso
Browse files

Añade organisation a ObservationSeries

parent eac39c85

src/main/java/es/redmic/api/privatedata/dto/ObservationDTO.java

+13 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ import javax.validation.constraints.NotNull; 


import com.fasterxml.jackson.annotation.JsonIgnoreProperties;



import es.redmic.models.es.administrative.dto.OrganisationCompactDTO;



/*-

 * #%L

 * API
@@ -46,6 +48,9 @@ public class ObservationDTO { 
	@NotNull

	private AnimalTaxonomyCompactDTO animal;



	@JsonIgnoreProperties(value = {"_meta"})

	private OrganisationCompactDTO organisation;



	@JsonIgnoreProperties(value = {"_meta"})

	@NotNull

	private DomainDTO observationType;
@@ -82,6 +87,14 @@ public class ObservationDTO { 
		this.animal = animal;

	}



	public OrganisationCompactDTO getOrganisation() {

		return organisation;

	}



	public void setOrganisation(OrganisationCompactDTO organisation) {

		this.organisation = organisation;

	}



	public DomainDTO getObservationType() {

		return observationType;

	}

src/main/java/es/redmic/api/privatedata/model/Observation.java

+11 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import es.redmic.models.es.administrative.taxonomy.model.AnimalTaxonomyCompact; 
import es.redmic.models.es.administrative.taxonomy.model.TaxonomyBase;

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

import es.redmic.models.es.maintenance.device.model.DeviceCompact;

import es.redmic.models.es.administrative.model.OrganisationCompact;



/*-

 * #%L
@@ -36,6 +37,8 @@ public class Observation { 


	private AnimalTaxonomyCompact animal;



	private OrganisationCompact organisation;



	private DomainES observationType;



	public String getNote() {
@@ -70,6 +73,14 @@ public class Observation { 
		this.animal = animal;

	}



	public OrganisationCompact getOrganisation() {

		return this.organisation;

	}



	public void setOrganisation(OrganisationCompact organisation) {

		this.organisation = organisation;

	};



	public DomainES getObservationType() {

		return observationType;

	}