Author: chabotc
Date: Sun Oct 12 10:31:25 2008
New Revision: 703852
URL: http://svn.apache.org/viewvc?rev=703852&view=rev
Log:
Fixed and verified activity creation via REST, also fixed up the Activity SPI,
some params and collection fields were missing
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/service/RestRequestItem.php
incubator/shindig/trunk/php/src/social/spi/ActivityService.php
incubator/shindig/trunk/php/src/social/spi/RestfulCollection.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=703852&r1=703851&r2=703852&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php
(original)
+++ incubator/shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php
Sun Oct 12 10:31:25 2008
@@ -342,9 +342,26 @@
}
return new ResponseItem(null, null, array());
}
+
+ public function getActivity($userId, $groupId, $appdId, $fields,
$activityId, SecurityToken $token)
+ {
+ die("broken code, please use partuza to test for now");
+ $activities = $this->getActivities($userId, $groupId, null,
null, $token);
+ $activities = $activities->getResponse();
+ if ($activities instanceof RestfulCollection) {
+ $activities = $activities->getEntry();
+ foreach ($activities as $activity) {
+ if ($activity['id'] == $activityId) {
+ return new ResponseItem(null, null,
$activity);
+ }
+ }
+ }
+ return new ResponseItem(NOT_FOUND, "Activity not found", null);
+ }
- public function getActivities($userId, $groupId, $first, $max,
SecurityToken $token)
+ public function getActivities($userIds, $groupId, $appId, $sortBy,
$filterBy, $startIndex, $count, $fields, $token)
{
+ die("broken code, please use partuza to test for now");
$db = $this->getDb();
$friendsTable = $db[self::$FRIEND_LINK_TABLE];
$ids = array();
@@ -370,7 +387,7 @@
return new ResponseItem(null, null,
RestfulCollection::createFromEntry($activities));
}
- public function createActivity($userId, $activity, SecurityToken $token)
+ public function createActivity($userId, $groupId, $appId, $fields,
$activity, SecurityToken $token)
{
$db = $this->getDb();
$activitiesTable = $this->getAllActivities();
@@ -381,21 +398,6 @@
return new ResponseItem(null, null, array());
}
- public function getActivity($userId, $groupId, $activityId, $first,
$max, SecurityToken $token)
- {
- $activities = $this->getActivities($userId, $groupId, null,
null, $token);
- $activities = $activities->getResponse();
- if ($activities instanceof RestfulCollection) {
- $activities = $activities->getEntry();
- foreach ($activities as $activity) {
- if ($activity['id'] == $activityId) {
- return new ResponseItem(null, null,
$activity);
- }
- }
- }
- return new ResponseItem(NOT_FOUND, "Activity not found", null);
- }
-
public function createMessage($userId, $message, SecurityToken $token)
{
return new ResponseItem(NOT_IMPLEMENTED, "Not implemented",
null);
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=703852&r1=703851&r2=703852&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/service/ActivityHandler.php
(original)
+++ incubator/shindig/trunk/php/src/social/service/ActivityHandler.php Sun Oct
12 10:31:25 2008
@@ -65,13 +65,10 @@
if (count($optionalActivityIds) == 1) {
return $this->service->getActivity($userIds[0],
$requestItem->getGroup(), $requestItem->getAppId(), $requestItem->getFields(),
$optionalActivityIds[0], $requestItem->getToken());
} else {
- return
$this->service->getActivities($userIds[0], $requestItem->getGroup(),
$requestItem->getAppId(), $requestItem->getFields(), $optionalActivityIds,
$requestItem->getToken());
+ return
$this->service->getActivities($userIds[0], $requestItem->getGroup(),
$requestItem->getAppId(), $requestItem->getSortBy(),
$requestItem->getFilterBy(), $requestItem->getStartIndex(),
$requestItem->getCount(), $requestItem->getFields(), $optionalActivityIds,
$requestItem->getToken());
}
}
- return $this->service->getActivities($userIds,
$requestItem->getGroup(), $requestItem->getAppId(),
- // TODO: add pagination and sorting support
- // getSortBy(params), getFilterBy(params),
getStartIndex(params), getCount(params),
- $requestItem->getFields(), $requestItem->getToken());
+ return $this->service->getActivities($userIds,
$requestItem->getGroup(), $requestItem->getAppId(), $requestItem->getSortBy(),
$requestItem->getFilterBy(), $requestItem->getStartIndex(),
$requestItem->getCount(), $requestItem->getFields(), $requestItem->getToken());
}
/**
Modified: incubator/shindig/trunk/php/src/social/service/RestRequestItem.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social/service/RestRequestItem.php?rev=703852&r1=703851&r2=703852&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/service/RestRequestItem.php
(original)
+++ incubator/shindig/trunk/php/src/social/service/RestRequestItem.php Sun Oct
12 10:31:25 2008
@@ -67,9 +67,11 @@
break;
case DataServiceServlet::$ACTIVITY_ROUTE:
$data =
$this->inputConverter->convertActivities($this->postData);
+ $this->params['activity'] = $data;
break;
case DataServiceServlet::$APPDATA_ROUTE:
$data =
$this->inputConverter->convertAppData($this->postData);
+ $this->params['data'] = $data;
break;
case DataServiceServlet::$MESSAGE_ROUTE:
$data =
$this->inputConverter->convertMessages($this->postData);
@@ -78,7 +80,7 @@
throw new Exception("Invalid or unknown service
endpoint: $service");
break;
}
- $this->params['data'] = $data;
+
}
static function getServiceFromPath($pathInfo)
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=703852&r1=703851&r2=703852&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/spi/ActivityService.php (original)
+++ incubator/shindig/trunk/php/src/social/spi/ActivityService.php Sun Oct 12
10:31:25 2008
@@ -21,21 +21,14 @@
/**
* Returns a list of activities that correspond to the passed in person
ids.
- * @param ids The ids of the people to fetch activities for.
- * @param token A valid SecurityToken
- * @return a response item with the list of activities.
*/
- function getActivities($userId, $groupId, $first, $max, SecurityToken
$token);
+ function getActivities($userIds, $groupId, $appId, $sortBy, $filterBy,
$startIndex, $count, $fields, $token);
- function getActivity($userId, $groupId, $activityId, $first, $max,
SecurityToken $token);
+ function getActivity($userId, $groupId, $appdId, $fields, $activityId,
SecurityToken $token);
/**
* Creates the passed in activity for the given user. Once
createActivity is
* called, getActivities will be able to return the Activity.
- * @param personId The id of the person to create the activity for.
- * @param activity The activity to create.
- * @param token A valid SecurityToken
- * @return a response item containing any errors
*/
- function createActivity($userId, $activity, SecurityToken $token);
+ function createActivity($userId, $groupId, $appId, $fields, $activity,
SecurityToken $token);
}
Modified: incubator/shindig/trunk/php/src/social/spi/RestfulCollection.php
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social/spi/RestfulCollection.php?rev=703852&r1=703851&r2=703852&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/spi/RestfulCollection.php (original)
+++ incubator/shindig/trunk/php/src/social/spi/RestfulCollection.php Sun Oct 12
10:31:25 2008
@@ -69,9 +69,9 @@
return $this->itemsPerPage;
}
- public function setItemsPerPage($startIndex)
+ public function setItemsPerPage($itemsPerPage)
{
- $this->startIndex = itemsPerPage;
+ $this->itemsPerPage = $itemsPerPage;
}
public function getTotalResults()
