From e0fcdb2cee35352187b914fd113abdb2083cb6f0 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 24 Aug 2022 16:31:36 +0200 Subject: [PATCH 1/3] Add new RIGHT for LIST_ALL_CONTRIBUTION_MESSAGES. --- backend/src/auth/RIGHTS.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts index a62a09bee..4f144f1e9 100644 --- a/backend/src/auth/RIGHTS.ts +++ b/backend/src/auth/RIGHTS.ts @@ -34,6 +34,7 @@ export enum RIGHTS { COMMUNITY_STATISTICS = 'COMMUNITY_STATISTICS', SEARCH_ADMIN_USERS = 'SEARCH_ADMIN_USERS', CREATE_CONTRIBUTION_MESSAGE = 'CREATE_CONTRIBUTION_MESSAGE', + LIST_ALL_CONTRIBUTION_MESSAGES = 'LIST_ALL_CONTRIBUTION_MESSAGES', // Admin SEARCH_USERS = 'SEARCH_USERS', SET_USER_ROLE = 'SET_USER_ROLE', From a9c3dd25edc2ed85237242df2b439a8c9b619cd8 Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 24 Aug 2022 16:32:58 +0200 Subject: [PATCH 2/3] Add RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES to the ROLES of Users. --- backend/src/auth/ROLES.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/auth/ROLES.ts b/backend/src/auth/ROLES.ts index bad18db9e..eabaf8e99 100644 --- a/backend/src/auth/ROLES.ts +++ b/backend/src/auth/ROLES.ts @@ -32,6 +32,7 @@ export const ROLE_USER = new Role('user', [ RIGHTS.LIST_CONTRIBUTION_LINKS, RIGHTS.COMMUNITY_STATISTICS, RIGHTS.CREATE_CONTRIBUTION_MESSAGE, + RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES, ]) export const ROLE_ADMIN = new Role('admin', Object.values(RIGHTS)) // all rights From 057816e4c0a2df9052fbe0b416d8929388866e9a Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 24 Aug 2022 16:43:32 +0200 Subject: [PATCH 3/3] Change innerJoin to leftJoin, so that every contribution is shown not only the one with messages. --- backend/src/graphql/resolver/ContributionResolver.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index f9538851b..1b63c90d2 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -98,8 +98,8 @@ export class ContributionResolver { .createQueryBuilder() .select('c') .from(dbContribution, 'c') - .innerJoinAndSelect('c.messages', 'm') - .innerJoinAndSelect('m.user', 'u') + .leftJoinAndSelect('c.messages', 'm') + .leftJoinAndSelect('m.user', 'u') .orderBy('c.createdAt', order) .limit(pageSize) .offset((currentPage - 1) * pageSize)