Adding latest parameter to processed spat messages

CDOT-CV · May 20, 2024 · 0ef9aa6 · 0ef9aa6
1 parent f867945
commit 0ef9aa6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/...izer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/spat/ProcessedSpatRepository.java b/...izer-api/src/main/java/us/dot/its/jpo/ode/api/accessors/spat/ProcessedSpatRepository.java
@@ -9,7 +9,7 @@
 import org.springframework.data.mongodb.core.query.Query;
 
 public interface ProcessedSpatRepository extends DataLoader<ProcessedSpat>{
-    Query getQuery(Integer intersectionID, Long startTime, Long endTime, boolean compact);
+    Query getQuery(Integer intersectionID, Long startTime, Long endTime, boolean latest, boolean compact);
 
     long getQueryResultCount(Query query);
 

diff --git a/...-api/src/main/java/us/dot/its/jpo/ode/api/accessors/spat/ProcessedSpatRepositoryImpl.java b/...-api/src/main/java/us/dot/its/jpo/ode/api/accessors/spat/ProcessedSpatRepositoryImpl.java
@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -40,7 +41,7 @@ public class ProcessedSpatRepositoryImpl implements ProcessedSpatRepository {
     private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd-HH");
     private ObjectMapper mapper = DateJsonMapper.getInstance();
 
-    public Query getQuery(Integer intersectionID, Long startTime, Long endTime, boolean compact) {
+    public Query getQuery(Integer intersectionID, Long startTime, Long endTime, boolean latest, boolean compact) {
         Query query = new Query();
 
         if (intersectionID != null) {
@@ -57,13 +58,19 @@ public Query getQuery(Integer intersectionID, Long startTime, Long endTime, bool
             endTimeString = Instant.ofEpochMilli(endTime).toString();
         }
 
+        if (latest) {
+            query.with(Sort.by(Sort.Direction.DESC, "utcTimeStamp"));
+            query.limit(1);
+        }else{
+            query.limit(props.getMaximumResponseSize());
+        }
+
         if (compact){
             query.fields().exclude("recordGeneratedAt", "validationMessages");
         }else{
             query.fields().exclude("recordGeneratedAt");
         }
 
-	    query.limit(props.getMaximumResponseSize());
         query.addCriteria(Criteria.where("utcTimeStamp").gte(startTimeString).lte(endTimeString));
         return query;
     }
@@ -77,7 +84,7 @@ public List<ProcessedSpat> findProcessedSpats(Query query) {
     }
 
     public List<IDCount> getSpatBroadcastRates(int intersectionID, Long startTime, Long endTime){
-        Query query = getQuery(intersectionID, startTime, endTime, true);
+        Query query = getQuery(intersectionID, startTime, endTime, false, true);
 
         query.fields().include("utcTimeStamp");
         List<Map> times = mongoTemplate.find(query, Map.class, collectionName);

diff --git a/...nflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/SpatController.java b/...nflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/SpatController.java
@@ -46,13 +46,14 @@ public ResponseEntity<List<ProcessedSpat>> findSpats(
             @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 = "compact", required = false, defaultValue = "true") boolean compact,
             @RequestParam(name = "test", required = false, defaultValue = "false") boolean testData) {
 
         if (testData) {
             return ResponseEntity.ok(MockSpatGenerator.getProcessedSpats());
         } else {
-            Query query = processedSpatRepo.getQuery(intersectionID, startTime, endTime, compact);
+            Query query = processedSpatRepo.getQuery(intersectionID, startTime, endTime, latest, compact);
             long count = processedSpatRepo.getQueryResultCount(query);
             logger.info("Returning Processed Spat Response with Size: " + count);
             return ResponseEntity.ok(processedSpatRepo.findProcessedSpats(query));
@@ -71,7 +72,7 @@ public ResponseEntity<Long> countSpats(
         if (testData) {
             return ResponseEntity.ok(80L);
         } else {
-            Query query = processedSpatRepo.getQuery(intersectionID, startTime, endTime, true);
+            Query query = processedSpatRepo.getQuery(intersectionID, startTime, endTime,false, true);
             long count = processedSpatRepo.getQueryResultCount(query);
             logger.info("Found: " + count + "Processed Spat Messages");
             return ResponseEntity.ok(count);