From 9415c98719ad00e6c6aa2078634967c84141a9f0 Mon Sep 17 00:00:00 2001
From: Elia Azar <elia.azar@polytechnique.edu>
Date: Sun, 3 Mar 2019 14:10:05 +0100
Subject: [PATCH] groups.ts -> annoucementsFromGroup, annoucementsToGroup,
eventsFromGroup, eventsToGroup
---
src/graphql/models/messageModel.ts | 6 +++---
src/graphql/object_resolvers/groups.ts | 10 ++++++++--
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/graphql/models/messageModel.ts b/src/graphql/models/messageModel.ts
index b7e5832..45579de 100644
--- a/src/graphql/models/messageModel.ts
+++ b/src/graphql/models/messageModel.ts
@@ -176,7 +176,7 @@ export class MessageModel {
* @async
* @rights member of groups
*/
- async getAllEvents(groups: GroupCollection): Promise<Event[]> {
+ async getAllEvents(groups: GroupSet): Promise<Event[]> {
throw "Not implemented";
/*let result = await knex.select().from('events').whereIn('id', selection);
@@ -195,7 +195,7 @@ export class MessageModel {
* @async
* @rights member of groups
*/
- async getAllEventsFrom(groups: GroupCollection): Promise<Event[]> {
+ async getAllEventsFrom(groups: GroupSet): Promise<Event[]> {
throw "Not implemented";
/*let result = await knex.select().from('events').whereIn('gid');
@@ -214,7 +214,7 @@ export class MessageModel {
* @async
* @rights member of groups
*/
- async getAllEventsTo(groups: GroupCollection): Promise<Event[]> {
+ async getAllEventsTo(groups: GroupSet): Promise<Event[]> {
throw "Not implemented";
/*let result = await knex.select().from('events').whereIn('gid');
diff --git a/src/graphql/object_resolvers/groups.ts b/src/graphql/object_resolvers/groups.ts
index f2a7d1c..0bac9ee 100644
--- a/src/graphql/object_resolvers/groups.ts
+++ b/src/graphql/object_resolvers/groups.ts
@@ -269,7 +269,10 @@ export abstract class Group {
*/
async eventsFromGroup(args, context: Context, info): Promise<Event[]> {
if (context.models.auth.isMember(this.gid)) {
- throw "Not implemented"
+ //03/03/19
+ let res = new GroupSet();
+ res.add(this.gid);
+ return context.models.message.getAllEventsFrom(res);
}
throw new AuthenticationError("Not a member");
}
@@ -284,7 +287,10 @@ export abstract class Group {
*/
async eventsToGroup(args, context: Context, info): Promise<Event[]> {
if (context.models.auth.isMember(this.gid)) {
- throw "Not implemented"
+ //03/03/19
+ let res = new GroupSet();
+ res.add(this.gid);
+ return context.models.message.getAllEventsTo(res);
}
throw new AuthenticationError("Not a member");
}
--
GitLab