added ModerationQuery

Author: Igor Chepurnoy

models/CommentModel.php

@@ -13,7 +13,7 @@
 use yii2mod\comments\Module;
 use yii2mod\moderation\enums\Status;
 use yii2mod\moderation\ModerationBehavior;
-use yii2mod\moderation\ModerationQueryTrait;
+use yii2mod\moderation\ModerationQuery;
 
 /**
  * Class CommentModel
@@ -38,8 +38,6 @@
  */
 class CommentModel extends ActiveRecord
 {
-    use ModerationQueryTrait;
-
     /**
      * @var null|array|ActiveRecord[] comment children
      */
@@ -76,7 +74,8 @@ public function rules()
     public function validateParentID($attribute)
     {
         if ($this->{$attribute} !== null) {
-            $parentCommentExist = static::approved()
+            $parentCommentExist = static::find()
+                ->approved()
                 ->andWhere([
                     'id' => $this->{$attribute},
                     'entity' => $this->entity,
@@ -151,6 +150,14 @@ public function attributeLabels()
         ];
     }
 
+    /**
+     * @return ModerationQuery
+     */
+    public static function find()
+    {
+        return new ModerationQuery(get_called_class());
+    }
+
     /**
      * @inheritdoc
      */
@@ -223,10 +230,12 @@ public function getAuthor()
      */
     public static function getTree($entity, $entityId, $maxLevel = null)
     {
-        $query = static::approved()->andWhere([
-            'entityId' => $entityId,
-            'entity' => $entity,
-        ])->with(['author']);
+        $query = static::find()
+            ->approved()
+            ->andWhere([
+                'entityId' => $entityId,
+                'entity' => $entity,
+            ])->with(['author']);
 
         if ($maxLevel > 0) {
             $query->andWhere(['<=', 'level', $maxLevel]);
@@ -345,7 +354,8 @@ public static function getAuthors()
      */
     public function getCommentsCount()
     {
-        return (int)static::approved()
+        return (int)static::find()
+            ->approved()
             ->andWhere(['entity' => $this->entity, 'entityId' => $this->entityId])
             ->count();
     }