Skip to content

Added ensured repository calls for hermes worker handlers #1

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
mikoczy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added ensured repository calls for hermes worker handlers #1

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
12 changes: 9 additions & 3 deletions src/Hermes/ListCreatedHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,22 @@ public function handle(MessageInterface $message): bool
throw new HermesException('unable to handle event: mail_type_id is missing');
}

$list = $this->listsRepository->find($payload['list_id']);
$list = $this->listsRepository->ensure(function () use ($payload) {
return $this->listsRepository->find($payload['list_id']);
});

$page = 1;
while ($users = $this->userProvider->list([], $page)) {
foreach ($users as $user) {
$this->logger->log(LogLevel::INFO, sprintf("Subscribing user: %s (%s).", $user['email'], $user['id']));
if ($list->auto_subscribe) {
$this->userSubscriptionsRepository->subscribeUser($list, $user['id'], $user['email']);
$this->userSubscriptionsRepository->ensure(function () use ($list, $user) {
$this->userSubscriptionsRepository->subscribeUser($list, $user['id'], $user['email']);
});
} else {
$this->userSubscriptionsRepository->unsubscribeUser($list, $user['id'], $user['email']);
$this->userSubscriptionsRepository->ensure(function () use ($list, $user) {
$this->userSubscriptionsRepository->unsubscribeUser($list, $user['id'], $user['email']);
});
}
}
$page++;
Expand Down
26 changes: 18 additions & 8 deletions src/Hermes/MailgunEventHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,27 +43,37 @@ public function handle(MessageInterface $message): bool
throw new HermesException('unable to handle event: event is missing');
}

$log = $this->logsRepository->findBySenderId($payload['mail_sender_id']);
$log = $this->logsRepository->ensure(function () use ($payload) {
return $this->logsRepository->findBySenderId($payload['mail_sender_id']);
});
if (!$log) {
return false;
}

$eventTimestamp = explode('.', (string) $payload['timestamp'])[0];
$date = DateTime::from($eventTimestamp);

$mailgunEvent = $this->logsRepository->mapEvent($payload['event'], $payload['reason']);
$mailgunEvent = $this->logsRepository->ensure(function () use ($payload) {
return $this->logsRepository->mapEvent($payload['event'], $payload['reason']);
});
if (!$mailgunEvent) {
return false;
}

$this->logsRepository->update($log, [
$mailgunEvent => $date,
'updated_at' => new DateTime(),
]);
$this->logsRepository->ensure(function () use ($log, $mailgunEvent, $date) {
$this->logsRepository->update($log, [
$mailgunEvent => $date,
'updated_at' => new DateTime(),
]);
});

$column = $this->batchTemplatesRepository->mapEvent($mailgunEvent);
$column = $this->batchTemplatesRepository->ensure(function () use ($mailgunEvent) {
return $this->batchTemplatesRepository->mapEvent($mailgunEvent);
});
if (isset($column)) {
$this->batchTemplatesRepository->incrementColumn($column, $log->mail_template_id, $log->mail_job_batch_id);
$this->batchTemplatesRepository->ensure(function () use ($column, $log) {
$this->batchTemplatesRepository->incrementColumn($column, $log->mail_template_id, $log->mail_job_batch_id);
});
}

