Added Map Count Endpoint

CDOT-CV · Apr 29, 2024 · 7def768 · 7def768
1 parent 7fd4eeb
commit 7def768
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/...er-api/src/main/java/us/dot/its/jpo/ode/api/accessors/map/ProcessedMapRepositoryImpl.java b/...er-api/src/main/java/us/dot/its/jpo/ode/api/accessors/map/ProcessedMapRepositoryImpl.java
@@ -36,7 +36,6 @@
 
 import us.dot.its.jpo.geojsonconverter.pojos.geojson.map.ProcessedMap;
 import us.dot.its.jpo.ode.api.ConflictMonitorApiProperties;
-import us.dot.its.jpo.ode.api.controllers.AssessmentController;
 import us.dot.its.jpo.ode.api.models.IDCount;
 import us.dot.its.jpo.ode.api.models.IntersectionReferenceData;
 import us.dot.its.jpo.geojsonconverter.DateJsonMapper;
@@ -125,6 +124,10 @@ public List<IntersectionReferenceData> getIntersectionIDs() {
                             data.setIntersectionID(intersectionId);
                             data.setRoadRegulatorID("-1");
                             data.setRsuIP(properties.getString("originIp"));
+
+                            if(properties.getString("intersectionName").isEmpty()){
+
+                            }
                             data.setIntersectionName(properties.getString("intersectionName"));
                             if (refPoint != null) {
                                 data.setLatitude(refPoint.getDouble("latitude"));

diff --git a/...onflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/MapController.java b/...onflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/MapController.java
@@ -59,5 +59,27 @@ public ResponseEntity<List<ProcessedMap>> findMaps(
         }
     }
 
+    @CrossOrigin(origins = "http://localhost:3000")
+    @RequestMapping(value = "/map/count", method = RequestMethod.GET, produces = "application/json")
+    @PreAuthorize("hasRole('USER') || hasRole('ADMIN')")
+    public ResponseEntity<Long> countMaps(
+            @RequestParam(name = "intersection_id", required = false) Integer intersectionID,
+            @RequestParam(name = "start_time_utc_millis", required = false) Long startTime,
+            @RequestParam(name = "end_time_utc_millis", required = false) Long endTime,
+            @RequestParam(name= "latest", required = false, defaultValue = "false") boolean latest,
+            @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) {
+
+        if (testData) {
+            return ResponseEntity.ok(5L);
+        } else {
+            Query query = processedMapRepo.getQuery(intersectionID, startTime, endTime, latest);
+            long count = processedMapRepo.getQueryResultCount(query);
+
+            logger.info("Found: " + count + "Processed Map Messages");
+            return ResponseEntity.ok(count);
+
+        }
+    }
+
 
 }