DBC22-1811: Improved delays list structured info

src/backend/apps/event/enums.py

@@ -92,16 +92,21 @@ class EVENT_DIRECTION:
     EVENT_DIRECTION.EAST: "Eastbound",
     EVENT_DIRECTION.SOUTH: "Southbound",
     EVENT_DIRECTION.WEST: "Westbound",
-    EVENT_DIRECTION.BOTH: "Both Directions",
-    EVENT_DIRECTION.NONE: "Not Applicable"
+    EVENT_DIRECTION.BOTH: "Both",
+    EVENT_DIRECTION.NONE: "Both"
 }
 
 EVENT_DIFF_FIELDS = [
-    'last_updated',
-    'priority'
+    'next_update',
+    'last_updated'
 ]
 
 EVENT_UPDATE_FIELDS = [
+    'highway_segment_names',
+    'location_description',
+    'closest_landmark',
+    'next_update',
+    'start_point_linear_reference',
     'description',
     'event_type',
     'event_sub_type',
@@ -110,7 +115,6 @@ class EVENT_DIRECTION:
     'closed',
     'direction',
     'last_updated',
-    'priority',
     'location',
     'route_at',
     'route_from',

src/backend/apps/event/migrations/0014_event_closest_landmark_event_highway_segment_names_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.2.3 on 2024-02-28 18:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('event', '0013_event_priority'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='event',
+            name='closest_landmark',
+            field=models.CharField(blank=True, default='', max_length=128),
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='highway_segment_names',
+            field=models.CharField(blank=True, default='', max_length=128),
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='location_description',
+            field=models.CharField(blank=True, default='', max_length=128),
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='next_update',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+    ]

src/backend/apps/event/migrations/0015_alter_event_closest_landmark_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.3 on 2024-02-29 21:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('event', '0014_event_closest_landmark_event_highway_segment_names_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='event',
+            name='closest_landmark',
+            field=models.CharField(blank=True, default='', max_length=256),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='highway_segment_names',
+            field=models.CharField(blank=True, default='', max_length=256),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='location_description',
+            field=models.CharField(blank=True, default='', max_length=256),
+        ),
+    ]

src/backend/apps/event/migrations/0016_event_start_point_linear_reference.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.3 on 2024-03-04 17:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('event', '0015_alter_event_closest_landmark_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='event',
+            name='start_point_linear_reference',
+            field=models.FloatField(null=True),
+        ),
+    ]

src/backend/apps/event/migrations/0017_remove_event_priority.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.3 on 2024-03-04 18:07
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('event', '0016_event_start_point_linear_reference'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='event',
+            name='priority',
+        ),
+    ]

src/backend/apps/event/models.py

@@ -14,7 +14,6 @@ class Event(BaseModel):
     status = models.CharField(max_length=32)
     severity = models.CharField(max_length=32)
     closed = models.BooleanField(default=False)
-    priority = models.PositiveIntegerField(default=0)
 
     # Location
     direction = models.CharField(max_length=32)
@@ -23,6 +22,13 @@ class Event(BaseModel):
     route_from = models.CharField(max_length=128)
     route_to = models.CharField(max_length=128, blank=True)
 
+    # CARS API info
+    highway_segment_names = models.CharField(max_length=256, blank=True, default='')
+    location_description = models.CharField(max_length=256, blank=True, default='')
+    closest_landmark = models.CharField(max_length=256, blank=True, default='')
+    next_update = models.DateTimeField(null=True, blank=True)
+    start_point_linear_reference = models.FloatField(null=True)
+
     # Update status
     first_created = models.DateTimeField()
     last_updated = models.DateTimeField()

src/backend/apps/event/serializers.py

@@ -17,10 +17,38 @@ class ScheduleSerializer(serializers.Serializer):
     )
 
 
