fix custom key routing (#30)

Fix custom key routing support
cybercog · May 26, 2021 · 94c9731 · 94c9731
1 parent 27afa8c
commit 94c9731
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/Traits/OptimusEncodedRouteKey.php b/src/Traits/OptimusEncodedRouteKey.php
@@ -29,13 +29,11 @@ public function resolveRouteBinding($value, $field = null)
             $value = (int) $value;
         }
 
-        if (!is_int($value)) {
-            return null;
+        if (is_int($value) && is_null($field)) {
+            $value = $this->getOptimus()->decode($value);
         }
 
-        $id = $this->getOptimus()->decode($value);
-
-        return $this->where($this->getRouteKeyName(), '=', $id)->first();
+        return $this->where($field ?? $this->getRouteKeyName(), $value)->first();
     }
 
     /**

diff --git a/tests/Traits/OptimusEncodedRouteKeyTest.php b/tests/Traits/OptimusEncodedRouteKeyTest.php
@@ -60,6 +60,15 @@ public function testResolveModelWithEncodedKey(): void
         $this->assertEquals($user->id, $resolvedUser->id);
     }
 
+    public function testResolveModelWithEncodedKeyWithCustomKey(): void
+    {
+        $user = $this->createUserWithDefaultOptimusConnection();
+        $email = $user->email;
+        $resolvedUser = $user->resolveRouteBinding($email, 'email');
+
+        $this->assertEquals($user->id, $resolvedUser->id);
+    }
+
     public function testEncodedKeyIsUsedForRouteModelBinding(): void
     {
         $user = $this->createUserWithDefaultOptimusConnection();