Merge pull request #473 from minos-framework/issue-471-add-contains

#471 - Add `Condition.CONTAINS`

Author: albamig

packages/core/minos-microservice-aggregate/minos/aggregate/queries.py

@@ -146,6 +146,11 @@ def _evaluate(self, value: Model) -> bool:
         return self._get_field(value) in self.parameter
 
 
+class _ContainsCondition(_SimpleCondition):
+    def _evaluate(self, value: Model) -> bool:
+        return self.parameter in self._get_field(value)
+
+
 class _LikeCondition(_SimpleCondition):
     def _evaluate(self, value: Model) -> bool:
         return bool(self._pattern.fullmatch(self._get_field(value)))
@@ -205,6 +210,7 @@ class Condition:
     EQUAL = _EqualCondition
     NOT_EQUAL = _NotEqualCondition
     IN = _InCondition
+    CONTAINS = _ContainsCondition
     LIKE = _LikeCondition
 
 

packages/core/minos-microservice-aggregate/tests/test_aggregate/test_queries.py

@@ -21,6 +21,10 @@ class _Text(DeclarativeModel):
     value: str
 
 
+class _ListInt(DeclarativeModel):
+    value: list[int]
+
+
 class TestCondition(unittest.TestCase):
     def test_hash(self):
         self.assertIsInstance(hash(Condition.EQUAL("value", 3)), int)
@@ -126,6 +130,13 @@ def test_condition_in(self):
         self.assertFalse(condition.evaluate(_Number(42)))
         self.assertTrue(condition.evaluate(_Number(56)))
 
+    def test_condition_contains(self):
+        condition = Condition.CONTAINS("value", 1)
+        self.assertEqual("_ContainsCondition('value', 1)", repr(condition))
+
+        self.assertFalse(condition.evaluate(_ListInt([42, 3, -5])))
+        self.assertTrue(condition.evaluate(_ListInt([1, 2, 3])))
+
     def test_condition_like(self):
         condition = Condition.LIKE("value", "a%[^ou]")
         self.assertEqual("_LikeCondition('value', 'a%[^ou]')", repr(condition))

packages/plugins/minos-database-aiopg/minos/plugins/aiopg/factories/aggregate/snapshots/queries.py

@@ -31,6 +31,7 @@
     _AndCondition,
     _ComposedCondition,
     _Condition,
+    _ContainsCondition,
     _EqualCondition,
     _FalseCondition,
     _GreaterCondition,
@@ -144,6 +145,8 @@ def _build_condition(self, condition: _Condition) -> Composable:
             return SQL("FALSE")
         if isinstance(condition, _LikeCondition):
             return self._build_condition_like(condition)
+        if isinstance(condition, _ContainsCondition):
+            return self._build_condition_contains(condition)
         if isinstance(condition, _SimpleCondition):
             return self._build_condition_simple(condition)
 
@@ -184,7 +187,7 @@ def _build_condition_simple(self, condition: _SimpleCondition) -> Composable:
             name = Placeholder(name)
             return SQL("(data#>{field} {operator} {name}::jsonb)").format(field=field, operator=operator, name=name)
 
-    def _build_condition_like(self, condition: _SimpleCondition) -> Composable:
+    def _build_condition_like(self, condition: _LikeCondition) -> Composable:
         field = condition.field
 
         parameter = AvroDataEncoder(condition.parameter).build()
@@ -204,6 +207,21 @@ def _build_condition_like(self, condition: _SimpleCondition) -> Composable:
             name = Placeholder(name)
             return SQL("(data#>>{field} LIKE {name})").format(field=field, name=name)
 
+    def _build_condition_contains(self, condition: _ContainsCondition) -> Composable:
+        field = condition.field
+
+        parameter = AvroDataEncoder(condition.parameter).build()
+
+        if field in self._FIXED_FIELDS_MAPPER:
+            raise ValueError(f"Cannot use 'contains' over non-list field '{field}'")
+        else:
+            name = self.generate_random_str()
+            self._parameters[name] = parameter
+
+            field = Literal("{{{}}}".format(field.replace(".", ",")))
+            name = Placeholder(name)
+            return SQL("(data#>{name} IN {field}::jsonb)").format(field=field, name=name)
+
     def _build_ordering(self, ordering: _Ordering) -> Composable:
         field = ordering.by
         direction = self._ORDERING_MAPPER[ordering.reverse]