Merge pull request #487 from sinfo/fran/notifications

Notifications

Author: luckspt

README.md

@@ -8,4 +8,4 @@ Version 2 of eventdeck
 
 ## Documentation
 
-- swagger: http://petstore.swagger.io/?url=http%3A%2F%2Flocalhost%3A8080%2Fstatic%2Fswagger.json#/auth/authCallback
+- swagger: make run-doc

backend/src/mongodb/notification.go

@@ -264,3 +264,19 @@ func (n *NotificationsType) DeleteNotification(notificationID primitive.ObjectID
 
 	return &notification, nil
 }
+
+// DeleteAllMemberNotifications deletes all notifications for a member
+func (n *NotificationsType) DeleteAllMemberNotifications(memberID primitive.ObjectID) (int64, error) {
+	ctx = context.Background()
+
+	filter := bson.M{
+		"member": memberID,
+	}
+
+	deleteResult, err := n.Collection.DeleteMany(ctx, filter)
+	if err != nil {
+		return 0, err
+	}
+
+	return deleteResult.DeletedCount, nil
+}

backend/src/router/init.go

@@ -250,6 +250,7 @@ func InitializeRouter() {
 	meRouter.HandleFunc("/image", authMember(setMyImage)).Methods("POST")
 	meRouter.HandleFunc("/notifications", authMember(getMyNotifications)).Methods("GET")
 	meRouter.HandleFunc("/notifications/{id}", authMember(deleteMyNotification)).Methods("DELETE")
+	meRouter.HandleFunc("/notifications", authMember(deleteAllMyNotifications)).Methods("DELETE")
 
 	// member handlers
 	memberRouter := r.PathPrefix("/members").Subrouter()

backend/src/router/me.go

@@ -255,3 +255,28 @@ func deleteMyNotification(w http.ResponseWriter, r *http.Request) {
 
 	json.NewEncoder(w).Encode(notification)
 }
+
+func deleteAllMyNotifications(w http.ResponseWriter, r *http.Request) {
+
+	credentials, ok := r.Context().Value(credentialsKey).(models.AuthorizationCredentials)
+
+	if !ok {
+		http.Error(w, "Could not parse credentials", http.StatusBadRequest)
+		return
+	}
+
+	memberID := credentials.ID
+
+	if _, err := mongodb.Members.GetMember(memberID); err != nil {
+		http.Error(w, "Could not find member: " + err.Error(), http.StatusNotFound)
+		return
+	}
+
+	count, err := mongodb.Notifications.DeleteAllMemberNotifications(memberID)
+	if err != nil {
+		http.Error(w, "Could not delete notifications: " + err.Error(), http.StatusExpectationFailed)
+		return
+	}
+
+	json.NewEncoder(w).Encode(map[string]int64{"deletedCount": count})
+}

backend/static/swagger.json

@@ -38,5 +38,49 @@
                 "description": "Unauthorized"
             }
         }
+    },
+    
+    "delete": {
+        "tags": [
+            "me",
+            "notifications"
+        ],
+        "summary": "Delete all my notifications",
+        "operationId": "deleteAllMyNotifications",
+        "consumes": [
+            "multipart/form-data"
+        ],
+        "produces": [
+            "application/json"
+        ],
+        "security": [
+            {
+                "Bearer": []
+            }
+        ],
+        "parameters": [],
+        "responses": {
+            "200": {
+                "description": "Deleted notifications count",
+                "schema": {
+                    "type": "object",
+                    "properties": {
+                        "deletedCount": {
+                            "type": "integer",
+                            "format": "int64"
+                        }
+                    }
+                }
+            },
+            "417": {
+                "description": "Unable to delete notifications"
+            },
+            "404": {
+                "description": "Member not found"
+            },
+            "401": {
+                "description": "Unauthorized"
+            }
+        }
     }
 }

backend/swagger/me-notifications.json

@@ -0,0 +1,6 @@
+import type { Notification } from "@/dto/notifications";
+import { instance } from ".";
+
+export const getMyNotifications = () => instance.get<Notification[]>('/me/notifications');
+export const deleteMyNotification = (id: string) => instance.delete<Notification>(`/me/notifications/${id}`);
+export const deleteAllMyNotifications = () => instance.delete<void>('/me/notifications');

frontend/src/api/notifications.ts

@@ -19,6 +19,7 @@ import CompanyOrSpeakerAutocompleteWithDialog from "./CompanyOrSpeakerAutocomple
 import type { Company } from "@/dto/companies";
 import type { Speaker } from "@/dto/speakers";
 import { useMagicKeys } from "@vueuse/core";
+import Notification from "./navbar/Notification.vue";
 
 const isOpen = ref(false);
 const authStore = useAuthStore();
@@ -29,6 +30,8 @@ const logout = () => {
   router.push({ name: "landing" });
 };
 
