diff --git a/src/graphql/models/requestModel.ts b/src/graphql/models/requestModel.ts index 8a2568e5f2e6c9b0d0b8caeef4a095ef75a9322a..0eeff5b63ffc8919021f5f8876157eeae9c68e2f 100644 --- a/src/graphql/models/requestModel.ts +++ b/src/graphql/models/requestModel.ts @@ -93,15 +93,8 @@ export class RequestModel { * @rights admin du groupe */ async getUserJoinGroupRequestsToGroup(gid: string): Promise<UserJoinGroup[]> { - throw "Not implemented"; - - // CODE A MODIFIER - /*let result = knex.select('id', 'useruid', 'message').from('user_join_group') - .where('recipient', recipient.gid); - return result.map(obj => { - obj.type = "UserJoinGroup"; - return obj; - });*/ + let result = await knex.select('rid').from('requests_user_join_group').where('request_to', gid); + return result.map(obj => new UserJoinGroup(obj.rid)); } /** @@ -114,7 +107,8 @@ export class RequestModel { * @rights admin du groupe */ async getGroupJoinMetagroupRequestsToGroup(gid: string): Promise<GroupJoinMetagroup[]> { - throw "Not implemented"; + let result = await knex.select('rid').from('requests_group_join_metagroup').where('request_to', gid); + return result.map(obj => new GroupJoinMetagroup(obj.rid)); } /** @@ -127,22 +121,8 @@ export class RequestModel { * @rights admin du groupe */ async getGroupCoauthorEventRequestsToGroup(gid: string): Promise<GroupCoauthorEvent[]> { - throw "Not implemented"; - - //CODE A MODIFIER - /*let result = await knex.select('id', 'senderuid', 'eventuid', 'message').from('group_join_event') - .where('recipient', recipient.gid); - return result.map(obj => { - obj.type = "GroupJoinEvent"; - return obj; - });*/ - - /*let result = await knex.select('id', 'senderuid', 'eventuid', 'message').from('your_group_host_event') - .where('recipient', recipient.gid); - return result.map(obj => { - obj.type = "YourGroupHostEvent"; - return obj; - });*/ + let result = await knex.select('rid').from('requests_group_coauthor_event').where('request_to', gid); + return result.map(obj => new GroupCoauthorEvent(obj.rid)); } /**