diff --git a/src/graphql/models/groupModel.ts b/src/graphql/models/groupModel.ts index 63d90257e2d9c30e830ef2233ff5db8283f69734..1a4e217d9c122af6d362d23e87b1422a5fa559ea 100644 --- a/src/graphql/models/groupModel.ts +++ b/src/graphql/models/groupModel.ts @@ -151,6 +151,18 @@ export class GroupModel { return res; } + /** + * @memberof GraphQL.GroupModel# + * @function getAllSimpleGroupsFromMeta + * @summary Fonction qui renvoie tous les groupes simples du groupe meta. + * @arg {string} gid - identifiant du groupe en question. + * @return {GroupSet} Renvoie le tableau de groupes correspondant + * @rights connectedOrOnplatal + */ + getAllSimpleGroupsFromMeta(gid: string): Promise<GroupSet> { + throw "Not implemented"; + } + /** * @memberof GraphQL.GroupModel# * @function likeGroup diff --git a/src/graphql/object_resolvers/groups.ts b/src/graphql/object_resolvers/groups.ts index cda19cc47d457c49843605d799d9cbcced20be25..994d9450182af82022243477498b426e2cfd2f9f 100644 --- a/src/graphql/object_resolvers/groups.ts +++ b/src/graphql/object_resolvers/groups.ts @@ -11,6 +11,8 @@ import { Context } from '../typeDefs/queries'; import { ApolloError, AuthenticationError } from 'apollo-server-core'; import { Request, UserJoinGroup, GroupJoinMetagroup, GroupCoauthorEvent } from './requests'; import { GroupSet } from '../models/tools'; +import { is } from 'bluebird'; +import { userData } from '../../ldap/export/user'; export abstract class Group { @@ -552,14 +554,28 @@ export class SimpleGroup extends Group { */ async admins(args, context: Context, info): Promise<User[]> { if(context.models.auth.isViewer(this.gid)) { - await this.fetchData(); - return this.m_admins.map(uid => { + let list_admins =await this.auxAdmins(); + return list_admins.map(uid => { return new User(uid); }); } throw new AuthenticationError("Not a viewer"); } + /** + * @memberof GraphQL.SimpleGroup# + * @function auxAdmins + * @summary Renvoie la liste des admins en String + * @return {Promise(String[])} + * @async + */ + async auxAdmins(): Promise<string[]> { + await this.fetchData(); + return this.m_admins; + } + + + /** * @memberof GraphQL.SimpleGroup# * @function likers @@ -747,7 +763,16 @@ export class MetaGroup extends Group { */ async admins(args, context: Context, info): Promise<User[]> { if (context.models.auth.isViewer(this.gid)) { - throw "Not implemented"; + let admins = new Set<string>(); + let arg = await context.models.group.getAllSimpleGroupsFromMeta(this.gid); + for(let g of arg){ + let sg=new SimpleGroup(g); + let sg_admins= await sg.auxAdmins(); + for(let admin of sg_admins){ + admins.add(admin); + } + } + return [...admins].map(uid => new User(uid)); } throw new AuthenticationError("Not a viewer"); } @@ -762,7 +787,12 @@ export class MetaGroup extends Group { */ async members(args, context: Context, info): Promise<SimpleGroup[]> { if (context.models.auth.isViewer(this.gid)) { - throw "Not implemented" + let arg = await context.models.group.getAllSimpleGroupsFromMeta(this.gid); + let res = new Array<SimpleGroup>(); + for(let g of arg){ + res.push(new SimpleGroup(g)); + } + return res; /*let member_group_list = await knex.distinct().select().from('groups') .innerJoin('meta_group_membership', 'groups.uid', 'meta_group_membership.member_uid')