Merge pull request #241 from bowphp/5.x-refactoring-for-perf

[5.x] Fixes for model Relationship performance

Author: papac

src/Auth/Authentication.php

@@ -17,4 +17,14 @@ public function getAuthenticateUserId()
     {
         return $this->attributes[$this->primary_key];
     }
+
+    /**
+     * Define the additionals values
+     *
+     * @return array
+     */
+    public function customJwtAttributes(): array
+    {
+        return [];
+    }
 }

src/Auth/Guards/GuardContract.php

@@ -8,7 +8,7 @@
 use Bow\Auth\Authentication;
 
 /**
- * @method ?string getToken()
+ * @method ?\Policier\Token getToken()
  */
 abstract class GuardContract
 {

src/Auth/Guards/JwtGuard.php

@@ -147,11 +147,13 @@ public function getToken(): ?Token
      */
     public function login(Authentication $user): bool
     {
-        $this->token = $this->getPolicier()->encode($user->getAuthenticateUserId(), [
+        $attributes = array_merge($user->customJwtAttributes(), [
             "id" => $user->getAuthenticateUserId(),
             "logged" => true
         ]);
 
+        $this->token = $this->getPolicier()->encode($user->getAuthenticateUserId(), $attributes);
+
         return true;
     }
 

src/Auth/Guards/SessionGuard.php

@@ -78,7 +78,9 @@ private function getSession(): Session
         $session = Session::getInstance();
 
         if (is_null($session)) {
-            throw new AuthenticationException("Please the session configuration is not load");
+            throw new AuthenticationException(
+                "Please the session configuration is not load"
+            );
         }
 
         return $session;

src/Database/Barry/Concerns/Relationship.php

@@ -104,14 +104,14 @@ public function hasMany(
      * The has one relative
      *
      * @param string $related
-     * @param string $primary_key
      * @param string $foreign_key
+     * @param string $primary_key
      * @return HasOne
      */
     public function hasOne(
         string $related,
-        ?string $primary_key = null,
-        ?string $foreign_key = null
+        ?string $foreign_key = null,
+        ?string $primary_key = null
     ): HasOne {
         $related_model = app()->make($related);
 
@@ -124,6 +124,6 @@ public function hasOne(
             $foreign_key = rtrim($related_model->getTable(), 's') . '_id';
         }
 
-        return new HasOne($related_model, $this, $primary_key, $foreign_key);
+        return new HasOne($related_model, $this, $foreign_key, $primary_key);
     }
 }

src/Database/Barry/Relations/BelongsTo.php

@@ -51,7 +51,7 @@ public function __construct(
      */
     public function getResults(): ?Model
     {
-        $key = $this->query->getTable() . "_" . $this->local_key;
+        $key = $this->query->getTable() . ":belongsto:" . $this->related->getTable() . ":" . $this->foreign_key;
         $cache = Cache::cache('file')->get($key);
 
         if (!is_null($cache)) {

src/Database/Barry/Relations/HasOne.php

@@ -49,7 +49,7 @@ public function __construct(Model $related, Model $parent, string $foreign_key,
      */
     public function getResults(): ?Model
     {
-        $key = $this->query->getTable() . "_" . $this->local_key;
+        $key = $this->query->getTable() . ":hasone:" . $this->related->getTable() . ":" . $this->foreign_key;
         $cache = Cache::cache('file')->get($key);
 
         if (!is_null($cache)) {

tests/Auth/AuthenticationTest.php

@@ -44,6 +44,7 @@ public function test_it_should_be_a_default_guard()
     {
         $config = TestingConfiguration::getConfig();
         $auth = Auth::getInstance();
+
         $this->assertEquals($auth->getName(), $config["auth"]["default"]);
         $this->assertEquals($auth->getName(), "web");
     }

tests/Config/stubs/policier.php

@@ -46,7 +46,7 @@
     /**
      * Hashing algorithm being used
      *
-     * HS256, HS384, HS512, RS256, RS384, RS512, ES256, ES384, ES512,
+     * HS256, HS384, HS512, ES256, ES384, ES512,
      */
-    "alg" => "HS256",
+    "alg" => "HS512",
 ];