From e3549d3aa99cefbb21b4e3e5d919613d9a7d56a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 23 Aug 2022 05:11:10 +0200 Subject: [PATCH] Rename resolver `SwitchGroupMemberRole` to `ChangeGroupMemberRole` Co-Authored-By: Mogge --- backend/src/db/graphql/groups.js | 4 +- backend/src/db/seed.js | 22 ++--- .../src/middleware/permissionsMiddleware.js | 2 +- backend/src/schema/resolvers/groups.js | 2 +- backend/src/schema/resolvers/groups.spec.js | 92 +++++++++---------- backend/src/schema/types/type/Group.gql | 2 +- 6 files changed, 62 insertions(+), 62 deletions(-) diff --git a/backend/src/db/graphql/groups.js b/backend/src/db/graphql/groups.js index 41780f7cd..2a9647860 100644 --- a/backend/src/db/graphql/groups.js +++ b/backend/src/db/graphql/groups.js @@ -50,9 +50,9 @@ export const joinGroupMutation = gql` } ` -export const switchGroupMemberRoleMutation = gql` +export const changeGroupMemberRoleMutation = gql` mutation ($id: ID!, $userId: ID!, $roleInGroup: GroupMemberRole!) { - SwitchGroupMemberRole(id: $id, userId: $userId, roleInGroup: $roleInGroup) { + ChangeGroupMemberRole(id: $id, userId: $userId, roleInGroup: $roleInGroup) { id name slug diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js index a2be78553..0010b09ef 100644 --- a/backend/src/db/seed.js +++ b/backend/src/db/seed.js @@ -8,7 +8,7 @@ import { getNeode, getDriver } from '../db/neo4j' import { createGroupMutation, joinGroupMutation, - switchGroupMemberRoleMutation, + changeGroupMemberRoleMutation, } from './graphql/groups' import { createPostMutation } from './graphql/posts' import { createCommentMutation } from './graphql/comments' @@ -436,7 +436,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] ]) await Promise.all([ mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables: { id: 'g0', userId: 'u2', @@ -444,7 +444,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] }, }), mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables: { id: 'g0', userId: 'u4', @@ -452,7 +452,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] }, }), mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables: { id: 'g0', userId: 'u3', @@ -515,7 +515,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] ]) await Promise.all([ mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables: { id: 'g0', userId: 'u1', @@ -523,7 +523,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] }, }), mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables: { id: 'g0', userId: 'u2', @@ -531,7 +531,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] }, }), mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables: { id: 'g0', userId: 'u5', @@ -539,7 +539,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] }, }), mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables: { id: 'g0', userId: 'u6', @@ -595,7 +595,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] ]) await Promise.all([ mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables: { id: 'g0', userId: 'u4', @@ -603,7 +603,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] }, }), mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables: { id: 'g0', userId: 'u5', @@ -611,7 +611,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl'] }, }), mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables: { id: 'g0', userId: 'u6', diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js index e3e3b3eb0..a3935872e 100644 --- a/backend/src/middleware/permissionsMiddleware.js +++ b/backend/src/middleware/permissionsMiddleware.js @@ -259,7 +259,7 @@ export default shield( UpdateUser: onlyYourself, CreateGroup: isAuthenticated, JoinGroup: isAuthenticated, // Wolle: can not be correct - SwitchGroupMemberRole: isAllowedToSwitchGroupMemberRole, + ChangeGroupMemberRole: isAllowedToSwitchGroupMemberRole, CreatePost: isAuthenticated, UpdatePost: isAuthor, DeletePost: isAuthor, diff --git a/backend/src/schema/resolvers/groups.js b/backend/src/schema/resolvers/groups.js index 34959908d..ca24ef55f 100644 --- a/backend/src/schema/resolvers/groups.js +++ b/backend/src/schema/resolvers/groups.js @@ -160,7 +160,7 @@ export default { session.close() } }, - SwitchGroupMemberRole: async (_parent, params, context, _resolveInfo) => { + ChangeGroupMemberRole: async (_parent, params, context, _resolveInfo) => { const { id: groupId, userId, roleInGroup } = params // Wolle // console.log('groupId: ', groupId) diff --git a/backend/src/schema/resolvers/groups.spec.js b/backend/src/schema/resolvers/groups.spec.js index 22bac6da7..23fc5646e 100644 --- a/backend/src/schema/resolvers/groups.spec.js +++ b/backend/src/schema/resolvers/groups.spec.js @@ -3,7 +3,7 @@ import Factory, { cleanDatabase } from '../../db/factories' import { createGroupMutation, joinGroupMutation, - switchGroupMemberRoleMutation, + changeGroupMemberRoleMutation, groupMemberQuery, groupQuery, } from '../../db/graphql/groups' @@ -865,7 +865,7 @@ describe('in mode: always clean db', () => { beforeEach(async () => { authenticatedUser = await ownerOfClosedGroupUser.toJson() await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables: { id: 'closed-group', userId: 'owner-of-hidden-group', @@ -974,7 +974,7 @@ describe('in mode: always clean db', () => { beforeEach(async () => { authenticatedUser = await ownerOfHiddenGroupUser.toJson() await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables: { id: 'hidden-group', userId: 'owner-of-closed-group', @@ -1049,7 +1049,7 @@ describe('in mode: building up', () => { await cleanDatabase() }) - describe('SwitchGroupMemberRole', () => { + describe('ChangeGroupMemberRole', () => { let pendingMemberUser let usualMemberUser let adminMemberUser @@ -1221,7 +1221,7 @@ describe('in mode: building up', () => { userId: 'current-user', roleInGroup: 'pending', } - const { errors } = await mutate({ mutation: switchGroupMemberRoleMutation, variables }) + const { errors } = await mutate({ mutation: changeGroupMemberRoleMutation, variables }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') }) }) @@ -1259,7 +1259,7 @@ describe('in mode: building up', () => { it('has role usual', async () => { const expected = { data: { - SwitchGroupMemberRole: { + ChangeGroupMemberRole: { id: 'usual-member-user', myRoleInGroup: 'usual', }, @@ -1268,7 +1268,7 @@ describe('in mode: building up', () => { } await expect( mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }), ).resolves.toMatchObject(expected) @@ -1308,7 +1308,7 @@ describe('in mode: building up', () => { // console.log('groupMemberOfClosedGroup.data.GroupMember: ', groupMemberOfClosedGroup.data.GroupMember) const expected = { data: { - SwitchGroupMemberRole: { + ChangeGroupMemberRole: { id: 'admin-member-user', myRoleInGroup: 'admin', }, @@ -1317,7 +1317,7 @@ describe('in mode: building up', () => { } await expect( mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }), ).resolves.toMatchObject(expected) @@ -1344,7 +1344,7 @@ describe('in mode: building up', () => { it('has role owner', async () => { const expected = { data: { - SwitchGroupMemberRole: { + ChangeGroupMemberRole: { id: 'second-owner-member-user', myRoleInGroup: 'owner', }, @@ -1353,7 +1353,7 @@ describe('in mode: building up', () => { } await expect( mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }), ).resolves.toMatchObject(expected) @@ -1387,7 +1387,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -1413,7 +1413,7 @@ describe('in mode: building up', () => { it('has role admin', async () => { const expected = { data: { - SwitchGroupMemberRole: { + ChangeGroupMemberRole: { id: 'owner-member-user', myRoleInGroup: 'admin', }, @@ -1422,7 +1422,7 @@ describe('in mode: building up', () => { } await expect( mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }), ).resolves.toMatchObject(expected) @@ -1440,7 +1440,7 @@ describe('in mode: building up', () => { it('has role owner again', async () => { const expected = { data: { - SwitchGroupMemberRole: { + ChangeGroupMemberRole: { id: 'owner-member-user', myRoleInGroup: 'owner', }, @@ -1449,7 +1449,7 @@ describe('in mode: building up', () => { } await expect( mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }), ).resolves.toMatchObject(expected) @@ -1472,7 +1472,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -1495,7 +1495,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -1518,7 +1518,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -1551,7 +1551,7 @@ describe('in mode: building up', () => { it('has role owner', async () => { const expected = { data: { - SwitchGroupMemberRole: { + ChangeGroupMemberRole: { id: 'admin-member-user', myRoleInGroup: 'owner', }, @@ -1560,7 +1560,7 @@ describe('in mode: building up', () => { } await expect( mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }), ).resolves.toMatchObject(expected) @@ -1578,7 +1578,7 @@ describe('in mode: building up', () => { it('has role admin again', async () => { const expected = { data: { - SwitchGroupMemberRole: { + ChangeGroupMemberRole: { id: 'admin-member-user', myRoleInGroup: 'admin', }, @@ -1587,7 +1587,7 @@ describe('in mode: building up', () => { } await expect( mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }), ).resolves.toMatchObject(expected) @@ -1610,7 +1610,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -1627,7 +1627,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -1650,7 +1650,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -1667,7 +1667,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -1690,7 +1690,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -1707,7 +1707,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -1740,7 +1740,7 @@ describe('in mode: building up', () => { it('has role admin', async () => { const expected = { data: { - SwitchGroupMemberRole: { + ChangeGroupMemberRole: { id: 'usual-member-user', myRoleInGroup: 'admin', }, @@ -1749,7 +1749,7 @@ describe('in mode: building up', () => { } await expect( mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }), ).resolves.toMatchObject(expected) @@ -1767,7 +1767,7 @@ describe('in mode: building up', () => { it('has role usual again', async () => { const expected = { data: { - SwitchGroupMemberRole: { + ChangeGroupMemberRole: { id: 'usual-member-user', myRoleInGroup: 'usual', }, @@ -1776,7 +1776,7 @@ describe('in mode: building up', () => { } await expect( mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }), ).resolves.toMatchObject(expected) @@ -1799,7 +1799,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -1816,7 +1816,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -1839,7 +1839,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -1856,7 +1856,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -1879,7 +1879,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -1896,7 +1896,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -1929,7 +1929,7 @@ describe('in mode: building up', () => { it('has role usual', async () => { const expected = { data: { - SwitchGroupMemberRole: { + ChangeGroupMemberRole: { id: 'pending-member-user', myRoleInGroup: 'usual', }, @@ -1938,7 +1938,7 @@ describe('in mode: building up', () => { } await expect( mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }), ).resolves.toMatchObject(expected) @@ -1956,7 +1956,7 @@ describe('in mode: building up', () => { it('has role usual again', async () => { const expected = { data: { - SwitchGroupMemberRole: { + ChangeGroupMemberRole: { id: 'pending-member-user', myRoleInGroup: 'pending', }, @@ -1965,7 +1965,7 @@ describe('in mode: building up', () => { } await expect( mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }), ).resolves.toMatchObject(expected) @@ -1988,7 +1988,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -2011,7 +2011,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') @@ -2034,7 +2034,7 @@ describe('in mode: building up', () => { it('throws authorization error', async () => { const { errors } = await mutate({ - mutation: switchGroupMemberRoleMutation, + mutation: changeGroupMemberRoleMutation, variables, }) expect(errors[0]).toHaveProperty('message', 'Not Authorised!') diff --git a/backend/src/schema/types/type/Group.gql b/backend/src/schema/types/type/Group.gql index 270f5c844..f12b98c07 100644 --- a/backend/src/schema/types/type/Group.gql +++ b/backend/src/schema/types/type/Group.gql @@ -119,7 +119,7 @@ type Mutation { userId: ID! ): User - SwitchGroupMemberRole( + ChangeGroupMemberRole( id: ID! userId: ID! roleInGroup: GroupMemberRole!