frontend function consolidation part 2

app/Http/Controllers/FileManager/ShareController.php

@@ -23,15 +23,14 @@ class ShareController extends Controller
     /**
      * Get shared record
      *
+     * @param Share $shared
      * @return ShareResource
      */
-    public function show($token)
+    public function show(Share $shared)
     {
-        // Get record
-        $shared = Share::whereToken($token)
-            ->firstOrFail();
-
-        return new ShareResource($shared);
+        return new ShareResource(
+            $shared
+        );
     }
 
     /**
@@ -98,9 +97,8 @@ class ShareController extends Controller
     /**
      * Delete sharing item
      *
-     * @param $token
+     * @param Request $request
      * @return ResponseFactory|\Illuminate\Http\Response
-     * @throws \Exception
      */
     public function destroy(Request $request)
     {
@@ -122,7 +120,6 @@ class ShareController extends Controller
             }
         }
 
-        // Done
         return response('Done!', 204);
     }
 

app/Http/Requests/FileFunctions/MoveItemRequest.php

@@ -25,7 +25,7 @@ class MoveItemRequest extends FormRequest
     public function rules()
     {
         return [
-            'to_id'         => 'required|uuid',
+            'to_id'         => 'nullable|uuid',
             'items[*].type' => 'required|string',
             'items[*].id'   => 'required|uuid',
         ];

app/Http/helpers.php

@@ -218,7 +218,9 @@ function is_demo($user_id)
  */
 function get_item($type, $id)
 {
-    return ('App\\Models\\' . ucfirst($type))::find($id);
+    $model = strtolower($type) === 'folder' ? 'Folder' : 'File';
+
+    return ("App\\Models\\$model")::find($id);
 }
 
 /**
@@ -756,6 +758,7 @@ function get_files_for_zip($folders, $files, $path = [])
         $files->push([
             'name'        => $file->name,
             'basename'    => $file->basename,
+            'mimetype'    => $file->mimetype,
             'folder_path' => implode('/', $path),
         ]);
     });