remove User object from CommentEvent, update DefaultController

Author: igor

README.md

@@ -50,10 +50,6 @@ To access the module, you need to add the following code to your application con
             'default' => [
                 'class' => 'yii2mod\comments\controllers\DefaultController',
                 'on afterCreate' => function ($event) {
-                    // get userId
-                    $event->getUser()->getId();
-                    // get identity
-                    $event->getUser()->getIdentity();
                     // get saved comment model
                     $event->getCommentModel();
                     // your custom code

assets/js/comment.js

@@ -87,6 +87,8 @@
                 }
                 $commentForm.find(':submit').prop('disabled', false).text(settings.submitBtnText);
             }
+        }).fail(function (xhr, status, error) {
+            alert(error);
         });
 
         return false;

controllers/DefaultController.php

@@ -5,6 +5,7 @@
 use Yii;
 use yii\filters\VerbFilter;
 use yii\helpers\Json;
+use yii\web\BadRequestHttpException;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\web\Response;
@@ -54,36 +55,23 @@ public function behaviors()
      * Create comment.
      *
      * @param $entity string encrypt entity
-     * @return array|null|Response
+     * @return array
      */
     public function actionCreate($entity)
     {
-        /* @var $module Module */
-        $module = Yii::$app->getModule(Module::$name);
-        $event = Yii::createObject(['class' => CommentEvent::className(), 'user' => Yii::$app->user]);
-        $commentModelClass = $module->commentModelClass;
-        $decryptEntity = Yii::$app->getSecurity()->decryptByKey(utf8_decode($entity), $module::$name);
-        if ($decryptEntity !== false) {
-            $entityData = Json::decode($decryptEntity);
-            /* @var $model CommentModel */
-            $model = new $commentModelClass;
-            $model->setAttributes($entityData);
-            if ($model->load(Yii::$app->request->post()) && $model->save()) {
-                $event->setCommentModel($model);
-                $this->trigger(self::EVENT_AFTER_CREATE, $event);
-                return ['status' => 'success'];
-            } else {
-                return [
-                    'status' => 'error',
-                    'errors' => ActiveForm::validate($model)
-                ];
-            }
-        } else {
-            return [
-                'status' => 'error',
-                'message' => Yii::t('yii2mod.comments', 'Oops, something went wrong. Please try again later.')
-            ];
+        $commentModel = Yii::createObject(Yii::$app->getModule(Module::$name)->commentModelClass);
+        $commentModel->setAttributes($this->getCommentAttributesFromEntity($entity));
+        if ($commentModel->load(Yii::$app->request->post()) && $commentModel->save()) {
+            $event = Yii::createObject(['class' => CommentEvent::className(), 'commentModel' => $commentModel]);
+            $this->trigger(self::EVENT_AFTER_CREATE, $event);
+
+            return ['status' => 'success'];
         }
+
+        return [
+            'status' => 'error',
+            'errors' => ActiveForm::validate($commentModel)
+        ];
     }
 
     /**
@@ -119,4 +107,22 @@ protected function findModel($id)
             throw new NotFoundHttpException(Yii::t('yii2mod.comments', 'The requested page does not exist.'));
         }
     }
+
+    /**
+     * Get list of attributes from encrypted entity
+     *
+     * @param $entity string encrypted entity
+     * @return array|mixed
+     *
+     * @throws BadRequestHttpException
+     */
+    protected function getCommentAttributesFromEntity($entity)
+    {
+        $decryptEntity = Yii::$app->getSecurity()->decryptByKey(utf8_decode($entity), Module::$name);
+        if ($decryptEntity !== false) {
+            return Json::decode($decryptEntity);
+        }
+
+        throw new BadRequestHttpException(Yii::t('yii2mod.comments', 'Oops, something went wrong. Please try again later.'));
+    }
 }

events/CommentEvent.php

@@ -3,7 +3,6 @@
 namespace yii2mod\comments\events;
 
 use yii\base\Event;
-use yii\web\User;
 use yii2mod\comments\models\CommentModel;
 
 /**
@@ -12,32 +11,11 @@
  */
 class CommentEvent extends Event
 {
-    /**
-     * @var User
-     */
-    private $_user;
-
     /**
      * @var CommentModel
      */
     private $_commentModel;
 
-    /**
-     * @return User
-     */
-    public function getUser()
-    {
-        return $this->_user;
-    }
-
-    /**
-     * @param User $user
-     */
-    public function setUser(User $user)
-    {
-        $this->_user = $user;
-    }
-
     /**
      * @return CommentModel
      */

tests/CommentTest.php

@@ -37,8 +37,8 @@ public function testDeleteComment()
 
     public function testTryAddCommentWithInvalidEntityParam()
     {
-        $response = Yii::$app->runAction('comment/default/create', ['entity' => 'invalid entity']);
-        $this->assertEquals('error', $response['status'], 'Response status is invalid!');
+        $this->setExpectedException('yii\web\BadRequestHttpException');
+        Yii::$app->runAction('comment/default/create', ['entity' => 'invalid entity']);
     }
 
     /**