Merge pull request #104 from 12urenloop/stationEndpointChangeKeyToName

12urenloop · Mar 8, 2023 · f8ea463 · f8ea463
2 parents d28bbc0 + 818f818
commit f8ea463
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/main/java/telraam/api/MonitoringResource.java b/src/main/java/telraam/api/MonitoringResource.java
@@ -70,8 +70,8 @@ public Map<Integer, List<BatonDetection>> getTeamDetectionTimes() {
 
     @GET
     @Path("/stations-latest-detection-time")
-    @ApiOperation(value = "Get the map of all station ID's to time since last detection")
-    public Map<Integer, Long> getStationIDToLatestDetectionTimeMap() {
+    @ApiOperation(value = "Get the map of all station name to time since last detection")
+    public Map<String, Long> getStationIDToLatestDetectionTimeMap() {
         return stationDetectionManager.timeSinceLastDetectionPerStation();
     }
 

diff --git a/src/main/java/telraam/monitoring/StationDetectionManager.java b/src/main/java/telraam/monitoring/StationDetectionManager.java
@@ -19,17 +19,15 @@ public StationDetectionManager(DetectionDAO detectionDAO, StationDAO stationDAO)
         this.stationDAO = stationDAO;
     }
 
-    public Map<Integer, Long> timeSinceLastDetectionPerStation() {
+    public Map<String, Long> timeSinceLastDetectionPerStation() {
         List<Integer> stationIdList = stationDAO.getAll().stream().map(Station::getId).toList();
-        Map<Integer, Long> stationIdToTimeSinceLatestDetection = new HashMap<>();
+        Map<String, Long> stationIdToTimeSinceLatestDetection = new HashMap<>();
         for (Integer stationId : stationIdList) {
             Optional<Detection> maybeDetection = this.detectionDAO.latestDetectionByStationId(stationId);
-
-            if (maybeDetection.isPresent()) {
+            Optional<Station> maybeStation = this.stationDAO.getById(stationId);
+            if (maybeDetection.isPresent() && maybeStation.isPresent()) {
                 Long time = maybeDetection.get().getTimestamp().getTime();
-                stationIdToTimeSinceLatestDetection.put(stationId, (System.currentTimeMillis() - time)/1000);
-            } else {
-                stationIdToTimeSinceLatestDetection.put(stationId, null);
+                stationIdToTimeSinceLatestDetection.put(maybeStation.get().getName(), (System.currentTimeMillis() - time)/1000);
             }
         }
         return stationIdToTimeSinceLatestDetection;