From 339745daf7d2ceebd02ef255f4de12ba47e56acc Mon Sep 17 00:00:00 2001 From: Yarne Coppens Date: Thu, 22 Aug 2024 10:15:24 +0200 Subject: [PATCH] Made filters work with refactored changes --- src/filters/boardgame_filters.py | 4 ++-- src/filters/play_filters.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/filters/boardgame_filters.py b/src/filters/boardgame_filters.py index dfce5f5..8e0df84 100644 --- a/src/filters/boardgame_filters.py +++ b/src/filters/boardgame_filters.py @@ -4,13 +4,13 @@ from src.classes import boardgame_classes def filter_expansions_out(to_filter_boardgames: list[boardgame_classes.BoardGame]): - filtered_boardgames = list(filter(lambda x: type(x) in [boardgame_classes.BoardGame], to_filter_boardgames)) + filtered_boardgames = list(filter(lambda x: x.expansion_info == None, to_filter_boardgames)) return filtered_boardgames def filter_non_expansions_out(to_filter_boardgames: list[boardgame_classes.BoardGame]): - #filtered_boardgames = list(filter(lambda x: type(x) in [boardgame_classes.BoardGameExpansion, boardgame_classes.OwnedBoardGameExpansion, boardgame_classes.WishlistBoardGameExpansion], to_filter_boardgames)) + filtered_boardgames = list(filter(lambda x: x.expansion_info != None, to_filter_boardgames)) filtered_boardgames = to_filter_boardgames diff --git a/src/filters/play_filters.py b/src/filters/play_filters.py index 858c6d2..031b6f7 100644 --- a/src/filters/play_filters.py +++ b/src/filters/play_filters.py @@ -3,14 +3,14 @@ from src.classes import play_classes, boardgame_classes def filter_expansions_out(play_list: list[play_classes.Play]): to_return_plays = [] - to_return_plays = list(filter(lambda x: x.expansion_id == None, play_list)) + to_return_plays = list(filter(lambda x: x.boardgame.expansion_info == None, play_list)) return to_return_plays def filter_non_expansions_out(play_list: list[play_classes.Play]): to_return_plays = [] - to_return_plays = list(filter(lambda x: x.expansion_id != None, play_list)) + to_return_plays = list(filter(lambda x: x.boardgame.expansion_info != None, play_list)) return to_return_plays