#100. Change exception on deleteBulk to Json::error

SoliDry · Aug 18, 2018 · 7a82f45 · 7a82f45
1 parent 8b05e2a
commit 7a82f45
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/blocks/EntitiesTrait.php b/src/blocks/EntitiesTrait.php
@@ -6,7 +6,6 @@
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\DB;
 use League\Fractal\Resource\ResourceAbstract;
-use rjapi\exceptions\AttributesException;
 use rjapi\extension\ApiController;
 use rjapi\extension\BaseFormRequest;
 use rjapi\extension\BaseModel;
@@ -162,7 +161,6 @@ protected function mutateBulk(array $jsonApiAttributes) : ResourceAbstract
 
     /**
      * @param array $jsonApiAttributes
-     * @throws AttributesException
      */
     public function removeBulk(array $jsonApiAttributes) : void
     {
@@ -174,7 +172,14 @@ public function removeBulk(array $jsonApiAttributes) : void
 
                 if ($model === null) {
                     DB::rollBack();
-                    throw new AttributesException('There is no such id: ' . $jsonObject[JSONApiInterface::CONTENT_ID] . ' or model was already deleted - transaction has been rolled back.');
+                    Json::outputErrors(
+                        [
+                            [
+                                JSONApiInterface::ERROR_TITLE => 'There is no such id: ' . $jsonObject[JSONApiInterface::CONTENT_ID],
+                                JSONApiInterface::ERROR_DETAIL => 'There is no such id: ' . $jsonObject[JSONApiInterface::CONTENT_ID] . ' or model was already deleted - transaction has been rolled back.'
+                            ],
+                        ]
+                    );
                 }
 
                 $model->delete();

diff --git a/src/extension/BaseController.php b/src/extension/BaseController.php
@@ -60,7 +60,6 @@ public function updateBulk(Request $request)
      *
      * @param Request $request
      * @throws \LogicException
-     * @throws \rjapi\exceptions\AttributesException
      */
     public function deleteBulk(Request $request)
     {