Merge pull request #11 from tarfin-labs/add-an-exception-for-unhandle…

…d-error-codes Add an exception for unhandled error codes
tarfin-labs · Mar 4, 2020 · 7860bfe · 7860bfe
2 parents e3138e0 + d353957
commit 7860bfe
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to `netgsm` will be documented in this file
 
 ## Unreleased
+
+## 2.1.0 - 2020-03-04
+
+- added an exception for unhandled netgsm error codes.
 - Laravel 7 support added.
 
 ## 2.0.0 - 2020-03-02

diff --git a/src/Balance/NetgsmAvailableCredit.php b/src/Balance/NetgsmAvailableCredit.php
@@ -52,7 +52,7 @@ public function parseResponse(): ?string
         $code = $result[0];
 
         if (! in_array($code, $this->successCodes)) {
-            $message = $this->errorCodes[$code];
+            $message = $this->errorCodes[$code] ?? NetgsmErrors::SYSTEM_ERROR;
             throw new NetgsmException($message, $code);
         }
 

diff --git a/src/Balance/NetgsmPackages.php b/src/Balance/NetgsmPackages.php
@@ -39,7 +39,7 @@ public function parseResponse(): array
         $availablePackages = [];
 
         if (array_key_exists($this->response, $this->errorCodes)) {
-            $message = $this->errorCodes[$this->response];
+            $message = $this->errorCodes[$this->response] ?? NetgsmErrors::SYSTEM_ERROR;
             throw new NetgsmException($message, $this->response);
         }
 

diff --git a/src/NetgsmErrors.php b/src/NetgsmErrors.php
@@ -19,4 +19,5 @@ class NetgsmErrors
     const SYSTEM_ERROR = 'Sistem hatası.';
     const NETGSM_GENERAL_ERROR = 'Netgsm responded with an error :';
     const NO_RECORD = 'No records';
+    const JOB_ID_NOT_FOUND = 'Job id not found';
 }
diff --git a/src/Sms/AbstractNetgsmMessage.php b/src/Sms/AbstractNetgsmMessage.php
@@ -8,6 +8,7 @@
 use Psr\Http\Message\ResponseInterface;
 use TarfinLabs\Netgsm\Exceptions\CouldNotSendNotification;
 use TarfinLabs\Netgsm\Exceptions\IncorrectPhoneNumberFormatException;
+use TarfinLabs\Netgsm\Exceptions\NetgsmException;
 use TarfinLabs\Netgsm\NetgsmApiClient;
 use TarfinLabs\Netgsm\NetgsmErrors;
 
@@ -316,6 +317,7 @@ public function getJobId(): string
      *
      * @return $this
      * @throws CouldNotSendNotification
+     * @throws NetgsmException
      */
     public function parseResponse(): self
     {
@@ -325,12 +327,17 @@ public function parseResponse(): self
             throw new CouldNotSendNotification(NetgsmErrors::NETGSM_GENERAL_ERROR);
         }
 
-        if (! in_array($result[0], self::SUCCESS_CODES)) {
-            $message = $this->errorCodes[$result[0]];
+        $code = $result[0];
+        if (! in_array($code, self::SUCCESS_CODES)) {
+            $message = $this->errorCodes[$code] ?? NetgsmErrors::SYSTEM_ERROR;
             throw new CouldNotSendNotification($message);
         }
 
-        $this->code = $result[0];
+        if (! isset($result[1])) {
+            throw new NetgsmException(NetgsmErrors::JOB_ID_NOT_FOUND);
+        }
+
+        $this->code = $code;
         $this->jobId = $result[1];
 
         return $this;
@@ -342,6 +349,7 @@ public function parseResponse(): self
      * @return $this
      * @throws CouldNotSendNotification
      * @throws GuzzleException
+     * @throws NetgsmException
      */
     protected function sendViaGet(): self
     {
@@ -356,6 +364,7 @@ protected function sendViaGet(): self
      * @return $this
      * @throws CouldNotSendNotification
      * @throws GuzzleException
+     * @throws NetgsmException
      */
     protected function sendViaXml(): self
     {

diff --git a/tests/NetGsmTest.php b/tests/NetGsmTest.php
@@ -7,6 +7,7 @@
 use Mockery;
 use TarfinLabs\Netgsm\Exceptions\CouldNotSendNotification;
 use TarfinLabs\Netgsm\Exceptions\IncorrectPhoneNumberFormatException;
+use TarfinLabs\Netgsm\Exceptions\NetgsmException;
 use TarfinLabs\Netgsm\Netgsm;
 use TarfinLabs\Netgsm\Sms\NetgsmSmsMessage;
 
@@ -83,7 +84,24 @@ public function should_throw_exception_when_return_code_is_not_success()
             ->andReturn(new Response(
                 $status = 200,
                 $headers = [],
-                $this->faker->randomElement(['20', '30', '40', '70'])
+                $this->faker->randomElement(['20', '30', '40', '70', '52'])
+            ));
+
+        $this->netgsm->sendSms($this->newSmsMessage());
+    }
+
+    /**
+     * @test
+     */
+    public function should_throw_exception_when_is_no_job_id_in_response()
+    {
+        $this->expectException(NetgsmException::class);
+
+        $this->httpClient->shouldReceive('request')
+            ->andReturn(new Response(
+                $status = 200,
+                $headers = [],
+                $this->faker->randomElement(['00', '01', '02'])
             ));
 
         $this->netgsm->sendSms($this->newSmsMessage());