Fix tests

api/tests/unit/modules/accounts/models/DeleteAccountFormTest.php

@@ -5,7 +5,9 @@ namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\DeleteAccountForm;
 use api\tests\unit\TestCase;
+use Codeception\Util\ReflectionHelper;
 use common\models\Account;
+use common\notifications\AccountEditNotification;
 use common\tasks\CreateWebHooksDeliveries;
 use common\tasks\DeleteAccount;
 use common\tests\fixtures\AccountFixture;
@@ -46,7 +48,12 @@ class DeleteAccountFormTest extends TestCase {
             ->method('push')
             ->withConsecutive(
                 [$this->callback(function(CreateWebHooksDeliveries $task) use ($account): bool {
-                    $this->assertSame($account->id, $task->payloads['id']);
+                    /** @var AccountEditNotification $notification */
+                    $notification = ReflectionHelper::readPrivateProperty($task, 'notification');
+                    $this->assertInstanceOf(AccountEditNotification::class, $notification);
+                    $this->assertSame($account->id, $notification->getPayloads()['id']);
+                    $this->assertTrue($notification->getPayloads()['isDeleted']);
+
                     return true;
                 })],
                 [$this->callback(function(DeleteAccount $task) use ($account): bool {

api/tests/unit/modules/accounts/models/RestoreAccountFormTest.php

@@ -5,7 +5,9 @@ namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\RestoreAccountForm;
 use api\tests\unit\TestCase;
+use Codeception\Util\ReflectionHelper;
 use common\models\Account;
+use common\notifications\AccountEditNotification;
 use common\tasks\CreateWebHooksDeliveries;
 use common\tests\fixtures\AccountFixture;
 use Yii;
@@ -39,7 +41,12 @@ class RestoreAccountFormTest extends TestCase {
             ->method('push')
             ->withConsecutive(
                 [$this->callback(function(CreateWebHooksDeliveries $task) use ($account): bool {
-                    $this->assertSame($account->id, $task->payloads['id']);
+                    /** @var AccountEditNotification $notification */
+                    $notification = ReflectionHelper::readPrivateProperty($task, 'notification');
+                    $this->assertInstanceOf(AccountEditNotification::class, $notification);
+                    $this->assertSame($account->id, $notification->getPayloads()['id']);
+                    $this->assertFalse($notification->getPayloads()['isDeleted']);
+
                     return true;
                 })],
             );

common/models/Account.php

@@ -189,7 +189,9 @@ class Account extends ActiveRecord {
 
     public function afterDelete(): void {
         parent::afterDelete();
-        Yii::$app->queue->push(new CreateWebHooksDeliveries(new AccountDeletedNotification($this)));
+        if ($this->status !== self::STATUS_REGISTERED) {
+            Yii::$app->queue->push(new CreateWebHooksDeliveries(new AccountDeletedNotification($this)));
+        }
     }
 
 }

common/tests/unit/models/AccountTest.php

@@ -3,7 +3,10 @@ declare(strict_types=1);
 
 namespace common\tests\unit\models;
 
+use Codeception\Util\ReflectionHelper;
 use common\models\Account;
+use common\notifications\AccountDeletedNotification;
+use common\notifications\AccountEditNotification;
 use common\tasks\CreateWebHooksDeliveries;
 use common\tests\fixtures\MojangUsernameFixture;
 use common\tests\unit\TestCase;
@@ -129,23 +132,37 @@ class AccountTest extends TestCase {
         ];
 
         $account = new Account();
+        $account->id = 123;
         $account->afterSave(false, $changedAttributes);
         /** @var CreateWebHooksDeliveries $job */
         $job = $this->tester->grabLastQueuedJob();
         $this->assertInstanceOf(CreateWebHooksDeliveries::class, $job);
-        $this->assertSame('account.edit', $job->type);
+        /** @var AccountEditNotification $notification */
-        $this->assertSame($changedAttributes, $job->payloads['changedAttributes']);
+        $notification = ReflectionHelper::readPrivateProperty($job, 'notification');
+        $this->assertInstanceOf(AccountEditNotification::class, $notification);
+        $this->assertSame(123, $notification->getPayloads()['id']);
+        $this->assertSame($changedAttributes, $notification->getPayloads()['changedAttributes']);
     }
 
     public function testAfterDeletePushEvent() {
         $account = new Account();
         $account->id = 1;
+        $account->status = Account::STATUS_REGISTERED;
+        $account->created_at = time() - 60 * 60 * 24;
+        $account->deleted_at = time();
+
+        $account->afterDelete();
+        $this->assertNull($this->tester->grabLastQueuedJob());
+
+        $account->status = Account::STATUS_ACTIVE;
         $account->afterDelete();
         /** @var CreateWebHooksDeliveries $job */
         $job = $this->tester->grabLastQueuedJob();
         $this->assertInstanceOf(CreateWebHooksDeliveries::class, $job);
-        $this->assertSame('account.deletion', $job->type);
+        /** @var AccountDeletedNotification $notification */
-        $this->assertSame(1, $job->payloads['id']);
+        $notification = ReflectionHelper::readPrivateProperty($job, 'notification');
+        $this->assertInstanceOf(AccountDeletedNotification::class, $notification);
+        $this->assertSame(1, $notification->getPayloads()['id']);
     }
 
 }