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

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

View File

@@ -4,13 +4,14 @@ namespace api\models\authentication;
use api\aop\annotations\CollectModelMetrics;
use api\components\ReCaptcha\Validator as ReCaptchaValidator;
use api\models\base\ApiForm;
use common\emails\EmailHelper;
use common\helpers\Error as E;
use api\traits\AccountFinder;
use common\components\UserFriendlyRandomKey;
use common\models\Account;
use common\models\confirmations\ForgotPassword;
use common\models\EmailActivation;
use common\tasks\SendPasswordRecoveryEmail;
use Yii;
use yii\base\ErrorException;
class ForgotPasswordForm extends ApiForm {
@@ -80,7 +81,7 @@ class ForgotPasswordForm extends ApiForm {
throw new ErrorException('Cannot create email activation for forgot password form');
}
EmailHelper::forgotPassword($emailActivation);
Yii::$app->queue->push(SendPasswordRecoveryEmail::createFromConfirmation($emailActivation));
return true;
}

View File

@@ -3,13 +3,13 @@ namespace api\models\authentication;
use api\aop\annotations\CollectModelMetrics;
use api\components\ReCaptcha\Validator as ReCaptchaValidator;
use common\emails\EmailHelper;
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\UsernameHistory;
use common\tasks\SendRegistrationEmail;
use common\validators\EmailValidator;
use common\validators\LanguageValidator;
use common\validators\PasswordValidator;
@@ -104,7 +104,7 @@ class RegistrationForm extends ApiForm {
throw new ErrorException('Cannot save username history record');
}
EmailHelper::registration($emailActivation);
Yii::$app->queue->push(SendRegistrationEmail::createFromConfirmation($emailActivation));
$transaction->commit();
} catch (Exception $e) {

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;
}

View File

@@ -3,11 +3,11 @@ namespace api\modules\accounts\models;
use api\aop\annotations\CollectModelMetrics;
use api\exceptions\ThisShouldNotHappenException;
use common\emails\EmailHelper;
use api\validators\PasswordRequiredValidator;
use common\helpers\Error as E;
use common\models\confirmations\CurrentEmailConfirmation;
use common\models\EmailActivation;
use common\tasks\SendCurrentEmailConfirmation;
use Yii;
class SendEmailVerificationForm extends AccountActionForm {
@@ -48,7 +48,7 @@ class SendEmailVerificationForm extends AccountActionForm {
$this->removeOldCode();
$activation = $this->createCode();
EmailHelper::changeEmailConfirmCurrent($activation);
Yii::$app->queue->push(SendCurrentEmailConfirmation::createFromConfirmation($activation));
$transaction->commit();

View File

@@ -3,10 +3,10 @@ namespace api\modules\accounts\models;
use api\aop\annotations\CollectModelMetrics;
use api\exceptions\ThisShouldNotHappenException;
use common\emails\EmailHelper;
use api\validators\EmailActivationKeyValidator;
use common\models\confirmations\NewEmailConfirmation;
use common\models\EmailActivation;
use common\tasks\SendNewEmailConfirmation;
use common\validators\EmailValidator;
use Yii;
@@ -39,7 +39,7 @@ class SendNewEmailVerificationForm extends AccountActionForm {
$activation = $this->createCode();
EmailHelper::changeEmailConfirmNew($activation);
Yii::$app->queue->push(SendNewEmailConfirmation::createFromConfirmation($activation));
$transaction->commit();