fix: allow empty task id and osm id for new geopoint

hotosm · Sep 10, 2024 · 755c0e1 · 755c0e1
1 parent ad9abad
commit 755c0e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/backend/app/central/central_crud.py b/src/backend/app/central/central_crud.py
@@ -795,6 +795,13 @@ async def get_entities_data(
 
         # Rename '__id' to 'id'
         flattened_dict["id"] = flattened_dict.pop("__id")
+
+        # convert empty str task_id and osm_id to None
+        # when new entities are created task_id and osm_id will be empty
+        if "task_id" in flattened_dict and flattened_dict["task_id"] == "":
+            flattened_dict["task_id"] = None
+        if "osm_id" in flattened_dict and flattened_dict["osm_id"] == "":
+            flattened_dict["osm_id"] = None
         all_entities.append(flattened_dict)
 
     return all_entities

diff --git a/src/backend/app/central/central_schemas.py b/src/backend/app/central/central_schemas.py
@@ -102,7 +102,7 @@ class EntityTaskID(BaseModel):
     """Map of Entity UUID to FMTM Task ID."""
 
     id: str
-    task_id: int
+    task_id: Optional[int] = None
 
 
 class EntityMappingStatus(EntityOsmID, EntityTaskID):