From 932ad7037f8411c966fb33ae699dbc570c6ba435 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 20 Jun 2023 13:09:12 +0200
Subject: [PATCH] add apollo messages query

---
 webapp/graphql/Messages.js | 16 ++++++++++++++++
 webapp/graphql/Rooms.js    |  2 +-
 webapp/pages/chat.vue      | 38 ++++++++++++++++++++++++++++----------
 3 files changed, 45 insertions(+), 11 deletions(-)
 create mode 100644 webapp/graphql/Messages.js

diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
new file mode 100644
index 000000000..9ecd49dd2
--- /dev/null
+++ b/webapp/graphql/Messages.js
@@ -0,0 +1,16 @@
+import gql from 'graphql-tag'
+
+export const messageQuery = () => {
+  return gql`
+    query($roomId: ID!) {
+      Message(roomId: $roomId) {
+        id
+        content
+        author {
+          id
+        }
+      }
+    }
+  `
+}
+
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 45493f683..4f4c67449 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -1,6 +1,6 @@
 import gql from 'graphql-tag'
 
-export const RoomQuery = () => gql`
+export const roomQuery = () => gql`
  query {
         Room {
           id
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index 7e88258bd..6c8a72ca8 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -36,7 +36,8 @@ register()
 import links from '~/constants/links.js'
 import { internalPageMixins } from '~/mixins/internalPageMixins'
 import BaseButton from '../components/_new/generic/BaseButton/BaseButton.vue'
-import { RoomQuery } from '~/graphql/Rooms'
+import { roomQuery } from '~/graphql/Rooms'
+import { messageQuery } from '~/graphql/Messages'
 
 export default {
   components: { BaseButton },
@@ -132,19 +133,36 @@ export default {
   },
 
   methods: {
-    fetchMessages({ options = {} }) {
-      setTimeout(() => {
+    fetchMessages({ room, options = {} }) {
+      console.log(room, options)
+      this.messagesLoaded = false
+      setTimeout(async () => {
         if (options.reset) {
-          this.messages = this.addMessages(true)
+          console.log('reset messages')
+          this.messages = [] // this.addMessages(true)
         } else {
-          this.messages = [...this.addMessages(), ...this.messages]
-          this.messagesLoaded = true
+          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)
+          }
         }
-        // this.addNewMessage()
+        this.messagesLoaded = true
       })
     },
 
-    addMessages(reset) {
+    /* addMessages(reset) {
       const messages = []
 
       for (let i = 0; i < 30; i++) {
@@ -167,7 +185,7 @@ export default {
       })
 
       return messages
-    },
+    }, */
 
     sendMessage(message) {
       this.messages = [
@@ -200,7 +218,7 @@ export default {
   apollo: {
     Rooms: {
       query() {
-        return RoomQuery()
+        return roomQuery()
       },
       update({ Room }) {
         console.log('Rooms', Room)