+def tail_trim(text, target):
+    target_index = text.find(target)
+    return text[:target_index] if target_index != -1 else text
+
+
+def optimize_description(text):
+    res = text
+
+    # Remove next update from the end
+    res = tail_trim(res, ' Next update')
+
+    # Remove last updated from the end
+    res = tail_trim(res, ' Last updated')
+
+    # Split by periods and remove road+directions
+    res = res.split('. ')[1:]
+
+    # Remove 'at' location phrases from the beginning
+    res[0] = tail_trim(res[0], ' at')
+
+    # Remove 'between' location phrases from the beginning
+    res[0] = tail_trim(res[0], ' between')
+
+    # Join split strings and return
+    return '. '.join(res) if len(res) > 1 else res[0] + '.'
+
+
 class EventInternalSerializer(serializers.ModelSerializer):
     display_category = serializers.SerializerMethodField()
     direction_display = serializers.SerializerMethodField()
     route_display = serializers.SerializerMethodField()
+    optimized_description = serializers.SerializerMethodField()
     schedule = ScheduleSerializer()
 
     class Meta:
@@ -50,11 +78,14 @@ def get_route_display(self, obj):
 
         return res
 
+    def get_optimized_description(self, obj):
+        return optimize_description(obj.description)
+
     def get_display_category(self, obj):
         if obj.closed:
             return EVENT_DISPLAY_CATEGORY.CLOSURE
 
-        if obj.id.startswith('drivebc.ca/DBCRCON'):
+        if obj.id.startswith('DBCRCON'):
             return EVENT_DISPLAY_CATEGORY.ROAD_CONDITION
 
         if obj.start and datetime.datetime.now(pytz.utc) < obj.start:

src/backend/apps/event/tasks.py

@@ -65,23 +65,35 @@ def populate_event_from_data(new_event_data):
 
 def populate_all_event_data(include_closures=True):
     client = FeedClient()
-    closures = client.get_closures_dict() if include_closures else {}
-    feed_data = client.get_event_list()['events']
+    dit_data_dict = client.get_dit_event_dict() if include_closures else {}
+    open511_data = client.get_event_list()['events']
 
-    priority = 0
     active_event_ids = []
-    for event_data in feed_data:
+    for event_data in open511_data:
         try:
             id = event_data.get("id", "").split("/")[-1]
-            event_data["closed"] = closures.get(id, False)
-            event_data['priority'] = priority
+            event_data["id"] = id
 
+            # CARS data
+            cars_data = dit_data_dict[id] if id in dit_data_dict else {}
+            event_data["closed"] = cars_data.get('closed', False)
+            event_data["highway_segment_names"] = cars_data.get('highway_segment_names', '')
+
+            location_description = cars_data.get('location_description', '')
+            location_extent = cars_data.get('location_extent', '')
+            if location_extent:
+                location_description += ' for ' + location_extent
+
+            event_data["location_description"] = location_description
+            event_data["closest_landmark"] = cars_data.get('closest_landmark', '')
+            event_data["next_update"] = cars_data.get('next_update', None)
+            event_data["start_point_linear_reference"] = cars_data.get('start_point_linear_reference', None)
+
+            # Populate db obj
             populate_event_from_data(event_data)
-            priority += 1
 
-            # Event is active
-            if "id" in event_data:
-                active_event_ids.append(event_data["id"])
+            if id:  # Mark event as active
+                active_event_ids.append(id)
 
         except Exception as e:
             logger.warning(e)

src/backend/apps/feed/client.py

@@ -13,7 +13,7 @@
     WEBCAM,
 )
 from apps.feed.serializers import (
-    CarsClosureEventSerializer,
+    CarsEventSerializer,
     EventAPISerializer,
     EventFeedSerializer,
     FerryAPISerializer,
@@ -145,15 +145,19 @@ def get_event_list(self):
             {"format": "json", "limit": 500}
         )
 
-    def get_closures_dict(self):
+    def get_dit_event_dict(self):
         """ Return a dict of <id>:True for fast lookup of closed events by <id>. """
 
-        events = self.get_list_feed(
-            DIT, 'dbcevents', CarsClosureEventSerializer,
+        res = {}
+        cars_events = self.get_list_feed(
+            DIT, 'dbcevents', CarsEventSerializer,
             {"format": "json", "limit": 500}
         )
 
-        return {event["id"]: True for event in events if event["closed"]}
+        for event in cars_events:
+            res[event['id']] = event
+
+        return res
 
     # Ferries
     def get_ferries_list(self):