diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index 2977a3dde..c9d3f54f2 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -30,3 +30,11 @@ export const roomQuery = () => {
}
`
}
+
+export const unreadRoomsQuery = () => {
+ return gql`
+ query {
+ UnreadRooms
+ }
+ `
+}
diff --git a/backend/src/middleware/permissionsMiddleware.ts b/backend/src/middleware/permissionsMiddleware.ts
index c07098a3c..f87f4b079 100644
--- a/backend/src/middleware/permissionsMiddleware.ts
+++ b/backend/src/middleware/permissionsMiddleware.ts
@@ -408,6 +408,7 @@ export default shield(
getInviteCode: isAuthenticated, // and inviteRegistration
Room: isAuthenticated,
Message: isAuthenticated,
+ UnreadRooms: isAuthenticated,
},
Mutation: {
'*': deny,
diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index 0978fd600..690572e43 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -1,7 +1,8 @@
import { createTestClient } from 'apollo-server-testing'
import Factory, { cleanDatabase } from '../../db/factories'
import { getNeode, getDriver } from '../../db/neo4j'
-import { createRoomMutation, roomQuery } from '../../graphql/rooms'
+import { createRoomMutation, roomQuery, unreadRoomsQuery } from '../../graphql/rooms'
+import { createMessageMutation } from '../../graphql/messages'
import createServer from '../../server'
const driver = getDriver()
@@ -34,6 +35,8 @@ afterAll(async () => {
})
describe('Room', () => {
+ let roomId: string
+
beforeAll(async () => {
;[chattingUser, otherChattingUser, notChattingUser] = await Promise.all([
Factory.build('user', {
@@ -76,8 +79,6 @@ describe('Room', () => {
})
describe('authenticated', () => {
- let roomId: string
-
beforeAll(async () => {
authenticatedUser = await chattingUser.toJson()
})
@@ -269,6 +270,117 @@ describe('Room', () => {
})
})
+ describe('unread rooms query', () => {
+ describe('unauthenticated', () => {
+ it('throws authorization error', async () => {
+ authenticatedUser = null
+ await expect(
+ query({
+ query: unreadRoomsQuery(),
+ }),
+ ).resolves.toMatchObject({
+ errors: [{ message: 'Not Authorized!' }],
+ })
+ })
+ })
+
+ describe('authenticated', () => {
+ let otherRoomId: string
+
+ beforeAll(async () => {
+ authenticatedUser = await chattingUser.toJson()
+ const result = await mutate({
+ mutation: createRoomMutation(),
+ variables: {
+ userId: 'not-chatting-user',
+ },
+ })
+ otherRoomId = result.data.CreateRoom.roomId
+ await mutate({
+ mutation: createMessageMutation(),
+ variables: {
+ roomId: otherRoomId,
+ content: 'Message to not chatting user',
+ },
+ })
+ await mutate({
+ mutation: createMessageMutation(),
+ variables: {
+ roomId,
+ content: '1st message to other chatting user',
+ },
+ })
+ await mutate({
+ mutation: createMessageMutation(),
+ variables: {
+ roomId,
+ content: '2nd message to other chatting user',
+ },
+ })
+ authenticatedUser = await otherChattingUser.toJson()
+ const result2 = await mutate({
+ mutation: createRoomMutation(),
+ variables: {
+ userId: 'not-chatting-user',
+ },
+ })
+ otherRoomId = result2.data.CreateRoom.roomId
+ await mutate({
+ mutation: createMessageMutation(),
+ variables: {
+ roomId: otherRoomId,
+ content: 'Other message to not chatting user',
+ },
+ })
+ })
+
+ describe('as chatting user', () => {
+ it('has 0 unread rooms', async () => {
+ authenticatedUser = await chattingUser.toJson()
+ await expect(
+ query({
+ query: unreadRoomsQuery(),
+ }),
+ ).resolves.toMatchObject({
+ data: {
+ UnreadRooms: 0,
+ },
+ })
+ })
+ })
+
+ describe('as other chatting user', () => {
+ it('has 1 unread rooms', async () => {
+ authenticatedUser = await otherChattingUser.toJson()
+ await expect(
+ query({
+ query: unreadRoomsQuery(),
+ }),
+ ).resolves.toMatchObject({
+ data: {
+ UnreadRooms: 1,
+ },
+ })
+ })
+ })
+
+ describe('as not chatting user', () => {
+ it('has 2 unread rooms', async () => {
+ authenticatedUser = await notChattingUser.toJson()
+ await expect(
+ query({
+ query: unreadRoomsQuery(),
+ }),
+ ).resolves.toMatchObject({
+ data: {
+ UnreadRooms: 2,
+ },
+ })
+ })
+ })
+ })
+ })
+
describe('query several rooms', () => {
beforeAll(async () => {
authenticatedUser = await chattingUser.toJson()
@@ -287,7 +399,7 @@ describe('Room', () => {
})
it('returns the rooms paginated', async () => {
- expect(await query({ query: roomQuery(), variables: { first: 2, offset: 0 } })).toMatchObject(
+ expect(await query({ query: roomQuery(), variables: { first: 3, offset: 0 } })).toMatchObject(
{
errors: undefined,
data: {
@@ -338,11 +450,34 @@ describe('Room', () => {
},
]),
},
+ {
+ id: expect.any(String),
+ roomId: expect.any(String),
+ roomName: 'Not Chatting User',
+ users: expect.arrayContaining([
+ {
+ _id: 'chatting-user',
+ id: 'chatting-user',
+ name: 'Chatting User',
+ avatar: {
+ url: expect.any(String),
+ },
+ },
+ {
+ _id: 'not-chatting-user',
+ id: 'not-chatting-user',
+ name: 'Not Chatting User',
+ avatar: {
+ url: expect.any(String),
+ },
+ },
+ ]),
+ },
],
},
},
)
- expect(await query({ query: roomQuery(), variables: { first: 2, offset: 2 } })).toMatchObject(
+ expect(await query({ query: roomQuery(), variables: { first: 3, offset: 3 } })).toMatchObject(
{
errors: undefined,
data: {
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index d5015a03b..cbf5bcd63 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -25,6 +25,27 @@ export default {
}
return resolved
},
+ UnreadRooms: async (object, params, context, resolveInfo) => {
+ const {
+ user: { id: currentUserId },
+ } = context
+ const session = context.driver.session()
+ const readTxResultPromise = session.readTransaction(async (transaction) => {
+ const unreadRoomsCypher = `
+ MATCH (:User { id: $currentUserId })-[:CHATS_IN]->(room:Room)<-[:INSIDE]-(message:Message)<-[:CREATED]-(sender:User)
+ WHERE NOT sender.id = $currentUserId AND NOT message.seen
+ RETURN toString(COUNT(DISTINCT room)) AS count
+ `
+ const unreadRoomsTxResponse = await transaction.run(unreadRoomsCypher, { currentUserId })
+ return unreadRoomsTxResponse.records.map((record) => record.get('count'))[0]
+ })
+ try {
+ const count = await readTxResultPromise
+ return count
+ } finally {
+ session.close()
+ }
+ },
},
Mutation: {
CreateRoom: async (_parent, params, context, _resolveInfo) => {
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 82acd9e05..80f61c83a 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -33,4 +33,5 @@ type Query {
id: ID
orderBy: [_RoomOrdering]
): [Room]
+ UnreadRooms: Int
}
diff --git a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
index fcd93ee48..016410216 100644
--- a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
+++ b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
@@ -8,18 +8,34 @@
placement: 'bottom-start',
}"
>
-
+
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index a746d34f9..e42cae2e8 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -27,3 +27,11 @@ export const createRoom = () => gql`
}
}
`
+
+export const unreadRoomsQuery = () => {
+ return gql`
+ query {
+ UnreadRooms
+ }
+ `
+}