Merge branch 'feature/a' into develop

Author: gnello

.gitignore

@@ -1,3 +1,2 @@
 vendor/
-lab/
-Models/TeamModel.php
+lab/

README.md

@@ -61,11 +61,23 @@ $result = $driver->getUserModel()->getUserByUsername('username');
 ```
 
 ### Team data model
-In Development, coming soon!
+```php
+//Add a new team
+$requestOptions = [
+    'name'  => 'new_team',
+    'display_name'  => 'New Team',
+    'type'  => 'O',
+];
+$result = $driver->getTeamModel()->createTeam($requestOptions);
+
+
+//Get a team
+$result = $driver->getTeamModel()->getTeamByName('new_team');
+```
 
 ## ToDo
-[ ] Add Team data model (in development)  
-[ ] Add Channel data model  
+[x] Add Team data model
+[ ] Add Channel data model (in development)  
 [ ] Add Post data model  
 [ ] Add File data model  
 [ ] Add Admin data model  

src/Driver.php

@@ -11,6 +11,7 @@
 
 namespace Gnello\Mattermost;
 
+use Gnello\Mattermost\Models\TeamModel;
 use Gnello\Mattermost\Models\UserModel;
 use Pimple\Container;
 
@@ -95,4 +96,16 @@ public function getUserModel()
 
         return $this->models['user'];
     }
+
+    /**
+     * @return TeamModel
+     */
+    public function getTeamModel()
+    {
+        if (!isset($this->models['team'])) {
+            $this->models['team'] = new TeamModel($this->container['client']);
+        }
+
+        return $this->models['team'];
+    }
 }

src/Models/TeamModel.php

@@ -41,12 +41,50 @@ public function getAllTeams()
     }
 
     /**
-     * @param $team_id
      * @return \Psr\Http\Message\ResponseInterface
      */
-    public function getGetTeamMembers($team_id)
+    public function getAllTeamsUserIsMemberOf()
+    {
+        return $this->client->get(self::$endpoint . '/members');
+    }
+
+    /**
+     * @return \Psr\Http\Message\ResponseInterface
+     */
+    public function getCountUnreadMessagesAndMentionsInTeamsUserIsMemberOf()
+    {
+        return $this->client->get(self::$endpoint . '/unread');
+    }
+
+    /**
+     * @param $team_id
+     * @param $offset
+     * @param $limit
+     * @return null|\Psr\Http\Message\ResponseInterface
+     */
+    public function getTeamMembers($team_id, $offset, $limit)
+    {
+        return $this->client->get(self::$endpoint . '/' . $team_id . '/members/' . $offset . '/' . $limit);
+    }
+
+    /**
+     * @param $team_id
+     * @param $userId
+     * @return null|\Psr\Http\Message\ResponseInterface
+     */
+    public function getSingleTeamMember($team_id, $userId)
+    {
+        return $this->client->get(self::$endpoint . '/' . $team_id . '/members/' . $userId);
+    }
+
+    /**
+     * @param       $team_id
+     * @param array $requestOptions
+     * @return null|\Psr\Http\Message\ResponseInterface
+     */
+    public function getTeamMembersByIds($team_id, array $requestOptions)
     {
-        return $this->client->get(self::$endpoint . '/members/' . $team_id);
+        return $this->client->post(self::$endpoint . '/' . $team_id . '/members/ids', $requestOptions);
     }
 
     /**
@@ -58,33 +96,60 @@ public function getTeam($team_id)
         return $this->client->get(self::$endpoint . '/' . $team_id . '/me');
     }
 
+    /**
+     * @param $teamName
+     * @return \Psr\Http\Message\ResponseInterface
+     */
+    public function getTeamByName($teamName)
+    {
+        return $this->client->get(self::$endpoint . '/name/' . $teamName);
+    }
+
     /**
      * @param       $team_id
      * @param array $requestOptions
      * @return \Psr\Http\Message\ResponseInterface
      */
     public function updateTeam($team_id, array $requestOptions)
     {
-        return $this->client->post(self::$endpoint . '/teams/' . $team_id . '/update', $requestOptions);
+        return $this->client->post(self::$endpoint . '/' . $team_id . '/update', $requestOptions);
     }
 
     /**
-     * @param $team_id
-     * @param $user_id
+     * @param       $team_id
      * @return \Psr\Http\Message\ResponseInterface
      */
-    public function addUser($team_id, $user_id)
+    public function getStatsOfTeam($team_id)
     {
-        return $this->client->post(self::$endpoint . '/teams/' . $team_id . '/add_user_to_team', compact('user_id'));
+        return $this->client->get(self::$endpoint . '/' . $team_id . '/stats');
     }
 
     /**
      * @param $team_id
-     * @param $user_id
+     * @param array $requestOptions
      * @return \Psr\Http\Message\ResponseInterface
      */
-    public function removeUser($team_id, $user_id)
+    public function addUser($team_id, array $requestOptions)
+    {
+        return $this->client->post(self::$endpoint . '/' . $team_id . '/add_user_to_team', $requestOptions);
+    }
+
+    /**
+     * @param       $team_id
+     * @param array $requestOptions
+     * @return null|\Psr\Http\Message\ResponseInterface
+     */
+    public function removeUser($team_id, array $requestOptions)
+    {
+        return $this->client->post(self::$endpoint . '/' . $team_id . '/remove_user_from_team', $requestOptions);
+    }
+
+    /**
+     * @param       $team_id
+     * @return null|\Psr\Http\Message\ResponseInterface
+     */
+    public function getAllSlashCommandsOfTeam($team_id)
     {
-        return $this->client->post(self::$endpoint . '/teams/' . $team_id . '/remove_user_from_team', compact('user_id'));
+        return $this->client->get(self::$endpoint . '/' . $team_id . '/commands/list_team_commands');
     }
 }

src/Models/UserModel.php

@@ -76,7 +76,7 @@ public function getUsersList($offset, $limit)
      */
     public function getUsersListOfTeam($team_id, $offset, $limit)
     {
-        $uri = '/teams/' . $team_id . '/' . self::$endpoint . '/' . $offset . '/' . $limit;
+        $uri = TeamModel::$endpoint . '/' . $team_id . '/' . self::$endpoint . '/' . $offset . '/' . $limit;
         return $this->client->get($uri);
     }
 
@@ -113,7 +113,7 @@ public function getUserByEmail($email)
      */
     public function getUsersListByIds(array $requestOptions)
     {
-        return $this->client->post(self::$endpoint . '/ids/', $requestOptions);
+        return $this->client->post(self::$endpoint . '/ids', $requestOptions);
     }
 
     /**
@@ -125,7 +125,7 @@ public function getUsersListByIds(array $requestOptions)
      */
     public function getUserOfChannel($team_id, $channel_id, $offset, $limit)
     {
-        $uri = '/teams/' . $team_id . '/channels/' . $channel_id . '/' . self::$endpoint . '/' . $offset . '/' . $limit;
+        $uri = TeamModel::$endpoint . '/' . $team_id . '/channels/' . $channel_id . '/' . self::$endpoint . '/' . $offset . '/' . $limit;
         return $this->client->get($uri);
     }
 
@@ -138,7 +138,7 @@ public function getUserOfChannel($team_id, $channel_id, $offset, $limit)
      */
     public function getUserNotOfChannel($team_id, $channel_id, $offset, $limit)
     {
-        $uri = '/teams/' . $team_id . '/channels/' . $channel_id . '/' . self::$endpoint . '/not_in_channel/' . $offset . '/' . $limit;
+        $uri = TeamModel::$endpoint . '/' . $team_id . '/channels/' . $channel_id . '/' . self::$endpoint . '/not_in_channel/' . $offset . '/' . $limit;
         return $this->client->post($uri);
     }
 
@@ -221,7 +221,7 @@ public function autocompleteUsers(array $requestOptions)
      */
     public function autocompleteUsersOfTeam($team_id, array $requestOptions)
     {
-        $uri = '/teams/' . $team_id . '/' . self::$endpoint . '/autocomplete';
+        $uri = TeamModel::$endpoint . '/' . $team_id . '/' . self::$endpoint . '/autocomplete';
         return $this->client->get($uri, $requestOptions);
     }
 
@@ -233,7 +233,7 @@ public function autocompleteUsersOfTeam($team_id, array $requestOptions)
      */
     public function autocompleteUsersOfChannel($team_id, $channel_id, array $requestOptions)
     {
-        $uri = '/teams/' . $team_id . '/channels/' . $channel_id . '/' . self::$endpoint . '/autocomplete';
+        $uri = TeamModel::$endpoint . '/' . $team_id . '/channels/' . $channel_id . '/' . self::$endpoint . '/autocomplete';
         return $this->client->get($uri, $requestOptions);
     }
 }