diff --git a/src/graphql/resolvers.ts b/src/graphql/resolvers.ts index 5256612b1de2fbee97d87b30ba9536dfa6f8d277..9f3a0a55f2d20874c69b86b600900b465c6483a5 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.