Move encoding type from client to message

Author: marventhieme

README.md

@@ -57,14 +57,11 @@ Add your CMSMS Product Token and default originator (name or number of sender) t
 'cmsms' => [
     'product_token' => env('CMSMS_PRODUCT_TOKEN'),
     'originator' => env('CMSMS_ORIGINATOR'),
-    'encoding_detection_type' => env('CMSMS_ENCODING_DETECTION_TYPE', 'AUTO'),
 ],
 ...
 ```
 
-Notice:
-- The originator can contain a maximum of 11 alphanumeric characters.
-- Read about encoding detection here: https://developers.cm.com/messaging/docs/sms#auto-detect-encoding
+Notice: The originator can contain a maximum of 11 alphanumeric characters.
 
 ## Usage
 
@@ -105,6 +102,7 @@ public function routeNotificationForCmsms()
 - `body('')`: Accepts a string value for the message body.
 - `originator('')`: Accepts a string value between 1 and 11 characters, used as the message sender name.
 - `reference('')`: Accepts a string value for your message reference. This information will be returned in a status report so you can match the message and it's status. Restrictions: 1 - 32 alphanumeric characters. Reference will not work for demo accounts.
+- `encodingDetectionType('')`: Read about encoding detection here: https://developers.cm.com/messaging/docs/sms#auto-detect-encoding
 - `multipart($minimum, $maximum)`: Accepts a 0 to 8 integer range which allows multipart messages. See the [documentation from CM](https://dashboard.onlinesmsgateway.com/docs#send-a-message-multipart) for more information.
 
 ### Available events

src/CmsmsClient.php

@@ -62,11 +62,9 @@ public function send(CmsmsMessage $message, string $recipient): void
      */
     public function buildMessageJson(CmsmsMessage $message, string $recipient): string
     {
-        $encodingDetectionType = config('services.cmsms.encoding_detection_type', 'AUTO');
-
         $body = [];
         $body['content'] = $message->getBody();
-        if (strtoupper($encodingDetectionType) === 'AUTO') {
+        if (strtoupper($message->getEncodingDetectionType()) === 'AUTO') {
             $body['type'] = 'AUTO';
         }
 
@@ -94,7 +92,7 @@ public function buildMessageJson(CmsmsMessage $message, string $recipient): stri
                     'to' => [[
                         'number' => $recipient,
                     ]],
-                    'dcs' => strtoupper($encodingDetectionType) === 'AUTO' ? 0 : $encodingDetectionType,
+                    'dcs' => strtoupper($message->getEncodingDetectionType()) === 'AUTO' ? '0' : $message->getEncodingDetectionType(),
                     'from' => $message->getOriginator(),
                     ...$minimumNumberOfMessageParts,
                     ...$maximumNumberOfMessageParts,

src/CmsmsMessage.php

@@ -12,6 +12,8 @@ class CmsmsMessage
 
     protected string $reference = '';
 
+    protected string $encodingDetectionType = 'AUTO';
+
     protected ?int $minimumNumberOfMessageParts = null;
 
     protected ?int $maximumNumberOfMessageParts = null;
@@ -88,6 +90,18 @@ public function getMaximumNumberOfMessageParts(): ?int
         return $this->maximumNumberOfMessageParts;
     }
 
+    public function encodingDetectionType(string|int $encodingDetectionType): self
+    {
+        $this->encodingDetectionType = (string) $encodingDetectionType;
+
+        return $this;
+    }
+
+    public function getEncodingDetectionType(): string
+    {
+        return $this->encodingDetectionType;
+    }
+
     public static function create(string $body = ''): self
     {
         return new static($body);

tests/CmsmsClientTest.php

@@ -113,6 +113,35 @@ public function it_includes_reference_data()
         $this->assertEquals('ABC', $messageJsonObject->messages->msg[0]->reference);
     }
 
+    /** @test */
+    public function it_includes_encoding_detection_type_data_in_body()
+    {
+        $message = clone $this->message;
+        $message->encodingDetectionType('AUTO');
+
+        $messageJson = $this->client->buildMessageJson($message, '00301234');
+
+        $messageJsonObject = json_decode($messageJson);
+
+        $this->assertTrue(isset($messageJsonObject->messages->msg[0]->body->type));
+        $this->assertEquals('AUTO', $messageJsonObject->messages->msg[0]->body->type);
+        $this->assertEquals('0', $messageJsonObject->messages->msg[0]->dcs);
+    }
+
+    /** @test */
+    public function it_includes_encoding_detection_type_data_in_message()
+    {
+        $message = clone $this->message;
+        $message->encodingDetectionType(1);
+
+        $messageJson = $this->client->buildMessageJson($message, '00301234');
+
+        $messageJsonObject = json_decode($messageJson);
+
+        $this->assertFalse(isset($messageJsonObject->messages->msg[0]->body->type));
+        $this->assertEquals('1', $messageJsonObject->messages->msg[0]->dcs);
+    }
+
     /** @test */
     public function it_dispatches_a_success_event()
     {