Fixing Null time issues for CM Events APi

CDOT-CV · Apr 9, 2024 · be21091 · be21091
1 parent d280aab
commit be21091
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/...flictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/EventController.java b/...flictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/controllers/EventController.java
@@ -1,6 +1,8 @@
 package us.dot.its.jpo.ode.api.controllers;
 
+import java.time.Instant;
 import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -107,6 +109,7 @@ public class EventController {
     private static final Logger logger = LoggerFactory.getLogger(EventController.class);
 
     ObjectMapper objectMapper = new ObjectMapper();
+    DateTimeFormatter formatter = DateTimeFormatter.ISO_INSTANT;
 
     public String getCurrentTime() {
         return ZonedDateTime.now().toInstant().toEpochMilli() + "";
@@ -528,9 +531,8 @@ public ResponseEntity<List<MinuteCount>> getBsmActivityByMinuteInRange(
             Random rand = new Random();
             for(int i=0; i< 10; i++){
                 int offset = rand.nextInt((int)(endTime - startTime));
-
                 MinuteCount count = new MinuteCount();
-                count.setMinute(Math.round((startTime + offset) / 60000) * 60000);
+                count.setMinute(((long)Math.round((startTime + offset) / 60000)) * 60000L);
                 count.setCount(rand.nextInt(10) + 1);
                 list.add(count);
             }
@@ -543,21 +545,23 @@ public ResponseEntity<List<MinuteCount>> getBsmActivityByMinuteInRange(
 
             Map<Long, Set<String>> bsmEventMap = new HashMap<>();
 
-            System.out.println("Test" + events.size());
-
             for(BsmEvent event: events){
-                Long eventStartMinute = event.getStartingBsmTimestamp() / (60 * 1000);
-                Long eventEndMinute = event.getEndingBsmTimestamp()/ (60 * 1000);
+                J2735Bsm bsm = ((J2735Bsm)event.getStartingBsm().getPayload().getData());
+                Long eventStartMinute = Instant.from(formatter.parse(event.getStartingBsm().getMetadata().getOdeReceivedAt())).toEpochMilli() / (60 * 1000);
+                Long eventEndMinute = eventStartMinute;
+
+                if(event.getEndingBsm() != null){
+                    eventEndMinute = Instant.from(formatter.parse(event.getEndingBsm().getMetadata().getOdeReceivedAt())).toEpochMilli() / (60 * 1000);
+                }
 
                 if(eventStartMinute != null && eventEndMinute != null){
-                    for (Long i = eventStartMinute; i< eventEndMinute; i++){
-                        String bsmID = ((J2735Bsm)event.getStartingBsm().getPayload().getData()).getCoreData().getId();
+                    for (Long i = eventStartMinute; i<= eventEndMinute; i++){
+                        String bsmID = bsm.getCoreData().getId();
                         if(bsmEventMap.get(i) != null){
                             bsmEventMap.get(i).add(bsmID);
                         }else{
                             Set<String> newSet = new HashSet<>();
                             newSet.add(bsmID);
-
                             bsmEventMap.put(i, newSet);
                         }
                     }