From 1e3a90552ec8b54d2dc7014d58503fac7af3f6fa Mon Sep 17 00:00:00 2001 From: tejitak Date: Fri, 18 Jan 2019 10:35:00 +0700 Subject: [PATCH 1/3] use original_file_name for file model scheme --- app/Services/Production/FileService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Services/Production/FileService.php b/app/Services/Production/FileService.php index 786de32..3e9fe9b 100644 --- a/app/Services/Production/FileService.php +++ b/app/Services/Production/FileService.php @@ -96,7 +96,7 @@ public function upload($categoryType, $path, $mediaType, $metaInputs) 'media_type' => $mediaType, 'format' => $mediaType, 'file_size' => 0, - 'original_filename' => array_get($metaInputs, 'originalFileName', ''), + 'original_file_name' => array_get($metaInputs, 'originalFileName', ''), 'width' => 0, 'height' => 0, 'is_enabled' => true, @@ -193,7 +193,7 @@ public function createFromUrl($categoryType, $url, $mediaType, $metaInputs) 'media_type' => $mediaType, 'format' => $mediaType, 'file_size' => 0, - 'original_filename' => array_get($metaInputs, 'originalFileName', ''), + 'original_file_name' => array_get($metaInputs, 'originalFileName', ''), 'width' => 0, 'height' => 0, 'is_enabled' => true, From 2e613470912065ffe8a3b12fb39109aa8e66a8e8 Mon Sep 17 00:00:00 2001 From: tejitak Date: Fri, 18 Jan 2019 10:35:46 +0700 Subject: [PATCH 2/3] fix a parameter name for fileUploadService->delete --- app/Services/Production/FileService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/Production/FileService.php b/app/Services/Production/FileService.php index 3e9fe9b..81754c7 100644 --- a/app/Services/Production/FileService.php +++ b/app/Services/Production/FileService.php @@ -162,7 +162,7 @@ public function delete($model) $fileUploadService = array_get($this->fileUploadServices, $storageType); if (!empty($fileUploadService)) { $fileUploadService->delete([ - 's3_key' => $key, + 'key' => $key, ]); } From 8bd9c0282b4e5ff73359c06760e98197298bbfd6 Mon Sep 17 00:00:00 2001 From: tejitak Date: Fri, 18 Jan 2019 10:36:25 +0700 Subject: [PATCH 3/3] fix unlink argument --- app/Services/Production/FileService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/Production/FileService.php b/app/Services/Production/FileService.php index 81754c7..e56015f 100644 --- a/app/Services/Production/FileService.php +++ b/app/Services/Production/FileService.php @@ -46,7 +46,7 @@ public function uploadFromText($categoryType, $text, $mediaType, $metaInputs) $file = $this->upload($categoryType, $tempFile, $mediaType, $metaInputs); - unlink($handle); + unlink($tempFile); return $file; }