feat: refactor logical filters and add tests (#17)

fernando24164 · web-flow · commit 56e68f3b1dd5 · 2023-10-21T14:41:15.000+02:00
diff --git a/nocodb/filters/logical.py b/nocodb/filters/logical.py
@@ -7,28 +7,20 @@ def __init__(self, *filters: List[WhereFilter]):
         self.__filters = filters
 
     def get_where(self) -> str:
-        return (
-            "("
-            + "~or".join([filter.get_where() for filter in self.__filters])
-            + ")"
-        )
+        return f"({'~or'.join([filter.get_where() for filter in self.__filters])})"
 
 
 class And(WhereFilter):
     def __init__(self, *filters: List[WhereFilter]):
         self.__filters = filters
 
     def get_where(self) -> str:
-        return (
-            "("
-            + "~and".join([filter.get_where() for filter in self.__filters])
-            + ")"
-        )
+        return f"({'~and'.join([filter.get_where() for filter in self.__filters])})"
 
 
 class Not(WhereFilter):
     def __init__(self, filter: WhereFilter):
         self.__filter = filter
 
     def get_where(self) -> str:
-        return "~not" + self.__filter.get_where()
+        return f"~not{self.__filter.get_where()}"
diff --git a/nocodb/filters/logical_test.py b/nocodb/filters/logical_test.py
@@ -0,0 +1,21 @@
+from nocodb import filters
+
+
+def test_or_with_two_filters():
+    filter1 = filters.EqFilter("column1", "value1")
+    filter2 = filters.EqFilter("column2", "value2")
+    or_filter = filters.Or(filter1, filter2)
+    assert or_filter.get_where() == "((column1,eq,value1)~or(column2,eq,value2))"
+
+
+def test_and_with_two_filters():
+    filter1 = filters.And(filters.EqFilter("column1", "value1"))
+    filter2 = filters.And(filters.EqFilter("column2", "value2"))
+    and_filter = filters.And(filter1, filter2)
+    assert and_filter.get_where() == "(((column1,eq,value1))~and((column2,eq,value2)))"
+
+
+def test_not_filter():
+    filter = filters.EqFilter("column", "value")
+    not_filter = filters.Not(filter)
+    assert not_filter.get_where() == "~not(column,eq,value)"
