new correction

This commit is contained in:
Fateme
2020-07-04 23:26:44 +04:30
parent a74e49af6f
commit 1f1be72d74
21 changed files with 161 additions and 107 deletions
+48 -21
View File
@@ -9,27 +9,42 @@ use App\Media;
class UploadController extends Controller
{
public function uploadImage(Request $request)
public function uploadFile(Request $request)
{
$FileType = 'image';
$rules = [
'image' => 'required|image|mimes:jpeg,png,jpg|max:2048',
"file" => "required|mimes:pdf,jpeg,png,jpg,doc,docx|max:2048"
];
$this->validate($request, $rules);
if(substr( $request->file('file')->getMimeType(), 0, 12 ) == 'application/'){
$FileType = 'document';
}
if ($request->model_id !== null && is_numeric($request->model_id)) {
$Model = 'App\\'.$request->model_type;
$Object = $Model::findOrFail($request->model_id);
if ($Object) {
$Image = $request->file('image');
$Manager = new ImageManager(array('driver' => 'imagick'));
$InterventionImage = $Manager->make($Image);
$Mime = explode('/', $InterventionImage->mime());
if($FileType == 'image'){
$Image = $request->file('file');
$Manager = new ImageManager(array('driver' => 'imagick'));
$InterventionImage = $Manager->make($Image);
$Mime = explode('/', $InterventionImage->mime());
$ImageName = time().'.'.$Mime[1];
$Path = 'media'.'/TestResults'.'/'.$Object->id .'/'.$ImageName;
$FileName = time().'.'.$Mime[1];
$Path = 'media'.'/TestResults'.'/'.$Object->id .'/'.$FileName;
Storage::disk('public')->makeDirectory('TestResults'.'/'.$Object->id);
$InterventionImage->save(public_path($Path));
Storage::disk('public')->makeDirectory('TestResults'.'/'.$Object->id);
$InterventionImage->save(public_path($Path));
}
else if($FileType == 'document'){
$UploadedFile = $request->file('file');
$FileName = time().'_'.$request->file('file')->getClientOriginalName();
$Path = 'media'.'/TestResults'.'/'.$Object->id;
Storage::disk('public')->makeDirectory('TestResults'.'/'.$Object->id);
$UploadedFile->move($Path, $FileName);
$Path = $Path . '/' . $FileName;
}
$MediaData = [
'model_id' => $Object->id,
@@ -37,22 +52,33 @@ class UploadController extends Controller
'model_type' => 'App\\'.$request->model_type,
'path' => $Path,
'user_id' => auth('api')->user()->id,
'file_name' => $ImageName
'file_name' => $FileName,
'file_type' => $FileType
];
$Media = Media::create($MediaData);
}
}
else {
$Image = $request->file('image');
$Manager = new ImageManager(array('driver' => 'imagick'));
$InterventionImage = $Manager->make($Image);
$Mime = explode('/', $InterventionImage->mime());
if($FileType == 'image'){
$Image = $request->file('file');
$Manager = new ImageManager(array('driver' => 'imagick'));
$InterventionImage = $Manager->make($Image);
$Mime = explode('/', $InterventionImage->mime());
$ImageName = time().'.'.$Mime[1];
$Path = 'media'.'/Temp'.'/'.$request->batch_id .'/'.$ImageName;
$FileName = time().'.'.$Mime[1];
$Path = 'media'.'/Temp'.'/'.$request->batch_id .'/'.$FileName;
Storage::disk('public')->makeDirectory('Temp'.'/'.$request->batch_id);
$InterventionImage->save(public_path($Path));
Storage::disk('public')->makeDirectory('Temp'.'/'.$request->batch_id);
$InterventionImage->save(public_path($Path));
}
else if($FileType == 'document'){
$UploadedFile = $request->file('file');
$FileName = time().'_'.$request->file('file')->getClientOriginalName();
$Path = 'media'.'/Temp'.'/'.$request->batch_id;
Storage::disk('public')->makeDirectory('Temp'.'/'.$request->batch_id);
$UploadedFile->move($Path, $FileName);
$Path = $Path . '/' . $FileName;
}
$MediaData = [
'model_id' => null,
@@ -60,14 +86,15 @@ class UploadController extends Controller
'model_type' => 'App\\'.$request->model_type,
'path' => $Path,
'user_id' => auth('api')->user()->id,
'file_name' => $ImageName
'file_name' => $FileName,
'file_type' => $FileType
];
$Media = Media::create($MediaData);
}
return \MessageResponse::success(trans('messages.success_message'), null, $Media);
}
public function deleteImage(Request $request)
public function deleteFile(Request $request)
{
if ($request->model_id != null && is_numeric($request->model_id)) {
$Media = Media::findOrFail($request->media_id);