Return only assigned projects to team users (ActiveLearningStudio#203)

Author: yurysakovich1010

.env.example

@@ -48,9 +48,11 @@ MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
 MATTERMOST_SERVER=default
+MATTERMOST_AUTH=default
 MATTERMOST_HOST=
 MATTERMOST_LOGIN=
 MATTERMOST_PASSWORD=
+MATTERMOST_TOKEN=
 MATTERMOST_DEFAULT_TEAM_ID=
 
 GAPI_CLASSROOM_CREDENTIALS=

app/Http/Controllers/Api/V1/ActivityController.php

@@ -324,7 +324,6 @@ public function detail(Activity $activity)
         $data = ['h5p_parameters' => null, 'user_name' => null, 'user_id' => null];
 
         if ($activity->playlist->project->user) {
-            // TODO: is this correct?
             $data['user_name'] = $activity->playlist->project->user;
             $data['user_id'] = $activity->playlist->project->id;
         }

app/Http/Controllers/Api/V1/UserController.php

@@ -83,7 +83,6 @@ public function getUsersForTeam(UserSearchRequest $userSearchRequest)
      */
     public function store(Request $request)
     {
-        // TODO: do we need user create functionality for admin ?
         return response([
             'errors' => ['Forbidden. Please use register to create new user.'],
         ], 403);

app/Repositories/Team/TeamRepository.php

@@ -12,6 +12,7 @@
 use App\Repositories\Team\TeamRepositoryInterface;
 use App\Repositories\User\UserRepositoryInterface;
 use App\User;
+use Gnello\Mattermost\Laravel\Facades\Mattermost;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
@@ -23,6 +24,7 @@ class TeamRepository extends BaseRepository implements TeamRepositoryInterface
     private $userRepository;
     private $projectRepository;
     private $invitedTeamUserRepository;
+    private $matDriver;
 
     /**
      * TeamRepository constructor.
@@ -44,6 +46,8 @@ public function __construct(
         $this->userRepository = $userRepository;
         $this->projectRepository = $projectRepository;
         $this->invitedTeamUserRepository = $invitedTeamUserRepository;
+
+        $this->matDriver = Mattermost::server('default');
     }
 
     /**
@@ -293,31 +297,44 @@ public function removeMemberFromTeamProject($team, $project, $user)
      */
     public function getTeamDetail($teamId)
     {
+        $authenticated_user = auth()->user();
         $team = $this->model->find($teamId);
 
         if ($team) {
+            $team_projects = [];
             foreach ($team->projects as $team_project) {
-                $team_project_users = DB::table('team_project_user')
+                $tpu = DB::table('team_project_user')
                     ->where('team_id', $team->id)
                     ->where('project_id', $team_project->id)
-                    ->get();
-
-                $project_users = [];
-                foreach ($team_project_users as $team_project_user) {
-                    $user = User::find($team_project_user->user_id);
-                    if ($user) {
-                        $project_users[] = [
-                            'id' => $user->id,
-                            'first_name' => $user->first_name,
-                            'last_name' => $user->last_name,
-                            'email' => $user->email,
-                        ];
+                    ->where('user_id', $authenticated_user->id)
+                    ->first();
+
+                if ($tpu) {
+                    $team_project_users = DB::table('team_project_user')
+                        ->where('team_id', $team->id)
+                        ->where('project_id', $team_project->id)
+                        ->get();
+
+                    $project_users = [];
+                    foreach ($team_project_users as $team_project_user) {
+                        $user = User::find($team_project_user->user_id);
+                        if ($user) {
+                            $project_users[] = [
+                                'id' => $user->id,
+                                'first_name' => $user->first_name,
+                                'last_name' => $user->last_name,
+                                'email' => $user->email,
+                            ];
+                        }
                     }
-                }
 
-                $team_project->users = $project_users;
+                    $team_project->users = $project_users;
+                    $team_projects[] = $team_project;
+                }
             }
 
+            $team->projects = $team_projects;
+
             foreach ($team->users as $team_user) {
                 $team_project_users = DB::table('team_project_user')
                     ->where('team_id', $team->id)

app/Services/GoogleClassroom.php

@@ -17,7 +17,7 @@
 class GoogleClassroom implements GoogleClassroomInterface
 {
     /**
-     * Google Classroom Serivce object
+     * Google Classroom Service object
      *
      * @var \Google_Service_Classroom
      */
@@ -32,7 +32,8 @@ class GoogleClassroom implements GoogleClassroomInterface
 
     /**
      * Creates an instance of the class
-     * 
+     *
+     * @param $accessTokenStr
      *
      * @return void
      */
@@ -105,7 +106,7 @@ public function getClient()
 
     /**
      * Set GcClasswork repository object
-     * 
+     *
      * @param GcClassworkRepositoryInterface $gcClassworkRepository
      *
      * @return void
@@ -324,7 +325,7 @@ public function createProjectAsCourse(Project $project, $courseId = null)
 
                 // We need to save the classwork id in the database, and also need to retrieve it later.
                 // So we make a dummy insertion in the database, and append the id in the link.
-                // We have to do this way because, we cannot update the 'Materials' link for classwork 
+                // We have to do this way because, we cannot update the 'Materials' link for classwork
                 $classworkItem = $this->gc_classwork->create([
                     'classwork_id' => uniqid(),
                     'path' => $activityLink,
@@ -334,7 +335,7 @@ public function createProjectAsCourse(Project $project, $courseId = null)
                 if ($classworkItem) {
                     // Now, we append the activity link with our database id.
                     $activityLink .= '/' . $classworkItem->id;
-                    
+
                     $courseWorkData = [
                         'course_id' => $course->id,
                         'topic_id' => $topic->topicId,
@@ -343,13 +344,13 @@ public function createProjectAsCourse(Project $project, $courseId = null)
                         'activity_link' => $frontURL . $activityLink
                     ];
                     $courseWork = $this->createCourseWork($courseWorkData);
-                    
+
                     // Once coursework id is generated, we'll update that in our database.
                     $this->gc_classwork->update([
                         'classwork_id' => $courseWork->id,
                         'path' => $activityLink
                     ], $classworkItem->id);
-                   
+
                     $return['topics'][$count]['course_work'][] = GCCourseWorkResource::make($courseWork)->resolve();
                 }
             }
@@ -384,7 +385,7 @@ public function getFirstStudentSubmission($courseId, $classworkId, $userId = "me
         $submissions = $this->getStudentSubmissions($courseId, $classworkId, $userId);
         // Grab the first submission
         $first = $submissions[0];
-        
+
         return $first;
     }
 
@@ -444,7 +445,7 @@ public function turnIn($courseId, $courseWorkId, $id)
     {
         $studentSubmissions = $this->service->courses_courseWork_studentSubmissions;
         $requestBody = new \Google_Service_Classroom_TurnInStudentSubmissionRequest;
-        return $studentSubmissions->turnIn($courseId, $courseWorkId, $id, $requestBody); 
+        return $studentSubmissions->turnIn($courseId, $courseWorkId, $id, $requestBody);
     }
 
     /**
@@ -505,7 +506,7 @@ public function isAssignmentSubmitted($state)
         $submittedStates = [self::ASSIGNMENT_STATE_TURNED_IN, self::ASSIGNMENT_STATE_RETURNED];
         return (in_array($state, $submittedStates) ? true : false);
     }
-    
+
     /**
      * Determine front URL of the application.
      *

composer.json

@@ -15,6 +15,7 @@
         "doctrine/dbal": "^2.10",
         "fideloper/proxy": "^4.2",
         "fruitcake/laravel-cors": "^1.0",
+        "gnello/laravel-mattermost-driver": "^1.2",
         "google/apiclient": "^2.7",
         "guzzlehttp/guzzle": "^6.3",
         "h5p/h5p-core": "^1.24",