diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts index 1b03f8876..1c2120fb0 100644 --- a/backend/src/graphql/rooms.ts +++ b/backend/src/graphql/rooms.ts @@ -21,6 +21,7 @@ export const roomQuery = () => { Room { id roomId + roomName users { _id id diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts index 732523a73..dd996f4f4 100644 --- a/backend/src/schema/resolvers/rooms.spec.ts +++ b/backend/src/schema/resolvers/rooms.spec.ts @@ -141,6 +141,7 @@ describe('Room', () => { { id: expect.any(String), roomId: result.data.Room[0].id, + roomName: 'Other Chatting User', users: expect.arrayContaining([ { _id: 'chatting-user', @@ -180,6 +181,7 @@ describe('Room', () => { { id: expect.any(String), roomId: result.data.Room[0].id, + roomName: 'Chatting User', users: expect.arrayContaining([ { _id: 'chatting-user', diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts index aa165b35f..d8aaff2ce 100644 --- a/backend/src/schema/resolvers/rooms.ts +++ b/backend/src/schema/resolvers/rooms.ts @@ -13,6 +13,7 @@ export default { if (resolved) { resolved.forEach((room) => { if (room.users) { + room.roomName = room.users.filter((user) => user.id !== context.user.id)[0].name room.users.forEach((user) => { user._id = user.id }) diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql index 854d85078..f93b395c8 100644 --- a/backend/src/schema/types/type/Room.gql +++ b/backend/src/schema/types/type/Room.gql @@ -13,6 +13,7 @@ type Room { users: [User]! @relation(name: "CHATS_IN", direction: "IN") roomId: String! @cypher(statement: "RETURN this.id") + roomName: String! ## @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user[0].name") } type Mutation {