refactor: improve notification handling and type safety in

Author: Francisca105

backend/src/mongodb/notification.go

@@ -194,7 +194,7 @@ func (n *NotificationsType) NotifyMember(memberID primitive.ObjectID, data Creat
 		return
 	}
 
-	notification, err = n.GetNotification(insertResult.InsertedID.(primitive.ObjectID))
+	_, err = n.GetNotification(insertResult.InsertedID.(primitive.ObjectID))
 	if err != nil {
 		log.Println("unable to retrieve created notification: ", err.Error())
 		return
@@ -229,6 +229,16 @@ func (n *NotificationsType) GetMemberNotifications(memberID primitive.ObjectID)
 		return nil, err
 	}
 
+	type savedNotif struct {
+		notifMap  map[string]interface{}
+		speakerID *primitive.ObjectID
+		companyID *primitive.ObjectID
+	}
+
+	var saved = make([]savedNotif, 0)
+	speakerSet := make(map[primitive.ObjectID]struct{})
+	companySet := make(map[primitive.ObjectID]struct{})
+
 	for cur.Next(ctx) {
 
 		// decode into models.Notification first
@@ -261,27 +271,81 @@ func (n *NotificationsType) GetMemberNotifications(memberID primitive.ObjectID)
 			notifMap["session"] = notification.Session.Hex()
 		}
 
-		// Try to embed the speaker object if present
+		var sID *primitive.ObjectID
+		var cID *primitive.ObjectID
+
 		if notification.Speaker != nil {
-			if sp, err := Speakers.GetSpeaker(*notification.Speaker); err == nil {
-				// embed full speaker object
-				notifMap["speaker"] = sp
-			} else {
-				// fallback to id
-				notifMap["speaker"] = notification.Speaker.Hex()
-			}
+			sID = notification.Speaker
+			// tentatively store the hex (fallback) until we embed
+			notifMap["speaker"] = notification.Speaker.Hex()
+			speakerSet[*sID] = struct{}{}
 		}
 
