Merge pull request #4 from nullthoughts/dev

Shorthand methods

Author: nullthoughts

README.md

@@ -1,5 +1,7 @@
 # Laravel Latest Relation
-Eloquent macros for querying the latest HasMany relationship in Laravel
+Eloquent macros for querying the latest HasMany relationship in Laravel. 
+
+More information on the problem and solutions: [Dynamic scope on latest record in Laravel's HasMany relationships, Part 1: solving with Subqueries - nullthoughts.com](https://nullthoughts.com/development/2019/10/08/dynamic-scope-on-latest-relationship-in-laravel/)
 
 ## Installation
 Install via composer:
@@ -10,6 +12,20 @@ Use the Builder methods inside a whereHas closure:
 
 ### Latest:
 
+#### whereLatestRelation($relation, $column, $value)
+**Query**
+```php
+$users = User::whereLatestRelation('logins', 'device_type', 'desktop');
+```
+
+**Dynamic Scope**
+```php
+public function scopeUsingDevice($query, $device)
+{
+    return $query->whereLatestRelation('logins', 'device_type', $device);
+}
+```
+
 #### whereLatest($column, $value)
 **Query**
 ```php
@@ -20,7 +36,7 @@ $users = User::whereHas('logins', function ($query) {
 
 **Dynamic Scope**
 ```php
-public function scopeByCondition($query, $condition)
+public function scopeUsingDevice($query, $device)
 {
     return $query->whereHas('logins', function ($query) use ($device) {
         $query->whereLatest('device_type', $device);
@@ -42,7 +58,7 @@ $users = User::whereHas('logins', function ($query) {
 
 **Dynamic Scope**
 ```php
-public function scopeByCondition($query, $condition)
+public function scopeHavingDeviceType($query)
 {
     return $query->whereHas('logins', function ($query) {
         $query->latestRelation()->whereNotNull('device_type');
@@ -53,6 +69,8 @@ public function scopeByCondition($query, $condition)
 ### Earliest:
 
 ```php
+$users = User::whereLatestRelation('logins', 'device_type', 'desktop');
+
 $users = User::whereHas('logins', function ($query) {
     $query->whereEarliest('device_type', 'desktop');
 });

src/ServiceProvider.php

@@ -3,14 +3,15 @@
 namespace LaravelLatestRelation;
 
 use InvalidArgumentException;
-use Illuminate\Database\Query\Builder;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
 
 class ServiceProvider extends BaseServiceProvider
 {
     public function boot()
     {
-        Builder::macro('relation', function (string $type = 'max') {
+        QueryBuilder::macro('relation', function (string $type = 'max') {
             if(! $where = $this->wheres[0] ?? null) {
                 throw new InvalidArgumentException('The relation methods should only be called from within a whereHas callback.');
             }
@@ -22,20 +23,32 @@ public function boot()
             });
         });
 
-        Builder::macro('earliestRelation', function () {
+        QueryBuilder::macro('earliestRelation', function () {
             return $this->relation('min');
         });
 
-        Builder::macro('latestRelation', function () {
+        QueryBuilder::macro('latestRelation', function () {
             return $this->relation('max');
         });
 
-        Builder::macro('whereEarliest', function ($column, $value) {
+        QueryBuilder::macro('whereEarliest', function ($column, $value) {
             return $this->earliestRelation()->where($column, $value);
         });
 
-        Builder::macro('whereLatest', function ($column, $value) {
+        QueryBuilder::macro('whereLatest', function ($column, $value) {
             return $this->latestRelation()->where($column, $value);
         });
+
+        EloquentBuilder::macro('whereEarliestRelation', function ($relation, $column, $value) {
+            return $this->whereHas($relation, function($query) use ($column, $value) {
+                return $query->whereEarliest($column, $value);
+            });
+        });
+
+        EloquentBuilder::macro('whereLatestRelation', function ($relation, $column, $value) {
+            return $this->whereHas($relation, function ($query) use ($column, $value) {
+                $query->whereLatest($column, $value);
+            });
+        });
     }
 }

tests/Unit/EloquentLatestRelationTest.php

@@ -174,6 +174,42 @@ public function where_earilest()
 
         $this->assertCount(0, $users);
     }
+
+    /**
+     * @test
+     */
+    public function where_latest_relation()
+    {
+        $users = User::whereLatestRelation('logins', 'device_type', 'mobile')->get();
+        
+        $this->assertCount(2, $users);
+        $this->assertSame('Cameron Frye', $users->first()->name);
+        $this->assertSame('mobile', $users->first()->lastLogin->device_type);
+        $this->assertTrue($users->first()->lastLogin->created_at->isYesterday());
+        $this->assertSame('Ed Rooney', $users->last()->name);
+        $this->assertSame('mobile', $users->last()->lastLogin->device_type);
+        $this->assertTrue($users->last()->lastLogin->created_at->isToday());
+
+        $users = User::whereLatestRelation('logins', 'device_type', 'desktop')->get();
+
+        $this->assertCount(1, $users);
+        $this->assertSame('Ferris Bueller', $users->first()->name);
+        $this->assertSame('desktop', $users->first()->lastLogin->device_type);
+    }
+
+    /**
+     * @test
+     */
+    public function where_earilest_relation()
+    {
+        $users = User::whereEarliestRelation('logins', 'device_type', 'mobile')->get();
+        
+        $this->assertCount(3, $users);
+
+        $users = User::whereEarliestRelation('logins', 'device_type', 'desktop')->get();
+
+        $this->assertCount(0, $users);
+    }
 }
 
 class User extends Model