Merge pull request #6 from hosmelq/tests

MrPunyapal · web-flow · commit f7d48ec816b7 · 2024-02-03T18:29:40.000+05:30
will added more later
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
     backupGlobals="false"
     bootstrap="vendor/autoload.php"
     colors="true"
@@ -21,9 +21,6 @@
         </testsuite>
     </testsuites>
     <coverage>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
         <report>
             <html outputDirectory="build/coverage"/>
             <text outputFile="build/coverage.txt"/>
@@ -33,4 +30,9 @@
     <logging>
         <junit outputFile="build/report.junit.xml"/>
     </logging>
+    <source>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/src/HasExtendedRelationships.php b/src/HasExtendedRelationships.php
@@ -4,7 +4,7 @@
 
 namespace Mrpunyapal\LaravelExtendedRelationships;
 
-use Illuminate\Contracts\Database\Query\Builder;
+use Illuminate\Database\Eloquent\Builder;
 use Mrpunyapal\LaravelExtendedRelationships\Relations\BelongsToArrayColumn;
 use Mrpunyapal\LaravelExtendedRelationships\Relations\BelongsToManyKeys;
 use Mrpunyapal\LaravelExtendedRelationships\Relations\HasManyArrayColumn;
diff --git a/src/Relations/HasManyArrayColumn.php b/src/Relations/HasManyArrayColumn.php
@@ -17,9 +17,10 @@ public function addConstraints(): void
         if (! static::$constraints) {
             return;
         }
+
         $query = $this->getRelationQuery();
 
-        $query->wherein($this->foreignKey, $this->getParentKey());
+        $query->whereIn($this->foreignKey, $this->getParentKey());
 
         $query->whereNotNull($this->foreignKey);
     }
@@ -40,6 +41,7 @@ public function addEagerConstraints(array $models): void
     protected function getKeys(array $models, $key = null): array
     {
         $keys = [];
+
         collect($models)->each(function ($value) use ($key, &$keys) {
             $keys = array_merge($keys, $value->getAttribute($key));
         });
@@ -66,6 +68,7 @@ public function matchMany(array $models, Collection $results, $relation): array
                     $collection = $collection->merge($this->getRelationValue($dictionary, $id, 'many'));
                 }
             }
+
             $model->setRelation($relation, $collection);
         }
 
diff --git a/src/Relations/HasManyKeys.php b/src/Relations/HasManyKeys.php
@@ -45,6 +45,7 @@ public function addConstraints(): void
         if (! static::$constraints) {
             return;
         }
+
         $foreignKeys = $this->foreignKeys;
 
         $this->query->where(function ($query) use ($foreignKeys): void {
diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php
diff --git a/tests/Relations/HasManyArrayColumnTest.php b/tests/Relations/HasManyArrayColumnTest.php
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+use Mrpunyapal\LaravelExtendedRelationships\Relations\HasManyArrayColumn;
+
+it('models are properly matched to parents', function (): void {
+    $relation = getRelation();
+
+    $result1 = new HasManyArrayColumnModelStub();
+    $result1->foreign_key = 1;
+    $result2 = new HasManyArrayColumnModelStub();
+    $result2->foreign_key = 2;
+    $result3 = new HasManyArrayColumnModelStub();
+    $result3->foreign_key = 2;
+
+    $model1 = new HasManyArrayColumnModelStub();
+    $model1->companies = [1];
+    $model2 = new HasManyArrayColumnModelStub();
+    $model2->companies = [2];
+    $model3 = new HasManyArrayColumnModelStub();
+    $model3->companies = [3];
+
+    $relation->getRelated()->shouldReceive('newCollection')->andReturnUsing(function ($array) {
+        return new Collection($array);
+    });
+
+    $models = $relation->match([$model1, $model2, $model3], new Collection([$result1, $result2, $result3]), 'foo');
+
+    expect($models[0]->foo)->toHaveCount(1)
+        ->get(0)->foreign_key->toBe(1)
+        ->and($models[1]->foo)->toHaveCount(2)
+        ->get(0)->foreign_key->toBe(2)
+        ->get(1)->foreign_key->toBe(2)
+        ->and($models[2]->foo)->toHaveCount(0);
+});
+
+function getRelation()
+{
+    $queryBuilder = Mockery::mock(QueryBuilder::class);
+    $eloquentBuilder = Mockery::mock(EloquentBuilder::class, [$queryBuilder]);
+
+    $parent = Mockery::mock(Model::class);
+    $related = Mockery::mock(Model::class);
+
+    $eloquentBuilder->shouldReceive('getModel')->andReturn($related);
+    $eloquentBuilder->shouldReceive('whereIn')->with('foreign_key', [1, 2]);
+    $eloquentBuilder->shouldReceive('whereNotNull')->with('foreign_key');
+
+    $parent->shouldReceive('getAttribute')->with('companies')->andReturn([1, 2]);
+
+    return new HasManyArrayColumn($eloquentBuilder, $parent, 'foreign_key', 'companies');
+}
+
+class HasManyArrayColumnModelStub extends Model
+{
+    public int $foreign_key;
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -11,6 +11,5 @@ class TestCase extends Orchestra
     protected function setUp(): void
     {
         parent::setUp();
-
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,10 @@ public function addConstraints(): void`
`17`	`17`	`if (! static::$constraints) {`
`18`	`18`	`return;`
`19`	`19`	`}`
	`20`	`+`
`20`	`21`	`$query = $this->getRelationQuery();`
`21`	`22`
`22`		`- $query->wherein($this->foreignKey, $this->getParentKey());`
	`23`	`+ $query->whereIn($this->foreignKey, $this->getParentKey());`
`23`	`24`
`24`	`25`	`$query->whereNotNull($this->foreignKey);`
`25`	`26`	`}`
`@@ -40,6 +41,7 @@ public function addEagerConstraints(array $models): void`
`40`	`41`	`protected function getKeys(array $models, $key = null): array`
`41`	`42`	`{`
`42`	`43`	`$keys = [];`
	`44`	`+`
`43`	`45`	`collect($models)->each(function ($value) use ($key, &$keys) {`
`44`	`46`	`$keys = array_merge($keys, $value->getAttribute($key));`
`45`	`47`	`});`
`@@ -66,6 +68,7 @@ public function matchMany(array $models, Collection $results, $relation): array`
`66`	`68`	`$collection = $collection->merge($this->getRelationValue($dictionary, $id, 'many'));`
`67`	`69`	`}`
`68`	`70`	`}`
	`71`	`+`
`69`	`72`	`$model->setRelation($relation, $collection);`
`70`	`73`	`}`
`71`	`74`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public function addConstraints(): void`
`45`	`45`	`if (! static::$constraints) {`
`46`	`46`	`return;`
`47`	`47`	`}`
	`48`	`+`
`48`	`49`	`$foreignKeys = $this->foreignKeys;`
`49`	`50`
`50`	`51`	`$this->query->where(function ($query) use ($foreignKeys): void {`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,5 @@ class TestCase extends Orchestra`
`11`	`11`	`protected function setUp(): void`
`12`	`12`	`{`
`13`	`13`	`parent::setUp();`
`14`		`-`
`15`	`14`	`}`
`16`	`15`	`}`