+
+
 interface NavigationItem {
   name: string;
   to: RouteLocationRaw;
@@ -96,67 +99,45 @@ watch(shortcutLinux, () => {
 </script>
 
 <template>
-  <section
-    class="fixed top-0 left-0 right-0 z-50 w-full flex items-center bg-white py-4 border-b border-gray-200"
-  >
+  <section class="fixed top-0 left-0 right-0 z-50 w-full flex items-center bg-white py-4 border-b border-gray-200">
     <div class="container mx-auto px-4 md:px-6 lg:px-8">
       <nav class="flex items-center justify-between">
         <div class="flex items-center gap-3">
-          <RouterLink :to="{ name: 'dashboard' }" class="text-2xl font-bold"
-            >Deck</RouterLink
-          >
+          <RouterLink :to="{ name: 'dashboard' }" class="text-2xl font-bold">Deck</RouterLink>
 
           <Select v-model="eventStore.selectedEvent">
             <SelectTrigger :loading="eventsLoading">
               <SelectValue placeholder="Edition" />
             </SelectTrigger>
             <SelectContent>
-              <SelectItem
-                v-for="event in sortedEvents"
-                :key="event.id"
-                :value="event"
-              >
+              <SelectItem v-for="event in sortedEvents" :key="event.id" :value="event">
                 {{ event.name }}
               </SelectItem>
             </SelectContent>
           </Select>
         </div>
 
-        <CompanyOrSpeakerAutocompleteWithDialog
-          :autofocus="showSuggestions"
-          :force-show-suggestions="showSuggestions"
-          class="hidden md:inline w-full px-3"
-          placeholder="Search"
-          @company-selected="companySelected"
-          @speaker-selected="speakerSelected"
-          show-create
-        />
+        <CompanyOrSpeakerAutocompleteWithDialog :autofocus="showSuggestions" :force-show-suggestions="showSuggestions"
+          class="hidden md:inline w-full px-3" placeholder="Search" @company-selected="companySelected"
+          @speaker-selected="speakerSelected" show-create />
 
         <!-- Desktop Navigation -->
         <div class="hidden md:flex items-center space-x-4">
-          <RouterLink
-            v-for="item in navigation"
-            :key="item.name"
-            :to="item.to"
-            class="text-gray-600 hover:text-gray-900"
-            :title="item.name"
-          >
+            <Notification />
+          <RouterLink v-for="item in navigation" :key="item.name" :to="item.to"
+            class="text-gray-600 hover:text-gray-900" :title="item.name">
             <component v-if="item.icon" :is="item.icon" class="h-5 w-5" />
             <span v-else>{{ item.name }}</span>
           </RouterLink>
 
-          <Button
-            variant="ghost"
-            size="sm"
-            @click="logout"
-            class="text-gray-600 hover:text-gray-900"
-          >
+          <Button variant="ghost" size="sm" @click="logout" class="text-gray-600 hover:text-gray-900">
             <LogOut class="h-4 w-4" />
           </Button>
         </div>
 
         <!-- Mobile Navigation Button -->
         <div class="md:hidden">
+          <Notification />
           <Button variant="ghost" @click="isOpen = !isOpen">
             <Menu v-if="!isOpen" class="h-6 w-6" />
             <X v-else class="h-6 w-6" />
@@ -165,35 +146,21 @@ watch(shortcutLinux, () => {
       </nav>
 
       <!-- Mobile Navigation Menu -->
-      <div
-        v-if="isOpen"
-        class="md:hidden absolute top-full left-0 w-full bg-white border-b border-gray-200 py-4"
-      >
-        <CompanyOrSpeakerAutocompleteWithDialog
-          class="w-full px-3 pb-3"
-          placeholder="Search"
-          @company-selected="companySelected"
-          @speaker-selected="speakerSelected"
-        />
+      <div v-if="isOpen" class="md:hidden absolute top-full left-0 w-full bg-white border-b border-gray-200 py-4">
+        <CompanyOrSpeakerAutocompleteWithDialog class="w-full px-3 pb-3" placeholder="Search"
+          @company-selected="companySelected" @speaker-selected="speakerSelected" />
 
         <div class="container mx-auto px-4">
           <div class="flex flex-col space-y-4">
-            <RouterLink
-              v-for="item in navigation"
-              :key="item.name"
-              :to="item.to"
-              class="text-gray-600 hover:text-gray-900 flex items-center gap-2"
-            >
+            
+            <RouterLink v-for="item in navigation" :key="item.name" :to="item.to"
+              class="text-gray-600 hover:text-gray-900 flex items-center gap-2">
               <component v-if="item.icon" :is="item.icon" class="h-4 w-4" />
               <span>{{ item.name }}</span>
             </RouterLink>
 
-            <Button
-              variant="ghost"
-              size="sm"
-              @click="logout"
-              class="text-gray-600 hover:text-gray-900 justify-start p-0"
-            >
+            <Button variant="ghost" size="sm" @click="logout"
+              class="text-gray-600 hover:text-gray-900 justify-start p-0">
               <LogOut class="h-4 w-4 mr-2" />
               Logout
             </Button>