add error handling

Author: samanthajayasinghe

lib/API/Client.php

@@ -247,9 +247,18 @@ public function get(HTTPRequest $request)
             ];
             $response = $this->getHttpClient()
                 ->get($request->buildEndPoint(), $data);
-            return new HTTPResponse($response);
+
+            $httpResponse = new HTTPResponse($response);
+            return $httpResponse;
         } catch (RequestException $e) {
-            echo $e->getMessage();
+            if ($e->hasResponse()) {
+                $httpResponse = new HTTPResponse($e);
+                $httpResponse->setStatusCode($e->getCode());
+                return $httpResponse;
+            } else{
+                throw $e;
+            }
+
         }
 
     }

lib/API/HTTPResponse.php

@@ -23,19 +23,46 @@ class HTTPResponse {
 
     private $response = null ;
 
+    private $statusCode = 200;
+
+    private $result = null;
+
     public function __construct($response) {
         $this->response = $response;
     }
 
-    public function getStatusCode(){
+    /**
+     * @return null
+     */
+    public function getStatusCode()
+    {
+        $result = $this->getResult();
+        if(isset($result['error'])) {
+            return $result['error']['status'];
+        } else{
+            return $this->statusCode;
+        }
 
     }
 
+    /**
+     * @param null $statusCode
+     * @return $this;
+     */
+    public function setStatusCode($statusCode)
+    {
+        $this->statusCode = $statusCode;
+        return $this;
+    }
+
     /**
      * @return array
      */
     public function getResult() {
-       return json_decode($this->getResponse()->getBody()->getContents(), true);
+        if(empty($this->result)){
+            $this->result = json_decode($this->getResponse()->getBody()->getContents(), true);
+        }
+       return $this->result ;
     }
 
     /**
@@ -57,4 +84,18 @@ public function getToken() {
         }
     }
 
+    public function hasError() {
+
+        $result = $this->getResult();
+        return isset($result['error']);
+    }
+
+    public function getError() {
+        $result = $this->getResult();
+        if(isset($result['error'])) {
+            return $result['error']['text'];
+        }
+
+    }
+
 }

test/ClientTest.php

@@ -42,4 +42,12 @@ public function testGetRequest() {
 
         $this->assertArrayHasKey('data',$result->getResult());
     }
+
+    public function testErrorResult() {
+        $request = new HTTPRequest('leave/search?fromDate="2005-11-30"&toDate="2005-12-30"');
+        $result = $this->client->get($request);
+        $this->assertTrue($result->hasError());
+        $this->assertEquals('toDate must be a valid date. Sample format: "2005-12-30"',$result->getError());
+        $this->assertEquals(202,$result->getStatusCode());
+    }
 }