if ($payload['event'] === 'dropped') {
Expand Down
10 changes: 6 additions & 4 deletions src/Hermes/RedisDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,12 @@ public function wait(Closure $callback, array $priorities = []): void

$result = $callback($hermesMessage);
if (!$result) {
$this->tasksRepository->add(
$hermesMessage,
HermesTasksRepository::STATE_ERROR
);
$this->tasksRepository->ensure(function () use ($hermesMessage) {
$this->tasksRepository->add(
$hermesMessage,
HermesTasksRepository::STATE_ERROR
);
});
}
$this->incrementProcessedItems();
break;
Expand Down
4 changes: 3 additions & 1 deletion src/Hermes/SendEmailHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ public function __construct(
public function handle(MessageInterface $message): bool
{
$payload = $message->getPayload();
$mailTemplate = $this->templatesRepository->getByCode($payload['mail_template_code']);
$mailTemplate = $this->templatesRepository->ensure(function () use ($payload) {
return $this->templatesRepository->getByCode($payload['mail_template_code']);
});
if (!$mailTemplate) {
Debugger::log("could not load mail template: record with code [{$payload['mail_template_code']}] doesn't exist");
return false;
Expand Down
4 changes: 3 additions & 1 deletion src/Hermes/SubscribeHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ public function handle(MessageInterface $message): bool
return true;
}

$welcomeEmail = $this->mailTypesRepository->find($payload['mail_type_id'])->subscribe_mail_template;
$welcomeEmail = $this->mailTypesRepository->ensure(function () use ($payload) {
return $this->mailTypesRepository->find($payload['mail_type_id'])->subscribe_mail_template;
});

if (!$welcomeEmail) {
return true;
Expand Down
8 changes: 6 additions & 2 deletions src/Hermes/TrackNewsletterArticlesHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,19 @@ public function handle(MessageInterface $message): bool
throw new HermesException('unable to handle event: status is missing');
}

$batch = $this->batchesRepository->find($payload['mail_job_batch_id']);
$batch = $this->batchesRepository->ensure(function () use ($payload) {
return $this->batchesRepository->find($payload['mail_job_batch_id']);
});
if (!$batch) {
throw new HermesException('unable to handle event: mail job batch not found');
}
if ($payload['status'] !== BatchesRepository::STATUS_SENDING) {
return true;
}

$batchTemplates = $this->batchTemplatesRepository->findByBatchId($batch->id);
$batchTemplates = $this->batchTemplatesRepository->ensure(function () use ($batch) {
return $this->batchTemplatesRepository->findByBatchId($batch->id);
});
foreach ($batchTemplates as $batchTemplate) {
preg_match_all('/<a.*?href="([^"]*?)".*?>/i', $batchTemplate->mail_template->mail_body_html, $matches);
$matches = array_unique($matches[1]);
Expand Down
19 changes: 13 additions & 6 deletions src/Hermes/UnsubscribeDroppedHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,29 @@ public function handle(MessageInterface $message): bool
{
$payload = $message->getPayload();

$lastEmails = $this->logsRepository
->getEmailLogs($payload['email'])
->limit($this->threshold)
->fetchPairs('id', 'dropped_at');
$lastEmails = $this->logsRepository->ensure(function () use ($payload) {
return $this->logsRepository
->getEmailLogs($payload['email'])
->limit($this->threshold)
->fetchPairs('id', 'dropped_at');
});

$droppedEmails = array_filter($lastEmails);
if (count($droppedEmails) < $this->threshold) {
return true;
}

$types = $this->mailTypesRepository->all();
$types = $this->mailTypesRepository->ensure(function () {
return $this->mailTypesRepository->all();
});
foreach ($types as $type) {
if ($type->locked) {
continue;
}
$this->userSubscriptionsRepository->unsubscribeEmail($type, $payload['email']);

$this->userSubscriptionsRepository->ensure(function () use ($type, $payload) {
$this->userSubscriptionsRepository->unsubscribeEmail($type, $payload['email']);
});
}

return true;
Expand Down
4 changes: 3 additions & 1 deletion src/Hermes/ValidateCrmEmailHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ public function handle(MessageInterface $message): bool
return true;
}

$log = $this->logsRepository->findBySenderId($payload['mail_sender_id']);
$log = $this->logsRepository->ensure(function () use ($payload) {
return $this->logsRepository->findBySenderId($payload['mail_sender_id']);
});
if (!$log) {
return false;
}
Expand Down
15 changes: 15 additions & 0 deletions src/Repositories/Repository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@

namespace Remp\MailerModule\Repositories;

use Closure;
use Nette\Caching\Storage;
use Nette\Utils\DateTime;
use Nette\Database\Context;
use Throwable;

class Repository
{
Expand Down Expand Up @@ -50,6 +52,19 @@ public function getDatabase(): Context
return $this->database;
}

public function ensure(Closure $callback, int $retryTimes = 1)
{
try {
return $callback($this);
} catch (Throwable $e) {
if ($retryTimes === 0) {
throw $e;
}
$this->database->getConnection()->reconnect();
return $this->ensure($callback, $retryTimes - 1);
}
}

/**
* Update updates provided record with given $data array and mutates the provided instance. Operation is logged
* to audit log.
Expand Down