ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed 'GroupMember' to 'GroupMembers'

Browse Source 
Co-Authored-By: Mogge <moriz.wahl@gmx.de>
This commit is contained in:
Wolfgang Huß 2022-08-23 11:03:47 +02:00
parent b703621eb7
commit 826cf5a8e0
5 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/db/graphql/groups.js
View File

@ -116,9 +116,9 @@ export const groupQuery = gql`
} }
` `
export const groupMemberQuery = gql` export const groupMembersQuery = gql`
query ($id: ID!, $first: Int, $offset: Int, $orderBy: [_UserOrdering], $filter: _UserFilter) { query ($id: ID!, $first: Int, $offset: Int, $orderBy: [_UserOrdering], $filter: _UserFilter) {
GroupMember(id: $id, first: $first, offset: $offset, orderBy: $orderBy, filter: $filter) { GroupMembers(id: $id, first: $first, offset: $offset, orderBy: $orderBy, filter: $filter) {
id id
name name
slug slug

2
backend/src/middleware/permissionsMiddleware.js
View File

@ -286,7 +286,7 @@ export default shield(
statistics: allow, statistics: allow,
currentUser: allow, currentUser: allow,
Group: isAuthenticated, Group: isAuthenticated,
GroupMember: isAllowedSeeingMembersOfGroup, GroupMembers: isAllowedSeeingMembersOfGroup,
Post: allow, Post: allow,
profilePagePosts: allow, profilePagePosts: allow,
Comment: allow, Comment: allow,

2
backend/src/schema/resolvers/groups.js
View File

@ -46,7 +46,7 @@ export default {
session.close() session.close()
} }
}, },
GroupMember: async (_object, params, context, _resolveInfo) => { GroupMembers: async (_object, params, context, _resolveInfo) => {
const { id: groupId } = params const { id: groupId } = params
// Wolle: console.log('groupId: ', groupId) // Wolle: console.log('groupId: ', groupId)
const session = context.driver.session() const session = context.driver.session()

72
backend/src/schema/resolvers/groups.spec.js
View File

@ -4,7 +4,7 @@ import {
createGroupMutation, createGroupMutation,
joinGroupMutation, joinGroupMutation,
changeGroupMemberRoleMutation, changeGroupMemberRoleMutation,
groupMemberQuery, groupMembersQuery,
groupQuery, groupQuery,
} from '../../db/graphql/groups' } from '../../db/graphql/groups'
import { getNeode, getDriver } from '../../db/neo4j' import { getNeode, getDriver } from '../../db/neo4j'
@ -499,7 +499,7 @@ describe('in mode: always clean db', () => {
id: 'hidden-group', id: 'hidden-group',
userId: 'owner-of-closed-group', userId: 'owner-of-closed-group',
} }
const { errors } = await query({ query: groupMemberQuery, variables }) const { errors } = await query({ query: groupMembersQuery, variables })
expect(errors[0]).toHaveProperty('message', 'Not Authorised!') expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
}) })
}) })
@ -533,7 +533,7 @@ describe('in mode: always clean db', () => {
}) })
describe('in mode: building up – separate for each resolver', () => { describe('in mode: building up – separate for each resolver', () => {
describe('GroupMember', () => { describe('GroupMembers', () => {
beforeAll(async () => { beforeAll(async () => {
await seedBasicsAndClearAuthentication() await seedBasicsAndClearAuthentication()
}) })
@ -547,7 +547,7 @@ describe('in mode: building up – separate for each resolver', () => {
variables = { variables = {
id: 'not-existing-group', id: 'not-existing-group',
} }
const { errors } = await query({ query: groupMemberQuery, variables }) const { errors } = await query({ query: groupMembersQuery, variables })
expect(errors[0]).toHaveProperty('message', 'Not Authorised!') expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
}) })
}) })
@ -704,12 +704,12 @@ describe('in mode: building up – separate for each resolver', () => {
// const groups = await query({ query: groupQuery, variables: {} }) // const groups = await query({ query: groupQuery, variables: {} })
// console.log('groups.data.Group: ', groups.data.Group) // console.log('groups.data.Group: ', groups.data.Group)
// const groupMemberOfClosedGroup = await mutate({ // const groupMemberOfClosedGroup = await mutate({
// mutation: groupMemberQuery, // mutation: groupMembersQuery,
// variables: { // variables: {
// id: 'hidden-group', // id: 'hidden-group',
// }, // },
// }) // })
// console.log('groupMemberOfClosedGroup.data.GroupMember: ', groupMemberOfClosedGroup.data.GroupMember) // console.log('groupMemberOfClosedGroup.data.GroupMembers: ', groupMemberOfClosedGroup.data.GroupMembers)
authenticatedUser = null authenticatedUser = null
}) })
@ -729,12 +729,12 @@ describe('in mode: building up – separate for each resolver', () => {
it('finds all members', async () => { it('finds all members', async () => {
const result = await mutate({ const result = await mutate({
mutation: groupMemberQuery, mutation: groupMembersQuery,
variables, variables,
}) })
expect(result).toMatchObject({ expect(result).toMatchObject({
data: { data: {
GroupMember: expect.arrayContaining([ GroupMembers: expect.arrayContaining([
expect.objectContaining({ expect.objectContaining({
id: 'current-user', id: 'current-user',
myRoleInGroup: 'owner', myRoleInGroup: 'owner',
@ -751,7 +751,7 @@ describe('in mode: building up – separate for each resolver', () => {
}, },
errors: undefined, errors: undefined,
}) })
expect(result.data.GroupMember.length).toBe(3) expect(result.data.GroupMembers.length).toBe(3)
}) })
}) })
@ -762,12 +762,12 @@ describe('in mode: building up – separate for each resolver', () => {
it('finds all members', async () => { it('finds all members', async () => {
const result = await mutate({ const result = await mutate({
mutation: groupMemberQuery, mutation: groupMembersQuery,
variables, variables,
}) })
expect(result).toMatchObject({ expect(result).toMatchObject({
data: { data: {
GroupMember: expect.arrayContaining([ GroupMembers: expect.arrayContaining([
expect.objectContaining({ expect.objectContaining({
id: 'current-user', id: 'current-user',
myRoleInGroup: 'owner', myRoleInGroup: 'owner',
@ -784,7 +784,7 @@ describe('in mode: building up – separate for each resolver', () => {
}, },
errors: undefined, errors: undefined,
}) })
expect(result.data.GroupMember.length).toBe(3) expect(result.data.GroupMembers.length).toBe(3)
}) })
}) })
@ -795,12 +795,12 @@ describe('in mode: building up – separate for each resolver', () => {
it('finds all members', async () => { it('finds all members', async () => {
const result = await mutate({ const result = await mutate({
mutation: groupMemberQuery, mutation: groupMembersQuery,
variables, variables,
}) })
expect(result).toMatchObject({ expect(result).toMatchObject({
data: { data: {
GroupMember: expect.arrayContaining([ GroupMembers: expect.arrayContaining([
expect.objectContaining({ expect.objectContaining({
id: 'current-user', id: 'current-user',
myRoleInGroup: 'owner', myRoleInGroup: 'owner',
@ -817,7 +817,7 @@ describe('in mode: building up – separate for each resolver', () => {
}, },
errors: undefined, errors: undefined,
}) })
expect(result.data.GroupMember.length).toBe(3) expect(result.data.GroupMembers.length).toBe(3)
}) })
}) })
}) })
@ -838,12 +838,12 @@ describe('in mode: building up – separate for each resolver', () => {
it('finds all members', async () => { it('finds all members', async () => {
const result = await mutate({ const result = await mutate({
mutation: groupMemberQuery, mutation: groupMembersQuery,
variables, variables,
}) })
expect(result).toMatchObject({ expect(result).toMatchObject({
data: { data: {
GroupMember: expect.arrayContaining([ GroupMembers: expect.arrayContaining([
expect.objectContaining({ expect.objectContaining({
id: 'current-user', id: 'current-user',
myRoleInGroup: 'pending', myRoleInGroup: 'pending',
@ -860,7 +860,7 @@ describe('in mode: building up – separate for each resolver', () => {
}, },
errors: undefined, errors: undefined,
}) })
expect(result.data.GroupMember.length).toBe(3) expect(result.data.GroupMembers.length).toBe(3)
}) })
}) })
@ -880,12 +880,12 @@ describe('in mode: building up – separate for each resolver', () => {
it('finds all members', async () => { it('finds all members', async () => {
const result = await mutate({ const result = await mutate({
mutation: groupMemberQuery, mutation: groupMembersQuery,
variables, variables,
}) })
expect(result).toMatchObject({ expect(result).toMatchObject({
data: { data: {
GroupMember: expect.arrayContaining([ GroupMembers: expect.arrayContaining([
expect.objectContaining({ expect.objectContaining({
id: 'current-user', id: 'current-user',
myRoleInGroup: 'pending', myRoleInGroup: 'pending',
@ -902,7 +902,7 @@ describe('in mode: building up – separate for each resolver', () => {
}, },
errors: undefined, errors: undefined,
}) })
expect(result.data.GroupMember.length).toBe(3) expect(result.data.GroupMembers.length).toBe(3)
}) })
}) })
@ -912,7 +912,7 @@ describe('in mode: building up – separate for each resolver', () => {
}) })
it('throws authorization error', async () => { it('throws authorization error', async () => {
const { errors } = await query({ query: groupMemberQuery, variables }) const { errors } = await query({ query: groupMembersQuery, variables })
expect(errors[0]).toHaveProperty('message', 'Not Authorised!') expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
}) })
}) })
@ -923,7 +923,7 @@ describe('in mode: building up – separate for each resolver', () => {
}) })
it('throws authorization error', async () => { it('throws authorization error', async () => {
const { errors } = await query({ query: groupMemberQuery, variables }) const { errors } = await query({ query: groupMembersQuery, variables })
expect(errors[0]).toHaveProperty('message', 'Not Authorised!') expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
}) })
}) })
@ -945,12 +945,12 @@ describe('in mode: building up – separate for each resolver', () => {
it('finds all members', async () => { it('finds all members', async () => {
const result = await mutate({ const result = await mutate({
mutation: groupMemberQuery, mutation: groupMembersQuery,
variables, variables,
}) })
expect(result).toMatchObject({ expect(result).toMatchObject({
data: { data: {
GroupMember: expect.arrayContaining([ GroupMembers: expect.arrayContaining([
expect.objectContaining({ expect.objectContaining({
id: 'pending-user', id: 'pending-user',
myRoleInGroup: 'pending', myRoleInGroup: 'pending',
@ -971,7 +971,7 @@ describe('in mode: building up – separate for each resolver', () => {
}, },
errors: undefined, errors: undefined,
}) })
expect(result.data.GroupMember.length).toBe(4) expect(result.data.GroupMembers.length).toBe(4)
}) })
}) })
@ -982,12 +982,12 @@ describe('in mode: building up – separate for each resolver', () => {
it('finds all members', async () => { it('finds all members', async () => {
const result = await mutate({ const result = await mutate({
mutation: groupMemberQuery, mutation: groupMembersQuery,
variables, variables,
}) })
expect(result).toMatchObject({ expect(result).toMatchObject({
data: { data: {
GroupMember: expect.arrayContaining([ GroupMembers: expect.arrayContaining([
expect.objectContaining({ expect.objectContaining({
id: 'pending-user', id: 'pending-user',
myRoleInGroup: 'pending', myRoleInGroup: 'pending',
@ -1008,7 +1008,7 @@ describe('in mode: building up – separate for each resolver', () => {
}, },
errors: undefined, errors: undefined,
}) })
expect(result.data.GroupMember.length).toBe(4) expect(result.data.GroupMembers.length).toBe(4)
}) })
}) })
@ -1019,12 +1019,12 @@ describe('in mode: building up – separate for each resolver', () => {
it('finds all members', async () => { it('finds all members', async () => {
const result = await mutate({ const result = await mutate({
mutation: groupMemberQuery, mutation: groupMembersQuery,
variables, variables,
}) })
expect(result).toMatchObject({ expect(result).toMatchObject({
data: { data: {
GroupMember: expect.arrayContaining([ GroupMembers: expect.arrayContaining([
expect.objectContaining({ expect.objectContaining({
id: 'pending-user', id: 'pending-user',
myRoleInGroup: 'pending', myRoleInGroup: 'pending',
@ -1045,7 +1045,7 @@ describe('in mode: building up – separate for each resolver', () => {
}, },
errors: undefined, errors: undefined,
}) })
expect(result.data.GroupMember.length).toBe(4) expect(result.data.GroupMembers.length).toBe(4)
}) })
}) })
@ -1055,7 +1055,7 @@ describe('in mode: building up – separate for each resolver', () => {
}) })
it('throws authorization error', async () => { it('throws authorization error', async () => {
const { errors } = await query({ query: groupMemberQuery, variables }) const { errors } = await query({ query: groupMembersQuery, variables })
expect(errors[0]).toHaveProperty('message', 'Not Authorised!') expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
}) })
}) })
@ -1066,7 +1066,7 @@ describe('in mode: building up – separate for each resolver', () => {
}) })
it('throws authorization error', async () => { it('throws authorization error', async () => {
const { errors } = await query({ query: groupMemberQuery, variables }) const { errors } = await query({ query: groupMembersQuery, variables })
expect(errors[0]).toHaveProperty('message', 'Not Authorised!') expect(errors[0]).toHaveProperty('message', 'Not Authorised!')
}) })
}) })
@ -1323,12 +1323,12 @@ describe('in mode: building up – separate for each resolver', () => {
// const groups = await query({ query: groupQuery, variables: {} }) // const groups = await query({ query: groupQuery, variables: {} })
// console.log('groups.data.Group: ', groups.data.Group) // console.log('groups.data.Group: ', groups.data.Group)
// const groupMemberOfClosedGroup = await mutate({ // const groupMemberOfClosedGroup = await mutate({
// mutation: groupMemberQuery, // mutation: groupMembersQuery,
// variables: { // variables: {
// id: 'closed-group', // id: 'closed-group',
// }, // },
// }) // })
// console.log('groupMemberOfClosedGroup.data.GroupMember: ', groupMemberOfClosedGroup.data.GroupMember) // console.log('groupMemberOfClosedGroup.data.GroupMembers: ', groupMemberOfClosedGroup.data.GroupMembers)
await expect( await expect(
mutate({ mutate({
mutation: changeGroupMemberRoleMutation, mutation: changeGroupMemberRoleMutation,

2
backend/src/schema/types/type/Group.gql
View File

@ -73,7 +73,7 @@ type Query {
orderBy: [_GroupOrdering] orderBy: [_GroupOrdering]
): [Group] ): [Group]
GroupMember( GroupMembers(
id: ID! id: ID!
first: Int first: Int
offset: Int offset: Int