fix

edsonalvesan · Mar 24, 2020 · b23dd22 · b23dd22
1 parent 30aea7e
commit b23dd22
Show file tree

Hide file tree

Showing 21 changed files with 199 additions and 1,271 deletions.
diff --git a/src/Api.php b/src/Api.php
diff --git a/src/Commands/Command.php b/src/Commands/Command.php
diff --git a/src/Commands/CommandBus.php b/src/Commands/CommandBus.php
diff --git a/src/Commands/CommandInterface.php b/src/Commands/CommandInterface.php
diff --git a/src/Commands/HelpCommand.php b/src/Commands/HelpCommand.php
diff --git a/src/DigiSacClient.php b/src/DigiSacClient.php
@@ -37,7 +37,7 @@ class DigiSacClient
     protected $httpClientHandler;
 
     /**
-     * Instantiates a new TelegramClient object.
+     * Instantiates a new DigiSacClient object.
      *
      * @param HttpClientInterface|null $httpClientHandler
      */
@@ -67,26 +67,36 @@ public function getHttpClientHandler()
     }
 
     /**
-     * Returns the base Bot URL.
+     * Returns the base URL begin.
      *
      * @return string
      */
-    public function getBaseBotUrl()
+    public function getBaseBotUrlBegin()
     {
         return static::BASE_API_URL_BEGIN;
     }
 
+    /**
+     * Returns the base URL begin.
+     *
+     * @return string
+     */
+    public function getBaseBotUrlEnd()
+    {
+        return static::BASE_API_URL_END;
+    }
+
     /**
      * Prepares the API request for sending to the client handler.
      *
-     * @param TelegramRequest $request
+     * @param DigiSacRequest $request
      *
      * @return array
      */
     public function prepareRequest(DigiSacRequest $request)
     {
-        $url = $this->getBaseBotUrl().$request->getAccessToken().'/'.$request->getEndpoint();
-
+        $url = $this->getBaseBotUrlBegin().$request->getUrl().$this->getBaseBotUrlEnd().'/'.$request->getEndpoint();
+        
         return [
             $url,
             $request->getMethod(),
@@ -106,8 +116,13 @@ public function prepareRequest(DigiSacRequest $request)
      */
     public function sendRequest(DigiSacRequest $request)
     {
+
         list($url, $method, $headers, $isAsyncRequest) = $this->prepareRequest($request);
 
+        if (!empty($request->getId())) { 
+            $url = $url.'/'.$request->getId();
+        }
+
         $timeOut = $request->getTimeOut();
         $connectTimeOut = $request->getConnectTimeOut();
 
@@ -116,7 +131,7 @@ public function sendRequest(DigiSacRequest $request)
         } else {
             $options = ['query' => $request->getParams()];
         }
-
+       
         $rawResponse = $this->httpClientHandler->send($url, $method, $headers, $options, $timeOut, $isAsyncRequest, $connectTimeOut);
 
         $returnResponse = $this->getResponse($request, $rawResponse);