From 34145cfa061512f889151b8c1f196ce67304e1b0 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 13:10:28 +0200
Subject: [PATCH 01/20] fix typo

---
 .github/workflows/test-backend.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 84d87c770..d144928e8 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3.3.0
 
-      - name: Check for frontend file changes
+      - name: Check for backend file changes
         uses: dorny/paths-filter@v2.11.1
         id: changes
         with:
@@ -93,11 +93,11 @@ jobs:
       - name: Load Docker Image
         run: docker load < /tmp/neo4j.tar
 
-      - name: Download Docker Image (Backend)
-        uses: actions/download-artifact@v3
-        with:
-          name: docker-backend-test
-          path: /tmp
+      # - name: Download Docker Image (Backend)
+      #   uses: actions/download-artifact@v3
+      #   with:
+      #     name: docker-backend-test
+      #     path: /tmp
 
       - name: Load Docker Image
         run: docker load < /tmp/backend.tar

From b15148b985ec0df4a89203dca620ce58a2cf9e04 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 13:18:35 +0200
Subject: [PATCH 02/20] replace artefact upload by caching in neo4j build test
 job

---
 .github/workflows/test-backend.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index d144928e8..e6bc213fe 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -35,11 +35,16 @@ jobs:
           docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
           docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/neo4j.tar
 
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+      - name: Get pr number
+        id: pr
+        uses: 8BitJonny/gh-get-current-pr@2.2.0
+      
+      - name: Cache docker images
+        id: cache-neo4j
+        uses: actions/cache/save@v3.3.1
         with:
-          name: docker-neo4j-image
           path: /tmp/neo4j.tar
+          key: backend-neo4j-cache-pr${{ steps.pr.outputs.number }}
 
   build_test_backend:
     name: Docker Build Test - Backend
@@ -53,13 +58,13 @@ jobs:
       - name: backend | Build 'test' image
         run: |
           docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
-          docker save "ocelotsocialnetwork/backend:test" > /tmp/backend.tar
+          docker save "ocelotsocialnetwork/backend:test" > /tmp/images/backend.tar
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
           name: docker-backend-test
-          path: /tmp/backend.tar
+          path: /tmp/images/backend.tar
 
   lint_backend:
     name: Lint Backend

From 7e171fb5218911810459f1936c47245818809b42 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 13:21:02 +0200
Subject: [PATCH 03/20] replace artefact upload by caching in backend build
 test job

---
 .github/workflows/test-backend.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index e6bc213fe..c484dc702 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -58,13 +58,18 @@ jobs:
       - name: backend | Build 'test' image
         run: |
           docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
-          docker save "ocelotsocialnetwork/backend:test" > /tmp/images/backend.tar
+          docker save "ocelotsocialnetwork/backend:test" > /tmp/backend.tar
 
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+      - name: Get pr number
+        id: pr
+        uses: 8BitJonny/gh-get-current-pr@2.2.0
+      
+      - name: Cache docker images
+        id: cache-backend
+        uses: actions/cache/save@v3.3.1
         with:
-          name: docker-backend-test
-          path: /tmp/images/backend.tar
+          path: /tmp/backend.tar
+          key: backend-cache-pr${{ steps.pr.outputs.number }}
 
   lint_backend:
     name: Lint Backend

From 4ec4b3659041be9b250b8cbc4c977f5ed18a2734 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 13:57:53 +0200
Subject: [PATCH 04/20] replace artefact download by caching in backend unit
 test job

---
 .github/workflows/test-backend.yml | 46 ++++++++++++++----------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index c484dc702..c90d0e1ea 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -10,6 +10,7 @@ jobs:
     outputs:
       backend: ${{ steps.changes.outputs.backend }}
       docker: ${{ steps.changes.outputs.docker }}
+      pr-number: ${{ steps.pr.outputs.number }}
     steps:
       - uses: actions/checkout@v3.3.0
 
@@ -21,6 +22,10 @@ jobs:
           filters: .github/file-filters.yml
           list-files: shell
 
+      - name: Get pr number
+        id: pr
+        uses: 8BitJonny/gh-get-current-pr@2.2.0
+
   build_test_neo4j:
     name: Docker Build Test - Neo4J
     if: needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true'
@@ -34,17 +39,13 @@ jobs:
         run: |
           docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
           docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/neo4j.tar
-
-      - name: Get pr number
-        id: pr
-        uses: 8BitJonny/gh-get-current-pr@2.2.0
       
       - name: Cache docker images
         id: cache-neo4j
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-pr${{ steps.pr.outputs.number }}
+          key: backend-neo4j-cache-pr${{ needs.files-changed.outputs.pr-number }}
 
   build_test_backend:
     name: Docker Build Test - Backend
