From b6ba0fc2836e7166f638777d6c8b810a12e33d19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jul 2023 01:37:31 +0000
Subject: [PATCH 1/9] Bump @faker-js/faker from 5.1.0 to 8.0.2

Bumps [@faker-js/faker](https://github.com/faker-js/faker) from 5.1.0 to 8.0.2.
- [Release notes](https://github.com/faker-js/faker/releases)
- [Changelog](https://github.com/faker-js/faker/blob/next/CHANGELOG.md)
- [Commits](https://github.com/faker-js/faker/compare/v5.1.0...v8.0.2)

---
updated-dependencies:
- dependency-name: "@faker-js/faker"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 5a116bd13..5ede4e71b 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "@babel/register": "^7.12.10",
     "@badeball/cypress-cucumber-preprocessor": "^15.1.4",
     "@cypress/browserify-preprocessor": "^3.0.2",
-    "@faker-js/faker": "7.6.0",
+    "@faker-js/faker": "8.0.2",
     "auto-changelog": "^2.3.0",
     "bcryptjs": "^2.4.3",
     "cross-env": "^7.0.3",
diff --git a/yarn.lock b/yarn.lock
index be628e106..9bf803c68 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1975,10 +1975,10 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz#8cfaf2ff603e9aabb910e9c0558c26cf32744061"
   integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==
 
-"@faker-js/faker@7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-7.6.0.tgz#9ea331766084288634a9247fcd8b84f16ff4ba07"
-  integrity sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==
+"@faker-js/faker@8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-8.0.2.tgz#bab698c5d3da9c52744e966e0e3eedb6c8b05c37"
+  integrity sha512-Uo3pGspElQW91PCvKSIAXoEgAUlRnH29sX2/p89kg7sP1m2PzCufHINd0FhTXQf6DYGiUlVncdSPa2F9wxed2A==
 
 "@hapi/address@2.x.x":
   version "2.1.4"

From f0d4c7ac22e922921ed7f27ac0d23dcb40ec018b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 8 Jul 2023 01:16:57 +0000
Subject: [PATCH 2/9] Bump cypress from 12.14.0 to 12.17.0

Bumps [cypress](https://github.com/cypress-io/cypress) from 12.14.0 to 12.17.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/compare/v12.14.0...v12.17.0)

---
updated-dependencies:
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 5a116bd13..39d0e20ac 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "bcryptjs": "^2.4.3",
     "cross-env": "^7.0.3",
     "cucumber": "^6.0.5",
-    "cypress": "^12.14.0",
+    "cypress": "^12.17.0",
     "cypress-file-upload": "^3.5.3",
     "cypress-network-idle": "^1.14.2",
     "date-fns": "^2.25.0",
diff --git a/yarn.lock b/yarn.lock
index be628e106..e004f01bd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3164,10 +3164,10 @@ cypress-network-idle@^1.14.2:
   resolved "https://registry.yarnpkg.com/cypress-network-idle/-/cypress-network-idle-1.14.2.tgz#0837100861feeb5a18f4c2d9815be079f8590f4d"
   integrity sha512-xAdR8dH58KFPv8eCDWjviScITrJOcUpuMXYfYTc175nk2/NvnJ+I6ylSn1CM7yZmoV/gLbFa36QLiH5NfNEaLQ==
 
-cypress@^12.14.0:
-  version "12.14.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.14.0.tgz#37a19b85f5e9d881995e9fee1ddf41b3d3a623dd"
-  integrity sha512-HiLIXKXZaIT1RT7sw1sVPt+qKtis3uYNm6KwC4qoYjabwLKaqZlyS/P+uVvvlBNcHIwL/BC6nQZajpbUd7hOgQ==
+cypress@^12.17.0:
+  version "12.17.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.17.0.tgz#3a907a41c4afbb44be7b84e822e4914d734a6bb0"
+  integrity sha512-nq0ug8Zrjq/2khHU1PTNxg+3/n1oqtmAFCxwQhS6QzkQ4mR6RLitX+cGIOuIMfnEbDAtVub0hZh661FOA16JxA==
   dependencies:
     "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"
@@ -3206,7 +3206,7 @@ cypress@^12.14.0:
     pretty-bytes "^5.6.0"
     proxy-from-env "1.0.0"
     request-progress "^3.0.0"
-    semver "^7.3.2"
+    semver "^7.5.3"
     supports-color "^8.1.1"
     tmp "~0.2.1"
     untildify "^4.0.0"
@@ -5358,10 +5358,10 @@ semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.3.2, semver@^7.3.5:
-  version "7.5.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
-  integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
+semver@^7.3.5, semver@^7.5.3:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 

From c2c96ee96c095689c75d64705bf1442a4e615128 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 10 Jul 2023 11:53:00 +0200
Subject: [PATCH 3/9] frontend rooms query, singleRoom gets an userid now, not
 a boolean

---
 webapp/components/Chat/Chat.vue | 97 +++++++++++++++++++++------------
 webapp/graphql/Rooms.js         | 17 ++++++
 webapp/layouts/default.vue      |  2 +-
 3 files changed, 81 insertions(+), 35 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index c2b02c0af..6bbeb7c71 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-// import { roomQuery } from '~/graphql/Rooms'
+import { roomQuery, createRoom } from '~/graphql/Rooms'
 import { messageQuery } from '~/graphql/Messages'
 
 export default {
@@ -36,16 +36,16 @@ export default {
     theme: {
       type: String,
     },
-    singleRoom: {
-      type: Boolean,
-      default: false,
+    singleRoomId: {
+      type: String,
+      default: null,
     },
   },
   data() {
     return {
       currentUserId: '1234',
       menuActions: [
-        {
+        /* {
           name: 'inviteUser',
           title: 'Invite User',
         },
@@ -56,7 +56,7 @@ export default {
         {
           name: 'deleteRoom',
           title: 'Delete Room',
-        },
+        }, */
       ],
       messageActions: [
         {
@@ -93,16 +93,16 @@ export default {
         CANCEL_SELECT_MESSAGE: 'Annuler Sélection',
       },
       roomActions: [
-        {
+        /* {
           name: 'archiveRoom',
           title: 'Archive Room',
-        },
-        { name: 'inviteUser', title: 'Invite User' },
-        { name: 'removeUser', title: 'Remove User' },
-        { name: 'deleteRoom', title: 'Delete Room' },
+        }, */
+        // { name: 'inviteUser', title: 'Invite User' },
+        // { name: 'removeUser', title: 'Remove User' },
+        // { name: 'deleteRoom', title: 'Delete Room' },
       ],
       rooms: [
-        {
+        /* {
           roomId: '1',
           roomName: 'John Snow',
           avatar: 'https://66.media.tumblr.com/avatar_c6a8eae4303e_512.pnj',
@@ -120,15 +120,35 @@ export default {
             { _id: '1234', username: 'Johnx Doe' },
             { _id: '43210', username: 'Max J. Mustermann' },
           ],
-        },
+        }, */
       ],
       messages: [],
       messagesLoaded: true,
       showDemoOptions: true,
       responsiveBreakpoint: 600,
+      singleRoom: !!this.singleRoomId || false
+    }
+  },
+  mounted() {
+    if(this.singleRoom){
+      this.$apollo
+        .mutate({
+          mutation: createRoom(),
+          variables: {
+            userId: this.singleRoomId
+          },
+        })
+        .then((res) => {
+          this.$apollo.queries.Rooms.refetch()
+        })
+        .catch(() => {
+          console.log(error)
+        })
+        .finally(() => {
+          // this.loading = false
+        })
     }
   },
-
   methods: {
     fetchMessages({ room, options = {} }) {
       // console.log(room, options)
@@ -212,26 +232,35 @@ export default {
       }, 2000)
     },
   },
-  //   apollo: {
-  //     Rooms: {
-  //       query() {
-  //         return roomQuery()
-  //       },
-  //       update({ Room }) {
-  //         console.log('Rooms', Room)
-  //         if (!Room) {
-  //           this.rooms = []
-  //           return
-  //         }
-  //         this.rooms = Room
-  //       },
-  //       error(error) {
-  //         this.rooms = []
-  //         this.$toast.error(error.message)
-  //       },
-  //       fetchPolicy: 'cache-and-network',
-  //     },
-  //   },
+  apollo: {
+    Rooms: {
+       query() {
+          return roomQuery()
+        },
+        update({ Room }) {
+          console.log('Rooms', Room)
+          if (!Room) {
+            this.rooms = []
+            return
+          }
+
+          // Backend result needs mapping of the following values
+          // room[i].users[j].name -> room[i].users[j].username
+          // room[i].users[j].avatar.url -> room[i].users[j].avatar
+          // also filter rooms for the single room
+          this.rooms = Room.map((r) => {
+            return {...r, users: r.users.map((u) => { return {...u, username: u.name, avatar: u.avatar?.url}})}
+          }).filter((r) => this.singleRoom ? r.users.filter((u) => u.id === this.singleRoomId ).length > 0 : true)
+          
+          console.log(this.rooms)
+        },
+       error(error) {
+          this.rooms = []
+           this.$toast.error(error.message)
+        },
+        fetchPolicy: 'cache-and-network',
+      },
+    },
 }
 </script>
 <style lang="scss">
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index e8f1d9f6f..0e6074a79 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -4,9 +4,26 @@ export const roomQuery = () => gql`
   query {
     Room {
       id
+      roomId
+      roomName
+      avatar
       users {
+        _id
         id
+        name
+        avatar {
+          url
+        }
       }
     }
   }
 `
+
+export const createRoom = () => gql`
+  mutation ($userId: ID!) {
+    CreateRoom(userId: $userId) {
+      id
+      roomId
+    }
+  }
+`
\ No newline at end of file
diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index ae6c10b73..209649661 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -20,7 +20,7 @@
           x
         </ds-button>
       </ds-text>
-      <chat-module :singleRoom="true" />
+      <chat-module :singleRoomId="$store.getters['chat/showChat'].roomID"/>
     </div>
     >
   </div>

From 5f2cfdeab482ef886040808121070dcaa3745b75 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 10 Jul 2023 11:53:20 +0200
Subject: [PATCH 4/9] backend room hacks

---
 backend/src/schema/resolvers/rooms.ts  | 4 ++++
 backend/src/schema/types/type/Room.gql | 1 +
 2 files changed, 5 insertions(+)

diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index 2fe621d23..02309e172 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -12,7 +12,11 @@ export default {
       if (resolved) {
         resolved.forEach((room) => {
           if (room.users) {
+            // buggy, you must query the username for this to function correctly
             room.roomName = room.users.filter((user) => user.id !== context.user.id)[0].name
+            room.avatar =
+              room.users.filter((user) => user.id !== context.user.id)[0].avatar?.url ||
+              'default-avatar'
             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 c90ebda3a..2ce6556f6 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -14,6 +14,7 @@ type Room {
 
   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")
+  avatar: String! ## @cypher match not own user in users array
 }
 
 type Mutation {

From 8859aa56a4fddd74f3598ba61d58a3562bed3876 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 10 Jul 2023 12:00:11 +0200
Subject: [PATCH 5/9] lint fixes

---
 webapp/components/Chat/Chat.vue | 69 ++++++++++++++++++---------------
 webapp/graphql/Rooms.js         |  2 +-
 webapp/layouts/default.vue      |  2 +-
 3 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 6bbeb7c71..801b5e948 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -126,23 +126,23 @@ export default {
       messagesLoaded: true,
       showDemoOptions: true,
       responsiveBreakpoint: 600,
-      singleRoom: !!this.singleRoomId || false
+      singleRoom: !!this.singleRoomId || false,
     }
   },
   mounted() {
-    if(this.singleRoom){
+    if (this.singleRoom) {
       this.$apollo
         .mutate({
           mutation: createRoom(),
           variables: {
-            userId: this.singleRoomId
+            userId: this.singleRoomId,
           },
         })
-        .then((res) => {
+        .then(() => {
           this.$apollo.queries.Rooms.refetch()
         })
-        .catch(() => {
-          console.log(error)
+        .catch((error) => {
+          this.$toast.error(error)
         })
         .finally(() => {
           // this.loading = false
@@ -234,33 +234,40 @@ export default {
   },
   apollo: {
     Rooms: {
-       query() {
-          return roomQuery()
-        },
-        update({ Room }) {
-          console.log('Rooms', Room)
-          if (!Room) {
-            this.rooms = []
-            return
-          }
-
-          // Backend result needs mapping of the following values
-          // room[i].users[j].name -> room[i].users[j].username
-          // room[i].users[j].avatar.url -> room[i].users[j].avatar
-          // also filter rooms for the single room
-          this.rooms = Room.map((r) => {
-            return {...r, users: r.users.map((u) => { return {...u, username: u.name, avatar: u.avatar?.url}})}
-          }).filter((r) => this.singleRoom ? r.users.filter((u) => u.id === this.singleRoomId ).length > 0 : true)
-          
-          console.log(this.rooms)
-        },
-       error(error) {
-          this.rooms = []
-           this.$toast.error(error.message)
-        },
-        fetchPolicy: 'cache-and-network',
+      query() {
+        return roomQuery()
       },
+      update({ Room }) {
+        // console.log('Rooms', Room)
+        if (!Room) {
+          this.rooms = []
+          return
+        }
+
+        // Backend result needs mapping of the following values
+        // room[i].users[j].name -> room[i].users[j].username
+        // room[i].users[j].avatar.url -> room[i].users[j].avatar
+        // also filter rooms for the single room
+        this.rooms = Room.map((r) => {
+          return {
+            ...r,
+            users: r.users.map((u) => {
+              return { ...u, username: u.name, avatar: u.avatar?.url }
+            }),
+          }
+        }).filter((r) =>
+          this.singleRoom ? r.users.filter((u) => u.id === this.singleRoomId).length > 0 : true,
+        )
+
+        // console.log(this.rooms)
+      },
+      error(error) {
+        this.rooms = []
+        this.$toast.error(error.message)
+      },
+      fetchPolicy: 'cache-and-network',
     },
+  },
 }
 </script>
 <style lang="scss">
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 0e6074a79..7bab25509 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -26,4 +26,4 @@ export const createRoom = () => gql`
       roomId
     }
   }
-`
\ No newline at end of file
+`
diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index 209649661..8b6b80604 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -20,7 +20,7 @@
           x
         </ds-button>
       </ds-text>
-      <chat-module :singleRoomId="$store.getters['chat/showChat'].roomID"/>
+      <chat-module :singleRoomId="$store.getters['chat/showChat'].roomID" />
     </div>
     >
   </div>

From 88e20918044dd06eb04d9acb0c31a99af1bd4638 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 10 Jul 2023 13:37:42 +0200
Subject: [PATCH 6/9] fix comments

---
 webapp/components/Chat/Chat.vue | 32 +++++++-------------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 801b5e948..9cd3e391a 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -93,35 +93,17 @@ export default {
         CANCEL_SELECT_MESSAGE: 'Annuler Sélection',
       },
       roomActions: [
-        /* {
+        /*
+        {
           name: 'archiveRoom',
           title: 'Archive Room',
-        }, */
-        // { name: 'inviteUser', title: 'Invite User' },
-        // { name: 'removeUser', title: 'Remove User' },
-        // { name: 'deleteRoom', title: 'Delete Room' },
-      ],
-      rooms: [
-        /* {
-          roomId: '1',
-          roomName: 'John Snow',
-          avatar: 'https://66.media.tumblr.com/avatar_c6a8eae4303e_512.pnj',
-          users: [
-            { _id: '1234', username: 'John Doe' },
-            { _id: '4321', username: 'John Snow' },
-          ],
         },
-        {
-          roomId: '2',
-          roomName: 'Max J. Mustermann',
-          avatar:
-            'https://64.media.tumblr.com/8889b6e26370f4e3837584c1c59721a6/f4f76ed6b0249d08-4b/s1280x1920/810e9e5fa724366d26c10c0fa22ba97dad8778d1.pnj',
-          users: [
-            { _id: '1234', username: 'Johnx Doe' },
-            { _id: '43210', username: 'Max J. Mustermann' },
-          ],
-        }, */
+        { name: 'inviteUser', title: 'Invite User' },
+        { name: 'removeUser', title: 'Remove User' },
+        { name: 'deleteRoom', title: 'Delete Room' },
+        */
       ],
+      rooms: [],
       messages: [],
       messagesLoaded: true,
       showDemoOptions: true,

From aecc24e37494ca2b740849b8a1539a7c2802eb64 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 10 Jul 2023 16:21:39 +0200
Subject: [PATCH 7/9] chat message capability

---
 webapp/components/Chat/Chat.vue | 106 ++++++++++----------------------
 webapp/graphql/Messages.js      |  13 ++++
 2 files changed, 44 insertions(+), 75 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 9cd3e391a..d3fe9c4d5 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -28,7 +28,7 @@
 
 <script>
 import { roomQuery, createRoom } from '~/graphql/Rooms'
-import { messageQuery } from '~/graphql/Messages'
+import { messageQuery, createMessageMutation } from '~/graphql/Messages'
 
 export default {
   name: 'Chat',
@@ -43,7 +43,7 @@ export default {
   },
   data() {
     return {
-      currentUserId: '1234',
+      currentUserId: this.$store.getters['auth/user'].id,
       menuActions: [
         /* {
           name: 'inviteUser',
@@ -133,85 +133,44 @@ export default {
   },
   methods: {
     fetchMessages({ room, options = {} }) {
-      // console.log(room, options)
       this.messagesLoaded = false
       setTimeout(async () => {
-        if (options.reset) {
-          // console.log('reset messages')
-          this.messages = [] // this.addMessages(true)
-        } else {
-          try {
-            const {
-              data: { Message },
-            } = await this.$apollo.query({
-              query: messageQuery(),
-              variables: {
-                roomId: room.id,
-              },
-            })
-            // console.log('Messages', Message)
-            this.messages = Message
-          } catch (error) {
-            // console.log('Error', error)
-            this.messages = [] // this.addMessages(true)
-            this.$toast.error(error.message)
-          }
+        try {
+          const {
+            data: { Message },
+          } = await this.$apollo.query({
+            query: messageQuery(),
+            variables: {
+              roomId: room.id,
+            },
+            fetchPolicy: 'no-cache',
+          })
+          this.messages = Message
+        } catch (error) {
+          this.messages = []
+          this.$toast.error(error.message)
         }
         this.messagesLoaded = true
       })
     },
 
-    /* addMessages(reset) {
-      const messages = []
-
-      for (let i = 0; i < 30; i++) {
-        messages.push({
-          _id: reset ? i : this.messages.length + i,
-          content: `${reset ? '' : 'paginated'} message ${i + 1}`,
-          senderId: '4321',
-          username: 'John Doe',
-          date: '13 November',
-          timestamp: '10:20',
-        })
-      }
-      messages.push({
-        _id: '31',
-        content: `Hallo Welt`,
-        senderId: '1234',
-        username: 'John Doe',
-        date: '13 November',
-        timestamp: '10:20',
-      })
-
-      return messages
-    }, */
-
-    sendMessage(message) {
-      this.messages = [
-        ...this.messages,
-        {
-          _id: this.messages.length,
-          content: message.content,
-          senderId: this.currentUserId,
-          timestamp: new Date().toString().substring(16, 21),
-          date: new Date().toDateString(),
-        },
-      ]
+    refetchMessage(roomId) {
+      this.fetchMessages({room: this.rooms.find((r) => r.roomId === roomId)})
     },
 
-    addNewMessage() {
-      setTimeout(() => {
-        this.messages = [
-          ...this.messages,
-          {
-            _id: this.messages.length,
-            content: 'NEW MESSAGE',
-            senderId: '1234',
-            timestamp: new Date().toString().substring(16, 21),
-            date: new Date().toDateString(),
+    async sendMessage(message) {
+      try {
+        const result = await this.$apollo.mutate({
+          mutation: createMessageMutation(),
+          variables: {
+            roomId: message.roomId,
+            content: message.content
           },
-        ]
-      }, 2000)
+        })
+      } catch (error) {
+        this.$toast.error(error.message)
+      }
+      this.refetchMessage(message.roomId)
     },
   },
   apollo: {
@@ -220,7 +179,6 @@ export default {
         return roomQuery()
       },
       update({ Room }) {
-        // console.log('Rooms', Room)
         if (!Room) {
           this.rooms = []
           return
@@ -240,14 +198,12 @@ export default {
         }).filter((r) =>
           this.singleRoom ? r.users.filter((u) => u.id === this.singleRoomId).length > 0 : true,
         )
-
-        // console.log(this.rooms)
       },
       error(error) {
         this.rooms = []
         this.$toast.error(error.message)
       },
-      fetchPolicy: 'cache-and-network',
+      fetchPolicy: 'no-cache',
     },
   },
 }
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index 099a7265e..852919a8c 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -4,7 +4,9 @@ export const messageQuery = () => {
   return gql`
     query ($roomId: ID!) {
       Message(roomId: $roomId) {
+        _id
         id
+        senderId
         content
         author {
           id
@@ -13,3 +15,14 @@ export const messageQuery = () => {
     }
   `
 }
+
+export const createMessageMutation = () => {
+  return gql`
+    mutation ($roomId: ID!, $content: String!) {
+      CreateMessage(roomId: $roomId, content: $content) {
+        id
+        content
+      }
+    }
+  `
+}
\ No newline at end of file

From 0ad59d9412dae31b67f0ac80547d11901e9d40e4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 10 Jul 2023 16:27:36 +0200
Subject: [PATCH 8/9] lint fix

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d3fe9c4d5..cca030387 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -155,16 +155,16 @@ export default {
     },
 
     refetchMessage(roomId) {
-      this.fetchMessages({room: this.rooms.find((r) => r.roomId === roomId)})
+      this.fetchMessages({ room: this.rooms.find((r) => r.roomId === roomId) })
     },
 
     async sendMessage(message) {
       try {
-        const result = await this.$apollo.mutate({
+        await this.$apollo.mutate({
           mutation: createMessageMutation(),
           variables: {
             roomId: message.roomId,
-            content: message.content
+            content: message.content,
           },
         })
       } catch (error) {
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index 852919a8c..41d647d4b 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -25,4 +25,4 @@ export const createMessageMutation = () => {
       }
     }
   `
-}
\ No newline at end of file
+}

From cb8db68b5bac1005c937eb5fb1db815d0b3cfad9 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 10 Jul 2023 17:10:55 +0200
Subject: [PATCH 9/9] user mapgetters instead of addressing the store directly

---
 webapp/components/Chat/Chat.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index cca030387..2b9514bf3 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -3,7 +3,7 @@
     <client-only>
       <vue-advanced-chat
         :theme="theme"
-        :current-user-id="currentUserId"
+        :current-user-id="currentUser.id"
         :room-id="null"
         :template-actions="JSON.stringify(templatesText)"
         :menu-actions="JSON.stringify(menuActions)"
@@ -29,6 +29,7 @@
 <script>
 import { roomQuery, createRoom } from '~/graphql/Rooms'
 import { messageQuery, createMessageMutation } from '~/graphql/Messages'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'Chat',
@@ -43,7 +44,6 @@ export default {
   },
   data() {
     return {
-      currentUserId: this.$store.getters['auth/user'].id,
       menuActions: [
         /* {
           name: 'inviteUser',
@@ -131,6 +131,11 @@ export default {
         })
     }
   },
+  computed: {
+    ...mapGetters({
+      currentUser: 'auth/user',
+    }),
+  },
   methods: {
     fetchMessages({ room, options = {} }) {
       this.messagesLoaded = false