complete getActivities

Author: pterk

lib/GetStream/Stream/Activities.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace GetStream\Stream;
+
+class Activities extends Feed
+{
+    /**
+     * @var string
+     */
+    protected $token;
+
+    /**
+     * @param Client $client
+     * @param string $api_key
+     * @param string $token
+     */
+    public function __construct($client, $api_key, $token)
+    {
+        $this->client = $client;
+        $this->api_key = $api_key;
+        $this->token = $token;
+    }
+
+    /**
+     * @param string $resource
+     * @param string $action
+     *
+     * @return array
+     */
+    protected function getHttpRequestHeaders($resource, $action)
+    {
+        $headers = parent::getHttpRequestHeaders($resource, $action);
+        $headers['Authorization'] = $this->token;
+
+        return $headers;
+    }
+
+    public function _getActivities($query_params)
+    {
+        if (empty($query_params)) {
+            return;
+        }
+
+        return $this->makeHttpRequest('activities/', 'GET', null, $query_params);
+    }
+}

lib/GetStream/Stream/Client.php

@@ -1,6 +1,7 @@
 <?php
 namespace GetStream\Stream;
 
+use DateTime;
 use Exception;
 
 const VERSION = '2.6.0';
@@ -237,10 +238,15 @@ public function getActivities($ids=null, $foreign_id_times=null)
             $times = [];
             foreach($foreign_id_times as $fit){
                 $fids[] = $fit[0];
-                $times[] = $fit[1];
+                try {
+                    $times[] = $fit[1]->format(DateTime::ISO8601);
+                } catch(Exception $e) {
+                    // assume it's in the right format already
+                    $times[] = $fit[1];
+                }
             }
             $query_params = [
-                "foreign_ids" => join(',', $fid),
+                "foreign_ids" => join(',', $fids),
                 "timestamps" => join(',', $times)
             ];
 
@@ -255,7 +261,6 @@ public function updateActivities($activities)
         if (empty($activities)) {
             return;
         }
-
         $token = $this->signer->jwtScopeToken('*', 'activities', '*');
         $activityUpdateOp = new ActivityUpdateOperation($this, $this->api_key, $token);
         return $activityUpdateOp->updateActivities($activities);
@@ -266,7 +271,6 @@ public function updateActivity($activity)
         return $this->updateActivities([$activity]);
     }
 
-
     /**
      * Creates a redirect url for tracking the given events in the context of
      * getstream.io/personalization

tests/integration/FeedTest.php

@@ -696,6 +696,14 @@ public function testGetActivities(){
         $this->assertCount(2, $activities);
         $ids = [$activities[0]['id'], $activities[1]['id']];
         $response = $this->client->getActivities($ids=$ids)['results'];
-        $this->assertEquals($activities, $response, $canonicalize=true);
+        $this->assertCount(2, $response);
+        $this->assertEquals(sort($activities), sort($response), $canonicalize=true);
+        $foreign_id_times = [
+            ['fid:ga2', $now],
+            ['fid:ga1', $now],
+        ];
+        $response = $this->client->getActivities(null, $foreign_id_times=$foreign_id_times)['results'];
+        $this->assertCount(2, $response);
+        $this->assertEquals(sort($activities), sort($response), $canonicalize=true);
     }
 }