Review and update SDK

src/Common/Constants.php

@@ -8,8 +8,8 @@ class Constants
     public const DEFAULT_LIMIT = 25;
     public const MIN_LIMIT = 10;
     public const MAX_LIMIT = 100;
-    public const POSSIBLE_EVENT_TYPES = ['queued', 'sent', 'delivered', 'soft_bounced', 'hard_bounced', 'junk', 'opened', 'clicked', 'unsubscribed', 'spam_complaints', 'opened_unique', 'clicked_unique'];
-    public const POSSIBLE_SMS_STATUSES = ['queued', 'sent', 'delivered', 'failed'];
+    public const POSSIBLE_EVENT_TYPES = ['queued', 'sent', 'delivered', 'soft_bounced', 'hard_bounced', 'junk', 'opened', 'clicked', 'unsubscribed', 'spam_complaints', 'opened_unique', 'clicked_unique', 'survey_opened', 'survey_submitted', 'deferred'];
+    public const POSSIBLE_SMS_STATUSES = ['processed', 'queued', 'sent', 'delivered', 'failed'];
     public const POSSIBLE_SMS_RECIPIENT_STATUSES = ['active', 'opt_out'];
     public const POSSIBLE_GROUP_BY_OPTIONS = ['days', 'weeks', 'months', 'years'];
     public const GROUP_BY_DAYS = 'days';
@@ -33,16 +33,28 @@ class Constants
 
     // Comparison Operators
     public const COMPARER_EQUAL = 'equal';
-    public const COMPARER_NOT_EQUQL = 'not-equal';
+    public const COMPARER_NOT_EQUAL = 'not-equal';
     public const COMPARER_CONTAINS = 'contains';
     public const COMPARER_NOT_CONTAINS = 'not-contains';
     public const COMPARER_STARTS_WITH = 'starts-with';
     public const COMPARER_ENDS_WITH = 'ends-with';
     public const COMPARER_NOT_STARTS_WITH = 'not-starts-with';
     public const COMPARER_NOT_ENDS_WITH = 'not-ends-with';
 
+    public const POSSIBLE_SMS_INBOUND_COMPARERS = [
+        self::COMPARER_EQUAL,
+        self::COMPARER_NOT_EQUAL,
+        self::COMPARER_CONTAINS,
+        self::COMPARER_NOT_CONTAINS,
+        self::COMPARER_STARTS_WITH,
+        self::COMPARER_ENDS_WITH,
+        self::COMPARER_NOT_STARTS_WITH,
+        self::COMPARER_NOT_ENDS_WITH,
+    ];
+
     // Forward Types
     public const TYPE_WEBHOOK = 'webhook';
+    public const TYPE_EMAIL = 'email';
 
     // Scheduled messages status
     public const STATUS_SCHEDULED = 'scheduled';

src/Common/Roles.php

@@ -9,4 +9,12 @@ class Roles
     public const DESIGNER = 'Designer';
     public const ACCOUNTANT = 'Accountant';
     public const CUSTOM_USER = 'Custom User';
+
+    public const ALL_ROLES = [
+        self::ADMIN,
+        self::MANAGER,
+        self::DESIGNER,
+        self::ACCOUNTANT,
+        self::CUSTOM_USER,
+    ];
 }

src/Endpoints/Activity.php

@@ -28,7 +28,7 @@ public function getAll(string $domainId, ActivityParams $activityParams): array
                     $activityParams->getLimit(),
                     Constants::MIN_LIMIT,
                     Constants::MAX_LIMIT,
-                    'Limit is supposed to be between' . Constants::MIN_LIMIT . ' and ' . Constants::MAX_LIMIT . '.'
+                    'Limit is supposed to be between ' . Constants::MIN_LIMIT . ' and ' . Constants::MAX_LIMIT . '.'
                 )
             );
         }

src/Endpoints/Blocklist.php

@@ -50,7 +50,6 @@ public function create(BlocklistParams $params): array
                 array_filter([$params->getRecipients(), $params->getPatterns()], fn ($v) => !empty($v)),
                 'Either recipients or patterns must be provided.'
             )
