Use the member's userId in removal

Fixes #6016

Author: Laurie T. Malau

components/server/src/workspace/gitpod-server-impl.ts

@@ -1559,17 +1559,18 @@ export class GitpodServerImpl<Client extends GitpodClient, Server extends Gitpod
         const user = this.checkAndBlockUser("deleteTeam");
         await this.guardTeamOperation(teamId, "delete");
 
-        await this.teamDB.deleteTeam(teamId);
         const teamProjects = await this.projectsService.getTeamProjects(teamId);
         teamProjects.forEach(project => {
             this.deleteProject(project.id);
         })
 
         const teamMembers = await this.teamDB.findMembersByTeam(teamId);
         teamMembers.forEach(member => {
-            this.removeTeamMember(teamId, userId);
+            this.removeTeamMember(teamId, member.userId);
         })
 
+        await this.teamDB.deleteTeam(teamId);
+
         return this.analytics.track({
             userId: user.id,
             event: "team_deleted",