Skip to content

fix(email): reinforcement of the validator and skip invalid address when sending alerts #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kevin-blackbird wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(email): reinforcement of the validator and skip invalid address when sending alerts #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 25 additions & 19 deletions src/Command/AlertCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Mime\Exception\RfcComplianceException;
use Symfony\Component\Routing\RouterInterface;
use Webgriffe\SyliusBackInStockNotificationPlugin\Entity\SubscriptionInterface;
use Webgriffe\SyliusBackInStockNotificationPlugin\Repository\SubscriptionRepositoryInterface;
Expand Down Expand Up @@ -44,27 +45,32 @@ protected function execute(InputInterface $input, OutputInterface $output): int
//I think that this load in the long time can be a bottle necklace
$subscriptions = $this->backInStockNotificationRepository->findBy(['notify' => false]);
foreach ($subscriptions as $subscription) {
$channel = $subscription->getChannel();
$productVariant = $subscription->getProductVariant();
if ($productVariant === null || $channel === null) {
$this->backInStockNotificationRepository->remove($subscription);
$this->logger->warning(
'The back in stock subscription for the product does not have all the information required',
['subscription' => var_export($subscription, true)],
);
try {
$channel = $subscription->getChannel();
$productVariant = $subscription->getProductVariant();
if ($productVariant === null || $channel === null) {
$this->backInStockNotificationRepository->remove($subscription);
$this->logger->warning(
'The back in stock subscription for the product does not have all the information required',
['subscription' => var_export($subscription, true)],
);

continue;
}
continue;
}

if (
$this->availabilityChecker->isStockAvailable($productVariant) &&
$productVariant->isEnabled() &&
$productVariant->getProduct()?->isEnabled() === true
) {
$this->router->getContext()->setHost($channel->getHostname() ?? 'localhost');
$this->sendEmail($subscription, $productVariant, $channel);
$subscription->setNotify(true);
$this->backInStockNotificationRepository->add($subscription);
if (
$this->availabilityChecker->isStockAvailable($productVariant) &&
$productVariant->isEnabled() &&
$productVariant->getProduct()?->isEnabled() === true
) {
$this->router->getContext()->setHost($channel->getHostname() ?? 'localhost');
$this->sendEmail($subscription, $productVariant, $channel);
$subscription->setNotify(true);
$this->backInStockNotificationRepository->add($subscription);
}
} catch (RfcComplianceException $e) {
// Invalid email address, continue to the next one
$this->logger->warning($e->getMessage());
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Form/SubscriptionType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
->add('email', EmailType::class, [
'constraints' => [
new NotBlank([], null, null, null, ['webgriffe_sylius_back_in_stock_notification_plugin']),
new Email([], null, null, null, ['webgriffe_sylius_back_in_stock_notification_plugin']),
new Email(['mode' => Email::VALIDATION_MODE_STRICT], null, null, null, ['webgriffe_sylius_back_in_stock_notification_plugin']),
],
])
->add('product_variant_code', HiddenType::class)
Expand Down