return empty markers when none exist (#120)

fixes an instacrash on startup
SJSU-CS-systems-group · Aug 11, 2023 · e44b21f · e44b21f
1 parent d9d9bd6
commit e44b21f
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/server/src/main/java/edu/sjsu/moth/server/service/TimelineService.java b/server/src/main/java/edu/sjsu/moth/server/service/TimelineService.java
@@ -1,6 +1,7 @@
 package edu.sjsu.moth.server.service;
 
 import edu.sjsu.moth.generated.Marker;
+import edu.sjsu.moth.server.db.TimelineRecord;
 import edu.sjsu.moth.server.db.TimelineRepository;
 import edu.sjsu.moth.util.EmailCodeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,8 +19,16 @@ public class TimelineService {
     @Autowired
     TimelineRepository timelineRepository;
 
+    private TimelineRecord getEmptyTimelineRecord(String acct) {
+        var r = new TimelineRecord();
+        r.acct = acct;
+        r.markers = Map.of();
+        return r;
+    }
+
     public Mono<Map<String, Marker>> getMarkersForUser(String name, List<String> timeline) {
         return timelineRepository.findById(name)
+                .defaultIfEmpty(getEmptyTimelineRecord(name))
                 .map(r -> timeline.stream()
                         .map(k -> Map.entry(k, r.markers.getOrDefault(k, EMPTY_MARKER)))
                         .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));