feat(street): Add numberOfGroups for the street project

Author: susilnem

apps/project/factories.py

@@ -54,6 +54,7 @@ class Meta:
     firebase_id = factory.LazyFunction(lambda: str(ULID()))
     project_type_specifics = factory.LazyAttribute(lambda _: {})
     number_of_tasks = 100
+    number_of_groups = 10
     required_count = 50
 
     finished_count = 50

apps/project/migrations/0017_projecttaskgroup_number_of_groups.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.5 on 2025-08-19 05:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project', '0016_rename_stats_type_projectasset_export_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='projecttaskgroup',
+            name='number_of_groups',
+            field=models.IntegerField(default=1),
+            preserve_default=False,
+        ),
+    ]

apps/project/models.py

@@ -497,6 +497,7 @@ class ProjectTaskGroup(FirebasePushResource):
     )
 
     number_of_tasks = models.IntegerField()
+    number_of_groups = models.IntegerField()
     required_count = models.IntegerField()
 
     finished_count = models.IntegerField(default=0)

apps/project/tests/mutation_test.py

@@ -1511,11 +1511,10 @@ def test_project_street(self, mock_requests):
             "clientId": project_client_id,
             "status": self.genum(Project.Status.MARKED_AS_READY),
         }
-        content = self._update_project_mutation(project_id, project_data)
-        resp_data = content["data"]["updateProject"]
+        content = self._update_project_status_mutation(project_id, project_data)
+        resp_data = content["data"]["updateProjectStatus"]
         assert resp_data["errors"] is None, content
         assert resp_data["result"]["status"] == self.genum(Project.Status.MARKED_AS_READY)
-        assert resp_data["result"]["processingStatus"] is None
 
         mock_requests.assert_called_once()
         mock_requests.assert_has_calls([call(int(project_id))])

firebase

@@ -122,6 +122,7 @@ def analyze_groups(self):
         project_task_groups_qs = ProjectTaskGroup.objects.filter(project_id=self.project.pk)
 
         project_task_groups_qs.update(
+            number_of_groups=project_task_groups_qs.count(),
             number_of_tasks=models.Subquery(
                 ProjectTask.objects.filter(task_group_id=models.OuterRef("id"))
                 .values("task_group_id")

project_types/base/project.py

@@ -34,7 +34,7 @@ class StreetMapillaryImageFilters(BaseModel):
 
 
 class StreetProjectProperty(base_project.BaseProjectProperty):
-    aoi_geometry: typing.Annotated[str, Field(strict=True, pattern=r"^\d+$")] | None = None
+    aoi_geometry: custom_fields.PydanticId
     custom_options: list[CustomOption] | None = None
     mapillary_image_filters: StreetMapillaryImageFilters
 
@@ -109,11 +109,11 @@ def create_tasks(
 
             bulk_mgr.add(
                 ProjectTask(
-                    firebase_id=f"t{f_id}",
+                    firebase_id=f"{f_id}",
                     task_group_id=group.pk,
                     geometry=geometry_str,
                     project_type_specifics=self.project_task_property_class(
-                        task_id=f"t{f_id}",
+                        task_id=f"{f_id}",
                         group_id=f"g{group.pk}",
                         geometry=geometry_str,
                     ).model_dump(),
@@ -140,6 +140,7 @@ def create_groups(self, resp: StreetRawGroupItem):
                 firebase_id=f"g{group_id}",
                 project_id=self.project.pk,
                 number_of_tasks=0,
+                number_of_groups=0,
                 progress=0,
                 finished_count=0,
                 required_count=0,
@@ -214,6 +215,7 @@ def get_task_specifics_for_firebase(self, task: ProjectTask):
     def get_group_specifics_for_firebase(self, group: ProjectTaskGroup):
         return firebase_models.FbMappingGroupStreetCreateOnlyInput(
             groupId=group.firebase_id,
+            numberOfGroups=group.number_of_groups,
         )
 
     @typing.override

project_types/street/project.py

@@ -198,6 +198,7 @@ def create_groups(self, resp: tile_grouping.AoiGeometry):
                 firebase_id=group_key,
                 project_id=self.project.pk,
                 number_of_tasks=0,
+                number_of_groups=0,
                 progress=0,
                 finished_count=0,
                 required_count=0,

project_types/tile_map_service/base/project.py

@@ -300,6 +300,7 @@ def create_groups(self, resp: list[ValidFeature]):
                 firebase_id=group_key,
                 project_id=self.project.pk,
                 number_of_tasks=0,
+                number_of_groups=0,
                 progress=0,
                 finished_count=0,
                 required_count=0,

project_types/validate/project.py

@@ -166,6 +166,7 @@ def create_groups(self, resp: list[ValidImage]):
                 firebase_id=group_key,
                 project_id=self.project.pk,
                 number_of_tasks=0,
+                number_of_groups=0,
                 progress=0,
                 finished_count=0,
                 required_count=0,