Skip to content

Commit 131a981

Browse files
committed
Fix project delete issue
1 parent 9fcd215 commit 131a981

File tree

5 files changed

+16
-1
lines changed

5 files changed

+16
-1
lines changed

mapswipe_workers/mapswipe_workers/project_types/project.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,13 +566,22 @@ def delete_draft_from_firebase(self):
566566
@staticmethod
567567
def delete_mapping_session_results(project_id):
568568
p_con = auth.postgresDB()
569+
# User data
569570
sql_query = """
570571
DELETE FROM mapping_sessions_results msr
571572
USING mapping_sessions ms
572573
WHERE ms.mapping_session_id = msr.mapping_session_id
573574
AND ms.project_id = %(project_id)s;
574575
"""
575576
p_con.query(sql_query, {"project_id": project_id})
577+
# User Group data
578+
sql_query = """
579+
DELETE FROM mapping_sessions_user_groups msug
580+
USING mapping_sessions ms
581+
WHERE ms.mapping_session_id = msug.mapping_session_id
582+
AND ms.project_id = %(project_id)s;
583+
"""
584+
p_con.query(sql_query, {"project_id": project_id})
576585

577586
@classmethod
578587
def delete_from_postgres(cls, project_id):
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
123 ug100123
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ug1001 CustomUserGroup Description false 2020-02-03 15:39:39.332 NULL NULL NULL

mapswipe_workers/tests/integration/set_up.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ def create_test_project(
5555
project_type: str,
5656
fixture_name: str,
5757
results: bool = False,
58+
create_user_group_session_data: bool = False,
5859
mapping_sessions_results: str = "mapping_sessions_results",
5960
) -> str:
6061
"""Create a test data in Firebase and Posgres."""
@@ -86,6 +87,9 @@ def create_test_project(
8687
set_firebase_test_data(project_type, "results", fixture_name, project_id)
8788
set_postgres_test_data(project_type, "mapping_sessions", fixture_name)
8889
set_postgres_test_data(project_type, mapping_sessions_results, fixture_name)
90+
if create_user_group_session_data:
91+
set_postgres_test_data(project_type, "userGroups", fixture_name)
92+
set_postgres_test_data(project_type, "mapping_sessions_user_groups", fixture_name)
8993

9094
time.sleep(5) # Wait for Firebase Functions to complete
9195
return project_id

mapswipe_workers/tests/integration/test_delete_project.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def setUp(self):
1414
project_type = "tile_map_service_grid"
1515
fixture_name = "build_area"
1616
self.project_id = set_up.create_test_project(
17-
project_type, fixture_name, results=True
17+
project_type, fixture_name, results=True, create_user_group_session_data=True,
1818
)
1919

2020
def tearDown(self):

0 commit comments

Comments
 (0)