Skip to content

[IMPROVE] Add support to queries in channels.members and groups.members endpoints #21414

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 11 commits into from
May 14, 2021
Merged

[IMPROVE] Add support to queries in channels.members and groups.members endpoints #21414

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5ab02b3
Add query param to subscriptions in the channels.members endpoint
matheusbsilva137 Mar 29, 2021
891b356
Add scope to permissions' verifications
matheusbsilva137 Mar 30, 2021
a96eb3f
Add support to queries in channels.members and groups.members endpoints
matheusbsilva137 Apr 1, 2021
32e6f26
Merge develop branch
matheusbsilva137 Apr 1, 2021
02e220b
Fix variable name
matheusbsilva137 Apr 1, 2021
7438fe9
Replace query param by name, username and status params
matheusbsilva137 Apr 10, 2021
45e0347
Merge branch 'develop' into teams-back-groups-channels-queries
matheusbsilva137 Apr 22, 2021
2f8b235
Add type check to the endpoint params
matheusbsilva137 Apr 22, 2021
80054cd
Merge branch 'develop' into teams-back-groups-channels-queries
matheusbsilva137 Apr 26, 2021
d947d8f
Merge branch 'develop' into teams-back-groups-channels-queries
sampaiodiego May 13, 2021
68e7f7f
Use findUserOfRoom
sampaiodiego May 13, 2021
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
13 changes: 12 additions & 1 deletion app/api/server/v1/channels.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
import _ from 'underscore';

import { Rooms, Subscriptions, Messages, Uploads, Integrations, Users } from '../../../models';
Expand Down Expand Up @@ -577,6 +578,11 @@ API.v1.addRoute('channels.members', { authRequired: true }, {

const { offset, count } = this.getPaginationItems();
const { sort = {} } = this.parseJsonQuery();
const { status, username, name } = this.queryParams;

check(status, Match.Maybe([String]));
check(username, Match.Maybe(String));
check(name, Match.Maybe(String));

const subscriptions = Subscriptions.findByRoomId(findResult._id, {
fields: { 'u._id': 1 },
Comment thread
sampaiodiego marked this conversation as resolved.
Outdated
Expand All @@ -588,8 +594,13 @@ API.v1.addRoute('channels.members', { authRequired: true }, {
const total = subscriptions.count();

const members = subscriptions.fetch().map((s) => s.u && s.u._id);
const query = {
name,
Comment thread
KevLehman marked this conversation as resolved.
Outdated
username,
status: status ? { $in: status } : undefined,
};

const users = Users.find({ _id: { $in: members } }, {
const users = Users.find({ ...query, _id: { $in: members } }, {
fields: { _id: 1, username: 1, name: 1, status: 1, statusText: 1, utcOffset: 1 },
sort: { username: sort.username != null ? sort.username : 1 },
}).fetch();
Expand Down
14 changes: 12 additions & 2 deletions app/api/server/v1/groups.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import _ from 'underscore';
import { Meteor } from 'meteor/meteor';
import { Match } from 'meteor/check';
import { Match, check } from 'meteor/check';

import { mountIntegrationQueryBasedOnPermissions } from '../../../integrations/server/lib/mountQueriesBasedOnPermission';
import { Subscriptions, Rooms, Messages, Uploads, Integrations, Users } from '../../../models/server';
Expand Down Expand Up @@ -500,6 +500,11 @@ API.v1.addRoute('groups.members', { authRequired: true }, {

const { offset, count } = this.getPaginationItems();
const { sort = {} } = this.parseJsonQuery();
const { status, username, name } = this.queryParams;
Comment thread
KevLehman marked this conversation as resolved.
Outdated

check(status, Match.Maybe([String]));
check(username, Match.Maybe(String));
check(name, Match.Maybe(String));

const subscriptions = Subscriptions.findByRoomId(findResult.rid, {
fields: { 'u._id': 1 },
Expand All @@ -511,8 +516,13 @@ API.v1.addRoute('groups.members', { authRequired: true }, {
const total = subscriptions.count();

const members = subscriptions.fetch().map((s) => s.u && s.u._id);
const query = {
name,
username,
status: status ? { $in: status } : undefined,
};

const users = Users.find({ _id: { $in: members } }, {
const users = Users.find({ ...query, _id: { $in: members } }, {
fields: { _id: 1, username: 1, name: 1, status: 1, statusText: 1, utcOffset: 1 },
sort: { username: sort.username != null ? sort.username : 1 },
}).fetch();
Expand Down