Merge pull request #30 from topcoder-platform/issues-229

Issues-229

Author: jmgasper

controllers/api/GroupsApiController.php

@@ -192,11 +192,14 @@ public function post_members($id, array $body) {
         if(!$user) {
             throw new NotFoundException('User');
         }
+
         if(!$this->groupModel->canManageMembers($group)) {
             throw new ClientException('Don\'t have permissions to add a member to this group.');
         }
 
-        $this->groupModel->join($group->GroupID, $user->UserID);
+        $watch = $body['watch'];
+        $follow = $body['follow'];
+        $this->groupModel->join($group->GroupID, $user->UserID, $watch, $follow);
     }
 
     /**
@@ -263,6 +266,8 @@ public function groupMemberPostSchema($type) {
             $this->groupMemberPostSchema = $this->schema(
                 Schema::parse([
                     'userID:i?' => 'The userID.',
+                    'watch:b?' => 'Watch all group categories',
+                    'follow:b?' => 'Follow all group categories',
                 ]),
                 'GroupMemberPost'
             );

models/class.groupmodel.php

@@ -814,17 +814,23 @@ public function checkPermission($userID,$groupID,$permissions = null, $fullMatch
     }
 
     /**
-     * Join a new member
+     * Join a new member.
      * @param $GroupID
      * @param $UserID
+     * @param bool $watched
+     * @param bool $followed
      * @return bool|Gdn_DataSet|object|string
      */
-    public function join($GroupID, $UserID){
+    public function join($GroupID, $UserID, $watched = true, $followed = true ){
         $Fields = ['Role' => GroupModel::ROLE_MEMBER, 'GroupID' => $GroupID,'UserID' => $UserID, 'DateInserted' => Gdn_Format::toDateTime()];
         if( $this->SQL->getWhere('UserGroup', ['GroupID' => $GroupID,'UserID' => $UserID])->numRows() == 0) {
             $this->SQL->insert('UserGroup', $Fields);
-            $this->followGroup($GroupID, $UserID);
-            $this->watchGroup($GroupID, $UserID);
+            if($followed) {
+                $this->followGroup($GroupID, $UserID);
+            }
+            if($watched) {
+                $this->watchGroup($GroupID, $UserID);
+            }
             $this->notifyJoinGroup($GroupID, $UserID);
         }
     }

openapi/groups.yml

@@ -271,6 +271,12 @@ components:
         userID:
           description: The Vanilla user ID
           type: integer
+        watch:
+          description: Watch all group categories
+          type: boolean
+        follow:
+          description: Follow all group categories
+          type: boolean
       required:
         - userID
       type: object