Added getRouteBindingQuery method

Author: toonvandenbos

src/HasSlug.php

@@ -166,7 +166,11 @@ public function resolveRouteBinding($value, $field = null)
         $locale = app()->getLocale();
 
         // Return exact match if we find it
-        if($result = $this->where($key . '->' . $locale, $value)->first()) {
+        $result = $this->getRouteBindingQueryBuilder()
+            ->where($key . '->' . $locale, $value)
+            ->first();
+
+        if($result) {
             return $result;
         }
 
@@ -176,7 +180,9 @@ public function resolveRouteBinding($value, $field = null)
         }
 
         // Get the models where this slug exists in other langs as well
-        $results = $this->whereRaw('JSON_SEARCH(`'.$key.'`, "one", "'.$value.'")')->get();
+        $results = $this->getRouteBindingQueryBuilder()
+            ->whereRaw('JSON_SEARCH(`'.$key.'`, "one", "'.$value.'")')
+            ->get();
 
         // If we have zero or multiple results, don't guess
         if($results->count() !== 1) {
@@ -188,4 +194,21 @@ public function resolveRouteBinding($value, $field = null)
             Router::current(), $locale, false
         )]);
     }
+
+    /**
+     * Get a new query builder for the Route Binding
+     *
+     * @param $value
+     * @return mixed
+     */
+    protected function getRouteBindingQueryBuilder()
+    {
+        $query = $this->newQuery();
+
+        if(method_exists($this, 'getRouteBindingQuery')) {
+            return $this->getRouteBindingQuery($query);
+        }
+
+        return $query;
+    }
 }

tests/SluggableTest.php

@@ -77,4 +77,40 @@ public function test_can_generate_translated_url_for_route()
 
         $this->assertSame('/foo/french-title/some-value', $model->getSluggedUrlForRoute($route, 'fr', false));
     }
+
+    public function test_can_resolve_model()
+    {
+        TestModelTranslated::create([
+            'title' => [
+                'en' => 'English title',
+                'fr' => 'French title'
+            ]
+        ]);
+
+        $result = (new TestModelTranslated())
+            ->resolveRouteBinding('english-title');
+
+        $this->assertSame('English title', $result ? $result->title : null);
+    }
+
+    public function test_can_resolve_model_with_custom_query()
+    {
+        TestModelTranslated::create([
+            'title' => [
+                'en' => 'English custom query',
+                'fr' => 'French custom query'
+            ],
+            'deleted_at' => now()
+        ]);
+
+        $instance = new class() extends TestModelTranslated {
+            protected function getRouteBindingQuery($query) {
+                return $query->withTrashed();
+            }
+        };
+
+        $result = $instance->resolveRouteBinding('english-custom-query');
+
+        $this->assertSame('English custom query', $result ? $result->title : null);
+    }
 }

tests/TestCase.php

@@ -47,6 +47,7 @@ protected function setUpDatabase()
             $table->json('title')->nullable();
             $table->json('name')->nullable();
             $table->json('slug')->nullable();
+            $table->softDeletes();
         });
 
         $this->app['db']->connection()->getSchemaBuilder()->create('test_model_custom_attributes', function (Blueprint $table) {

tests/TestModelTranslated.php

@@ -3,11 +3,13 @@
 namespace Whitecube\Sluggable\Tests;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Spatie\Translatable\HasTranslations;
 use Whitecube\Sluggable\HasSlug;
 
 class TestModelTranslated extends Model
 {
+    use SoftDeletes;
     use HasSlug;
     use HasTranslations;