From c6075b794963f293b413358b363774e2b8758b3f Mon Sep 17 00:00:00 2001 From: Yarne Coppens Date: Thu, 22 Aug 2024 22:13:17 +0200 Subject: [PATCH] Fixed version info not updating if boardgame is already present --- src/classes/people_classes.py | 2 +- src/filters/boardgame_filters.py | 1 - src/modules/db_connection.py | 33 +++++--------------------------- 3 files changed, 6 insertions(+), 30 deletions(-) diff --git a/src/classes/people_classes.py b/src/classes/people_classes.py index f5450fd..daefab6 100644 --- a/src/classes/people_classes.py +++ b/src/classes/people_classes.py @@ -10,7 +10,7 @@ class Designer(SQLModel, table=True): class DesignerPublic(SQLModel): name: str - designed_boardgames: list[boardgame_classes.BoardGamePublic] + designed_boardgames: list[boardgame_classes.BoardGamePublicNoPlays] class DesignerPublicNoGames(SQLModel): name: str \ No newline at end of file diff --git a/src/filters/boardgame_filters.py b/src/filters/boardgame_filters.py index 10508a9..05981ef 100644 --- a/src/filters/boardgame_filters.py +++ b/src/filters/boardgame_filters.py @@ -9,7 +9,6 @@ def filter_expansions_out(to_filter_boardgames: list[boardgame_classes.BoardGame return filtered_boardgames def filter_non_expansions_out(to_filter_boardgames: list[boardgame_classes.BoardGame]): - filtered_boardgames = list(filter(lambda x: x.expansion_info != None, to_filter_boardgames)) diff --git a/src/modules/db_connection.py b/src/modules/db_connection.py index ddaf89f..e2af2e8 100644 --- a/src/modules/db_connection.py +++ b/src/modules/db_connection.py @@ -52,6 +52,11 @@ def upsert_multiple_boardgames(session: Session, boardgame_list: list[boardgame_ wishlist_info = new_db_boardgame.wishlist_info.model_dump() db_boardgame.wishlist_info = boardgame_classes.WishlistInfo(**wishlist_info) + db_boardgame.name = new_db_boardgame.name + db_boardgame.image_url = new_db_boardgame.image_url + db_boardgame.thumbnail_url = new_db_boardgame.thumbnail_url + db_boardgame.year_published = new_db_boardgame.year_published + return db_boardgame with critical_function_lock: @@ -86,34 +91,6 @@ def upsert_multiple_boardgames(session: Session, boardgame_list: list[boardgame_ altered_boardgames.append(updated_boardgame) session.commit() - - # for boardgame_index in range(len(boardgame_list)): - # #Check if boardgame is already present - - # if boardgame_list[boardgame_index] in existing_boardgames: - # to_alter_boardgame = update_boardgame(list(filter(lambda x: x.id == boardgame_list[boardgame_index].id, existing_boardgames))[0], boardgame_list[boardgame_index]) - # else: - # to_alter_boardgame = insert_boardgame(boardgame_list[boardgame_index]) - - - - # # if not is_boardgame_present: - # # to_alter_boardgame = boardgame_list[boardgame_index] - # # else: - # # to_alter_boardgame = present_boardgames[0] - # # copy_attributes_from_to(boardgame_list[boardgame_index],to_alter_boardgame) - - - - - # # statement = select(boardgame_classes.BoardGame).where(boardgame_classes.BoardGame.id == to_alter_boardgame.id) - # # present_boardgames = session.exec(statement).all() - # # is_boardgame_present = len(present_boardgames) != 0 - - - - # session.add(to_alter_boardgame) - # altered_boardgames.append(to_alter_boardgame) [session.refresh(boardgame) for boardgame in altered_boardgames]