Support whereIn and whereBetween

close #4, #5

Author: kitar

src/Kitar/Dynamodb/Query/Builder.php

@@ -45,12 +45,6 @@ class Builder extends BaseBuilder
      */
     public $dry_run = false;
 
-    /**
-     * The attribute name to place compiled wheres.
-     * @var string
-     */
-    public $where_as;
-
     /**
      * The ExpressionAttributes object.
      * @var Kitar\Dynamodb\Query\ExpressionAttributes
@@ -63,6 +57,12 @@ class Builder extends BaseBuilder
      */
     public $available_wheres;
 
+    /**
+     * The attribute name to place compiled wheres.
+     * @var string
+     */
+    public $where_as;
+
     /**
      * Dedicated query for building FilterExpression.
      * @var Kitar\Dynamodb\Query\Builder
@@ -228,7 +228,7 @@ public function initializeDedicatedQueries()
         // Array of: 'incomingMethodName' => [ 'target_builder_instance_name', 'targetMethodName' ]
         foreach (['filter', 'condition', 'key_condition'] as $query_type) {
             foreach (['', 'or'] as $boolean) {
-                foreach ([''] as $where_type) {
+                foreach (['', 'in', 'between'] as $where_type) {
                     $target_query = $query_type . '_query';
                     $source_method = Str::camel(implode('_', [$boolean, $query_type, $where_type]));
                     $target_method = Str::camel(implode('_', [$boolean, 'where', $where_type]));
@@ -306,6 +306,34 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
         return $this;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function whereIn($column, $values, $boolean = 'and', $not = false)
+    {
+        $column = $this->expression_attributes->addName($column);
+
+        foreach ($values as &$value) {
+            $value = $this->expression_attributes->addValue($value);
+        }
+
+        return parent::whereIn($column, $values, $boolean, $not);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function whereBetween($column, array $values, $boolean = 'and', $not = false)
+    {
+        $column = $this->expression_attributes->addName($column);
+
+        foreach ($values as &$value) {
+            $value = $this->expression_attributes->addValue($value);
+        }
+
+        return parent::whereBetween($column, $values, $boolean, $not);
+    }
+
     /**
      * @inheritdoc
      */

src/Kitar/Dynamodb/Query/Grammar.php

@@ -259,13 +259,11 @@ protected function compileSizeCondition($where)
      */
     protected function whereBetween($query, $where)
     {
-        $column = $query->expression_attributes->addName($where['column']);
+        $min = reset($where['values']);
 
-        $min = $query->expression_attributes->addValue(reset($where['values']));
+        $max = end($where['values']);
 
-        $max = $query->expression_attributes->addValue(end($where['values']));
-
-        return "({$column} between {$min} and {$max})";
+        return "({$where['column']} between {$min} and {$max})";
     }
 
     /**
@@ -275,7 +273,7 @@ protected function whereIn($query, $where)
     {
         $values = implode(', ', $where['values']);
 
-        return "in({$values})";
+        return "({$where['column']} in ({$values}))";
     }
 
     /**

tests/Query/BuilderTest.php

@@ -215,6 +215,61 @@ public function it_can_process_or_condition()
         $this->assertEquals($params, $query['params']);
     }
 
+    /** @test */
+    public function it_can_process_filter_in()
+    {
+        $params = [
+            'TableName' => 'test',
+            'FilterExpression' => '(#1 in (:1, :2, :3))',
+            'ExpressionAttributeNames' => [
+                '#1' => 'Id'
+            ],
+            'ExpressionAttributeValues' => [
+                ':1' => [
+                    'N' => '101'
+                ],
+                ':2' => [
+                    'N' => '102'
+                ],
+                ':3' => [
+                    'N' => '201'
+                ]
+            ]
+        ];
+
+        $query = $this->builder
+                      ->filterIn('Id', [101, 102, 201])
+                      ->scan();
+
+        $this->assertEquals($params, $query['params']);
+    }
+
+    /** @test */
+    public function it_can_process_filter_between()
+    {
+        $params = [
+            'TableName' => 'test',
+            'FilterExpression' => '(#1 between :1 and :2)',
+            'ExpressionAttributeNames' => [
+                '#1' => 'Id'
+            ],
+            'ExpressionAttributeValues' => [
+                ':1' => [
+                    'N' => '101'
+                ],
+                ':2' => [
+                    'N' => '103'
+                ]
+            ]
+        ];
+
+        $query = $this->builder
+                      ->filterBetween('Id', [101, 103])
+                      ->scan();
+
+        $this->assertEquals($params, $query['params']);
+    }
+
     /** @test */
     public function it_can_process_get_item()
     {