Merge pull request #2933 from rommapp/none-filter-support

Add NONE support for filter logic operators

Author: gantoine

backend/endpoints/rom.py

@@ -351,55 +351,55 @@ def get_roms(
     genres_logic: Annotated[
         str,
         Query(
-            description="Logic operator for genres filter: 'any' (OR) or 'all' (AND).",
+            description="Logic operator for genres filter: 'any' (OR), 'all' (AND) or 'none' (NOT).",
         ),
     ] = "any",
     franchises_logic: Annotated[
         str,
         Query(
-            description="Logic operator for franchises filter: 'any' (OR) or 'all' (AND).",
+            description="Logic operator for franchises filter: 'any' (OR), 'all' (AND) or 'none' (NOT).",
         ),
     ] = "any",
     collections_logic: Annotated[
         str,
         Query(
-            description="Logic operator for collections filter: 'any' (OR) or 'all' (AND).",
+            description="Logic operator for collections filter: 'any' (OR), 'all' (AND) or 'none' (NOT).",
         ),
     ] = "any",
     companies_logic: Annotated[
         str,
         Query(
-            description="Logic operator for companies filter: 'any' (OR) or 'all' (AND).",
+            description="Logic operator for companies filter: 'any' (OR), 'all' (AND) or 'none' (NOT).",
         ),
     ] = "any",
     age_ratings_logic: Annotated[
         str,
         Query(
-            description="Logic operator for age ratings filter: 'any' (OR) or 'all' (AND).",
+            description="Logic operator for age ratings filter: 'any' (OR), 'all' (AND) or 'none' (NOT).",
         ),
     ] = "any",
     regions_logic: Annotated[
         str,
         Query(
-            description="Logic operator for regions filter: 'any' (OR) or 'all' (AND).",
+            description="Logic operator for regions filter: 'any' (OR), 'all' (AND) or 'none' (NOT).",
         ),
     ] = "any",
     languages_logic: Annotated[
         str,
         Query(
-            description="Logic operator for languages filter: 'any' (OR) or 'all' (AND).",
+            description="Logic operator for languages filter: 'any' (OR), 'all' (AND) or 'none' (NOT).",
         ),
     ] = "any",
     statuses_logic: Annotated[
         str,
         Query(
-            description="Logic operator for statuses filter: 'any' (OR) or 'all' (AND).",
+            description="Logic operator for statuses filter: 'any' (OR), 'all' (AND) or 'none' (NOT).",
         ),
     ] = "any",
     player_counts_logic: Annotated[
         str,
         Query(
-            description="Logic operator for player counts filter: 'any' (OR) or 'all' (AND).",
+            description="Logic operator for player counts filter: 'any' (OR), 'all' (AND) or 'none' (NOT).",
         ),
     ] = "any",
     order_by: Annotated[

backend/handler/database/roms_handler.py

@@ -372,9 +372,11 @@ def _filter_by_genres(
         session: Session,
         values: Sequence[str],
         match_all: bool = False,
+        match_none: bool = False,
     ) -> Query:
         op = json_array_contains_all if match_all else json_array_contains_any
-        return query.filter(op(RomMetadata.genres, values, session=session))
+        condition = op(RomMetadata.genres, values, session=session)
+        return query.filter(~condition) if match_none else query.filter(condition)
 
     def _filter_by_franchises(
         self,
@@ -383,9 +385,11 @@ def _filter_by_franchises(
         session: Session,
         values: Sequence[str],
         match_all: bool = False,
+        match_none: bool = False,
     ) -> Query:
         op = json_array_contains_all if match_all else json_array_contains_any
-        return query.filter(op(RomMetadata.franchises, values, session=session))
+        condition = op(RomMetadata.franchises, values, session=session)
+        return query.filter(~condition) if match_none else query.filter(condition)
 
     def _filter_by_collections(
         self,
@@ -394,9 +398,11 @@ def _filter_by_collections(
         session: Session,
         values: Sequence[str],
         match_all: bool = False,
+        match_none: bool = False,
     ) -> Query:
         op = json_array_contains_all if match_all else json_array_contains_any
-        return query.filter(op(RomMetadata.collections, values, session=session))
+        condition = op(RomMetadata.collections, values, session=session)
+        return query.filter(~condition) if match_none else query.filter(condition)
 
     def _filter_by_companies(
         self,
@@ -405,9 +411,11 @@ def _filter_by_companies(
         session: Session,
         values: Sequence[str],
         match_all: bool = False,
+        match_none: bool = False,
     ) -> Query:
         op = json_array_contains_all if match_all else json_array_contains_any
-        return query.filter(op(RomMetadata.companies, values, session=session))
+        condition = op(RomMetadata.companies, values, session=session)
+        return query.filter(~condition) if match_none else query.filter(condition)
 
     def _filter_by_age_ratings(
         self,
@@ -416,9 +424,11 @@ def _filter_by_age_ratings(
         session: Session,
         values: Sequence[str],
         match_all: bool = False,
+        match_none: bool = False,
     ) -> Query:
         op = json_array_contains_all if match_all else json_array_contains_any
-        return query.filter(op(RomMetadata.age_ratings, values, session=session))
+        condition = op(RomMetadata.age_ratings, values, session=session)
+        return query.filter(~condition) if match_none else query.filter(condition)
 
     def _filter_by_status(self, query: Query, statuses: Sequence[str]):
         """Filter by one or more user statuses using OR logic."""
@@ -449,9 +459,11 @@ def _filter_by_regions(
         session: Session,
         values: Sequence[str],
         match_all: bool = False,
+        match_none: bool = False,
     ) -> Query:
         op = json_array_contains_all if match_all else json_array_contains_any
-        return query.filter(op(Rom.regions, values, session=session))
+        condition = op(Rom.regions, values, session=session)
+        return query.filter(~condition) if match_none else query.filter(condition)
 
     def _filter_by_languages(
         self,
@@ -460,9 +472,11 @@ def _filter_by_languages(
         session: Session,
         values: Sequence[str],
         match_all: bool = False,
+        match_none: bool = False,
     ) -> Query:
         op = json_array_contains_all if match_all else json_array_contains_any
-        return query.filter(op(Rom.languages, values, session=session))
+        condition = op(Rom.languages, values, session=session)
+        return query.filter(~condition) if match_none else query.filter(condition)
 
     def _filter_by_player_counts(
         self,
@@ -471,8 +485,12 @@ def _filter_by_player_counts(
         session: Session,
         values: Sequence[str],
         match_all: bool = False,
+        match_none: bool = False,
     ) -> Query:
-        return query.filter(RomMetadata.player_count.in_(values))
+        condition = RomMetadata.player_count.in_(values)
+        if match_none:
+            return query.filter(not_(condition))
+        return query.filter(condition)
 
     @begin_session
     def filter_roms(
@@ -695,7 +713,11 @@ def filter_roms(
         for values, logic, filter_func in filters_to_apply:
             if values:
                 query = filter_func(
-                    query, session=session, values=values, match_all=(logic == "all")
+                    query,
+                    session=session,
+                    values=values,
+                    match_all=(logic == "all"),
+                    match_none=(logic == "none"),
                 )
 
         # The RomUser table is already joined if user_id is set