@@ -59,17 +60,13 @@ jobs:
         run: |
           docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
           docker save "ocelotsocialnetwork/backend:test" > /tmp/backend.tar
-
-      - name: Get pr number
-        id: pr
-        uses: 8BitJonny/gh-get-current-pr@2.2.0
       
       - name: Cache docker images
         id: cache-backend
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-pr${{ steps.pr.outputs.number }}
+          key: backend-cache-pr${{ needs.files-changed.outputs.pr-number }}
 
   lint_backend:
     name: Lint Backend
@@ -94,23 +91,24 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Download Docker Image (Neo4J)
-        uses: actions/download-artifact@v3
+      - name: Restore Neo4J cache
+        uses: actions/cache/restore@v3.3.1
         with:
-          name: docker-neo4j-image
-          path: /tmp
+          path: /tmp/neo4j.tar
+          key: backend-neo4j-cache-pr${{ needs.files-changed.outputs.pr-number }}
+          fail-on-cache-miss: true
 
-      - name: Load Docker Image
-        run: docker load < /tmp/neo4j.tar
+      - name: Restore Backend cache
+        uses: actions/cache/restore@v3.3.1
+        with:
+          path: /tmp/backend.tar
+          key: backend-cache-pr${{ needs.files-changed.outputs.pr-number }}
+          fail-on-cache-miss: true
 
-      # - name: Download Docker Image (Backend)
-      #   uses: actions/download-artifact@v3
-      #   with:
-      #     name: docker-backend-test
-      #     path: /tmp
-
-      - name: Load Docker Image
-        run: docker load < /tmp/backend.tar
+      - name: Load Docker Images
+        run: |
+          docker load < /tmp/neo4j.tar
+          docker load < /tmp/backend.tar
 
       - name: backend | copy env files webapp
         run: cp webapp/.env.template webapp/.env

From 89719b3cdad35b2de700fe869dc98c85b2de6cf3 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 14:01:14 +0200
Subject: [PATCH 05/20] merge env copy steps into single step

---
 .github/workflows/test-backend.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index c90d0e1ea..e293f3e99 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -110,10 +110,10 @@ jobs:
           docker load < /tmp/neo4j.tar
           docker load < /tmp/backend.tar
 
-      - name: backend | copy env files webapp
-        run: cp webapp/.env.template webapp/.env
-      - name: backend | copy env files backend
-        run: cp backend/.env.template backend/.env
+      - name: backend | copy env files
+        run: |
+          cp webapp/.env.template webapp/.env
+          cp backend/.env.template backend/.env
 
       - name: backend | docker-compose
         run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps neo4j backend

From e44c3493e2a7bde4583d2efb88f0929ebfc1a232 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 14:29:00 +0200
Subject: [PATCH 06/20] add backend test worfkflow file to file filter

---
 .github/file-filters.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/file-filters.yml b/.github/file-filters.yml
index d7f9cb6c0..1c2f4fc62 100644
--- a/.github/file-filters.yml
+++ b/.github/file-filters.yml
@@ -1,4 +1,5 @@
 backend: &backend
+  - '.github/workflows/test-backend.yml'
   - 'backend/**/*'
   - 'neo4j/**/*'
 

From f7e8d85b5f59c34dd00b2b427fd12cda53a1a37a Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 14:29:35 +0200
Subject: [PATCH 07/20] add webapp test worfkflow file to file filter

---
 .github/file-filters.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/file-filters.yml b/.github/file-filters.yml
index 1c2f4fc62..8d2d93fac 100644
--- a/.github/file-filters.yml
+++ b/.github/file-filters.yml
@@ -7,4 +7,5 @@ docker: &docker
   - 'docker-compose.*'
 
 webapp: &webapp
+  - '.github/workflows/test-webapp.yml'
   - 'webapp/**/*'

From ced4996f4769bae5821e70b42a7dcadf4cfa6fc5 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 14:55:57 +0200
Subject: [PATCH 08/20] implement chatMessageAdded subscription

---
 backend/src/schema/resolvers/messages.ts  | 18 +++++++++++++-
 backend/src/schema/types/type/Message.gql |  4 ++++
 backend/src/server.ts                     |  2 +-
 webapp/components/Chat/Chat.vue           | 29 ++++++++++++++++++++++-
 webapp/graphql/Messages.js                | 26 ++++++++++++++++++++
 5 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index ececd65a6..f363f9a44 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -1,9 +1,21 @@
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import Resolver from './helpers/Resolver'
 import RoomResolver from './rooms'
