Merge pull request #138 from bvipul/develop

Blog and Faq Tests

Author: viralsolani

app/Models/Blogs/Traits/Relationship/BlogRelationship.php

@@ -30,8 +30,8 @@ public function tags()
     /**
      * Blogs belongsTo with User.
      */
-    public function createdBy()
+    public function owner()
     {
-        return $this->belongsTo(User::class, 'created_by', 'id');
+        return $this->belongsTo(User::class, 'created_by');
     }
 }

app/Repositories/Backend/Blogs/BlogsRepository.php

@@ -2,19 +2,20 @@
 
 namespace App\Repositories\Backend\Blogs;
 
-use App\Events\Backend\Blogs\BlogCreated;
+use DB;
+use Carbon\Carbon;
+use App\Models\Blogs\Blog;
+use App\Models\BlogTags\BlogTag;
+use App\Http\Utilities\FileUploads;
+use App\Exceptions\GeneralException;
+use App\Repositories\BaseRepository;
+use App\Models\BlogMapTags\BlogMapTag;
+use Illuminate\Support\Facades\Storage;
 use App\Events\Backend\Blogs\BlogDeleted;
 use App\Events\Backend\Blogs\BlogUpdated;
-use App\Exceptions\GeneralException;
-use App\Http\Utilities\FileUploads;
+use App\Events\Backend\Blogs\BlogCreated;
 use App\Models\BlogCategories\BlogCategory;
 use App\Models\BlogMapCategories\BlogMapCategory;
-use App\Models\BlogMapTags\BlogMapTag;
-use App\Models\Blogs\Blog;
-use App\Models\BlogTags\BlogTag;
-use App\Repositories\BaseRepository;
-use Carbon\Carbon;
-use DB;
 
 /**
  * Class BlogsRepository.
@@ -26,6 +27,21 @@ class BlogsRepository extends BaseRepository
      */
     const MODEL = Blog::class;
 
+    protected $upload_path;
+
+    /**
+     * Storage Class Object.
+     *
+     * @var \Illuminate\Support\Facades\Storage
+     */
+    protected $storage;
+
+    public function __construct()
+    {
+        $this->upload_path = 'img' . DIRECTORY_SEPARATOR . 'blog' . DIRECTORY_SEPARATOR;
+        $this->storage = Storage::disk('public');
+    }
+
     /**
      * @return mixed
      */
@@ -210,13 +226,12 @@ public function delete(Blog $blog)
      */
     public function uploadImage($input)
     {
-        $uploadManager = new FileUploads();
         $avatar = $input['featured_image'];
 
         if (isset($input['featured_image']) && !empty($input['featured_image'])) {
-            $fileName = $uploadManager->setBasePath('backend/blog_images')
-                ->setThumbnailFlag(false)
-                ->upload($input['featured_image']);
+            $fileName = time() . $avatar->getClientOriginalName();
+
+            $this->storage->put($this->upload_path . $fileName, file_get_contents($avatar->getRealPath()));
 
             $input = array_merge($input, ['featured_image' => $fileName]);
 
@@ -231,11 +246,8 @@ public function uploadImage($input)
      */
     public function deleteOldFile($model)
     {
-        $uploadManager = new FileUploads();
         $fileName = $model->featured_image;
-        $filePath = $uploadManager->setBasePath('backend/blog_images');
-        $file = $filePath->filePath.DIRECTORY_SEPARATOR.$fileName;
-
-        return $uploadManager->deleteFile($file);
+        
+        return $this->storage->delete($this->upload_path . $fileName);
     }
 }