#60 - add getuser helper (#65)

blumilksoftware · Jul 1, 2024 · 8b6373c · 8b6373c
1 parent 18d2381
commit 8b6373c
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 21 deletions.
diff --git a/config/blt.php b/config/blt.php
@@ -5,6 +5,8 @@
 return [
     "namespaces" => [
         "default" => "App\\",
-        "types" => [],
+        "types" => [
+            "User" => "App\Models\User",
+        ],
     ],
 ];
diff --git a/src/Features/Traits/Authentication.php b/src/Features/Traits/Authentication.php
@@ -5,6 +5,7 @@
 namespace Blumilk\BLT\Features\Traits;
 
 use Behat\Gherkin\Node\TableNode;
+use Blumilk\BLT\Helpers\UserHelper;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use PHPUnit\Framework\Assert;
@@ -21,7 +22,8 @@ trait Authentication
     public function userIsAuthenticatedInSessionAs(string $value, string $field): void
     {
         $auth = $this->getContainer()->make(Guard::class);
-        $auth->login($this->getUserModel()::query()->where($field, $value)->first());
+        $user = UserHelper::getBy($field, $value);
+        $auth->login($user);
     }
 
     /**

diff --git a/src/Helpers/RecognizeClassHelper.php b/src/Helpers/RecognizeClassHelper.php
@@ -14,22 +14,27 @@ public static function recognizeObjectClass(string $objectName): string
             return $objectName;
         }
 
-        $objectName = Str::ucfirst(Str::singular($objectName));
+        $typeNamespaces = config("blt.namespaces.types");
+        $objectName = Str::lcfirst($objectName);
 
-        return self::getObjectNamespace($objectName) . $objectName;
-    }
+        if (array_key_exists($objectName, $typeNamespaces)) {
+            return $typeNamespaces[$objectName];
+        }
 
-    public static function getObjectNamespace(string $objectName): string
-    {
         $type = self::guessType($objectName);
-        $typeNamespace = self::getNamespaceFromConfig($objectName, $type);
+        $objectName = Str::ucfirst($objectName);
 
-        if ($typeNamespace) {
-            return $typeNamespace;
+        if (array_key_exists($type, $typeNamespaces)) {
+            return $typeNamespaces[$type] . $objectName;
         }
 
+        return self::getObjectNamespace(Str::singular($objectName), $type) . $objectName;
+    }
+
+    public static function getObjectNamespace(string $objectName, string $type): string
+    {
         $type = Str::plural(Str::ucfirst($type));
-        $defaultNamespace = config("blt.namespaces.default", "App\\");
+        $defaultNamespace = config("blt.namespaces.default") ?? "App\\";
 
         return $defaultNamespace . $type . "\\";
     }
@@ -39,18 +44,13 @@ public static function guessType(string $objectName): string
         $slug = Str::slug($objectName);
 
         foreach (TypesEnum::cases() as $objectType) {
-            if (Str::contains($slug, $objectType->value)) {
-                return Str::singular($objectType->value);
+            $objectTypeName = $objectType->value;
+
+            if (Str::contains($slug, $objectTypeName)) {
+                return Str::singular($objectTypeName);
             }
         }
 
-        return "model";
-    }
-
-    protected static function getNamespaceFromConfig(string $objectName, string $type): ?string
-    {
-        $typeNamespaces = config("blt.namespaces.types");
-
-        return $typeNamespaces[$objectName] ?? $typeNamespaces[$type] ?? null;
+        return TypesEnum::Model->value;
     }
 }
diff --git a/src/Helpers/UserHelper.php b/src/Helpers/UserHelper.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Blumilk\BLT\Helpers;
+
+class UserHelper
+{
+    public static function getBy(string $field, string $value): ?object
+    {
+        $userClass = RecognizeClassHelper::recognizeObjectClass("User");
+
+        return $userClass::query()->where($field, $value)->first();
+    }
+
+    public static function getByEmail(string $value): ?object
+    {
+        $userClass = RecognizeClassHelper::recognizeObjectClass("User");
+
+        return $userClass::query()->where("email", $value)->first();
+    }
+}