-import { pubsub, ROOM_COUNT_UPDATED } from '../../server'
+import { pubsub, ROOM_COUNT_UPDATED, CHAT_MESSAGE_ADDED } from '../../server'
+import { withFilter } from 'graphql-subscriptions'
 
 export default {
+  Subscription: {
+    chatMessageAdded: {
+      subscribe: withFilter(
+        () => pubsub.asyncIterator(CHAT_MESSAGE_ADDED),
+        (payload, variables) => {
+          console.log('chatMessageAdded', payload, variables)
+          return true // payload.user.id === variables.userId
+        },
+      ),
+    },
+  },
   Query: {
     Message: async (object, params, context, resolveInfo) => {
       const { roomId } = params
@@ -91,6 +103,10 @@ export default {
 
         // send subscriptions
         await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: message.otherUser })
+        await pubsub.publish(CHAT_MESSAGE_ADDED, {
+          chatMessageAdded: message,
+          user: message.otherUser,
+        })
 
         return message
       })
diff --git a/backend/src/schema/types/type/Message.gql b/backend/src/schema/types/type/Message.gql
index 671c5523a..e15a27d91 100644
--- a/backend/src/schema/types/type/Message.gql
+++ b/backend/src/schema/types/type/Message.gql
@@ -45,3 +45,7 @@ type Query {
     orderBy: [_MessageOrdering]
   ): [Message]
 }
+
+type Subscription {
+  chatMessageAdded(userId: ID!): Message
+}
diff --git a/backend/src/server.ts b/backend/src/server.ts
index feceeb9eb..0522f5fc8 100644
--- a/backend/src/server.ts
+++ b/backend/src/server.ts
@@ -14,7 +14,7 @@ import bodyParser from 'body-parser'
 import { graphqlUploadExpress } from 'graphql-upload'
 
 export const NOTIFICATION_ADDED = 'NOTIFICATION_ADDED'
-// export const CHAT_MESSAGE_ADDED = 'CHAT_MESSAGE_ADDED'
+export const CHAT_MESSAGE_ADDED = 'CHAT_MESSAGE_ADDED'
 export const ROOM_COUNT_UPDATED = 'ROOM_COUNT_UPDATED'
 const { REDIS_DOMAIN, REDIS_PORT, REDIS_PASSWORD } = CONFIG
 let prodPubsub, devPubsub
diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index dd39e7bcd..1e4636e8b 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -61,7 +61,7 @@
 
 <script>
 import { roomQuery, createRoom } from '~/graphql/Rooms'
-import { messageQuery, createMessageMutation } from '~/graphql/Messages'
+import { messageQuery, createMessageMutation, chatMessageAdded } from '~/graphql/Messages'
 import chatStyle from '~/constants/chat.js'
 import { mapGetters } from 'vuex'
 
@@ -182,6 +182,22 @@ export default {
     } else {
       this.fetchRooms()
     }
