Changeset 10756

Timestamp:

Feb 13, 2009, 6:02:04 PM (13 years ago)

Author:

ShogoKawahara

Message:

#3628:fixed opJsonDbOpensocialService for the Persistence API

Location:

OpenPNE3/plugins/opOpenSocialPlugin/trunk

Files:

• config/schema.yml (modified) (1 diff)
• lib/model/ApplicationPersistentDataPeer.php (modified) (1 diff)
• lib/update/3_0_1_to_3_0_2_dev_200902121145.php (added)
• lib/update/3_0_2_dev_200902121145_to_3_0_2_dev_200902121523.php (added)
• lib/user/opJsonDbOpensocialService.class.php (modified) (11 diffs)

OpenPNE3/plugins/opOpenSocialPlugin/trunk/config/schema.yml

@@ -45 +45 @@
   application_persistent_data:
     id: ~
-    member_application_id: { type: integer, foreignTable: member_application, foreignReference: id, onDelete: cascade }
-    key: { type: varchar(128), required: true }
+    application_id: { type: integer, foreignTable: application, foreignReference: id, onDelete: cascade }
+    member_id: { type: integer, foreignTable: member, foreignReference: id, onDelete: cascade }
+    name: { type: varchar(128), required: true }
     value: { type : longvarchar, required: true }
 

OpenPNE3/plugins/opOpenSocialPlugin/trunk/lib/model/ApplicationPersistentDataPeer.php

@@ -9 +9 @@
  */
 
+/**
+ * ApplicationPersistentDataPeer
+ *
+ * @author Shogo Kawahara <kawahara@tejimaya.net>
+ */
 class ApplicationPersistentDataPeer extends BaseApplicationPersistentDataPeer
 {
+  public static function retrieveByApplicationIdAndMemberIdAndName($applicationId, $memberId, $name)
+  {
+    $criteria = new Criteria();
+    $criteria->add(self::APPLICATION_ID, $applicationId);
+    $criteria->add(self::MEMBER_ID, $memberId);
+    $criteria->add(self::NAME, $name);
+    return self::doSelectOne($criteria);
+  }
+
+  public static function retrievesByApplicationIdAndMemberId($applicationId, $memberId, $fields = array())
+  {
+    $criteria = new Criteria();
+    $criteria->add(self::APPLICATION_ID, $applicationId);
+    $criteria->add(self::MEMBER_ID, $memberId);
+    if (count($fields))
+    {
+      $criteria->add(self::NAME, $fields, Criteria::IN);
+    }
+    return self::doSelect($criteria);
+  }
+
+  public static function getMemberFriendPersistentDatas($applicationId, $memberId, $fields = array())
+  {
+    $friendIds = MemberRelationshipPeer::getFriendMemberIds($memberId);
+    $criteria = new Criteria();
+    $criteria->add(self::APPLICATION_ID, $applicationId);
+    $criteria->add(self::MEMBER_ID, $friendIds, Criteria::IN);
+    if (count($fields))
+    {
+      $criteria->add(self::NAME, $fields, Criteria::IN);
+    }
+    return self::doSelect($criteria);
+  }
 }

OpenPNE3/plugins/opOpenSocialPlugin/trunk/lib/user/opJsonDbOpensocialService.class.php

