From 7e77bc82fb949ed7c45fce05af7ecb1b46f39a2d Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 12 Jul 2023 13:14:43 +0200
Subject: [PATCH 001/151] new query including index & first, offset and orderBy

---
 webapp/graphql/Messages.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index 41d647d4b..d017f816c 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -2,10 +2,11 @@ import gql from 'graphql-tag'
 
 export const messageQuery = () => {
   return gql`
-    query ($roomId: ID!) {
-      Message(roomId: $roomId) {
+    query ($roomId: ID!, $first: Int, $offset: Int) {
+      Message(roomId: $roomId, first: $first, offset: $offset, orderBy: createdAt_desc) {
         _id
         id
+        indexId
         senderId
         content
         author {

From 635d3a22326a4acad8b1fa406bd4cdba28889662 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 12 Jul 2023 13:15:06 +0200
Subject: [PATCH 002/151] new room query

---
 webapp/graphql/Rooms.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 7bab25509..e28702f77 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -1,8 +1,8 @@
 import gql from 'graphql-tag'
 
 export const roomQuery = () => gql`
-  query {
-    Room {
+  query Room($first: Int, $offset: Int) {
+    Room(first: $first, offset: $offset) {
       id
       roomId
       roomName

From 730e15a9ea91d1ecb00a73f8d3b7d8e2d3ca1b2e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 12 Jul 2023 13:15:19 +0200
Subject: [PATCH 003/151] working message pagination

---
 webapp/components/Chat/Chat.vue | 43 +++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 2b9514bf3..8c4ae8447 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -45,7 +45,8 @@ export default {
   data() {
     return {
       menuActions: [
-        /* {
+        /*
+        {
           name: 'inviteUser',
           title: 'Invite User',
         },
@@ -56,9 +57,11 @@ export default {
         {
           name: 'deleteRoom',
           title: 'Delete Room',
-        }, */
+        },
+        */
       ],
       messageActions: [
+        /*
         {
           name: 'addMessageToFavorite',
           title: 'Add To Favorite',
@@ -67,6 +70,7 @@ export default {
           name: 'shareMessage',
           title: 'Share Message',
         },
+        */
       ],
       templatesText: [
         {
@@ -109,6 +113,11 @@ export default {
       showDemoOptions: true,
       responsiveBreakpoint: 600,
       singleRoom: !!this.singleRoomId || false,
+      messagePage: 0,
+      messagePageSize: 20,
+      roomPage: 0,
+      roomPageSize: 999, //TODO pagination is a problem with single rooms - cant use
+      lastRoom: null
     }
   },
   mounted() {
@@ -138,7 +147,13 @@ export default {
   },
   methods: {
     fetchMessages({ room, options = {} }) {
+      if(this.lastRoom != room.id) {
+        this.messages = []
+        this.messagePage = 0,
+        this.lastRoom = room.id
+      }
       this.messagesLoaded = false
+      const offset = (options.refetch ? 0 : this.messagePage) *  this.messagePageSize
       setTimeout(async () => {
         try {
           const {
@@ -147,20 +162,32 @@ export default {
             query: messageQuery(),
             variables: {
               roomId: room.id,
+              first: this.messagePageSize,
+              offset,
             },
             fetchPolicy: 'no-cache',
           })
-          this.messages = Message
+          
+          const msgs = []
+          ;[...this.messages, ...Message].forEach((m) => {
+            msgs[m.indexId] = m
+          })
+          this.messages = msgs.filter( Boolean )
+
+
+          if(Message.length < this.messagePageSize){
+            this.messagesLoaded = true
+          }
+          this.messagePage += 1
         } catch (error) {
           this.messages = []
           this.$toast.error(error.message)
         }
-        this.messagesLoaded = true
       })
     },
 
     refetchMessage(roomId) {
-      this.fetchMessages({ room: this.rooms.find((r) => r.roomId === roomId) })
+      this.fetchMessages({ room: this.rooms.find((r) => r.roomId === roomId), options: { refetch: true} })
     },
 
     async sendMessage(message) {
@@ -183,6 +210,12 @@ export default {
       query() {
         return roomQuery()
       },
+      variables() {
+        return {
+          first: this.roomPageSize,
+          offset: this.roomPage* this.roomPageSize,
+        }
+      },
       update({ Room }) {
         if (!Room) {
           this.rooms = []

From 481158f81586b949fb518ba5b8e09b47d38e3c2a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 12 Jul 2023 13:15:27 +0200
Subject: [PATCH 004/151] message type definition

---
 backend/src/schema/types/type/Message.gql | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/backend/src/schema/types/type/Message.gql b/backend/src/schema/types/type/Message.gql
index 4a3346079..f97d86dd8 100644
--- a/backend/src/schema/types/type/Message.gql
+++ b/backend/src/schema/types/type/Message.gql
@@ -2,8 +2,14 @@
 #   room: _RoomFilter
 # }
 
+enum _MessageOrdering {
+  createdAt_asc
+  createdAt_desc
+}
+
 type Message {
   id: ID!
+  indexId: String!
   createdAt: String
   updatedAt: String
 
@@ -26,5 +32,10 @@ type Mutation {
 }
 
 type Query {
-  Message(roomId: ID!): [Message]
+  Message(
+    roomId: ID!,
+    first: Int
+    offset: Int
+    orderBy: [_MessageOrdering]
+  ): [Message]
 }

From 0cce43500a13a795d4a3c0a471b4d694982c33e4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 12 Jul 2023 13:36:16 +0200
Subject: [PATCH 005/151] backend implementation for message pagination

---
 backend/src/schema/resolvers/messages.ts | 25 ++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index b93cffe06..5e2335c9b 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -13,11 +13,32 @@ export default {
           id: context.user.id,
         },
       }
+      // this does not work
+      // params.orderBy = ['createdAt_desc']
       const resolved = await neo4jgraphql(object, params, context, resolveInfo)
+
       if (resolved) {
-        resolved.forEach((message) => {
-          message._id = message.id
+        const session = context.driver.session()
+        const countMessageTxPromise = session.readTransaction(async (transaction) => {
+          const countMessageCypher = `
+          MATCH((message:Message)-[:INSIDE]->(:Room { id: $roomId })) RETURN COUNT(message) AS count
+          `
+          const countMessageTxResponse = await transaction.run(countMessageCypher, {
+            roomId,
+          })
+          return await countMessageTxResponse.records[0].get('count')
         })
+        try {
+          const count = await countMessageTxPromise
+          for (let i = 0; i < resolved.length; i++) {
+            resolved[i]._id = resolved[i].id
+            resolved[i].indexId = count - 1 - params.offset - i
+          }
+        } catch (error) {
+          throw new Error(error)
+        } finally {
+          session.close()
+        }
       }
       return resolved
     },

From 70c310bc885f40ff7bc4f4b444e68d6d8fab341e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 13 Jul 2023 10:40:31 +0200
Subject: [PATCH 006/151] create indexId when creating the message

---
 backend/src/schema/resolvers/messages.ts | 25 +++++-------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 5e2335c9b..d00d365b1 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -18,26 +18,8 @@ export default {
       const resolved = await neo4jgraphql(object, params, context, resolveInfo)
 
       if (resolved) {
-        const session = context.driver.session()
-        const countMessageTxPromise = session.readTransaction(async (transaction) => {
-          const countMessageCypher = `
-          MATCH((message:Message)-[:INSIDE]->(:Room { id: $roomId })) RETURN COUNT(message) AS count
-          `
-          const countMessageTxResponse = await transaction.run(countMessageCypher, {
-            roomId,
-          })
-          return await countMessageTxResponse.records[0].get('count')
-        })
-        try {
-          const count = await countMessageTxPromise
-          for (let i = 0; i < resolved.length; i++) {
-            resolved[i]._id = resolved[i].id
-            resolved[i].indexId = count - 1 - params.offset - i
-          }
-        } catch (error) {
-          throw new Error(error)
-        } finally {
-          session.close()
+        for (let i = 0; i < resolved.length; i++) {
+          resolved[i]._id = resolved[i].id
         }
       }
       return resolved
@@ -53,9 +35,12 @@ export default {
       const writeTxResultPromise = session.writeTransaction(async (transaction) => {
         const createMessageCypher = `
           MATCH (currentUser:User { id: $currentUserId })-[:CHATS_IN]->(room:Room { id: $roomId })
+          OPTIONAL MATCH (m:Message)-[:INSIDE]->(room)
+          WITH MAX(m.indexId) as maxIndex, room, currentUser
           CREATE (currentUser)-[:CREATED]->(message:Message {
             createdAt: toString(datetime()),
             id: apoc.create.uuid(),
+            indexId: CASE WHEN maxIndex IS NOT NULL THEN maxIndex + 1 ELSE 0 END,
             content: $content
           })-[:INSIDE]->(room)
           RETURN message { .* }

From 8065529d0acb67265a84f8afa23fbf096feecf4e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 13 Jul 2023 10:41:55 +0200
Subject: [PATCH 007/151] reverted change - use forEach instead of for loop

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

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index d00d365b1..70786e50f 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -18,9 +18,9 @@ export default {
       const resolved = await neo4jgraphql(object, params, context, resolveInfo)
 
       if (resolved) {
-        for (let i = 0; i < resolved.length; i++) {
-          resolved[i]._id = resolved[i].id
-        }
+        resolved.forEach((message) => {
+          message._id = message.id
+        })
       }
       return resolved
     },

From 1648b25516b86616dff14ab22ae5690b7683eff0 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 13 Jul 2023 11:06:29 +0200
Subject: [PATCH 008/151] lint fixes

---
 webapp/components/Chat/Chat.vue | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 8c4ae8447..507cce9da 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -116,8 +116,8 @@ export default {
       messagePage: 0,
       messagePageSize: 20,
       roomPage: 0,
-      roomPageSize: 999, //TODO pagination is a problem with single rooms - cant use
-      lastRoom: null
+      roomPageSize: 999, // TODO pagination is a problem with single rooms - cant use
+      lastRoom: null,
     }
   },
   mounted() {
@@ -147,13 +147,13 @@ export default {
   },
   methods: {
     fetchMessages({ room, options = {} }) {
-      if(this.lastRoom != room.id) {
+      if (this.lastRoom !== room.id) {
         this.messages = []
-        this.messagePage = 0,
+        this.messagePage = 0
         this.lastRoom = room.id
       }
       this.messagesLoaded = false
-      const offset = (options.refetch ? 0 : this.messagePage) *  this.messagePageSize
+      const offset = (options.refetch ? 0 : this.messagePage) * this.messagePageSize
       setTimeout(async () => {
         try {
           const {
@@ -167,15 +167,14 @@ export default {
             },
             fetchPolicy: 'no-cache',
           })
-          
+
           const msgs = []
           ;[...this.messages, ...Message].forEach((m) => {
             msgs[m.indexId] = m
           })
-          this.messages = msgs.filter( Boolean )
+          this.messages = msgs.filter(Boolean)
 
-
-          if(Message.length < this.messagePageSize){
+          if (Message.length < this.messagePageSize) {
             this.messagesLoaded = true
           }
           this.messagePage += 1
@@ -187,7 +186,10 @@ export default {
     },
 
     refetchMessage(roomId) {
-      this.fetchMessages({ room: this.rooms.find((r) => r.roomId === roomId), options: { refetch: true} })
+      this.fetchMessages({
+        room: this.rooms.find((r) => r.roomId === roomId),
+        options: { refetch: true },
+      })
     },
 
     async sendMessage(message) {
@@ -213,7 +215,7 @@ export default {
       variables() {
         return {
           first: this.roomPageSize,
-          offset: this.roomPage* this.roomPageSize,
+          offset: this.roomPage * this.roomPageSize,
         }
       },
       update({ Room }) {

From a82e76f3666969840952600e31a55e7cb294e304 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 13 Jul 2023 11:13:06 +0200
Subject: [PATCH 009/151] test message ordering & pagination

---
 backend/src/graphql/messages.ts               |  1 +
 backend/src/schema/resolvers/messages.spec.ts | 69 +++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/backend/src/graphql/messages.ts b/backend/src/graphql/messages.ts
index 4d2220f18..8a17d5208 100644
--- a/backend/src/graphql/messages.ts
+++ b/backend/src/graphql/messages.ts
@@ -17,6 +17,7 @@ export const messageQuery = () => {
       Message(roomId: $roomId) {
         _id
         id
+        indexId
         content
         senderId
         username
diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index a43bd3226..c7733aa9b 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -212,6 +212,7 @@ describe('Message', () => {
                 {
                   id: expect.any(String),
                   _id: result.data.Message[0].id,
+                  indexId: '0',
                   content: 'Some nice message to other chatting user',
                   senderId: 'chatting-user',
                   username: 'Chatting User',
@@ -256,6 +257,7 @@ describe('Message', () => {
                 Message: expect.arrayContaining([
                   expect.objectContaining({
                     id: expect.any(String),
+                    indexId: '0',
                     content: 'Some nice message to other chatting user',
                     senderId: 'chatting-user',
                     username: 'Chatting User',
@@ -264,6 +266,7 @@ describe('Message', () => {
                   }),
                   expect.objectContaining({
                     id: expect.any(String),
+                    indexId: '1',
                     content: 'A nice response message to chatting user',
                     senderId: 'other-chatting-user',
                     username: 'Other Chatting User',
@@ -272,6 +275,72 @@ describe('Message', () => {
                   }),
                   expect.objectContaining({
                     id: expect.any(String),
+                    indexId: '2',
+                    content: 'And another nice message to other chatting user',
+                    senderId: 'chatting-user',
+                    username: 'Chatting User',
+                    avatar: expect.any(String),
+                    date: expect.any(String),
+                  }),
+                ]),
+              },
+            })
+          })
+
+          it('returns the messages paginated', async () => {
+            await expect(
+              query({
+                query: messageQuery(),
+                variables: {
+                  roomId,
+                  first: 2,
+                  offset: 0,
+                  orderBy: 'created_desc',
+                },
+              }),
+            ).resolves.toMatchObject({
+              errors: undefined,
+              data: {
+                Message: expect.arrayContaining([
+                  expect.objectContaining({
+                    id: expect.any(String),
+                    indexId: '0',
+                    content: 'Some nice message to other chatting user',
+                    senderId: 'chatting-user',
+                    username: 'Chatting User',
+                    avatar: expect.any(String),
+                    date: expect.any(String),
+                  }),
+                  expect.objectContaining({
+                    id: expect.any(String),
+                    indexId: '1',
+                    content: 'A nice response message to chatting user',
+                    senderId: 'other-chatting-user',
+                    username: 'Other Chatting User',
+                    avatar: expect.any(String),
+                    date: expect.any(String),
+                  }),
+                ]),
+              },
+            })
+
+            await expect(
+              query({
+                query: messageQuery(),
+                variables: {
+                  roomId,
+                  first: 2,
+                  offset: 2,
+                  orderBy: 'created_desc',
+                },
+              }),
+            ).resolves.toMatchObject({
+              errors: undefined,
+              data: {
+                Message: expect.arrayContaining([
+                  expect.objectContaining({
+                    id: expect.any(String),
+                    indexId: '2',
                     content: 'And another nice message to other chatting user',
                     senderId: 'chatting-user',
                     username: 'Chatting User',

From 507be4eca2515c285368e02d843fc9d69a50b77a Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Thu, 13 Jul 2023 11:15:46 +0200
Subject: [PATCH 010/151] [feature] removed message actions for chat

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 2b9514bf3..7f36d3c39 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -8,6 +8,7 @@
         :template-actions="JSON.stringify(templatesText)"
         :menu-actions="JSON.stringify(menuActions)"
         :text-messages="JSON.stringify(textMessages)"
+        :message-actions="messageActions"
         :messages="JSON.stringify(messages)"
         :messages-loaded="messagesLoaded"
         :rooms="JSON.stringify(rooms)"
@@ -59,14 +60,14 @@ export default {
         }, */
       ],
       messageActions: [
-        {
-          name: 'addMessageToFavorite',
-          title: 'Add To Favorite',
-        },
-        {
-          name: 'shareMessage',
-          title: 'Share Message',
-        },
+        // {
+        //   name: 'addMessageToFavorite',
+        //   title: 'Add To Favorite',
+        // },
+        // {
+        //   name: 'shareMessage',
+        //   title: 'Share Message',
+        // },
       ],
       templatesText: [
         {

From c21026e28ad393e7ff4c8d728d454e70f7cb2d53 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 13 Jul 2023 11:23:06 +0200
Subject: [PATCH 011/151] fixed message loading state when writing and
 refetching

---
 webapp/components/Chat/Chat.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 507cce9da..b080f0763 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -152,7 +152,7 @@ export default {
         this.messagePage = 0
         this.lastRoom = room.id
       }
-      this.messagesLoaded = false
+      this.messagesLoaded = options.refetch ? this.messagesLoaded : false
       const offset = (options.refetch ? 0 : this.messagePage) * this.messagePageSize
       setTimeout(async () => {
         try {

From cbf1bab2f2cd31a965b528588308255e2d6a50ac Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Thu, 13 Jul 2023 11:31:04 +0200
Subject: [PATCH 012/151] [feature] remove reply emojis for chat component

---
 webapp/components/Chat/Chat.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 2b9514bf3..b625eeba3 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -20,6 +20,7 @@
         @fetch-messages="fetchMessages($event.detail[0])"
         :responsive-breakpoint="responsiveBreakpoint"
         :single-room="singleRoom"
+        show-reaction-emojis="false"
         @show-demo-options="showDemoOptions = $event"
       />
     </client-only>

From ac6bbf18406560bdb4ef49e7670662c3a7598add Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 13 Jul 2023 11:33:45 +0200
Subject: [PATCH 013/151] remove setTimeout

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index b080f0763..99715ea97 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -146,7 +146,7 @@ export default {
     }),
   },
   methods: {
-    fetchMessages({ room, options = {} }) {
+    async fetchMessages({ room, options = {} }) {
       if (this.lastRoom !== room.id) {
         this.messages = []
         this.messagePage = 0
@@ -154,35 +154,33 @@ export default {
       }
       this.messagesLoaded = options.refetch ? this.messagesLoaded : false
       const offset = (options.refetch ? 0 : this.messagePage) * this.messagePageSize
-      setTimeout(async () => {
-        try {
-          const {
-            data: { Message },
-          } = await this.$apollo.query({
-            query: messageQuery(),
-            variables: {
-              roomId: room.id,
-              first: this.messagePageSize,
-              offset,
-            },
-            fetchPolicy: 'no-cache',
-          })
+      try {
+        const {
+          data: { Message },
+        } = await this.$apollo.query({
+          query: messageQuery(),
+          variables: {
+            roomId: room.id,
+            first: this.messagePageSize,
+            offset,
+          },
+          fetchPolicy: 'no-cache',
+        })
 
-          const msgs = []
-          ;[...this.messages, ...Message].forEach((m) => {
-            msgs[m.indexId] = m
-          })
-          this.messages = msgs.filter(Boolean)
+        const msgs = []
+        ;[...this.messages, ...Message].forEach((m) => {
+          msgs[m.indexId] = m
+        })
+        this.messages = msgs.filter(Boolean)
 
-          if (Message.length < this.messagePageSize) {
-            this.messagesLoaded = true
-          }
-          this.messagePage += 1
-        } catch (error) {
-          this.messages = []
-          this.$toast.error(error.message)
+        if (Message.length < this.messagePageSize) {
+          this.messagesLoaded = true
         }
-      })
+        this.messagePage += 1
+      } catch (error) {
+        this.messages = []
+        this.$toast.error(error.message)
+      }
     },
 
     refetchMessage(roomId) {

From 751c8b60a66d6615abd03816f6c809236f0b55c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 13 Jul 2023 12:02:53 +0200
Subject: [PATCH 014/151] Add headline to chat page

---
 webapp/locales/de.json | 3 +++
 webapp/locales/en.json | 3 +++
 webapp/pages/chat.vue  | 5 ++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index a9a8e9ed4..450f5b3a0 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -78,6 +78,9 @@
     }
   },
   "chat": {
+    "page": {
+      "headline": "Chat"
+    },
     "userProfileButton": {
       "label": "Chat",
       "tooltip": "Chatte mit „{name}“"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 9af3e11af..bfb8b34c2 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -78,6 +78,9 @@
     }
   },
   "chat": {
+    "page": {
+      "headline": "Chat"
+    },
     "userProfileButton": {
       "label": "Chat",
       "tooltip": "Chat with “{name}”"
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index 61192ea49..b23a6e8dc 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -1,5 +1,8 @@
 <template>
-  <chat />
+  <div>
+    <ds-heading tag="h1">{{ $t('chat.page.headline') }}</ds-heading>
+    <chat />
+  </div>
 </template>
 
 <script>

From bb509ae24427e01fa1b125ddd235fbca0f3fe2f4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 13 Jul 2023 12:17:28 +0200
Subject: [PATCH 015/151] remove comment, reverse order to reduce client
 workload

---
 backend/src/schema/resolvers/messages.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 70786e50f..b3892c78c 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -13,8 +13,7 @@ export default {
           id: context.user.id,
         },
       }
-      // this does not work
-      // params.orderBy = ['createdAt_desc']
+
       const resolved = await neo4jgraphql(object, params, context, resolveInfo)
 
       if (resolved) {
@@ -22,7 +21,7 @@ export default {
           message._id = message.id
         })
       }
-      return resolved
+      return resolved.reverse()
     },
   },
   Mutation: {

From 06b15dcd5cf0e419f4b50dcd6f7f80b9b8cd99e6 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 13 Jul 2023 12:18:05 +0200
Subject: [PATCH 016/151] expect specific order of elements when querying, fix
 pagination query

---
 backend/src/graphql/messages.ts               |  4 +--
 backend/src/schema/resolvers/messages.spec.ts | 36 +++++++++----------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/backend/src/graphql/messages.ts b/backend/src/graphql/messages.ts
index 8a17d5208..8172110e0 100644
--- a/backend/src/graphql/messages.ts
+++ b/backend/src/graphql/messages.ts
@@ -13,8 +13,8 @@ export const createMessageMutation = () => {
 
 export const messageQuery = () => {
   return gql`
-    query ($roomId: ID!) {
-      Message(roomId: $roomId) {
+    query ($roomId: ID!, $first: Int, $offset: Int) {
+      Message(roomId: $roomId, first: $first, offset: $offset, orderBy: createdAt_desc) {
         _id
         id
         indexId
diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index c7733aa9b..b68efd71f 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -254,7 +254,7 @@ describe('Message', () => {
             ).resolves.toMatchObject({
               errors: undefined,
               data: {
-                Message: expect.arrayContaining([
+                Message: [
                   expect.objectContaining({
                     id: expect.any(String),
                     indexId: '0',
@@ -282,7 +282,7 @@ describe('Message', () => {
                     avatar: expect.any(String),
                     date: expect.any(String),
                   }),
-                ]),
+                ],
               },
             })
           })
@@ -295,22 +295,12 @@ describe('Message', () => {
                   roomId,
                   first: 2,
                   offset: 0,
-                  orderBy: 'created_desc',
                 },
               }),
             ).resolves.toMatchObject({
               errors: undefined,
               data: {
-                Message: expect.arrayContaining([
-                  expect.objectContaining({
-                    id: expect.any(String),
-                    indexId: '0',
-                    content: 'Some nice message to other chatting user',
-                    senderId: 'chatting-user',
-                    username: 'Chatting User',
-                    avatar: expect.any(String),
-                    date: expect.any(String),
-                  }),
+                Message: [
                   expect.objectContaining({
                     id: expect.any(String),
                     indexId: '1',
@@ -320,7 +310,16 @@ describe('Message', () => {
                     avatar: expect.any(String),
                     date: expect.any(String),
                   }),
-                ]),
+                  expect.objectContaining({
+                    id: expect.any(String),
+                    indexId: '2',
+                    content: 'And another nice message to other chatting user',
+                    senderId: 'chatting-user',
+                    username: 'Chatting User',
+                    avatar: expect.any(String),
+                    date: expect.any(String),
+                  }),
+                ],
               },
             })
 
@@ -331,23 +330,22 @@ describe('Message', () => {
                   roomId,
                   first: 2,
                   offset: 2,
-                  orderBy: 'created_desc',
                 },
               }),
             ).resolves.toMatchObject({
               errors: undefined,
               data: {
-                Message: expect.arrayContaining([
+                Message: [
                   expect.objectContaining({
                     id: expect.any(String),
-                    indexId: '2',
-                    content: 'And another nice message to other chatting user',
+                    indexId: '0',
+                    content: 'Some nice message to other chatting user',
                     senderId: 'chatting-user',
                     username: 'Chatting User',
                     avatar: expect.any(String),
                     date: expect.any(String),
                   }),
-                ]),
+                ],
               },
             })
           })

From a961f88cff2cf2774e3cd9ccebbcc015d37673e3 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 13 Jul 2023 12:28:54 +0200
Subject: [PATCH 017/151] indexId as Int not String

---
 backend/src/schema/resolvers/messages.spec.ts | 12 ++++++------
 backend/src/schema/types/type/Message.gql     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index b68efd71f..323cb7f0c 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -257,7 +257,7 @@ describe('Message', () => {
                 Message: [
                   expect.objectContaining({
                     id: expect.any(String),
-                    indexId: '0',
+                    indexId: 0,
                     content: 'Some nice message to other chatting user',
                     senderId: 'chatting-user',
                     username: 'Chatting User',
@@ -266,7 +266,7 @@ describe('Message', () => {
                   }),
                   expect.objectContaining({
                     id: expect.any(String),
-                    indexId: '1',
+                    indexId: 1,
                     content: 'A nice response message to chatting user',
                     senderId: 'other-chatting-user',
                     username: 'Other Chatting User',
@@ -275,7 +275,7 @@ describe('Message', () => {
                   }),
                   expect.objectContaining({
                     id: expect.any(String),
-                    indexId: '2',
+                    indexId: 2,
                     content: 'And another nice message to other chatting user',
                     senderId: 'chatting-user',
                     username: 'Chatting User',
@@ -303,7 +303,7 @@ describe('Message', () => {
                 Message: [
                   expect.objectContaining({
                     id: expect.any(String),
-                    indexId: '1',
+                    indexId: 1,
                     content: 'A nice response message to chatting user',
                     senderId: 'other-chatting-user',
                     username: 'Other Chatting User',
@@ -312,7 +312,7 @@ describe('Message', () => {
                   }),
                   expect.objectContaining({
                     id: expect.any(String),
-                    indexId: '2',
+                    indexId: 2,
                     content: 'And another nice message to other chatting user',
                     senderId: 'chatting-user',
                     username: 'Chatting User',
@@ -338,7 +338,7 @@ describe('Message', () => {
                 Message: [
                   expect.objectContaining({
                     id: expect.any(String),
-                    indexId: '0',
+                    indexId: 0,
                     content: 'Some nice message to other chatting user',
                     senderId: 'chatting-user',
                     username: 'Chatting User',
diff --git a/backend/src/schema/types/type/Message.gql b/backend/src/schema/types/type/Message.gql
index f97d86dd8..65e8ad009 100644
--- a/backend/src/schema/types/type/Message.gql
+++ b/backend/src/schema/types/type/Message.gql
@@ -9,7 +9,7 @@ enum _MessageOrdering {
 
 type Message {
   id: ID!
-  indexId: String!
+  indexId: Int!
   createdAt: String
   updatedAt: String
 

From 4b9e7da1ba2f53248cea263936297b14f4aedc19 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 13 Jul 2023 12:30:02 +0200
Subject: [PATCH 018/151] typo

---
 backend/src/schema/resolvers/messages.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index 323cb7f0c..ce83462f7 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -212,7 +212,7 @@ describe('Message', () => {
                 {
                   id: expect.any(String),
                   _id: result.data.Message[0].id,
-                  indexId: '0',
+                  indexId: 0,
                   content: 'Some nice message to other chatting user',
                   senderId: 'chatting-user',
                   username: 'Chatting User',

From 24c6884b9afe1d902b4aeb4d7983cf22d391ca3b Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Thu, 13 Jul 2023 14:38:28 +0200
Subject: [PATCH 019/151] [feature] changed usertag in chat messages to
 user-slug

---
 webapp/components/Chat/Chat.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 2b9514bf3..d27824fa8 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -164,6 +164,12 @@ export default {
     },
 
     async sendMessage(message) {
+      //check for usersTag and change userid to username
+      message.usersTag.forEach(userTag =>{
+        let needle = `<usertag>${userTag.id}</usertag>`
+        let replacement = `<usertag>@${userTag.name.replaceAll(" ","-").toLowerCase()}</usertag>`
+        message.content = message.content.replaceAll(needle,replacement)
+      })
       try {
         await this.$apollo.mutate({
           mutation: createMessageMutation(),

From 08b78aad7c55d66cab3ec23d98b32eb710dc58d0 Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Thu, 13 Jul 2023 14:45:44 +0200
Subject: [PATCH 020/151] fixed linting

---
 webapp/components/Chat/Chat.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d27824fa8..6ed548ab0 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -164,11 +164,11 @@ export default {
     },
 
     async sendMessage(message) {
-      //check for usersTag and change userid to username
-      message.usersTag.forEach(userTag =>{
-        let needle = `<usertag>${userTag.id}</usertag>`
-        let replacement = `<usertag>@${userTag.name.replaceAll(" ","-").toLowerCase()}</usertag>`
-        message.content = message.content.replaceAll(needle,replacement)
+      // check for usersTag and change userid to username
+      message.usersTag.forEach((userTag) => {
+        const needle = `<usertag>${userTag.id}</usertag>`
+        const replacement = `<usertag>@${userTag.name.replaceAll(' ', '-').toLowerCase()}</usertag>`
+        message.content = message.content.replaceAll(needle, replacement)
       })
       try {
         await this.$apollo.mutate({

From 032bca1b64a68fe3080bdcaf0aa51878ae87a6f5 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 13 Jul 2023 19:09:17 +0200
Subject: [PATCH 021/151] add last message at, use cypher statements for
 roomName and avatar

---
 backend/src/graphql/rooms.ts                  |  1 +
 backend/src/schema/resolvers/messages.spec.ts | 17 ++++++++++++++++-
 backend/src/schema/resolvers/messages.ts      |  1 +
 backend/src/schema/resolvers/rooms.spec.ts    |  3 +++
 backend/src/schema/resolvers/rooms.ts         |  6 +-----
 backend/src/schema/types/type/Room.gql        |  6 ++++--
 6 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index 109bf1d55..c42da6166 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -18,6 +18,7 @@ export const roomQuery = () => {
         id
         roomId
         roomName
+        lastMessageAt
         users {
           _id
           id
diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index 0deccb4e9..bc16c1ef2 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -1,7 +1,7 @@
 import { createTestClient } from 'apollo-server-testing'
 import Factory, { cleanDatabase } from '../../db/factories'
 import { getNeode, getDriver } from '../../db/neo4j'
-import { createRoomMutation } from '../../graphql/rooms'
+import { createRoomMutation, roomQuery } from '../../graphql/rooms'
 import { createMessageMutation, messageQuery, markMessagesAsSeen } from '../../graphql/messages'
 import createServer from '../../server'
 
@@ -129,6 +129,21 @@ describe('Message', () => {
               },
             })
           })
+
+          describe('room is updated as well', () => {
+            it('has last message at set', async () => {
+              await expect(query({ query: roomQuery() })).resolves.toMatchObject({
+                errors: undefined,
+                data: {
+                  Room: [
+                    expect.objectContaining({
+                      lastMessageAt: expect.any(String),
+                    }),
+                  ],
+                },
+              })
+            })
+          })
         })
 
         describe('user does not chat in room', () => {
diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 45de0b4a4..266758128 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -68,6 +68,7 @@ export default {
             distributed: false,
             seen: false
           })-[:INSIDE]->(room)
+          SET room.lastMessageAt = toString(datetime())
           RETURN message { .* }
         `
         const createMessageTxResponse = await transaction.run(createMessageCypher, {
diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index 03c3d4456..d247c42b4 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -21,6 +21,9 @@ beforeAll(async () => {
         driver,
         neode,
         user: authenticatedUser,
+        cypherParams: {
+          currentUserId: authenticatedUser ? authenticatedUser.id : null,
+        },
       }
     },
   })
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index d5015a03b..c8077211a 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -12,11 +12,6 @@ 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
             })
@@ -68,6 +63,7 @@ export default {
   },
   Room: {
     ...Resolver('Room', {
+      undefinedToNull: ['lastMessageAt'],
       hasMany: {
         users: '<-[:CHATS_IN]-(related:User)',
       },
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 2ce6556f6..eb5ed02e5 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -13,8 +13,10 @@ 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")
-  avatar: String! ## @cypher match not own user in users array
+  roomName: String! @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.name")
+  avatar: String! @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.avatar.url")
+
+  lastMessageAt: String
 }
 
 type Mutation {

From d73fd0cbb75d7080f3c55612e727e62e78b6ef8e Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Thu, 13 Jul 2023 22:35:48 +0200
Subject: [PATCH 022/151] [bug] chat language is now reactive

---
 webapp/components/Chat/Chat.vue | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 8aeb4e7de..855f1e14b 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -114,20 +114,6 @@ export default {
           text: 'This is the action',
         },
       ],
-      textMessages: {
-        ROOMS_EMPTY: this.$t('chat.roomsEmpty'),
-        ROOM_EMPTY: this.$t('chat.roomEmpty'),
-        NEW_MESSAGES: this.$t('chat.newMessages'),
-        MESSAGE_DELETED: this.$t('chat.messageDeleted'),
-        MESSAGES_EMPTY: this.$t('chat.messagesEmpty'),
-        CONVERSATION_STARTED: this.$t('chat.conversationStarted'),
-        TYPE_MESSAGE: this.$t('chat.typeMessage'),
-        SEARCH: this.$t('chat.search'),
-        IS_ONLINE: this.$t('chat.isOnline'),
-        LAST_SEEN: this.$t('chat.lastSeen'),
-        IS_TYPING: this.$t('chat.isTyping'),
-        CANCEL_SELECT_MESSAGE: this.$t('chat.cancelSelectMessage'),
-      },
       roomActions: [
         /*
         {
@@ -177,6 +163,22 @@ export default {
       // return this.theme === 'light' ? chatStyle.STYLE.light : chatStyle.STYLE.dark
       return chatStyle.STYLE.light
     },
+    textMessages() {
+      return{
+        ROOMS_EMPTY: this.$t('chat.roomsEmpty'),
+        ROOM_EMPTY: this.$t('chat.roomEmpty'),
+        NEW_MESSAGES: this.$t('chat.newMessages'),
+        MESSAGE_DELETED: this.$t('chat.messageDeleted'),
+        MESSAGES_EMPTY: this.$t('chat.messagesEmpty'),
+        CONVERSATION_STARTED: this.$t('chat.conversationStarted'),
+        TYPE_MESSAGE: this.$t('chat.typeMessage'),
+        SEARCH: this.$t('chat.search'),
+        IS_ONLINE: this.$t('chat.isOnline'),
+        LAST_SEEN: this.$t('chat.lastSeen'),
+        IS_TYPING: this.$t('chat.isTyping'),
+        CANCEL_SELECT_MESSAGE: this.$t('chat.cancelSelectMessage'),
+      }
+    }
   },
   methods: {
     fetchMessages({ room, options = {} }) {

From d496aef0a42abb9fdd17a7c8ac95c2653c0172b8 Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Thu, 13 Jul 2023 22:56:38 +0200
Subject: [PATCH 023/151] fixed linting

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 855f1e14b..eb7d7124a 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -164,7 +164,7 @@ export default {
       return chatStyle.STYLE.light
     },
     textMessages() {
-      return{
+      return {
         ROOMS_EMPTY: this.$t('chat.roomsEmpty'),
         ROOM_EMPTY: this.$t('chat.roomEmpty'),
         NEW_MESSAGES: this.$t('chat.newMessages'),
@@ -178,7 +178,7 @@ export default {
         IS_TYPING: this.$t('chat.isTyping'),
         CANCEL_SELECT_MESSAGE: this.$t('chat.cancelSelectMessage'),
       }
-    }
+    },
   },
   methods: {
     fetchMessages({ room, options = {} }) {

From 5376e171bd50494700ffa5452a447e72557c6a61 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 09:11:32 +0200
Subject: [PATCH 024/151] trying last message prop in room

---
 backend/src/schema/resolvers/messages.spec.ts | 6 +++++-
 backend/src/schema/types/type/Room.gql        | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index bc16c1ef2..bad78a240 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -131,13 +131,17 @@ describe('Message', () => {
           })
 
           describe('room is updated as well', () => {
-            it('has last message at set', async () => {
+            it('has last message set', async () => {
               await expect(query({ query: roomQuery() })).resolves.toMatchObject({
                 errors: undefined,
                 data: {
                   Room: [
                     expect.objectContaining({
                       lastMessageAt: expect.any(String),
+                      lastMessage: expect.objectContaining({
+                        id: expect.any(String),
+                        content: 'Some nice message to other chatting user',
+                      })
                     }),
                   ],
                 },
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index eb5ed02e5..3f8a22e70 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -17,6 +17,8 @@ type Room {
   avatar: String! @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.avatar.url")
 
   lastMessageAt: String
+
+  lastMessage: Message @cypher(statement: "MATCH (this)<-[:INSIDE]-(message:Message) RETURN message ORDER BY message.createdAt DESC LIMIT 1")
 }
 
 type Mutation {

From faa474dcf6aff62f13942ab8af5b7fb2e83458c4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 14 Jul 2023 09:19:56 +0200
Subject: [PATCH 025/151] fixed merge problem

---
 webapp/components/Chat/Chat.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index ba12b9771..95bf5da95 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -78,7 +78,6 @@ export default {
     return {
       menuActions: [
         // NOTE: if menuActions is empty, the related slot is not shown
-        /*
         {
           name: 'dummyItem',
           title: 'Just a dummy item',

From f9da7622538d0d73a974ad91b999eba26da8d357 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 14 Jul 2023 10:42:20 +0200
Subject: [PATCH 026/151] implemented chat seed

---
 backend/src/db/seed.ts | 86 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/backend/src/db/seed.ts b/backend/src/db/seed.ts
index a717ff7a6..425c9e28c 100644
--- a/backend/src/db/seed.ts
+++ b/backend/src/db/seed.ts
@@ -11,6 +11,8 @@ import {
   changeGroupMemberRoleMutation,
 } from '../graphql/groups'
 import { createPostMutation } from '../graphql/posts'
+import { createRoomMutation } from '../graphql/rooms'
+import { createMessageMutation } from '../graphql/messages'
 import { createCommentMutation } from '../graphql/comments'
 import { categories } from '../constants/categories'
 
@@ -1553,6 +1555,90 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     )
 
     await Factory.build('donations')
+
+    // Chat
+    authenticatedUser = await huey.toJson()
+    const { data: roomHueyPeter } = await mutate({
+      mutation: createRoomMutation(),
+      variables: {
+        userId: (await peterLustig.toJson()).id,
+      },
+    })
+
+    for (let i = 0; i < 30; i++) {
+      authenticatedUser = await huey.toJson()
+      await mutate({
+        mutation: createMessageMutation(),
+        variables: {
+          roomId: roomHueyPeter?.CreateRoom.id,
+          content: faker.lorem.sentence(),
+        },
+      })
+      authenticatedUser = await peterLustig.toJson()
+      await mutate({
+        mutation: createMessageMutation(),
+        variables: {
+          roomId: roomHueyPeter?.CreateRoom.id,
+          content: faker.lorem.sentence(),
+        },
+      })
+    }
+
+    authenticatedUser = await huey.toJson()
+    const { data: roomHueyJenny } = await mutate({
+      mutation: createRoomMutation(),
+      variables: {
+        userId: (await jennyRostock.toJson()).id,
+      },
+    })
+    for (let i = 0; i < 10000; i++) {
+      authenticatedUser = await huey.toJson()
+      await mutate({
+        mutation: createMessageMutation(),
+        variables: {
+          roomId: roomHueyJenny?.CreateRoom.id,
+          content: faker.lorem.sentence(),
+        },
+      })
+      authenticatedUser = await jennyRostock.toJson()
+      await mutate({
+        mutation: createMessageMutation(),
+        variables: {
+          roomId: roomHueyJenny?.CreateRoom.id,
+          content: faker.lorem.sentence(),
+        },
+      })
+    }
+
+    for (const user of additionalUsers) {
+      authenticatedUser = await jennyRostock.toJson()
+      const { data: room } = await mutate({
+        mutation: createRoomMutation(),
+        variables: {
+          userId: (await user.toJson()).id,
+        },
+      })
+
+      for (let i = 0; i < 30; i++) {
+        authenticatedUser = await jennyRostock.toJson()
+        await mutate({
+          mutation: createMessageMutation(),
+          variables: {
+            roomId: room?.CreateRoom.id,
+            content: faker.lorem.sentence(),
+          },
+        })
+        authenticatedUser = await user.toJson()
+        await mutate({
+          mutation: createMessageMutation(),
+          variables: {
+            roomId: room?.CreateRoom.id,
+            content: faker.lorem.sentence(),
+          },
+        })
+      }
+    }
+
     /* eslint-disable-next-line no-console */
     console.log('Seeded Data...')
     await driver.close()

From eae7b53adf79de8e87ee1fa1acf050de9e36b540 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 14 Jul 2023 10:56:02 +0200
Subject: [PATCH 027/151] reduce message count to 1000 instead of 10000 to
 reduce seed time

---
 backend/src/db/seed.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/db/seed.ts b/backend/src/db/seed.ts
index 425c9e28c..cf3f43ee9 100644
--- a/backend/src/db/seed.ts
+++ b/backend/src/db/seed.ts
@@ -1591,7 +1591,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         userId: (await jennyRostock.toJson()).id,
       },
     })
-    for (let i = 0; i < 10000; i++) {
+    for (let i = 0; i < 1000; i++) {
       authenticatedUser = await huey.toJson()
       await mutate({
         mutation: createMessageMutation(),

From 55b3bc999a57588e90ba90fba71052b83d919e3e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 14 Jul 2023 10:59:38 +0200
Subject: [PATCH 028/151] use a prime for seeding to allow testing of the
 pagination

---
 backend/src/db/seed.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/db/seed.ts b/backend/src/db/seed.ts
index cf3f43ee9..7286683dd 100644
--- a/backend/src/db/seed.ts
+++ b/backend/src/db/seed.ts
@@ -1619,7 +1619,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         },
       })
 
-      for (let i = 0; i < 30; i++) {
+      for (let i = 0; i < 29; i++) {
         authenticatedUser = await jennyRostock.toJson()
         await mutate({
           mutation: createMessageMutation(),

From 54cf5b37a5f353de187a95b7b608791c5ffdfd30 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 14 Jul 2023 11:09:04 +0200
Subject: [PATCH 029/151] order by indexId instead of createdAt

---
 backend/src/graphql/messages.ts           | 2 +-
 backend/src/schema/types/type/Message.gql | 3 +--
 webapp/graphql/Messages.js                | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/backend/src/graphql/messages.ts b/backend/src/graphql/messages.ts
index ca5ffb952..26eb32750 100644
--- a/backend/src/graphql/messages.ts
+++ b/backend/src/graphql/messages.ts
@@ -17,7 +17,7 @@ export const createMessageMutation = () => {
 export const messageQuery = () => {
   return gql`
     query ($roomId: ID!, $first: Int, $offset: Int) {
-      Message(roomId: $roomId, first: $first, offset: $offset, orderBy: createdAt_desc) {
+      Message(roomId: $roomId, first: $first, offset: $offset, orderBy: indexId_desc) {
         _id
         id
         indexId
diff --git a/backend/src/schema/types/type/Message.gql b/backend/src/schema/types/type/Message.gql
index 671c5523a..764181dd9 100644
--- a/backend/src/schema/types/type/Message.gql
+++ b/backend/src/schema/types/type/Message.gql
@@ -3,8 +3,7 @@
 # }
 
 enum _MessageOrdering {
-  createdAt_asc
-  createdAt_desc
+  indexId_desc
 }
 
 type Message {
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index d017f816c..bede62d01 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -3,7 +3,7 @@ import gql from 'graphql-tag'
 export const messageQuery = () => {
   return gql`
     query ($roomId: ID!, $first: Int, $offset: Int) {
-      Message(roomId: $roomId, first: $first, offset: $offset, orderBy: createdAt_desc) {
+      Message(roomId: $roomId, first: $first, offset: $offset, orderBy: indexId_desc) {
         _id
         id
         indexId

From 1d92b40f506d1999858cef5448726c02de35ee7d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 11:52:51 +0200
Subject: [PATCH 030/151] lastMessage in room working

---
 backend/src/graphql/rooms.ts                  | 12 ++++++++++
 backend/src/middleware/chatMiddleware.ts      | 22 +++++++++++++++++++
 backend/src/middleware/index.ts               |  3 +++
 backend/src/schema/resolvers/messages.spec.ts | 16 ++++++++++++--
 backend/src/schema/resolvers/rooms.ts         | 12 +---------
 backend/src/schema/types/type/Room.gql        |  6 ++++-
 6 files changed, 57 insertions(+), 14 deletions(-)
 create mode 100644 backend/src/middleware/chatMiddleware.ts

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index c42da6166..28626071c 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -19,6 +19,18 @@ export const roomQuery = () => {
         roomId
         roomName
         lastMessageAt
+        lastMessage {
+          _id
+          id
+          content
+          senderId
+          username
+          avatar
+          date
+          saved
+          distributed
+          seen
+        }
         users {
           _id
           id
diff --git a/backend/src/middleware/chatMiddleware.ts b/backend/src/middleware/chatMiddleware.ts
new file mode 100644
index 000000000..38b299450
--- /dev/null
+++ b/backend/src/middleware/chatMiddleware.ts
@@ -0,0 +1,22 @@
+const roomProperties = async (resolve, root, args, context, info) => {
+  const resolved = await resolve(root, args, context, info)
+  if (resolved) {
+    resolved.forEach((room) => {
+      if (room.users) {
+        room.users.forEach((user) => {
+          user._id = user.id
+        })
+      }
+      if (room.lastMessage) {
+        room.lastMessage._id = room.lastMessage.id
+      }
+    })
+  }
+  return resolved
+}
+
+export default {
+  Query: {
+    Room: roomProperties,
+  },
+}
diff --git a/backend/src/middleware/index.ts b/backend/src/middleware/index.ts
index 813bbe9a7..08c872db7 100644
--- a/backend/src/middleware/index.ts
+++ b/backend/src/middleware/index.ts
@@ -14,6 +14,7 @@ import login from './login/loginMiddleware'
 import sentry from './sentryMiddleware'
 import languages from './languages/languages'
 import userInteractions from './userInteractions'
+import chatMiddleware from './chatMiddleware'
 
 export default (schema) => {
   const middlewares = {
@@ -31,6 +32,7 @@ export default (schema) => {
     orderBy,
     languages,
     userInteractions,
+    chatMiddleware,
   }
 
   let order = [
@@ -49,6 +51,7 @@ export default (schema) => {
     'softDelete',
     'includedFields',
     'orderBy',
+    'chatMiddleware',
   ]
 
   // add permisions middleware at the first position (unless we're seeding)
diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index bad78a240..ecdf90873 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -22,6 +22,9 @@ beforeAll(async () => {
         driver,
         neode,
         user: authenticatedUser,
+        cypherParams: {
+          currentUserId: authenticatedUser ? authenticatedUser.id : null,
+        },
       }
     },
   })
@@ -132,16 +135,25 @@ describe('Message', () => {
 
           describe('room is updated as well', () => {
             it('has last message set', async () => {
-              await expect(query({ query: roomQuery() })).resolves.toMatchObject({
+              const result = await query({ query: roomQuery() })
+              await expect(result).toMatchObject({
                 errors: undefined,
                 data: {
                   Room: [
                     expect.objectContaining({
                       lastMessageAt: expect.any(String),
                       lastMessage: expect.objectContaining({
+                        _id: result.data.Room[0].lastMessage.id,
                         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,
+                      }),
                     }),
                   ],
                 },
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index c8077211a..d1e14aaba 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -8,17 +8,7 @@ export default {
       params.filter.users_some = {
         id: context.user.id,
       }
-      const resolved = await neo4jgraphql(object, params, context, resolveInfo)
-      if (resolved) {
-        resolved.forEach((room) => {
-          if (room.users) {
-            room.users.forEach((user) => {
-              user._id = user.id
-            })
-          }
-        })
-      }
-      return resolved
+      return neo4jgraphql(object, params, context, resolveInfo)
     },
   },
   Mutation: {
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 3f8a22e70..2cf51014e 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -18,7 +18,11 @@ type Room {
 
   lastMessageAt: String
 
-  lastMessage: Message @cypher(statement: "MATCH (this)<-[:INSIDE]-(message:Message) RETURN message ORDER BY message.createdAt DESC LIMIT 1")
+  lastMessage: Message @cypher(statement: """
+    MATCH (this)<-[:INSIDE]-(message:Message)
+    WITH message ORDER BY message.createdAt DESC LIMIT 1
+    RETURN message
+  """)
 }
 
 type Mutation {

From 2fe93892a1c1a52ae224e04c1fbb391b15c0bc4a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 12:21:40 +0200
Subject: [PATCH 031/151] full room object for create room mutation

---
 backend/src/graphql/rooms.ts               | 10 +++++++
 backend/src/middleware/chatMiddleware.ts   | 33 +++++++++++++++-------
 backend/src/schema/resolvers/rooms.spec.ts | 19 +++++++++++++
 backend/src/schema/resolvers/rooms.ts      |  8 +++++-
 4 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index 28626071c..e48ffe943 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -6,6 +6,16 @@ export const createRoomMutation = () => {
       CreateRoom(userId: $userId) {
         id
         roomId
+        roomName
+        lastMessageAt
+        users {
+          _id
+          id
+          name
+          avatar {
+            url
+          }
+        }
       }
     }
   `
diff --git a/backend/src/middleware/chatMiddleware.ts b/backend/src/middleware/chatMiddleware.ts
index 38b299450..5b0e4d7e2 100644
--- a/backend/src/middleware/chatMiddleware.ts
+++ b/backend/src/middleware/chatMiddleware.ts
@@ -1,16 +1,26 @@
+import { isArray } from 'lodash'
+
+const setRoomProps = (room) => {
+  if (room.users) {
+    room.users.forEach((user) => {
+      user._id = user.id
+    })
+  }
+  if (room.lastMessage) {
+    room.lastMessage._id = room.lastMessage.id
+  }
+}
+
 const roomProperties = async (resolve, root, args, context, info) => {
   const resolved = await resolve(root, args, context, info)
   if (resolved) {
-    resolved.forEach((room) => {
-      if (room.users) {
-        room.users.forEach((user) => {
-          user._id = user.id
-        })
-      }
-      if (room.lastMessage) {
-        room.lastMessage._id = room.lastMessage.id
-      }
-    })
+    if (isArray(resolved)) {
+      resolved.forEach((room) => {
+        setRoomProps(room)
+      })
+    } else {
+      setRoomProps(resolved)
+    }
   }
   return resolved
 }
@@ -19,4 +29,7 @@ export default {
   Query: {
     Room: roomProperties,
   },
+  Mutation: {
+    CreateRoom: roomProperties,
+  },
 }
diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index d247c42b4..daed6815e 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -125,6 +125,25 @@ describe('Room', () => {
               CreateRoom: {
                 id: expect.any(String),
                 roomId: result.data.CreateRoom.id,
+                roomName: 'Other 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),
+                    },
+                  },
+                ]),
               },
             },
           })
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index d1e14aaba..885688643 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -29,7 +29,13 @@ export default {
           ON CREATE SET
             room.createdAt = toString(datetime()),
             room.id = apoc.create.uuid()
-          RETURN room { .* }
+          WITH room, user, currentUser,
+          user.name AS roomName
+          RETURN room {
+            .*,
+            users: [properties(currentUser), properties(user)],
+            roomName: roomName
+          }
         `
         const createRommTxResponse = await transaction.run(createRoomCypher, {
           userId,

From 1fd67aa581c58cf4f17f26811cc8280ee94026ff Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 12:34:12 +0200
Subject: [PATCH 032/151] add unreadCount property

---
 backend/src/graphql/rooms.ts               | 2 ++
 backend/src/schema/resolvers/rooms.spec.ts | 2 ++
 backend/src/schema/resolvers/rooms.ts      | 3 ++-
 backend/src/schema/types/type/Room.gql     | 7 +++++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index e48ffe943..554c346dc 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -8,6 +8,7 @@ export const createRoomMutation = () => {
         roomId
         roomName
         lastMessageAt
+        unreadCount
         users {
           _id
           id
@@ -29,6 +30,7 @@ export const roomQuery = () => {
         roomId
         roomName
         lastMessageAt
+        unreadCount
         lastMessage {
           _id
           id
diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index daed6815e..0ff8669fb 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -126,6 +126,7 @@ describe('Room', () => {
                 id: expect.any(String),
                 roomId: result.data.CreateRoom.id,
                 roomName: 'Other Chatting User',
+                unreadCount: 0,
                 users: expect.arrayContaining([
                   {
                     _id: 'chatting-user',
@@ -241,6 +242,7 @@ describe('Room', () => {
                   id: expect.any(String),
                   roomId: result.data.Room[0].id,
                   roomName: 'Chatting User',
+                  unreadCount: 0,
                   users: expect.arrayContaining([
                     {
                       _id: 'chatting-user',
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index 885688643..f87f89f2e 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -34,7 +34,8 @@ export default {
           RETURN room {
             .*,
             users: [properties(currentUser), properties(user)],
-            roomName: roomName
+            roomName: roomName,
+            unreadCount: toString(0)
           }
         `
         const createRommTxResponse = await transaction.run(createRoomCypher, {
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 2cf51014e..a1ff56e34 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -23,6 +23,13 @@ type Room {
     WITH message ORDER BY message.createdAt DESC LIMIT 1
     RETURN message
   """)
+
+  unreadCount: Int @cypher(statement: """
+    MATCH (this)<-[:INSIDE]-(message:Message)<-[:CREATED]-(user:User)
+    WHERE NOT user.id = $cypherParams.currentUserId
+      AND NOT message.seen 
+    RETURN count(message)
+  """)
 }
 
 type Mutation {

From b9b9fea1ddedaf48771b6ca43ddd72dfbb3dcb14 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 12:38:46 +0200
Subject: [PATCH 033/151] test unread count

---
 backend/src/schema/resolvers/messages.spec.ts | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index ecdf90873..9a9e84c1e 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -142,6 +142,7 @@ describe('Message', () => {
                   Room: [
                     expect.objectContaining({
                       lastMessageAt: expect.any(String),
+                      unreadCount: 0,
                       lastMessage: expect.objectContaining({
                         _id: result.data.Room[0].lastMessage.id,
                         id: expect.any(String),
@@ -160,6 +161,35 @@ describe('Message', () => {
               })
             })
           })
+
+          describe('unread count for other user', () => {
+            it('has unread count = 1', async () => {
+              authenticatedUser = await otherChattingUser.toJson()
+              await expect(query({ query: roomQuery() })).resolves.toMatchObject({
+                errors: undefined,
+                data: {
+                  Room: [
+                    expect.objectContaining({
+                      lastMessageAt: expect.any(String),
+                      unreadCount: 1,
+                      lastMessage: expect.objectContaining({
+                        _id: expect.any(String),
+                        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,
+                      }),
+                    }),
+                  ],
+                },
+              })
+            })
+          })
         })
 
         describe('user does not chat in room', () => {

From 4310b3fa48d9c2f36df5e992d2f973458cf68fb4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 12:51:54 +0200
Subject: [PATCH 034/151] create message mutation returns full message object

---
 backend/src/graphql/messages.ts               |  4 ++++
 backend/src/middleware/chatMiddleware.ts      | 22 +++++++++++++++++++
 backend/src/schema/resolvers/messages.spec.ts |  4 ++++
 backend/src/schema/resolvers/messages.ts      | 15 +++++++------
 4 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/backend/src/graphql/messages.ts b/backend/src/graphql/messages.ts
index 34c7d559b..e042fc600 100644
--- a/backend/src/graphql/messages.ts
+++ b/backend/src/graphql/messages.ts
@@ -6,6 +6,10 @@ export const createMessageMutation = () => {
       CreateMessage(roomId: $roomId, content: $content) {
         id
         content
+        senderId
+        username
+        avatar
+        date
         saved
         distributed
         seen
diff --git a/backend/src/middleware/chatMiddleware.ts b/backend/src/middleware/chatMiddleware.ts
index 5b0e4d7e2..c28d6a70d 100644
--- a/backend/src/middleware/chatMiddleware.ts
+++ b/backend/src/middleware/chatMiddleware.ts
@@ -11,6 +11,13 @@ const setRoomProps = (room) => {
   }
 }
 
+const setMessageProps = (message, context) => {
+  message._id = message.id
+  if (message.senderId !== context.user.id) {
+    message.distributed = true
+  }
+}
+
 const roomProperties = async (resolve, root, args, context, info) => {
   const resolved = await resolve(root, args, context, info)
   if (resolved) {
@@ -25,9 +32,24 @@ const roomProperties = async (resolve, root, args, context, info) => {
   return resolved
 }
 
+const messageProperties = async (resolve, root, args, context, info) => {
+  const resolved = await resolve(root, args, context, info)
+  if (resolved) {
+    if (isArray(resolved)) {
+      resolved.forEach((message) => {
+        setMessageProps(message, context)
+      })
+    } else {
+      setMessageProps(resolved, context)
+    }
+  }
+  return resolved
+}
+
 export default {
   Query: {
     Room: roomProperties,
+    Message: messageProperties,
   },
   Mutation: {
     CreateRoom: roomProperties,
diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index 9a9e84c1e..68b84ad69 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -125,6 +125,10 @@ describe('Message', () => {
                 CreateMessage: {
                   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,
diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 266758128..fa80a7b3f 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -40,12 +40,6 @@ export default {
           }
           // send subscription to author to updated the messages
         }
-        resolved.forEach((message) => {
-          message._id = message.id
-          if (message.senderId !== context.user.id) {
-            message.distributed = true
-          }
-        })
       }
       return resolved
     },
@@ -60,6 +54,7 @@ export default {
       const writeTxResultPromise = session.writeTransaction(async (transaction) => {
         const createMessageCypher = `
           MATCH (currentUser:User { id: $currentUserId })-[:CHATS_IN]->(room:Room { id: $roomId })
+          OPTIONAL MATCH (currentUser)-[:AVATAR_IMAGE]->(image:Image)
           CREATE (currentUser)-[:CREATED]->(message:Message {
             createdAt: toString(datetime()),
             id: apoc.create.uuid(),
@@ -69,7 +64,13 @@ export default {
             seen: false
           })-[:INSIDE]->(room)
           SET room.lastMessageAt = toString(datetime())
-          RETURN message { .* }
+          RETURN message {
+            .*,
+            senderId: currentUser.id,
+            username: currentUser.name,
+            avatar: image.url,
+            date: message.createdAt
+          }
         `
         const createMessageTxResponse = await transaction.run(createMessageCypher, {
           currentUserId,

From f4567b14ff838a5f78e2f132d471d8ce4aa7da0a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 13:25:57 +0200
Subject: [PATCH 035/151] feat(backend): unread rooms query

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

diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index d5015a03b..3eda1440c 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]-(user:User)
+          WHERE NOT message.seen AND NOT user.id = $currentUserId
+          RETURN toString(COUNT(room)) AS count
+        `
+        const unreadRoomsTxResponse = await transaction.run(unreadRoomsCypher, { currentUserId })
+        return unreadRoomsTxResponse.records.map((record) => record.get('count'))
+      })
+      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 2ce6556f6..55984fb5f 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -25,4 +25,5 @@ type Mutation {
 
 type Query {
   Room: [Room]
+  UnreadRooms: Int
 }

From 09be4d3442e227bb7722cfc5fe0b4a3d9445a44c Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 14:40:38 +0200
Subject: [PATCH 036/151] test unread rooms query

---
 backend/src/graphql/rooms.ts                  |   8 ++
 .../src/middleware/permissionsMiddleware.ts   |   1 +
 backend/src/schema/resolvers/rooms.spec.ts    | 120 +++++++++++++++++-
 backend/src/schema/resolvers/rooms.ts         |   6 +-
 4 files changed, 128 insertions(+), 7 deletions(-)

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index 109bf1d55..cb511c4eb 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 03c3d4456..6a8cb47de 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()
@@ -29,11 +30,13 @@ beforeAll(async () => {
 })
 
 afterAll(async () => {
-  await cleanDatabase()
+  // await cleanDatabase()
   driver.close()
 })
 
 describe('Room', () => {
+  let roomId: string
+
   beforeAll(async () => {
     ;[chattingUser, otherChattingUser, notChattingUser] = await Promise.all([
       Factory.build('user', {
@@ -68,8 +71,6 @@ describe('Room', () => {
     })
 
     describe('authenticated', () => {
-      let roomId: string
-
       beforeAll(async () => {
         authenticatedUser = await chattingUser.toJson()
       })
@@ -260,4 +261,115 @@ 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,
+            },
+          })
+        })
+      })
+    })
+  })
 })
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index 3eda1440c..084a75eb0 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -33,11 +33,11 @@ export default {
       const readTxResultPromise = session.readTransaction(async (transaction) => {
         const unreadRoomsCypher = `
           MATCH (:User { id: $currentUserId })-[:CHATS_IN]->(room:Room)<-[:INSIDE]-(message:Message)<-[:CREATED]-(user:User)
-          WHERE NOT message.seen AND NOT user.id = $currentUserId
-          RETURN toString(COUNT(room)) AS count
+          WHERE NOT user.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'))
+        return unreadRoomsTxResponse.records.map((record) => record.get('count'))[0]
       })
       try {
         const count = await readTxResultPromise

From d7746e5904a44460404fa5ebf6d554ef42d17882 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 14:44:41 +0200
Subject: [PATCH 037/151] clean db after all

---
 backend/src/schema/resolvers/rooms.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index 6a8cb47de..8c46794c7 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -30,7 +30,7 @@ beforeAll(async () => {
 })
 
 afterAll(async () => {
-  // await cleanDatabase()
+  await cleanDatabase()
   driver.close()
 })
 

From c46d0064fcd33b175fa71e95aab747bef587aa04 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 14:50:43 +0200
Subject: [PATCH 038/151] unread rooms query in chat notification

---
 .../ChatNotificationMenu.vue                   | 18 +++++++++++++++++-
 webapp/graphql/Rooms.js                        |  8 ++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

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',
       }"
     >
-      <counter-icon icon="chat-bubble" :count="1" danger />
+      <counter-icon icon="chat-bubble" :count="count" danger />
     </base-button>
   </nuxt-link>
 </template>
 
 <script>
 import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
+import { unreadRoomsQuery } from '~/graphql/Rooms'
 
 export default {
   name: 'ChatNotificationMenu',
   components: {
     CounterIcon,
   },
+  data() {
+    return {
+      count: 0,
+    }
+  },
+  apollo: {
+    UnreadRooms: {
+      query() {
+        return unreadRoomsQuery()
+      },
+      update({ UnreadRooms }) {
+        this.count = UnreadRooms
+      },
+    },
+  },
 }
 </script>
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index e28702f77..c659ba85c 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
+    }
+  `
+}

From db594650f9308e8c3bdd5e396c087598ae932d82 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 14 Jul 2023 18:53:56 +0200
Subject: [PATCH 039/151] feat(webapp): mark messages as seen

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 95bf5da95..8c4aaff69 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -59,7 +59,7 @@
 
 <script>
 import { roomQuery, createRoom } from '~/graphql/Rooms'
-import { messageQuery, createMessageMutation } from '~/graphql/Messages'
+import { messageQuery, createMessageMutation, markMessagesAsSeen } from '~/graphql/Messages'
 import chatStyle from '~/constants/chat.js'
 import { mapGetters } from 'vuex'
 
@@ -83,30 +83,30 @@ export default {
           title: 'Just a dummy item',
         },
         /* {
-          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',
+            },
+          */
       ],
       messageActions: [
         /*
-        {
-          name: 'addMessageToFavorite',
-          title: 'Add To Favorite',
-        },
-        {
-          name: 'shareMessage',
-          title: 'Share Message',
-        },
-        */
+            {
+            name: 'addMessageToFavorite',
+            title: 'Add To Favorite',
+            },
+            {
+            name: 'shareMessage',
+            title: 'Share Message',
+            },
+          */
       ],
       templatesText: [
         {
@@ -134,14 +134,14 @@ export default {
       },
       roomActions: [
         /*
-        {
-          name: 'archiveRoom',
-          title: 'Archive Room',
-        },
-        { name: 'inviteUser', title: 'Invite User' },
-        { name: 'removeUser', title: 'Remove User' },
-        { name: 'deleteRoom', title: 'Delete Room' },
-        */
+            {
+            name: 'archiveRoom',
+            title: 'Archive Room',
+            },
+            { name: 'inviteUser', title: 'Invite User' },
+            { name: 'removeUser', title: 'Remove User' },
+            { name: 'deleteRoom', title: 'Delete Room' },
+          */
       ],
       rooms: [],
       messages: [],
@@ -208,8 +208,19 @@ export default {
           fetchPolicy: 'no-cache',
         })
 
+        const newMsgIds = Message.filter((m) => m.seen === false).map((m) => m.id)
+        if (newMsgIds.length) {
+          this.$apollo.mutate({
+            mutation: markMessagesAsSeen(),
+            variables: {
+              messageIds: newMsgIds,
+            },
+          })
+        }
+
         const msgs = []
         ;[...this.messages, ...Message].forEach((m) => {
+          m.seen = true
           msgs[m.indexId] = m
         })
         this.messages = msgs.filter(Boolean)
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index d017f816c..134b00de0 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -27,3 +27,11 @@ export const createMessageMutation = () => {
     }
   `
 }
+
+export const markMessagesAsSeen = () => {
+  return gql`
+    mutation ($messageIds: [String!]) {
+      MarkMessagesAsSeen(messageIds: $messageIds)
+    }
+  `
+}

From f05a0bc5448bbd55116283d928b82d1381955412 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 10:38:19 +0200
Subject: [PATCH 040/151] frontend paginate rooms

---
 webapp/components/Chat/Chat.vue | 108 +++++++++++++++++---------------
 webapp/graphql/Rooms.js         |   4 +-
 2 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 95bf5da95..437f8bcf1 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -13,13 +13,15 @@
         :messages-loaded="messagesLoaded"
         :rooms="JSON.stringify(rooms)"
         :room-actions="JSON.stringify(roomActions)"
-        :rooms-loaded="true"
+        :rooms-loaded="roomsLoaded"
+        :loading-rooms="loadingRooms"
         show-files="false"
         show-audio="false"
         :styles="JSON.stringify(computedChatStyle)"
         :show-footer="true"
         @send-message="sendMessage($event.detail[0])"
         @fetch-messages="fetchMessages($event.detail[0])"
+        @fetch-more-rooms="fetchRooms"
         :responsive-breakpoint="responsiveBreakpoint"
         :single-room="singleRoom"
         show-reaction-emojis="false"
@@ -143,17 +145,20 @@ export default {
         { name: 'deleteRoom', title: 'Delete Room' },
         */
       ],
-      rooms: [],
-      messages: [],
-      messagesLoaded: true,
+      
       showDemoOptions: true,
       responsiveBreakpoint: 600,
+      rooms: [],
+      roomsLoaded: false,
+      roomPage: 0,
+      roomPageSize: 10, // TODO pagination is a problem with single rooms - cant use
       singleRoom: !!this.singleRoomId || false,
+      selectedRoom: null,
+      loadingRooms: true,
+      messagesLoaded: false,
       messagePage: 0,
       messagePageSize: 20,
-      roomPage: 0,
-      roomPageSize: 999, // TODO pagination is a problem with single rooms - cant use
-      selectedRoom: null,
+      messages: [],
     }
   },
   mounted() {
@@ -165,8 +170,8 @@ export default {
             userId: this.singleRoomId,
           },
         })
-        .then(() => {
-          this.$apollo.queries.Rooms.refetch()
+        .then(({data: { CreateRoom }}) => {
+          this.fetchRooms({room: CreateRoom})
         })
         .catch((error) => {
           this.$toast.error(error)
@@ -174,6 +179,8 @@ export default {
         .finally(() => {
           // this.loading = false
         })
+    } else {
+      this.fetchRooms()
     }
   },
   computed: {
@@ -181,12 +188,52 @@ export default {
       currentUser: 'auth/user',
     }),
     computedChatStyle() {
-      // TODO light/dark theme still needed?
-      // return this.theme === 'light' ? chatStyle.STYLE.light : chatStyle.STYLE.dark
       return chatStyle.STYLE.light
     },
   },
   methods: {
+    async fetchRooms({ room } = {}){
+      console.log(room)
+      this.roomsLoaded = false
+      const offset = this.roomPage * this.roomPageSize
+      try {
+        const {
+          data: { Room },
+        } = await this.$apollo.query({
+          query: roomQuery(),
+          variables: {
+            id: room?.id,
+            first: this.roomPageSize,
+            offset,
+          },
+          fetchPolicy: 'no-cache',
+        })
+
+        console.log(Room)
+        const rooms = []
+        const newRooms = Room.map((r) => {
+          return {
+            ...r,
+            users: r.users.map((u) => {
+              return { ...u, username: u.name, avatar: u.avatar?.url }
+            }),
+          }
+        })
+
+        this.rooms = [...this.rooms, ...newRooms]
+
+        if (Room.length < this.roomPageSize) {
+          this.roomsLoaded = true
+        }
+        this.roomPage += 1
+      } catch (error) {
+        this.rooms = []
+        this.$toast.error(error.message)
+      }
+      // must be set false after initial rooms are loaded and never changed again
+      this.loadingRooms = false
+    },
+
     async fetchMessages({ room, options = {} }) {
       if (this.selectedRoom !== room.id) {
         this.messages = []
@@ -251,45 +298,6 @@ export default {
       return fullname.match(/\b\w/g).join('').substring(0, 3).toUpperCase()
     },
   },
-  apollo: {
-    Rooms: {
-      query() {
-        return roomQuery()
-      },
-      variables() {
-        return {
-          first: this.roomPageSize,
-          offset: this.roomPage * this.roomPageSize,
-        }
-      },
-      update({ 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,
-        )
-      },
-      error(error) {
-        this.rooms = []
-        this.$toast.error(error.message)
-      },
-      fetchPolicy: 'no-cache',
-    },
-  },
 }
 </script>
 <style lang="scss">
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index e28702f77..38fd5e3b1 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -1,8 +1,8 @@
 import gql from 'graphql-tag'
 
 export const roomQuery = () => gql`
-  query Room($first: Int, $offset: Int) {
-    Room(first: $first, offset: $offset) {
+  query Room($first: Int, $offset: Int, $id: ID) {
+    Room(first: $first, offset: $offset, id: $id) {
       id
       roomId
       roomName

From 5f4a973e2a56b8f81e7fb3b1da0eebd481d10c13 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 10:38:35 +0200
Subject: [PATCH 041/151] backend allow room filter by id for single rooms

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

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index 109bf1d55..001c5cdc3 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -13,8 +13,8 @@ export const createRoomMutation = () => {
 
 export const roomQuery = () => {
   return gql`
-    query {
-      Room {
+    query Room($first: Int, $offset: Int, $id: ID) {
+      Room(first: $first, offset: $offset, id: $id) {
         id
         roomId
         roomName
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 2ce6556f6..1d056770b 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -24,5 +24,5 @@ type Mutation {
 }
 
 type Query {
-  Room: [Room]
+  Room(id: ID): [Room]
 }

From 851dd2e3e609eec3711ba76660b814cfb6630ea9 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 10:40:18 +0200
Subject: [PATCH 042/151] lint fixes

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 437f8bcf1..f2e0f7c3d 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -145,7 +145,7 @@ export default {
         { name: 'deleteRoom', title: 'Delete Room' },
         */
       ],
-      
+
       showDemoOptions: true,
       responsiveBreakpoint: 600,
       rooms: [],
@@ -170,8 +170,8 @@ export default {
             userId: this.singleRoomId,
           },
         })
-        .then(({data: { CreateRoom }}) => {
-          this.fetchRooms({room: CreateRoom})
+        .then(({ data: { CreateRoom } }) => {
+          this.fetchRooms({ room: CreateRoom })
         })
         .catch((error) => {
           this.$toast.error(error)
@@ -192,8 +192,7 @@ export default {
     },
   },
   methods: {
-    async fetchRooms({ room } = {}){
-      console.log(room)
+    async fetchRooms({ room } = {}) {
       this.roomsLoaded = false
       const offset = this.roomPage * this.roomPageSize
       try {
@@ -209,8 +208,6 @@ export default {
           fetchPolicy: 'no-cache',
         })
 
-        console.log(Room)
-        const rooms = []
         const newRooms = Room.map((r) => {
           return {
             ...r,

From 0cb45cd8f63c526b2e0977603c25d6efb3a44a9e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 10:42:10 +0200
Subject: [PATCH 043/151] removed refetch message method

---
 webapp/components/Chat/Chat.vue | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index f2e0f7c3d..7d258c2d0 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -268,13 +268,6 @@ export default {
       }
     },
 
-    refetchMessage(roomId) {
-      this.fetchMessages({
-        room: this.rooms.find((r) => r.roomId === roomId),
-        options: { refetch: true },
-      })
-    },
-
     async sendMessage(message) {
       try {
         await this.$apollo.mutate({
@@ -287,7 +280,10 @@ export default {
       } catch (error) {
         this.$toast.error(error.message)
       }
-      this.refetchMessage(message.roomId)
+      this.fetchMessages({
+        room: this.rooms.find((r) => r.roomId === roomId),
+        options: { refetch: true },
+      })
     },
 
     getInitialsName(fullname) {

From ab91413bf30aa7db32e3aee82e15b4be77a5bc9d Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 10:43:08 +0200
Subject: [PATCH 044/151] typo

---
 webapp/components/Chat/Chat.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 7d258c2d0..96bdef518 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -281,7 +281,7 @@ export default {
         this.$toast.error(error.message)
       }
       this.fetchMessages({
-        room: this.rooms.find((r) => r.roomId === roomId),
+        room: this.rooms.find((r) => r.roomId === message.roomId),
         options: { refetch: true },
       })
     },

From 66cd66d71a833eac20d94fcebd35ba88fe6b0e38 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 12:03:53 +0200
Subject: [PATCH 045/151] test room pagination and singleRoom query

---
 backend/src/schema/resolvers/rooms.spec.ts | 182 +++++++++++++++++++++
 1 file changed, 182 insertions(+)

diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index 03c3d4456..a527d1b8b 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -48,6 +48,14 @@ describe('Room', () => {
         id: 'not-chatting-user',
         name: 'Not Chatting User',
       }),
+      Factory.build('user', {
+        id: 'second-chatting-user',
+        name: 'Second Chatting User',
+      }),
+      Factory.build('user', {
+        id: 'third-chatting-user',
+        name: 'Third Chatting User',
+      }),
     ])
   })
 
@@ -260,4 +268,178 @@ describe('Room', () => {
       })
     })
   })
+
+  describe('query several rooms', () => {
+    beforeAll(async () => {
+      authenticatedUser = await chattingUser.toJson()
+      await mutate({
+        mutation: createRoomMutation(),
+        variables: {
+          userId: 'second-chatting-user',
+        },
+      })
+      await mutate({
+        mutation: createRoomMutation(),
+        variables: {
+          userId: 'third-chatting-user',
+        },
+      })
+    })
+
+    it('returns the rooms paginated', async () => {
+      expect(await query({ query: roomQuery(), variables: { first: 2, offset: 0 } })).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),
+                    },
+                  },
+                  {
+                    _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: 'Second Chatting User',
+                users: expect.arrayContaining([
+                  {
+                    _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(await query({ query: roomQuery(), variables: { first: 2, offset: 2 } })).toMatchObject(
+        {
+          errors: undefined,
+          data: {
+            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),
+                    },
+                  },
+                ]),
+              },
+            ],
+          },
+        },
+      )
+    })
+  })
+
+  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(
+          await query({
+            query: roomQuery(),
+            variables: { first: 2, offset: 0, id: result.data.Room[0].id },
+          }),
+        ).toMatchObject({
+          errors: undefined,
+          data: {
+            Room: [
+              {
+                id: result.data.Room[0].id,
+                roomId: result.data.Room[0].id,
+                roomName: 'Other 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),
+                    },
+                  },
+                ]),
+              },
+            ],
+          },
+        })
+      })
+      describe('as not chatter of room', () => {
+        beforeAll(async () => {
+          authenticatedUser = await notChattingUser.toJson()
+        })
+        it('returns no room', async () => {
+          authenticatedUser = await notChattingUser.toJson()
+          expect(
+            await query({
+              query: roomQuery(),
+              variables: { first: 2, offset: 0, id: result.data.Room[0].id },
+            }),
+          ).toMatchObject({
+            errors: undefined,
+            data: {
+              Room: [],
+            },
+          })
+        })
+      })
+    })
+  })
 })

From 2d3483dc1be4e5565f61c5e920a87477739e60a2 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 12:35:26 +0200
Subject: [PATCH 046/151] query additional data for messages

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

diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index d017f816c..1d7917bfc 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -7,11 +7,17 @@ export const messageQuery = () => {
         _id
         id
         indexId
-        senderId
         content
+        senderId
         author {
           id
         }
+        username
+        avatar
+        date
+        saved
+        distributed
+        seen
       }
     }
   `

From 775a3ddb7282fea07cc32aba9af7c33e0aa2518a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 12:35:44 +0200
Subject: [PATCH 047/151] strip datetime down to date in message

---
 webapp/components/Chat/Chat.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 95bf5da95..daab051de 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -210,6 +210,7 @@ export default {
 
         const msgs = []
         ;[...this.messages, ...Message].forEach((m) => {
+          m.date = new Date(m.date).toDateString()
           msgs[m.indexId] = m
         })
         this.messages = msgs.filter(Boolean)

From 661c2f1b71c0ad8308068331248fee998c9f2316 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 12:51:33 +0200
Subject: [PATCH 048/151] implement room order

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

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index 001c5cdc3..2977a3dde 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -14,7 +14,7 @@ export const createRoomMutation = () => {
 export const roomQuery = () => {
   return gql`
     query Room($first: Int, $offset: Int, $id: ID) {
-      Room(first: $first, offset: $offset, id: $id) {
+      Room(first: $first, offset: $offset, id: $id, orderBy: createdAt_desc) {
         id
         roomId
         roomName
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 1d056770b..82acd9e05 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -5,6 +5,11 @@
 #   users_some: _UserFilter
 # }
 
+# TODO change this to last message date
+enum _RoomOrdering {
+  createdAt_desc
+}
+
 type Room {
   id: ID!
   createdAt: String
@@ -24,5 +29,8 @@ type Mutation {
 }
 
 type Query {
-  Room(id: ID): [Room]
+  Room(
+    id: ID
+    orderBy: [_RoomOrdering]
+  ): [Room]
 }

From 1e7f579378ab22cd4ea008b78287322c8917676b Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 15 Jul 2023 12:51:43 +0200
Subject: [PATCH 049/151] adjust tests

---
 backend/src/schema/resolvers/rooms.spec.ts | 28 +++++++++++-----------
 webapp/graphql/Rooms.js                    |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index a527d1b8b..0978fd600 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -295,7 +295,7 @@ describe('Room', () => {
               {
                 id: expect.any(String),
                 roomId: expect.any(String),
-                roomName: 'Other Chatting User',
+                roomName: 'Third Chatting User',
                 users: expect.arrayContaining([
                   {
                     _id: 'chatting-user',
@@ -306,9 +306,9 @@ describe('Room', () => {
                     },
                   },
                   {
-                    _id: 'other-chatting-user',
-                    id: 'other-chatting-user',
-                    name: 'Other Chatting User',
+                    _id: 'third-chatting-user',
+                    id: 'third-chatting-user',
+                    name: 'Third Chatting User',
                     avatar: {
                       url: expect.any(String),
                     },
@@ -350,7 +350,7 @@ describe('Room', () => {
               {
                 id: expect.any(String),
                 roomId: expect.any(String),
-                roomName: 'Third Chatting User',
+                roomName: 'Other Chatting User',
                 users: expect.arrayContaining([
                   {
                     _id: 'chatting-user',
@@ -361,9 +361,9 @@ describe('Room', () => {
                     },
                   },
                   {
-                    _id: 'third-chatting-user',
-                    id: 'third-chatting-user',
-                    name: 'Third Chatting User',
+                    _id: 'other-chatting-user',
+                    id: 'other-chatting-user',
+                    name: 'Other Chatting User',
                     avatar: {
                       url: expect.any(String),
                     },
@@ -395,9 +395,9 @@ describe('Room', () => {
           data: {
             Room: [
               {
-                id: result.data.Room[0].id,
-                roomId: result.data.Room[0].id,
-                roomName: 'Other Chatting User',
+                id: expect.any(String),
+                roomId: expect.any(String),
+                roomName: 'Third Chatting User',
                 users: expect.arrayContaining([
                   {
                     _id: 'chatting-user',
@@ -408,9 +408,9 @@ describe('Room', () => {
                     },
                   },
                   {
-                    _id: 'other-chatting-user',
-                    id: 'other-chatting-user',
-                    name: 'Other Chatting User',
+                    _id: 'third-chatting-user',
+                    id: 'third-chatting-user',
+                    name: 'Third Chatting User',
                     avatar: {
                       url: expect.any(String),
                     },
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index 38fd5e3b1..a746d34f9 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) {
+    Room(first: $first, offset: $offset, id: $id, orderBy: createdAt_desc) {
       id
       roomId
       roomName

From 5dfdcc9bc2e77cde65d9c2f0ef4970ed5b07c952 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Sat, 15 Jul 2023 19:00:46 +0200
Subject: [PATCH 050/151] fix(webapp): show room header images.

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 95bf5da95..6cacd7090 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -188,10 +188,10 @@ export default {
   },
   methods: {
     async fetchMessages({ room, options = {} }) {
-      if (this.selectedRoom !== room.id) {
+      if (this.selectedRoom?.id !== room.id) {
         this.messages = []
         this.messagePage = 0
-        this.selectedRoom = room.id
+        this.selectedRoom = room
       }
       this.messagesLoaded = options.refetch ? this.messagesLoaded : false
       const offset = (options.refetch ? 0 : this.messagePage) * this.messagePageSize

From 5ca1e9e648f5d34b8127234455522a4dac9ac144 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 07:35:20 +0200
Subject: [PATCH 051/151] add docker image building step to e2e test workflow

---
 .github/workflows/test-e2e.yml | 38 ++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 74ebd1c43..87fdb2bf0 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -2,8 +2,46 @@ name: ocelot.social end-to-end test CI
 on: push
 
 jobs:
+  docker_preparation:
+    name: Fullstack test preparation
+    runs-on: ubuntu-latest
+    outputs:
+      pr-number: ${{ steps.pr.outputs.number }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Copy env files
+        run: |
+          cp webapp/.env.template webapp/.env
+          cp backend/.env.template backend/.env
+
+      - name: Build docker images
+        run: |
+          mkdir /tmp/images
+          docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
+          docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/images/neo4j.tar
+          docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
+          docker save "ocelotsocialnetwork/backend:test" > /tmp/images/backend.tar
+          docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
+          docker save "ocelotsocialnetwork/webapp:test" > /tmp/images/webapp.tar
+
+      - name: Get pr number
+        id: pr
+        uses: 8BitJonny/gh-get-current-pr@2.2.0
+      
+      - name: Cache docker images
+        id: cache
+        uses: actions/cache/save@v3.3.1
+        with:
+          path: |
+            /tmp/images/
+          key: e2e-preparation-cache-pr${{ steps.pr.outputs.number }}
+
   fullstack_tests:
     name: Fullstack tests
+    if: success()
+    needs: docker_preparation
     runs-on: ubuntu-latest
     env:
       jobs: 8

From 690021fcb6eb3f575470e15d969267b3a5d7d9ad Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 07:39:57 +0200
Subject: [PATCH 052/151] move cypress requirement installation to preparation
 step

---
 .github/workflows/test-e2e.yml | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 87fdb2bf0..9d4a7d1a5 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -26,6 +26,15 @@ jobs:
           docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
           docker save "ocelotsocialnetwork/webapp:test" > /tmp/images/webapp.tar
 
+      - name: Install cypress requirements
+        run: |
+          wget --no-verbose -O /opt/cucumber-json-formatter "https://github.com/cucumber/json-formatter/releases/download/v19.0.0/cucumber-json-formatter-linux-386"
+          cd backend
+          yarn install
+          yarn build
+          cd ..
+          yarn install
+
       - name: Get pr number
         id: pr
         uses: 8BitJonny/gh-get-current-pr@2.2.0
@@ -35,6 +44,9 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: |
+            /opt/cucumber-json-formatter
+            /home/runner/.cache/Cypress
+            /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
           key: e2e-preparation-cache-pr${{ steps.pr.outputs.number }}
 
@@ -50,29 +62,9 @@ jobs:
         # run copies of the current job in parallel
         job: [1, 2, 3, 4, 5, 6, 7, 8]
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: webapp | copy env file
-        run: cp webapp/.env.template webapp/.env
-
-      - name: backend | copy env file
-        run: cp backend/.env.template backend/.env
-
       - name: boot up test system | docker-compose
         run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend
 
-      - name: Full stack tests | prepare
-        run: |
-          wget --no-verbose -O /opt/cucumber-json-formatter "https://github.com/cucumber/json-formatter/releases/download/v19.0.0/cucumber-json-formatter-linux-386"
-          chmod +x /opt/cucumber-json-formatter
-          sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
-          cd backend
-          yarn install
-          yarn build
-          cd ..
-          yarn install
-
       - name: Full stack tests | run tests
         id: e2e-tests
         run: yarn run cypress:run --spec $(cypress/parallel-features.sh ${{ matrix.job }} ${{ env.jobs }} )

From 9ba873648e04203a518b4cb1efdd47f259ab9662 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 07:42:58 +0200
Subject: [PATCH 053/151] add cache restoring in e2e test step

---
 .github/workflows/test-e2e.yml | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 9d4a7d1a5..426b2450c 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -62,8 +62,27 @@ jobs:
         # run copies of the current job in parallel
         job: [1, 2, 3, 4, 5, 6, 7, 8]
     steps:
-      - name: boot up test system | docker-compose
-        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend
+      - name: Restore cache
+        uses: actions/cache/restore@v3.3.1
+        id: cache
+        with:
+          path: |
+            /opt/cucumber-json-formatter
+            /home/runner/.cache/Cypress
+            /home/runner/work/Ocelot-Social/Ocelot-Social
+            /tmp/images/
+          key: e2e-preparation-cache-pr${{ needs.docker_preparation.outputs.pr-number }}
+          fail-on-cache-miss: true
+
+      - name: Boot up test system | docker-compose
+        run: |
+          chmod +x /opt/cucumber-json-formatter
+          sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
+          docker load < /tmp/images/neo4j.tar
+          docker load < /tmp/images/backend.tar
+          docker load < /tmp/images/webapp.tar
+          docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend
+          sleep 90s
 
       - name: Full stack tests | run tests
         id: e2e-tests

From 545eb04d6cb60a7bccf9423e82890c0b78fb3849 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 07:43:54 +0200
Subject: [PATCH 054/151] adapt step namings

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

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 426b2450c..9235d9f27 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -94,12 +94,12 @@ jobs:
           cd cypress/
           node create-cucumber-html-report.js
   
-      - name: End-to-end tests | if tests failed, get pr number
+      - name: Full stack tests | if tests failed, get pr number
         id: pr
         if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
         uses: 8BitJonny/gh-get-current-pr@2.2.0
 
-      - name: End-to-end tests | if tests failed, upload report
+      - name: Full stack tests | if tests failed, upload report
         id: e2e-report
         if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
         uses: actions/upload-artifact@v3

From fe8d4a4cfa3d477c78f9188682405ea1eefa498a Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 07:46:01 +0200
Subject: [PATCH 055/151] reuse pr number from preparation step in e2e test
 step

---
 .github/workflows/test-e2e.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 9235d9f27..e68f2992f 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -104,6 +104,6 @@ jobs:
         if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
         uses: actions/upload-artifact@v3
         with:
-          name: ocelot-e2e-test-report-pr${{ steps.pr.outputs.number }}
+          name: ocelot-e2e-test-report-pr${{ needs.docker_preparation.outputs.pr-number }}
           path: /home/runner/work/Ocelot-Social/Ocelot-Social/cypress/reports/cucumber_html_report
 

From 6ab1d24c36bbfb6c574f9f873b0f1800dad40471 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 17 Jul 2023 07:47:49 +0200
Subject: [PATCH 056/151] remove pr number step fpm e2e test job

---
 .github/workflows/test-e2e.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index e68f2992f..2e6986722 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -93,11 +93,6 @@ jobs:
         run: |
           cd cypress/
           node create-cucumber-html-report.js
-  
-      - name: Full stack tests | if tests failed, get pr number
-        id: pr
-        if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
-        uses: 8BitJonny/gh-get-current-pr@2.2.0
 
       - name: Full stack tests | if tests failed, upload report
         id: e2e-report
@@ -107,3 +102,16 @@ jobs:
           name: ocelot-e2e-test-report-pr${{ needs.docker_preparation.outputs.pr-number }}
           path: /home/runner/work/Ocelot-Social/Ocelot-Social/cypress/reports/cucumber_html_report
 
+  cleanup:
+    name: Cleanup
+    if: always()
+    needs: [docker_preparation, fullstack_tests]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Delete cache
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh extension install actions/gh-actions-cache
+          KEY="e2e-preparation-cache-pr${{ needs.docker_preparation.outputs.pr-number }}"
+          gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file

From b6fe28e1c4fcbadedc7b8d5f64f17a5714e222f6 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 10:29:32 +0200
Subject: [PATCH 057/151] fix test, test pagination properly

---
 backend/src/schema/resolvers/rooms.spec.ts | 27 ++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index 17277ab13..c4c46f00d 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -399,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: {
@@ -450,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: {

From d75566a8ce3733efd709271d8f775e36eb51dbbe Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 10:30:12 +0200
Subject: [PATCH 058/151] sender user

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

diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index 084a75eb0..cbf5bcd63 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -32,8 +32,8 @@ export default {
       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]-(user:User)
-          WHERE NOT user.id = $currentUserId AND NOT message.seen
+          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 })

From 8e3402a7efb55a57796f3e28ad50f792c1e0b2e5 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 11:33:59 +0200
Subject: [PATCH 059/151] Update backend/src/schema/types/type/Room.gql

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 backend/src/schema/types/type/Room.gql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index a1ff56e34..c9c72e931 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -20,7 +20,7 @@ type Room {
 
   lastMessage: Message @cypher(statement: """
     MATCH (this)<-[:INSIDE]-(message:Message)
-    WITH message ORDER BY message.createdAt DESC LIMIT 1
+    WITH message ORDER BY message.indexId DESC LIMIT 1
     RETURN message
   """)
 

From 9c052ea1cdc0997b842ffede2a86fb1d474ba57c Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 11:38:06 +0200
Subject: [PATCH 060/151] start with chat notifications

---
 backend/src/schema/resolvers/messages.ts      | 18 +++++++++++++++++-
 backend/src/schema/types/type/Message.gql     |  4 ++++
 backend/src/server.ts                         |  1 +
 .../ChatNotificationMenu.vue                  | 19 +++++++++++++++++++
 .../NotificationMenu/NotificationMenu.vue     |  1 +
 webapp/graphql/Messages.js                    | 13 +++++++++++++
 6 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index a9937aac4..b0defe760 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -1,7 +1,19 @@
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import Resolver from './helpers/Resolver'
+import { withFilter } from 'graphql-subscriptions'
+import { pubsub, CHAT_MESSAGE_ADDED } from '../../server'
 
 export default {
+  Subscription: {
+    chatMessageAdded: {
+      subscribe: withFilter(
+        () => pubsub.asyncIterator(CHAT_MESSAGE_ADDED),
+        (payload, variables) => {
+          return payload.chatMessageAdded.senderId !== variables.userId
+        },
+      ),
+    },
+  },
   Query: {
     Message: async (object, params, context, resolveInfo) => {
       const { roomId } = params
@@ -72,7 +84,7 @@ export default {
             distributed: false,
             seen: false
           })-[:INSIDE]->(room)
-          RETURN message { .* }
+          RETURN message { .*, room: properties(room), senderId: currentUser.id }
         `
         const createMessageTxResponse = await transaction.run(createMessageCypher, {
           currentUserId,
@@ -82,6 +94,10 @@ export default {
         const [message] = await createMessageTxResponse.records.map((record) =>
           record.get('message'),
         )
+
+        // send subscriptions
+        await pubsub.publish(CHAT_MESSAGE_ADDED, { chatMessageAdded: message })
+
         return message
       })
       try {
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 b4d63c007..8192e44bc 100644
--- a/backend/src/server.ts
+++ b/backend/src/server.ts
@@ -14,6 +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'
 const { REDIS_DOMAIN, REDIS_PORT, REDIS_PASSWORD } = CONFIG
 let prodPubsub, devPubsub
 const options = {
diff --git a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
index 016410216..34368a787 100644
--- a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
+++ b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
@@ -14,8 +14,10 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
 import { unreadRoomsQuery } from '~/graphql/Rooms'
+import { chatMessageAdded } from '~/graphql/Messages'
 
 export default {
   name: 'ChatNotificationMenu',
@@ -27,6 +29,11 @@ export default {
       count: 0,
     }
   },
+  computed: {
+    ...mapGetters({
+      user: 'auth/user',
+    }),
+  },
   apollo: {
     UnreadRooms: {
       query() {
@@ -35,6 +42,18 @@ export default {
       update({ UnreadRooms }) {
         this.count = UnreadRooms
       },
+      subscribeToMore: {
+        document: chatMessageAdded(),
+        variables() {
+          return {
+            userId: this.user.id,
+          }
+        },
+        updateQuery: (previousResult, { subscriptionData }) => {
+          // TODO emit chat reload
+          return { UnreadRooms: previousResult.UnreadRooms + 1}
+        },
+      },
     },
   },
 }
diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index 72f539a42..9e94e07d7 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -146,6 +146,7 @@ export default {
           const {
             data: { notificationAdded: newNotification },
           } = subscriptionData
+
           return {
             notifications: unionBy(
               [newNotification],
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index d017f816c..408a4aabb 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -27,3 +27,16 @@ export const createMessageMutation = () => {
     }
   `
 }
+
+export const chatMessageAdded = () => {
+  return gql`
+    subscription chatMessageAdded($userId: ID!) {
+      chatMessageAdded(userId: $userId) {
+        id
+        room {
+          id
+        }
+      }
+    }
+  `
+}

From 882435e54c28af8ef1f609a846c2829014e5658e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 11:40:07 +0200
Subject: [PATCH 061/151] lint fix

---
 backend/src/schema/resolvers/rooms.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index c4c46f00d..690572e43 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -374,7 +374,7 @@ describe('Room', () => {
           ).resolves.toMatchObject({
             data: {
               UnreadRooms: 2,
-            }
+            },
           })
         })
       })

From 4afd688fbecc17bb8de63d1a392de0ef2c07e54e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 11:50:59 +0200
Subject: [PATCH 062/151] count unread messages on create room

---
 backend/src/schema/resolvers/rooms.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index f87f89f2e..b0ff6925e 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -29,13 +29,16 @@ export default {
           ON CREATE SET
             room.createdAt = toString(datetime()),
             room.id = apoc.create.uuid()
-          WITH room, user, currentUser,
+          WITH room, user, currentUser
+          OPTIONAL MATCH (room)<-[:INSIDE]-(message:Message)<-[:CREATED]-(sender:User)
+          WHERE NOT sender.id = $currentUserId AND NOT message.seen
+          WITH room, user, currentUser, message,
           user.name AS roomName
           RETURN room {
             .*,
             users: [properties(currentUser), properties(user)],
             roomName: roomName,
-            unreadCount: toString(0)
+            unreadCount: toString(COUNT(DISTINCT message))
           }
         `
         const createRommTxResponse = await transaction.run(createRoomCypher, {

From edaf72b674027f61f685b80ec598e0d0eac8fbc7 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 11:56:58 +0200
Subject: [PATCH 063/151] add room query pagination

---
 backend/src/graphql/rooms.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/rooms.ts b/backend/src/graphql/rooms.ts
index 554c346dc..2c724b1c8 100644
--- a/backend/src/graphql/rooms.ts
+++ b/backend/src/graphql/rooms.ts
@@ -24,8 +24,8 @@ export const createRoomMutation = () => {
 
 export const roomQuery = () => {
   return gql`
-    query {
-      Room {
+    query Room($first: Int, $offset: Int, $id: ID) {
+      Room(first: $first, offset: $offset, id: $id, orderBy: createdAt_desc) {
         id
         roomId
         roomName

From 3e60ab6854957e6085163c7b4eed219077813e3e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 12:41:06 +0200
Subject: [PATCH 064/151] room count subscription

---
 backend/src/schema/resolvers/messages.ts      | 20 +++++++------------
 backend/src/schema/resolvers/rooms.ts         | 13 ++++++++++++
 backend/src/schema/types/type/Message.gql     |  4 ----
 backend/src/schema/types/type/Room.gql        |  4 ++++
 backend/src/server.ts                         |  3 ++-
 .../ChatNotificationMenu.vue                  |  8 +++-----
 webapp/graphql/Messages.js                    | 13 ------------
 webapp/graphql/Rooms.js                       |  8 ++++++++
 8 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index b0defe760..49756d4d1 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -1,19 +1,9 @@
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import Resolver from './helpers/Resolver'
-import { withFilter } from 'graphql-subscriptions'
-import { pubsub, CHAT_MESSAGE_ADDED } from '../../server'
+import RoomResolver from './rooms'
+import { pubsub, ROOM_COUNT_UPDATED } from '../../server'
 
 export default {
-  Subscription: {
-    chatMessageAdded: {
-      subscribe: withFilter(
-        () => pubsub.asyncIterator(CHAT_MESSAGE_ADDED),
-        (payload, variables) => {
-          return payload.chatMessageAdded.senderId !== variables.userId
-        },
-      ),
-    },
-  },
   Query: {
     Message: async (object, params, context, resolveInfo) => {
       const { roomId } = params
@@ -91,12 +81,16 @@ export default {
           roomId,
           content,
         })
+
         const [message] = await createMessageTxResponse.records.map((record) =>
           record.get('message'),
         )
 
+        // TODO change user in context - mark message as seen
+        const roomCountUpdated = await RoomResolver.Query.UnreadRooms(null, null, context, null)
+
         // send subscriptions
-        await pubsub.publish(CHAT_MESSAGE_ADDED, { chatMessageAdded: message })
+        await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated })
 
         return message
       })
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index cbf5bcd63..c5ab92d87 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -1,7 +1,20 @@
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import Resolver from './helpers/Resolver'
+import { pubsub, ROOM_COUNT_UPDATED } from '../../server'
+import { withFilter } from 'graphql-subscriptions'
 
 export default {
+  Subscription: {
+    roomCountUpdated: {
+      subscribe: withFilter(
+        () => pubsub.asyncIterator(ROOM_COUNT_UPDATED),
+        (payload, variables) => {
+          console.log('sub', payload, variables)
+          return true // payload.chatMessageAdded.senderId !== variables.userId
+        },
+      ),
+    },
+  },
   Query: {
     Room: async (object, params, context, resolveInfo) => {
       if (!params.filter) params.filter = {}
diff --git a/backend/src/schema/types/type/Message.gql b/backend/src/schema/types/type/Message.gql
index e15a27d91..671c5523a 100644
--- a/backend/src/schema/types/type/Message.gql
+++ b/backend/src/schema/types/type/Message.gql
@@ -45,7 +45,3 @@ type Query {
     orderBy: [_MessageOrdering]
   ): [Message]
 }
-
-type Subscription {
-  chatMessageAdded(userId: ID!): Message
-}
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 80f61c83a..580edcfac 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -35,3 +35,7 @@ type Query {
   ): [Room]
   UnreadRooms: Int
 }
+
+type Subscription {
+  roomCountUpdated(userId: ID!): Int
+}
diff --git a/backend/src/server.ts b/backend/src/server.ts
index 8192e44bc..feceeb9eb 100644
--- a/backend/src/server.ts
+++ b/backend/src/server.ts
@@ -14,7 +14,8 @@ 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
 const options = {
diff --git a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
index 34368a787..92cb9d25a 100644
--- a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
+++ b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
@@ -16,8 +16,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
-import { unreadRoomsQuery } from '~/graphql/Rooms'
-import { chatMessageAdded } from '~/graphql/Messages'
+import { unreadRoomsQuery, roomCountUpdated } from '~/graphql/Rooms'
 
 export default {
   name: 'ChatNotificationMenu',
@@ -43,15 +42,14 @@ export default {
         this.count = UnreadRooms
       },
       subscribeToMore: {
-        document: chatMessageAdded(),
+        document: roomCountUpdated(),
         variables() {
           return {
             userId: this.user.id,
           }
         },
         updateQuery: (previousResult, { subscriptionData }) => {
-          // TODO emit chat reload
-          return { UnreadRooms: previousResult.UnreadRooms + 1}
+          return { UnreadRooms: subscriptionData.data.roomCountUpdated }
         },
       },
     },
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index 2cb2ee667..1d7917bfc 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -33,16 +33,3 @@ export const createMessageMutation = () => {
     }
   `
 }
-
-export const chatMessageAdded = () => {
-  return gql`
-    subscription chatMessageAdded($userId: ID!) {
-      chatMessageAdded(userId: $userId) {
-        id
-        room {
-          id
-        }
-      }
-    }
-  `
-}
diff --git a/webapp/graphql/Rooms.js b/webapp/graphql/Rooms.js
index e42cae2e8..68baccf3f 100644
--- a/webapp/graphql/Rooms.js
+++ b/webapp/graphql/Rooms.js
@@ -35,3 +35,11 @@ export const unreadRoomsQuery = () => {
     }
   `
 }
+
+export const roomCountUpdated = () => {
+  return gql`
+    subscription roomCountUpdated($userId: ID!) {
+      roomCountUpdated(userId: $userId)
+    }
+  `
+}

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 065/151] 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 e09c91235edea3a3d2a1d09ea34804456021cdd4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 13:11:33 +0200
Subject: [PATCH 066/151] properly propagte user into unreadRoomCount
 subscription

---
 backend/src/schema/resolvers/messages.ts | 10 +++++-----
 backend/src/schema/resolvers/rooms.ts    |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 49756d4d1..ececd65a6 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -63,8 +63,8 @@ export default {
       const writeTxResultPromise = session.writeTransaction(async (transaction) => {
         const createMessageCypher = `
           MATCH (currentUser:User { id: $currentUserId })-[:CHATS_IN]->(room:Room { id: $roomId })
-          OPTIONAL MATCH (m:Message)-[:INSIDE]->(room)
-          WITH MAX(m.indexId) as maxIndex, room, currentUser
+          OPTIONAL MATCH (m:Message)-[:INSIDE]->(room)<-[:CHATS_IN]-(otherUser:User)
+          WITH MAX(m.indexId) as maxIndex, room, currentUser, otherUser
           CREATE (currentUser)-[:CREATED]->(message:Message {
             createdAt: toString(datetime()),
             id: apoc.create.uuid(),
@@ -74,7 +74,7 @@ export default {
             distributed: false,
             seen: false
           })-[:INSIDE]->(room)
-          RETURN message { .*, room: properties(room), senderId: currentUser.id }
+          RETURN message { .*, room: properties(room), senderId: currentUser.id, otherUser: properties(otherUser) }
         `
         const createMessageTxResponse = await transaction.run(createMessageCypher, {
           currentUserId,
@@ -86,11 +86,11 @@ export default {
           record.get('message'),
         )
 
-        // TODO change user in context - mark message as seen
+        // TODO change user in context - mark message as seen - chattingUser is the correct user.
         const roomCountUpdated = await RoomResolver.Query.UnreadRooms(null, null, context, null)
 
         // send subscriptions
-        await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated })
+        await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: message.otherUser })
 
         return message
       })
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index c5ab92d87..00d9d7b26 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -9,8 +9,7 @@ export default {
       subscribe: withFilter(
         () => pubsub.asyncIterator(ROOM_COUNT_UPDATED),
         (payload, variables) => {
-          console.log('sub', payload, variables)
-          return true // payload.chatMessageAdded.senderId !== variables.userId
+          return payload.user.id === variables.userId
         },
       ),
     },

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 067/151] 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 068/151] 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 069/151] 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 070/151] 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 071/151] 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 072/151] 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 073/151] 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 074/151] 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 4a9199229b2c71098bd25bc5d329c855d5a94d16 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 15:05:51 +0200
Subject: [PATCH 075/151] redurce changeset

---
 webapp/components/Chat/Chat.vue | 45 +++++++++++++++++----------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index dc3619ac6..386e4743e 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -84,31 +84,32 @@ export default {
           name: 'dummyItem',
           title: 'Just a dummy item',
         },
-        /* {
-            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',
+          },
+        */
       ],
       messageActions: [
         /*
-            {
-            name: 'addMessageToFavorite',
-            title: 'Add To Favorite',
-            },
-            {
-            name: 'shareMessage',
-            title: 'Share Message',
-            },
-          */
+          {
+          name: 'addMessageToFavorite',
+          title: 'Add To Favorite',
+          },
+          {
+          name: 'shareMessage',
+          title: 'Share Message',
+          },
+        */
       ],
       templatesText: [
         {

From 19e441b44939a132dc5c2bf12fe667a5cfb58b62 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 15:06:37 +0200
Subject: [PATCH 076/151] more changeset reduction

---
 webapp/components/Chat/Chat.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 386e4743e..1b5dd45ea 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -85,30 +85,30 @@ export default {
           title: 'Just a dummy item',
         },
         /*
-          {
+        {
           name: 'inviteUser',
           title: 'Invite User',
-          },
-          {
+        },
+        {
           name: 'removeUser',
           title: 'Remove User',
-          },
-          {
+        },
+        {
           name: 'deleteRoom',
           title: 'Delete Room',
-          },
+        },
         */
       ],
       messageActions: [
         /*
-          {
+        {
           name: 'addMessageToFavorite',
           title: 'Add To Favorite',
-          },
-          {
+        },
+        {
           name: 'shareMessage',
           title: 'Share Message',
-          },
+        },
         */
       ],
       templatesText: [

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 077/151] 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 078/151] 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 b8f0e1ef59b2c6f38bce96d607edb3ae174e38b3 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 15:23:34 +0200
Subject: [PATCH 079/151] "fix" room avatar query

---
 backend/src/schema/types/type/Room.gql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 0ddc65533..76823d364 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -19,7 +19,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.name")
-  avatar: String! @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.avatar.url")
+  avatar: String @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.avatar.url")
 
   lastMessageAt: String
 

From edeb22e70cc36f01661bf6570cf7e75afb8492d8 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 15:58:46 +0200
Subject: [PATCH 080/151] room avatar is working (returns other users avatar
 image if present)

---
 backend/src/schema/types/type/Room.gql | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 76823d364..9950407b7 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -19,7 +19,12 @@ 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.name")
-  avatar: String @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.avatar.url")
+  avatar: String @cypher(statement: """
+    MATCH (this)<-[:CHATS_IN]-(user:User)
+    WHERE NOT user.id = $cypherParams.currentUserId
+    OPTIONAL MATCH (:User)-[:AVATAR_IMAGE]->(image:Image)
+    RETURN image.url
+  """)
 
   lastMessageAt: String
 

From 27600f0e79538d7ab1260c36b9848ebef6bb290e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 15:59:32 +0200
Subject: [PATCH 081/151] fix merge error

---
 backend/src/schema/resolvers/messages.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index e1b988221..8c32a76bd 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -73,7 +73,7 @@ export default {
           RETURN message {
             .*,
             room: properties(room)
-            otherUser: properties(otherUser)
+            otherUser: properties(otherUser),
             senderId: currentUser.id,
             username: currentUser.name,
             avatar: image.url,

From 45db186dfdcdc2939b9d4d36471f667f5344c5f5 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 16:00:08 +0200
Subject: [PATCH 082/151] more merge errors

---
 backend/src/schema/resolvers/messages.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 8c32a76bd..e7651f613 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -72,7 +72,7 @@ export default {
           SET room.lastMessageAt = toString(datetime())
           RETURN message {
             .*,
-            room: properties(room)
+            room: properties(room),
             otherUser: properties(otherUser),
             senderId: currentUser.id,
             username: currentUser.name,

From b1102f6e3e5e10480b39aca57fdb04d572807e80 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 16:07:12 +0200
Subject: [PATCH 083/151] only mark other users messages as seen

---
 webapp/components/Chat/Chat.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 1b5dd45ea..761973ef1 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -267,7 +267,7 @@ export default {
 
         const msgs = []
         ;[...this.messages, ...Message].forEach((m) => {
-          m.seen = true
+          if (m.senderId !== this.currentUser.id) m.seen = true
           m.date = new Date(m.date).toDateString()
           msgs[m.indexId] = m
         })

From 884ee1713cc65d9136e148ec2ad8393e922baefd Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 16:36:39 +0200
Subject: [PATCH 084/151] unread room count query as function

---
 backend/src/schema/resolvers/messages.ts | 14 +++++++-------
 backend/src/schema/resolvers/rooms.ts    | 23 +++++++++++++----------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index e7651f613..785b8d99c 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -1,6 +1,6 @@
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import Resolver from './helpers/Resolver'
-import RoomResolver from './rooms'
+import { getUnreadRoomsCount } from './rooms'
 import { pubsub, ROOM_COUNT_UPDATED } from '../../server'
 
 export default {
@@ -90,16 +90,16 @@ export default {
           record.get('message'),
         )
 
-        // TODO change user in context - mark message as seen - chattingUser is the correct user.
-        const roomCountUpdated = await RoomResolver.Query.UnreadRooms(null, null, context, null)
-
-        // send subscriptions
-        await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: message.otherUser })
-
         return message
       })
       try {
         const message = await writeTxResultPromise
+
+        const roomCountUpdated = await getUnreadRoomsCount(currentUserId, session)
+
+        // send subscriptions
+        await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: message.otherUser })
+
         return message
       } catch (error) {
         throw new Error(error)
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index 6774dad98..029b44b94 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -3,6 +3,18 @@ import Resolver from './helpers/Resolver'
 import { pubsub, ROOM_COUNT_UPDATED } from '../../server'
 import { withFilter } from 'graphql-subscriptions'
 
+export const getUnreadRoomsCount = async (userId, session) => {
+  return session.readTransaction(async (transaction) => {
+    const unreadRoomsCypher = `
+      MATCH (:User { id: $userId })-[:CHATS_IN]->(room:Room)<-[:INSIDE]-(message:Message)<-[:CREATED]-(sender:User)
+      WHERE NOT sender.id = $userId AND NOT message.seen
+      RETURN toString(COUNT(DISTINCT room)) AS count
+    `
+    const unreadRoomsTxResponse = await transaction.run(unreadRoomsCypher, { userId })
+    return unreadRoomsTxResponse.records.map((record) => record.get('count'))[0]
+  })
+}
+
 export default {
   Subscription: {
     roomCountUpdated: {
@@ -27,17 +39,8 @@ export default {
         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
+        const count = await getUnreadRoomsCount(currentUserId, session)
         return count
       } finally {
         session.close()

From ea28f4afebf9453c7bb6671b3c3ba2cba4c8e627 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 17:33:51 +0200
Subject: [PATCH 085/151] recipient user of message to send subscription, test
 subscription

---
 backend/src/schema/resolvers/messages.spec.ts | 17 ++++++++++++++---
 backend/src/schema/resolvers/messages.ts      | 18 ++++++++++--------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index 628034be5..07ae2dd85 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -3,11 +3,13 @@ import Factory, { cleanDatabase } from '../../db/factories'
 import { getNeode, getDriver } from '../../db/neo4j'
 import { createRoomMutation, roomQuery } from '../../graphql/rooms'
 import { createMessageMutation, messageQuery, markMessagesAsSeen } from '../../graphql/messages'
-import createServer from '../../server'
+import createServer, { pubsub } from '../../server'
 
 const driver = getDriver()
 const neode = getNeode()
 
+const pubsubSpy = jest.spyOn(pubsub, 'publish')
+
 let query
 let mutate
 let authenticatedUser
@@ -58,6 +60,10 @@ describe('Message', () => {
   })
 
   describe('create message', () => {
+    beforeEach(() => {
+      jest.clearAllMocks()
+    })
+
     describe('unauthenticated', () => {
       it('throws authorization error', async () => {
         await expect(
@@ -80,7 +86,7 @@ describe('Message', () => {
       })
 
       describe('room does not exist', () => {
-        it('returns null', async () => {
+        it('returns null and does not publish subscription', async () => {
           await expect(
             mutate({
               mutation: createMessageMutation(),
@@ -95,6 +101,7 @@ describe('Message', () => {
               CreateMessage: null,
             },
           })
+          expect(pubsubSpy).not.toBeCalled()
         })
       })
 
@@ -110,7 +117,7 @@ describe('Message', () => {
         })
 
         describe('user chats in room', () => {
-          it('returns the message', async () => {
+          it('returns the message and publishes subscription', async () => {
             await expect(
               mutate({
                 mutation: createMessageMutation(),
@@ -135,6 +142,10 @@ describe('Message', () => {
                 },
               },
             })
+            expect(pubsubSpy).toBeCalledWith('ROOM_COUNT_UPDATED', {
+              roomCountUpdated: '1',
+              user: 'other-chatting-user',
+            })
           })
 
           describe('room is updated as well', () => {
diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 785b8d99c..ea2ed3614 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -58,8 +58,10 @@ export default {
         const createMessageCypher = `
           MATCH (currentUser:User { id: $currentUserId })-[:CHATS_IN]->(room:Room { id: $roomId })
           OPTIONAL MATCH (currentUser)-[:AVATAR_IMAGE]->(image:Image)
-          OPTIONAL MATCH (m:Message)-[:INSIDE]->(room)<-[:CHATS_IN]-(otherUser:User)
-          WITH MAX(m.indexId) as maxIndex, room, currentUser, image, otherUser
+          OPTIONAL MATCH (m:Message)-[:INSIDE]->(room)
+          OPTIONAL MATCH (room)<-[:CHATS_IN]-(recipientUser:User)
+            WHERE NOT recipientUser.id = $currentUserId
+          WITH MAX(m.indexId) as maxIndex, room, currentUser, image, recipientUser 
           CREATE (currentUser)-[:CREATED]->(message:Message {
             createdAt: toString(datetime()),
             id: apoc.create.uuid(),
@@ -72,8 +74,7 @@ export default {
           SET room.lastMessageAt = toString(datetime())
           RETURN message {
             .*,
-            room: properties(room),
-            otherUser: properties(otherUser),
+            recipientId: recipientUser.id,
             senderId: currentUser.id,
             username: currentUser.name,
             avatar: image.url,
@@ -94,11 +95,12 @@ export default {
       })
       try {
         const message = await writeTxResultPromise
+        if (message) {
+          const roomCountUpdated = await getUnreadRoomsCount(message.recipientId, session)
 
-        const roomCountUpdated = await getUnreadRoomsCount(currentUserId, session)
-
-        // send subscriptions
-        await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: message.otherUser })
+          // send subscriptions
+          await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: message.recipientId })
+        }
 
         return message
       } catch (error) {

From 887f2c9362584e68c2fd4c43b7d319f4c506b082 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 17:42:45 +0200
Subject: [PATCH 086/151] more subscription tests for create message

---
 backend/src/schema/resolvers/messages.spec.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index 07ae2dd85..14ed9890a 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -325,6 +325,18 @@ describe('Message', () => {
             })
           })
 
+          it('sends two subscriptions', () => {
+            expect(pubsubSpy).toBeCalledTimes(2)
+            expect(pubsubSpy).nthCalledWith(1, 'ROOM_COUNT_UPDATED', {
+              roomCountUpdated: '1',
+              user: 'chatting-user',
+            })
+            expect(pubsubSpy).nthCalledWith(2, 'ROOM_COUNT_UPDATED', {
+              roomCountUpdated: '1',
+              user: 'other-chatting-user',
+            })
+          })
+
           it('returns the messages', async () => {
             await expect(
               query({

From c24a9a56c2fcfafa3e6829a6f408379704945ed7 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 18:24:31 +0200
Subject: [PATCH 087/151] profile query fix to return the correct user avatar
 not the first found

---
 backend/src/schema/types/type/Room.gql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 9950407b7..744d63e6b 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -22,7 +22,7 @@ type Room {
   avatar: String @cypher(statement: """
     MATCH (this)<-[:CHATS_IN]-(user:User)
     WHERE NOT user.id = $cypherParams.currentUserId
-    OPTIONAL MATCH (:User)-[:AVATAR_IMAGE]->(image:Image)
+    OPTIONAL MATCH (user:User)-[:AVATAR_IMAGE]->(image:Image)
     RETURN image.url
   """)
 

From 3a86c892b4a59feee6978721adb99d71fd624971 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 17 Jul 2023 18:27:00 +0200
Subject: [PATCH 088/151] further query simplification

---
 backend/src/schema/types/type/Room.gql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 744d63e6b..8b9982dda 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -22,7 +22,7 @@ type Room {
   avatar: String @cypher(statement: """
     MATCH (this)<-[:CHATS_IN]-(user:User)
     WHERE NOT user.id = $cypherParams.currentUserId
-    OPTIONAL MATCH (user:User)-[:AVATAR_IMAGE]->(image:Image)
+    OPTIONAL MATCH (user)-[:AVATAR_IMAGE]->(image:Image)
     RETURN image.url
   """)
 

From 846fe26091923ca2a0f0c6d6b73c3c6c689aef69 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 18:34:35 +0200
Subject: [PATCH 089/151] some changes

---
 webapp/components/Chat/Chat.vue               | 58 +++++++++----------
 .../ChatNotificationMenu.vue                  |  1 +
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 88d0b811c..ee5d147c5 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -85,30 +85,30 @@ export default {
           title: 'Just a dummy item',
         },
         /* {
-          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',
+            },
+          */
       ],
       messageActions: [
         /*
-        {
-          name: 'addMessageToFavorite',
-          title: 'Add To Favorite',
-        },
-        {
-          name: 'shareMessage',
-          title: 'Share Message',
-        },
-        */
+            {
+            name: 'addMessageToFavorite',
+            title: 'Add To Favorite',
+            },
+            {
+            name: 'shareMessage',
+            title: 'Share Message',
+            },
+          */
       ],
       templatesText: [
         {
@@ -122,14 +122,14 @@ export default {
       ],
       roomActions: [
         /*
-        {
-          name: 'archiveRoom',
-          title: 'Archive Room',
-        },
-        { name: 'inviteUser', title: 'Invite User' },
-        { name: 'removeUser', title: 'Remove User' },
-        { name: 'deleteRoom', title: 'Delete Room' },
-        */
+            {
+            name: 'archiveRoom',
+            title: 'Archive Room',
+            },
+            { name: 'inviteUser', title: 'Invite User' },
+            { name: 'removeUser', title: 'Remove User' },
+            { name: 'deleteRoom', title: 'Delete Room' },
+          */
       ],
 
       showDemoOptions: true,
diff --git a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
index 92cb9d25a..a6f2e2917 100644
--- a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
+++ b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
@@ -49,6 +49,7 @@ export default {
           }
         },
         updateQuery: (previousResult, { subscriptionData }) => {
+          console.log(subscriptionData)
           return { UnreadRooms: subscriptionData.data.roomCountUpdated }
         },
       },

From fb1d540eb24db3c8341099e7fb7377112e673e0b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 18:35:10 +0200
Subject: [PATCH 090/151] subscription send on message query

---
 backend/src/schema/resolvers/messages.ts | 50 +++++++++++++++---------
 backend/src/schema/resolvers/rooms.ts    |  2 +-
 backend/src/schema/types/type/Room.gql   |  9 ++++-
 3 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index ea2ed3614..44cbacbd4 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -3,6 +3,21 @@ import Resolver from './helpers/Resolver'
 import { getUnreadRoomsCount } from './rooms'
 import { pubsub, ROOM_COUNT_UPDATED } from '../../server'
 
+const setMessagesAsDistributed = async (undistributedMessagesIds, session) => {
+  return session.writeTransaction(async (transaction) => {
+    const setDistributedCypher = `
+      MATCH (m:Message) WHERE m.id IN $undistributedMessagesIds
+      SET m.distributed = true
+      RETURN m { .* }
+    `
+    const setDistributedTxResponse = await transaction.run(setDistributedCypher, {
+      undistributedMessagesIds,
+    })
+    const messages = await setDistributedTxResponse.records.map((record) => record.get('m'))
+    return messages
+  })
+}
+
 export default {
   Query: {
     Message: async (object, params, context, resolveInfo) => {
@@ -18,31 +33,27 @@ export default {
 
       const resolved = await neo4jgraphql(object, params, context, resolveInfo)
 
+      console.log(resolved)
+
       if (resolved) {
         const undistributedMessagesIds = resolved
           .filter((msg) => !msg.distributed && msg.senderId !== context.user.id)
           .map((msg) => msg.id)
-        if (undistributedMessagesIds.length > 0) {
-          const session = context.driver.session()
-          const writeTxResultPromise = session.writeTransaction(async (transaction) => {
-            const setDistributedCypher = `
-              MATCH (m:Message) WHERE m.id IN $undistributedMessagesIds
-              SET m.distributed = true
-              RETURN m { .* }
-            `
-            const setDistributedTxResponse = await transaction.run(setDistributedCypher, {
-              undistributedMessagesIds,
-            })
-            const messages = await setDistributedTxResponse.records.map((record) => record.get('m'))
-            return messages
-          })
-          try {
-            await writeTxResultPromise
-          } finally {
-            session.close()
+        const session = context.driver.session()
+        try {
+          if (undistributedMessagesIds.length > 0) {
+            await setMessagesAsDistributed(undistributedMessagesIds, session)
           }
-          // send subscription to author to updated the messages
+          const roomCountUpdated = await getUnreadRoomsCount(context.user.id, session)
+          console.log(roomCountUpdated)
+
+          // send subscriptions
+          console.log({ roomCountUpdated, user: context.user.id })
+          await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: context.user.id })
+        } finally {
+          session.close()
         }
+        // send subscription to author to updated the messages
       }
       return resolved.reverse()
     },
@@ -99,6 +110,7 @@ export default {
           const roomCountUpdated = await getUnreadRoomsCount(message.recipientId, session)
 
           // send subscriptions
+          console.log({ roomCountUpdated, user: message.recipientId })
           await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: message.recipientId })
         }
 
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index 029b44b94..e2195fe0b 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -21,7 +21,7 @@ export default {
       subscribe: withFilter(
         () => pubsub.asyncIterator(ROOM_COUNT_UPDATED),
         (payload, variables) => {
-          return payload.user.id === variables.userId
+          return true // payload.user.id === variables.userId
         },
       ),
     },
diff --git a/backend/src/schema/types/type/Room.gql b/backend/src/schema/types/type/Room.gql
index 2ffbc2b96..f20c7a812 100644
--- a/backend/src/schema/types/type/Room.gql
+++ b/backend/src/schema/types/type/Room.gql
@@ -19,8 +19,13 @@ 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.name")
-  avatar: String! @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user.avatar.url")
-
+  avatar: String @cypher(statement: """
+    MATCH (this)<-[:CHATS_IN]-(user:User)
+    WHERE NOT user.id = $cypherParams.currentUserId
+    OPTIONAL MATCH (user)-[:AVATAR_IMAGE]->(image:Image)
+    RETURN image.url
+  """)
+  
   lastMessageAt: String
 
   lastMessage: Message @cypher(statement: """

From 2eb94d91e14baf86d151de5d246db60391a6134e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 18:54:17 +0200
Subject: [PATCH 091/151] no subscription on message query

---
 backend/src/schema/resolvers/#messages.ts# | 150 +++++++++++++++++++++
 backend/src/schema/resolvers/messages.ts   |  14 +-
 backend/src/schema/resolvers/rooms.ts      |   2 +-
 3 files changed, 155 insertions(+), 11 deletions(-)
 create mode 100644 backend/src/schema/resolvers/#messages.ts#

diff --git a/backend/src/schema/resolvers/#messages.ts# b/backend/src/schema/resolvers/#messages.ts#
new file mode 100644
index 000000000..43a3fabf1
--- /dev/null
+++ b/backend/src/schema/resolvers/#messages.ts#
@@ -0,0 +1,150 @@
+import { neo4jgraphql } from 'neo4j-graphql-js'
+import Resolver from './helpers/Resolver'
+import { getUnreadRoomsCount } from './rooms'
+import { pubsub, ROOM_COUNT_UPDATED } from '../../server'
+
+const setMessagesAsDistributed = async (undistributedMessagesIds, session) => {
+  return session.writeTransaction(async (transaction) => {
+    const setDistributedCypher = `
+      MATCH (m:Message) WHERE m.id IN $undistributedMessagesIds
+      SET m.distributed = true
+      RETURN m { .* }
+    `
+    const setDistributedTxResponse = await transaction.run(setDistributedCypher, {
+      undistributedMessagesIds,
+    })
+    const messages = await setDistributedTxResponse.records.map((record) => record.get('m'))
+    return messages
+  })
+}
+
+export default {
+  Query: {
+    Message: async (object, params, context, resolveInfo) => {
+      const { roomId } = params
+      delete params.roomId
+      if (!params.filter) params.filter = {}
+      params.filter.room = {
+        id: roomId,
+        users_some: {
+          id: context.user.id,
+        },
+      }
+
+      const resolved = await neo4jgraphql(object, params, context, resolveInfo)
+
+      if (resolved) {
+        const undistributedMessagesIds = resolved
+          .filter((msg) => !msg.distributed && msg.senderId !== context.user.id)
+          .map((msg) => msg.id)
+        const session = context.driver.session()
+        try {
+          if (undistributedMessagesIds.length > 0) {
+            await setMessagesAsDistributed(undistributedMessagesIds, session)
+          }
+        } finally {
+          session.close()
+        }
+        // send subscription to author to updated the messages
+      }
+      return resolved.reverse()
+    },
+  },
+  Mutation: {
+    CreateMessage: async (_parent, params, context, _resolveInfo) => {
+      const { roomId, content } = params
+      const {
+        user: { id: currentUserId },
+      } = context
+      const session = context.driver.session()
+      const writeTxResultPromise = session.writeTransaction(async (transaction) => {
+        const createMessageCypher = `
+          MATCH (currentUser:User { id: $currentUserId })-[:CHATS_IN]->(room:Room { id: $roomId })
+          OPTIONAL MATCH (currentUser)-[:AVATAR_IMAGE]->(image:Image)
+          OPTIONAL MATCH (m:Message)-[:INSIDE]->(room)
+          OPTIONAL MATCH (room)<-[:CHATS_IN]-(recipientUser:User)
+            WHERE NOT recipientUser.id = $currentUserId
+          WITH MAX(m.indexId) as maxIndex, room, currentUser, image, recipientUser 
+          CREATE (currentUser)-[:CREATED]->(message:Message {
+            createdAt: toString(datetime()),
+            id: apoc.create.uuid(),
+            indexId: CASE WHEN maxIndex IS NOT NULL THEN maxIndex + 1 ELSE 0 END,
+            content: $content,
+            saved: true,
+            distributed: false,
+            seen: false
+          })-[:INSIDE]->(room)
+          SET room.lastMessageAt = toString(datetime())
+          RETURN message {
+            .*,
+            recipientId: recipientUser.id,
+            senderId: currentUser.id,
+            username: currentUser.name,
+            avatar: image.url,
+            date: message.createdAt
+          }
+        `
+        const createMessageTxResponse = await transaction.run(createMessageCypher, {
+          currentUserId,
+          roomId,
+          content,
+        })
+
+        const [message] = await createMessageTxResponse.records.map((record) =>
+          record.get('message'),
+        )
+
+        return message
+      })
+      try {
+        const message = await writeTxResultPromise
+        if (message) {
+          const roomCountUpdated = await getUnreadRoomsCount(message.recipientId, session)
+
+          // send subscriptions
+          await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, userId: message.recipientId })
+        }
+
+        return message
+      } catch (error) {
+        throw new Error(error)
+      } finally {
+        session.close()
+      }
+    },
+    MarkMessagesAsSeen: async (_parent, params, context, _resolveInfo) => {
+      const { messageIds } = params
+      const currentUserId = context.user.id
+      const session = context.driver.session()
+      const writeTxResultPromise = session.writeTransaction(async (transaction) => {
+        const setSeenCypher = `
+          MATCH (m:Message)<-[:CREATED]-(user:User)
+          WHERE m.id IN $messageIds AND NOT user.id = $currentUserId
+          SET m.seen = true
+          RETURN m { .* }
+        `
+        const setSeenTxResponse = await transaction.run(setSeenCypher, {
+          messageIds,
+          currentUserId,
+        })
+        const messages = await setSeenTxResponse.records.map((record) => record.get('m'))
+        return messages
+      })
+      try {
+        await writeTxResultPromise
+        // send subscription to author to updated the messages
+        return true
+      } finally {
+        session.close()
+      }
+    },
+  },
+  Message: {
+    ...Resolver('Message', {
+      hasOne: {
+        author: '<-[:CREATED]-(related:User)',
+        room: '-[:INSIDE]->(related:Room)',
+      },
+    }),
+  },
+}
diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 44cbacbd4..a908f3fd8 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -33,8 +33,6 @@ export default {
 
       const resolved = await neo4jgraphql(object, params, context, resolveInfo)
 
-      console.log(resolved)
-
       if (resolved) {
         const undistributedMessagesIds = resolved
           .filter((msg) => !msg.distributed && msg.senderId !== context.user.id)
@@ -44,12 +42,6 @@ export default {
           if (undistributedMessagesIds.length > 0) {
             await setMessagesAsDistributed(undistributedMessagesIds, session)
           }
-          const roomCountUpdated = await getUnreadRoomsCount(context.user.id, session)
-          console.log(roomCountUpdated)
-
-          // send subscriptions
-          console.log({ roomCountUpdated, user: context.user.id })
-          await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: context.user.id })
         } finally {
           session.close()
         }
@@ -110,8 +102,10 @@ export default {
           const roomCountUpdated = await getUnreadRoomsCount(message.recipientId, session)
 
           // send subscriptions
-          console.log({ roomCountUpdated, user: message.recipientId })
-          await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, user: message.recipientId })
+          await pubsub.publish(ROOM_COUNT_UPDATED, {
+            roomCountUpdated,
+            userId: message.recipientId,
+          })
         }
 
         return message
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index e2195fe0b..5e931a446 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -21,7 +21,7 @@ export default {
       subscribe: withFilter(
         () => pubsub.asyncIterator(ROOM_COUNT_UPDATED),
         (payload, variables) => {
-          return true // payload.user.id === variables.userId
+          return payload.userId === variables.userId
         },
       ),
     },

From 0dcda35678cca43af0d296188e5e3c9393a29933 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 18:55:36 +0200
Subject: [PATCH 092/151] no console

---
 webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
index a6f2e2917..92cb9d25a 100644
--- a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
+++ b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
@@ -49,7 +49,6 @@ export default {
           }
         },
         updateQuery: (previousResult, { subscriptionData }) => {
-          console.log(subscriptionData)
           return { UnreadRooms: subscriptionData.data.roomCountUpdated }
         },
       },

From 74af79921754901ffd93508bec725044e31a8010 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 19:28:56 +0200
Subject: [PATCH 093/151] unread room count in store

---
 webapp/components/Chat/Chat.vue               | 43 ++++++++++++-------
 .../ChatNotificationMenu.vue                  | 17 ++++----
 webapp/store/chat.js                          |  7 +++
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 226a0287a..05472c56f 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -60,10 +60,10 @@
 </template>
 
 <script>
-import { roomQuery, createRoom } from '~/graphql/Rooms'
+import { roomQuery, createRoom, unreadRoomsQuery } from '~/graphql/Rooms'
 import { messageQuery, createMessageMutation, markMessagesAsSeen } from '~/graphql/Messages'
 import chatStyle from '~/constants/chat.js'
-import { mapGetters } from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 
 export default {
   name: 'Chat',
@@ -85,19 +85,19 @@ export default {
           title: 'Just a dummy item',
         },
         /*
-        {
-          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',
+            },
+          */
       ],
       messageActions: [
         /*
@@ -195,6 +195,9 @@ export default {
     },
   },
   methods: {
+    ...mapMutations({
+      commitUnreadRoomCount: 'chat/UPDATE_ROOM_COUNT',
+    }),
     async fetchRooms({ room } = {}) {
       this.roomsLoaded = false
       const offset = this.roomPage * this.roomPageSize
@@ -257,12 +260,20 @@ export default {
 
         const newMsgIds = Message.filter((m) => m.seen === false).map((m) => m.id)
         if (newMsgIds.length) {
-          this.$apollo.mutate({
+          await this.$apollo.mutate({
             mutation: markMessagesAsSeen(),
             variables: {
               messageIds: newMsgIds,
             },
           })
+          this.$apollo
+            .query({
+              query: unreadRoomsQuery(),
+              fetchPolicy: 'network-only',
+            })
+            .then(({ data: { UnreadRooms } }) => {
+              this.commitUnreadRoomCount(UnreadRooms)
+            })
         }
 
         const msgs = []
diff --git a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
index 92cb9d25a..ec3f9fbc7 100644
--- a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
+++ b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
@@ -8,13 +8,13 @@
         placement: 'bottom-start',
       }"
     >
-      <counter-icon icon="chat-bubble" :count="count" danger />
+      <counter-icon icon="chat-bubble" :count="unreadRoomCount" danger />
     </base-button>
   </nuxt-link>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
 import { unreadRoomsQuery, roomCountUpdated } from '~/graphql/Rooms'
 
@@ -23,14 +23,15 @@ export default {
   components: {
     CounterIcon,
   },
-  data() {
-    return {
-      count: 0,
-    }
-  },
   computed: {
     ...mapGetters({
       user: 'auth/user',
+      unreadRoomCount: 'chat/unreadRoomCount',
+    }),
+  },
+  methods: {
+    ...mapMutations({
+      commitUnreadRoomCount: 'chat/UPDATE_ROOM_COUNT',
     }),
   },
   apollo: {
@@ -39,7 +40,7 @@ export default {
         return unreadRoomsQuery()
       },
       update({ UnreadRooms }) {
-        this.count = UnreadRooms
+        this.commitUnreadRoomCount(UnreadRooms)
       },
       subscribeToMore: {
         document: roomCountUpdated(),
diff --git a/webapp/store/chat.js b/webapp/store/chat.js
index be4ddaec0..ed6b5256c 100644
--- a/webapp/store/chat.js
+++ b/webapp/store/chat.js
@@ -2,6 +2,7 @@ export const state = () => {
   return {
     showChat: false,
     roomID: null,
+    unreadRoomCount: 0,
   }
 }
 
@@ -10,6 +11,9 @@ export const mutations = {
     state.showChat = ctx.showChat || false
     state.roomID = ctx.roomID || null
   },
+  UPDATE_ROOM_COUNT(state, count) {
+    state.unreadRoomCount = count
+  },
 }
 
 export const getters = {
@@ -19,4 +23,7 @@ export const getters = {
   roomID(state) {
     return state
   },
+  unreadRoomCount(state) {
+    return state.unreadRoomCount
+  },
 }

From 27fe3068e06f8389854ca21e5b43bc9177b9a3d6 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 19:30:44 +0200
Subject: [PATCH 094/151] remove emacs fragment

---
 backend/src/schema/resolvers/#messages.ts# | 150 ---------------------
 1 file changed, 150 deletions(-)
 delete mode 100644 backend/src/schema/resolvers/#messages.ts#

diff --git a/backend/src/schema/resolvers/#messages.ts# b/backend/src/schema/resolvers/#messages.ts#
deleted file mode 100644
index 43a3fabf1..000000000
--- a/backend/src/schema/resolvers/#messages.ts#
+++ /dev/null
@@ -1,150 +0,0 @@
-import { neo4jgraphql } from 'neo4j-graphql-js'
-import Resolver from './helpers/Resolver'
-import { getUnreadRoomsCount } from './rooms'
-import { pubsub, ROOM_COUNT_UPDATED } from '../../server'
-
-const setMessagesAsDistributed = async (undistributedMessagesIds, session) => {
-  return session.writeTransaction(async (transaction) => {
-    const setDistributedCypher = `
-      MATCH (m:Message) WHERE m.id IN $undistributedMessagesIds
-      SET m.distributed = true
-      RETURN m { .* }
-    `
-    const setDistributedTxResponse = await transaction.run(setDistributedCypher, {
-      undistributedMessagesIds,
-    })
-    const messages = await setDistributedTxResponse.records.map((record) => record.get('m'))
-    return messages
-  })
-}
-
-export default {
-  Query: {
-    Message: async (object, params, context, resolveInfo) => {
-      const { roomId } = params
-      delete params.roomId
-      if (!params.filter) params.filter = {}
-      params.filter.room = {
-        id: roomId,
-        users_some: {
-          id: context.user.id,
-        },
-      }
-
-      const resolved = await neo4jgraphql(object, params, context, resolveInfo)
-
-      if (resolved) {
-        const undistributedMessagesIds = resolved
-          .filter((msg) => !msg.distributed && msg.senderId !== context.user.id)
-          .map((msg) => msg.id)
-        const session = context.driver.session()
-        try {
-          if (undistributedMessagesIds.length > 0) {
-            await setMessagesAsDistributed(undistributedMessagesIds, session)
-          }
-        } finally {
-          session.close()
-        }
-        // send subscription to author to updated the messages
-      }
-      return resolved.reverse()
-    },
-  },
-  Mutation: {
-    CreateMessage: async (_parent, params, context, _resolveInfo) => {
-      const { roomId, content } = params
-      const {
-        user: { id: currentUserId },
-      } = context
-      const session = context.driver.session()
-      const writeTxResultPromise = session.writeTransaction(async (transaction) => {
-        const createMessageCypher = `
-          MATCH (currentUser:User { id: $currentUserId })-[:CHATS_IN]->(room:Room { id: $roomId })
-          OPTIONAL MATCH (currentUser)-[:AVATAR_IMAGE]->(image:Image)
-          OPTIONAL MATCH (m:Message)-[:INSIDE]->(room)
-          OPTIONAL MATCH (room)<-[:CHATS_IN]-(recipientUser:User)
-            WHERE NOT recipientUser.id = $currentUserId
-          WITH MAX(m.indexId) as maxIndex, room, currentUser, image, recipientUser 
-          CREATE (currentUser)-[:CREATED]->(message:Message {
-            createdAt: toString(datetime()),
-            id: apoc.create.uuid(),
-            indexId: CASE WHEN maxIndex IS NOT NULL THEN maxIndex + 1 ELSE 0 END,
-            content: $content,
-            saved: true,
-            distributed: false,
-            seen: false
-          })-[:INSIDE]->(room)
-          SET room.lastMessageAt = toString(datetime())
-          RETURN message {
-            .*,
-            recipientId: recipientUser.id,
-            senderId: currentUser.id,
-            username: currentUser.name,
-            avatar: image.url,
-            date: message.createdAt
-          }
-        `
-        const createMessageTxResponse = await transaction.run(createMessageCypher, {
-          currentUserId,
-          roomId,
-          content,
-        })
-
-        const [message] = await createMessageTxResponse.records.map((record) =>
-          record.get('message'),
-        )
-
-        return message
-      })
-      try {
-        const message = await writeTxResultPromise
-        if (message) {
-          const roomCountUpdated = await getUnreadRoomsCount(message.recipientId, session)
-
-          // send subscriptions
-          await pubsub.publish(ROOM_COUNT_UPDATED, { roomCountUpdated, userId: message.recipientId })
-        }
-
-        return message
-      } catch (error) {
-        throw new Error(error)
-      } finally {
-        session.close()
-      }
-    },
-    MarkMessagesAsSeen: async (_parent, params, context, _resolveInfo) => {
-      const { messageIds } = params
-      const currentUserId = context.user.id
-      const session = context.driver.session()
-      const writeTxResultPromise = session.writeTransaction(async (transaction) => {
-        const setSeenCypher = `
-          MATCH (m:Message)<-[:CREATED]-(user:User)
-          WHERE m.id IN $messageIds AND NOT user.id = $currentUserId
-          SET m.seen = true
-          RETURN m { .* }
-        `
-        const setSeenTxResponse = await transaction.run(setSeenCypher, {
-          messageIds,
-          currentUserId,
-        })
-        const messages = await setSeenTxResponse.records.map((record) => record.get('m'))
-        return messages
-      })
-      try {
-        await writeTxResultPromise
-        // send subscription to author to updated the messages
-        return true
-      } finally {
-        session.close()
-      }
-    },
-  },
-  Message: {
-    ...Resolver('Message', {
-      hasOne: {
-        author: '<-[:CREATED]-(related:User)',
-        room: '-[:INSIDE]->(related:Room)',
-      },
-    }),
-  },
-}

From 4b2fae9a2c15c5a6fd38f3f71c878e2f06aa530b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 19:52:41 +0200
Subject: [PATCH 095/151] do not await for mark messages as seen

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 05472c56f..43994ef5d 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -260,19 +260,22 @@ export default {
 
         const newMsgIds = Message.filter((m) => m.seen === false).map((m) => m.id)
         if (newMsgIds.length) {
-          await this.$apollo.mutate({
-            mutation: markMessagesAsSeen(),
-            variables: {
-              messageIds: newMsgIds,
-            },
-          })
           this.$apollo
-            .query({
-              query: unreadRoomsQuery(),
-              fetchPolicy: 'network-only',
+            .mutate({
+              mutation: markMessagesAsSeen(),
+              variables: {
+                messageIds: newMsgIds,
+              },
             })
-            .then(({ data: { UnreadRooms } }) => {
-              this.commitUnreadRoomCount(UnreadRooms)
+            .then(() => {
+              this.$apollo
+                .query({
+                  query: unreadRoomsQuery(),
+                  fetchPolicy: 'network-only',
+                })
+                .then(({ data: { UnreadRooms } }) => {
+                  this.commitUnreadRoomCount(UnreadRooms)
+                })
             })
         }
 

From dfd7107714f26a260c01bb8497affa763b5778a4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 17 Jul 2023 20:37:52 +0200
Subject: [PATCH 096/151] remove unused ubscription test, fix subscription
 params in test

---
 backend/src/schema/resolvers/messages.spec.ts | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/backend/src/schema/resolvers/messages.spec.ts b/backend/src/schema/resolvers/messages.spec.ts
index 14ed9890a..1679b0c34 100644
--- a/backend/src/schema/resolvers/messages.spec.ts
+++ b/backend/src/schema/resolvers/messages.spec.ts
@@ -144,7 +144,7 @@ describe('Message', () => {
             })
             expect(pubsubSpy).toBeCalledWith('ROOM_COUNT_UPDATED', {
               roomCountUpdated: '1',
-              user: 'other-chatting-user',
+              userId: 'other-chatting-user',
             })
           })
 
@@ -325,18 +325,6 @@ describe('Message', () => {
             })
           })
 
-          it('sends two subscriptions', () => {
-            expect(pubsubSpy).toBeCalledTimes(2)
-            expect(pubsubSpy).nthCalledWith(1, 'ROOM_COUNT_UPDATED', {
-              roomCountUpdated: '1',
-              user: 'chatting-user',
-            })
-            expect(pubsubSpy).nthCalledWith(2, 'ROOM_COUNT_UPDATED', {
-              roomCountUpdated: '1',
-              user: 'other-chatting-user',
-            })
-          })
-
           it('returns the messages', async () => {
             await expect(
               query({

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 097/151] 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 63bf3a307101f4a7db9d2acd8df2c116baf72154 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 10:31:56 +0200
Subject: [PATCH 098/151] set workflow not to fail while deleting cache

---
 .github/workflows/test-e2e.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 2e6986722..e37b9fed0 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -113,5 +113,6 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
+          set +e
           KEY="e2e-preparation-cache-pr${{ needs.docker_preparation.outputs.pr-number }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file

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 099/151] 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 100/151] 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 101/151] 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 102/151] 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 103/151] 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 1cc60cd154296f2a34979ff2bafecb20a24b1f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 18 Jul 2023 12:23:09 +0200
Subject: [PATCH 104/151] Change text for chat room search to 'Filter chat
 rooms'

---
 webapp/locales/de.json | 2 +-
 webapp/locales/en.json | 2 +-
 webapp/locales/es.json | 3 +++
 webapp/locales/fr.json | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index e1137deb7..2b7fc3b37 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -88,7 +88,7 @@
     "newMessages": "Neue Nachrichten",
     "roomEmpty": "Keinen Raum selektiert",
     "roomsEmpty": "Keine Räume",
-    "search": "Suche",
+    "search": "Chat-Räume filtern",
     "typeMessage": "Nachricht schreiben",
     "userProfileButton": {
       "label": "Chat",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 2e1e361ab..50009d69c 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -88,7 +88,7 @@
     "newMessages": "New Messages",
     "roomEmpty": "No room selected",
     "roomsEmpty": "No rooms",
-    "search": "Search",
+    "search": "Filter chat rooms",
     "typeMessage": "Type message",
     "userProfileButton": {
       "label": "Chat",
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index a313b3dc4..ae455e5eb 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -75,6 +75,9 @@
       }
     }
   },
+  "chat": {
+    "search": "Filtrar salas de chat"
+  },
   "code-of-conduct": {
     "subheader": "para la red social de {ORGANIZATION_NAME}"
   },
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index 511ca4568..3f97d84c2 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -75,6 +75,9 @@
       }
     }
   },
+  "chat": {
+    "search": "Filtrer les salons de chat"
+  },
   "code-of-conduct": {
     "subheader": "pour le réseau social de {ORGANIZATION_NAME}"
   },

From 507f0c0880b9c79c710c5f933570581192f83caf Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 12:23:24 +0200
Subject: [PATCH 105/151] removed promise all

---
 backend/src/db/seed.ts | 1417 +++++++++++++++++++---------------------
 1 file changed, 669 insertions(+), 748 deletions(-)

diff --git a/backend/src/db/seed.ts b/backend/src/db/seed.ts
index 7286683dd..53cd4cea6 100644
--- a/backend/src/db/seed.ts
+++ b/backend/src/db/seed.ts
@@ -269,17 +269,17 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     await dagobert.relateTo(louie, 'blocked')
 
     // categories
-    await Promise.all(
-      categories.map(({ icon, name }, index) => {
-        return Factory.build('category', {
-          id: `cat${index + 1}`,
-          slug: name,
-          name,
-          icon,
-        })
-      }),
-    )
+    let i = 0
+    for (const category of categories) {
+      await Factory.build('category', {
+        id: `cat${i++}`,
+        slug: category.name,
+        naem: category.name,
+        icon: category.icon,
+      })
+    }
 
+    // tags
     const environment = await Factory.build('tag', {
       id: 'Environment',
     })
@@ -295,361 +295,324 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 
     // groups
     authenticatedUser = await peterLustig.toJson()
-    await Promise.all([
-      mutate({
-        mutation: createGroupMutation(),
-        variables: {
-          id: 'g0',
-          name: 'Investigative Journalism',
-          about: 'Investigative journalists share ideas and insights and can collaborate.',
-          description: `<p class=""><em>English:</em></p><p class="">This group is hidden.</p><h3>What is our group for?</h3><p>This group was created to allow investigative journalists to share and collaborate.</p><h3>How does it work?</h3><p>Here you can internally share posts and comments about them.</p><p><br></p><p><em>Deutsch:</em></p><p class="">Diese Gruppe ist verborgen.</p><h3>Wofür ist unsere Gruppe?</h3><p class="">Diese Gruppe wurde geschaffen, um investigativen Journalisten den Austausch und die Zusammenarbeit zu ermöglichen.</p><h3>Wie funktioniert das?</h3><p class="">Hier könnt ihr euch intern über Beiträge und Kommentare zu ihnen austauschen.</p>`,
-          groupType: 'hidden',
-          actionRadius: 'global',
-          categoryIds: ['cat6', 'cat12', 'cat16'],
-          locationName: 'Hamburg, Germany',
-        },
-      }),
-    ])
-    await Promise.all([
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g0',
-          userId: 'u2',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g0',
-          userId: 'u4',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g0',
-          userId: 'u6',
-        },
-      }),
-    ])
-    await Promise.all([
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g0',
-          userId: 'u2',
-          roleInGroup: 'usual',
-        },
-      }),
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g0',
-          userId: 'u4',
-          roleInGroup: 'admin',
-        },
-      }),
-    ])
+    await mutate({
+      mutation: createGroupMutation(),
+      variables: {
+        id: 'g0',
+        name: 'Investigative Journalism',
+        about: 'Investigative journalists share ideas and insights and can collaborate.',
+        description: `<p class=""><em>English:</em></p><p class="">This group is hidden.</p><h3>What is our group for?</h3><p>This group was created to allow investigative journalists to share and collaborate.</p><h3>How does it work?</h3><p>Here you can internally share posts and comments about them.</p><p><br></p><p><em>Deutsch:</em></p><p class="">Diese Gruppe ist verborgen.</p><h3>Wofür ist unsere Gruppe?</h3><p class="">Diese Gruppe wurde geschaffen, um investigativen Journalisten den Austausch und die Zusammenarbeit zu ermöglichen.</p><h3>Wie funktioniert das?</h3><p class="">Hier könnt ihr euch intern über Beiträge und Kommentare zu ihnen austauschen.</p>`,
+        groupType: 'hidden',
+        actionRadius: 'global',
+        categoryIds: ['cat6', 'cat12', 'cat16'],
+        locationName: 'Hamburg, Germany',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g0',
+        userId: 'u2',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g0',
+        userId: 'u4',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g0',
+        userId: 'u6',
+      },
+    })
+
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g0',
+        userId: 'u2',
+        roleInGroup: 'usual',
+      },
+    })
+
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g0',
+        userId: 'u4',
+        roleInGroup: 'admin',
+      },
+    })
 
     // post into group
-    await Promise.all([
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p0-g0',
-          groupId: 'g0',
-          title: `What happend in Shanghai?`,
-          content: 'A sack of rise dropped in Shanghai. Should we further investigate?',
-          categoryIds: ['cat6'],
-        },
-      }),
-    ])
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p0-g0',
+        groupId: 'g0',
+        title: `What happend in Shanghai?`,
+        content: 'A sack of rise dropped in Shanghai. Should we further investigate?',
+        categoryIds: ['cat6'],
+      },
+    })
+
     authenticatedUser = await bobDerBaumeister.toJson()
-    await Promise.all([
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p1-g0',
-          groupId: 'g0',
-          title: `The man on the moon`,
-          content: 'We have to further investigate about the stories of a man living on the moon.',
-          categoryIds: ['cat12', 'cat16'],
-        },
-      }),
-    ])
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p1-g0',
+        groupId: 'g0',
+        title: `The man on the moon`,
+        content: 'We have to further investigate about the stories of a man living on the moon.',
+        categoryIds: ['cat12', 'cat16'],
+      },
+    })
 
     authenticatedUser = await jennyRostock.toJson()
-    await Promise.all([
-      mutate({
-        mutation: createGroupMutation(),
-        variables: {
-          id: 'g1',
-          name: 'School For Citizens',
-          about: 'Our children shall receive education for life.',
-          description: `<p class=""><em>English</em></p><h3>Our goal</h3><p>Only those who enjoy learning and do not lose their curiosity can obtain a good education for life and continue to learn with joy throughout their lives.</p><h3>Curiosity</h3><p>For this we need a school that takes up the curiosity of the children, the people, and satisfies it through a lot of experience.</p><p><br></p><p><em>Deutsch</em></p><h3>Unser Ziel</h3><p class="">Nur wer Spaß am Lernen hat und seine Neugier nicht verliert, kann gute Bildung für's Leben erlangen und sein ganzes Leben mit Freude weiter lernen.</p><h3>Neugier</h3><p class="">Dazu benötigen wir eine Schule, die die Neugier der Kinder, der Menschen, aufnimmt und durch viel Erfahrung befriedigt.</p>`,
-          groupType: 'closed',
-          actionRadius: 'national',
-          categoryIds: ['cat8', 'cat14'],
-          locationName: 'France',
-        },
-      }),
-    ])
-    await Promise.all([
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g1',
-          userId: 'u1',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g1',
-          userId: 'u2',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g1',
-          userId: 'u5',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g1',
-          userId: 'u6',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g1',
-          userId: 'u7',
-        },
-      }),
-    ])
-    await Promise.all([
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g1',
-          userId: 'u1',
-          roleInGroup: 'usual',
-        },
-      }),
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g1',
-          userId: 'u5',
-          roleInGroup: 'admin',
-        },
-      }),
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g1',
-          userId: 'u6',
-          roleInGroup: 'owner',
-        },
-      }),
-    ])
+    await mutate({
+      mutation: createGroupMutation(),
+      variables: {
+        id: 'g1',
+        name: 'School For Citizens',
+        about: 'Our children shall receive education for life.',
+        description: `<p class=""><em>English</em></p><h3>Our goal</h3><p>Only those who enjoy learning and do not lose their curiosity can obtain a good education for life and continue to learn with joy throughout their lives.</p><h3>Curiosity</h3><p>For this we need a school that takes up the curiosity of the children, the people, and satisfies it through a lot of experience.</p><p><br></p><p><em>Deutsch</em></p><h3>Unser Ziel</h3><p class="">Nur wer Spaß am Lernen hat und seine Neugier nicht verliert, kann gute Bildung für's Leben erlangen und sein ganzes Leben mit Freude weiter lernen.</p><h3>Neugier</h3><p class="">Dazu benötigen wir eine Schule, die die Neugier der Kinder, der Menschen, aufnimmt und durch viel Erfahrung befriedigt.</p>`,
+        groupType: 'closed',
+        actionRadius: 'national',
+        categoryIds: ['cat8', 'cat14'],
+        locationName: 'France',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g1',
+        userId: 'u1',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g1',
+        userId: 'u2',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g1',
+        userId: 'u5',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g1',
+        userId: 'u6',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g1',
+        userId: 'u7',
+      },
+    })
+
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g1',
+        userId: 'u1',
+        roleInGroup: 'usual',
+      },
+    })
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g1',
+        userId: 'u5',
+        roleInGroup: 'admin',
+      },
+    })
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g1',
+        userId: 'u6',
+        roleInGroup: 'owner',
+      },
+    })
     // post into group
-    await Promise.all([
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p0-g1',
-          groupId: 'g1',
-          title: `Can we use ocelot for education?`,
-          content: 'I like the concept of this school. Can we use our software in this?',
-          categoryIds: ['cat8'],
-        },
-      }),
-    ])
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p0-g1',
+        groupId: 'g1',
+        title: `Can we use ocelot for education?`,
+        content: 'I like the concept of this school. Can we use our software in this?',
+        categoryIds: ['cat8'],
+      },
+    })
     authenticatedUser = await peterLustig.toJson()
-    await Promise.all([
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p1-g1',
-          groupId: 'g1',
-          title: `Can we push this idea out of France?`,
-          content: 'This idea is too inportant to have the scope only on France.',
-          categoryIds: ['cat14'],
-        },
-      }),
-    ])
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p1-g1',
+        groupId: 'g1',
+        title: `Can we push this idea out of France?`,
+        content: 'This idea is too inportant to have the scope only on France.',
+        categoryIds: ['cat14'],
+      },
+    })
 
     authenticatedUser = await bobDerBaumeister.toJson()
-    await Promise.all([
-      mutate({
-        mutation: createGroupMutation(),
-        variables: {
-          id: 'g2',
-          name: 'Yoga Practice',
-          about: 'We do yoga around the clock.',
-          description: `<h3>What Is yoga?</h3><p>Yoga is not just about practicing asanas. It's about how we do it.</p><p class="">And practicing asanas doesn't have to be yoga, it can be more athletic than yogic.</p><h3>What makes practicing asanas yogic?</h3><p class="">The important thing is:</p><ul><li><p>Use the exercises (consciously) for your personal development.</p></li></ul>`,
-          groupType: 'public',
-          actionRadius: 'interplanetary',
-          categoryIds: ['cat4', 'cat5', 'cat17'],
-        },
-      }),
-    ])
-    await Promise.all([
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u3',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u4',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u5',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u6',
-        },
-      }),
-      mutate({
-        mutation: joinGroupMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u7',
-        },
-      }),
-    ])
-    await Promise.all([
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u3',
-          roleInGroup: 'usual',
-        },
-      }),
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u4',
-          roleInGroup: 'pending',
-        },
-      }),
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u5',
-          roleInGroup: 'admin',
-        },
-      }),
-      mutate({
-        mutation: changeGroupMemberRoleMutation(),
-        variables: {
-          groupId: 'g2',
-          userId: 'u6',
-          roleInGroup: 'usual',
-        },
-      }),
-    ])
+    await mutate({
+      mutation: createGroupMutation(),
+      variables: {
+        id: 'g2',
+        name: 'Yoga Practice',
+        about: 'We do yoga around the clock.',
+        description: `<h3>What Is yoga?</h3><p>Yoga is not just about practicing asanas. It's about how we do it.</p><p class="">And practicing asanas doesn't have to be yoga, it can be more athletic than yogic.</p><h3>What makes practicing asanas yogic?</h3><p class="">The important thing is:</p><ul><li><p>Use the exercises (consciously) for your personal development.</p></li></ul>`,
+        groupType: 'public',
+        actionRadius: 'interplanetary',
+        categoryIds: ['cat4', 'cat5', 'cat17'],
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u3',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u4',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u5',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u6',
+      },
+    })
+    await mutate({
+      mutation: joinGroupMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u7',
+      },
+    })
+
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u3',
+        roleInGroup: 'usual',
+      },
+    })
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u4',
+        roleInGroup: 'pending',
+      },
+    })
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u5',
+        roleInGroup: 'admin',
+      },
+    })
+    await mutate({
+      mutation: changeGroupMemberRoleMutation(),
+      variables: {
+        groupId: 'g2',
+        userId: 'u6',
+        roleInGroup: 'usual',
+      },
+    })
 
     authenticatedUser = await louie.toJson()
-    await Promise.all([
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p0-g2',
-          groupId: 'g2',
-          title: `I am a Noob`,
-          content: 'I am new to Yoga and did not join this group so far.',
-          categoryIds: ['cat4'],
-        },
-      }),
-    ])
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p0-g2',
+        groupId: 'g2',
+        title: `I am a Noob`,
+        content: 'I am new to Yoga and did not join this group so far.',
+        categoryIds: ['cat4'],
+      },
+    })
 
     // Create Events (by peter lustig)
     authenticatedUser = await peterLustig.toJson()
     const now = new Date()
 
-    await Promise.all([
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'e0',
-          title: 'Illegaler Kindergeburtstag',
-          content: 'Elli hat nächste Woche Geburtstag. Wir feiern das!',
-          categoryIds: ['cat4'],
-          postType: 'Event',
-          eventInput: {
-            eventStart: new Date(
-              now.getFullYear(),
-              now.getMonth(),
-              now.getDate() + 7,
-            ).toISOString(),
-            eventVenue: 'Ellis Kinderzimmer',
-            eventLocationName: 'Deutschland',
-          },
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'e0',
+        title: 'Illegaler Kindergeburtstag',
+        content: 'Elli hat nächste Woche Geburtstag. Wir feiern das!',
+        categoryIds: ['cat4'],
+        postType: 'Event',
+        eventInput: {
+          eventStart: new Date(now.getFullYear(), now.getMonth(), now.getDate() + 7).toISOString(),
+          eventVenue: 'Ellis Kinderzimmer',
+          eventLocationName: 'Deutschland',
         },
-      }),
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'e1',
-          title: 'Wir Schützen den Stuttgarter Schlossgarten',
-          content: 'Kein Baum wird gefällt werden!',
-          categoryIds: ['cat5'],
-          postType: 'Event',
-          eventInput: {
-            eventStart: new Date(
-              now.getFullYear(),
-              now.getMonth(),
-              now.getDate() + 1,
-            ).toISOString(),
-            eventVenue: 'Schlossgarten',
-            eventLocationName: 'Stuttgart',
-          },
+      },
+    })
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'e1',
+        title: 'Wir Schützen den Stuttgarter Schlossgarten',
+        content: 'Kein Baum wird gefällt werden!',
+        categoryIds: ['cat5'],
+        postType: 'Event',
+        eventInput: {
+          eventStart: new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1).toISOString(),
+          eventVenue: 'Schlossgarten',
+          eventLocationName: 'Stuttgart',
         },
-      }),
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'e2',
-          title: 'IT 4 Change Treffen',
-          content: 'Wir sitzen eine Woche zusammen rum und glotzen uns blöde an.',
-          categoryIds: ['cat5'],
-          postType: 'Event',
-          eventInput: {
-            eventStart: new Date(
-              now.getFullYear(),
-              now.getMonth(),
-              now.getDate() + 1,
-            ).toISOString(),
-            eventEnd: new Date(now.getFullYear(), now.getMonth(), now.getDate() + 4).toISOString(),
-            eventVenue: 'Ferienlager',
-            eventLocationName: 'Bahra, Sachsen',
-          },
+      },
+    })
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'e2',
+        title: 'IT 4 Change Treffen',
+        content: 'Wir sitzen eine Woche zusammen rum und glotzen uns blöde an.',
+        categoryIds: ['cat5'],
+        postType: 'Event',
+        eventInput: {
+          eventStart: new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1).toISOString(),
+          eventEnd: new Date(now.getFullYear(), now.getMonth(), now.getDate() + 4).toISOString(),
+          eventVenue: 'Ferienlager',
+          eventLocationName: 'Bahra, Sachsen',
         },
-      }),
-    ])
+      },
+    })
 
     let passedEvent = await neode.find('Post', 'e1')
     await passedEvent.update({ eventStart: new Date(2010, 8, 30, 10).toISOString() })
@@ -836,48 +799,49 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     const hashtagAndMention1 =
       'The new physics of <a class="hashtag" data-hashtag-id="QuantenFlussTheorie" href="/?hashtag=QuantenFlussTheorie">#QuantenFlussTheorie</a> can explain <a class="hashtag" data-hashtag-id="QuantumGravity" href="/?hashtag=QuantumGravity">#QuantumGravity</a>! <a class="mention" data-mention-id="u1" href="/profile/u1">@peter-lustig</a> got that already. ;-)'
 
-    await Promise.all([
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p2',
-          title: `Nature Philosophy Yoga`,
-          content: hashtag1,
-          categoryIds: ['cat2'],
-        },
-      }),
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p7',
-          title: 'This is post #7',
-          content: `${mention1} ${faker.lorem.paragraph()}`,
-          categoryIds: ['cat7'],
-        },
-      }),
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p8',
-          image: faker.image.unsplash.nature(),
-          title: `Quantum Flow Theory explains Quantum Gravity`,
-          content: hashtagAndMention1,
-          categoryIds: ['cat8'],
-        },
-      }),
-      mutate({
-        mutation: createPostMutation(),
-        variables: {
-          id: 'p12',
-          title: 'This is post #12',
-          content: `${mention2} ${faker.lorem.paragraph()}`,
-          categoryIds: ['cat12'],
-        },
-      }),
-    ])
-    const [p2, p7, p8, p12] = await Promise.all(
-      ['p2', 'p7', 'p8', 'p12'].map((id) => neode.find('Post', id)),
-    )
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p2',
+        title: `Nature Philosophy Yoga`,
+        content: hashtag1,
+        categoryIds: ['cat2'],
+      },
+    })
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p7',
+        title: 'This is post #7',
+        content: `${mention1} ${faker.lorem.paragraph()}`,
+        categoryIds: ['cat7'],
+      },
+    })
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p8',
+        image: faker.image.unsplash.nature(),
+        title: `Quantum Flow Theory explains Quantum Gravity`,
+        content: hashtagAndMention1,
+        categoryIds: ['cat8'],
+      },
+    })
+    await mutate({
+      mutation: createPostMutation(),
+      variables: {
+        id: 'p12',
+        title: 'This is post #12',
+        content: `${mention2} ${faker.lorem.paragraph()}`,
+        categoryIds: ['cat12'],
+      },
+    })
+
+    const p2 = await neode.find('Post', 'p2')
+    const p7 = await neode.find('Post', 'p7')
+    const p8 = await neode.find('Post', 'p8')
+    const p12 = await neode.find('Post', 'p12')
+
     authenticatedUser = null
 
     authenticatedUser = await dewey.toJson()
@@ -885,31 +849,30 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       'I heard <a class="mention" data-mention-id="u3" href="/profile/u3">@jenny-rostock</a> has practiced it for 3 years now.'
     const mentionInComment2 =
       'Did <a class="mention" data-mention-id="u1" href="/profile/u1">@peter-lustig</a> tell you?'
-    await Promise.all([
-      mutate({
-        mutation: createCommentMutation,
-        variables: {
-          id: 'c4',
-          postId: 'p2',
-          content: mentionInComment1,
-        },
-      }),
-      mutate({
-        mutation: createCommentMutation,
-        variables: {
-          id: 'c4-1',
-          postId: 'p2',
-          content: mentionInComment2,
-        },
-      }),
-      mutate({
-        mutation: createCommentMutation,
-        variables: {
-          postId: 'p14',
-          content: faker.lorem.paragraph(),
-        },
-      }), // should send a notification
-    ])
+    await mutate({
+      mutation: createCommentMutation,
+      variables: {
+        id: 'c4',
+        postId: 'p2',
+        content: mentionInComment1,
+      },
+    })
+    await mutate({
+      mutation: createCommentMutation,
+      variables: {
+        id: 'c4-1',
+        postId: 'p2',
+        content: mentionInComment2,
+      },
+    })
+    await mutate({
+      mutation: createCommentMutation,
+      variables: {
+        postId: 'p14',
+        content: faker.lorem.paragraph(),
+      },
+    }) // should send a notification
+
     authenticatedUser = null
 
     const comments: any[] = []
@@ -1193,366 +1156,324 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       closed: true,
     })
 
-    const additionalUsers = await Promise.all(
-      [...Array(30).keys()].map(() => Factory.build('user')),
-    )
+    const additionalUsers: any[] = []
+    for (let i = 0; i < 30; i++) {
+      const user = await Factory.build('user')
+      await jennyRostock.relateTo(user, 'following')
+      await user.relateTo(jennyRostock, 'following')
+      additionalUsers.push(user)
+    }
 
-    await Promise.all(
-      additionalUsers.map(async (user) => {
-        await jennyRostock.relateTo(user, 'following')
-        await user.relateTo(jennyRostock, 'following')
-      }),
-    )
+    // Jenny users
+    for (let i = 0; i < 30; i++) {
+      await Factory.build('user', { name: `Jenny${i}` })
+    }
 
-    await Promise.all(
-      [...Array(30).keys()].map((index) => Factory.build('user', { name: `Jenny${index}` })),
-    )
+    // Jenny posts
+    for (let i = 0; i < 30; i++) {
+      await Factory.build(
+        'post',
+        { content: `Jenny ${faker.lorem.sentence()}` },
+        {
+          categoryIds: ['cat1'],
+          author: jennyRostock,
+          image: Factory.build('image', {
+            url: faker.image.unsplash.objects(),
+          }),
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(30).keys()].map(() =>
-        Factory.build(
-          'post',
-          { content: `Jenny ${faker.lorem.sentence()}` },
-          {
-            categoryIds: ['cat1'],
-            author: jennyRostock,
-            image: Factory.build('image', {
-              url: faker.image.unsplash.objects(),
-            }),
-          },
-        ),
-      ),
-    )
+    // comments on p2 jenny
+    for (let i = 0; i < 6; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: jennyRostock,
+          postId: 'p2',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(30).keys()].map(() =>
-        Factory.build(
-          'post',
-          {},
-          {
-            categoryIds: ['cat1'],
-            author: jennyRostock,
-            image: Factory.build('image', {
-              url: faker.image.unsplash.objects(),
-            }),
-          },
-        ),
-      ),
-    )
+    // comments on p15 jenny
+    for (let i = 0; i < 4; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: jennyRostock,
+          postId: 'p15',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(6).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: jennyRostock,
-            postId: 'p2',
-          },
-        ),
-      ),
-    )
+    // comments on p4 jenny
+    for (let i = 0; i < 2; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: jennyRostock,
+          postId: 'p4',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(4).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: jennyRostock,
-            postId: 'p15',
-          },
-        ),
-      ),
-    )
+    // Posts Peter Lustig
+    for (let i = 0; i < 21; i++) {
+      await Factory.build(
+        'post',
+        {},
+        {
+          categoryIds: ['cat1'],
+          author: peterLustig,
+          image: Factory.build('image', {
+            url: faker.image.unsplash.buildings(),
+          }),
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(2).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: jennyRostock,
-            postId: 'p4',
-          },
-        ),
-      ),
-    )
+    // comments p4 peter
+    for (let i = 0; i < 3; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: peterLustig,
+          postId: 'p4',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(21).keys()].map(() =>
-        Factory.build(
-          'post',
-          {},
-          {
-            categoryIds: ['cat1'],
-            author: peterLustig,
-            image: Factory.build('image', {
-              url: faker.image.unsplash.buildings(),
-            }),
-          },
-        ),
-      ),
-    )
+    // comments p14 peter
+    for (let i = 0; i < 3; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: peterLustig,
+          postId: 'p14',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(3).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: peterLustig,
-            postId: 'p4',
-          },
-        ),
-      ),
-    )
+    // comments p0 peter
+    for (let i = 0; i < 3; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: peterLustig,
+          postId: 'p0',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(3).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: peterLustig,
-            postId: 'p14',
-          },
-        ),
-      ),
-    )
+    // Posts dewey
+    for (let i = 0; i < 11; i++) {
+      await Factory.build(
+        'post',
+        {},
+        {
+          categoryIds: ['cat1'],
+          author: dewey,
+          image: Factory.build('image', {
+            url: faker.image.unsplash.food(),
+          }),
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(6).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: peterLustig,
-            postId: 'p0',
-          },
-        ),
-      ),
-    )
+    // Comments p2 dewey
+    for (let i = 0; i < 7; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: dewey,
+          postId: 'p2',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(11).keys()].map(() =>
-        Factory.build(
-          'post',
-          {},
-          {
-            categoryIds: ['cat1'],
-            author: dewey,
-            image: Factory.build('image', {
-              url: faker.image.unsplash.food(),
-            }),
-          },
-        ),
-      ),
-    )
+    // Comments p6 dewey
+    for (let i = 0; i < 5; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: dewey,
+          postId: 'p6',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(7).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: dewey,
-            postId: 'p2',
-          },
-        ),
-      ),
-    )
+    // Comments p9 dewey
+    for (let i = 0; i < 2; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: dewey,
+          postId: 'p9',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(5).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: dewey,
-            postId: 'p6',
-          },
-        ),
-      ),
-    )
+    // Posts louie
+    for (let i = 0; i < 16; i++) {
+      await Factory.build(
+        'post',
+        {},
+        {
+          categoryIds: ['cat1'],
+          author: louie,
+          image: Factory.build('image', {
+            url: faker.image.unsplash.technology(),
+          }),
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(2).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: dewey,
-            postId: 'p9',
-          },
-        ),
-      ),
-    )
+    // Comments p1 louie
+    for (let i = 0; i < 4; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          postId: 'p1',
+          author: louie,
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(16).keys()].map(() =>
-        Factory.build(
-          'post',
-          {},
-          {
-            categoryIds: ['cat1'],
-            author: louie,
-            image: Factory.build('image', {
-              url: faker.image.unsplash.technology(),
-            }),
-          },
-        ),
-      ),
-    )
+    // Comments p10 louie
+    for (let i = 0; i < 8; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: louie,
+          postId: 'p10',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(4).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            postId: 'p1',
-            author: louie,
-          },
-        ),
-      ),
-    )
+    // Comments p13 louie
+    for (let i = 0; i < 5; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: louie,
+          postId: 'p13',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(8).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: louie,
-            postId: 'p10',
-          },
-        ),
-      ),
-    )
+    // Posts Bob der Baumeister
+    for (let i = 0; i < 45; i++) {
+      await Factory.build(
+        'post',
+        {},
+        {
+          categoryIds: ['cat1'],
+          author: bobDerBaumeister,
+          image: Factory.build('image', {
+            url: faker.image.unsplash.people(),
+          }),
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(5).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: louie,
-            postId: 'p13',
-          },
-        ),
-      ),
-    )
+    // Comments p2 bob
+    for (let i = 0; i < 2; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: bobDerBaumeister,
+          postId: 'p2',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(45).keys()].map(() =>
-        Factory.build(
-          'post',
-          {},
-          {
-            categoryIds: ['cat1'],
-            author: bobDerBaumeister,
-            image: Factory.build('image', {
-              url: faker.image.unsplash.people(),
-            }),
-          },
-        ),
-      ),
-    )
+    // Comments p12 bob
+    for (let i = 0; i < 3; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: bobDerBaumeister,
+          postId: 'p12',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(2).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: bobDerBaumeister,
-            postId: 'p2',
-          },
-        ),
-      ),
-    )
+    // Comments p13 bob
+    for (let i = 0; i < 7; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: bobDerBaumeister,
+          postId: 'p13',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(3).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: bobDerBaumeister,
-            postId: 'p12',
-          },
-        ),
-      ),
-    )
+    // Posts huey
+    for (let i = 0; i < 8; i++) {
+      await Factory.build(
+        'post',
+        {},
+        {
+          categoryIds: ['cat1'],
+          author: huey,
+          image: Factory.build('image', {
+            url: faker.image.unsplash.nature(),
+          }),
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(7).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: bobDerBaumeister,
-            postId: 'p13',
-          },
-        ),
-      ),
-    )
+    // Comments p0 huey
+    for (let i = 0; i < 6; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: huey,
+          postId: 'p0',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(8).keys()].map(() =>
-        Factory.build(
-          'post',
-          {},
-          {
-            categoryIds: ['cat1'],
-            author: huey,
-            image: Factory.build('image', {
-              url: faker.image.unsplash.nature(),
-            }),
-          },
-        ),
-      ),
-    )
+    // Comments p13 huey
+    for (let i = 0; i < 8; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: huey,
+          postId: 'p13',
+        },
+      )
+    }
 
-    await Promise.all(
-      [...Array(6).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: huey,
-            postId: 'p0',
-          },
-        ),
-      ),
-    )
-
-    await Promise.all(
-      [...Array(8).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: huey,
-            postId: 'p13',
-          },
-        ),
-      ),
-    )
-
-    await Promise.all(
-      [...Array(8).keys()].map(() =>
-        Factory.build(
-          'comment',
-          {},
-          {
-            author: huey,
-            postId: 'p15',
-          },
-        ),
-      ),
-    )
+    // Comments p15 huey
+    for (let i = 0; i < 8; i++) {
+      await Factory.build(
+        'comment',
+        {},
+        {
+          author: huey,
+          postId: 'p15',
+        },
+      )
+    }
 
     await Factory.build('donations')
 

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 106/151] 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 107/151] 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 108/151] 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(

From 785a0279899f12952abb7f94f78e603647842910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 18 Jul 2023 14:17:40 +0200
Subject: [PATCH 109/151] Close mini chat on visit chat room page

---
 webapp/pages/chat.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index b23a6e8dc..b5f255506 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -6,9 +6,18 @@
 </template>
 
 <script>
+import { mapMutations } from 'vuex'
 import Chat from '../components/Chat/Chat.vue'
 
 export default {
   components: { Chat },
+  mounted() {
+    this.showChat({ showChat: false, roomID: null })
+  },
+  methods: {
+    ...mapMutations({
+      showChat: 'chat/SET_OPEN_CHAT',
+    }),
+  },
 }
 </script>

From cc4cb8af46a6e077283d5d38c1aac2d08ac516a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 18 Jul 2023 14:41:10 +0200
Subject: [PATCH 110/151] Rename tag 'chat-module' to 'chat'

---
 webapp/layouts/default.vue | 8 ++++----
 webapp/pages/chat.vue      | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index bd518b976..27efcdd89 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -14,9 +14,9 @@
       <modal />
     </client-only>
     <div v-if="$store.getters['chat/showChat'].showChat" class="chat-modul">
-      <chat-module
-        v-on:close-single-room="closeSingleRoom"
+      <chat
         :singleRoomId="$store.getters['chat/showChat'].roomID"
+        @close-single-room="closeSingleRoom"
       />
     </div>
   </div>
@@ -27,14 +27,14 @@ import mobile from '~/mixins/mobile'
 import HeaderMenu from '~/components/HeaderMenu/HeaderMenu'
 import Modal from '~/components/Modal'
 import PageFooter from '~/components/PageFooter/PageFooter'
-import ChatModule from '~/components/Chat/Chat.vue'
+import Chat from '~/components/Chat/Chat.vue'
 
 export default {
   components: {
     HeaderMenu,
     Modal,
     PageFooter,
-    ChatModule,
+    Chat,
   },
   mixins: [seo, mobile()],
   methods: {
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index b5f255506..e2a577c5e 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -14,6 +14,11 @@ export default {
   mounted() {
     this.showChat({ showChat: false, roomID: null })
   },
+  data() {
+    return {
+      // former,
+    }
+  },
   methods: {
     ...mapMutations({
       showChat: 'chat/SET_OPEN_CHAT',

From 4a474a6a4a487dc460f6865c67b9557e28e3c0c4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 16:35:18 +0200
Subject: [PATCH 111/151] convert indexId to string (neo4j number problem)

---
 backend/src/schema/resolvers/messages.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index e473c2bb5..078584c9d 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -89,6 +89,7 @@ export default {
           SET room.lastMessageAt = toString(datetime())
           RETURN message {
             .*,
+            indexId: toString(message.indexId),
             recipientId: recipientUser.id,
             senderId: currentUser.id,
             username: currentUser.name,

From c7deefa5636e5e1f95839e86a2910682330024cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 18 Jul 2023 17:33:45 +0200
Subject: [PATCH 112/151] Close small chat if one changes to the chat room page

---
 webapp/components/Chat/Chat.vue | 16 +++++++++++-----
 webapp/layouts/default.vue      | 14 +++++++++-----
 webapp/pages/chat.vue           | 12 ++++++------
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 43994ef5d..42dd1cf98 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -4,7 +4,7 @@
       <vue-advanced-chat
         :theme="theme"
         :current-user-id="currentUser.id"
-        :room-id="null"
+        :room-id="!singleRoom ? roomId : null"
         :template-actions="JSON.stringify(templatesText)"
         :menu-actions="JSON.stringify(menuActions)"
         :text-messages="JSON.stringify(textMessages)"
@@ -70,13 +70,20 @@ export default {
   props: {
     theme: {
       type: String,
+      default: 'light',
     },
-    singleRoomId: {
+    singleRoom: {
+      type: Boolean,
+      default: false,
+    },
+    roomId: {
       type: String,
       default: null,
     },
   },
   data() {
+    // Wolle console.log('this.singleRoom: ', this.singleRoom)
+    // console.log('this.roomId: ', this.roomId)
     return {
       menuActions: [
         // NOTE: if menuActions is empty, the related slot is not shown
@@ -139,8 +146,7 @@ export default {
       roomsLoaded: false,
       roomPage: 0,
       roomPageSize: 10,
-      singleRoom: !!this.singleRoomId || false,
-      selectedRoom: null,
+      selectedRoom: this.roomId,
       loadingRooms: true,
       messagesLoaded: false,
       messagePage: 0,
@@ -154,7 +160,7 @@ export default {
         .mutate({
           mutation: createRoom(),
           variables: {
-            userId: this.singleRoomId,
+            userId: this.roomId,
           },
         })
         .then(({ data: { CreateRoom } }) => {
diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index 27efcdd89..13e5bdb95 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -13,15 +13,14 @@
     <client-only>
       <modal />
     </client-only>
-    <div v-if="$store.getters['chat/showChat'].showChat" class="chat-modul">
-      <chat
-        :singleRoomId="$store.getters['chat/showChat'].roomID"
-        @close-single-room="closeSingleRoom"
-      />
+    <div v-if="getShowChat.showChat" class="chat-modul">
+      <chat singleRoom :roomId="getShowChat.roomID" @close-single-room="closeSingleRoom" />
     </div>
   </div>
 </template>
+
 <script>
+import { mapGetters } from 'vuex'
 import seo from '~/mixins/seo'
 import mobile from '~/mixins/mobile'
 import HeaderMenu from '~/components/HeaderMenu/HeaderMenu'
@@ -37,6 +36,11 @@ export default {
     Chat,
   },
   mixins: [seo, mobile()],
+  computed: {
+    ...mapGetters({
+      getShowChat: 'chat/showChat',
+    }),
+  },
   methods: {
     closeSingleRoom() {
       this.$store.commit('chat/SET_OPEN_CHAT', { showChat: false, roomID: null })
diff --git a/webapp/pages/chat.vue b/webapp/pages/chat.vue
index e2a577c5e..920cbabe9 100644
--- a/webapp/pages/chat.vue
+++ b/webapp/pages/chat.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
     <ds-heading tag="h1">{{ $t('chat.page.headline') }}</ds-heading>
-    <chat />
+    <chat :roomId="getShowChat.showChat ? getShowChat.roomID : null" />
   </div>
 </template>
 
 <script>
-import { mapMutations } from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 import Chat from '../components/Chat/Chat.vue'
 
 export default {
@@ -14,10 +14,10 @@ export default {
   mounted() {
     this.showChat({ showChat: false, roomID: null })
   },
-  data() {
-    return {
-      // former,
-    }
+  computed: {
+    ...mapGetters({
+      getShowChat: 'chat/showChat',
+    }),
   },
   methods: {
     ...mapMutations({

From a9835288e205d39560493d1633b6cbc917cfb940 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 17:39:50 +0200
Subject: [PATCH 113/151] fix github cache in workflow

---
 .github/workflows/test-backend.yml | 19 +++++++------------
 .github/workflows/test-e2e.yml     | 14 ++++----------
 .github/workflows/test-webapp.yml  | 13 ++++---------
 3 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index af53e1fbc..50c24441e 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -10,7 +10,6 @@ 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
 
@@ -22,10 +21,6 @@ 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'
@@ -45,7 +40,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-pr${{ needs.files-changed.outputs.pr-number }}
+          key: backend-neo4j-cache-${{ GITHUB_RUN_NUMBER }}
 
   build_test_backend:
     name: Docker Build Test - Backend
@@ -66,7 +61,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-pr${{ needs.files-changed.outputs.pr-number }}
+          key: backend-cache-${{ GITHUB_RUN_NUMBER }}
 
   lint_backend:
     name: Lint Backend
@@ -95,14 +90,14 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-pr${{ needs.files-changed.outputs.pr-number }}
+          key: backend-neo4j-cache-${{ GITHUB_RUN_NUMBER }}
           fail-on-cache-miss: true
 
       - 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 }}
+          key: backend-cache-${{ GITHUB_RUN_NUMBER }}
           fail-on-cache-miss: true
 
       - name: Load Docker Images
@@ -132,14 +127,14 @@ jobs:
     if: always()
     needs: [files-changed, unit_test_backend]
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
       - name: Delete cache
         env:
           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 }}"
+          KEY="backend-neo4j-cache-${{ GITHUB_RUN_NUMBER }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
-          KEY="backend-cache-pr${{ needs.files-changed.outputs.pr-number }}"
+          KEY="backend-cache-${{ GITHUB_RUN_NUMBER }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index e37b9fed0..49b4877fa 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -5,8 +5,6 @@ jobs:
   docker_preparation:
     name: Fullstack test preparation
     runs-on: ubuntu-latest
-    outputs:
-      pr-number: ${{ steps.pr.outputs.number }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -34,10 +32,6 @@ jobs:
           yarn build
           cd ..
           yarn install
-
-      - name: Get pr number
-        id: pr
-        uses: 8BitJonny/gh-get-current-pr@2.2.0
       
       - name: Cache docker images
         id: cache
@@ -48,7 +42,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-pr${{ steps.pr.outputs.number }}
+          key: e2e-preparation-cache-${{ GITHUB_RUN_NUMBER }}
 
   fullstack_tests:
     name: Fullstack tests
@@ -71,7 +65,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-pr${{ needs.docker_preparation.outputs.pr-number }}
+          key: e2e-preparation-cache-${{ GITHUB_RUN_NUMBER }}
           fail-on-cache-miss: true
 
       - name: Boot up test system | docker-compose
@@ -107,12 +101,12 @@ jobs:
     if: always()
     needs: [docker_preparation, fullstack_tests]
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
       - name: Delete cache
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          set +e
-          KEY="e2e-preparation-cache-pr${{ needs.docker_preparation.outputs.pr-number }}"
+          KEY="e2e-preparation-cache-${{ GITHUB_RUN_NUMBER }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 421ce5187..9bd588420 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -9,7 +9,6 @@ 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
@@ -22,10 +21,6 @@ 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'
@@ -58,7 +53,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-pr${{ needs.files-changed.outputs.pr-number }}
+          key: webapp-cache-${{ GITHUB_RUN_NUMBER }}
 
   lint_webapp:
     name: Lint Webapp
@@ -87,7 +82,7 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-pr${{ needs.files-changed.outputs.pr-number }}
+          key: webapp-cache-${{ GITHUB_RUN_NUMBER }}
 
       - name: Load Docker Image
         run: docker load < /tmp/webapp.tar
@@ -108,13 +103,13 @@ jobs:
     if: always()
     needs: [files-changed, unit_test_webapp]
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
       - name: Delete cache
         env:
           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 }}"
+          KEY="webapp-cache-${{ GITHUB_RUN_NUMBER }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
 

From 45c70f7910ba6596d42cda4903e7805f82c701fa Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 17:55:22 +0200
Subject: [PATCH 114/151] corrected var reference

---
 .github/workflows/test-backend.yml | 12 ++++++------
 .github/workflows/test-e2e.yml     |  6 +++---
 .github/workflows/test-webapp.yml  |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 50c24441e..366196978 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-${{ GITHUB_RUN_NUMBER }}
+          key: backend-neo4j-cache-${{ env.GITHUB_RUN_NUMBER }}
 
   build_test_backend:
     name: Docker Build Test - Backend
@@ -61,7 +61,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-${{ GITHUB_RUN_NUMBER }}
+          key: backend-cache-${{ env.GITHUB_RUN_NUMBER }}
 
   lint_backend:
     name: Lint Backend
@@ -90,14 +90,14 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-${{ GITHUB_RUN_NUMBER }}
+          key: backend-neo4j-cache-${{ env.GITHUB_RUN_NUMBER }}
           fail-on-cache-miss: true
 
       - name: Restore Backend cache
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-${{ GITHUB_RUN_NUMBER }}
+          key: backend-cache-${{ env.GITHUB_RUN_NUMBER }}
           fail-on-cache-miss: true
 
       - name: Load Docker Images
@@ -134,7 +134,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="backend-neo4j-cache-${{ GITHUB_RUN_NUMBER }}"
+          KEY="backend-neo4j-cache-${{ env.GITHUB_RUN_NUMBER }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
-          KEY="backend-cache-${{ GITHUB_RUN_NUMBER }}"
+          KEY="backend-cache-${{ env.GITHUB_RUN_NUMBER }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 49b4877fa..09c6f3136 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -42,7 +42,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-${{ GITHUB_RUN_NUMBER }}
+          key: e2e-preparation-cache-${{ env.GITHUB_RUN_NUMBER }}
 
   fullstack_tests:
     name: Fullstack tests
@@ -65,7 +65,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-${{ GITHUB_RUN_NUMBER }}
+          key: e2e-preparation-cache-${{ env.GITHUB_RUN_NUMBER }}
           fail-on-cache-miss: true
 
       - name: Boot up test system | docker-compose
@@ -108,5 +108,5 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="e2e-preparation-cache-${{ GITHUB_RUN_NUMBER }}"
+          KEY="e2e-preparation-cache-${{ env.GITHUB_RUN_NUMBER }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 9bd588420..d468d0859 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -53,7 +53,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-${{ GITHUB_RUN_NUMBER }}
+          key: webapp-cache-${{ env.GITHUB_RUN_NUMBER }}
 
   lint_webapp:
     name: Lint Webapp
@@ -82,7 +82,7 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-${{ GITHUB_RUN_NUMBER }}
+          key: webapp-cache-${{ env.GITHUB_RUN_NUMBER }}
 
       - name: Load Docker Image
         run: docker load < /tmp/webapp.tar
@@ -110,6 +110,6 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="webapp-cache-${{ GITHUB_RUN_NUMBER }}"
+          KEY="webapp-cache-${{ env.GITHUB_RUN_NUMBER }}"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
 

From a3b3e02ebc9cb035996f72481e757dd1974de572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 18 Jul 2023 18:20:04 +0200
Subject: [PATCH 115/151] Use 'mapMutations' in default layout

---
 webapp/layouts/default.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index 13e5bdb95..a75535a84 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 import seo from '~/mixins/seo'
 import mobile from '~/mixins/mobile'
 import HeaderMenu from '~/components/HeaderMenu/HeaderMenu'
@@ -42,8 +42,11 @@ export default {
     }),
   },
   methods: {
+    ...mapMutations({
+      showChat: 'chat/SET_OPEN_CHAT',
+    }),
     closeSingleRoom() {
-      this.$store.commit('chat/SET_OPEN_CHAT', { showChat: false, roomID: null })
+      this.showChat({ showChat: false, roomID: null })
     },
   },
   beforeCreate() {

From 9157e14dedc039a50508b30f35e597cce4db12d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 18 Jul 2023 18:21:05 +0200
Subject: [PATCH 116/151] Change small chat partner on click the chat button on
 different user profile

---
 webapp/pages/profile/_id/_slug.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index ce97cd53a..cef3a5d45 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -85,7 +85,7 @@
                 content: $t('chat.userProfileButton.tooltip', { name: userName }),
                 placement: 'bottom-start',
               }"
-              @click="showChat({ showChat: true, roomID: user.id })"
+              @click="showOrChangeChat(user.id)"
             >
               {{ $t('chat.userProfileButton.label') }}
             </base-button>
@@ -182,7 +182,7 @@
 
 <script>
 import uniqBy from 'lodash/uniqBy'
-import { mapMutations } from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 import postListActions from '~/mixins/postListActions'
 import PostTeaser from '~/components/PostTeaser/PostTeaser.vue'
 import HcFollowButton from '~/components/Button/FollowButton'
@@ -254,6 +254,9 @@ export default {
     }
   },
   computed: {
+    ...mapGetters({
+      getShowChat: 'chat/showChat',
+    }),
     myProfile() {
       return this.$route.params.id === this.$store.getters['auth/user'].id
     },
@@ -403,6 +406,12 @@ export default {
       if (type === 'following') this.followingCount = count
       if (type === 'followedBy') this.followedByCount = count
     },
+    async showOrChangeChat(roomID) {
+      if (this.getShowChat.showChat) {
+        await this.showChat({ showChat: false, roomID: null })
+      }
+      await this.showChat({ showChat: true, roomID })
+    },
   },
   apollo: {
     profilePagePosts: {

From b85d5345a0230c4848ef833e8c5461b45b92c0b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 18 Jul 2023 18:30:03 +0200
Subject: [PATCH 117/151] Clean up

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 42dd1cf98..5723d3140 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -82,8 +82,6 @@ export default {
     },
   },
   data() {
-    // Wolle console.log('this.singleRoom: ', this.singleRoom)
-    // console.log('this.roomId: ', this.roomId)
     return {
       menuActions: [
         // NOTE: if menuActions is empty, the related slot is not shown

From 6ccd4dde543759cb2d99bddb20fdf60f4f827f04 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 18:34:13 +0200
Subject: [PATCH 118/151] reference GITHUB_RUN_NUMBER differently

---
 .github/workflows/test-backend.yml | 12 ++++++------
 .github/workflows/test-e2e.yml     |  6 +++---
 .github/workflows/test-webapp.yml  |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 366196978..e9a05b998 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-${{ env.GITHUB_RUN_NUMBER }}
+          key: backend-neo4j-cache-$GITHUB_RUN_NUMBER
 
   build_test_backend:
     name: Docker Build Test - Backend
@@ -61,7 +61,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-${{ env.GITHUB_RUN_NUMBER }}
+          key: backend-cache-$GITHUB_RUN_NUMBER
 
   lint_backend:
     name: Lint Backend
@@ -90,14 +90,14 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-${{ env.GITHUB_RUN_NUMBER }}
+          key: backend-neo4j-cache-$GITHUB_RUN_NUMBER
           fail-on-cache-miss: true
 
       - name: Restore Backend cache
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-${{ env.GITHUB_RUN_NUMBER }}
+          key: backend-cache-$GITHUB_RUN_NUMBER
           fail-on-cache-miss: true
 
       - name: Load Docker Images
@@ -134,7 +134,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="backend-neo4j-cache-${{ env.GITHUB_RUN_NUMBER }}"
+          KEY="backend-neo4j-cache-$GITHUB_RUN_NUMBER"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
-          KEY="backend-cache-${{ env.GITHUB_RUN_NUMBER }}"
+          KEY="backend-cache-$GITHUB_RUN_NUMBER"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 09c6f3136..6bad6fb4f 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -42,7 +42,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-${{ env.GITHUB_RUN_NUMBER }}
+          key: e2e-preparation-cache-$GITHUB_RUN_NUMBER
 
   fullstack_tests:
     name: Fullstack tests
@@ -65,7 +65,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-${{ env.GITHUB_RUN_NUMBER }}
+          key: e2e-preparation-cache-$GITHUB_RUN_NUMBER
           fail-on-cache-miss: true
 
       - name: Boot up test system | docker-compose
@@ -108,5 +108,5 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="e2e-preparation-cache-${{ env.GITHUB_RUN_NUMBER }}"
+          KEY="e2e-preparation-cache-$GITHUB_RUN_NUMBER"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index d468d0859..f89437317 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -53,7 +53,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-${{ env.GITHUB_RUN_NUMBER }}
+          key: webapp-cache-$GITHUB_RUN_NUMBER
 
   lint_webapp:
     name: Lint Webapp
@@ -82,7 +82,7 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-${{ env.GITHUB_RUN_NUMBER }}
+          key: webapp-cache-$GITHUB_RUN_NUMBER
 
       - name: Load Docker Image
         run: docker load < /tmp/webapp.tar
@@ -110,6 +110,6 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="webapp-cache-${{ env.GITHUB_RUN_NUMBER }}"
+          KEY="webapp-cache-$GITHUB_RUN_NUMBER"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
 

From bf7d4e13c81ab408a4279847fb0b24a5d79ea85e Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 18:33:25 +0200
Subject: [PATCH 119/151] run cache deletion job only, if needed jobs were
 successful

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

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index e9a05b998..b963a9e45 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -124,7 +124,7 @@ jobs:
 
   cleanup:
     name: Cleanup
-    if: always()
+    if: success()
     needs: [files-changed, unit_test_backend]
     runs-on: ubuntu-latest
     continue-on-error: true
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 6bad6fb4f..c4ddc620f 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -98,7 +98,7 @@ jobs:
 
   cleanup:
     name: Cleanup
-    if: always()
+    if: success()
     needs: [docker_preparation, fullstack_tests]
     runs-on: ubuntu-latest
     continue-on-error: true
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index f89437317..8e59bdf10 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -100,7 +100,7 @@ jobs:
 
   cleanup:
     name: Cleanup
-    if: always()
+    if: success()
     needs: [files-changed, unit_test_webapp]
     runs-on: ubuntu-latest
     continue-on-error: true

From 4d611638687426518235290778bf67cc7791d0e5 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 18:41:16 +0200
Subject: [PATCH 120/151] run cache deletion job only, if file change condition
 is true

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

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index b963a9e45..0e8b7f3e6 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -124,7 +124,7 @@ jobs:
 
   cleanup:
     name: Cleanup
-    if: success()
+    if: (needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true') || success()
     needs: [files-changed, unit_test_backend]
     runs-on: ubuntu-latest
     continue-on-error: true
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 8e59bdf10..32cd563ef 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -100,7 +100,7 @@ jobs:
 
   cleanup:
     name: Cleanup
-    if: success()
+    if: (needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true') || success()
     needs: [files-changed, unit_test_webapp]
     runs-on: ubuntu-latest
     continue-on-error: true

From b1feca35d6e34b642d344dbad1162930f00105d9 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Jul 2023 18:53:50 +0200
Subject: [PATCH 121/151] another try fixing run id

---
 .github/workflows/test-backend.yml | 12 ++++++------
 .github/workflows/test-e2e.yml     |  6 +++---
 .github/workflows/test-webapp.yml  |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 0e8b7f3e6..9fd6adb49 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-$GITHUB_RUN_NUMBER
+          key: backend-neo4j-cache-${{github.run_id}}
 
   build_test_backend:
     name: Docker Build Test - Backend
@@ -61,7 +61,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-$GITHUB_RUN_NUMBER
+          key: backend-cache-${{github.run_id}}
 
   lint_backend:
     name: Lint Backend
@@ -90,14 +90,14 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-$GITHUB_RUN_NUMBER
+          key: backend-neo4j-cache-${{github.run_id}}
           fail-on-cache-miss: true
 
       - name: Restore Backend cache
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-$GITHUB_RUN_NUMBER
+          key: backend-cache-${{github.run_id}}
           fail-on-cache-miss: true
 
       - name: Load Docker Images
@@ -134,7 +134,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="backend-neo4j-cache-$GITHUB_RUN_NUMBER"
+          KEY="backend-neo4j-cache-$(($GITHUB_RUN_NUMBER))"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
-          KEY="backend-cache-$GITHUB_RUN_NUMBER"
+          KEY="backend-cache-$(($GITHUB_RUN_NUMBER))"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index c4ddc620f..4d25ef5fe 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -42,7 +42,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-$GITHUB_RUN_NUMBER
+          key: e2e-preparation-cache-${{github.run_id}}
 
   fullstack_tests:
     name: Fullstack tests
@@ -65,7 +65,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-$GITHUB_RUN_NUMBER
+          key: e2e-preparation-cache-${{github.run_id}}
           fail-on-cache-miss: true
 
       - name: Boot up test system | docker-compose
@@ -108,5 +108,5 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="e2e-preparation-cache-$GITHUB_RUN_NUMBER"
+          KEY="e2e-preparation-cache-$(($GITHUB_RUN_NUMBER))"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 32cd563ef..5c6cce0f6 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -53,7 +53,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-$GITHUB_RUN_NUMBER
+          key: "webapp-cache-${{ github.run_id }}"
 
   lint_webapp:
     name: Lint Webapp
@@ -82,7 +82,7 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: webapp-cache-$GITHUB_RUN_NUMBER
+          key: "webapp-cache-${{ github.run_id }}"
 
       - name: Load Docker Image
         run: docker load < /tmp/webapp.tar
@@ -110,6 +110,6 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="webapp-cache-$GITHUB_RUN_NUMBER"
+          KEY="webapp-cache-$(($GITHUB_RUN_NUMBER))"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
 

From d468af8104a8fac439de8f14bdffb34e36b0c23a Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 19:18:38 +0200
Subject: [PATCH 122/151] fix cache naming

---
 .github/workflows/test-backend.yml | 12 ++++++------
 .github/workflows/test-e2e.yml     |  6 +++---
 .github/workflows/test-webapp.yml  |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 9fd6adb49..fa43c9b81 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-${{github.run_id}}
+          key: ${{ github.run_id }}-backend-neo4j-cache
 
   build_test_backend:
     name: Docker Build Test - Backend
@@ -61,7 +61,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-${{github.run_id}}
+          key: ${{ github.run_id }}-backend-cache
 
   lint_backend:
     name: Lint Backend
@@ -90,14 +90,14 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/neo4j.tar
-          key: backend-neo4j-cache-${{github.run_id}}
+          key: ${{ github.run_id }}-backend-neo4j-cache
           fail-on-cache-miss: true
 
       - name: Restore Backend cache
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: backend-cache-${{github.run_id}}
+          key: ${{ github.run_id }}backend-cache
           fail-on-cache-miss: true
 
       - name: Load Docker Images
@@ -134,7 +134,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="backend-neo4j-cache-$(($GITHUB_RUN_NUMBER))"
+          KEY="${{ github.run_id }}-backend-neo4j-cache"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
-          KEY="backend-cache-$(($GITHUB_RUN_NUMBER))"
+          KEY="${{ github.run_id }}-backend-cache"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 4d25ef5fe..921fb4fc8 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -42,7 +42,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-${{github.run_id}}
+          key: ${{ github.run_id }}-e2e-preparation-cache
 
   fullstack_tests:
     name: Fullstack tests
@@ -65,7 +65,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: e2e-preparation-cache-${{github.run_id}}
+          key: ${{ github.run_id }}e2e-preparation-cache
           fail-on-cache-miss: true
 
       - name: Boot up test system | docker-compose
@@ -108,5 +108,5 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="e2e-preparation-cache-$(($GITHUB_RUN_NUMBER))"
+          KEY="${{ github.run_id }}-e2e-preparation-cache"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 5c6cce0f6..0f578dc46 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -53,7 +53,7 @@ jobs:
         uses: actions/cache/save@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: "webapp-cache-${{ github.run_id }}"
+          key: ${{ github.run_id }}-webapp-cache
 
   lint_webapp:
     name: Lint Webapp
@@ -82,7 +82,7 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/webapp.tar
-          key: "webapp-cache-${{ github.run_id }}"
+          key: ${{ github.run_id }}-webapp-cache
 
       - name: Load Docker Image
         run: docker load < /tmp/webapp.tar
@@ -110,6 +110,6 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh extension install actions/gh-actions-cache
-          KEY="webapp-cache-$(($GITHUB_RUN_NUMBER))"
+          KEY="${{ github.run_id }}-webapp-cache"
           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
 

From b2632e3a8881b86fd1f629c7130a85eb72d5d77c Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 19:34:36 +0200
Subject: [PATCH 123/151] for testing use only backend test workflow triggered
 by pushes on this branch

---
 .github/workflows/test-backend.yml |   5 +-
 .github/workflows/test-e2e.yml     | 202 ++++++++++++++---------------
 .github/workflows/test-webapp.yml  | 192 +++++++++++++--------------
 3 files changed, 201 insertions(+), 198 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index fa43c9b81..2d2c9bb6b 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -1,7 +1,10 @@
 name: ocelot.social backend test CI
 
 
-on: [push]
+on:
+  push:
+    branches:
+      - fix-runner
 
 jobs:
   files-changed:
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 921fb4fc8..9eafcddaa 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -1,112 +1,112 @@
-name: ocelot.social end-to-end test CI
-on: push
+# name: ocelot.social end-to-end test CI
+# on: push
 
-jobs:
-  docker_preparation:
-    name: Fullstack test preparation
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+# jobs:
+#   docker_preparation:
+#     name: Fullstack test preparation
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v3
 
-      - name: Copy env files
-        run: |
-          cp webapp/.env.template webapp/.env
-          cp backend/.env.template backend/.env
+#       - name: Copy env files
+#         run: |
+#           cp webapp/.env.template webapp/.env
+#           cp backend/.env.template backend/.env
 
-      - name: Build docker images
-        run: |
-          mkdir /tmp/images
-          docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
-          docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/images/neo4j.tar
-          docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
-          docker save "ocelotsocialnetwork/backend:test" > /tmp/images/backend.tar
-          docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
-          docker save "ocelotsocialnetwork/webapp:test" > /tmp/images/webapp.tar
+#       - name: Build docker images
+#         run: |
+#           mkdir /tmp/images
+#           docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
+#           docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/images/neo4j.tar
+#           docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
+#           docker save "ocelotsocialnetwork/backend:test" > /tmp/images/backend.tar
+#           docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
+#           docker save "ocelotsocialnetwork/webapp:test" > /tmp/images/webapp.tar
 
-      - name: Install cypress requirements
-        run: |
-          wget --no-verbose -O /opt/cucumber-json-formatter "https://github.com/cucumber/json-formatter/releases/download/v19.0.0/cucumber-json-formatter-linux-386"
-          cd backend
-          yarn install
-          yarn build
-          cd ..
-          yarn install
+#       - name: Install cypress requirements
+#         run: |
+#           wget --no-verbose -O /opt/cucumber-json-formatter "https://github.com/cucumber/json-formatter/releases/download/v19.0.0/cucumber-json-formatter-linux-386"
+#           cd backend
+#           yarn install
+#           yarn build
+#           cd ..
+#           yarn install
       
-      - name: Cache docker images
-        id: cache
-        uses: actions/cache/save@v3.3.1
-        with:
-          path: |
-            /opt/cucumber-json-formatter
-            /home/runner/.cache/Cypress
-            /home/runner/work/Ocelot-Social/Ocelot-Social
-            /tmp/images/
-          key: ${{ github.run_id }}-e2e-preparation-cache
+#       - name: Cache docker images
+#         id: cache
+#         uses: actions/cache/save@v3.3.1
+#         with:
+#           path: |
+#             /opt/cucumber-json-formatter
+#             /home/runner/.cache/Cypress
+#             /home/runner/work/Ocelot-Social/Ocelot-Social
+#             /tmp/images/
+#           key: ${{ github.run_id }}-e2e-preparation-cache
 
-  fullstack_tests:
-    name: Fullstack tests
-    if: success()
-    needs: docker_preparation
-    runs-on: ubuntu-latest
-    env:
-      jobs: 8
-    strategy:
-      matrix:
-        # run copies of the current job in parallel
-        job: [1, 2, 3, 4, 5, 6, 7, 8]
-    steps:
-      - name: Restore cache
-        uses: actions/cache/restore@v3.3.1
-        id: cache
-        with:
-          path: |
-            /opt/cucumber-json-formatter
-            /home/runner/.cache/Cypress
-            /home/runner/work/Ocelot-Social/Ocelot-Social
-            /tmp/images/
-          key: ${{ github.run_id }}e2e-preparation-cache
-          fail-on-cache-miss: true
+#   fullstack_tests:
+#     name: Fullstack tests
+#     if: success()
+#     needs: docker_preparation
+#     runs-on: ubuntu-latest
+#     env:
+#       jobs: 8
+#     strategy:
+#       matrix:
+#         # run copies of the current job in parallel
+#         job: [1, 2, 3, 4, 5, 6, 7, 8]
+#     steps:
+#       - name: Restore cache
+#         uses: actions/cache/restore@v3.3.1
+#         id: cache
+#         with:
+#           path: |
+#             /opt/cucumber-json-formatter
+#             /home/runner/.cache/Cypress
+#             /home/runner/work/Ocelot-Social/Ocelot-Social
+#             /tmp/images/
+#           key: ${{ github.run_id }}e2e-preparation-cache
+#           fail-on-cache-miss: true
 
-      - name: Boot up test system | docker-compose
-        run: |
-          chmod +x /opt/cucumber-json-formatter
-          sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
-          docker load < /tmp/images/neo4j.tar
-          docker load < /tmp/images/backend.tar
-          docker load < /tmp/images/webapp.tar
-          docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend
-          sleep 90s
+#       - name: Boot up test system | docker-compose
+#         run: |
+#           chmod +x /opt/cucumber-json-formatter
+#           sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
+#           docker load < /tmp/images/neo4j.tar
+#           docker load < /tmp/images/backend.tar
+#           docker load < /tmp/images/webapp.tar
+#           docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend
+#           sleep 90s
 
-      - name: Full stack tests | run tests
-        id: e2e-tests
-        run: yarn run cypress:run --spec $(cypress/parallel-features.sh ${{ matrix.job }} ${{ env.jobs }} )
+#       - name: Full stack tests | run tests
+#         id: e2e-tests
+#         run: yarn run cypress:run --spec $(cypress/parallel-features.sh ${{ matrix.job }} ${{ env.jobs }} )
 
-      - name: Full stack tests | if tests failed, compile html report
-        if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
-        run: |
-          cd cypress/
-          node create-cucumber-html-report.js
+#       - name: Full stack tests | if tests failed, compile html report
+#         if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
+#         run: |
+#           cd cypress/
+#           node create-cucumber-html-report.js
 
-      - name: Full stack tests | if tests failed, upload report
-        id: e2e-report
-        if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: ocelot-e2e-test-report-pr${{ needs.docker_preparation.outputs.pr-number }}
-          path: /home/runner/work/Ocelot-Social/Ocelot-Social/cypress/reports/cucumber_html_report
+#       - name: Full stack tests | if tests failed, upload report
+#         id: e2e-report
+#         if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
+#         uses: actions/upload-artifact@v3
+#         with:
+#           name: ocelot-e2e-test-report-pr${{ needs.docker_preparation.outputs.pr-number }}
+#           path: /home/runner/work/Ocelot-Social/Ocelot-Social/cypress/reports/cucumber_html_report
 
-  cleanup:
-    name: Cleanup
-    if: success()
-    needs: [docker_preparation, fullstack_tests]
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-      - name: Delete cache
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh extension install actions/gh-actions-cache
-          KEY="${{ github.run_id }}-e2e-preparation-cache"
-          gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file
+#   cleanup:
+#     name: Cleanup
+#     if: success()
+#     needs: [docker_preparation, fullstack_tests]
+#     runs-on: ubuntu-latest
+#     continue-on-error: true
+#     steps:
+#       - name: Delete cache
+#         env:
+#           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#         run: |
+#           gh extension install actions/gh-actions-cache
+#           KEY="${{ github.run_id }}-e2e-preparation-cache"
+#           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 0f578dc46..0def21da3 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -1,115 +1,115 @@
-name: ocelot.social webapp test CI
+# name: ocelot.social webapp test CI
 
 
-on: [push]
+# on: [push]
 
-jobs:
-  files-changed:
-    name: Detect File Changes - Webapp
-    runs-on: ubuntu-latest
-    outputs:
-      docker: ${{ steps.changes.outputs.docker }}
-      webapp: ${{ steps.changes.outputs.webapp }}
-    steps:
-      - uses: actions/checkout@v3.3.0
+# jobs:
+#   files-changed:
+#     name: Detect File Changes - Webapp
+#     runs-on: ubuntu-latest
+#     outputs:
+#       docker: ${{ steps.changes.outputs.docker }}
+#       webapp: ${{ steps.changes.outputs.webapp }}
+#     steps:
+#       - uses: actions/checkout@v3.3.0
 
-      - name: Check for frontend file changes
-        uses: dorny/paths-filter@v2.11.1
-        id: changes
-        with:
-          token: ${{ github.token }}
-          filters: .github/file-filters.yml
-          list-files: shell
+#       - name: Check for frontend file changes
+#         uses: dorny/paths-filter@v2.11.1
+#         id: changes
+#         with:
+#           token: ${{ github.token }}
+#           filters: .github/file-filters.yml
+#           list-files: shell
 
-  prepare:
-    name: Prepare
-    if: needs.files-changed.outputs.webapp == 'true'
-    needs: files-changed
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+#   prepare:
+#     name: Prepare
+#     if: needs.files-changed.outputs.webapp == 'true'
+#     needs: files-changed
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v3
 
-      - name: Check translation files
-        run: |
-          scripts/translations/sort.sh
-          scripts/translations/missing-keys.sh
+#       - name: Check translation files
+#         run: |
+#           scripts/translations/sort.sh
+#           scripts/translations/missing-keys.sh
 
-  build_test_webapp:
-    name: Docker Build Test - Webapp
-    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
-    needs: [files-changed, prepare]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+#   build_test_webapp:
+#     name: Docker Build Test - Webapp
+#     if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
+#     needs: [files-changed, prepare]
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v3
 
-      - name: Webapp | Build 'test' image
-        run: |
-          docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
-          docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar
+#       - name: Webapp | Build 'test' image
+#         run: |
+#           docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
+#           docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar
 
-      - name: Cache docker image
-        uses: actions/cache/save@v3.3.1
-        with:
-          path: /tmp/webapp.tar
-          key: ${{ github.run_id }}-webapp-cache
+#       - name: Cache docker image
+#         uses: actions/cache/save@v3.3.1
+#         with:
+#           path: /tmp/webapp.tar
+#           key: ${{ github.run_id }}-webapp-cache
 
-  lint_webapp:
-    name: Lint Webapp
-    if: needs.files-changed.outputs.webapp == 'true'
-    needs: files-changed
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+#   lint_webapp:
+#     name: Lint Webapp
+#     if: needs.files-changed.outputs.webapp == 'true'
+#     needs: files-changed
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v3
 
-      - name: webapp | Lint
-        run: cd webapp && yarn && yarn run lint
+#       - name: webapp | Lint
+#         run: cd webapp && yarn && yarn run lint
 
-  unit_test_webapp:
-    name: Unit Tests - Webapp
-    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
-    needs: [files-changed, build_test_webapp]
-    runs-on: ubuntu-latest
-    permissions: 
-      checks: write
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+#   unit_test_webapp:
+#     name: Unit Tests - Webapp
+#     if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
+#     needs: [files-changed, build_test_webapp]
+#     runs-on: ubuntu-latest
+#     permissions: 
+#       checks: write
+#     steps:
+#       - name: Checkout code
+#         uses: actions/checkout@v3
 
-      - name: Restore webapp cache
-        uses: actions/cache/restore@v3.3.1
-        with:
-          path: /tmp/webapp.tar
-          key: ${{ github.run_id }}-webapp-cache
+#       - name: Restore webapp cache
+#         uses: actions/cache/restore@v3.3.1
+#         with:
+#           path: /tmp/webapp.tar
+#           key: ${{ github.run_id }}-webapp-cache
 
-      - name: Load Docker Image
-        run: docker load < /tmp/webapp.tar
+#       - name: Load Docker Image
+#         run: docker load < /tmp/webapp.tar
 
-      - name: Copy env files
-        run: |
-          cp webapp/.env.template webapp/.env
-          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
+#       - name: backend | docker-compose
+#         run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp
 
-      - name: webapp | Unit tests incl. coverage check
-        run: docker-compose exec -T webapp yarn test
+#       - name: webapp | Unit tests incl. coverage check
+#         run: docker-compose exec -T webapp yarn test
 
-  cleanup:
-    name: Cleanup
-    if: (needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true') || success()
-    needs: [files-changed, unit_test_webapp]
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-      - name: Delete cache
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh extension install actions/gh-actions-cache
-          KEY="${{ github.run_id }}-webapp-cache"
-          gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
+#   cleanup:
+#     name: Cleanup
+#     if: (needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true') || success()
+#     needs: [files-changed, unit_test_webapp]
+#     runs-on: ubuntu-latest
+#     continue-on-error: true
+#     steps:
+#       - name: Delete cache
+#         env:
+#           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#         run: |
+#           gh extension install actions/gh-actions-cache
+#           KEY="${{ github.run_id }}-webapp-cache"
+#           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
 

From ca721228cd768d1f1ae80456a8b85a7bf2e0061b Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 19:41:24 +0200
Subject: [PATCH 124/151] change backend cache deletion job dependency

---
 .github/workflows/test-backend.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 2d2c9bb6b..357a8f26e 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -127,7 +127,7 @@ jobs:
 
   cleanup:
     name: Cleanup
-    if: (needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true') || success()
+    if: ${{ needs.files-changed.outputs.backend == 'true' || needs.files-changed.outputs.docker == 'true' }}
     needs: [files-changed, unit_test_backend]
     runs-on: ubuntu-latest
     continue-on-error: true

From 991e5c5ec30338e1e93c5bf17c8d94f7d06a9dd1 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 19:55:27 +0200
Subject: [PATCH 125/151] make backend tests fail for testing

---
 .github/workflows/test-backend.yml     | 2 +-
 backend/src/schema/resolvers/groups.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 357a8f26e..64647dde7 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -123,7 +123,7 @@ jobs:
         run: docker-compose exec -T backend yarn db:migrate up
 
       - name: backend | Unit test incl. coverage check
-        run: docker-compose exec -T backend yarn test
+        run: docker-compose exec -T backend yarn test src/schema/resolvers/groups.spec.ts
 
   cleanup:
     name: Cleanup
diff --git a/backend/src/schema/resolvers/groups.ts b/backend/src/schema/resolvers/groups.ts
index cd1eb8db3..16d1ecc23 100644
--- a/backend/src/schema/resolvers/groups.ts
+++ b/backend/src/schema/resolvers/groups.ts
@@ -1,4 +1,4 @@
-import { v4 as uuid } from 'uuid'
+import { v4TEST as uuid } from 'uuid'
 import { UserInputError } from 'apollo-server'
 import CONFIG from '../../config'
 import { CATEGORIES_MIN, CATEGORIES_MAX } from '../../constants/categories'

From 0e73d53e9afbf7bbb2e1ef792fa1893da6088222 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 19:57:37 +0200
Subject: [PATCH 126/151] fix typo

---
 .github/workflows/test-backend.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 64647dde7..bda03edf3 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -100,7 +100,7 @@ jobs:
         uses: actions/cache/restore@v3.3.1
         with:
           path: /tmp/backend.tar
-          key: ${{ github.run_id }}backend-cache
+          key: ${{ github.run_id }}-backend-cache
           fail-on-cache-miss: true
 
       - name: Load Docker Images

From b712e3084ee22a6d4274f99c16f01f0dac9a1af1 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 20:26:09 +0200
Subject: [PATCH 127/151] Revert "make backend tests fail for testing"

This reverts commit 991e5c5ec30338e1e93c5bf17c8d94f7d06a9dd1.
---
 .github/workflows/test-backend.yml     | 2 +-
 backend/src/schema/resolvers/groups.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index bda03edf3..3f7559980 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -123,7 +123,7 @@ jobs:
         run: docker-compose exec -T backend yarn db:migrate up
 
       - name: backend | Unit test incl. coverage check
-        run: docker-compose exec -T backend yarn test src/schema/resolvers/groups.spec.ts
+        run: docker-compose exec -T backend yarn test
 
   cleanup:
     name: Cleanup
diff --git a/backend/src/schema/resolvers/groups.ts b/backend/src/schema/resolvers/groups.ts
index 16d1ecc23..cd1eb8db3 100644
--- a/backend/src/schema/resolvers/groups.ts
+++ b/backend/src/schema/resolvers/groups.ts
@@ -1,4 +1,4 @@
-import { v4TEST as uuid } from 'uuid'
+import { v4 as uuid } from 'uuid'
 import { UserInputError } from 'apollo-server'
 import CONFIG from '../../config'
 import { CATEGORIES_MIN, CATEGORIES_MAX } from '../../constants/categories'

From 715ab9d0cb0460c2cd6320a1b87f11da5bd97019 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 21:06:00 +0200
Subject: [PATCH 128/151] set webapp cache delete job wo run only, if needed
 jobs were successful

---
 .github/workflows/test-webapp.yml | 195 +++++++++++++++---------------
 1 file changed, 99 insertions(+), 96 deletions(-)

diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 0def21da3..364ad4796 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -1,115 +1,118 @@
-# name: ocelot.social webapp test CI
+name: ocelot.social webapp test CI
 
 
-# on: [push]
+on:
+  push:
+    branches:
+      - fix-runner
 
-# jobs:
-#   files-changed:
-#     name: Detect File Changes - Webapp
-#     runs-on: ubuntu-latest
-#     outputs:
-#       docker: ${{ steps.changes.outputs.docker }}
-#       webapp: ${{ steps.changes.outputs.webapp }}
-#     steps:
-#       - uses: actions/checkout@v3.3.0
+jobs:
+  files-changed:
+    name: Detect File Changes - Webapp
+    runs-on: ubuntu-latest
+    outputs:
+      docker: ${{ steps.changes.outputs.docker }}
+      webapp: ${{ steps.changes.outputs.webapp }}
+    steps:
+      - uses: actions/checkout@v3.3.0
 
-#       - name: Check for frontend file changes
-#         uses: dorny/paths-filter@v2.11.1
-#         id: changes
-#         with:
-#           token: ${{ github.token }}
-#           filters: .github/file-filters.yml
-#           list-files: shell
+      - name: Check for frontend file changes
+        uses: dorny/paths-filter@v2.11.1
+        id: changes
+        with:
+          token: ${{ github.token }}
+          filters: .github/file-filters.yml
+          list-files: shell
 
-#   prepare:
-#     name: Prepare
-#     if: needs.files-changed.outputs.webapp == 'true'
-#     needs: files-changed
-#     runs-on: ubuntu-latest
-#     steps:
-#       - name: Checkout code
-#         uses: actions/checkout@v3
+  prepare:
+    name: Prepare
+    if: needs.files-changed.outputs.webapp == 'true'
+    needs: files-changed
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
 
-#       - name: Check translation files
-#         run: |
-#           scripts/translations/sort.sh
-#           scripts/translations/missing-keys.sh
+      - name: Check translation files
+        run: |
+          scripts/translations/sort.sh
+          scripts/translations/missing-keys.sh
 
-#   build_test_webapp:
-#     name: Docker Build Test - Webapp
-#     if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
-#     needs: [files-changed, prepare]
-#     runs-on: ubuntu-latest
-#     steps:
-#       - name: Checkout code
-#         uses: actions/checkout@v3
+  build_test_webapp:
+    name: Docker Build Test - Webapp
+    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
+    needs: [files-changed, prepare]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
 
-#       - name: Webapp | Build 'test' image
-#         run: |
-#           docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
-#           docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar
+      - name: Webapp | Build 'test' image
+        run: |
+          docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
+          docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar
 
-#       - name: Cache docker image
-#         uses: actions/cache/save@v3.3.1
-#         with:
-#           path: /tmp/webapp.tar
-#           key: ${{ github.run_id }}-webapp-cache
+      - name: Cache docker image
+        uses: actions/cache/save@v3.3.1
+        with:
+          path: /tmp/webapp.tar
+          key: ${{ github.run_id }}-webapp-cache
 
-#   lint_webapp:
-#     name: Lint Webapp
-#     if: needs.files-changed.outputs.webapp == 'true'
-#     needs: files-changed
-#     runs-on: ubuntu-latest
-#     steps:
-#       - name: Checkout code
-#         uses: actions/checkout@v3
+  lint_webapp:
+    name: Lint Webapp
+    if: needs.files-changed.outputs.webapp == 'true'
+    needs: files-changed
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
 
-#       - name: webapp | Lint
-#         run: cd webapp && yarn && yarn run lint
+      - name: webapp | Lint
+        run: cd webapp && yarn && yarn run lint
 
-#   unit_test_webapp:
-#     name: Unit Tests - Webapp
-#     if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
-#     needs: [files-changed, build_test_webapp]
-#     runs-on: ubuntu-latest
-#     permissions: 
-#       checks: write
-#     steps:
-#       - name: Checkout code
-#         uses: actions/checkout@v3
+  unit_test_webapp:
+    name: Unit Tests - Webapp
+    if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true'
+    needs: [files-changed, build_test_webapp]
+    runs-on: ubuntu-latest
+    permissions: 
+      checks: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
 
-#       - name: Restore webapp cache
-#         uses: actions/cache/restore@v3.3.1
-#         with:
-#           path: /tmp/webapp.tar
-#           key: ${{ github.run_id }}-webapp-cache
+      - name: Restore webapp cache
+        uses: actions/cache/restore@v3.3.1
+        with:
+          path: /tmp/webapp.tar
+          key: ${{ github.run_id }}-webapp-cache
 
-#       - name: Load Docker Image
-#         run: docker load < /tmp/webapp.tar
+      - name: Load Docker Image
+        run: docker load < /tmp/webapp.tar
 
-#       - name: Copy env files
-#         run: |
-#           cp webapp/.env.template webapp/.env
-#           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
+      - name: backend | docker-compose
+        run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp
 
-#       - name: webapp | Unit tests incl. coverage check
-#         run: docker-compose exec -T webapp yarn test
+      - name: webapp | Unit tests incl. coverage check
+        run: docker-compose exec -T webapp yarn test
 
-#   cleanup:
-#     name: Cleanup
-#     if: (needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true') || success()
-#     needs: [files-changed, unit_test_webapp]
-#     runs-on: ubuntu-latest
-#     continue-on-error: true
-#     steps:
-#       - name: Delete cache
-#         env:
-#           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#         run: |
-#           gh extension install actions/gh-actions-cache
-#           KEY="${{ github.run_id }}-webapp-cache"
-#           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
+  cleanup:
+    name: Cleanup
+    if: ${{ needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.webapp == 'true' }}
+    needs: [files-changed, unit_test_webapp]
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Delete cache
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh extension install actions/gh-actions-cache
+          KEY="${{ github.run_id }}-webapp-cache"
+          gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
 

From b4383d38a10a609aa0c25b984785cd83ddfe6a89 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 21:10:54 +0200
Subject: [PATCH 129/151] set e2e test cache delete job wo run only, if needed
 jobs were successful

---
 .github/workflows/test-e2e.yml | 201 ++++++++++++++++-----------------
 1 file changed, 100 insertions(+), 101 deletions(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 9eafcddaa..0012f15da 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -1,112 +1,111 @@
-# name: ocelot.social end-to-end test CI
-# on: push
+name: ocelot.social end-to-end test CI
+on: push
 
-# jobs:
-#   docker_preparation:
-#     name: Fullstack test preparation
-#     runs-on: ubuntu-latest
-#     steps:
-#       - name: Checkout code
-#         uses: actions/checkout@v3
+jobs:
+  docker_preparation:
+    name: Fullstack test preparation
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
 
-#       - name: Copy env files
-#         run: |
-#           cp webapp/.env.template webapp/.env
-#           cp backend/.env.template backend/.env
+      - name: Copy env files
+        run: |
+          cp webapp/.env.template webapp/.env
+          cp backend/.env.template backend/.env
 
-#       - name: Build docker images
-#         run: |
-#           mkdir /tmp/images
-#           docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
-#           docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/images/neo4j.tar
-#           docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
-#           docker save "ocelotsocialnetwork/backend:test" > /tmp/images/backend.tar
-#           docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
-#           docker save "ocelotsocialnetwork/webapp:test" > /tmp/images/webapp.tar
+      - name: Build docker images
+        run: |
+          mkdir /tmp/images
+          docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
+          docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/images/neo4j.tar
+          docker build --target test -t "ocelotsocialnetwork/backend:test" backend/
+          docker save "ocelotsocialnetwork/backend:test" > /tmp/images/backend.tar
+          docker build --target test -t "ocelotsocialnetwork/webapp:test" webapp/
+          docker save "ocelotsocialnetwork/webapp:test" > /tmp/images/webapp.tar
 
-#       - name: Install cypress requirements
-#         run: |
-#           wget --no-verbose -O /opt/cucumber-json-formatter "https://github.com/cucumber/json-formatter/releases/download/v19.0.0/cucumber-json-formatter-linux-386"
-#           cd backend
-#           yarn install
-#           yarn build
-#           cd ..
-#           yarn install
+      - name: Install cypress requirements
+        run: |
+          wget --no-verbose -O /opt/cucumber-json-formatter "https://github.com/cucumber/json-formatter/releases/download/v19.0.0/cucumber-json-formatter-linux-386"
+          cd backend
+          yarn install
+          yarn build
+          cd ..
+          yarn install
       
-#       - name: Cache docker images
-#         id: cache
-#         uses: actions/cache/save@v3.3.1
-#         with:
-#           path: |
-#             /opt/cucumber-json-formatter
-#             /home/runner/.cache/Cypress
-#             /home/runner/work/Ocelot-Social/Ocelot-Social
-#             /tmp/images/
-#           key: ${{ github.run_id }}-e2e-preparation-cache
+      - name: Cache docker images
+        id: cache
+        uses: actions/cache/save@v3.3.1
+        with:
+          path: |
+            /opt/cucumber-json-formatter
+            /home/runner/.cache/Cypress
+            /home/runner/work/Ocelot-Social/Ocelot-Social
+            /tmp/images/
+          key: ${{ github.run_id }}-e2e-preparation-cache
 
-#   fullstack_tests:
-#     name: Fullstack tests
-#     if: success()
-#     needs: docker_preparation
-#     runs-on: ubuntu-latest
-#     env:
-#       jobs: 8
-#     strategy:
-#       matrix:
-#         # run copies of the current job in parallel
-#         job: [1, 2, 3, 4, 5, 6, 7, 8]
-#     steps:
-#       - name: Restore cache
-#         uses: actions/cache/restore@v3.3.1
-#         id: cache
-#         with:
-#           path: |
-#             /opt/cucumber-json-formatter
-#             /home/runner/.cache/Cypress
-#             /home/runner/work/Ocelot-Social/Ocelot-Social
-#             /tmp/images/
-#           key: ${{ github.run_id }}e2e-preparation-cache
-#           fail-on-cache-miss: true
+  fullstack_tests:
+    name: Fullstack tests
+    if: success()
+    needs: docker_preparation
+    runs-on: ubuntu-latest
+    env:
+      jobs: 8
+    strategy:
+      matrix:
+        # run copies of the current job in parallel
+        job: [1, 2, 3, 4, 5, 6, 7, 8]
+    steps:
+      - name: Restore cache
+        uses: actions/cache/restore@v3.3.1
+        id: cache
+        with:
+          path: |
+            /opt/cucumber-json-formatter
+            /home/runner/.cache/Cypress
+            /home/runner/work/Ocelot-Social/Ocelot-Social
+            /tmp/images/
+          key: ${{ github.run_id }}e2e-preparation-cache
+          fail-on-cache-miss: true
 
-#       - name: Boot up test system | docker-compose
-#         run: |
-#           chmod +x /opt/cucumber-json-formatter
-#           sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
-#           docker load < /tmp/images/neo4j.tar
-#           docker load < /tmp/images/backend.tar
-#           docker load < /tmp/images/webapp.tar
-#           docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend
-#           sleep 90s
+      - name: Boot up test system | docker-compose
+        run: |
+          chmod +x /opt/cucumber-json-formatter
+          sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
+          docker load < /tmp/images/neo4j.tar
+          docker load < /tmp/images/backend.tar
+          docker load < /tmp/images/webapp.tar
+          docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend
+          sleep 90s
 
-#       - name: Full stack tests | run tests
-#         id: e2e-tests
-#         run: yarn run cypress:run --spec $(cypress/parallel-features.sh ${{ matrix.job }} ${{ env.jobs }} )
+      - name: Full stack tests | run tests
+        id: e2e-tests
+        run: yarn run cypress:run --spec $(cypress/parallel-features.sh ${{ matrix.job }} ${{ env.jobs }} )
 
-#       - name: Full stack tests | if tests failed, compile html report
-#         if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
-#         run: |
-#           cd cypress/
-#           node create-cucumber-html-report.js
+      - name: Full stack tests | if tests failed, compile html report
+        if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
+        run: |
+          cd cypress/
+          node create-cucumber-html-report.js
 
-#       - name: Full stack tests | if tests failed, upload report
-#         id: e2e-report
-#         if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
-#         uses: actions/upload-artifact@v3
-#         with:
-#           name: ocelot-e2e-test-report-pr${{ needs.docker_preparation.outputs.pr-number }}
-#           path: /home/runner/work/Ocelot-Social/Ocelot-Social/cypress/reports/cucumber_html_report
+      - name: Full stack tests | if tests failed, upload report
+        id: e2e-report
+        if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: ocelot-e2e-test-report-pr${{ needs.docker_preparation.outputs.pr-number }}
+          path: /home/runner/work/Ocelot-Social/Ocelot-Social/cypress/reports/cucumber_html_report
 
-#   cleanup:
-#     name: Cleanup
-#     if: success()
-#     needs: [docker_preparation, fullstack_tests]
-#     runs-on: ubuntu-latest
-#     continue-on-error: true
-#     steps:
-#       - name: Delete cache
-#         env:
-#           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#         run: |
-#           gh extension install actions/gh-actions-cache
-#           KEY="${{ github.run_id }}-e2e-preparation-cache"
-#           gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file
+  cleanup:
+    name: Cleanup
+    needs: [docker_preparation, fullstack_tests]
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Delete cache
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh extension install actions/gh-actions-cache
+          KEY="${{ github.run_id }}-e2e-preparation-cache"
+          gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm
\ No newline at end of file

From d0a597b07d1b53da2f9210e45ba1998046a4db46 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 21:12:31 +0200
Subject: [PATCH 130/151] make e2e testing fail for testing

---
 .github/workflows/test-e2e.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 0012f15da..2437f680c 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -70,7 +70,7 @@ jobs:
 
       - name: Boot up test system | docker-compose
         run: |
-          chmod +x /opt/cucumber-json-formatter
+          chmod +x /opt/cucumber-json-formatterTEST
           sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
           docker load < /tmp/images/neo4j.tar
           docker load < /tmp/images/backend.tar

From 7f5730edc8efec15c1d4f911346f752463bebe68 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 21:37:26 +0200
Subject: [PATCH 131/151] fix typo

---
 .github/workflows/test-e2e.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 2437f680c..371765ec3 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -65,7 +65,7 @@ jobs:
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
-          key: ${{ github.run_id }}e2e-preparation-cache
+          key: ${{ github.run_id }}-e2e-preparation-cache
           fail-on-cache-miss: true
 
       - name: Boot up test system | docker-compose

From 2eb507170a0f6042921d4948d55f4343fef2b24b Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 21:59:22 +0200
Subject: [PATCH 132/151] Revert "make e2e testing fail for testing"

This reverts commit d0a597b07d1b53da2f9210e45ba1998046a4db46.
---
 .github/workflows/test-e2e.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 371765ec3..81c068ba5 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -70,7 +70,7 @@ jobs:
 
       - name: Boot up test system | docker-compose
         run: |
-          chmod +x /opt/cucumber-json-formatterTEST
+          chmod +x /opt/cucumber-json-formatter
           sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter
           docker load < /tmp/images/neo4j.tar
           docker load < /tmp/images/backend.tar

From 09e887fc3c86e21258d7e697daae68c292ddb4d8 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 22:32:21 +0200
Subject: [PATCH 133/151] make workflows fail to stress test github cache
 deletion

---
 .../workflows/cleanup-cache-at-pr-closing.yml | 24 +++++++++++++++++++
 .github/workflows/test-backend.yml            |  2 +-
 .github/workflows/test-e2e.yml                |  2 +-
 .github/workflows/test-webapp.yml             |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/cleanup-cache-at-pr-closing.yml

diff --git a/.github/workflows/cleanup-cache-at-pr-closing.yml b/.github/workflows/cleanup-cache-at-pr-closing.yml
new file mode 100644
index 000000000..2171cc2d5
--- /dev/null
+++ b/.github/workflows/cleanup-cache-at-pr-closing.yml
@@ -0,0 +1,24 @@
+name: ocelot.social cache cleanup on pr closing
+
+
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  clean-branch-cache:
+    name: Clean branch cache
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name:
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh extension install actions/gh-actions-cache
+          gh actions-cache list --branch TODO:this_current_branch --order desc --sort created-at
+ #         gh actions-cache delete -R Ocelot-Social-Community/Ocelot-Social --confirm
diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 3f7559980..a24a9415e 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -92,7 +92,7 @@ jobs:
       - name: Restore Neo4J cache
         uses: actions/cache/restore@v3.3.1
         with:
-          path: /tmp/neo4j.tar
+          path: /tmp/neo4j.tarTEST
           key: ${{ github.run_id }}-backend-neo4j-cache
           fail-on-cache-miss: true
 
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 81c068ba5..059e758bf 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -61,7 +61,7 @@ jobs:
         id: cache
         with:
           path: |
-            /opt/cucumber-json-formatter
+            /opt/cucumber-json-formatterTEST
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 364ad4796..80b93f3f7 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -84,7 +84,7 @@ jobs:
       - name: Restore webapp cache
         uses: actions/cache/restore@v3.3.1
         with:
-          path: /tmp/webapp.tar
+          path: /tmp/webapp.tarTEST
           key: ${{ github.run_id }}-webapp-cache
 
       - name: Load Docker Image

From f348e18ce2330159b01ddbf1cc2b67bd9d22512c Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 22:54:14 +0200
Subject: [PATCH 134/151] Revert "make workflows fail to stress test github
 cache deletion"

This reverts commit 09e887fc3c86e21258d7e697daae68c292ddb4d8.
---
 .../workflows/cleanup-cache-at-pr-closing.yml | 24 -------------------
 .github/workflows/test-backend.yml            |  2 +-
 .github/workflows/test-e2e.yml                |  2 +-
 .github/workflows/test-webapp.yml             |  2 +-
 4 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 .github/workflows/cleanup-cache-at-pr-closing.yml

diff --git a/.github/workflows/cleanup-cache-at-pr-closing.yml b/.github/workflows/cleanup-cache-at-pr-closing.yml
deleted file mode 100644
index 2171cc2d5..000000000
--- a/.github/workflows/cleanup-cache-at-pr-closing.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: ocelot.social cache cleanup on pr closing
-
-
-on:
-  pull_request:
-    types:
-      - closed
-
-jobs:
-  clean-branch-cache:
-    name: Clean branch cache
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name:
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh extension install actions/gh-actions-cache
-          gh actions-cache list --branch TODO:this_current_branch --order desc --sort created-at
- #         gh actions-cache delete -R Ocelot-Social-Community/Ocelot-Social --confirm
diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index a24a9415e..3f7559980 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -92,7 +92,7 @@ jobs:
       - name: Restore Neo4J cache
         uses: actions/cache/restore@v3.3.1
         with:
-          path: /tmp/neo4j.tarTEST
+          path: /tmp/neo4j.tar
           key: ${{ github.run_id }}-backend-neo4j-cache
           fail-on-cache-miss: true
 
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 059e758bf..81c068ba5 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -61,7 +61,7 @@ jobs:
         id: cache
         with:
           path: |
-            /opt/cucumber-json-formatterTEST
+            /opt/cucumber-json-formatter
             /home/runner/.cache/Cypress
             /home/runner/work/Ocelot-Social/Ocelot-Social
             /tmp/images/
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 80b93f3f7..364ad4796 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -84,7 +84,7 @@ jobs:
       - name: Restore webapp cache
         uses: actions/cache/restore@v3.3.1
         with:
-          path: /tmp/webapp.tarTEST
+          path: /tmp/webapp.tar
           key: ${{ github.run_id }}-webapp-cache
 
       - name: Load Docker Image

From 3ffa8c9af5dbcb19dfef2d7335233492896a00ad Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 23:37:44 +0200
Subject: [PATCH 135/151] add recommended branch cache cleanup at pr closing
 workflow

---
 .../workflows/cleanup-cache-at-pr-closing.yml | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 .github/workflows/cleanup-cache-at-pr-closing.yml

diff --git a/.github/workflows/cleanup-cache-at-pr-closing.yml b/.github/workflows/cleanup-cache-at-pr-closing.yml
new file mode 100644
index 000000000..284702e76
--- /dev/null
+++ b/.github/workflows/cleanup-cache-at-pr-closing.yml
@@ -0,0 +1,42 @@
+###############################################################################
+# A Github repo has max 10 GB of cache.
+# https://github.blog/changelog/2021-11-23-github-actions-cache-size-is-now-increased-to-10gb-per-repository/
+#
+# To avoid "cache thrashing" by their cache eviction policy it is recommended
+# to apply a cache cleanup workflow at PR closing to dele cache leftovers of
+# the current branch:
+# https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#force-deleting-cache-entries
+###############################################################################
+
+name: ocelot.social cache cleanup on pr closing
+
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  clean-branch-cache:
+    name: Cleanup branch cache
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Cleanup
+        run: |
+          gh extension install actions/gh-actions-cache
+          REPO=${{ github.repository }}
+          BRANCH="refs/pull/${{ github.event.pull_request.number }}/merge"
+          echo "Fetching list of cache key"
+          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From aa7c54a052e723b5ad2e72d023ce471a4f13c0e1 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 18 Jul 2023 23:59:34 +0200
Subject: [PATCH 136/151] set back workflow triggers to push

---
 .github/workflows/test-backend.yml | 5 +----
 .github/workflows/test-e2e.yml     | 1 +
 .github/workflows/test-webapp.yml  | 5 +----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
index 3f7559980..03e517826 100644
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -1,10 +1,7 @@
 name: ocelot.social backend test CI
 
 
-on:
-  push:
-    branches:
-      - fix-runner
+on: push
 
 jobs:
   files-changed:
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
index 81c068ba5..02d65ba9e 100644
--- a/.github/workflows/test-e2e.yml
+++ b/.github/workflows/test-e2e.yml
@@ -1,4 +1,5 @@
 name: ocelot.social end-to-end test CI
+
 on: push
 
 jobs:
diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml
index 364ad4796..2b1e144a5 100644
--- a/.github/workflows/test-webapp.yml
+++ b/.github/workflows/test-webapp.yml
@@ -1,10 +1,7 @@
 name: ocelot.social webapp test CI
 
 
-on:
-  push:
-    branches:
-      - fix-runner
+on: push
 
 jobs:
   files-changed:

From 0bc19cf226c0b5ed31af0fd40b853ce3b2e56e83 Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Wed, 19 Jul 2023 10:15:56 +0200
Subject: [PATCH 137/151] [fix] added usertag as allowed html tags, so user
 highlighting works for the chat

---
 backend/src/middleware/helpers/cleanHtml.ts | 1 +
 webapp/components/Chat/Chat.vue             | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/backend/src/middleware/helpers/cleanHtml.ts b/backend/src/middleware/helpers/cleanHtml.ts
index ac71f6bdc..84497760d 100644
--- a/backend/src/middleware/helpers/cleanHtml.ts
+++ b/backend/src/middleware/helpers/cleanHtml.ts
@@ -30,6 +30,7 @@ const standardSanitizeHtmlOptions = {
     'strike',
     'span',
     'blockquote',
+    'usertag',
   ],
   allowedAttributes: {
     a: ['href', 'class', 'target', 'data-*', 'contenteditable'],
diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d7864ebef..171d75f63 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -334,12 +334,6 @@ export default {
     },
 
     async sendMessage(message) {
-      // check for usersTag and change userid to username
-      message.usersTag.forEach((userTag) => {
-        const needle = `<usertag>${userTag.id}</usertag>`
-        const replacement = `<usertag>@${userTag.name.replaceAll(' ', '-').toLowerCase()}</usertag>`
-        message.content = message.content.replaceAll(needle, replacement)
-      })
       try {
         await this.$apollo.mutate({
           mutation: createMessageMutation(),

From 961a260044573db0d92cd95ada7395635497899a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 10:39:54 +0200
Subject: [PATCH 138/151] remove default avatar, allow refetch rooms, count
 down read messages, update lastMessage & lastMessageAt, ...

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d7864ebef..4ac5606e8 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -35,7 +35,7 @@
 
         <div slot="room-header-avatar">
           <div
-            v-if="selectedRoom && selectedRoom.avatar && selectedRoom.avatar !== 'default-avatar'"
+            v-if="selectedRoom && selectedRoom.avatar"
             class="vac-avatar"
             :style="{ 'background-image': `url('${selectedRoom.avatar}')` }"
           />
@@ -46,7 +46,7 @@
 
         <div v-for="room in rooms" :slot="'room-list-avatar_' + room.id" :key="room.id">
           <div
-            v-if="room.avatar && room.avatar !== 'default-avatar'"
+            v-if="room.avatar"
             class="vac-avatar"
             :style="{ 'background-image': `url('${room.avatar}')` }"
           />
@@ -222,9 +222,9 @@ export default {
     ...mapMutations({
       commitUnreadRoomCount: 'chat/UPDATE_ROOM_COUNT',
     }),
-    async fetchRooms({ room } = {}) {
-      this.roomsLoaded = false
-      const offset = this.roomPage * this.roomPageSize
+    async fetchRooms({ room, options = {} } = {}) {
+      this.roomsLoaded = options.refetch ? this.roomsLoaded : false
+      const offset = (options.refetch ? 0 : this.roomPage) * this.roomPageSize
       try {
         const {
           data: { Room },
@@ -238,16 +238,19 @@ export default {
           fetchPolicy: 'no-cache',
         })
 
-        const newRooms = Room.map((r) => {
-          return {
-            ...r,
+
+        const rms = []
+        const rmsIds = []
+        ;[...Room, ...this.rooms].forEach((r) => {
+          if(!rmsIds.find((v) => v === r.id)){
+            rms.push({...r, index: r.lastMessage.date,
             users: r.users.map((u) => {
               return { ...u, username: u.name, avatar: u.avatar?.url }
-            }),
+            })})
+            rmsIds.push(r.id)
           }
         })
-
-        this.rooms = [...this.rooms, ...newRooms]
+        this.rooms = rms
 
         if (Room.length < this.roomPageSize) {
           this.roomsLoaded = true
@@ -282,8 +285,12 @@ export default {
           fetchPolicy: 'no-cache',
         })
 
-        const newMsgIds = Message.filter((m) => m.seen === false).map((m) => m.id)
+        const newMsgIds = Message.filter((m) => m.seen === false && m.senderId !== this.currentUser.id).map((m) => m.id)
         if (newMsgIds.length) {
+          const roomIndex = this.rooms.findIndex((r) => r.id === room.id)
+          const changedRoom = {...this.rooms[roomIndex]}
+          changedRoom.unreadCount = changedRoom.unreadCount - newMsgIds.length
+          this.rooms[roomIndex] = changedRoom
           this.$apollo
             .mutate({
               mutation: markMessagesAsSeen(),
@@ -322,14 +329,15 @@ export default {
     },
 
     async chatMessageAdded({ data }) {
+      const roomIndex = this.rooms.findIndex((r) => r.id === data.chatMessageAdded.room.id)
+      const changedRoom = {...this.rooms[roomIndex]}
+      changedRoom.lastMessage = data.chatMessageAdded
+      changedRoom.lastMessageAt = data.chatMessageAdded.date
+      this.rooms[roomIndex] = changedRoom
       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 = []
-        this.roomPage = 0
-        this.roomsLoaded = false
-        this.fetchRooms()
+        this.fetchRooms({ options: { refetch: true } })
       }
     },
 

From 41cca4f4ec93d28a265aa3683973c24eec67db21 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 10:42:21 +0200
Subject: [PATCH 139/151] lint

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 4ac5606e8..698a270b7 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -238,15 +238,17 @@ export default {
           fetchPolicy: 'no-cache',
         })
 
-
         const rms = []
         const rmsIds = []
         ;[...Room, ...this.rooms].forEach((r) => {
-          if(!rmsIds.find((v) => v === r.id)){
-            rms.push({...r, index: r.lastMessage.date,
-            users: r.users.map((u) => {
-              return { ...u, username: u.name, avatar: u.avatar?.url }
-            })})
+          if (!rmsIds.find((v) => v === r.id)) {
+            rms.push({
+              ...r,
+              index: r.lastMessage.date,
+              users: r.users.map((u) => {
+                return { ...u, username: u.name, avatar: u.avatar?.url }
+              }),
+            })
             rmsIds.push(r.id)
           }
         })
@@ -285,10 +287,12 @@ export default {
           fetchPolicy: 'no-cache',
         })
 
-        const newMsgIds = Message.filter((m) => m.seen === false && m.senderId !== this.currentUser.id).map((m) => m.id)
+        const newMsgIds = Message.filter(
+          (m) => m.seen === false && m.senderId !== this.currentUser.id,
+        ).map((m) => m.id)
         if (newMsgIds.length) {
           const roomIndex = this.rooms.findIndex((r) => r.id === room.id)
-          const changedRoom = {...this.rooms[roomIndex]}
+          const changedRoom = { ...this.rooms[roomIndex] }
           changedRoom.unreadCount = changedRoom.unreadCount - newMsgIds.length
           this.rooms[roomIndex] = changedRoom
           this.$apollo
@@ -330,7 +334,7 @@ export default {
 
     async chatMessageAdded({ data }) {
       const roomIndex = this.rooms.findIndex((r) => r.id === data.chatMessageAdded.room.id)
-      const changedRoom = {...this.rooms[roomIndex]}
+      const changedRoom = { ...this.rooms[roomIndex] }
       changedRoom.lastMessage = data.chatMessageAdded
       changedRoom.lastMessageAt = data.chatMessageAdded.date
       this.rooms[roomIndex] = changedRoom

From 897794b0eee36e3cad9fa379ed2ee02a66b5770b Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Wed, 19 Jul 2023 11:06:05 +0200
Subject: [PATCH 140/151] [feature] changed seen checks for chat component

---
 webapp/assets/_new/styles/export.scss | 4 ++++
 webapp/assets/_new/styles/tokens.scss | 3 +++
 webapp/constants/chat.js              | 6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/webapp/assets/_new/styles/export.scss b/webapp/assets/_new/styles/export.scss
index 88b42bfc9..5b866d6b7 100644
--- a/webapp/assets/_new/styles/export.scss
+++ b/webapp/assets/_new/styles/export.scss
@@ -27,4 +27,8 @@
     chatMessageBgOthers: $chat-message-bg-others;
   
     chatNewMessageColor: $chat-new-message-color;
+    
+    chatMessageTimestamp: $chat-message-timestamp;
+    chatMessageCheckmarkSeen: $chat-message-checkmark-seen;
+    chatMessageCheckmark: $chat-message-checkmark;
   }
\ No newline at end of file
diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss
index e001ffa84..ef5086240 100644
--- a/webapp/assets/_new/styles/tokens.scss
+++ b/webapp/assets/_new/styles/tokens.scss
@@ -417,3 +417,6 @@ $chat-message-color: $text-color-base;
 $chat-message-bg-others: $color-neutral-80;
 $chat-sidemenu-bg: $color-secondary-active;
 $chat-new-message-color: $color-secondary-active;
+$chat-message-timestamp: $text-color-soft;
+$chat-message-checkmark-seen: $text-color-secondary;
+$chat-message-checkmark: $text-color-soft;
diff --git a/webapp/constants/chat.js b/webapp/constants/chat.js
index a183a3922..181d88e0e 100644
--- a/webapp/constants/chat.js
+++ b/webapp/constants/chat.js
@@ -65,7 +65,7 @@ const STYLE = {
       backgroundSelected: '#c2dcf2',
       colorDeleted: '#757e85',
       colorUsername: '#9ca6af',
-      colorTimestamp: '#828c94',
+      colorTimestamp: styleData.chatMessageTimestamp,
       backgroundDate: '#e5effa',
       colorDate: '#505a62',
       backgroundSystem: '#e5effa',
@@ -134,8 +134,8 @@ const STYLE = {
       emojiReaction: 'rgba(0, 0, 0, 0.3)',
       document: styleData.colorPrimary,
       pencil: '#9e9e9e',
-      checkmark: '#9e9e9e',
-      checkmarkSeen: '#0696c7',
+      checkmark: styleData.chatMessageCheckmark,
+      checkmarkSeen: styleData.chatMessageCheckmarkSeen,
       eye: '#fff',
       dropdownMessage: '#fff',
       dropdownMessageBackground: 'rgba(0, 0, 0, 0.25)',

From f7dd605838466b8d1acaf21de3c0ba05d6f7dc08 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 11:36:35 +0200
Subject: [PATCH 141/151] shorten room message, update room message when
 sending

---
 webapp/components/Chat/Chat.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 698a270b7..320ea3357 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -245,6 +245,7 @@ export default {
             rms.push({
               ...r,
               index: r.lastMessage.date,
+              lastMessage: {...r.lastMessage, content: r.lastMessage.content.trim().substring(0,30)},
               users: r.users.map((u) => {
                 return { ...u, username: u.name, avatar: u.avatar?.url }
               }),
@@ -336,6 +337,7 @@ export default {
       const roomIndex = this.rooms.findIndex((r) => r.id === data.chatMessageAdded.room.id)
       const changedRoom = { ...this.rooms[roomIndex] }
       changedRoom.lastMessage = data.chatMessageAdded
+      changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0,30)
       changedRoom.lastMessageAt = data.chatMessageAdded.date
       this.rooms[roomIndex] = changedRoom
       if (data.chatMessageAdded.room.id === this.selectedRoom?.id) {
@@ -360,6 +362,12 @@ export default {
             content: message.content,
           },
         })
+        const roomIndex = this.rooms.findIndex((r) => r.id === message.roomId)
+        const changedRoom = { ...this.rooms[roomIndex] }
+        console.log(changedRoom)
+        changedRoom.lastMessage = message
+        changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0,30)
+        this.rooms[roomIndex] = changedRoom
       } catch (error) {
         this.$toast.error(error.message)
       }

From 24187bf8a92d08e85988d2dbe9f640d54e9ec9a2 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 11:45:36 +0200
Subject: [PATCH 142/151] increase unreadCount when receiving a message, fix
 problem with empty room

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 320ea3357..9fec8d96f 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -244,8 +244,8 @@ export default {
           if (!rmsIds.find((v) => v === r.id)) {
             rms.push({
               ...r,
-              index: r.lastMessage.date,
-              lastMessage: {...r.lastMessage, content: r.lastMessage.content.trim().substring(0,30)},
+              index: r.lastMessage?.date,
+              lastMessage: {...r.lastMessage, content: r.lastMessage?.content.trim().substring(0,30)},
               users: r.users.map((u) => {
                 return { ...u, username: u.name, avatar: u.avatar?.url }
               }),
@@ -339,6 +339,7 @@ export default {
       changedRoom.lastMessage = data.chatMessageAdded
       changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0,30)
       changedRoom.lastMessageAt = data.chatMessageAdded.date
+      changedRoom.unreadCount++ 
       this.rooms[roomIndex] = changedRoom
       if (data.chatMessageAdded.room.id === this.selectedRoom?.id) {
         this.fetchMessages({ room: this.selectedRoom, options: { refetch: true } })

From 93aaea4aa1bb21c6841728c3c402fec3168ae414 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 11:51:41 +0200
Subject: [PATCH 143/151] only take 2000 chat message characters

---
 backend/src/schema/resolvers/messages.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/messages.ts b/backend/src/schema/resolvers/messages.ts
index 078584c9d..b7e7a7a73 100644
--- a/backend/src/schema/resolvers/messages.ts
+++ b/backend/src/schema/resolvers/messages.ts
@@ -81,7 +81,7 @@ export default {
             createdAt: toString(datetime()),
             id: apoc.create.uuid(),
             indexId: CASE WHEN maxIndex IS NOT NULL THEN maxIndex + 1 ELSE 0 END,
-            content: $content,
+            content: LEFT($content,2000),
             saved: true,
             distributed: false,
             seen: false

From 779d5641592c4386dbafdd5134adafefe486df93 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 11:53:13 +0200
Subject: [PATCH 144/151] lint fixes

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 9fec8d96f..fdf1b3301 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -245,7 +245,10 @@ export default {
             rms.push({
               ...r,
               index: r.lastMessage?.date,
-              lastMessage: {...r.lastMessage, content: r.lastMessage?.content.trim().substring(0,30)},
+              lastMessage: {
+                ...r.lastMessage,
+                content: r.lastMessage?.content.trim().substring(0, 30),
+              },
               users: r.users.map((u) => {
                 return { ...u, username: u.name, avatar: u.avatar?.url }
               }),
@@ -337,9 +340,9 @@ export default {
       const roomIndex = this.rooms.findIndex((r) => r.id === data.chatMessageAdded.room.id)
       const changedRoom = { ...this.rooms[roomIndex] }
       changedRoom.lastMessage = data.chatMessageAdded
-      changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0,30)
+      changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0, 30)
       changedRoom.lastMessageAt = data.chatMessageAdded.date
-      changedRoom.unreadCount++ 
+      changedRoom.unreadCount++
       this.rooms[roomIndex] = changedRoom
       if (data.chatMessageAdded.room.id === this.selectedRoom?.id) {
         this.fetchMessages({ room: this.selectedRoom, options: { refetch: true } })
@@ -365,9 +368,8 @@ export default {
         })
         const roomIndex = this.rooms.findIndex((r) => r.id === message.roomId)
         const changedRoom = { ...this.rooms[roomIndex] }
-        console.log(changedRoom)
         changedRoom.lastMessage = message
-        changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0,30)
+        changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0, 30)
         this.rooms[roomIndex] = changedRoom
       } catch (error) {
         this.$toast.error(error.message)

From 02cbe6c19b4c4d676094f849cd05a740feb2360a Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Wed, 19 Jul 2023 11:56:38 +0200
Subject: [PATCH 145/151] [feature] chat component can now show clickable urls

---
 webapp/components/Chat/Chat.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d7864ebef..d00133a56 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -315,6 +315,12 @@ export default {
           this.messagesLoaded = true
         }
         this.messagePage += 1
+
+        // hacky way to make urls clickable for the chat component
+        // --> linkify in the backend is changing the syntax of the url
+        this.messages.forEach((msg) => {
+          msg.content = msg.content.replace(/<\/?a[^>]*>/g, '')
+        })
       } catch (error) {
         this.messages = []
         this.$toast.error(error.message)

From 6acdde177fc4d0aa5a885927bff337dea174cabf Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 12:13:18 +0200
Subject: [PATCH 146/151] Revert "[feature] chat component can now show
 clickable urls"

This reverts commit 02cbe6c19b4c4d676094f849cd05a740feb2360a.
---
 webapp/components/Chat/Chat.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d00133a56..d7864ebef 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -315,12 +315,6 @@ export default {
           this.messagesLoaded = true
         }
         this.messagePage += 1
-
-        // hacky way to make urls clickable for the chat component
-        // --> linkify in the backend is changing the syntax of the url
-        this.messages.forEach((msg) => {
-          msg.content = msg.content.replace(/<\/?a[^>]*>/g, '')
-        })
       } catch (error) {
         this.messages = []
         this.$toast.error(error.message)

From 256bcc2af7d12e00a9253e92bab515fd2c51d9c6 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 12:13:49 +0200
Subject: [PATCH 147/151] do not filter chat message content with
 xss-middleware

---
 backend/src/middleware/xssMiddleware.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/middleware/xssMiddleware.ts b/backend/src/middleware/xssMiddleware.ts
index ede0cc199..9d8671137 100644
--- a/backend/src/middleware/xssMiddleware.ts
+++ b/backend/src/middleware/xssMiddleware.ts
@@ -3,7 +3,7 @@ import { cleanHtml } from '../middleware/helpers/cleanHtml'
 
 // exclamation mark separetes field names, that should not be sanitized
 const fields = [
-  'content',
+  'content!message',
   'contentExcerpt',
   'reasonDescription',
   'description!embed',

From 4448ecd6fedea53ad45c8e29bd58b8066c4ff5d6 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 14:12:25 +0200
Subject: [PATCH 148/151] fix walk recursive & field definitions

---
 backend/src/helpers/walkRecursive.ts    |  8 ++++----
 backend/src/middleware/xssMiddleware.ts | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/backend/src/helpers/walkRecursive.ts b/backend/src/helpers/walkRecursive.ts
index f560cf9cb..4f7adf497 100644
--- a/backend/src/helpers/walkRecursive.ts
+++ b/backend/src/helpers/walkRecursive.ts
@@ -9,10 +9,10 @@ function walkRecursive(data, fields, fieldName, callback, _key?) {
   if (!Array.isArray(fields)) {
     throw new Error('please provide an fields array for the walkRecursive helper')
   }
-  if (data && typeof data === 'string' && fields.includes(_key)) {
-    // well we found what we searched for, lets replace the value with our callback result
-    const key = _key.split('!')
-    if (key.length === 1 || key[1] !== fieldName) data = callback(data, key[0])
+  // console.log(_key)
+  const fieldDef = fields.find((f) => f.field === _key)
+  if (data && typeof data === 'string' && fieldDef) {
+    if (!fieldDef.excludes?.includes(fieldName)) data = callback(data, _key)
   } else if (data && Array.isArray(data)) {
     // go into the rabbit hole and dig through that array
     data.forEach((res, index) => {
diff --git a/backend/src/middleware/xssMiddleware.ts b/backend/src/middleware/xssMiddleware.ts
index 9d8671137..33fdcf2c6 100644
--- a/backend/src/middleware/xssMiddleware.ts
+++ b/backend/src/middleware/xssMiddleware.ts
@@ -3,11 +3,11 @@ import { cleanHtml } from '../middleware/helpers/cleanHtml'
 
 // exclamation mark separetes field names, that should not be sanitized
 const fields = [
-  'content!message',
-  'contentExcerpt',
-  'reasonDescription',
-  'description!embed',
-  'descriptionExcerpt',
+  { field: 'content', excludes: ['message'] },
+  { field: 'contentExcerpt' },
+  { field: 'reasonDescription' },
+  { field: 'description', excludes: ['embed'] },
+  { field: 'descriptionExcerpt' },
 ]
 
 export default {

From bc1015da8c754bb28ffd0ab1616962b1d1ed7fd9 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 14:22:04 +0200
Subject: [PATCH 149/151] corrected field names to exclude, remove comment

---
 backend/src/helpers/walkRecursive.ts    | 1 -
 backend/src/middleware/xssMiddleware.ts | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/backend/src/helpers/walkRecursive.ts b/backend/src/helpers/walkRecursive.ts
index 4f7adf497..f3be67575 100644
--- a/backend/src/helpers/walkRecursive.ts
+++ b/backend/src/helpers/walkRecursive.ts
@@ -9,7 +9,6 @@ function walkRecursive(data, fields, fieldName, callback, _key?) {
   if (!Array.isArray(fields)) {
     throw new Error('please provide an fields array for the walkRecursive helper')
   }
-  // console.log(_key)
   const fieldDef = fields.find((f) => f.field === _key)
   if (data && typeof data === 'string' && fieldDef) {
     if (!fieldDef.excludes?.includes(fieldName)) data = callback(data, _key)
diff --git a/backend/src/middleware/xssMiddleware.ts b/backend/src/middleware/xssMiddleware.ts
index 33fdcf2c6..c10997e8d 100644
--- a/backend/src/middleware/xssMiddleware.ts
+++ b/backend/src/middleware/xssMiddleware.ts
@@ -3,7 +3,7 @@ import { cleanHtml } from '../middleware/helpers/cleanHtml'
 
 // exclamation mark separetes field names, that should not be sanitized
 const fields = [
-  { field: 'content', excludes: ['message'] },
+  { field: 'content', excludes: ['CreateMessage', 'Message'] },
   { field: 'contentExcerpt' },
   { field: 'reasonDescription' },
   { field: 'description', excludes: ['embed'] },

From 2f76d0b502936d0265dcb6e07eec0409868c568e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 14:38:23 +0200
Subject: [PATCH 150/151] fix lastMessage to contain proper values

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

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index d333deecc..af8a2490f 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -353,7 +353,7 @@ export default {
 
     async sendMessage(message) {
       try {
-        await this.$apollo.mutate({
+        const { data: { CreateMessage: createdMessage }} = await this.$apollo.mutate({
           mutation: createMessageMutation(),
           variables: {
             roomId: message.roomId,
@@ -362,7 +362,7 @@ export default {
         })
         const roomIndex = this.rooms.findIndex((r) => r.id === message.roomId)
         const changedRoom = { ...this.rooms[roomIndex] }
-        changedRoom.lastMessage = message
+        changedRoom.lastMessage = createdMessage
         changedRoom.lastMessage.content = changedRoom.lastMessage.content.trim().substring(0, 30)
         this.rooms[roomIndex] = changedRoom
       } catch (error) {
diff --git a/webapp/graphql/Messages.js b/webapp/graphql/Messages.js
index e6292c509..cb5d37df9 100644
--- a/webapp/graphql/Messages.js
+++ b/webapp/graphql/Messages.js
@@ -4,8 +4,23 @@ export const createMessageMutation = () => {
   return gql`
     mutation ($roomId: ID!, $content: String!) {
       CreateMessage(roomId: $roomId, content: $content) {
+        #_id
         id
+        indexId
         content
+        senderId
+        author {
+          id
+        }
+        username
+        avatar
+        date
+        room {
+          id
+        }
+        saved
+        distributed
+        seen
       }
     }
   `
@@ -26,6 +41,9 @@ export const messageQuery = () => {
         username
         avatar
         date
+        room {
+          id
+        }
         saved
         distributed
         seen

From ea368cd0f308831550ba27d28f682a17ae5e39cc Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 19 Jul 2023 15:09:13 +0200
Subject: [PATCH 151/151] lint fixes

---
 webapp/components/Chat/Chat.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index af8a2490f..63cf045e8 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -353,7 +353,9 @@ export default {
 
     async sendMessage(message) {
       try {
-        const { data: { CreateMessage: createdMessage }} = await this.$apollo.mutate({
+        const {
+          data: { CreateMessage: createdMessage },
+        } = await this.$apollo.mutate({
           mutation: createMessageMutation(),
           variables: {
             roomId: message.roomId,