fixup! chore(organization): sync organization data into firebase.

Author: Rup-Narayan-Rajbanshi

apps/project/firebase.py

@@ -1,44 +1,57 @@
 import logging
+import typing
 
 from celery import shared_task
 from django.utils import timezone
 from firebase_admin.db import Reference as FbReference
-
 from pyfirebase_mapswipe import models as firebase_models
 from pyfirebase_mapswipe import utils as firebase_utils
-from pyfirebase_mapswipe import models as firebase_models
 
-from main.logging import log_extra
+from apps.project.models import FirebasePushStatusEnum, Organization
 from main.config import Config
-from apps.project.models import Organization, FirebasePushStatusEnum
-
+from main.logging import log_extra
 
 logger = logging.getLogger(__name__)
 
 
 class InvalidOrganizationPushException(Exception): ...
 
 
-def handle_new_organization_on_firebase(organization: Organization, orgnization_ref: FbReference):
-
+def handle_new_organization_on_firebase(organization: Organization, organization_ref: FbReference):
     organization_data = firebase_models.FbOrganisation(
         name=organization.name,
         nameKey=organization.unique_name,
-        description=organization.description,
+        description=organization.description if organization.description else firebase_models.UNDEFINED,
+        abbreviation=organization.abbreviation if organization.abbreviation else firebase_models.UNDEFINED,
         isArchived=organization.is_archived,
-        archivedAt=organization.archived_at if organization.archived_at else firebase_models.UNDEFINED,
-        archivedBy=organization.archived_by_id if organization.archived_by else firebase_models.UNDEFINED,
     )
 
-    orgnization_ref.set(
+    organization_ref.set(
         value={
             **firebase_utils.serialize(organization_data),
         },
     )
 
+
+def handle_organization_update_on_firebase(organization: Organization, organization_ref: FbReference):
+    organization_ref.update(
+        value=firebase_utils.serialize(
+            firebase_models.FbOrganisation(
+                name=organization.name,
+                nameKey=organization.unique_name,
+                description=organization.description if organization.description else firebase_models.UNDEFINED,
+                abbreviation=organization.abbreviation if organization.abbreviation else firebase_models.UNDEFINED,
+                isArchived=organization.is_archived,
+            ),
+        ),
+    )
+
+
 @shared_task
 def push_organization_to_firebase(organization_id: int):
     organization = Organization.objects.filter(id=organization_id).first()
+    if not organization:
+        return
     organization.update_firebase_push_status(FirebasePushStatusEnum.PROCESSING)
 
     try:

firebase

@@ -44,7 +44,7 @@ def project_tasks(project_id: str | int):
 
         @staticmethod
         def organization(organization_id: str | int):
-            return f"/v2/organization/{organization_id}/"
+            return f"/v2/organisation/{organization_id}/"
 
 
 # FIXME: Import utils/geo/raster_tile_server/config.py here

main/config.py

@@ -9,6 +9,7 @@
 from django.core.exceptions import ValidationError
 from django.core.serializers.json import DjangoJSONEncoder
 from django.utils.translation import gettext
+from ulid import ULID
 
 
 def validate_imagery_url(url: str, *, support_quadkey: bool | None = True):
@@ -35,17 +36,16 @@ def validate_imagery_url(url: str, *, support_quadkey: bool | None = True):
 
 
 def validate_ulid(val: str):
-    # if val == "":
-    #     raise ValidationError(
-    #         gettext("Empty string is not a valid ULID value"),
-    #     )
-    # try:
-    #     ULID.from_str(val)
-    # except (ValueError, TypeError) as e:
-    #     raise ValidationError(
-    #         gettext("'%s' is not a valid ULID value") % val,
-    #     ) from e
-    pass
+    if val == "":
+        raise ValidationError(
+            gettext("Empty string is not a valid ULID value"),
+        )
+    try:
+        ULID.from_str(val)
+    except (ValueError, TypeError) as e:
+        raise ValidationError(
+            gettext("'%s' is not a valid ULID value") % val,
+        ) from e
 
 
 def clean_up_none_keys(data: typing.Any):