From f2426f3922f0b0c1b8a6c47cbe8788398522a391 Mon Sep 17 00:00:00 2001
From: lewa <lene.wasskog@nibio.no>
Date: Fri, 3 May 2024 11:20:54 +0200
Subject: [PATCH] feat: Order by time of observation, add logging
---
.../nibio/vips/logic/controller/session/ObservationBean.java | 2 ++
.../java/no/nibio/vips/logic/service/ObservationService.java | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/no/nibio/vips/logic/controller/session/ObservationBean.java b/src/main/java/no/nibio/vips/logic/controller/session/ObservationBean.java
index 64bbec3a..9cb6cc19 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/ObservationBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/ObservationBean.java
@@ -604,6 +604,8 @@ public class ObservationBean {
parameters.put("isPositive", isPositive);
}
+ sql += "ORDER BY time_of_observation DESC";
+
LOGGER.debug(sql);
Query q = em.createNativeQuery(sql, Observation.class);
diff --git a/src/main/java/no/nibio/vips/logic/service/ObservationService.java b/src/main/java/no/nibio/vips/logic/service/ObservationService.java
index cd767b23..5d651556 100755
--- a/src/main/java/no/nibio/vips/logic/service/ObservationService.java
+++ b/src/main/java/no/nibio/vips/logic/service/ObservationService.java
@@ -176,6 +176,8 @@ public class ObservationService {
user != null ? user.getOrganizationId().getDefaultLocale() :
userBean.getOrganization(organizationId).getDefaultLocale());
+ LOGGER.debug("Get filtered observations for user {}", user != null ? user.getUserId() : "<no user>");
+
List<ObservationListItem> observations = getFilteredObservationsFromBackend(
organizationId,
pestId,
@@ -195,8 +197,7 @@ public class ObservationService {
)
);
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ LOGGER.error("Exception when getting localized observation data schema for observation " + obs.getObservationId(), e);
return null;
}
}).collect(Collectors.toList());
--
GitLab