Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 17:14:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update postmark to only update existing records with message IDs

Browse Source
This commit is contained in:
David Bomba 2023-10-20 21:36:45 +11:00
parent 33c8c713b1
commit 28f3de3f28
1 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/Jobs/PostMark/ProcessPostmarkWebhook.php
View File

@ -56,6 +56,23 @@ class ProcessPostmarkWebhook implements ShouldQueue
{ {
} }
private function getSystemLog(string $message_id): ?SystemLog
{
return SystemLog::query()
->where('company_id', $this->invitation->company_id)
->where('type_id', SystemLog::TYPE_WEBHOOK_RESPONSE)
->whereJsonContains('log', ['MessageID' => $message_id])
->orderBy('id','desc')
->first();
}
private function updateSystemLog(SystemLog $system_log, array $data): void
{
$system_log->log = $data;
$system_log->save();
}
/** /**
* Execute the job. * Execute the job.
* *
@ -135,6 +152,13 @@ class ProcessPostmarkWebhook implements ShouldQueue
$data = array_merge($this->request, ['history' => $this->fetchMessage()]); $data = array_merge($this->request, ['history' => $this->fetchMessage()]);
$sl = $this->getSystemLog($this->request['MessageID']);
if($sl){
$this->updateSystemLog($sl, $data);
return;
}
(new SystemLogger( (new SystemLogger(
$data, $data,
SystemLog::CATEGORY_MAIL, SystemLog::CATEGORY_MAIL,
@ -166,6 +190,13 @@ class ProcessPostmarkWebhook implements ShouldQueue
$data = array_merge($this->request, ['history' => $this->fetchMessage()]); $data = array_merge($this->request, ['history' => $this->fetchMessage()]);
$sl = $this->getSystemLog($this->request['MessageID']);
if($sl) {
$this->updateSystemLog($sl, $data);
return;
}
(new SystemLogger( (new SystemLogger(
$data, $data,
SystemLog::CATEGORY_MAIL, SystemLog::CATEGORY_MAIL,
@ -217,6 +248,13 @@ class ProcessPostmarkWebhook implements ShouldQueue
$data = array_merge($this->request, ['history' => $this->fetchMessage()]); $data = array_merge($this->request, ['history' => $this->fetchMessage()]);
$sl = $this->getSystemLog($this->request['MessageID']);
if($sl) {
$this->updateSystemLog($sl, $data);
return;
}
(new SystemLogger($data, SystemLog::CATEGORY_MAIL, SystemLog::EVENT_MAIL_BOUNCED, SystemLog::TYPE_WEBHOOK_RESPONSE, $this->invitation->contact->client, $this->invitation->company))->handle(); (new SystemLogger($data, SystemLog::CATEGORY_MAIL, SystemLog::EVENT_MAIL_BOUNCED, SystemLog::TYPE_WEBHOOK_RESPONSE, $this->invitation->contact->client, $this->invitation->company))->handle();
// if(config('ninja.notification.slack')) // if(config('ninja.notification.slack'))
@ -263,6 +301,13 @@ class ProcessPostmarkWebhook implements ShouldQueue
$data = array_merge($this->request, ['history' => $this->fetchMessage()]); $data = array_merge($this->request, ['history' => $this->fetchMessage()]);
$sl = $this->getSystemLog($this->request['MessageID']);
if($sl) {
$this->updateSystemLog($sl, $data);
return;
}
(new SystemLogger($data, SystemLog::CATEGORY_MAIL, SystemLog::EVENT_MAIL_SPAM_COMPLAINT, SystemLog::TYPE_WEBHOOK_RESPONSE, $this->invitation->contact->client, $this->invitation->company))->handle(); (new SystemLogger($data, SystemLog::CATEGORY_MAIL, SystemLog::EVENT_MAIL_SPAM_COMPLAINT, SystemLog::TYPE_WEBHOOK_RESPONSE, $this->invitation->contact->client, $this->invitation->company))->handle();
if (config('ninja.notification.slack')) { if (config('ninja.notification.slack')) {