Merge pull request #3 from nullthoughts/dev

Support for earliest-relation

Author: nullthoughts

README.md

@@ -8,7 +8,9 @@ Install via composer:
 ## Usage / Examples
 Use the Builder methods inside a whereHas closure:
 
-### whereLatest($column, $value)
+### Latest:
+
+#### whereLatest($column, $value)
 **Query**
 ```php
 $users = User::whereHas('logins', function ($query) {
@@ -26,7 +28,7 @@ public function scopeByCondition($query, $condition)
 }
 ```
 
-### latestRelation()
+#### latestRelation()
 **Query**
 ```php
 $users = User::whereHas('logins', function ($query) {
@@ -47,3 +49,15 @@ public function scopeByCondition($query, $condition)
     });
 }
 ```
+
+### Earliest:
+
+```php
+$users = User::whereHas('logins', function ($query) {
+    $query->whereEarliest('device_type', 'desktop');
+});
+
+$users = User::whereHas('logins', function ($query) {
+    $query->earliestRelation()->whereNotNull('device_type');
+});
+```

src/ServiceProvider.php

@@ -10,17 +10,29 @@ class ServiceProvider extends BaseServiceProvider
 {
     public function boot()
     {
-        Builder::macro('latestRelation', function () {
+        Builder::macro('relation', function (string $type = 'max') {
             if(! $where = $this->wheres[0] ?? null) {
-                throw new InvalidArgumentException('The latestRelation method should only be called from within a whereHas callback.');
+                throw new InvalidArgumentException('The relation methods should only be called from within a whereHas callback.');
             }
 
-            return $this->where('id', function ($sub) use ($where) {
+            return $this->where('id', function ($sub) use ($where, $type) {
                 $sub->from($this->from)
-                ->selectRaw('max(id)')
-                ->whereColumn($where['first'], $where['second']);
+                    ->selectRaw($type . '(id)')
+                    ->whereColumn($where['first'], $where['second']);
             });
         });
+        
+        Builder::macro('earliestRelation', function () {
+            return $this->relation('min');
+        });
+
+        Builder::macro('latestRelation', function () {
+            return $this->relation('max');
+        });
+
+        Builder::macro('whereEarliest', function ($column, $value) {
+            return $this->earliestRelation()->where($column, $value);
+        });
 
         Builder::macro('whereLatest', function ($column, $value) {
             return $this->latestRelation()->where($column, $value);

tests/Unit/EloquentLatestRelationTest.php

@@ -27,7 +27,7 @@ public function setUp(): void
             $table->timestamp('created_at');
             $table->unsignedBigInteger('user_id');
             $table->enum('device_type', ['mobile', 'desktop']);
-            $table->string('profession')->nullable();
+            $table->string('country')->nullable();
         });
 
         DB::table('users')->insert([
@@ -48,49 +48,48 @@ public function setUp(): void
                 'user_id' => 1,
                 'created_at' => Carbon::now()->subDays(3),
                 'device_type' => 'mobile',
-                'profession' => null
+                'country' => null
             ], [
 
                 'user_id' => 2,
                 'created_at' => Carbon::now()->subDays(3),
                 'device_type' => 'mobile',
-                'profession' => null
+                'country' => null
             ], [
                 'user_id' => 3,
                 'created_at' => Carbon::now()->subDays(3),
                 'device_type' => 'mobile',
-                'profession' => null],
-            
-            [
+                'country' => 'US'
+            ], [
                 'user_id' => 1,
                 'created_at' => Carbon::now()->subDay(2),
                 'device_type' => 'desktop',
-                'profession' => null
+                'country' => null
             ], [
                 'user_id' => 2,
                 'created_at' => Carbon::now()->subDay(2),
                 'device_type' => 'desktop',
-                'profession' => null
+                'country' => null
             ], [
                 'user_id' => 3,
                 'created_at' => Carbon::now()->subDay(2),
                 'device_type' => 'desktop',
-                'profession' => null
+                'country' => null
             ], [
                 'user_id' => 1,
                 'created_at' => Carbon::now(),
                 'device_type' => 'desktop',
-                'profession' => 'Leisure Consultant'
+                'country' => 'US'
             ], [
                 'user_id' => 2,
                 'created_at' => Carbon::now()->subDay(1),
                 'device_type' => 'mobile',
-                'profession' => null
+                'country' => null
             ], [
                 'user_id' => 3,
                 'created_at' => Carbon::now(),
                 'device_type' => 'mobile',
-                'profession' => null
+                'country' => null
             ],
         ]);
     }
@@ -100,12 +99,12 @@ public function setUp(): void
      */
     public function latest_relation()
     {
-        $professions = User::whereHas('logins', function ($query) {
-            $query->latestRelation()->whereNotNull('profession');
+        $users = User::whereHas('logins', function ($query) {
+            $query->latestRelation()->whereNotNull('country');
         });
 
-        $this->assertSame(1, $professions->count());
-        $this->assertSame('Ferris Bueller', $professions->first()->name);
+        $this->assertSame(1, $users->count());
+        $this->assertSame('Ferris Bueller', $users->first()->name);
 
         $loggedInYesterday = User::whereHas('logins', function ($query) {
             $query->latestRelation()->whereBetween(
@@ -118,7 +117,20 @@ public function latest_relation()
         $this->assertSame(1, $loggedInYesterday->count());
         $this->assertSame('Cameron Frye', $loggedInYesterday->first()->name);
     }
-    
+
+    /**
+     * @test
+     */
+    public function earilest_relation()
+    {
+        $users = User::whereHas('logins', function ($query) {
+            $query->earliestRelation()->whereNotNull('country');
+        });
+
+        $this->assertSame(1, $users->count());
+        $this->assertSame('Ed Rooney', $users->first()->name);
+    }
+
     /**
      * @test
      */
@@ -144,6 +156,24 @@ public function where_latest()
         $this->assertSame('Ferris Bueller', $users->first()->name);
         $this->assertSame('desktop', $users->first()->lastLogin->device_type);
     }
+
+    /**
+     * @test
+     */
+    public function where_earilest()
+    {
+        $users = User::whereHas('logins', function ($query) {
+            $query->whereEarliest('device_type', 'mobile');
+        })->get();
+        
+        $this->assertCount(3, $users);
+
+        $users = User::whereHas('logins', function ($query) {
+            $query->whereEarliest('device_type', 'desktop');
+        })->get();
+
+        $this->assertCount(0, $users);
+    }
 }
 
 class User extends Model