Skip to content

Regression: When only 'teams' type is provided, show only rooms with teamMain on rooms.adminRooms endpoint #21322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sampaiodiego merged 1 commit into from
Mar 29, 2021
Merged

Regression: When only 'teams' type is provided, show only rooms with teamMain on rooms.adminRooms endpoint #21322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/api/server/lib/rooms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export async function findAdminRooms({ uid, filter, types = [], pagination: { of
const name = filter && filter.trim();
const discussion = types && types.includes('discussions');
const includeTeams = types && types.includes('teams');
const showOnlyTeams = types.length === 1 && types.includes('teams');
const typesToRemove = ['discussions', 'teams'];
const showTypes = Array.isArray(types) ? types.filter((type) => !typesToRemove.includes(type)) : [];
const options = {
Expand All @@ -42,13 +43,12 @@ export async function findAdminRooms({ uid, filter, types = [], pagination: { of
};

let cursor;

if (name && showTypes.length) {
cursor = Rooms.findByNameContainingAndTypes(name, showTypes, discussion, includeTeams, options);
cursor = Rooms.findByNameContainingAndTypes(name, showTypes, discussion, includeTeams, showOnlyTeams, options);
} else if (showTypes.length) {
cursor = Rooms.findByTypes(showTypes, discussion, includeTeams, options);
cursor = Rooms.findByTypes(showTypes, discussion, includeTeams, showOnlyTeams, options);
} else {
cursor = Rooms.findByNameContaining(name, discussion, includeTeams, options);
cursor = Rooms.findByNameContaining(name, discussion, includeTeams, showOnlyTeams, options);
}

const total = await cursor.count();
Expand Down
15 changes: 12 additions & 3 deletions app/models/server/raw/Rooms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,11 @@ export class RoomsRaw extends BaseRaw {
return statistic;
}

findByNameContainingAndTypes(name, types, discussion = false, teams = false, options = {}) {
findByNameContainingAndTypes(name, types, discussion = false, teams = false, showOnlyTeams = false, options = {}) {
const nameRegex = new RegExp(escapeRegExp(name).trim(), 'i');

const onlyTeamsQuery = showOnlyTeams ? { teamMain: { $exists: true } } : {};

const teamCondition = teams ? {} : {
teamMain: {
$exists: false,
Expand All @@ -64,28 +66,32 @@ export class RoomsRaw extends BaseRaw {
},
],
...teamCondition,
...onlyTeamsQuery,
};
return this.find(query, options);
}

findByTypes(types, discussion = false, teams = false, options = {}) {
findByTypes(types, discussion = false, teams = false, onlyTeams = false, options = {}) {
const teamCondition = teams ? {} : {
teamMain: {
$exists: false,
},
};

const onlyTeamsCondition = onlyTeams ? { teamMain: { $exists: true } } : {};

const query = {
t: {
$in: types,
},
prid: { $exists: discussion },
...teamCondition,
...onlyTeamsCondition,
};
return this.find(query, options);
}

findByNameContaining(name, discussion = false, teams = false, options = {}) {
findByNameContaining(name, discussion = false, teams = false, onlyTeams = false, options = {}) {
const nameRegex = new RegExp(escapeRegExp(name).trim(), 'i');

const teamCondition = teams ? {} : {
Expand All @@ -94,6 +100,8 @@ export class RoomsRaw extends BaseRaw {
},
};

const onlyTeamsCondition = onlyTeams ? { $and: [{ teamMain: { $exists: true } }, { teamMain: true }] } : {};

const query = {
prid: { $exists: discussion },
$or: [
Expand All @@ -104,6 +112,7 @@ export class RoomsRaw extends BaseRaw {
},
],
...teamCondition,
...onlyTeamsCondition,
};

return this.find(query, options);
Expand Down