Merge pull request #16 from tv2regionerne/feature/assets-cache

Asure updated asset data is returned with POST/PATCH

Author: tv2reg

routes/api.php

@@ -33,6 +33,7 @@
                                     ->group(function () {
                                         Route::get('/', [Controllers\AssetsController::class, 'index'])->name('index');
                                         Route::get('{id}', [Controllers\AssetsController::class, 'show'])->name('show');
+                                        Route::patch('{id}', [Controllers\AssetsController::class, 'update'])->name('update');
                                         Route::delete('{id}', [Controllers\AssetsController::class, 'destroy'])->name('destroy');
                                         Route::post('/', [Controllers\AssetsController::class, 'store'])->name('store');
                                     });

src/Http/Controllers/AssetsController.php

@@ -9,6 +9,8 @@
 use Illuminate\Validation\ValidationException;
 use Statamic\Contracts\Assets\Asset as AssetContract;
 use Statamic\Facades;
+use Statamic\Facades\Asset;
+use Statamic\Facades\Blink;
 use Statamic\Http\Controllers\API\ApiController;
 use Statamic\Http\Controllers\CP\Assets\AssetsController as CpController;
 use Tv2regionerne\StatamicPrivateApi\Http\Resources\AssetResource;
@@ -62,20 +64,50 @@ public function store(Request $request, $container)
         }
 
         try {
+
             $response = (new CpController($request))->store($request);
+            $asset = $response->resource;
+            $fields = $asset->blueprint()->fields()->addValues($request->all());
+
+            $fields->validate();
 
-            if (! $id = $response->id()) {
-                abort(403);
+            $values = $fields->process()->values()->merge([
+                'focus' => $request->focus,
+            ]);
+
+            foreach ($values as $key => $value) {
+                $asset->set($key, $value);
             }
 
-            $asset = Facades\Asset::find($id);
+            $asset->save();
+            Blink::forget("eloquent-asset-{$asset->id()}");
+            Blink::forget("asset-meta-{$asset->id()}");
+            $asset = Asset::findById($asset->id());
 
             return AssetResource::make($asset);
+
         } catch (ValidationException $e) {
             return $this->returnValidationErrors($e);
         }
     }
 
+    public function update(Request $request, $container, $asset)
+    {
+        $request->merge([
+            'container' => $container,
+        ]);
+
+        $response = (new CpController($request))->update($request, $asset);
+        $assetId = $response['asset']['id'];
+
+        Blink::forget("eloquent-asset-{$assetId}");
+        Blink::forget("asset-meta-{$assetId}");
+
+        $asset = Asset::findById($assetId);
+
+        return AssetResource::make($asset);
+    }
+
     public function destroy(Request $request, $container, $id)
     {
         $container = $this->containerFromHandle($container);