[IMPROVE] teams.members endpoint doesn't support queries

app/api/server/v1/teams.ts

@@ -173,9 +173,10 @@ API.v1.addRoute('teams.members', { authRequired: true }, {
 	get() {
 		const { offset, count } = this.getPaginationItems();
 		const { teamId, teamName } = this.queryParams;
+		const { query } = this.parseJsonQuery();
 		const canSeeAllMembers = hasPermission(this.userId, 'view-all-teams');
 
-		const { records, total } = Promise.await(Team.members(this.userId, teamId, teamName, canSeeAllMembers, { offset, count }));
+		const { records, total } = Promise.await(Team.members(this.userId, teamId, teamName, canSeeAllMembers, { offset, count }, { query }));
 
 		return API.v1.success({
 			members: records,

app/models/server/raw/TeamMember.ts

@@ -1,4 +1,4 @@
-import { Collection, FindOneOptions, Cursor, InsertOneWriteOpResult, UpdateWriteOpResult, DeleteWriteOpResultObject } from 'mongodb';
+import { Collection, FindOneOptions, Cursor, InsertOneWriteOpResult, UpdateWriteOpResult, DeleteWriteOpResultObject, FilterQuery } from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
 import { ITeamMember } from '../../../../definition/ITeam';
@@ -47,8 +47,8 @@ export class TeamMemberRaw extends BaseRaw<T> {
 		return this.col.find(query, options);
 	}
 
-	findMembersInfoByTeamId(teamId: string, limit: number, skip: number): Cursor<T> {
-		return this.col.find({ teamId }, {
+	findMembersInfoByTeamId(teamId: string, limit: number, skip: number, query?: FilterQuery<T>): Cursor<T> {
+		return this.col.find({ teamId, ...query }, {
 			limit,
 			skip,
 			projection: {

definition/ITeam.ts

@@ -34,7 +34,7 @@ export interface IPaginationOptions {
 
 // TODO move this definition to a more broader file
 export interface IQueryOptions<T> {
-	sort: SortOptionObject<T>;
+	sort?: SortOptionObject<T>;
 	query?: FilterQuery<T>;
 	fields?: SchemaMember<T, number | boolean>;
 }

server/sdk/types/ITeamService.ts

@@ -1,6 +1,6 @@
 import { FindOneOptions } from 'mongodb';
 
-import { ITeam, IRecordsWithTotal, IPaginationOptions, IQueryOptions } from '../../../definition/ITeam';
+import { ITeam, IRecordsWithTotal, IPaginationOptions, IQueryOptions, ITeamMember } from '../../../definition/ITeam';
 import { IRoom } from '../../../definition/IRoom';
 import { ICreateRoomParams } from './IRoomService';
 
@@ -51,7 +51,7 @@ export interface ITeamService {
 	listAll(options?: IPaginationOptions): Promise<IRecordsWithTotal<ITeam>>;
 	listByNames(names: Array<string>, options?: FindOneOptions<ITeam>): Promise<Array<ITeam>>;
 	search(userId: string, term: string | RegExp, options?: FindOneOptions<ITeam>): Promise<ITeam[]>;
-	members(uid: string, teamId: string, teamName: string, canSeeAll: boolean, options?: IPaginationOptions): Promise<IRecordsWithTotal<ITeamMemberInfo>>;
+	members(uid: string, teamId: string, teamName: string, canSeeAll: boolean, options?: IPaginationOptions, queryOptions?: IQueryOptions<ITeamMember>): Promise<IRecordsWithTotal<ITeamMemberInfo>>;
 	addMembers(uid: string, teamId: string, teamName: string, members: Array<ITeamMemberParams>): Promise<void>;
 	updateMember(teamId: string, teamName: string, members: ITeamMemberParams): Promise<void>;
 	removeMembers(teamId: string, teamName: string, members: Array<ITeamMemberParams>): Promise<void>;

server/services/team/service.ts

@@ -458,7 +458,7 @@ export class TeamService extends ServiceClass implements ITeamService {
 		return rooms.map(({ _id }: { _id: string}) => _id);
 	}
 
-	async members(uid: string, teamId: string, teamName: string, canSeeAll: boolean, { offset, count }: IPaginationOptions = { offset: 0, count: 50 }): Promise<IRecordsWithTotal<ITeamMemberInfo>> {
+	async members(uid: string, teamId: string, teamName: string, canSeeAll: boolean, { offset, count }: IPaginationOptions = { offset: 0, count: 50 }, { query }: IQueryOptions<ITeam>): Promise<IRecordsWithTotal<ITeamMemberInfo>> {
 		if (!teamId) {
 			const teamIdName = await this.TeamModel.findOneByName(teamName, { projection: { _id: 1 } });
 			if (!teamIdName) {
@@ -476,7 +476,7 @@ export class TeamService extends ServiceClass implements ITeamService {
 			};
 		}
 
-		const cursor = this.TeamMembersModel.findMembersInfoByTeamId(teamId, count, offset);
+		const cursor = this.TeamMembersModel.findMembersInfoByTeamId(teamId, count, offset, query);
 
 		const records = await cursor.toArray();
 		const results: ITeamMemberInfo[] = [];