chore(alert-system): clean up naming and cronjobs

Author: sandeshit

alert_system/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import Connector, ExtractionItem, LoadItems
+from .models import Connector, ExtractionItem, LoadItem
 
 
 @admin.register(Connector)
@@ -25,8 +25,8 @@ class EventAdmin(admin.ModelAdmin):
     )
 
 
-@admin.register(LoadItems)
-class LoadAdmin(admin.ModelAdmin):
+@admin.register(LoadItem)
+class LoadItemAdmin(admin.ModelAdmin):
     list_display = (
         "id",
         "event_title",

alert_system/etl/Gdacs_flood/transform.py

@@ -25,19 +25,19 @@ class GdacsTransformer(BaseTransformerClass):
 
     # NOTE: This logic might change in future
     def compute_people_exposed(self, metadata_list) -> int:
-        for m in metadata_list:
-            if m["category"] == "people" and m["type"] == "affected_total":
-                return m["value"]
+        for data in metadata_list:
+            if data["category"] == "people" and data["type"] == "affected_total":
+                return data["value"]
         return 0
 
     # NOTE: This logic might change in future
     def compute_buildings_exposed(self, metadata_list) -> int:
         """
         Compute the 'buildings_exposed' field.
         """
-        for m in metadata_list:
-            if m["category"] == "buildings" and m["type"] == "damaged":
-                return m["value"]
+        for data in metadata_list:
+            if data["category"] == "buildings" and data["type"] == "damaged":
+                return data["value"]
         return 0
 
     def process_impact(self, impact_items) -> BaseTransformerClass.ImpactType:

alert_system/etl/base/extraction.py

@@ -7,7 +7,7 @@
 import httpx
 from django.db import transaction
 
-from alert_system.models import Connector, ExtractionItem, LoadItems
+from alert_system.models import Connector, ExtractionItem, LoadItem
 
 from .loader import BaseLoaderClass
 from .transform import BaseTransformerClass
@@ -258,14 +258,14 @@ def fetch_past_events(self, load_obj):
                 continue
 
             # Past event already exists → attach it
-            if LoadItems.objects.filter(correlation_id=corr_id).exists():
-                related_ids.append(LoadItems.objects.get(correlation_id=corr_id).id)
+            if LoadItem.objects.filter(correlation_id=corr_id).exists():
+                related_ids.append(LoadItem.objects.get(correlation_id=corr_id).id)
                 continue
 
             # Otherwise extract + load it as past event
             self.run(correlation_id=corr_id, is_past_event=True)
 
-            related_event_obj = LoadItems.objects.filter(correlation_id=corr_id).first()
+            related_event_obj = LoadItem.objects.filter(correlation_id=corr_id).first()
 
             if related_event_obj:
                 related_ids.append(related_event_obj.id)

alert_system/etl/base/loader.py

@@ -2,7 +2,7 @@
 from abc import ABC, abstractmethod
 from typing import Dict
 
-from alert_system.models import Connector, LoadItems
+from alert_system.models import Connector, LoadItem
 
 logger = logging.getLogger(__name__)
 
@@ -18,7 +18,7 @@ def filter_eligible_items(self, load_obj):
     # def fetch_similar_past_events(self, load_obj):
     #     raise NotImplementedError()
 
-    def load(self, transformed_data: Dict, connector: Connector, is_past_event: bool = False) -> LoadItems:
+    def load(self, transformed_data: Dict, connector: Connector, is_past_event: bool = False) -> LoadItem:
         """
         Save aggregated event.
 
@@ -32,7 +32,7 @@ def load(self, transformed_data: Dict, connector: Connector, is_past_event: bool
         correlation_id = transformed_data["correlation_id"]
         is_item_eligible = self.filter_eligible_items(transformed_data)
 
-        load_obj, created = LoadItems.objects.update_or_create(
+        load_obj, created = LoadItem.objects.update_or_create(
             correlation_id=correlation_id,
             defaults={
                 "connector": connector,

alert_system/migrations/0003_alter_extractionitem_collection.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.26 on 2025-12-07 16:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('alert_system', '0002_loaditems_is_past_event_loaditems_related_events'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='extractionitem',
+            name='collection',
+            field=models.IntegerField(choices=[(100, 'event'), (200, 'Hazard'), (300, 'Impacts')], help_text='Collection type of the item', verbose_name='Collection'),
+        ),
+    ]

alert_system/migrations/0004_rename_loaditems_loaditem.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.26 on 2025-12-07 17:36
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('alert_system', '0003_alter_extractionitem_collection'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='LoadItems',
+            new_name='LoadItem',
+        ),
+    ]

alert_system/models.py

@@ -109,7 +109,7 @@ def __str__(self):
         return self.stac_id
 
 
-class LoadItems(BaseItem):
+class LoadItem(BaseItem):
     """
     Model for Load items.
     """

deploy/helm/ifrcgo-helm/values.yaml

@@ -275,11 +275,11 @@ cronjobs:
   - command: 'ingest_icrc'
     schedule: '0 3 * * 0'
   # Schedule time yet to be decided
-  - command: 'poll_gdacs_cy'
+  - command: 'poll_gdacs_cyclone'
     schedule: '0 0 * * 0'
-  - command: 'poll_gdacs_fl'
+  - command: 'poll_gdacs_flood'
     schedule: '0 0 * * 0'
-  - command: 'poll_usgs_eq'
+  - command: 'poll_usgs_earthquake'
     schedule: '0 0 * * 0'
   # - command: 'notify_validators' 
   #   schedule: '0 0 * * *'

main/sentry.py

@@ -128,9 +128,9 @@ class SentryMonitor(models.TextChoices):
     INGEST_NS_DOCUMENT = "ingest_ns_document", "0 0 * * 0"
     INGEST_NS_INITIATIVES = "ingest_ns_initiatives", "0 0 * * 0"
     INGEST_ICRC = "ingest_icrc", "0 3 * * 0"
-    POLL_USGS_EQ = "poll_usgs_eq", "0 0 * * 0"
-    POLL_GDACS_FL = "poll_gdacs_fl", "0 0 * * 0"
-    POLL_GDACS_CY = "poll_gdacs_cy", "0 0 * * 0"
+    POLL_USGS_EARTHQUAKE = "poll_usgs_earthquake", "0 0 * * 0"
+    POLL_GDACS_FLOOD = "poll_gdacs_flood", "0 0 * * 0"
+    POLL_GDACS_CYCLONE = "poll_gdacs_cyclonef", "0 0 * * 0"
     # NOTIFY_VALIDATORS = "notify_validators", "0 0 * * *" # NOTE: Disable local unit email notification for now
     OAUTH_CLEARTOKENS = "oauth_cleartokens", "0 1 * * *"