From 8f5102b3e4128d53dca8abba2b25fd85e029ec2c Mon Sep 17 00:00:00 2001
From: SebClem <seb6596@gmail.com>
Date: Wed, 26 Oct 2022 14:09:10 +0200
Subject: [PATCH] :hammer: Message can be readed

---
 nextcloud_backup/backend/src/routes/messages.ts    | 10 +++++++++-
 .../backend/src/tools/messageManager.ts            | 13 +++++++++++++
 .../frontend/src/components/MessageBar.vue         | 14 ++++++++++----
 .../frontend/src/components/NavbarComponent.vue    | 11 ++++++++---
 .../frontend/src/services/messageService.ts        |  4 ++++
 5 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/nextcloud_backup/backend/src/routes/messages.ts b/nextcloud_backup/backend/src/routes/messages.ts
index 58c512e..dd920ea 100644
--- a/nextcloud_backup/backend/src/routes/messages.ts
+++ b/nextcloud_backup/backend/src/routes/messages.ts
@@ -5,6 +5,14 @@ const messageRouter = express.Router();
 
 messageRouter.get('/', (req, res, next)=>{
   res.json(messageManager.get())
-})
+});
+
+messageRouter.patch('/:messageId/readed', (req, res, next)=>{
+  if(messageManager.markReaded(req.params.messageId)){
+    res.json(messageManager.get());
+  }else{
+    res.status(404).send();
+  }
+});
 
 export default messageRouter;
diff --git a/nextcloud_backup/backend/src/tools/messageManager.ts b/nextcloud_backup/backend/src/tools/messageManager.ts
index b0915ad..7b9d0f3 100644
--- a/nextcloud_backup/backend/src/tools/messageManager.ts
+++ b/nextcloud_backup/backend/src/tools/messageManager.ts
@@ -40,6 +40,19 @@ class MessageManager {
   public get(){
     return this.messages;
   }
+
+  public getById(id: string){
+    return this.messages.find(value=>value.id == id);
+  } 
+
+  public markReaded(id: string){
+    const index = this.messages.findIndex(value=>value.id == id);
+    if(index == -1){
+      return false;
+    }
+    this.messages[index].viewed = true;
+    return true;
+  }
 }
 
 
diff --git a/nextcloud_backup/frontend/src/components/MessageBar.vue b/nextcloud_backup/frontend/src/components/MessageBar.vue
index 71f527c..147499a 100644
--- a/nextcloud_backup/frontend/src/components/MessageBar.vue
+++ b/nextcloud_backup/frontend/src/components/MessageBar.vue
@@ -36,7 +36,7 @@
                 <v-btn
                   color="success"
                   variant="text"
-                  @click.stop
+                  @click="markReaded(item.id)"
                   icon
                   v-if="!item.viewed"
                   size="small"
@@ -66,7 +66,7 @@
 </template>
 
 <script setup lang="ts">
-import { getMessages } from "@/services/messageService";
+import * as messageService from "@/services/messageService";
 import { useMessageStore } from "@/stores/message";
 import { MessageType } from "@/types/messages";
 import { DateTime } from "luxon";
@@ -76,10 +76,10 @@ import { onBeforeUnmount, ref } from "vue";
 const messagesStore = useMessageStore();
 const { messages } = storeToRefs(messagesStore);
 
-const interval = setInterval(refreshMessages, 1000);
+const interval = setInterval(refreshMessages, 2000);
 
 function refreshMessages() {
-  getMessages().then((values) => {
+  messageService.getMessages().then((values) => {
     messages.value = values;
   });
 }
@@ -142,6 +142,12 @@ function getTimeDelta(time: string) {
 const show = ref<boolean[]>([]);
 refreshMessages();
 
+function markReaded(id: string) {
+  messageService.markRead(id).then((values) => {
+    messages.value = values;
+  });
+}
+
 onBeforeUnmount(() => {
   clearInterval(interval);
 });
diff --git a/nextcloud_backup/frontend/src/components/NavbarComponent.vue b/nextcloud_backup/frontend/src/components/NavbarComponent.vue
index 848d1bd..9b84949 100644
--- a/nextcloud_backup/frontend/src/components/NavbarComponent.vue
+++ b/nextcloud_backup/frontend/src/components/NavbarComponent.vue
@@ -9,10 +9,15 @@
       </div>
     </v-app-bar-title>
     <v-spacer></v-spacer>
-    <v-btn icon id="message-btn" >
-      <v-badge color="error" :content="countUnreadMessages">
-        <v-icon :class="{ shake: haveUnreadMessages }">mdi-bell</v-icon>
+    <v-btn icon id="message-btn">
+      <v-badge
+        color="error"
+        :content="countUnreadMessages"
+        v-if="haveUnreadMessages"
+      >
+        <v-icon class="shake">mdi-bell</v-icon>
       </v-badge>
+      <v-icon v-else>mdi-bell</v-icon>
     </v-btn>
     <v-menu width="210px">
       <template v-slot:activator="{ props }">
diff --git a/nextcloud_backup/frontend/src/services/messageService.ts b/nextcloud_backup/frontend/src/services/messageService.ts
index e55871d..08a9821 100644
--- a/nextcloud_backup/frontend/src/services/messageService.ts
+++ b/nextcloud_backup/frontend/src/services/messageService.ts
@@ -4,3 +4,7 @@ import kyClient from "./kyClient";
 export function getMessages() {
   return kyClient.get("messages").json<Message[]>();
 }
+
+export function markRead(id: string) {
+  return kyClient.patch(`messages/${encodeURI(id)}/readed`).json<Message[]>();
+}