From 05b2dc669d2ea072a9f93b070df598f73c3a4482 Mon Sep 17 00:00:00 2001
From: Guilhem Roy <guilhem.roy@polytechnique.edu>
Date: Sun, 3 Mar 2019 19:57:51 +0100
Subject: [PATCH] =?UTF-8?q?Ajout=20des=20Models=20pour=20avoir=20toutes=20?=
=?UTF-8?q?les=20requ=C3=AAte=20address=C3=A9e=20=C3=A0=20un=20groupe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/graphql/models/requestModel.ts | 32 ++++++------------------------
1 file changed, 6 insertions(+), 26 deletions(-)
diff --git a/src/graphql/models/requestModel.ts b/src/graphql/models/requestModel.ts
index 8a2568e..0eeff5b 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));
}
/**
--
GitLab