From 61ea6071e180688a3d6925b55ad47308e8df487c Mon Sep 17 00:00:00 2001 From: mahdi purHosseini Date: Sat, 9 Dec 2023 20:32:53 +0330 Subject: [PATCH] fix media --- app/Http/Controllers/ItemController.php | 2 -- app/Http/Requests/StoreItemRequest.php | 2 +- app/Http/Resources/ItemResource.php | 1 - app/Http/Resources/TestResultResource.php | 1 - app/Item.php | 22 ++++++++++++++-------- app/Services/Media/MediaHelper.php | 6 +++--- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index b14b16b7..84f12748 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -144,7 +144,6 @@ class ItemController extends Controller $Item = Item::create( [ 'name' => $request->name , 'size' => $request->size , - 'unique_id' => $request->unique_id , 'specific' => $request->specific , 'note' => $request->note , 'udi' => $request->udi , @@ -167,7 +166,6 @@ class ItemController extends Controller $Item->update( [ 'name' => $request->name , 'size' => $request->size , - 'unique_id' => $request->unique_id , 'specific' => $request->specific , 'note' => $request->note , 'udi' => $request->udi diff --git a/app/Http/Requests/StoreItemRequest.php b/app/Http/Requests/StoreItemRequest.php index 0d5ac368..39d67e60 100644 --- a/app/Http/Requests/StoreItemRequest.php +++ b/app/Http/Requests/StoreItemRequest.php @@ -27,7 +27,7 @@ class StoreItemRequest extends FormRequest 'size' => 'required', 'specific' => 'required', 'note' => 'nullable', - 'udi' => 'required|max:100|unique:items', +// 'udi' => 'required|max:100|unique:items', ]; break; } diff --git a/app/Http/Resources/ItemResource.php b/app/Http/Resources/ItemResource.php index 682e1d60..f8ea510a 100644 --- a/app/Http/Resources/ItemResource.php +++ b/app/Http/Resources/ItemResource.php @@ -32,7 +32,6 @@ class ItemResource extends JsonResource 'package' => PackageResource::make($this->whenLoaded('package')), 'transfers' => TransferResource::collection($this->whenLoaded('transfers')), 'files' => MediaResource::collection($this->media), - 'thumbnail' => $this->getFirstMediaUrl('main_images', 'thumbnail'), 'created_at' => $this->created_at, 'updated_at' => $this->updated_at ]; diff --git a/app/Http/Resources/TestResultResource.php b/app/Http/Resources/TestResultResource.php index 1dc5acfa..1757d91f 100644 --- a/app/Http/Resources/TestResultResource.php +++ b/app/Http/Resources/TestResultResource.php @@ -34,7 +34,6 @@ class TestResultResource extends JsonResource 'input_values' => $this->when( $this->input_values , $this->input_values ) , 'user' => UserResource::make( $this->whenLoaded( 'user' ) ) , 'files' => MediaResource::collection( $this->media ) , - 'thumbnail' => $this->getFirstMediaUrl( 'main_images' , 'thumbnail' ) , 'created_at' => $this->created_at , 'updated_at' => $this->updated_at ]; diff --git a/app/Item.php b/app/Item.php index f4068ea4..569040fa 100644 --- a/app/Item.php +++ b/app/Item.php @@ -38,19 +38,25 @@ class Item extends Model implements HasMedia return $this->morphMany( 'App\Transfer' , "transferable" )->where( "status" , "approved" )->whereNull( "to_date" ); } - public function registerMediaCollections() + public function registerMediaCollections(): void { - $this->addMediaCollection( 'main_images' ) - ->useFallbackUrl( '/images/default_pastry.jpg' ) - ->useFallbackPath( public_path( '/images/default_pastry.jpg' ) ); + $this->addMediaCollection( 'main_image' ) + ->useFallbackUrl( config( 'media-library.wm-cdn' ) . '/images/placeholder/blog-placeholder.jpg' ) + ->useFallbackPath( public_path( '/images/placeholder/blog-placeholder.jpg' ) ) + ->singleFile(); } - public function registerMediaConversions( Media $media = null ): void + public function registerMediaConversions( Media $media = null ) { + $crop = $media->getCustomProperty( 'crop' ); + $conversion = $this->addMediaConversion( 'thumbnail' ); + $conversion = ! $crop ? $conversion : $conversion->manualCrop( $crop[ 'width' ] , $crop[ 'height' ] , $crop[ 'left' ] , $crop[ 'top' ] ); + $conversion->nonQueued() + ->performOnCollections( 'main_image' ); + $this->addMediaConversion( 'thumbnail' ) - ->width( 480 ) - ->height( 640 ) + ->width( 400 ) ->nonQueued() - ->performOnCollections( 'main_images' ); + ->performOnCollections( 'images' ); } } diff --git a/app/Services/Media/MediaHelper.php b/app/Services/Media/MediaHelper.php index 1db75fff..44f45887 100644 --- a/app/Services/Media/MediaHelper.php +++ b/app/Services/Media/MediaHelper.php @@ -14,7 +14,7 @@ class MediaHelper ]); if ($fakeModel = FakeModel::where('batch_id', request('file_batch_id'))->first()) { - foreach($fakeModel->getMedia('temp_files') as $media) { + foreach($fakeModel->getMedia('temp_medias') as $media) { if(substr($media->mime_type, 0, 5) == 'image') { $media->move($model, 'images'); } else { @@ -58,11 +58,11 @@ class MediaHelper ]); if ($fakeModel = FakeModel::where('batch_id', request('tinymce_batch_id'))->first()) { - foreach($fakeModel->getMedia('temp_files') as $media) { + foreach($fakeModel->getMedia('temp_medias') as $media) { if(substr($media->mime_type, 0, 5) == 'image') { $media->assign($model, 'tinymce_images'); } else { - $media->assign($model, 'tinymce_files'); + $media->assign($model, 'temp_medias'); } } $fakeModel->delete();