From d3b9feac9ca33a1bcf06510e0f4dfdf4a1c05820 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Sat, 4 Aug 2018 12:24:11 +0800
Subject: [PATCH] Fixed file upload controller after "projects" morph map

Projects\FilesController uses Project model full namespace as
morph entry. After we use morphMap for project model,
we need to update to use "projects" instead of full model
namespace on files record entry.
---
 app/Http/Controllers/Projects/FilesController.php | 10 ++++------
 tests/Feature/Projects/UploadFilesTest.php        |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Projects/FilesController.php b/app/Http/Controllers/Projects/FilesController.php
index c0a33d5..9dcd3d1 100644
--- a/app/Http/Controllers/Projects/FilesController.php
+++ b/app/Http/Controllers/Projects/FilesController.php
@@ -43,10 +43,10 @@ class FilesController extends Controller
             'description'   => 'nullable|max:255',
         ]);
 
-        $fileableExist = array_search($request->get('fileable_type'), $this->fileableTypes);
+        $fileableType = array_search($request->get('fileable_type'), $this->fileableTypes);
 
-        if ($fileableExist) {
-            $file = $this->proccessPhotoUpload($request->except('_token'), $request->get('fileable_type'), $fileableId);
+        if ($fileableType) {
+            $file = $this->proccessPhotoUpload($request->except('_token'), $fileableType, $fileableId);
 
             if ($file->exists) {
                 flash('Upload file berhasil.', 'success');
@@ -87,9 +87,7 @@ class FilesController extends Controller
 
         flash(trans('file.updated'), 'success');
 
-        $resourceName = array_search($file->fileable_type, $this->fileableTypes);
-
-        return redirect()->route($resourceName.'.files', $file->fileable_id);
+        return redirect()->route($file->fileable_type.'.files', $file->fileable_id);
     }
 
     private function proccessPhotoUpload($data, $fileableType, $fileableId)
diff --git a/tests/Feature/Projects/UploadFilesTest.php b/tests/Feature/Projects/UploadFilesTest.php
index e945730..232e9f0 100644
--- a/tests/Feature/Projects/UploadFilesTest.php
+++ b/tests/Feature/Projects/UploadFilesTest.php
@@ -29,7 +29,7 @@ class UploadFilesTest extends TestCase
 
         $this->seeInDatabase('files', [
             'fileable_id'   => $project->id,
-            'fileable_type' => 'App\Entities\Projects\Project',
+            'fileable_type' => 'projects',
             'title'         => 'Judul file',
             'description'   => 'Deskripsi file yang diuplod.',
         ]);
@@ -67,7 +67,7 @@ class UploadFilesTest extends TestCase
 
         $this->seeInDatabase('files', [
             'fileable_id'   => $project->id,
-            'fileable_type' => 'App\Entities\Projects\Project',
+            'fileable_type' => 'projects',
             'title'         => 'Edit Judul file',
             'description'   => 'Edit Deskripsi file yang diuplod.',
         ]);