From fc551be2a4d9271a5cd86d4fa8b3080bc1ade7ce Mon Sep 17 00:00:00 2001 From: Yarne Coppens Date: Wed, 14 Aug 2024 09:12:20 +0200 Subject: [PATCH] Removed None id's from plays --- src/modules/bgg_connection.py | 2 +- src/modules/data_connection.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/modules/bgg_connection.py b/src/modules/bgg_connection.py index b52aad0..191f99d 100644 --- a/src/modules/bgg_connection.py +++ b/src/modules/bgg_connection.py @@ -41,7 +41,7 @@ def get_multiple_boardgames(boardgame_ids: list[int]) -> list[boardgame_classes. def divide_list_in_chunks(list_to_divide: list[int], chunk_size: int = definitions.BGG_MAX_THING_BOARDGAMES): for i in range(0, len(list_to_divide), chunk_size): - yield list_to_divide[i:i + chunk_size] + yield list_to_divide[i:i + chunk_size] boardgame_list_to_return: list[boardgame_classes.BoardGame] = [] diff --git a/src/modules/data_connection.py b/src/modules/data_connection.py index 420e36f..4fd1eee 100644 --- a/src/modules/data_connection.py +++ b/src/modules/data_connection.py @@ -95,6 +95,12 @@ def get_plays(session: Session) -> list[play_classes.Play]: #list + set to remove duplicates played_boardgame_ids = list(set([play.boardgame_id for play in plays_from_db])) played_expansion_ids = list(set([play.expansion_id for play in plays_from_db])) + + #Remove None's (played board games don't have expansion id and vice versa) + played_boardgame_ids = list(filter(lambda x: x != None, played_boardgame_ids)) + played_expansion_ids = list(filter(lambda x: x != None, played_expansion_ids)) + + assert len(list(filter(lambda x: x == None, played_boardgame_ids))) == 0, plays_from_db get_multiple_boardgames(get_db_session(), played_boardgame_ids + played_expansion_ids)