fixes after review

pubnub · Nov 19, 2024 · ffe8702 · ffe8702
1 parent 652dfb0
commit ffe8702
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 41 deletions.
diff --git a/examples/cli/pub.php b/examples/cli/pub.php
@@ -10,7 +10,7 @@
 use PubNub\PubNub;
 use PubNub\PNConfiguration;
 
-if ($argc < 3) {
+if ($argc < 5) {
     echo "Usage: php pub.php <uuid> <channel> <message> <custom_message_type>\n";
     exit(1);
 }

diff --git a/src/PubNub/Endpoints/MessagePersistance/FetchMessages.php b/src/PubNub/Endpoints/MessagePersistance/FetchMessages.php
@@ -33,7 +33,7 @@ class FetchMessages extends Endpoint
     protected bool $includeUuid = false;
     protected bool $includeMessageType = true;
     protected bool $includeMessageActions = false;
-    protected bool $includeCustomMessageType = true;
+    protected bool $includeCustomMessageType = false;
 
     protected array $customParamMapping = [
         'start' => 'start',

diff --git a/tests/Acceptance/CustomMessageType/CustomMessageTypeContext.php b/tests/Acceptance/CustomMessageType/CustomMessageTypeContext.php
@@ -87,6 +87,35 @@ public function iFetchMessageHistoryWithSetToForChannel(string $attribute, strin
         }
     }
 
+    /**
+     * @When I fetch message history with messageType for :channelName channel
+     */
+    public function iFetchMessageHistoryWithMessagetypeForChannel($channelName)
+    {
+        $this->channelName = $channelName;
+        $builder = $this->pubnub->fetchMessages()->channels($this->channelName)->includeMessageType(true);
+        try {
+            $this->response = $builder->sync();
+        } catch (PubNubServerException $e) {
+            $this->response = $e;
+        }
+    }
+
+    /**
+     * @When I fetch message history with customMessageType for :channelName channel
+     */
+    public function iFetchMessageHistoryWithCustommessagetypeForChannel($channelName)
+    {
+        $this->channelName = $channelName;
+        $builder = $this->pubnub->fetchMessages()->channels($this->channelName)->includeCustomMessageType(true);
+
+        try {
+            $this->response = $builder->sync();
+        } catch (PubNubServerException $e) {
+            $this->response = $e;
+        }
+    }
+
     /**
      * @Then history response contains messages with :messageType1 and :messageType2 message types
      */

diff --git a/tests/Acceptance/CustomMessageType/history-custom-mssg-type.feature b/tests/Acceptance/CustomMessageType/history-custom-mssg-type.feature
diff --git a/tests/integrational/FetchMessagesTest.php b/tests/integrational/FetchMessagesTest.php
@@ -22,17 +22,18 @@ class FetchMessagesTest extends PubNubTestCase
 
     public function testFetchWithDefaults()
     {
-        $fetchMessages = new FetchMessagesExposed($this->pubnub);
+        $subKey = $this->pubnub_demo->getConfiguration()->getSubscribeKey();
+        $fetchMessages = new FetchMessagesExposed($this->pubnub_demo);
 
         $fetchMessages
             ->stubFor("/v3/history/sub-key/demo/channel/TheMessageHistoryChannelHD")
             ->withQuery([
-                "uuid" => $this->pubnub->getConfiguration()->getUserId(),
+                "uuid" => $this->pubnub_demo->getConfiguration()->getUserId(),
                 "pnsdk" => $this->encodedSdkName,
                 "include_meta" => "false",
                 "include_uuid" => "false",
                 "include_message_type" => "true",
-                "include_custom_message_type" => "true",
+                "include_custom_message_type" => "false",
             ])
             ->setResponseBody('{"status": 200, "error": false, "error_message": "", "channels":
                 {"TheMessageHistoryChannelHD":[
@@ -59,18 +60,19 @@ public function testFetchWithDefaults()
 
     public function testFetchWithCount()
     {
-        $fetchMessages = new FetchMessagesExposed($this->pubnub);
+        $subKey = $this->pubnub_demo->getConfiguration()->getSubscribeKey();
+        $fetchMessages = new FetchMessagesExposed($this->pubnub_demo);
 
         $fetchMessages
-            ->stubFor("/v3/history/sub-key/demo/channel/TheMessageHistoryChannelHD")
+            ->stubFor("/v3/history/sub-key/{$subKey}/channel/TheMessageHistoryChannelHD")
             ->withQuery([
                 "max" => "5",
-                "uuid" => $this->pubnub->getConfiguration()->getUserId(),
+                "uuid" => $this->pubnub_demo->getConfiguration()->getUserId(),
                 "pnsdk" => $this->encodedSdkName,
                 "include_meta" => "false",
                 "include_uuid" => "false",
                 "include_message_type" => "true",
-                "include_custom_message_type" => "true",
+                "include_custom_message_type" => "false",
             ])
             ->setResponseBody('{"status": 200, "error": false, "error_message": "", "channels":
                 {"TheMessageHistoryChannelHD":[
@@ -92,19 +94,20 @@ public function testFetchWithCount()
 
     public function testFetchWithStartEnd()
     {
-        $fetchMessages = new FetchMessagesExposed($this->pubnub);
+        $subKey = $this->pubnub_demo->getConfiguration()->getSubscribeKey();
+        $fetchMessages = new FetchMessagesExposed($this->pubnub_demo);
 
         $fetchMessages
-            ->stubFor("/v3/history/sub-key/demo/channel/TheMessageHistoryChannelHD")
+            ->stubFor("/v3/history/sub-key/{$subKey}/channel/TheMessageHistoryChannelHD")
             ->withQuery([
                 "start" => "17165627042258346",
                 "end" => "17165627042258546",
-                "uuid" => $this->pubnub->getConfiguration()->getUserId(),
+                "uuid" => $this->pubnub_demo->getConfiguration()->getUserId(),
                 "pnsdk" => $this->encodedSdkName,
                 "include_meta" => "false",
                 "include_uuid" => "false",
                 "include_message_type" => "true",
-                "include_custom_message_type" => "true",
+                "include_custom_message_type" => "false",
             ])
             ->setResponseBody('{"status": 200, "error": false, "error_message": "", "channels":
                 {"TheMessageHistoryChannelHD":[
@@ -126,17 +129,18 @@ public function testFetchWithStartEnd()
 
     public function testFetchEncrypted()
     {
+        $subKey = $this->pubnub_enc->getConfiguration()->getSubscribeKey();
         $fetchMessages = new FetchMessagesExposed($this->pubnub_enc);
 
         $fetchMessages
-            ->stubFor("/v3/history/sub-key/demo/channel/TheMessageHistoryChannelHD-ENCRYPTED")
+            ->stubFor("/v3/history/sub-key/{$subKey}/channel/TheMessageHistoryChannelHD-ENCRYPTED")
             ->withQuery([
-                "uuid" => $this->pubnub->getConfiguration()->getUserId(),
+                "uuid" => $this->pubnub_enc->getConfiguration()->getUserId(),
                 "pnsdk" => $this->encodedSdkName,
                 "include_meta" => "false",
                 "include_uuid" => "false",
                 "include_message_type" => "true",
-                "include_custom_message_type" => "true",
+                "include_custom_message_type" => "false",
             ])
 
             ->setResponseBody('{"status": 200, "error": false, "error_message": "", "channels": {