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

Merge branch 'master' into room-properties

Browse Source
This commit is contained in:
Moriz Wahl 2023-06-20 16:47:53 +02:00 committed by GitHub
commit 45602119ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
backend/src/schema/resolvers/messages.spec.ts
View File

@ -209,9 +209,17 @@ describe('Message', () => {
mutation: createMessageMutation(),
variables: {
roomId,
content: 'Another nice message to other chatting user',
content: 'A nice response message to chatting user',
}
})
authenticatedUser = await chattingUser.toJson()
await mutate({
mutation: createMessageMutation(),
variables: {
roomId,
content: 'And another nice message to other chatting user',
}
})
})
it('returns the messages', async () => {
@ -233,11 +241,18 @@ describe('Message', () => {
},
{
id: expect.any(String),
content: 'Another nice message to other chatting user',
content: 'A nice response message to chatting user',
author: {
id: 'other-chatting-user',
},
}
},
{
id: expect.any(String),
content: 'And another nice message to other chatting user',
author: {
id: 'chatting-user',
},
}
],
},
})

10
backend/src/schema/resolvers/messages.ts
View File

@ -24,11 +24,11 @@ export default {
const writeTxResultPromise = session.writeTransaction(async (transaction) => {
const createMessageCypher = `
MATCH (currentUser:User { id: $currentUserId })-[:CHATS_IN]->(room:Room { id: $roomId })
MERGE (currentUser)-[:CREATED]->(message:Message)-[:INSIDE]->(room)
ON CREATE SET
message.createdAt = toString(datetime()),
message.id = apoc.create.uuid(),
message.content = $content
CREATE (currentUser)-[:CREATED]->(message:Message {
createdAt: toString(datetime()),
id: apoc.create.uuid(),
content: $content
})-[:INSIDE]->(room)
RETURN message { .* }
`
const createMessageTxResponse = await transaction.run(