zoomyboy
/
medialibrary-helper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix response codes

This commit is contained in:
philipp lang 2024-11-13 13:50:41 +01:00
parent 9870ac8bab
commit 424ca30932
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DeferredMediaData.php
View File

@ -29,7 +29,7 @@ class DeferredMediaData extends Data
]); ]);
} }
public static function collectionFromPaths(Collection $paths, MediaCollection $collection): DataCollection public static function collectionFromPaths(Collection $paths, MediaCollection $collection): Collection
{ {
return static::collect($paths->map(fn ($path) => static::fromPath($path, $collection))); return static::collect($paths->map(fn ($path) => static::fromPath($path, $collection)));
} }

8
src/MediaController.php
View File

@ -5,6 +5,8 @@ namespace Zoomyboy\MedialibraryHelper;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Collection;
use Spatie\Image\Image; use Spatie\Image\Image;
use Spatie\LaravelData\DataCollection; use Spatie\LaravelData\DataCollection;
use Spatie\MediaLibrary\MediaCollections\Exceptions\InvalidBase64Data; use Spatie\MediaLibrary\MediaCollections\Exceptions\InvalidBase64Data;
@ -98,7 +100,7 @@ class MediaController
}); });
$this->authorize('storeMedia', [$modelName, null, $collection->name]); $this->authorize('storeMedia', [$modelName, null, $collection->name]);
return $isSingle ? DeferredMediaData::fromPath($tempPaths->first(), $collection) : DeferredMediaData::collect($tempPaths, $collection); return $isSingle ? DeferredMediaData::fromPath($tempPaths->first(), $collection) : response(DeferredMediaData::collectionFromPaths($tempPaths, $collection), 201);
} }
public function update(Request $request, Media $media): MediaData public function update(Request $request, Media $media): MediaData
@ -116,7 +118,7 @@ class MediaController
return MediaData::from($media); return MediaData::from($media);
} }
public function index(Request $request, $parentModel, int $parentId, string $collectionName): MediaData|DataCollection public function index(Request $request, $parentModel, int $parentId, string $collectionName): MediaData|JsonResponse
{ {
$model = app('media-library-helpers')->get($parentModel); $model = app('media-library-helpers')->get($parentModel);
$model = $model::find($parentId); $model = $model::find($parentId);
@ -132,7 +134,7 @@ class MediaController
return $isSingle return $isSingle
? MediaData::from($model->getFirstMedia($collectionName)) ? MediaData::from($model->getFirstMedia($collectionName))
: MediaData::collect($model->getMedia($collectionName)); : response()->json(MediaData::collect($model->getMedia($collectionName))->toArray());
} }
public function destroy(Media $media, Request $request): JsonResponse public function destroy(Media $media, Request $request): JsonResponse

2
src/OrderController.php
View File

@ -31,6 +31,6 @@ class OrderController
$model->getMediaCollection($collectionName)->runCallback('after', $model->fresh()); $model->getMediaCollection($collectionName)->runCallback('after', $model->fresh());
return MediaData::collect($model->getMedia($collectionName)); return MediaData::collect($model->getMedia($collectionName))->toArray();
} }
} }

1
tests/Feature/IndexTest.php
View File

@ -7,6 +7,7 @@ use Spatie\MediaLibrary\MediaCollections\Models\Media;
test('it gets all medias', function () { test('it gets all medias', function () {
$this->auth()->registerModel(); $this->auth()->registerModel();
$this->withoutExceptionHandling();
$post = $this->newPost(); $post = $this->newPost();
$firstMedia = $post->addMedia($this->pdfFile()->getPathname())->withCustomProperties(['test' => 'old'])->preservingOriginal()->toMediaCollection('images'); $firstMedia = $post->addMedia($this->pdfFile()->getPathname())->withCustomProperties(['test' => 'old'])->preservingOriginal()->toMediaCollection('images');
$secondMedia = $post->addMedia($this->pdfFile()->getPathname())->withCustomProperties(['test' => 'old'])->preservingOriginal()->toMediaCollection('images'); $secondMedia = $post->addMedia($this->pdfFile()->getPathname())->withCustomProperties(['test' => 'old'])->preservingOriginal()->toMediaCollection('images');