lucasjensen/TheGrapefruitsDuo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed many unneeded async definitions. The main controller remains async

Browse Source
This commit is contained in:
Lucas Jensen
2024-05-03 13:21:47 -07:00
parent 032feebe23
commit 5bb28ed923
15 changed files with 144 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/app/db/base_queries.py
View File

@@ -17,7 +17,7 @@ class BaseQueries:
self.table: str = None # type: ignore
self.connect_db: Callable = connect_db
async def select_all_series(self) -> list[dict]:
def select_all_series(self) -> list[dict]:
query = f"SELECT * FROM {self.table}"
db = connect_db()
cursor = db.cursor(dictionary=True)
@@ -27,7 +27,7 @@ class BaseQueries:
db.close()
return data # type: ignore
async def select_one_by_id(self, id: int) -> dict | None:
def select_one_by_id(self, id: int) -> dict | None:
query = f"SELECT * FROM {self.table} WHERE id = %s"
db = self.connect_db()
cursor = db.cursor(dictionary=True)

18
server/app/db/events.py
View File

@@ -17,7 +17,7 @@ class EventQueries(BaseQueries):
super().__init__()
self.table = SERIES_TABLE
async def select_one_by_id(self, series_id: int) -> list[dict] | None:
def select_one_by_id(self, series_id: int) -> list[dict] | None:
query = f"""
SELECT s.series_id , s.name , s.description , s.poster_id , e.event_id , e.location , e.`time` , e.ticket_url , e.map_url
FROM {SERIES_TABLE} s
@@ -33,7 +33,7 @@ class EventQueries(BaseQueries):
db.close()
return data
async def select_all_series(self) -> list[dict]:
def select_all_series(self) -> list[dict]:
"""
Queries for all Series and Event info and returns a list of dictionaries.
Data is gathered with a LEFT JOIN on the Event table to ensure all Series are returned.
@@ -54,7 +54,7 @@ class EventQueries(BaseQueries):
db.close()
return data
async def insert_one_series(self, series: NewEventSeries) -> int:
def insert_one_series(self, series: NewEventSeries) -> int:
query = f"""
INSERT INTO {self.table} (name, description)
VALUES (%s, %s)
@@ -74,7 +74,7 @@ class EventQueries(BaseQueries):
db.close()
return inserted_id
async def insert_one_event(self, event: NewEvent, series_id: int) -> int:
def insert_one_event(self, event: NewEvent, series_id: int) -> int:
query = f"""
INSERT INTO {EVENT_TABLE} (series_id, location, time, ticket_url, map_url)
VALUES (%s, %s, %s, %s, %s)
@@ -92,7 +92,7 @@ class EventQueries(BaseQueries):
db.close()
return iserted_id
async def delete_events_by_series(self, series: EventSeries) -> None:
def delete_events_by_series(self, series: EventSeries) -> None:
query = f"""
DELETE FROM {EVENT_TABLE}
WHERE series_id = %s
@@ -103,7 +103,7 @@ class EventQueries(BaseQueries):
db.commit()
cursor.close()
async def delete_one_series(self, series: EventSeries) -> None:
def delete_one_series(self, series: EventSeries) -> None:
query = f"""
DELETE FROM {self.table}
WHERE series_id = %s
@@ -114,7 +114,7 @@ class EventQueries(BaseQueries):
db.commit()
cursor.close()
async def update_series_poster(self, series: EventSeries) -> None:
def update_series_poster(self, series: EventSeries) -> None:
query = f"""
UPDATE {self.table}
SET poster_id = %s
@@ -126,7 +126,7 @@ class EventQueries(BaseQueries):
db.commit()
cursor.close()
async def replace_event(self, event: Event) -> None:
def replace_event(self, event: Event) -> None:
query = f"""
UPDATE {EVENT_TABLE}
SET location = %s, time = %s, ticket_url = %s, map_url = %s
@@ -143,7 +143,7 @@ class EventQueries(BaseQueries):
cursor.close()
db.close()
async def replace_series(self, series: EventSeries) -> None:
def replace_series(self, series: EventSeries) -> None:
query = f"""
UPDATE {self.table}
SET name = %s, description = %s, poster_id = %s

6
server/app/db/group.py
View File

@@ -7,7 +7,7 @@ class GroupQueries(BaseQueries):
super().__init__()
self.table = GROUP_TABLE
async def select_one_by_id(self) -> dict:
def select_one_by_id(self) -> dict:
query = f"SELECT * FROM {self.table}"
db = self.connect_db()
cursor = db.cursor(dictionary=True)
@@ -21,12 +21,12 @@ class GroupQueries(BaseQueries):
return data
async def select_all_series(self) -> None:
def select_all_series(self) -> None:
raise NotImplementedError(
"get_all method not implemented for GroupQueries. There's only one row in the table."
)
async def update_group_bio(self, bio: str) -> None:
def update_group_bio(self, bio: str) -> None:
db = self.connect_db()
cursor = db.cursor()
query = f"UPDATE {self.table} SET bio = %s WHERE id = 1" # only one row in the table

4
server/app/db/musicians.py
View File

@@ -11,7 +11,7 @@ class MusicianQueries(BaseQueries):
super().__init__()
self.table = MUSICIAN_TABLE
async def update_bio(self, musician: Musician, bio: str) -> None:
def update_bio(self, musician: Musician, bio: str) -> None:
"""Updates a musician's biography in the database.
Args:
@@ -26,7 +26,7 @@ class MusicianQueries(BaseQueries):
cursor.close()
db.close()
async def update_headshot(self, musician: Musician, headshot_id: str) -> None:
def update_headshot(self, musician: Musician, headshot_id: str) -> None:
"""Updates a musician's headshot ID in the database.
The image itself is stored with Cloudinary.

6
server/app/db/users.py
View File

@@ -7,7 +7,7 @@ class UserQueries(BaseQueries):
super().__init__()
self.table = USER_TABLE
async def get_one_by_email(self, email: str) -> dict | None:
def get_one_by_email(self, email: str) -> dict | None:
query = f"SELECT * FROM {self.table} WHERE email = %s"
db = self.connect_db()
cursor = db.cursor(dictionary=True)
@@ -18,7 +18,7 @@ class UserQueries(BaseQueries):
return data
async def get_one_by_sub(self, sub: str) -> dict | None:
def get_one_by_sub(self, sub: str) -> dict | None:
query = f"SELECT * FROM {self.table} WHERE sub = %s"
db = self.connect_db()
cursor = db.cursor(dictionary=True)
@@ -32,7 +32,7 @@ class UserQueries(BaseQueries):
return data
async def update_sub(self, email: str, sub: str) -> None:
def update_sub(self, email: str, sub: str) -> None:
query = f"UPDATE {self.table} SET sub = %s WHERE email = %s"
db = self.connect_db()
cursor = db.cursor()