Changeset 15410

Timestamp:

07/07/08 23:04:15 (5 years ago)

Author:

kumatch

Message:

- Added the cancel() method.
- Changed the accept/deny argument from user_id to request_id.

Location:

events/phpframework/piece_framework/trunk

Files:

• config/orm/mappers/Users.yaml (modified) (1 diff)
• libs/Phwittr/Self.php (modified) (3 diffs)

events/phpframework/piece_framework/trunk/config/orm/mappers/Users.yaml

@@ -78 +78 @@
   query: >
     SELECT
-      id,
-      user_name,
-      image
+      friend_requests.id as id,
+      users.id as user_id,
+      users.user_name,
+      users.image
     FROM
-      users, friend_requests
-    WHERE
-      users.id = friend_requests.requester_id
-      AND friend_requests.user_id = $id
+      users
+      JOIN friend_requests ON friend_requests.requester_id = users.id
+    WHERE EXISTS
+      (SELECT *
+       FROM friend_requests
+       WHERE friend_requests.user_id = $id
+       )

events/phpframework/piece_framework/trunk/libs/Phwittr/Self.php

@@ -248 +248 @@
 
     // }}}
+    // {{{ cancel
+
+    /**
+     * 指定フレンドリクエストをキャンセルする
+     * 
+     * @param integer $requestId
+     * @return boolean
+     */
+    public function cancel($requestId)
+    {
+        $requestMapper = Piece_ORM::getMapper('FriendRequests');
+        $friendRequest = $requestMapper->findById($requestId);
+        if (!$friendRequest) {
+            throw new Phwittr_Self_Exception();
+        }
+
+        if ($friendRequest->requesterId !== $this->id) {
+            throw new Phwittr_Self_Exception();
+        }
+
+        $requestMapper->delete($friendRequest);
+    }
+
+    // }}}
     // {{{ accept
 
     /**
-     * 指定ユーザのフォローを許可する
-     * 
-     * @param integer $userId
+     * 指定フレンドリクエストを許可する
+     * 
+     * @param integer $requestId
      * @return boolean
      */
-    public function accept($userId)
+    public function accept($requestId)
     {
         $requestMapper = Piece_ORM::getMapper('FriendRequests');
-        $criteria->userId = $this->id;
-        $criteria->requesterId = $userId;
-        $friendRequest = $requestMapper->findByUserIdAndRequesterId($criteria);
+        $friendRequest = $requestMapper->findById($requestId);
         if (!$friendRequest) {
             throw new Phwittr_Self_Exception();
         }
 
+        if ($friendRequest->userId !== $this->id) {
+            throw new Phwittr_Self_Exception();
+        }
+
         $entity = Piece_ORM::createObject('Followers');
-        $entity->userId = $userId;
-        $entity->followId = $this->id;
+        $entity->userId = $friendRequest->requesterId;
+        $entity->followId = $friendRequest->userId;
         $entity->createdAt = date('Y-m-d H:i:s');
 
@@ -276 +302 @@
             $followerMapper->insert($entity);
             $requestMapper->delete($friendRequest);
-            
         } catch (Exception $e) {
             if ($e->getCode() === PIECE_ORM_ERROR_CONSTRAINT) {
@@ -290 +315 @@
 
     /**
-     * 指定ユーザのフォローを拒否する
-     * 
-     * @param integer $userId
+     * 指定フレンドリクエストを拒否する
+     * 
+     * @param integer $requestId
      * @return boolean
      */
-    public function deny($userId)
+    public function deny($requestId)
     {
         $requestMapper = Piece_ORM::getMapper('FriendRequests');
-        $criteria->userId = $this->id;
-        $criteria->requesterId = $userId;
-        $friendRequest = $requestMapper->findByUserIdAndRequesterId($criteria);
+        $friendRequest = $requestMapper->findById($requestId);
         if (!$friendRequest) {
             throw new Phwittr_Self_Exception();
         }
 
-        try {
-            $requestMapper->delete($friendRequest);
-            
-        } catch (Exception $e) {
-            if ($e->getCode() === PIECE_ORM_ERROR_CONSTRAINT) {
-                throw new Phwittr_Self_Exception();
-            } else {
-                throw new Exception();
-            }
-        }
+        if ($friendRequest->userId !== $this->id) {
+            throw new Phwittr_Self_Exception();
+        }
+
+        $requestMapper->delete($friendRequest);
     }