+
+    // Subscriptions
+    const observer = this.$apollo.subscribe({
+      query: chatMessageAdded(),
+      variables: {
+        userId: this.currentUser.id,
+      },
+    })
+
+    observer.subscribe({
+      next: this.chatMessageAdded,
+      error (error) {
+        console.error(error)
+      },
+    })
+
   },
   computed: {
     ...mapGetters({
@@ -269,6 +285,17 @@ export default {
       }
     },
 
+    async chatMessageAdded({data}){
+      console.log(data)
+      if(data.chatMessageAdded.room.id === this.selectedRoom?.id){
+        this.fetchMessages({ room: this.selectedRoom}, { refetch: true})
+      } else {
+        // TODO this might be optimized selectively (first page vs rest)
+        this.rooms = []
+        this.fetchRooms()
+      }
+    },
+
     async sendMessage(message) {
       try {
         await this.$apollo.mutate({
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index 1d7917bfc..bc0d1e5ff 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -33,3 +33,29 @@ export const createMessageMutation = () => {
     }
   `
 }
+
+export const chatMessageAdded = () => {
+  return gql`
+    subscription chatMessageAdded($userId: ID!) {
+      chatMessageAdded(userId: $userId){
+        #_id
+        id
+        # indexId
+        content
+        senderId
+        #author {
+        #  id
+        #}
+        #username
+        #avatar
+        #date
+        room {
+          id
+        }
+        saved
+        distributed
+        seen
+      }
+    }
+  `
+}

From 69408007e7d943ad387335633585e90d5e735883 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 15:04:12 +0200
Subject: [PATCH 09/20] replace artefact upload by caching in webapp build test
 job

---
 .github/workflows/test-webapp.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index c1aee47cf..3e484d292 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -26,6 +26,8 @@ jobs:
     if: needs.files-changed.outputs.webapp == 'true'
     needs: files-changed
     runs-on: ubuntu-latest
+    outputs:
+      pr-number: ${{ steps.pr.outputs.number }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -34,7 +36,11 @@ jobs:
         run: |
           scripts/translations/sort.sh
           scripts/translations/missing-keys.sh
-          
+
+      - name: Get pr number
+        id: pr
+        uses: 8BitJonny/gh-get-current-pr@2.2.0
+
   build_test_webapp:
     name: Docker Build Test - Webapp
     if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
@@ -44,16 +50,16 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: webapp | Build 'test' image
+      - name: Webapp | Build 'test' image
         run: |
           docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
           docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar
 
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+      - name: Cache docker image
+        uses: actions/cache/save@v3.3.1
         with:
-          name: docker-webapp-test
           path: /tmp/webapp.tar
+          key: webapp-cache-pr${{ needs.prepare.outputs.pr-number }}
 
   lint_webapp:
     name: Lint Webapp

From 045d13996094682908dcb7b07565b260960d585a Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 15:11:18 +0200
Subject: [PATCH 10/20] replace artefact upload by caching in webapp unit test
 job

---
 .github/workflows/test-webapp.yml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 3e484d292..5d603e388 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -9,6 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       docker: ${{ steps.changes.outputs.docker }}
+      pr-number: ${{ steps.pr.outputs.number }}
       webapp: ${{ steps.changes.outputs.webapp }}
     steps:
       - uses: actions/checkout@v3.3.0
@@ -21,13 +22,15 @@ jobs:
           filters: .github/file-filters.yml
           list-files: shell
 
+      - name: Get pr number
+        id: pr
+        uses: 8BitJonny/gh-get-current-pr@2.2.0
+
   prepare:
     name: Prepare
     if: needs.files-changed.outputs.webapp == 'true'
     needs: files-changed
     runs-on: ubuntu-latest
-    outputs:
-      pr-number: ${{ steps.pr.outputs.number }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -37,10 +40,6 @@ jobs:
           scripts/translations/sort.sh
           scripts/translations/missing-keys.sh
 
-      - name: Get pr number
-        id: pr
-        uses: 8BitJonny/gh-get-current-pr@2.2.0
-
   build_test_webapp:
     name: Docker Build Test - Webapp
     if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
@@ -59,7 +58,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-pr${{ needs.prepare.outputs.pr-number }}
+          key: webapp-cache-pr${{ needs.files-changed.outputs.pr-number }}
 
   lint_webapp:
     name: Lint Webapp
@@ -84,11 +83,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Download Docker Image (Webapp)
-        uses: actions/download-artifact@v3
+      - name: Restore webapp cache
+        uses: actions/cache/restore@v3.3.1
         with:
-          name: docker-webapp-test
-          path: /tmp
+          path: /tmp/webapp.tar
+          key: webapp-cache-pr${{ needs.files-changed.outputs.pr-number }}
 
       - name: Load Docker Image
         run: docker load < /tmp/webapp.tar

From e1374c05ac5707edaa0eaecea0f77cdb14920131 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 15:17:58 +0200
Subject: [PATCH 11/20] add cache deletion job to backend and webapp workflow
 files

---
 .github/workflows/test-backend.yml | 16 ++++++++++++++++
 .github/workflows/test-webapp.yml  | 23 ++++++++++++++++++-----
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index e293f3e99..a96cff028 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -126,3 +126,19 @@ jobs:
 
       - name: backend | Unit test incl. coverage check
         run: docker-compose exec -T backend yarn test
+
+  cleanup:
+    name: Cleanup
+    if: always()
+    needs: [files-changed, unit_test_backend]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Delete cache
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh extension install actions/gh-actions-cache
+          KEY="backend-neo4j-cache-pr${{ needs.files-changed.outputs.pr-number }}"
+          gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
+          KEY="backend-cache-pr${{ needs.files-changed.outputs.pr-number }}"
+          gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 5d603e388..772182778 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -92,11 +92,10 @@ jobs:
       - name: Load Docker Image
         run: docker load < /tmp/webapp.tar
 
-      - name: backend | copy env files webapp
-        run: cp webapp/.env.template webapp/.env
-
-      - name: backend | copy env files backend
-        run: cp backend/.env.template backend/.env
+      - name: Copy env files
+        run: |
+          cp webapp/.env.template webapp/.env
+          cp backend/.env.template backend/.env
 
       - name: backend | docker-compose
         run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp
@@ -104,3 +103,17 @@ jobs:
       - name: webapp | Unit tests incl. coverage check
         run: docker-compose exec -T webapp yarn test
 
+  cleanup:
+    name: Cleanup
+    if: always()
+    needs: [files-changed, unit_test_webapp]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Delete cache
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh extension install actions/gh-actions-cache
+          KEY="webapp-cache-pr${{ needs.files-changed.outputs.pr-number }}"
+          gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
+

From 6b7047e604b7b10d6afdd6cc969404a5aea9bbb1 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 10:25:12 +0200
Subject: [PATCH 12/20] set workflow not to fail while deleting cache

---
 .github/workflows/test-backend.yml | 1 +
 .github/workflows/test-webapp.yml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index a96cff028..af53e1fbc 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -138,6 +138,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
+          set +e
           KEY="backend-neo4j-cache-pr${{ needs.files-changed.outputs.pr-number }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
           KEY="backend-cache-pr${{ needs.files-changed.outputs.pr-number }}"
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 772182778..421ce5187 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -114,6 +114,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
+          set +e
           KEY="webapp-cache-pr${{ needs.files-changed.outputs.pr-number }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
 

From 98cad5b568a49a246463abc113545e0aafefd3df Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 10:47:56 +0200
Subject: [PATCH 13/20] changed order of room to lastMessageAt

---
 backend/src/graphql/rooms.ts           | 2 +-
 backend/src/schema/types/type/Room.gql | 2 +-
 webapp/graphql/Rooms.js                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index 294b50641..b35a3e999 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -25,7 +25,7 @@ export const createRoomMutation = () => {
 export const roomQuery = () => {
   return gql`
     query Room($first: Int, $offset: Int, $id: ID) {
-      Room(first: $first, offset: $offset, id: $id, orderBy: createdAt_desc) {
+      Room(first: $first, offset: $offset, id: $id, orderBy: lastMessageAt_desc) {
         id
         roomId
         roomName
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index fdce6865b..0cf5b22c8 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -7,7 +7,7 @@
 
 # TODO change this to last message date
 enum _RoomOrdering {
-  createdAt_desc
+  lastMessageAt_desc
 }
 
 type Room {
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 68baccf3f..bbdd95a04 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -2,7 +2,7 @@ import gql from 'graphql-tag'
 
 export const roomQuery = () => gql`
   query Room($first: Int, $offset: Int, $id: ID) {
-    Room(first: $first, offset: $offset, id: $id, orderBy: createdAt_desc) {
+    Room(first: $first, offset: $offset, id: $id, orderBy: lastMessageAt_desc) {
       id
       roomId
       roomName

From d7aba44fbeb9ddefe39e8ef9ea7f066829e4325a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 10:48:42 +0200
Subject: [PATCH 14/20] removed console log and fixed reloading of messages

---
 backend/src/schema/resolvers/messages.ts | 1 -
 webapp/components/Chat/Chat.vue          | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index cd6e5827e..0dd91a905 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -26,7 +26,6 @@ export default {
       subscribe: withFilter(
         () => pubsub.asyncIterator(CHAT_MESSAGE_ADDED),
         (payload, variables) => {
-          console.log('chatMessageAdded', payload, variables)
           return true // payload.user.id === variables.userId
         },
       ),
diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 870e2a46c..5f747d9de 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -314,12 +314,13 @@ export default {
     },
 
     async chatMessageAdded({data}){
-      console.log(data)
       if(data.chatMessageAdded.room.id === this.selectedRoom?.id){
-        this.fetchMessages({ room: this.selectedRoom}, { refetch: true})
+        this.fetchMessages({ room: this.selectedRoom, options: { refetch: true }})
       } else {
         // TODO this might be optimized selectively (first page vs rest)
         this.rooms = []
+        this.roomPage = 0
+        this.roomsLoaded = false
         this.fetchRooms()
       }
     },

From ae2d6c7ad53b6f6a8d9edd3bc3b4db2bd095b942 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 10:52:18 +0200
Subject: [PATCH 15/20] fix recipient selection

---
 backend/src/schema/resolvers/messages.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 0dd91a905..e473c2bb5 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -26,7 +26,7 @@ export default {
       subscribe: withFilter(
         () => pubsub.asyncIterator(CHAT_MESSAGE_ADDED),
         (payload, variables) => {
-          return true // payload.user.id === variables.userId
+          return payload.userId === variables.userId
         },
       ),
     },
@@ -114,13 +114,13 @@ export default {
           const roomCountUpdated = await getUnreadRoomsCount(message.recipientId, session)
 
           // send subscriptions
-          await pubsub.publish(ROOM_COUNT_UPDATED, {
+          void pubsub.publish(ROOM_COUNT_UPDATED, {
             roomCountUpdated,
             userId: message.recipientId,
           })
-          await pubsub.publish(CHAT_MESSAGE_ADDED, {
+          void pubsub.publish(CHAT_MESSAGE_ADDED, {
             chatMessageAdded: message,
-            user: message.recipientId,
+            userId: message.recipientId,
           })
         }
 

From 33ecc4764e88d52a64e61745293ec74cb459b447 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 10:54:27 +0200
Subject: [PATCH 16/20] linting

---
 webapp/components/Chat/Chat.vue | 18 +++++++++++-------
 webapp/graphql/Messages.js      |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 5f747d9de..3a059f64e 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -61,7 +61,12 @@
 
 <script>
 import { roomQuery, createRoom, unreadRoomsQuery } from '~/graphql/Rooms'
-import { messageQuery, createMessageMutation, chatMessageAdded, markMessagesAsSeen } from '~/graphql/Messages'
+import {
+  messageQuery,
+  createMessageMutation,
+  chatMessageAdded,
+  markMessagesAsSeen,
+} from '~/graphql/Messages'
 import chatStyle from '~/constants/chat.js'
 import { mapGetters, mapMutations } from 'vuex'
 
@@ -180,11 +185,10 @@ export default {
 
     observer.subscribe({
       next: this.chatMessageAdded,
-      error (error) {
-        console.error(error)
+      error(error) {
+        this.$toast.error(error)
       },
     })
-
   },
   computed: {
     ...mapGetters({
@@ -313,9 +317,9 @@ export default {
       }
     },
 
-    async chatMessageAdded({data}){
-      if(data.chatMessageAdded.room.id === this.selectedRoom?.id){
-        this.fetchMessages({ room: this.selectedRoom, options: { refetch: true }})
+    async chatMessageAdded({ data }) {
+      if (data.chatMessageAdded.room.id === this.selectedRoom?.id) {
+        this.fetchMessages({ room: this.selectedRoom, options: { refetch: true } })
       } else {
         // TODO this might be optimized selectively (first page vs rest)
         this.rooms = []
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index 994b28f51..9efd35cf1 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -37,7 +37,7 @@ export const createMessageMutation = () => {
 export const chatMessageAdded = () => {
   return gql`
     subscription chatMessageAdded($userId: ID!) {
-      chatMessageAdded(userId: $userId){
+      chatMessageAdded(userId: $userId) {
         #_id
         id
         # indexId

From cca020b6b325be22ba2910621145602f6cc0a651 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 11:14:06 +0200
Subject: [PATCH 17/20] aligned backend and frontend queries, show last message
 and unread count in room list

---
 backend/src/graphql/messages.ts |  3 +++
 backend/src/graphql/rooms.ts    |  2 ++
 webapp/graphql/Messages.js      | 22 +++++++++++-----------
 webapp/graphql/Rooms.js         | 32 +++++++++++++++++++++++---------
 4 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/backend/src/graphql/messages.ts b/backend/src/graphql/messages.ts
index fde45083b..2842c7230 100644
--- a/backend/src/graphql/messages.ts
+++ b/backend/src/graphql/messages.ts
@@ -27,6 +27,9 @@ export const messageQuery = () => {
         indexId
         content
         senderId
+        author {
+          id
+        }
         username
         avatar
         date
diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index 294b50641..a5cd1841b 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -9,6 +9,7 @@ export const createRoomMutation = () => {
         roomName
         lastMessageAt
         unreadCount
+        #avatar
         users {
           _id
           id
@@ -29,6 +30,7 @@ export const roomQuery = () => {
         id
         roomId
         roomName
+        avatar
         lastMessageAt
         unreadCount
         lastMessage {
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index 86b9c81ca..01ba413f4 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -1,5 +1,16 @@
 import gql from 'graphql-tag'
 
+export const createMessageMutation = () => {
+  return gql`
+    mutation ($roomId: ID!, $content: String!) {
+      CreateMessage(roomId: $roomId, content: $content) {
+        id
+        content
+      }
+    }
+  `
+}
+
 export const messageQuery = () => {
   return gql`
     query ($roomId: ID!, $first: Int, $offset: Int) {
@@ -23,17 +34,6 @@ export const messageQuery = () => {
   `
 }
 
-export const createMessageMutation = () => {
-  return gql`
-    mutation ($roomId: ID!, $content: String!) {
-      CreateMessage(roomId: $roomId, content: $content) {
-        id
-        content
-      }
-    }
-  `
-}
-
 export const markMessagesAsSeen = () => {
   return gql`
     mutation ($messageIds: [String!]) {
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 68baccf3f..a7414ecb7 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -1,5 +1,14 @@
 import gql from 'graphql-tag'
 
+export const createRoom = () => gql`
+  mutation ($userId: ID!) {
+    CreateRoom(userId: $userId) {
+      id
+      roomId
+    }
+  }
+`
+
 export const roomQuery = () => gql`
   query Room($first: Int, $offset: Int, $id: ID) {
     Room(first: $first, offset: $offset, id: $id, orderBy: createdAt_desc) {
@@ -7,6 +16,20 @@ export const roomQuery = () => gql`
       roomId
       roomName
       avatar
+      lastMessageAt
+      unreadCount
+      lastMessage {
+        _id
+        id
+        content
+        senderId
+        username
+        avatar
+        date
+        saved
+        distributed
+        seen
+      }
       users {
         _id
         id
@@ -19,15 +42,6 @@ export const roomQuery = () => gql`
   }
 `
 
-export const createRoom = () => gql`
-  mutation ($userId: ID!) {
-    CreateRoom(userId: $userId) {
-      id
-      roomId
-    }
-  }
-`
-
 export const unreadRoomsQuery = () => {
   return gql`
     query {

From eed89f8c4b292f552a1894b8f2715d35ac04f831 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 18 Jul 2023 12:46:19 +0200
Subject: [PATCH 18/20] add chat middleware to add new message subscription

---
 backend/src/middleware/chatMiddleware.ts      |  3 +++
 backend/src/schema/resolvers/messages.spec.ts | 16 +++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/backend/src/middleware/chatMiddleware.ts b/backend/src/middleware/chatMiddleware.ts
index c28d6a70d..8ae252e13 100644
--- a/backend/src/middleware/chatMiddleware.ts
+++ b/backend/src/middleware/chatMiddleware.ts
@@ -54,4 +54,7 @@ export default {
   Mutation: {
     CreateRoom: roomProperties,
   },
+  Subscription: {
+    chatMessageAdded: messageProperties,
+  },
 }
diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index 1679b0c34..83d9fdc6b 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -117,7 +117,7 @@ describe('Message', () => {
         })
 
         describe('user chats in room', () => {
-          it('returns the message and publishes subscription', async () => {
+          it('returns the message and publishes subscriptions', async () => {
             await expect(
               mutate({
                 mutation: createMessageMutation(),
@@ -146,6 +146,20 @@ describe('Message', () => {
               roomCountUpdated: '1',
               userId: 'other-chatting-user',
             })
+            expect(pubsubSpy).toBeCalledWith('CHAT_MESSAGE_ADDED', {
+              chatMessageAdded: expect.objectContaining({
+                id: expect.any(String),
+                content: 'Some nice message to other chatting user',
+                senderId: 'chatting-user',
+                username: 'Chatting User',
+                avatar: expect.any(String),
+                date: expect.any(String),
+                saved: true,
+                distributed: false,
+                seen: false,
+              }),
+              userId: 'other-chatting-user',
+            })
           })
 
           describe('room is updated as well', () => {

From 81a08ff04e32090cbfc14a98f98aca1ec59df007 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 18 Jul 2023 12:47:23 +0200
Subject: [PATCH 19/20] query all props on add message subscription

---
 webapp/graphql/Messages.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index 9efd35cf1..13d27ac58 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -38,17 +38,17 @@ export const chatMessageAdded = () => {
   return gql`
     subscription chatMessageAdded($userId: ID!) {
       chatMessageAdded(userId: $userId) {
-        #_id
+        _id
         id
-        # indexId
+        indexId
         content
         senderId
-        #author {
-        #  id
-        #}
-        #username
-        #avatar
-        #date
+        author {
+          id
+        }
+        username
+        avatar
+        date
         room {
           id
         }

From c0fe7028e5efa5ed7c1b70658be11d6209509ff3 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 18 Jul 2023 13:23:03 +0200
Subject: [PATCH 20/20] fix unit test

---
 backend/src/schema/resolvers/rooms.spec.ts | 249 +++++++++++----------
 1 file changed, 128 insertions(+), 121 deletions(-)

diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index ee291a6c9..2e26dc1e3 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -423,125 +423,147 @@ describe('Room', () => {
     })
 
     it('returns the rooms paginated', async () => {
-      expect(await query({ query: roomQuery(), variables: { first: 3, offset: 0 } })).toMatchObject(
-        {
-          errors: undefined,
-          data: {
-            Room: [
-              {
+      await expect(
+        query({ query: roomQuery(), variables: { first: 3, offset: 0 } }),
+      ).resolves.toMatchObject({
+        errors: undefined,
+        data: {
+          Room: expect.arrayContaining([
+            expect.objectContaining({
+              id: expect.any(String),
+              roomId: expect.any(String),
+              roomName: 'Third Chatting User',
+              lastMessageAt: null,
+              unreadCount: 0,
+              lastMessage: null,
+              users: expect.arrayContaining([
+                expect.objectContaining({
+                  _id: 'chatting-user',
+                  id: 'chatting-user',
+                  name: 'Chatting User',
+                  avatar: {
+                    url: expect.any(String),
+                  },
+                }),
+                expect.objectContaining({
+                  _id: 'third-chatting-user',
+                  id: 'third-chatting-user',
+                  name: 'Third Chatting User',
+                  avatar: {
+                    url: expect.any(String),
+                  },
+                }),
+              ]),
+            }),
+            expect.objectContaining({
+              id: expect.any(String),
+              roomId: expect.any(String),
+              roomName: 'Second Chatting User',
+              lastMessageAt: null,
+              unreadCount: 0,
+              lastMessage: null,
+              users: expect.arrayContaining([
+                expect.objectContaining({
+                  _id: 'chatting-user',
+                  id: 'chatting-user',
+                  name: 'Chatting User',
+                  avatar: {
+                    url: expect.any(String),
+                  },
+                }),
+                expect.objectContaining({
+                  _id: 'second-chatting-user',
+                  id: 'second-chatting-user',
+                  name: 'Second Chatting User',
+                  avatar: {
+                    url: expect.any(String),
+                  },
+                }),
+              ]),
+            }),
+            expect.objectContaining({
+              id: expect.any(String),
+              roomId: expect.any(String),
+              roomName: 'Other Chatting User',
+              lastMessageAt: expect.any(String),
+              unreadCount: 0,
+              lastMessage: {
+                _id: expect.any(String),
                 id: expect.any(String),
-                roomId: expect.any(String),
-                roomName: 'Third Chatting User',
-                users: expect.arrayContaining([
-                  {
-                    _id: 'chatting-user',
-                    id: 'chatting-user',
-                    name: 'Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
-                  },
-                  {
-                    _id: 'third-chatting-user',
-                    id: 'third-chatting-user',
-                    name: 'Third Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
-                  },
-                ]),
+                content: '2nd message to other chatting user',
+                senderId: 'chatting-user',
+                username: 'Chatting User',
+                avatar: expect.any(String),
+                date: expect.any(String),
+                saved: true,
+                distributed: false,
+                seen: false,
               },
-              {
-                id: expect.any(String),
-                roomId: expect.any(String),
-                roomName: 'Second Chatting User',
-                users: expect.arrayContaining([
-                  {
-                    _id: 'chatting-user',
-                    id: 'chatting-user',
-                    name: 'Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
+              users: expect.arrayContaining([
+                expect.objectContaining({
+                  _id: 'chatting-user',
+                  id: 'chatting-user',
+                  name: 'Chatting User',
+                  avatar: {
+                    url: expect.any(String),
                   },
-                  {
-                    _id: 'second-chatting-user',
-                    id: 'second-chatting-user',
-                    name: 'Second Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
+                }),
+                expect.objectContaining({
+                  _id: 'other-chatting-user',
+                  id: 'other-chatting-user',
+                  name: 'Other Chatting User',
+                  avatar: {
+                    url: expect.any(String),
                   },
-                ]),
-              },
-              {
-                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: 3, offset: 3 } })).toMatchObject(
-        {
-          errors: undefined,
-          data: {
-            Room: [
-              {
-                id: expect.any(String),
-                roomId: expect.any(String),
-                roomName: 'Other Chatting User',
-                users: expect.arrayContaining([
-                  {
-                    _id: 'chatting-user',
-                    id: 'chatting-user',
-                    name: 'Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
+      })
+      await expect(
+        query({ query: roomQuery(), variables: { first: 3, offset: 3 } }),
+      ).resolves.toMatchObject({
+        errors: undefined,
+        data: {
+          Room: [
+            expect.objectContaining({
+              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: 'other-chatting-user',
-                    id: 'other-chatting-user',
-                    name: 'Other Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
+                },
+                {
+                  _id: 'not-chatting-user',
+                  id: 'not-chatting-user',
+                  name: 'Not Chatting User',
+                  avatar: {
+                    url: expect.any(String),
                   },
-                ]),
-              },
-            ],
-          },
+                },
+              ]),
+            }),
+          ],
         },
-      )
+      })
     })
   })
 
   describe('query single room', () => {
     let result: any = null
+
     beforeAll(async () => {
       authenticatedUser = await chattingUser.toJson()
       result = await query({ query: roomQuery() })
     })
+
     describe('as chatter of room', () => {
       it('returns the room', async () => {
         expect(
@@ -556,34 +578,19 @@ describe('Room', () => {
               {
                 id: expect.any(String),
                 roomId: expect.any(String),
-                roomName: 'Third Chatting User',
-                users: expect.arrayContaining([
-                  {
-                    _id: 'chatting-user',
-                    id: 'chatting-user',
-                    name: 'Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
-                  },
-                  {
-                    _id: 'third-chatting-user',
-                    id: 'third-chatting-user',
-                    name: 'Third Chatting User',
-                    avatar: {
-                      url: expect.any(String),
-                    },
-                  },
-                ]),
+                roomName: result.data.Room[0].roomName,
+                users: expect.any(Array),
               },
             ],
           },
         })
       })
+
       describe('as not chatter of room', () => {
         beforeAll(async () => {
           authenticatedUser = await notChattingUser.toJson()
         })
+
         it('returns no room', async () => {
           authenticatedUser = await notChattingUser.toJson()
           expect(