wip

Author: Jovert Lota Palonpon

Diff for: app/Contracts/Uploader.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Contracts;
+
+interface Uploader
+{
+    /**
+     * Get the directory.
+     *
+     * @return string
+     */
+    public function getDirectory() : string;
+}

Diff for: app/Http/Controllers/Api/V1/UsersController.php

@@ -127,6 +127,19 @@ public function restore(Request $request, $id)
         return response()->json($this->paginatedQuery($request));
     }
 
+    /**
+     * Store the user's avatar.
+     *
+     * @param Illuminate\Http\Request $request
+     * @param App\User $user
+     *
+     * @return Illuminate\Http\JsonResponse
+     */
+    public function storeAvatar(Request $request, User $user) : JsonResponse
+    {
+        return response()->json();
+    }
+
     /**
      * Get the paginated resource query.
      *

Diff for: app/Traits/UploadsFiles.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Traits;
+
+use Uploader;
+use Illuminate\Http\UploadedFile;
+
+trait UploadsFiles
+{
+    /**
+     * Handle the upload for the uploader, and update it's attributes.
+     *
+     * @param Illuminate\Http\UploadedFile
+     *
+     * @return bool
+     */
+    public function upload(UploadedFile $file)
+    {
+        $upload = Uploader::upload($this->getDirectory(), $file);
+
+        foreach ($upload as $attribute => $value) {
+            $this->attributes[$attribute] = $value;
+        }
+
+        return $this->update();
+    }
+}

Diff for: app/User.php

@@ -3,15 +3,17 @@
 namespace App;
 
 use App\Traits\HasJWT;
+use App\Contracts\Uploader;
+use App\Traits\UploadsFiles;
 use Tymon\JWTAuth\Contracts\JWTSubject;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 
-class User extends Authenticatable implements JWTSubject
+class User extends Authenticatable implements JWTSubject, Uploader
 {
-    use Notifiable, SoftDeletes, HasJWT;
+    use Notifiable, SoftDeletes, HasJWT, UploadsFiles;
 
     /**
      * The attributes that are mass assignable.
@@ -28,4 +30,14 @@ class User extends Authenticatable implements JWTSubject
     protected $hidden = [
         'password', 'remember_token',
     ];
+
+    /**
+     * Get the directory for uploads.
+     *
+     * @return string
+     */
+    public function getDirectory() : string
+    {
+        return 'users/'.$this->getKey();
+    }
 }

Diff for: app/Utils/Facades/Uploader.php

@@ -9,30 +9,6 @@
 
 class Uploader
 {
-    /**
-     * @var string The storage driver.
-     */
-    protected $disk;
-
-    public function __construct()
-    {
-        $this->disk = config('filesystems.default');
-    }
-
-    /**
-     * Specify which storage driver will be used.
-     *
-     * @param string $name
-     *
-     * @return App\Utils\Uploader
-     */
-    public function disk(string $name = 'public')
-    {
-        $this->disk = $name;
-
-        return $this;
-    }
-
     /**
      * Put the file into the storage.
      *
@@ -41,38 +17,40 @@ public function disk(string $name = 'public')
      *
      * @return array
      */
-    public function put(string $directory, UploadedFile $file)
+    public static function upload(string $directory, UploadedFile $file)
     {
+        $disk = config('filesystems.default');
         $filename = str_random(64).'.'.$file->getClientOriginalExtension();
         $original_filename = $file->getClientOriginalName();
 
-        $path = Storage::disk($this->disk)->putFileAs(
-            $directory,
-            $file,
-            $filename
-        );
+        // Upload the file
+        $path = Storage::putFileAs($directory, $file, $filename);
+        $url = Storage::url($path);
+        $thumbnail_url = null;
 
+        // Do image manipulations
         if (Str::startsWith($file->getClientMimeType(), 'image')) {
             $thumbnailDirectory = "{$directory}/thumbnails";
+            $thumbnailPath = "{$thumbnailDirectory}/{$filename}";
 
             if (! Storage::exists($thumbnailDirectory)) {
                 Storage::makeDirectory($thumbnailDirectory);
             }
 
-            $fileSystemRoot = config("filesystems.disks.{$this->disk}.root");
+            $fileSystemRoot = config("filesystems.disks.{$disk}.root");
             $fullPath = "{$fileSystemRoot}/{$path}";
-            $thumbnailPath =
+            $fullThumbnailPath =
                 "{$fileSystemRoot}/{$thumbnailDirectory}/{$filename}";
 
             Image::make($fullPath)
                 ->fit(240)
-                ->save($thumbnailPath, 95);
-        }
+                ->save($fullThumbnailPath, 95);
 
-        $path = Storage::url($path);
+            $thumbnail_url = Storage::url($thumbnailPath);
+        }
 
         return compact([
-            'directory', 'filename', 'original_filename', 'path'
+            'directory', 'filename', 'original_filename', 'url', 'thumbnail_url'
         ]);
     }
 }

Diff for: app/Utils/Uploader.php

@@ -199,7 +199,6 @@
 
     'aliases' => [
         'Image' => Intervention\Image\Facades\Image::class,
-        'Uploader' => App\Utils\Facades\Uploader::class,
 
         'App' => Illuminate\Support\Facades\App::class,
         'Artisan' => Illuminate\Support\Facades\Artisan::class,

Diff for: config/app.php

@@ -31,7 +31,14 @@
 
         Route::middleware('auth:api')->group(function () {
             Route::resource('users', 'UsersController', ['except' => ['edit', 'create']]);
-            Route::patch('users/{user}/restore', 'UsersController@restore')->name('users.restore');
+            Route::prefix('users')->name('users.')->group(function () {
+                Route::patch('{user}/restore', 'UsersController@restore')->name('restore');
+
+                Route::prefix('{user}/avatar')->name('avatar.')->group(function () {
+                    Route::post('/', 'UsersController@storeAvatar')->name('store');
+                    Route::delete('/', 'UsersController@destroyAvatar')->name('destroy');
+                });
+            });
         });
     });
 });

Diff for: routes/api.php

@@ -109,4 +109,17 @@ public function a_user_can_restore_a_user()
                 'total' => $incremented
             ]);
     }
+
+    /** @test */
+    public function a_user_can_store_a_user_avatar()
+    {
+        $user = User::first();
+
+        $payload = array_merge($this->getDefaultPayload(), [
+            'user' => $user
+        ]);
+
+        $this->post(route('api.v1.users.avatar.store', $payload))
+            ->assertStatus(200);
+    }
 }