Merge 8870dfd into e08e2be

realodix · Oct 18, 2023 · d0cd027 · d0cd027
2 parents e08e2be + 8870dfd
commit d0cd027
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 127 deletions.
diff --git a/app/Http/Controllers/Dashboard/DashboardController.php b/app/Http/Controllers/Dashboard/DashboardController.php
@@ -7,7 +7,6 @@
 use App\Models\Url;
 use App\Models\User;
 use App\Services\KeyGeneratorService;
-use App\Services\UrlService;
 
 class DashboardController extends Controller
 {
@@ -51,7 +50,10 @@ public function edit(string $urlKey)
      */
     public function update(StoreUrl $request, Url $hash_id)
     {
-        app(UrlService::class)->update($request, $hash_id);
+        $hash_id->update([
+            'destination' => $request->long_url,
+            'title'       => $request->title,
+        ]);
 
         return to_route('dashboard')
             ->withFlashSuccess(__('Link changed successfully !'));

diff --git a/app/Http/Controllers/UrlController.php b/app/Http/Controllers/UrlController.php
@@ -4,9 +4,9 @@
 
 use App\Http\Requests\StoreUrl;
 use App\Models\Url;
+use App\Models\User;
 use App\Models\Visit;
 use App\Services\QrCodeService;
-use App\Services\UrlService;
 
 class UrlController extends Controller
 {
@@ -26,7 +26,14 @@ public function __construct()
      */
     public function create(StoreUrl $request)
     {
-        $url = app(UrlService::class)->create($request);
+        $url = Url::create([
+            'user_id'     => auth()->id(),
+            'destination' => $request->long_url,
+            'title'       => app(Url::class)->getWebTitle($request->long_url),
+            'keyword'     => app(Url::class)->getKeyword($request),
+            'is_custom'   => $request->custom_key ? true : false,
+            'user_sign'   => app(User::class)->signature(),
+        ]);
 
         return to_route('su_detail', $url->keyword);
     }

diff --git a/app/Models/Url.php b/app/Models/Url.php
@@ -2,6 +2,8 @@
 
 namespace App\Models;
 
+use App\Http\Requests\StoreUrl;
+use App\Services\KeyGeneratorService;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -123,6 +125,32 @@ protected function uniqueClicks(): Attribute
     |--------------------------------------------------------------------------
     */
 
+    public function getKeyword(StoreUrl $request): string
+    {
+        $keyGen = app(KeyGeneratorService::class);
+
+        return $request->custom_key ?? $keyGen->generate($request->long_url);
+    }
+
+    public function getWebTitle(string $webAddress): string
+    {
+        $spatieUrl = \Spatie\Url\Url::fromString($webAddress);
+        $defaultTitle = $spatieUrl->getHost().' - Untitled';
+
+        if (config('urlhub.web_title')) {
+            try {
+                $title = app(\Embed\Embed::class)->get($webAddress)->title ?? $defaultTitle;
+            } catch (\Exception) {
+                // If failed or not found, then return "{domain_name} - Untitled"
+                $title = $defaultTitle;
+            }
+
+            return $title;
+        }
+
+        return 'No Title';
+    }
+
     /**
      * The number of shortened URLs that have been created by each User
      *

diff --git a/app/Services/UrlService.php b/app/Services/UrlService.php
diff --git a/tests/Unit/Models/UrlTest.php b/tests/Unit/Models/UrlTest.php
@@ -182,6 +182,36 @@ public function getUniqueClicksAttribute(): void
     |--------------------------------------------------------------------------
     */
 
+    /**
+     * @test
+     * @group u-model
+     */
+    public function getWebTitle(): void
+    {
+        $expected = 'example123456789.com - Untitled';
+        $actual = $this->url->getWebTitle('https://example123456789.com');
+        $this->assertSame($expected, $actual);
+
+        $expected = 'www.example123456789.com - Untitled';
+        $actual = $this->url->getWebTitle('https://www.example123456789.com');
+        $this->assertSame($expected, $actual);
+    }
+
+    /**
+     * When config('urlhub.web_title') set `false`, title() should return
+     * 'No Title' if the title is empty
+     *
+     * @test
+     */
+    public function getWebTitle_ShouldReturnNoTitle(): void
+    {
+        config(['urlhub.web_title' => false]);
+
+        $expected = 'No Title';
+        $actual = $this->url->getWebTitle('https://example123456789.com');
+        $this->assertSame($expected, $actual);
+    }
+
     /**
      * The number of shortened URLs that have been created by each User
      *

diff --git a/tests/Unit/Services/UrlServiceTest.php b/tests/Unit/Services/UrlServiceTest.php