make it possible again to kick user out of organization team (#2801)

app/controllers/UserController.scala

@@ -211,26 +211,12 @@ class UserController @Inject()(val messagesApi: MessagesApi)
           teamsWithUpdate <- Fox.filter(assignedMembershipWTeams)(t => issuingUser.isTeamManagerOrAdminOf(t._1._id))
           _ <- ensureProperTeamAdministration(user, teamsWithUpdate)
           trimmedExperiences = experiences.map { case (key, value) => key.trim -> value }
-          updatedTeams <- ensureOrganizationTeamIsPresent(user, teamsWithUpdate.map(_._1) ++ teamsWithoutUpdate)
+          updatedTeams = teamsWithUpdate.map(_._1) ++ teamsWithoutUpdate
           updatedUser <- UserService.update(user, firstName.trim, lastName.trim, email, isActive, isAdmin, updatedTeams, trimmedExperiences)
         } yield {
           Ok(User.userPublicWrites(request.identity).writes(updatedUser))
         }
     }
   }
 
-  def ensureOrganizationTeamIsPresent(user: User, updatedTeams: List[TeamMembership]) = {
-    for {
-      organization <- OrganizationDAO.findOneByName(user.organization)(GlobalAccessContext)
-      orgTeam = organization._organizationTeam
-    } yield {
-      if (updatedTeams.exists(t => t._id == orgTeam))
-        updatedTeams
-      else
-        user.teams.find(t => t._id == orgTeam) match {
-          case Some(teamMembership) => teamMembership :: updatedTeams
-          case None => updatedTeams
-        }
-    }
-  }
 }