Merge pull request #200 from mapswipe/fix/validate-image-uniqueness

Author: thenav56

apps/common/tasks.py

@@ -17,7 +17,7 @@ def clear_expired_django_sessions():
         if not acquired:
             logger.warning("Clear expired django sessions")
             return
-    management.call_command("clearsessions", verbosity=0)
+        management.call_command("clearsessions", verbosity=0)
 
 
 @shared_task

apps/community_dashboard/graphql/queries.py

@@ -5,11 +5,11 @@
 import strawberry
 from asgiref.sync import sync_to_async
 from django.db import models
-from django.shortcuts import aget_object_or_404
 from django.utils import timezone
 
 from apps.community_dashboard.models import AggregatedUserGroupStatData, AggregatedUserStatData
-from apps.contributor.models import ContributorUser
+from apps.contributor.models import ContributorUser, ContributorUserGroup
+from utils.graphql.inputs import FirebaseOrInternalIdInputType
 
 from .types import (
     AggregateHelper,
@@ -117,17 +117,19 @@ async def community_filtered_stats(
     ) -> CommunityFilteredStats:
         return CommunityFilteredStats(date_range=date_range)
 
+    # By Internal ID
     @strawberry.field
     async def community_user_stats(
         self,
-        firebase_id: strawberry.ID,
+        user_id: FirebaseOrInternalIdInputType,
     ) -> ContributorUserStats:
-        user = await aget_object_or_404(ContributorUser, firebase_id=firebase_id)
+        user = await FirebaseOrInternalIdInputType.aget_object_or_404(ContributorUser, object_id=user_id)
         return ContributorUserStats(user=user)
 
     @strawberry.field
     async def community_user_group_stats(
         self,
-        user_group_id: strawberry.ID,
+        user_group_id: FirebaseOrInternalIdInputType,
     ) -> ContributorUserGroupStats:
-        return ContributorUserGroupStats(user_group_id=int(user_group_id))
+        user_group = await FirebaseOrInternalIdInputType.aget_object_or_404(ContributorUserGroup, object_id=user_group_id)
+        return ContributorUserGroupStats(user_group=user_group)

apps/community_dashboard/graphql/types.py

@@ -11,7 +11,7 @@
 from django_cte import With  # type: ignore[reportMissingTypeStubs]
 
 from apps.community_dashboard.models import AggregatedUserGroupStatData, AggregatedUserStatData
-from apps.contributor.models import ContributorUser
+from apps.contributor.models import ContributorUser, ContributorUserGroup
 from apps.project.models import Project, ProjectTypeEnum
 from utils.graphql.inputs import DateRangeInput
 from utils.graphql.types import AreaSqKm, GenericJSON
@@ -349,6 +349,10 @@ def __post_init__(self, user: ContributorUser):
     async def id(self) -> strawberry.ID:
         return typing.cast("strawberry.ID", self._user.pk)
 
+    @strawberry.field
+    async def firebase_id(self) -> strawberry.ID:
+        return typing.cast("strawberry.ID", self._user.firebase_id)
+
     @strawberry.field
     async def stats(self) -> ContributorUserStatType:
         # TODO: Cache this
@@ -423,15 +427,15 @@ def __post_init__(self, date_range: DateRangeInput | None, user_group_id: int):
 
 @strawberry.type
 class ContributorUserGroupStats:
-    user_group_id: InitVar[int]
+    user_group: InitVar[ContributorUserGroup]
 
     _user_group_id: strawberry.Private[int] = dataclass_field(init=False)
     _ug_qs: strawberry.Private[models.QuerySet[AggregatedUserGroupStatData]] = dataclass_field(init=False)
 
-    def __post_init__(self, user_group_id: int):
-        self._user_group_id = user_group_id
+    def __post_init__(self, user_group: ContributorUserGroup):
+        self._user_group_id = user_group.pk
         self._ug_qs = AggregatedUserGroupStatData.objects.filter(
-            user_group_id=user_group_id,
+            user_group_id=user_group.pk,
         )
 
     @strawberry.field

apps/community_dashboard/tasks.py

@@ -19,4 +19,4 @@ def update_aggregated_data():
             logger.warning("Community Dashboard update aggregate already running")
             return
 
-    UpdateAggregateCommand().handle()
+        UpdateAggregateCommand().handle()

apps/community_dashboard/tests/query_test.py

@@ -256,7 +256,7 @@ def test_filtered_community_stats(self):
     def test_user_group_aggregated_calc(self):
         query = """
             query MyQuery($userGroupId: ID!) {
-              communityUserGroupStats(userGroupId: $userGroupId) {
+              communityUserGroupStats(userGroupId: {id: $userGroupId}) {
                 stats {
                   totalAreaSwiped
                   totalContributors
@@ -306,7 +306,7 @@ def test_user_group_aggregated_calc(self):
     def test_user_group_query(self):
         query = """
             query MyQuery($userGroupId: ID!, $pagination: OffsetPaginationInput!) {
-              contributorUserGroup(id: $userGroupId) {
+              contributorUserGroup(userGroupId: {id: $userGroupId}) {
                 id
                 name
                 createdAt
@@ -502,13 +502,13 @@ def test_user_query(self):
               $toDate: Date!,
           ) {
 
-            contributorUserByFirebaseId(firebaseId: $firebaseId) {
+            contributorUser(userId: {firebaseId: $firebaseId}) {
               id
               firebaseId
               username
             }
 
-            communityUserStats(firebaseId: $firebaseId) {
+            communityUserStats(userId: {firebaseId: $firebaseId}) {
               id
               stats {
                 totalSwipes
@@ -644,7 +644,7 @@ def test_user_query(self):
             )
 
             assert {
-                "contributorUserByFirebaseId": {
+                "contributorUser": {
                     "id": self.gID(contributor_user.pk),
                     "firebaseId": contributor_user.firebase_id,
                     "username": contributor_user.username,

apps/contributor/firebase/pull.py

@@ -5,6 +5,7 @@
 from pyfirebase_mapswipe import extended_models as firebase_ext_models
 from pyfirebase_mapswipe import models as firebase_models
 
+from apps.common.models import FirebasePushStatusEnum
 from apps.contributor.models import (
     ContributorUser,
     ContributorUserGroupMembershipLogActionEnum,
@@ -41,6 +42,9 @@ def pull_users_from_firebase():
             username=valid_user.username,
             created_at=valid_user.created,
             modified_at=valid_user.created,
+            # NOTE: Setting firebase_last_pushed so that we can send updates to firebase.
+            firebase_last_pushed=datetime.datetime.now(),
+            firebase_push_status=FirebasePushStatusEnum.SUCCESS,
         )
         users_to_pull.append(user)
 

apps/contributor/graphql/queries.py

@@ -3,11 +3,11 @@
 import strawberry
 import strawberry_django
 from django.db.models import QuerySet
-from django.shortcuts import aget_object_or_404
 from strawberry_django.pagination import OffsetPaginated
 from strawberry_django.permissions import IsAuthenticated
 
 from apps.contributor.models import ContributorTeam, ContributorUser, ContributorUserGroup, ContributorUserGroupMembership
+from utils.graphql.inputs import FirebaseOrInternalIdInputType
 
 from .filters import (
     ContributorTeamFilter,
@@ -31,18 +31,25 @@ class Query:
         filters=ContributorUserFilter,
     )
 
-    contributor_user: ContributorUserType = strawberry_django.field()
-
-    contributor_user_group: ContributorUserGroupType = strawberry_django.field()
-
     # Team
     contributor_team: ContributorTeamType = strawberry_django.field()
 
     @strawberry.field
-    async def contributor_user_by_firebase_id(self, firebase_id: strawberry.ID) -> ContributorUserType:
-        obj = await aget_object_or_404(ContributorUser, firebase_id=firebase_id)
+    async def contributor_user(
+        self,
+        user_id: FirebaseOrInternalIdInputType,
+    ) -> ContributorUserType:
+        obj = await FirebaseOrInternalIdInputType.aget_object_or_404(ContributorUser, object_id=user_id)
         return typing.cast("ContributorUserType", obj)
 
+    @strawberry.field
+    async def contributor_user_group(
+        self,
+        user_group_id: FirebaseOrInternalIdInputType,
+    ) -> ContributorUserGroupType:
+        obj = await FirebaseOrInternalIdInputType.aget_object_or_404(ContributorUserGroup, object_id=user_group_id)
+        return typing.cast("ContributorUserGroupType", obj)
+
     # --- Paginated
     # --- ContributorUserGroup
     @strawberry_django.offset_paginated(

apps/contributor/tasks.py

@@ -15,7 +15,7 @@ def pull_users_from_firebase_task():
             logger.warning("Pull users from firebase is already running")
             return
 
-    pull_users_from_firebase()
+        pull_users_from_firebase()
 
 
 @shared_task
@@ -25,4 +25,4 @@ def pull_user_group_memberships_from_firebase_task():
             logger.warning("Pull user group memberships from firebase is already running")
             return
 
-    pull_user_group_memberships_from_firebase()
+        pull_user_group_memberships_from_firebase()

apps/existing_database/management/commands/loaddata_from_existing_database.py

@@ -532,10 +532,11 @@ def parse_project_name(
 def parse_project_status(existing_project: existing_db_models.Project) -> ProjectStatusEnum:
     assert existing_project.status is not None
     return {
-        "inactive": ProjectStatusEnum.PAUSED,
+        "inactive": ProjectStatusEnum.DISCARDED,
         "active": ProjectStatusEnum.PUBLISHED,
         "private_active": ProjectStatusEnum.PUBLISHED,
         "private_finished": ProjectStatusEnum.FINISHED,
+        "private_inactive": ProjectStatusEnum.DISCARDED,
         "finished": ProjectStatusEnum.FINISHED,
         "archived": ProjectStatusEnum.WITHDRAWN,
     }[existing_project.status]
@@ -573,6 +574,8 @@ def create_project(
             requesting_organization=get_organization_by_name(requesting_organization, bot_user),
             created_by_id=get_user_by_contributor_user_firebase_id(existing_project.created_by, fallback=bot_user),
             modified_by_id=get_user_by_contributor_user_firebase_id(existing_project.created_by, fallback=bot_user),
+            project_type_specifics=existing_project.project_type_specifics,
+            description=existing_project.project_details.strip() if existing_project.project_details else "",
         )
 
         # Progress metadata
@@ -986,7 +989,7 @@ def handle_project(self):
                     output_field=GeometryField(geography=True),
                 ),
             )
-            / 100_000,
+            / 1_000_000,
         )
 
         self.stdout.write("\n")

apps/mapping/models.py

@@ -11,7 +11,9 @@
 
 
 class MappingSessionClientTypeEnum(models.IntegerChoices):
-    """Enum representing client type used during a mapping session."""
+    """Enum representing client type used during a mapping session.
+    https://github.com/react-native-device-info/react-native-device-info#getsystemname.
+    """
 
     UNKNOWN = 0, "Unknown"
     MOBILE_ANDROID = 1, "Mobile (Android)"
@@ -23,6 +25,8 @@ def get_client_type(cls, value: str) -> "MappingSessionClientTypeEnum":
         return {
             "mobile-android": cls.MOBILE_ANDROID,
             "mobile-ios": cls.MOBILE_IOS,
+            "mobile-iphone os": cls.MOBILE_IOS,
+            "mobile-ipados": cls.MOBILE_IOS,
             "web": cls.WEB,
         }.get(value, cls.UNKNOWN)