Bugfix/team project issue (ActiveLearningStudio#514)

* PR review fixing

* CUR-1201 fixing

* CUR-1203 and CUR-1201 fixing

* some fixing for team projects

* some fixing for team projects

Author: waleed-backend

Diff for: app/Http/Controllers/Api/V1/TeamController.php

@@ -532,13 +532,15 @@ public function removeProject(TeamRemoveProjectRequest $removeProjectRequest, Te
         $project = $this->projectRepository->find($data['id']);
 
         if ($project) {
-            $team->projects()->detach($project);
+            return \DB::transaction(function () use ($team, $project) {
+                $team->projects()->detach($project);
+                $project->delete();
+                // $this->teamRepository->removeTeamUserProject($team, $project);
 
-            $this->teamRepository->removeTeamUserProject($team, $project);
-
-            return response([
-                'message' => 'Project has been removed from the team successfully.',
-            ], 200);
+                return response([
+                    'message' => 'Project has been removed from the team successfully.',
+                ], 200);
+            });
         }
 
         return response([
@@ -730,7 +732,7 @@ public function update(TeamUpdateRequest $teamUpdateRequest, Organization $subor
      */
     public function updateTeamMemberRole(TeamMemberRoleUpdateRequest $request, Organization $suborganization, Team $team)
     {
-        $this->authorize('updateMemberRole', [Team::class, $suborganization, $team]);
+        $this->authorize('updateMemberRole', [Team::class, $team]);
 
         $data = $request->validated();
 

Diff for: app/Policies/TeamPolicy.php

@@ -63,15 +63,12 @@ public function update(User $user, Organization $suborganization)
      * Determine whether the user can update the team member role.
      *
      * @param User $user
-     * @param Organization $suborganization
      * @param Team $team
      * @return mixed
      */
-    public function updateMemberRole(User $user, Organization $suborganization, Team $team)
+    public function updateMemberRole(User $user, Team $team)
     {
-        return $user->hasPermissionTo('team:edit', $suborganization)
-               || $user->hasTeamPermissionTo('team:add-team-user', $team)
-               || $user->hasTeamPermissionTo('team:remove-team-user', $team);
+        return $user->hasTeamPermissionTo('team:add-team-user', $team);
     }
 
     /**