From d282a3745e83296bc4587111fe9913e2ad12e971 Mon Sep 17 00:00:00 2001
From: lewa <lene.wasskog@nibio.no>
Date: Sun, 16 Jun 2024 08:18:03 +0200
Subject: [PATCH] feat(observations): Add observationTimeSeriesId to json
response
---
.../nibio/vips/logic/entity/Observation.java | 6 ++++++
.../logic/entity/rest/ObservationListItem.java | 18 +++++++++++++++++-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/main/java/no/nibio/vips/logic/entity/Observation.java b/src/main/java/no/nibio/vips/logic/entity/Observation.java
index b0b092d0..190d52e6 100755
--- a/src/main/java/no/nibio/vips/logic/entity/Observation.java
+++ b/src/main/java/no/nibio/vips/logic/entity/Observation.java
@@ -558,6 +558,11 @@ public class Observation implements Serializable, no.nibio.vips.observation.Obse
this.observationIllustrationSet = observationIllustrationSet;
}
+ @Transient
+ public Integer getObservationTimeSeriesId() {
+ return observationTimeSeries != null ? observationTimeSeries.getObservationTimeSeriesId() : null;
+ }
+
/**
* @return the observation time series
*/
@@ -686,6 +691,7 @@ public class Observation implements Serializable, no.nibio.vips.observation.Obse
}
return new ObservationListItem(
this.getObservationId(),
+ this.getObservationTimeSeriesId(),
this.getTimeOfObservation(),
this.getOrganismId(),
! this.getOrganism().getLocalName(locale).trim().isBlank() ? this.getOrganism().getLocalName(locale) : this.getOrganism().getLatinName(),
diff --git a/src/main/java/no/nibio/vips/logic/entity/rest/ObservationListItem.java b/src/main/java/no/nibio/vips/logic/entity/rest/ObservationListItem.java
index 51c5a348..ddbc67e3 100644
--- a/src/main/java/no/nibio/vips/logic/entity/rest/ObservationListItem.java
+++ b/src/main/java/no/nibio/vips/logic/entity/rest/ObservationListItem.java
@@ -27,7 +27,7 @@ import no.nibio.vips.observationdata.ObservationDataSchema;
* @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
public class ObservationListItem implements Comparable{
- private Integer observationId, organismId, cropOrganismId;
+ private Integer observationId, observationTimeSeriesId, organismId, cropOrganismId;
private Date timeOfObservation;
private String organismName, cropOrganismName;
private String geoInfo;
@@ -40,6 +40,7 @@ public class ObservationListItem implements Comparable{
public ObservationListItem(
Integer observationId,
+ Integer observationTimeSeriesId,
Date timeOfObservation,
Integer organismId,
String organismName,
@@ -54,6 +55,7 @@ public class ObservationListItem implements Comparable{
ObservationDataSchema observationDataSchema
){
this.observationId = observationId;
+ this.observationTimeSeriesId = observationTimeSeriesId;
this.timeOfObservation = timeOfObservation;
this.organismId = organismId;
this.organismName = organismName;
@@ -93,6 +95,20 @@ public class ObservationListItem implements Comparable{
this.observationId = observationId;
}
+ /**
+ * @return the observationTimeSeriesId
+ */
+ public Integer getObservationTimeSeriesId() {
+ return observationTimeSeriesId;
+ }
+
+ /**
+ * @param observationTimeSeriesId the observationTimeSeriesId to set
+ */
+ public void setObservationTimeSeriesId(Integer observationTimeSeriesId) {
+ this.observationTimeSeriesId = observationTimeSeriesId;
+ }
+
/**
* @return the timeOfObservation
*/
--
GitLab