Add support of expiration date

Author: gallib

database/migrations/2019_09_06_231356_add_expires_at_to_urls.php

@@ -0,0 +1,19 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Migrations\Migration;
+
+class AddExpiresAtToUrls extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('shorturl_urls', function ($table) {
+            $table->dateTime('expires_at')->nullable()->after('counter');
+        });
+    }
+}

resources/views/urls/create.blade.php

@@ -33,7 +33,18 @@
                         @endif
                     </div>
                 </div>
-                <div class="col-8 text-right">By <a href="https://github.com/gallib/laravel-short-url" title="by gallib/laravel-short-url" target="_blank">Gallib/laravel-short-url</a></div>
+                <div class="col-4">
+                    <div class="form-group">
+                        <label for="expires_at">Expires at (optional)</label>
+                        <input type="datetime-local" class="form-control {{ $errors->has('expires_at') ? 'is-invalid' : '' }}" id="expires_at" name="expires_at" placeholder="Set your expiration date" value="{{ old('expires_at') }}">
+                        @if ($errors->has('expires_at'))
+                            <small id="code-error" class="form-text text-danger">
+                                {{ $errors->first('expires_at') }}
+                            </small>
+                        @endif
+                    </div>
+                </div>
+                <div class="col-4 text-right">By <a href="https://github.com/gallib/laravel-short-url" title="by gallib/laravel-short-url" target="_blank">Gallib/laravel-short-url</a></div>
             </div>
         </form>
     </div>

resources/views/urls/edit.blade.php

@@ -34,7 +34,18 @@
                         @endif
                     </div>
                 </div>
-                <div class="col-8 text-right">By <a href="https://github.com/gallib/laravel-short-url" title="by gallib/laravel-short-url" target="_blank">Gallib/laravel-short-url</a></div>
+                <div class="col-4">
+                    <div class="form-group">
+                        <label for="expires_at">Expires at (optional)</label>
+                        <input type="datetime-local" class="form-control {{ $errors->has('expires_at') ? 'is-invalid' : '' }}" id="expires_at" name="expires_at" placeholder="Set your expiration date" value="{{ old('expires_at', ($url->couldExpire() ? $url->expires_at->format('Y-m-d\TH:i') : null)) }}">
+                        @if ($errors->has('expires_at'))
+                            <small id="code-error" class="form-text text-danger">
+                                {{ $errors->first('expires_at') }}
+                            </small>
+                        @endif
+                    </div>
+                </div>
+                <div class="col-4 text-right">By <a href="https://github.com/gallib/laravel-short-url" title="by gallib/laravel-short-url" target="_blank">Gallib/laravel-short-url</a></div>
             </div>
         </form>
     </div>

src/Http/Controllers/RedirectController.php

@@ -21,9 +21,13 @@ public function redirect($code)
         });
 
         if ($url !== null) {
+            if ($url->hasExpired()) {
+                abort(410);
+            }
+
             $url->increment('counter');
 
-            return redirect()->away($url->url, 301);
+            return redirect()->away($url->url, $url->couldExpire() ? 302 : 301);
         }
 
         abort(404);

src/Http/Controllers/UrlController.php

@@ -2,6 +2,7 @@
 
 namespace Gallib\ShortUrl\Http\Controllers;
 
+use Carbon\Carbon;
 use Gallib\ShortUrl\Url;
 use Illuminate\Routing\Controller;
 use Gallib\ShortUrl\Http\Requests\UrlRequest;
@@ -40,10 +41,16 @@ public function create()
      */
     public function store(UrlRequest $request)
     {
-        $url = Url::create([
+        $data = [
             'url'  => $request->get('url'),
             'code' => $request->get('code') ? \Str::slug($request->get('code')) : \Hasher::generate(),
-        ]);
+        ];
+
+        if ($request->filled('expires_at')) {
+            $data['expires_at'] = Carbon::parse($request->get('expires_at'))->toDateTimeString();
+        }
+
+        $url = Url::create($data);
 
         return new UrlResponse($url);
     }
@@ -74,7 +81,16 @@ public function update(UrlRequest $request, $id)
 
         \Cache::forget("url.{$url['code']}");
 
-        $url->update($request->all());
+        $data = [
+            'url'  => $request->get('url'),
+            'code' => $request->get('code'),
+        ];
+
+        if ($request->filled('expires_at')) {
+            $data['expires_at'] = Carbon::parse($request->get('expires_at'))->toDateTimeString();
+        }
+
+        $url->update($data);
 
         return new UrlResponse($url);
     }

src/Http/Requests/UrlRequest.php

@@ -33,6 +33,7 @@ public function rules()
         return [
             'url'  => ['required', 'url', new Blacklist()],
             'code' => 'max:255'.$uniqueCode,
+            'expires_at' => 'date|after:now|nullable',
         ];
     }
 

src/Http/Responses/UrlResponse.php

@@ -43,6 +43,7 @@ public function toResponse($request)
                 'url'         => $this->url->url,
                 'short_url'   => $shortUrl,
                 'counter'     => $this->url->counter,
+                'expires_at'  => $this->url->expires_at,
             ], 201);
         }
 

src/Url.php

@@ -2,6 +2,7 @@
 
 namespace Gallib\ShortUrl;
 
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 
 class Url extends Model
@@ -21,6 +22,16 @@ class Url extends Model
     protected $fillable = [
         'url',
         'code',
+        'expires_at',
+    ];
+
+    /**
+     * The attributes that should be mutated to dates.
+     *
+     * @var array
+     */
+    protected $dates = [
+        'expires_at',
     ];
 
     /**
@@ -40,4 +51,25 @@ protected static function boot()
             app()->make('url-parser')->setUrlInfos($url);
         });
     }
+
+    public function couldExpire(): bool
+    {
+        return $this->expires_at !== null;
+    }
+
+    /**
+     * Return whether an url has expired
+     *
+     * @return boolean
+     */
+    public function hasExpired(): bool
+    {
+        if (!$this->couldExpire()) {
+            return false;
+        }
+
+        $expiresAt = new Carbon($this->expires_at);
+
+        return !$expiresAt->isFuture();
+    }
 }