From cd9e04255ae50dbd3767222ddc2c7d87e2411b04 Mon Sep 17 00:00:00 2001
From: Guilhem Roy <guilhem.roy@polytechnique.edu>
Date: Sun, 3 Mar 2019 16:05:30 +0100
Subject: [PATCH] Correction des erreurs GroupCollection / GroupSet
---
src/graphql/resolvers.ts | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/graphql/resolvers.ts b/src/graphql/resolvers.ts
index 5256612..9f3a0a5 100644
--- a/src/graphql/resolvers.ts
+++ b/src/graphql/resolvers.ts
@@ -21,7 +21,7 @@ import { User } from "./object_resolvers/users";
import { Group, SimpleGroup, MetaGroup } from "./object_resolvers/groups";
import { Announcement, Event, PrivatePost, Question, Answer, Message } from "./object_resolvers/messages";
import { UserJoinGroup, GroupJoinMetagroup, GroupCoauthorEvent, Request } from "./object_resolvers/requests";
-import { GroupCollection, GroupSet } from "./models/tools";
+import { GroupCollection, GroupSet, Tools } from "./models/tools";
export const resolvers = {
Query: {
@@ -140,19 +140,19 @@ export const resolvers = {
// @rights member of groups
allAnnouncements: async function (root, args, context: Context): Promise<Announcement[]> {
let groups = context.models.auth.groupsMember();
- return context.models.message.getAllAnnouncements(groups);
+ return context.models.message.getAllAnnouncements(Tools.union(groups.simpleGroups, groups.metaGroups));
},
// @rights member of groups
allEvents: async function (root, args, context: Context): Promise<Event[]> {
let groups = context.models.auth.groupsMember();
- return context.models.message.getAllEvents(groups);
+ return context.models.message.getAllEvents(Tools.union(groups.simpleGroups, groups.metaGroups));
},
// @rights member of groups
allPrivatePosts: async function (root, args, context: Context): Promise<PrivatePost[]> {
let groups = context.models.auth.groupsMember();
- return context.models.message.getAllPrivatePosts(groups);
+ return context.models.message.getAllPrivatePosts(Tools.union(groups.simpleGroups, groups.metaGroups));
},
// Tous les Groupes visibles par un utilisateur.
--
GitLab