svn commit: r704148 - in /incubator/shindig/trunk/php/src/social: sample/JsonDbOpensocialService.php service/ActivityHandler.php spi/ActivityService.php

[chabotc]

Author: chabotc
Date: Mon Oct 13 09:14:58 2008
New Revision: 704148

URL: http://svn.apache.org/viewvc?rev=704148&view=rev
Log:
Support deleting of activities in the SPI

Modified:
    incubator/shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php
    incubator/shindig/trunk/php/src/social/service/ActivityHandler.php
    incubator/shindig/trunk/php/src/social/spi/ActivityService.php

Modified: 
incubator/shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php?rev=704148&r1=704147&r2=704148&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php 
(original)
+++ incubator/shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php 
Mon Oct 13 09:14:58 2008
@@ -327,6 +327,11 @@
                $this->saveDb($db);
                return new ResponseItem(null, null, array());
        }
+       
+       public function deleteActivities($userId, $groupId, $appId, 
$activityIds, SecurityToken $token)
+       {
+               throw new SocialSpiException("Not implemented", 
ResponseError::$NOT_IMPLEMENTED);
+       }
 
        public function createMessage($userId, $message, SecurityToken $token)
        {

Modified: incubator/shindig/trunk/php/src/social/service/ActivityHandler.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social/service/ActivityHandler.php?rev=704148&r1=704147&r2=704148&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/service/ActivityHandler.php 
(original)
+++ incubator/shindig/trunk/php/src/social/service/ActivityHandler.php Mon Oct 
13 09:14:58 2008
@@ -21,7 +21,7 @@
 class ActivityHandler extends DataRequestHandler {
        private $service;
        
-       private static $ACTIVITY_ID_PATH = 
"/activities/{userId}/{groupId}/{activityId}";
+       private static $ACTIVITY_ID_PATH = 
"/activities/{userId}/{groupId}/appId/{activityId}";
 
        public function __construct()
        {
@@ -33,13 +33,13 @@
        {
                $requestItem->applyUrlTemplate(self::$ACTIVITY_ID_PATH);
                $userIds = $requestItem->getUsers();
-               $activityIds = $request->getListParameter("activityId");
+               $activityIds = $requestItem->getListParameter("activityId");
                if (empty($userIds)) {
                        throw new InvalidArgumentException("No userId 
specified");
                } elseif (count($userIds) > 1) {
                        throw new InvalidArgumentException("Multiple userIds 
not supported");
                }
-               return $this->service->deleteActivities($userIds[0], 
$requestItem->getGroup(), $requestItem->getAppId(), $activityIds, 
$request->getToken());
+               return $this->service->deleteActivities($userIds[0], 
$requestItem->getGroup(), $requestItem->getAppId(), $activityIds, 
$requestItem->getToken());
        }
 
        /**

Modified: incubator/shindig/trunk/php/src/social/spi/ActivityService.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social/spi/ActivityService.php?rev=704148&r1=704147&r2=704148&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/spi/ActivityService.php (original)
+++ incubator/shindig/trunk/php/src/social/spi/ActivityService.php Mon Oct 13 
09:14:58 2008
@@ -22,13 +22,15 @@
        /**
         * Returns a list of activities that correspond to the passed in person 
ids.
         */
-       function getActivities($userIds, $groupId, $appId, $sortBy, $filterBy, 
$startIndex, $count, $fields, $token);
+       public function getActivities($userIds, $groupId, $appId, $sortBy, 
$filterBy, $startIndex, $count, $fields, $token);
 
-       function getActivity($userId, $groupId, $appdId, $fields, $activityId, 
SecurityToken $token);
+       public function getActivity($userId, $groupId, $appdId, $fields, 
$activityId, SecurityToken $token);
+       
+       public function deleteActivities($userId, $groupId, $appId, 
$activityIds, SecurityToken $token);
 
        /**
         * Creates the passed in activity for the given user. Once 
createActivity is
         * called, getActivities will be able to return the Activity.
         */
-       function createActivity($userId, $groupId, $appId, $fields, $activity, 
SecurityToken $token);
+       public function createActivity($userId, $groupId, $appId, $fields, 
$activity, SecurityToken $token);
 }