@@ -1 +1 @@
 <?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
 
 /**
@@ -35 +43 @@
     $max   = $options->getCount();
     $ret = array();
+
     $criteria = new Criteria();
     $criteria->add(MemberPeer::ID, $ids, Criteria::IN);
     $totalSize = MemberPeer::doCount($criteria);
+
     $criteria->addAscendingOrderByColumn(MemberPeer::ID);
     if ($first !== false && $max !== false && is_numeric($first) && is_numeric($max) && $first >= 0 && $max > 0)
@@ -45 +55 @@
     }
     $members = MemberPeer::doSelect($criteria);
+
     $people = array();
     foreach ($members as $member)
     {
+      //FIXME
       $p = array();
       $p['isOwner']  =  (!$token->isAnonymous() && $member->getId() == $token->getOwnerId()) ? true : false;
@@ -79 +91 @@
       $people[] = $p;
     }
+
     $collection = new RestfulCollection($people, $options->getStartIndex(), $totalSize);
     $collection->setItemsPerPage($options->getCount());
@@ -89 +102 @@
   }
 
-  public function getActivity($userId, $groupId, $appdId, $fields, $activityId, SecurityToken $token)
+  public function getActivity($userId, $groupId, $appId, $fields, $activityId, SecurityToken $token)
   {
     throw new SocialSpiException("Not implemented", ResponseError::$NOT_IMPLEMENTED);
@@ -106 +119 @@
   public function getPersonData($userId, GroupId $groupId, $appId, $fields, SecurityToken $token)
   {
-    $ids = $this->getIdSet($userId, $groupId, $token);
-    $criteria = new Criteria();
-    $criteria->addJoin(ApplicationPersistentDataPeer::MEMBER_APPLICATION_ID, MemberApplicationPeer::ID);
-    $criteria->add(MemberApplicationPeer::APPLICATION_ID, $appId);
-    $criteria->add(MemberApplicationPeer::MEMBER_ID, $ids, Criteria::IN);
-    if (count($fields))
-    {
-      $criteria->add(ApplicationPersistentDataPeer::KEY, $fields, Criteria::IN);
-    }  
-    $persistentDatas = ApplicationPersistentDataPeer::doSelect($criteria);
-    if (!count($persistentDatas))
-    {
-      throw new SocialSpiException("UnKnown person app data key(s): ".implode(', ', $fields));
+    if (!($userId instanceof UserId))
+    {
+      throw new SocialSpiException("Not support request", ResponseError::$NOT_IMPLEMENTED);
+    }
+    $targetUserId = (int)$userId->getUserId($token);
+    $viewerId = (int)$token->getViewerId();
+    if ($targetUserId != $viewerId)
+    {
+      $memberRelationship = MemberRelationshipPeer::retrieveByFromAndTo($targetUserId, $viewerId);
+      if (!($memberRelationship && $memberRelationship->isFriend()))
+      {
+        throw new SocialSpiException("Unauthorized", ResponseError::$UNAUTHORIZED);
+      }
+    }
+   if ($groupId->getType() == 'self')
+    {
+      $appPersistentDatas = ApplicationPersistentDataPeer::retrievesByApplicationIdAndMemberId($appId, $targetUserId, $fields);
+    }
+    else if($groupId->getType() == 'friends')
+    {
+      $appPersistentDatas = ApplicationPersistentDataPeer::getMemberFriendPersistentDatas($appId, $targetUserId, $fields);  
+    }
+    else
+    {
+      throw new SocialSpiException("We support getting data only when GROUP_ID is SELF or FRIENDS ", ResponseError::$NOT_IMPLEMENTED);
     }
     $data = array();
-    foreach($persistentDatas as $persistentData)
-    {
-      $data[$persistentData->getMemberApplication()->getMemberId()][$persistentData->getKey()] = $persistentData->getValue();
+    foreach ($appPersistentDatas as $appPersistentData)
+    {
+      $data[$appPersistentData->getMemberId()][$appPersistentData->getName()] = $appPersistentData->getValue();
     }
     return new DataCollection($data);
@@ -130 +155 @@
   public function deletePersonData($userId, GroupId $groupId, $appId, $fields, SecurityToken $token)
   {
+    if (!($userId instanceof UserId) || $userId->getUserId($token) == null )
+    {
+      throw new SocialSpiException("Unknown person id", ResponseError::$NOT_FOUND);
+    }
+
+    $targetUserId = $userId->getUserId($token);
+    
+    if ($targetUserId != $token->getViewerId())
+    {
+      throw new SocialSpiException("Unauthorized", ResponseError::$UNAUTHORIZED);
+    }
+    
     foreach ($fields as $key)
     {
@@ -137 +174 @@
       }
     }
-    $ids = $this->getIdSet($userId, $groupId, $token);
-    if (count($ids) < 1)
-    {
-      throw new InvalidArgumentException("No userId specified");
-    }
-    else if (count($ids) > 1)
-    {
-      throw new InvalidArgumentException("Multiple userIds not supported");
-    }
-    $userId = $ids[0];
-    $appId = $token->getAppId();
+
+    $appPersistentDatas = ApplicationPersistentDataPeer::retrievesByApplicationIdAndMemberId($appId, $targetUserId, $fields);
+    
+    foreach ($appPersistentDatas as $appPersistentData)
+    {
+      $appPersistentData->delete();
+    }
+  }
+
+  public function updatePersonData(UserId $userId, GroupId $groupId, $appId, $fields, $values, SecurityToken $token)
+  {
+    if ($userId->getUserId($token) == null)
+    {
+      throw new SocialSpiException("Unknown person id", ResponseError::$NOT_FOUND);
+    }
+
     foreach ($fields as $key)
     {
-      $criteria = new Criteria();
-      $criteria->addJoin(ApplicationPersistentDataPeer::MEMBER_APPLICATION_ID, MemberApplicationPeer::ID);
-      $criteria->add(MemberApplicationPeer::APPLICATION_ID, $appId);
-      $criteria->add(MemberApplicationPeer::MEMBER_ID, $userId);
-      $criteria->add(ApplicationPersistentDataPeer::KEY, $key);
-      $persistentData = ApplicationPersistentDataPeer::doSelectOne($criteria);
-      if (!$persistentData)
-      {
-        throw new SocialSpiException("Internal server error", ResponseError::$INTERNAL_ERROR);
-      }
-      $persistentData->delete();
-    }
-  }
-
-  public function updatePersonData(UserId $userId, GroupId $groupId, $appId, $fields, $values, SecurityToken $token)
-  {
-    if ($userId->getUserId($token) == null)
-    {
-      throw new SocialSpiException("Unknown person id.", ResponseError::$NOT_FOUND);
-    }
-
-    foreach ($fields as $key)
-    {
       if (!preg_match('/[\w\-\.]+/',$key))
       {
@@ -178 +197 @@
       }
     }
-    switch ($groupId->getType())
-    {
-      case 'self':
-        foreach ($fields as $key)
+
+    if ($groupId->getType() != 'self')
+    {
+      throw new SocialSpiException("We don't support updating data in batches yet", ResponseError::$NOT_IMPLEMENTED);
+    }
+
+    $targetUserId = $userId->getUserId($token);
+    if ($token->getOwnerId() == $targetUserId || $token->getViewerId() == $targetUserId)
+    {
+      $memberApplication = MemberApplicationPeer::retrieveByApplicationIdAndMemberId($appId, $targetUserId);
+      if (!$memberApplication)
+      {
+        throw new SocialSpiException("Unauthorized", ResponseError::$UNAUTHORIZED);
+      }
+
+      foreach($fields as $name)
+      {
+        $value = isset($values[$name]) ? $values[$name] : null;
+        $appPersistentData = ApplicationPersistentDataPeer::retrieveByApplicationIdAndMemberIdAndName($appId, $targetUserId, $name);
+        if (!$appPersistentData)
         {
-          $value = isset($values[$key]) ? $values[$key] : null;
-          $criteria = new Criteria();
-
-          $criteria->add(ApplicationPersistentDataPeer::MEMBER_APPLICATION_ID, $token->getModuleId());
-          $criteria->add(ApplicationPersistentDataPeer::KEY, $key);
-          $persistentData = ApplicationPersistentDataPeer::doSelectOne($criteria);
-          if (!$persistentData)
-          {
-            $persistentData = new ApplicationPersistentData();
-            $persistentData->setMemberApplicationId($token->getModuleId());
-            $persistentData->setKey($key);
-          }
-          $persistentData->setValue($value);
-          $persistentData->save();
+          $appPersistentData = new ApplicationPersistentData();
+          $appPersistentData->setApplicationId($appId);
+          $appPersistentData->setMemberId($targetUserId);
+          $appPersistentData->setName($name);
         }
-        break;
-      default:
-        throw new SocialSpiException("We don't support updating data in batches yet", ResponseError::$NOT_IMPLEMENTED);
+        $appPersistentData->setValue($value);
+        $appPersistentData->save();
+      }
+    }
+    else
+    {
+      throw new SocialSpiException("Unauthorized", ResponseError::$UNAUTHORIZED);
     }
   }
@@ -209 +238 @@
   }
 
-  private function getIdSet($user, GroupId $group, SecurityToken $token)
+  protected function getIdSet($user, GroupId $group, SecurityToken $token)
   {
     $ids = array();
@@ -224 +253 @@
         case 'friends':
         case 'groupId':
-
-          $criteria = new Criteria();
-          $criteria->add(MemberRelationshipPeer::MEMBER_ID_FROM,$userId);
-          $criteria->add(MemberRelationshipPeer::IS_FRIEND, true);
-          $friends = MemberRelationshipPeer::doSelect($criteria);
-          
-          $friendIds = array();
-          foreach ($friends as $friend)
-          {
-            $friendIds[] = $friend->getMemberIdTo();
-          }
-          if (count($friendIds))
-          {
-            $ids = $friendIds;
-          }
+          $ids = MemberRelationshipPeer::getFriendMemberIds($userId);
           break;
         case 'self':