made between into a wrapper expression

Author: daniel-sanche

packages/google-cloud-firestore/google/cloud/firestore_v1/pipeline_expressions.py

@@ -626,13 +626,9 @@ def between(
         Returns:
             A new `BooleanExpression` representing the between comparison.
         """
-        return BooleanExpression(
-            "between",
-            [
-                self,
-                self._cast_to_expr_or_convert_to_constant(lower),
-                self._cast_to_expr_or_convert_to_constant(upper),
-            ],
+        return And(
+            self.greater_than_or_equal(lower),
+            self.less_than_or_equal(upper),
         )
 
     @expose_as_static

packages/google-cloud-firestore/tests/unit/v1/test_pipeline_expressions.py

@@ -795,9 +795,11 @@ def test_between(self):
         arg2 = self._make_arg("Lower")
         arg3 = self._make_arg("Upper")
         instance = Expression.between(arg1, arg2, arg3)
-        assert instance.name == "between"
-        assert instance.params == [arg1, arg2, arg3]
-        assert repr(instance) == "Left.between(Lower, Upper)"
+        assert instance.name == "and"
+        assert len(instance.params) == 2
+        assert instance.params[0].name == "greater_than_or_equal"
+        assert instance.params[1].name == "less_than_or_equal"
+        assert repr(instance) == "And(Left.greater_than_or_equal(Lower), Left.less_than_or_equal(Upper))"
         infix_instance = arg1.between(arg2, arg3)
         assert infix_instance == instance