Merge pull request Insolita#19 from Insolita/17-18-enh

enh Insolita#17 Insolita#18

Author: Insolita

CHANGELOG.md

@@ -38,4 +38,8 @@
  - Add aftersave callback for create/update actions that called after save model with all relations
 
 1.3.5
- - Change UpdateAction, set model scenario before checkAccess calling
+ - Change UpdateAction, set model scenario before checkAccess calling
+
+1.4.0
+ - Add callable afterDelete for DeleteAction (#17)
+ - Add additional param originalModel for afterSave callback for UpdateAction (#18)

src/actions/DeleteAction.php

@@ -7,6 +7,7 @@
 
 namespace insolita\fractal\actions;
 
+use Closure;
 use Yii;
 use yii\base\Model;
 use yii\web\ForbiddenHttpException;
@@ -26,6 +27,15 @@ class DeleteAction extends JsonApiAction
      */
     public $scenario = Model::SCENARIO_DEFAULT;
 
+    /**
+     * @var callable|Closure Callback after save model with all relations
+     * @example
+     *   'afterDelete' => function ($model) {
+     *           doSomething();
+     * }
+     */
+    public $afterDelete = null;
+
     public function init():void
     {
         parent::init();
@@ -53,7 +63,9 @@ public function run($id):void
         if ($model->delete() === false) {
             throw new ServerErrorHttpException('Failed to delete the object for unknown reason.');
         }
-
+        if ($this->afterDelete !== null) {
+            call_user_func($this->afterDelete, $model);
+        }
         Yii::$app->getResponse()->setStatusCode(204);
     }
 }

src/actions/UpdateAction.php

@@ -58,7 +58,7 @@ class UpdateAction extends JsonApiAction
     /**
      * @var callable|Closure Callback after save model with all relations
      * @example
-     *   'afterSave' => function ($model) {
+     *   'afterSave' => function ($model, $originalModel) {
      *           $model->doSomething();
      * }
      */
@@ -92,6 +92,7 @@ public function run($id):Item
         if ($this->checkAccess) {
             call_user_func($this->checkAccess, $this->id, $model);
         }
+        $originalModel = $model;
         RelationshipManager::validateRelationships($model, $this->getResourceRelationships(), $this->allowedRelations);
         if (empty($this->getResourceAttributes()) && $this->hasResourceRelationships()) {
             $transact = $model::getDb()->beginTransaction();
@@ -124,7 +125,7 @@ public function run($id):Item
         }
         $model->refresh();
         if ($this->afterSave !== null) {
-            call_user_func($this->afterSave, $model);
+            call_user_func($this->afterSave, $model, $originalModel);
         }
         return new Item($model, new $this->transformer, $this->resourceKey);
     }