From b857860c1b45e402ffe3c25a84234cebdd954d86 Mon Sep 17 00:00:00 2001 From: matheusbsilva137 Date: Wed, 31 Mar 2021 13:04:28 -0300 Subject: [PATCH 1/2] Add call to eraseRoom method --- app/api/server/v1/teams.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/api/server/v1/teams.ts b/app/api/server/v1/teams.ts index 5c4aa8cf61440..f050f3670af8b 100644 --- a/app/api/server/v1/teams.ts +++ b/app/api/server/v1/teams.ts @@ -1,3 +1,4 @@ +import { Meteor } from 'meteor/meteor'; import { Promise } from 'meteor/promise'; import { API } from '../api'; @@ -294,7 +295,7 @@ API.v1.addRoute('teams.delete', { authRequired: true }, { const rooms = Promise.await(Team.getMatchingTeamRooms(team._id, roomsToRemove)); // Remove the team's main room - Rooms.removeById(team.roomId); + Meteor.call('eraseRoom', team.roomId); // If we got a list of rooms to delete along with the team, remove them first if (rooms.length) { From f9237ab91ee5ab7920d6057b89865aac4f134b89 Mon Sep 17 00:00:00 2001 From: matheusbsilva137 Date: Wed, 31 Mar 2021 15:56:03 -0300 Subject: [PATCH 2/2] Add call to eraseRoom in roomsToRemove elements --- app/api/server/v1/teams.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/api/server/v1/teams.ts b/app/api/server/v1/teams.ts index f050f3670af8b..acc0c6f5bdc10 100644 --- a/app/api/server/v1/teams.ts +++ b/app/api/server/v1/teams.ts @@ -4,7 +4,7 @@ import { Promise } from 'meteor/promise'; import { API } from '../api'; import { Team } from '../../../../server/sdk'; import { hasAtLeastOnePermission, hasPermission } from '../../../authorization/server'; -import { Rooms, Subscriptions } from '../../../models/server'; +import { Subscriptions } from '../../../models/server'; API.v1.addRoute('teams.list', { authRequired: true }, { get() { @@ -292,14 +292,16 @@ API.v1.addRoute('teams.delete', { authRequired: true }, { return API.v1.failure('Team not found.'); } - const rooms = Promise.await(Team.getMatchingTeamRooms(team._id, roomsToRemove)); + const rooms: string[] = Promise.await(Team.getMatchingTeamRooms(team._id, roomsToRemove)); // Remove the team's main room Meteor.call('eraseRoom', team.roomId); // If we got a list of rooms to delete along with the team, remove them first if (rooms.length) { - Rooms.removeByIds(rooms); + rooms.forEach((room) => { + Meteor.call('eraseRoom', room); + }); } // Move every other room back to the workspace