ElyBy-Mirror/accounts
1
0
Fork 0
mirror of https://github.com/elyby/accounts.git synced 2025-05-31 14:11:46 +05:30
Code Issues Packages Projects Releases Wiki Activity

Отправка всех email вынесена в очередь

Browse Source
This commit is contained in:
ErickSkrauch
2017-11-26 04:44:41 +03:00
parent 4d48b38e47
commit 88175fea48
17 changed files with 253 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
api/models/authentication/RepeatAccountActivationForm.php
View File

@@ -3,15 +3,15 @@ namespace api\models\authentication;
use api\aop\annotations\CollectModelMetrics;
use api\components\ReCaptcha\Validator as ReCaptchaValidator;
use common\emails\EmailHelper;
use api\exceptions\ThisShouldNotHappenException;
use api\models\base\ApiForm;
use common\helpers\Error as E;
use common\components\UserFriendlyRandomKey;
use common\models\Account;
use common\models\confirmations\RegistrationConfirmation;
use common\models\EmailActivation;
use common\tasks\SendRegistrationEmail;
use Yii;
use yii\base\ErrorException;
class RepeatAccountActivationForm extends ApiForm {
@@ -57,7 +57,6 @@ class RepeatAccountActivationForm extends ApiForm {
/**
* @CollectModelMetrics(prefix="signup.repeatEmail")
* @return bool
* @throws ErrorException
*/
public function sendRepeatMessage() {
if (!$this->validate()) {
@@ -66,27 +65,23 @@ class RepeatAccountActivationForm extends ApiForm {
$account = $this->getAccount();
$transaction = Yii::$app->db->beginTransaction();
try {
EmailActivation::deleteAll([
'account_id' => $account->id,
'type' => EmailActivation::TYPE_REGISTRATION_EMAIL_CONFIRMATION,
]);
$activation = new RegistrationConfirmation();
$activation->account_id = $account->id;
$activation->key = UserFriendlyRandomKey::make();
if (!$activation->save()) {
throw new ErrorException('Unable save email-activation model.');
}
EmailActivation::deleteAll([
'account_id' => $account->id,
'type' => EmailActivation::TYPE_REGISTRATION_EMAIL_CONFIRMATION,
]);
EmailHelper::registration($activation);
$transaction->commit();
} catch (ErrorException $e) {
$transaction->rollBack();
throw $e;
$activation = new RegistrationConfirmation();
$activation->account_id = $account->id;
$activation->key = UserFriendlyRandomKey::make();
if (!$activation->save()) {
throw new ThisShouldNotHappenException('Unable save email-activation model.');
}
Yii::$app->queue->push(SendRegistrationEmail::createFromConfirmation($activation));
$transaction->commit();
return true;
}