Allow spots and alerts to have multiple activities #143

data/alert.py

@@ -66,8 +66,11 @@ class Alert:
 
     # Activity info
 
-    # Activity (e.g. outdoor activity programme such as POTA).
-    activity: str | None = None
+    # Activities (e.g. outdoor activity programmes such as POTA). An alert can be for several activities at once,
+    # e.g. a POTA and WWFF dual activation. This is a list so we can maintain the order items were added, but needs to
+    # be set-like to avoid dupes, and there's no Python class that handles that properly. So we use a list, but handle
+    # the uniqueness logic manually, so you must use add_activity() to add to it instead of adding directly.
+    activities: list = field(default_factory=list)
     # Activity references. We allow multiple here for e.g. n-fer activations, unlike ADIF SIG_INFO.
     activity_refs: list = field(default_factory=list)
 
@@ -92,6 +95,11 @@ class Alert:
     # Icon to use when displaying this alert in the web UI. Chosen from the Font Awesome set.
     icon: str | None = None
 
+    def __post_init__(self):
+        """Normalise the activities list, removing any duplicates while keeping the order."""
+
+        self.activities = list(dict.fromkeys(self.activities)) if self.activities else []
+
     def infer_missing(self, credentials=None):
         """Infer missing parameters where possible"""
 
@@ -145,10 +153,10 @@ class Alert:
                         self.dx_latitude = activity_ref.latitude
                         self.dx_longitude = activity_ref.longitude
 
-            # If the spot itself doesn't have an activity yet, but we have at least one activity reference, take that
-            # reference's activity and apply it to the whole spot.
-            if self.activity_refs and self.activity_refs[0] and not self.activity:
-                self.activity = self.activity_refs[0].activity
+            # Add the activities of any activity refs we have to the alert's list of activities.
+            for activity_ref in self.activity_refs:
+                if activity_ref and activity_ref.activity:
+                    self.add_activity(activity_ref.activity)
 
             # DX Grid to lat/lon and vice versa in case one is missing
             if self.dx_grid and (not self.dx_latitude or not self.dx_longitude):
@@ -179,14 +187,23 @@ class Alert:
             if self.dx_calls and not self.dx_names:
                 self.dx_names = [get_call_info(c, credentials).name for c in self.dx_calls]
 
-            # Icon for the alert should be the icon of its activity if known, otherwise a radio tower
+            # Icon for the alert should be the icon of its first activity that has one, otherwise a radio tower
             self.icon = "fa-tower-cell"
-            if self.activity and (activity_icon := get_icon_for_activity(self.activity)):
-                self.icon = activity_icon
+            for activity in self.activities:
+                if activity_icon := get_icon_for_activity(activity):
+                    self.icon = activity_icon
+                    break
 
         except Exception:
             logger.exception("Exception while inferring missing data from spot")
 
+    def add_activity(self, activity):
+        """Add an activity to the activities list, so long as it's not blank and not already there. The list is kept in
+        insertion order, so the first activity added is treated as the "primary" one."""
+
+        if activity and activity not in self.activities:
+            self.activities.append(activity)
+
     def to_json(self):
         """JSON serialise"""