wip

vormkracht10 · Sep 7, 2024 · 539e31c · 539e31c
1 parent 4b8db54
commit 539e31c
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 16 deletions.
diff --git a/config/mails.php b/config/mails.php
@@ -108,11 +108,11 @@
     ],
 
     'events' => [
-        'soft_bounce' => [
+        'soft_bounced' => [
             'notify' => ['mail'],
         ],
 
-        'hard_bounce' => [
+        'hard_bounced' => [
             'notify' => ['mail'],
         ],
 
@@ -128,7 +128,7 @@
             'treshold' => 99,
         ],
 
-        'complaint' => [
+        'complained' => [
             //
         ],
 

diff --git a/database/factories/MailEventFactory.php b/database/factories/MailEventFactory.php
@@ -21,7 +21,7 @@ public function bounce(): Factory
     {
         return $this->state(function () {
             return [
-                'type' => 'hard_bounce',
+                'type' => 'hard_bounced',
             ];
         });
     }

diff --git a/src/Actions/SendHighBounceRateNotifications.php b/src/Actions/SendHighBounceRateNotifications.php
@@ -2,9 +2,9 @@
 
 namespace Vormkracht10\Mails\Actions;
 
-use Vormkracht10\Mails\Listeners\Concerns\SendsNotifications;
 use Vormkracht10\Mails\Notifications\HighBounceRateNotification;
 use Vormkracht10\Mails\Shared\AsAction;
+use Vormkracht10\Mails\Traits\SendsNotifications;
 
 class SendHighBounceRateNotifications
 {

diff --git a/src/Drivers/MailgunDriver.php b/src/Drivers/MailgunDriver.php
@@ -38,7 +38,7 @@ public function getUuidFromPayload(array $payload): ?string
 
     protected function getTimestampFromPayload(array $payload)
     {
-        return $payload['DeliveredAt'] ?? $payload['BouncedAt'] ?? $payload['ReceivedAt'] ?? now();
+        return $payload['event-data']['timestamp'];
     }
 
     public function eventMapping(): array
@@ -48,9 +48,9 @@ public function eventMapping(): array
             EventType::CLICKED->value => ['event-data.event' => 'clicked'],
             EventType::COMPLAINED->value => ['event-data.event' => 'complained'],
             EventType::DELIVERED->value => ['event-data.event' => 'delivered'],
-            EventType::SOFT_BOUNCED->value => ['event-data.event' => 'failed', 'severity' => 'temporary'],
-            EventType::HARD_BOUNCED->value => ['event-data.event' => 'failed', 'severity' => 'permanent'],
+            EventType::HARD_BOUNCED->value => ['event-data.event' => 'failed', 'event-data.severity' => 'permanent'],
             EventType::OPENED->value => ['event-data.event' => 'opened'],
+            EventType::SOFT_BOUNCED->value => ['event-data.event' => 'failed', 'event-data.severity' => 'temporary'],
             EventType::UNSUBSCRIBED->value => ['event-data.event' => 'unsubscribed'],
         ];
     }

diff --git a/src/Listeners/NotifyOnBounce.php b/src/Listeners/NotifyOnBounce.php
@@ -3,8 +3,8 @@
 namespace Vormkracht10\Mails\Listeners;
 
 use Vormkracht10\Mails\Events\MailHardBounced;
-use Vormkracht10\Mails\Listeners\Concerns\SendsNotifications;
 use Vormkracht10\Mails\Notifications\BounceNotification;
+use Vormkracht10\Mails\Traits\SendsNotifications;
 
 class NotifyOnBounce
 {

diff --git a/src/Listeners/NotifyOnSpamComplaint.php b/src/Listeners/NotifyOnSpamComplaint.php
@@ -3,8 +3,8 @@
 namespace Vormkracht10\Mails\Listeners;
 
 use Vormkracht10\Mails\Events\MailComplained;
-use Vormkracht10\Mails\Listeners\Concerns\SendsNotifications;
 use Vormkracht10\Mails\Notifications\SpamComplaintNotification;
+use Vormkracht10\Mails\Traits\SendsNotifications;
 
 class NotifyOnSpamComplaint
 {

diff --git a/src/Notifications/BounceNotification.php b/src/Notifications/BounceNotification.php
@@ -10,7 +10,7 @@
 use NotificationChannels\Discord\DiscordMessage;
 use NotificationChannels\Telegram\TelegramMessage;
 use Vormkracht10\Mails\Models\Mail;
-use Vormkracht10\Mails\Notifications\Concerns\HasDynamicDrivers;
+use Vormkracht10\Mails\Traits\HasDynamicDrivers;
 
 class BounceNotification extends Notification implements ShouldQueue
 {

diff --git a/src/Notifications/HighBounceRateNotification.php b/src/Notifications/HighBounceRateNotification.php
@@ -9,7 +9,7 @@
 use Illuminate\Notifications\Notification;
 use NotificationChannels\Discord\DiscordMessage;
 use NotificationChannels\Telegram\TelegramMessage;
-use Vormkracht10\Mails\Notifications\Concerns\HasDynamicDrivers;
+use Vormkracht10\Mails\Traits\HasDynamicDrivers;
 
 class HighBounceRateNotification extends Notification implements ShouldQueue
 {

diff --git a/src/Notifications/SpamComplaintNotification.php b/src/Notifications/SpamComplaintNotification.php
@@ -9,7 +9,7 @@
 use NotificationChannels\Discord\DiscordMessage;
 use NotificationChannels\Telegram\TelegramMessage;
 use Vormkracht10\Mails\Models\Mail;
-use Vormkracht10\Mails\Notifications\Concerns\HasDynamicDrivers;
+use Vormkracht10\Mails\Traits\HasDynamicDrivers;
 
 class SpamComplaintNotification extends Notification implements ShouldQueue
 {

diff --git a/...ifications/Concerns/HasDynamicDrivers.php → src/Traits/HasDynamicDrivers.php b/...ifications/Concerns/HasDynamicDrivers.php → src/Traits/HasDynamicDrivers.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Vormkracht10\Mails\Notifications\Concerns;
+namespace Vormkracht10\Mails\Traits;
 
 trait HasDynamicDrivers
 {

diff --git a/...Listeners/Concerns/SendsNotifications.php → src/Traits/SendsNotifications.php b/...Listeners/Concerns/SendsNotifications.php → src/Traits/SendsNotifications.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Vormkracht10\Mails\Listeners\Concerns;
+namespace Vormkracht10\Mails\Traits;
 
 use Illuminate\Notifications\Notification;
 use Illuminate\Support\Facades\Notification as Notifications;

diff --git a/tests/PostmarkTest.php b/tests/PostmarkTest.php
@@ -124,7 +124,7 @@
     ])->assertAccepted();
 
     assertDatabaseHas((new MailEvent)->getTable(), [
-        'type' => EventType::HARD_BOUNCED->value,
+        'type' => EventType::SOFT_BOUNCED->value,
     ]);
 });