Merge pull request #960 from mapswipe/fix/project-delete

Fix/project delete issue fix

Author: thenav56

.github/workflows/actions.yml

@@ -22,7 +22,7 @@ jobs:
       working-directory: ./mapswipe_workers
       run: |
         python -m pip install --upgrade pip
-        pip install flake8 black==22.3.0 isort
+        pip install flake8 black==24.4.2 isort
 
     - name: Code style
       working-directory: ./mapswipe_workers
@@ -47,15 +47,15 @@ jobs:
       run: |
         # Create a mock file for wal-g setup
         touch postgres/serviceAccountKey.json
-        docker-compose up --build --detach postgres
-        for i in {1..5}; do docker-compose exec -T postgres pg_isready && s=0 && break || s=$? && sleep 5; done; (docker-compose logs postgres && exit $s)
+        docker compose up --build --detach postgres
+        for i in {1..5}; do docker compose exec -T postgres pg_isready && s=0 && break || s=$? && sleep 5; done; (docker compose logs postgres && exit $s)
 
     - name: Deploy Firebase Rules and Functions
       env:
         FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
         FIREBASE_DB: ${{ secrets.FIREBASE_DB }}
       run: |
-        docker-compose run --rm firebase_deploy sh -c "firebase use $FIREBASE_DB && firebase deploy --token $FIREBASE_TOKEN --only database"
+        docker compose run --rm firebase_deploy sh -c "firebase use $FIREBASE_DB && firebase deploy --token $FIREBASE_TOKEN --only database"
 
     - name: Decrypt Service Account Key File
       working-directory: ./
@@ -78,16 +78,16 @@ jobs:
         OSMCHA_API_KEY: ${{ secrets.OSMCHA_API_KEY }}
         DJANGO_SECRET_KEY: test-django-secret-key
       run: |
-        docker-compose run --rm mapswipe_workers_creation python -m unittest discover --verbose --start-directory tests/unittests/
-        docker-compose run --rm mapswipe_workers_creation bash -c 'pip install pytest && pytest -ra -v --durations=10 tests/integration/'
-        docker-compose run --rm django pytest -ra -v --durations=10
+        docker compose run --rm mapswipe_workers_creation python -m unittest discover --verbose --start-directory tests/unittests/
+        docker compose run --rm mapswipe_workers_creation bash -c 'pip install pytest && pytest -ra -v --durations=10 tests/integration/'
+        docker compose run --rm django pytest -ra -v --durations=10
 
     - name: Django Graphql Schema Check
       env:
         SOURCE_SCHEMA: './django/schema.graphql'
         LATEST_SCHEMA: './django-data/schema-latest.graphql'
       run: |
