Skip to content

Commit 7fce066

Browse files
Hagellach37Hagellach37
committed
adjust postgres string parameter
1 parent 7710ede commit 7fce066

File tree

2 files changed

+34
-26
lines changed

2 files changed

+34
-26
lines changed

‎mapswipe_workers/mapswipe_workers/firebase_to_postgres/archive_project.py‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
def chunks(data: list, size: int = 250) -> Iterable[list]:
1414
"""Yield successive n-sized chunks from list."""
1515
for i in range(0, len(data), size):
16-
yield data[i : i + size]
16+
yield data[i : i + size] # noqa E203
1717

1818

1919
def archive_project(project_ids: list) -> None:
@@ -28,9 +28,10 @@ def archive_project(project_ids: list) -> None:
2828

2929
fb_db = auth.firebaseDB()
3030
ref = fb_db.reference(f"v2/results/{project_id}")
31-
if not re.match("/v2/\w+/[a-zA-Z0-9|-|_]+", ref.path):
31+
if not re.match(r"/v2/\w+/[a-zA-Z0-9|-|_]+", ref.path):
3232
raise CustomError(
33-
"Given argument resulted in invalid Firebase Realtime Database reference."
33+
f"""Given argument resulted in invalid Firebase Realtime Database reference.
34+
{ref.path}"""
3435
)
3536
try:
3637
ref.delete()
@@ -43,9 +44,10 @@ def archive_project(project_ids: list) -> None:
4344
ref.delete()
4445

4546
ref = fb_db.reference(f"v2/tasks/{project_id}")
46-
if not re.match("/v2/\w+/[a-zA-Z0-9|-|_]+", ref.path):
47+
if not re.match(r"/v2/\w+/[a-zA-Z0-9|-|_]+", ref.path):
4748
raise CustomError(
48-
"Given argument resulted in invalid Firebase Realtime Database reference."
49+
f"""Given argument resulted in invalid Firebase Realtime Database reference.
50+
{ref.path}"""
4951
)
5052
try:
5153
ref.delete()
@@ -58,16 +60,18 @@ def archive_project(project_ids: list) -> None:
5860
ref.delete()
5961

6062
ref = fb_db.reference(f"v2/groups/{project_id}")
61-
if not re.match("/v2/\w+/[a-zA-Z0-9|-|_]+", ref.path):
63+
if not re.match(r"/v2/\w+/[a-zA-Z0-9|-|_]+", ref.path):
6264
raise CustomError(
63-
"Given argument resulted in invalid Firebase Realtime Database reference."
65+
f"""Given argument resulted in invalid Firebase Realtime Database reference.
66+
{ref.path}"""
6467
)
6568
ref.delete()
6669

6770
ref = fb_db.reference(f"v2/groups/{project_id}")
68-
if not re.match("/v2/\w+/[a-zA-Z0-9|-|_]+", ref.path):
71+
if not re.match(r"/v2/\w+/[a-zA-Z0-9|-|_]+", ref.path):
6972
raise CustomError(
70-
"Given argument resulted in invalid Firebase Realtime Database reference."
73+
f"""Given argument resulted in invalid Firebase Realtime Database reference.
74+
{ref.path}"""
7175
)
7276
ref.delete()
7377

‎mapswipe_workers/mapswipe_workers/firebase_to_postgres/delete_project.py‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
def chunks(data: list, size: int = 250) -> Iterable[list]:
1414
"""Yield successive n-sized chunks from list."""
1515
for i in range(0, len(data), size):
16-
yield data[i : i + size]
16+
yield data[i : i + size] # noqa E203
1717

1818

1919
def delete_project(project_ids: list) -> None:
@@ -27,9 +27,10 @@ def delete_project(project_ids: list) -> None:
2727

2828
fb_db = auth.firebaseDB()
2929
ref = fb_db.reference(f"v2/results/{project_id}")
30-
if not re.match("/v2/\w+/[a-zA-Z0-9|-|_]+", ref.path):
30+
if not re.match(r"/v2/\w+/[a-zA-Z0-9|-|_]+", ref.path):
3131
raise CustomError(
32-
"Given argument resulted in invalid Firebase Realtime Database reference."
32+
f"""Given argument resulted in invalid Firebase Realtime Database reference.
33+
{ref.path}"""
3334
)
3435
try:
3536
ref.delete()
@@ -42,9 +43,10 @@ def delete_project(project_ids: list) -> None:
4243
ref.delete()
4344

4445
ref = fb_db.reference(f"v2/tasks/{project_id}")
45-
if not re.match("/v2/\w+/[a-zA-Z0-9|-|_]+", ref.path):
46+
if not re.match(r"/v2/\w+/[a-zA-Z0-9|-|_]+", ref.path):
4647
raise CustomError(
47-
"Given argument resulted in invalid Firebase Realtime Database reference."
48+
f"""Given argument resulted in invalid Firebase Realtime Database reference.
49+
{ref.path}"""
4850
)
4951
try:
5052
ref.delete()
@@ -57,26 +59,28 @@ def delete_project(project_ids: list) -> None:
5759
ref.delete()
5860

5961
ref = fb_db.reference(f"v2/groups/{project_id}")
60-
if not re.match("/v2/\w+/[a-zA-Z0-9|-|_]+", ref.path):
62+
if not re.match(r"/v2/\w+/[a-zA-Z0-9|-|_]+", ref.path):
6163
raise CustomError(
62-
"Given argument resulted in invalid Firebase Realtime Database reference."
64+
f"""Given argument resulted in invalid Firebase Realtime Database reference.
65+
{ref.path}"""
6366
)
6467
ref.delete()
6568
ref = fb_db.reference(f"v2/projects/{project_id}")
66-
if not re.match("/v2/\w+/[a-zA-Z0-9|-|_]+", ref.path):
69+
if not re.match(r"/v2/\w+/[a-zA-Z0-9|-|_]+", ref.path):
6770
raise CustomError(
68-
"Given argument resulted in invalid Firebase Realtime Database reference."
71+
f"""Given argument resulted in invalid Firebase Realtime Database reference.
72+
{ref.path}"""
6973
)
7074
ref.delete()
7175

7276
pg_db = auth.postgresDB()
73-
sql_query = "DELETE FROM results WHERE project_id = '{}';".format(project_id)
74-
pg_db.query(sql_query, project_id)
75-
sql_query = "DELETE FROM tasks WHERE project_id = '{}';".format(project_id)
76-
pg_db.query(sql_query, project_id)
77-
sql_query = "DELETE FROM groups WHERE project_id = '{}';".format(project_id)
78-
pg_db.query(sql_query, project_id)
79-
sql_query = "DELETE FROM projects WHERE project_id = '{}';".format(project_id)
80-
pg_db.query(sql_query, project_id)
77+
sql_query = "DELETE FROM results WHERE project_id = %(project_id)s;"
78+
pg_db.query(sql_query, {"project_id": project_id})
79+
sql_query = "DELETE FROM tasks WHERE project_id = %(project_id)s;"
80+
pg_db.query(sql_query, {"project_id": project_id})
81+
sql_query = "DELETE FROM groups WHERE project_id = %(project_id)s;"
82+
pg_db.query(sql_query, {"project_id": project_id})
83+
sql_query = "DELETE FROM projects WHERE project_id = %(project_id)s;"
84+
pg_db.query(sql_query, {"project_id": project_id})
8185

8286
return True

0 commit comments

Comments
 (0)