Merge pull request #118 from mapswipe/feature/street-project

Author: tnagorra

apps/project/graphql/inputs/inputs.py

@@ -18,6 +18,7 @@
 from .project_types.compare import CompareProjectPropertyInput
 from .project_types.completeness import CompletenessProjectPropertyInput
 from .project_types.find import FindProjectPropertyInput
+from .project_types.street import StreetProjectPropertyInput
 from .project_types.validate import ValidateProjectPropertyInput
 from .project_types.validate_image import ValidateImageProjectPropertyInput
 
@@ -51,6 +52,7 @@ class ProjectTypeSpecificInput:
     completeness: CompletenessProjectPropertyInput | None = strawberry.UNSET
     validate: ValidateProjectPropertyInput | None = strawberry.UNSET
     validate_image: ValidateImageProjectPropertyInput | None = strawberry.UNSET
+    street: StreetProjectPropertyInput | None = strawberry.UNSET
 
 
 # NOTE: Make sure this matches with the serializers ../serializers.py

apps/project/graphql/inputs/project_types/street.py

@@ -0,0 +1,11 @@
+import strawberry
+
+from project_types.street import project as street_project
+
+
+@strawberry.experimental.pydantic.input(model=street_project.StreetMapillaryImageFilters, all_fields=True)
+class StreetMapillaryImageFiltersInput: ...
+
+
+@strawberry.experimental.pydantic.input(model=street_project.StreetProjectProperty, all_fields=True)
+class StreetProjectPropertyInput: ...

apps/project/graphql/types/project_types/street.py

@@ -0,0 +1,11 @@
+import strawberry
+
+from project_types.street import project as street_project
+
+
+@strawberry.experimental.pydantic.type(model=street_project.StreetMapillaryImageFilters, all_fields=True)
+class StreetMapillaryImageFilters: ...
+
+
+@strawberry.experimental.pydantic.type(model=street_project.StreetProjectProperty, all_fields=True)
+class StreetProjectPropertyType: ...

apps/project/graphql/types/types.py

@@ -14,6 +14,7 @@
 from apps.tutorial.graphql.types.types import TutorialType
 from main.config import Config
 from main.graphql.context import Info
+from project_types.street import project as street_project
 from project_types.tile_map_service.compare import project as compare_project
 from project_types.tile_map_service.completeness import project as completeness_project
 from project_types.tile_map_service.find import project as find_project
@@ -31,6 +32,7 @@
 from .project_types.compare import CompareProjectPropertyType
 from .project_types.completeness import CompletenessProjectPropertyType
 from .project_types.find import FindProjectPropertyType
+from .project_types.street import StreetProjectPropertyType
 from .project_types.validate import ValidateProjectPropertyType
 from .project_types.validate_image import ValidateImageProjectPropertyType
 
@@ -188,6 +190,7 @@ async def project_type_specifics(
         | ValidateProjectPropertyType
         | ValidateImageProjectPropertyType
         | CompletenessProjectPropertyType
+        | StreetProjectPropertyType
         | None
     ):
         data = project.project_type_specifics
@@ -209,4 +212,9 @@ async def project_type_specifics(
                 "CompletenessProjectPropertyType",
                 completeness_project.CompletenessProjectProperty.model_validate(data),
             )
+        if project.project_type_enum == Project.Type.STREET:
+            return typing.cast(
+                "StreetProjectPropertyType",
+                street_project.StreetProjectProperty.model_validate(data),
+            )
         typing.assert_never(project.project_type_enum)

apps/project/models.py

@@ -109,7 +109,9 @@ class ProjectTypeEnum(models.IntegerChoices):
 
     # MEDIA = 5, "Media"
     # DIGITIZATION = 6, "Digitization"
-    # STREET = 7, "Street"
+    STREET = 7, "Street"
+    """ Street project type. """
+
     # TODO(thenav56): Confirm if we have more/less
 
     @classmethod
@@ -130,6 +132,8 @@ def to_firebase(self) -> firebase_models.FbEnumProjectType:
                 return firebase_models.FbEnumProjectType.VALIDATE
             case ProjectTypeEnum.VALIDATE_IMAGE:
                 return firebase_models.FbEnumProjectType.VALIDATE_IMAGE
+            case ProjectTypeEnum.STREET:
+                return firebase_models.FbEnumProjectType.STREET
 
 
 class ProjectStatusEnum(models.IntegerChoices):

apps/project/tests/mutation_test.py

@@ -8,6 +8,7 @@
 from PIL import Image
 from ulid import ULID
 