-            && Assertion::minLength($params->getDomainId(), 1, 'Domain id is required.')
         );
 
         return $this->httpLayer->post(

src/Endpoints/BlocklistMonitoring.php

@@ -0,0 +1,165 @@
+<?php
+
+namespace MailerSend\Endpoints;
+
+use Assert\Assertion;
+use MailerSend\Common\Constants;
+use MailerSend\Helpers\Builder\BlocklistMonitoringParams;
+use MailerSend\Helpers\Builder\BlocklistMonitoringUpdateParams;
+use MailerSend\Helpers\GeneralHelpers;
+
+class BlocklistMonitoring extends AbstractEndpoint
+{
+    protected string $endpoint = 'blocklist-monitoring';
+
+    public const POSSIBLE_SORT_BY = ['name', 'address', 'created_at', 'updated_at', 'blocklisted'];
+    public const POSSIBLE_ORDER = ['asc', 'desc'];
+
+    /**
+     * @throws \Psr\Http\Client\ClientExceptionInterface
+     * @throws \MailerSend\Exceptions\MailerSendAssertException
+     * @throws \JsonException
+     */
+    public function getAll(
+        ?int $page = null,
+        ?int $limit = Constants::DEFAULT_LIMIT,
+        ?string $query = null,
+        ?string $sortBy = null,
+        ?string $order = null
+    ): array {
+        if ($limit) {
+            GeneralHelpers::assert(
+                fn () => Assertion::range(
+                    $limit,
+                    Constants::MIN_LIMIT,
+                    Constants::MAX_LIMIT,
+                    'Limit is supposed to be between ' . Constants::MIN_LIMIT . ' and ' . Constants::MAX_LIMIT . '.'
+                )
+            );
+        }
+
+        if ($query) {
+            GeneralHelpers::assert(
+                fn () => Assertion::maxLength($query, 255, 'Query may not be greater than 255 characters.')
+            );
+        }
+
+        if ($page !== null) {
+            GeneralHelpers::assert(
+                fn () => Assertion::range($page, 1, PHP_INT_MAX, 'Page must be at least 1.')
+            );
+        }
+
+        if ($sortBy) {
+            GeneralHelpers::assert(
+                fn () => Assertion::inArray(
+                    $sortBy,
+                    self::POSSIBLE_SORT_BY,
+                    'sort_by must be one of: ' . implode(', ', self::POSSIBLE_SORT_BY) . '.'
+                )
+            );
+        }
+
+        if ($order) {
+            GeneralHelpers::assert(
+                fn () => Assertion::inArray($order, self::POSSIBLE_ORDER, 'order must be asc or desc.')
+            );
+        }
+
+        return $this->httpLayer->get(
+            $this->buildUri($this->endpoint, array_filter([
+                'page' => $page,
+                'limit' => $limit,
+                'query' => $query,
+                'sort_by' => $sortBy,
+                'order' => $order,
+            ], fn ($v) => $v !== null))
+        );
+    }
+
+    /**
+     * @throws \Psr\Http\Client\ClientExceptionInterface
+     * @throws \MailerSend\Exceptions\MailerSendAssertException
+     * @throws \JsonException
+     */
+    public function find(string $monitorId): array
+    {
+        GeneralHelpers::assert(
+            fn () => Assertion::minLength($monitorId, 1, 'Monitor id is required.')
+        );
+
+        return $this->httpLayer->get(
+            $this->buildUri("$this->endpoint/$monitorId")
+        );
+    }
+
+    /**
+     * @throws \Psr\Http\Client\ClientExceptionInterface
+     * @throws \MailerSend\Exceptions\MailerSendAssertException
+     * @throws \JsonException
+     */
+    public function create(BlocklistMonitoringParams $params): array
+    {
+        GeneralHelpers::assert(
+            fn () => Assertion::minLength($params->getAddress(), 1, 'Address is required.')
+        );
+
+        GeneralHelpers::assert(
+            fn () => Assertion::maxLength($params->getAddress(), 255, 'Address may not be greater than 255 characters.')
+        );
+
+        if ($params->getNotify() === true) {
+            if (empty($params->getNotifyEmail()) && empty($params->getNotifyAddress())) {
+                GeneralHelpers::assert(
+                    fn () => Assertion::notEmpty(null, 'Notify email or notify address is required when notify is enabled.')
+                );
+            }
+        }
+
+        return $this->httpLayer->post(
+            $this->buildUri($this->endpoint),
+            $params->toArray()
+        );
+    }
+
+    /**
+     * @throws \Psr\Http\Client\ClientExceptionInterface
+     * @throws \MailerSend\Exceptions\MailerSendAssertException
+     * @throws \JsonException
+     */
+    public function update(string $monitorId, BlocklistMonitoringUpdateParams $params): array
+    {
+        GeneralHelpers::assert(
+            fn () => Assertion::minLength($monitorId, 1, 'Monitor id is required.')
+        );
+
+        if ($params->getNotify() === true) {
+            if (empty($params->getNotifyEmail()) && empty($params->getNotifyAddress())) {
+                GeneralHelpers::assert(
+                    fn () => Assertion::notEmpty(null, 'Notify email or notify address is required when notify is enabled.')
+                );
+            }
+        }
+
+        return $this->httpLayer->put(
+            $this->buildUri("$this->endpoint/$monitorId"),
+            $params->toArray()
+        );
+    }
+
+    /**
+     * @throws \Psr\Http\Client\ClientExceptionInterface
+     * @throws \MailerSend\Exceptions\MailerSendAssertException
+     * @throws \JsonException
+     */
+    public function delete(string $monitorId): array
+    {
+        GeneralHelpers::assert(
+            fn () => Assertion::minLength($monitorId, 1, 'Monitor id is required.')
+        );
+
+        return $this->httpLayer->delete(
+            $this->buildUri("$this->endpoint/$monitorId")
+        );
+    }
+}

src/Endpoints/BulkEmail.php

@@ -29,6 +29,7 @@ public function send(array $bulkParams): array
             $recipients_mapped = GeneralHelpers::mapToArray($params->getRecipients(), Recipient::class);
             $cc_mapped = GeneralHelpers::mapToArray($params->getCc(), Recipient::class);
             $bcc_mapped = GeneralHelpers::mapToArray($params->getBcc(), Recipient::class);
+            $rcpt_to_mapped = GeneralHelpers::mapToArray($params->getRcptTo(), Recipient::class);
             $attachments_mapped = GeneralHelpers::mapToArray($params->getAttachments(), Attachment::class);
             $personalization_mapped = GeneralHelpers::mapToArray($params->getPersonalization(), Personalization::class);
 
@@ -55,6 +56,15 @@ public function send(array $bulkParams): array
                     'send_at' => $params->getSendAt(),
                     'precedence_bulk' => $params->getPrecedenceBulkHeader(),
                     'in_reply_to' => $params->getInReplyToHeader(),
+                    'settings' => [
+                        'track_clicks' => $params->trackClicks(),
+                        'track_opens' => $params->trackOpens(),
+                        'track_content' => $params->trackContent(),
+                    ],
+                    'headers' => $params->getHeaders(),
+                    'references' => $params->getReferencesHeader(),
+                    'list_unsubscribe' => $params->getListUnsubscribe(),
+                    'rcptTo' => $rcpt_to_mapped,
                 ],
                 fn ($v) => is_array($v) ? array_filter($v, fn ($v) => $v !== null) : $v !== null
             );