Collection querying: Add andWhere GreaterThan/LessThan()

Author: roydejong

src/Collections/CollectionQuery.php

@@ -60,10 +60,11 @@ public function select(string ...$columns): self
      * Adds a filter condition with an "and" clause.
      *
      * @param string $columnName
+     * @param string $operator
      * @param bool|int|float|string|array $expectedValue
      * @return $this
      */
-    public function andWhereEquals(string $columnName, $expectedValue): self
+    protected function andWhere(string $columnName, $operator, $expectedValue): self
     {
         if (!empty($this->filter)) {
             $this->filter .= " and ";
@@ -74,17 +75,53 @@ public function andWhereEquals(string $columnName, $expectedValue): self
         }
 
         if (is_integer($expectedValue) || is_float($expectedValue)) {
-            $this->filter .= "{$columnName} eq {$expectedValue}";
+            $this->filter .= "{$columnName} {$operator} {$expectedValue}";
         } else if (is_string($expectedValue)) {
-            $this->filter .= "{$columnName} eq '{$expectedValue}'";
-        } else if (is_array($expectedValue)) {
+            $this->filter .= "{$columnName} {$operator} '{$expectedValue}'";
+        } else if (($operator === "eq" || $operator === "equals" || $operator === "oneOf") && is_array($expectedValue)) {
             $oneOfList = "'" . implode("','", $expectedValue) . "'";
             $this->filter .= "{$columnName} oneOf({$oneOfList})";
         }
 
         return $this;
     }
 
+    /**
+     * Adds a filter condition with an "and equals" clause.
+     *
+     * @param string $columnName
+     * @param bool|int|float|string|array $expectedValue
+     * @return $this
+     */
+    public function andWhereEquals(string $columnName, $expectedValue): self
+    {
+        return $this->andWhere($columnName, "eq", $expectedValue);
+    }
+
+    /**
+     * Adds a filter condition with an "and greater than" clause.
+     *
+     * @param string $columnName
+     * @param int|float $expectedValue
+     * @return $this
+     */
+    public function andWhereGreaterThan(string $columnName, $expectedValue): self
+    {
+        return $this->andWhere($columnName, "gt", $expectedValue);
+    }
+
+    /**
+     * Adds a filter condition with an "and less than" clause.
+     *
+     * @param string $columnName
+     * @param int|float $expectedValue
+     * @return $this
+     */
+    public function andWhereLessThan(string $columnName, $expectedValue): self
+    {
+        return $this->andWhere($columnName, "lt", $expectedValue);
+    }
+
     /**
      * Set query limit ($top).
      *

tests/Collections/CollectionQueryTest.php

@@ -93,7 +93,7 @@ public function testGetQueryString()
      * @depends testLimit
      * @depends testOffset
      */
-    public function testFilter()
+    public function testFilterEquals()
     {
         $cl = new Client(new Config([]));
         $dc = new CollectionQueryTestDummyCollection($cl);
@@ -107,6 +107,23 @@ public function testFilter()
             $cq->getQueryString()
         );
     }
+
+    /**
+     * @depends testFilterEquals
+     */
+    public function testFilterGreaterThanLessThan()
+    {
+        $cl = new Client(new Config([]));
+        $dc = new CollectionQueryTestDummyCollection($cl);
+        $cq = new CollectionQuery($dc);
+
+        $cq->andWhereGreaterThan('number', 123);
+        $cq->andWhereLessThan('number', 456);
+
+        $this->assertSame("\$filter=number gt 123 and number lt 456",
+            $cq->getQueryString()
+        );
+    }
 }
 
 class CollectionQueryTestDummyCollection extends Collection