+from apps.common.models import IconEnum
 from apps.contributor.factories import ContributorTeamFactory
 from apps.project.factories import OrganizationFactory, ProjectFactory
 from apps.project.models import (
@@ -25,6 +26,7 @@
 from apps.user.factories import UserFactory
 from main.config import Config
 from main.tests import TestCase
+from project_types.street import project as street_project
 from project_types.tile_map_service.compare import project as compare_project
 from utils.geo.raster_tile_server.config import RasterTileServerNameEnum
 
@@ -1546,3 +1548,103 @@ class TaskGroupType(typing.TypedDict):
         # project is sync to firebase after publish
         fb_project: typing.Any = project_ref.get()
         assert fb_project is not None
+
+    @patch("apps.project.serializers.process_project_task.delay")
+    def test_project_street(self, mock_requests):
+        self.force_login(self.user)
+        project_data = {
+            **self.project_data,
+            "clientId": str(ULID()),
+            "projectType": self.genum(ProjectTypeEnum.STREET),
+        }
+        content = self._create_project_mutation(project_data)
+        resp_data = content["data"]["createProject"]
+        assert resp_data["errors"] is None, content
+
+        project_id = resp_data["result"]["id"]
+        project_client_id = resp_data["result"]["clientId"]
+
+        # Creating AOI Project Asset
+        project_asset_data = {
+            "project": project_id,
+            "clientId": str(ULID()),
+        }
+
+        content = self._create_project_aoi_asset(project_asset_data, assert_errors=True)
+        resp_data = content["data"]["createProjectAsset"]
+        assert resp_data["errors"] is None, content
+        aoi_geometry_asset = resp_data["result"]
+
+        # Creating Project Image Asset
+        project_asset_data = {
+            "project": project_id,
+            "clientId": str(ULID()),
+        }
+        content = self._create_project_image_asset(project_asset_data, assert_errors=True)
+        resp_data = content["data"]["createProjectAsset"]
+        assert resp_data["errors"] is None, content
+        image_asset = resp_data["result"]
+
+        # Updating Project
+        project_data = {
+            "clientId": project_client_id,
+            "image": image_asset["id"],
+            "verificationNumber": 10,
+            "projectTypeSpecifics": {
+                "street": {
+                    "aoiGeometry": aoi_geometry_asset["id"],
+                    "customOptions": {
+                        "clientId": str(ULID()),
+                        "description": "Street project description",
+                        "icon": self.genum(IconEnum.ADD_OUTLINE),
+                        "iconColor": "#FF0000",
+                        "title": "Street Project Title",
+                        "value": 1,
+                        "subOptions": [
+                            {
+                                "clientId": str(ULID()),
+                                "value": 1,
+                                "description": "Street sub option description",
+                            },
+                        ],
+                    },
+                    "mapillaryImageFilters": {
+                        "isPano": True,
+                        "creatorId": None,
+                        "organizationId": None,
+                        "startTime": None,
+                        "endTime": None,
+                        "randomizeOrder": False,
+                        "samplingThreshold": None,
+                    },
+                },
+            },
+        }
+        content = self._update_project_mutation(project_id, project_data)
+        resp_data = content["data"]["updateProject"]
+        assert resp_data["errors"] is None, content
+
+        latest_project = Project.objects.get(pk=project_id)
+        assert latest_project.created_by_id == self.user.pk
+        assert latest_project.modified_by_id == self.user.pk
+        assert latest_project.image_id == int(image_asset["id"])
+        assert latest_project.project_type_specifics is not None
+
+        street_project.StreetProjectProperty.model_validate(
+            latest_project.project_type_specifics,
+            context={"project_id": latest_project.pk},
+        )
+
+        # Updating Project:
+        # Test project processing
+        project_data = {
+            "clientId": project_client_id,
+            "status": self.genum(Project.Status.MARKED_AS_READY),
+        }
+        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)
+
+        mock_requests.assert_called_once()
+        mock_requests.assert_has_calls([call(int(project_id))])

apps/tutorial/graphql/types/project_types/street.py

@@ -0,0 +1,7 @@
+import strawberry
+
+from project_types.street import tutorial as street_tutorial
+
+
+@strawberry.experimental.pydantic.type(model=street_tutorial.StreetTutorialTaskProperty, all_fields=True)
+class StreetTutorialTaskPropertyType: ...

apps/tutorial/graphql/types/types.py

@@ -17,6 +17,7 @@
 
 import apps.project.graphql.types.asset_types  # noqa: F401  # isort: skip # type: ignore[reportUnusedImport]
 
+from project_types.street import tutorial as street_tutorial
 from project_types.tile_map_service.compare import tutorial as compare_tutorial
 from project_types.tile_map_service.completeness import tutorial as completeness_tutorial
 from project_types.tile_map_service.find import tutorial as find_tutorial
@@ -26,6 +27,7 @@
 from .project_types.compare import CompareTutorialTaskPropertyType
 from .project_types.completeness import CompletenessTutorialTaskPropertyType
 from .project_types.find import FindTutorialTaskPropertyType
+from .project_types.street import StreetTutorialTaskPropertyType
 from .project_types.validate import ValidateTutorialTaskPropertyType
 from .project_types.validate_image import ValidateImageTutorialTaskPropertyType
 
@@ -62,6 +64,7 @@ async def project_type_specifics(
         | ValidateTutorialTaskPropertyType
         | ValidateImageTutorialTaskPropertyType
         | CompletenessTutorialTaskPropertyType
+        | StreetTutorialTaskPropertyType
         | None
     ):
         data = task.project_type_specifics
@@ -91,6 +94,11 @@ async def project_type_specifics(
                 "CompletenessTutorialTaskPropertyType",
                 completeness_tutorial.CompletenessTutorialTaskProperty.model_validate(data),
             )
+        if project_type_enum == Project.Type.STREET:
+            return typing.cast(
+                "StreetTutorialTaskPropertyType",
+                street_tutorial.StreetTutorialTaskProperty.model_validate(data),
+            )
         typing.assert_never(project_type_enum)
 
 

docker-compose.yaml

@@ -53,6 +53,7 @@ x-server: &base_server_setup
     MAP_IMAGE_ESRI_BETA_API_KEY: ${MAP_IMAGE_ESRI_BETA_API_KEY:-dummy-esri-beta}
     # MAP_IMAGE_DIGITAL_GLOBE_API_KEY: ${MAP_IMAGE_DIGITAL_GLOBE_API_KEY:-dummy-digital-globe}
     OSMCHA_API_KEY: ${OSMCHA_API_KEY:-dummy-osmcha-api-key}
+    MAPILLARY_API_KEY: ${MAPILLARY_API_KEY:-dummy-mapillary-api-key}
     # Firebase
     FIREBASE_EMULATOR_USE: ${FIREBASE_EMULATOR_USE:-true}
     FIREBASE_EMULATOR_PROJECT_ID: ${FIREBASE_EMULATOR_PROJECT_ID:-dev-mapswipe}