-        docker-compose run --rm django bash -c 'wait-for-it postgres:5432 && ./manage.py graphql_schema --out /django-data/schema-latest.graphql' &&
+        docker compose run --rm django bash -c 'wait-for-it postgres:5432 && ./manage.py graphql_schema --out /django-data/schema-latest.graphql' &&
         cmp --silent $SOURCE_SCHEMA $LATEST_SCHEMA || {
           echo 'The schema.graphql is not up to date with the latest changes. Please update and push latest';
           diff $SOURCE_SCHEMA $LATEST_SCHEMA;
@@ -101,7 +101,7 @@ jobs:
         POSTGRES_DB: postgres
         DJANGO_SECRET_KEY: test-django-secret-key
       run: |
-        docker-compose run --rm django bash -c 'wait-for-it postgres:5432 && ./manage.py makemigrations --check --dry-run' || {
+        docker compose run --rm django bash -c 'wait-for-it postgres:5432 && ./manage.py makemigrations --check --dry-run' || {
           echo 'There are some changes to be reflected in the migration. Make sure to run makemigrations';
           exit 1;
         }

mapswipe_workers/mapswipe_workers/firebase_to_postgres/archive_project.py

@@ -1,6 +1,7 @@
 """
 Archive a project.
 """
+
 import re
 import time
 from typing import Iterable

mapswipe_workers/mapswipe_workers/firebase_to_postgres/delete_project.py

@@ -1,6 +1,7 @@
 """
 Delete projects.
 """
+
 import re
 import time
 from typing import Iterable

mapswipe_workers/mapswipe_workers/project_types/arbitrary_geometry/project.py

@@ -30,9 +30,9 @@ class ArbitraryGeometryProject(BaseProject):
     def __init__(self, project_draft: dict) -> None:
         super().__init__(project_draft)
         self.groups: Dict[str, ArbitraryGeometryGroup] = {}
-        self.tasks: Dict[
-            str, List[ArbitraryGeometryTask]
-        ] = {}  # dict keys are group ids
+        self.tasks: Dict[str, List[ArbitraryGeometryTask]] = (
+            {}
+        )  # dict keys are group ids
 
         # set group size
         self.geometry = project_draft["geometry"]

mapswipe_workers/mapswipe_workers/project_types/media_classification/project.py

@@ -36,9 +36,9 @@ class MediaClassificationProject(BaseProject):
     def __init__(self, project_draft: dict):
         super().__init__(project_draft)
         self.groups: Dict[str, MediaClassificationGroup] = {}
-        self.tasks: Dict[
-            str, List[MediaClassificationTask]
-        ] = {}  # dict keys are group ids
+        self.tasks: Dict[str, List[MediaClassificationTask]] = (
+            {}
+        )  # dict keys are group ids
 
         self.mediaCredits = project_draft.get("mediaCredits", None)
         self.medialist = []

mapswipe_workers/mapswipe_workers/project_types/project.py

@@ -566,13 +566,22 @@ def delete_draft_from_firebase(self):
     @staticmethod
     def delete_mapping_session_results(project_id):
         p_con = auth.postgresDB()
+        # User data
         sql_query = """
             DELETE FROM mapping_sessions_results msr
             USING mapping_sessions ms
             WHERE ms.mapping_session_id = msr.mapping_session_id
                 AND ms.project_id = %(project_id)s;
         """
         p_con.query(sql_query, {"project_id": project_id})
+        # User Group data
+        sql_query = """
+            DELETE FROM mapping_sessions_user_groups msug
+            USING mapping_sessions ms
+            WHERE ms.mapping_session_id = msug.mapping_session_id
+                AND ms.project_id = %(project_id)s;
+        """
+        p_con.query(sql_query, {"project_id": project_id})
 
     @classmethod
     def delete_from_postgres(cls, project_id):

mapswipe_workers/mapswipe_workers/project_types/tile_map_service/project.py

@@ -41,9 +41,9 @@ class TileMapServiceBaseProject(BaseProject):
     def __init__(self, project_draft: dict):
         super().__init__(project_draft)
         self.groups: Dict[str, TileMapServiceBaseGroup] = {}
-        self.tasks: Dict[
-            str, List[TileMapServiceBaseTask]
-        ] = {}  # dict keys are group ids
+        self.tasks: Dict[str, List[TileMapServiceBaseTask]] = (
+            {}
+        )  # dict keys are group ids
 
         self.geometry = project_draft["geometry"]
         self.zoomLevel = int(project_draft.get("zoomLevel", 18))

mapswipe_workers/mapswipe_workers/project_types/tile_map_service/tutorial.py

@@ -26,9 +26,9 @@ def __init__(self, tutorial_draft):
         super().__init__(tutorial_draft)
 
         self.groups: Dict[str, TileMapServiceBaseGroup] = {}
-        self.tasks: Dict[
-            str, List[TileMapServiceBaseTutorialTask]
-        ] = {}  # dict keys are group ids
+        self.tasks: Dict[str, List[TileMapServiceBaseTutorialTask]] = (
+            {}
+        )  # dict keys are group ids
 
         self.zoomLevel = int(tutorial_draft.get("zoomLevel", 18))
         self.tileServer = vars(BaseTileServer(tutorial_draft["tileServer"]))

…/digitization/userGroups/user_group.json …digitization/user_groups/user_group.jsonmapswipe_workers/tests/integration/fixtures/digitization/userGroups/user_group.json renamed to mapswipe_workers/tests/integration/fixtures/digitization/user_groups/user_group.json mapswipe_workers/tests/integration/fixtures/digitization/userGroups/user_group.json renamed to mapswipe_workers/tests/integration/fixtures/digitization/user_groups/user_group.json

@@ -0,0 +1 @@
+123	ug1001