-		// Try to embed the company object if present
 		if notification.Company != nil {
-			if co, err := Companies.GetCompany(*notification.Company); err == nil {
-				notifMap["company"] = co
-			} else {
-				notifMap["company"] = notification.Company.Hex()
+			cID = notification.Company
+			notifMap["company"] = notification.Company.Hex()
+			companySet[*cID] = struct{}{}
+		}
+
+		saved = append(saved, savedNotif{notifMap: notifMap, speakerID: sID, companyID: cID})
+	}
+
+	// If we encountered speaker or company IDs, fetch them in batch and embed
+	var speakersByID = make(map[primitive.ObjectID]*models.Speaker)
+	var companiesByID = make(map[primitive.ObjectID]*models.Company)
+
+	if len(speakerSet) > 0 {
+		ids := make([]primitive.ObjectID, 0, len(speakerSet))
+		for id := range speakerSet {
+			ids = append(ids, id)
+		}
+
+		// batch find speakers
+		spCur, err := Speakers.Collection.Find(ctx, bson.M{"_id": bson.M{"$in": ids}})
+		if err == nil {
+			for spCur.Next(ctx) {
+				var sp models.Speaker
+				if err := spCur.Decode(&sp); err == nil {
+					speakersByID[sp.ID] = &sp
+				}
+			}
+			spCur.Close(ctx)
+		}
+	}
+
+	if len(companySet) > 0 {
+		ids := make([]primitive.ObjectID, 0, len(companySet))
+		for id := range companySet {
+			ids = append(ids, id)
+		}
+
+		// batch find companies
+		coCur, err := Companies.Collection.Find(ctx, bson.M{"_id": bson.M{"$in": ids}})
+		if err == nil {
+			for coCur.Next(ctx) {
+				var co models.Company
+				if err := coCur.Decode(&co); err == nil {
+					companiesByID[co.ID] = &co
+				}
+			}
+			coCur.Close(ctx)
+		}
+	}
+
+	// build final notifications embedding the fetched objects when available
+	for _, s := range saved {
+		if s.speakerID != nil {
+			if sp, ok := speakersByID[*s.speakerID]; ok {
+				s.notifMap["speaker"] = sp
+			}
+		}
+		if s.companyID != nil {
+			if co, ok := companiesByID[*s.companyID]; ok {
+				s.notifMap["company"] = co
 			}
 		}
 
-		notifications = append(notifications, notifMap)
+		notifications = append(notifications, s.notifMap)
 	}
 
 	if err := cur.Err(); err != nil {

frontend/src/components/navbar/Notification.vue

@@ -21,32 +21,33 @@ import Image from "../Image.vue";
 
 const getActor = (notification: Notification) => {
   if (notification.speaker && typeof notification.speaker === "object") {
+    const speaker = notification.speaker as Speaker;
     return {
-      id: (notification.speaker as Speaker).id,
-      name: (notification.speaker as Speaker).name,
-      avatar:
-        (notification.speaker as Speaker).imgs.internal ||
-        (notification.speaker as Speaker).imgs.speaker,
+      id: speaker.id,
+      name: speaker.name,
+      avatar: speaker.imgs.internal || speaker.imgs.speaker,
     };
   }
   if (notification.company && typeof notification.company === "object") {
+    const company = notification.company as Company;
     return {
-      id: (notification.company as Company).id,
-      name: (notification.company as Company).name,
-      avatar:
-        (notification.company as Company).imgs?.internal ||
-        (notification.company as Company).imgs?.public,
+      id: company.id,
+      name: company.name,
+      avatar: company.imgs?.internal || company.imgs?.public,
     };
   }
   return null;
 };
 
-const makeMessage = (notification: Notification) => {
+const makeMessage = (
+  notification: Notification,
+  actorArg?: { id?: string; name?: string; avatar?: string } | null,
+) => {
   const thread = notification.thread;
   const kind = notification.kind;
-  // Actor is the entity (company/speaker) related to the notification
-  const actor = getActor(notification);
-  const actorName = actor ? actor.name : "";
+  // Actor is the entity (company/speaker) related to the notification. Prefer the precomputed actor when provided.
+  const actor = actorArg ?? getActor(notification);
+  const actorName = actor && actor.name ? actor.name : "";
   const isActorPresent = actorName.length > 0;
 
   switch (kind) {
@@ -102,10 +103,18 @@ const { data: notifications } = useQuery({
   query: getMyNotifications,
 });
 
-const notificationItems = computed(() => {
+type NotificationEntry = {
+  n: Notification;
+  actor: { id?: string; name?: string; avatar?: string } | null;
+};
+
+const notificationItems = computed<NotificationEntry[]>(() => {
   const items = (notifications.value?.data as Notification[]) || [];
   // sort newest first — try common timestamp fields (date, createdAt, created_at)
-  return items.slice().sort((a, b) => b.date?.localeCompare(a.date ?? "") || 0);
+  const sorted = items
+    .slice()
+    .sort((a, b) => b.date?.localeCompare(a.date ?? "") || 0);
+  return sorted.map((n) => ({ n, actor: getActor(n) }));
 });
 
 const _deleteNotificationMutation = useDeleteNotificationMutation();
@@ -116,7 +125,7 @@ const removeNotification = async (id: string) => {
 };
 
 const removeAllNotifications = async () => {
-  const ids = notificationItems.value.map((i) => i.id);
+  const ids = notificationItems.value.map((i) => i.n.id);
   if (!ids.length) return;
   await _deleteAllNotificationsMutation.mutate();
 };
@@ -189,29 +198,31 @@ const onNotificationClick = async (n: Notification) => {
 
         <ul>
           <li
-            v-for="n in notificationItems"
-            :key="n.id"
+            v-for="entry in notificationItems"
+            :key="entry.n.id"
             class="flex items-center justify-between px-3 py-2 hover:bg-gray-50 cursor-pointer"
-            @click="onNotificationClick(n)"
+            @click="onNotificationClick(entry.n)"
           >
             <div class="flex items-center gap-3">
               <Image
-                v-if="getActor(n)?.avatar"
-                :src="getActor(n)?.avatar"
+                v-if="entry.actor?.avatar"
+                :src="entry.actor?.avatar"
                 alt="actor"
                 class="h-8 w-8 rounded-full object-cover"
               />
               <div class="text-sm">
-                <div class="font-medium">{{ makeMessage(n) }}</div>
+                <div class="font-medium">
+                  {{ makeMessage(entry.n, entry.actor) }}
+                </div>
                 <div class="text-xs text-gray-500">
-                  {{ getActor(n)?.name || n.date }}
+                  {{ entry.actor?.name || entry.n.date }}
                 </div>
               </div>
             </div>
             <div>
               <button
                 class="text-red-500 text-sm"
-                @click.stop.prevent="removeNotification(n.id)"
+                @click.stop.prevent="removeNotification(entry.n.id)"
               >
                 <Trash :size="16" />
               </button>

frontend/src/mutations/notifications.ts

@@ -18,7 +18,7 @@ export const useDeleteNotificationMutation = defineMutation(() => {
         data: [],
       };
       const newData = (prev.data || []).filter(
-        (n) => (n as Notification).id !== id,
+        (n: Notification) => n.id !== id,
       );
       queryCache.setQueryData(["notifications"], { ...prev, data: newData });
       // cancel ongoing queries