Process where boolean

sevenymedia · Sep 19, 2018 · 29964f0 · 29964f0
1 parent 48ecf68
commit 29964f0
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 1 deletion.
diff --git a/src/Repository/Eloquent/BaseRepository.php b/src/Repository/Eloquent/BaseRepository.php
@@ -247,7 +247,15 @@ protected function applyConditions(array $where)
     {
         $this->initiateModel();
 
-        parent::applyConditions($where);
+        foreach ($where as $field => $value) {
+            if (\is_array($value)) {
+                $value[3] = $value[3] ?? 'and';
+                list($field, $condition, $val, $boolean) = $value;
+                $this->model = $this->model->where($field, $condition, $val, $boolean);
+            } else {
+                $this->model = $this->model->where($field, '=', $value);
+            }
+        }
     }
 
 }
diff --git a/tests/BaseRepositoryTest.php b/tests/BaseRepositoryTest.php
@@ -115,6 +115,36 @@ public function testResetModelCreatesNewModel()
         $this->assertNotSame($model, $repository->modelProperty());
     }
 
+    /**
+     * @dataProvider providerTestApplyConditionsProcessesWhereBoolean
+     */
+    public function testApplyConditionsProcessesWhereBoolean($argumentBool, string $expectationBool)
+    {
+        $repository = new RepositoryStub(
+            $this->application,
+            new \Illuminate\Support\Collection(),
+            $model = new ModelStub()
+        );
+
+        $model::setConnectionResolver($connectionResolver = m::mock(\Illuminate\Database\ConnectionResolverInterface::class));
+        $connectionResolver->shouldReceive('connection')->andReturn(
+            $connection = m::mock(\Illuminate\Database\ConnectionInterface::class)
+        );
+        $connection->shouldReceive('getQueryGrammar', 'getPostProcessor');
+
+        $reflectionMethod = new \ReflectionMethod($repository, 'applyConditions');
+        $reflectionMethod->setAccessible(true);
+        $reflectionMethod->invokeArgs($repository, [
+            [array_filter([$column = 'foo', $operator = 'LIKE', $value = '%bar%', $argumentBool]),],
+        ]);
+
+        $where = $repository->modelProperty()->getQuery()->wheres[0];
+        $this->assertSame($column, $where['column']);
+        $this->assertSame($operator, $where['operator']);
+        $this->assertSame($value, $where['value']);
+        $this->assertSame($expectationBool, $where['boolean']);
+    }
+
     public function providerTestConstructor(): array
     {
         return [
@@ -125,6 +155,15 @@ public function providerTestConstructor(): array
         ];
     }
 
+    public function providerTestApplyConditionsProcessesWhereBoolean(): array
+    {
+        return [
+            [null, 'and',],
+            ['and', 'and',],
+            ['or', 'or',],
+        ];
+    }
+
     public function getModelMock(): m\MockInterface
     {
         return m::mock(\Illuminate\Database\Eloquent\Model::class);