chore: simplify notification merge logic

Author: justandras

packages/live-status-gateway/src/collections/notifications/notificationsHandler.ts

@@ -8,7 +8,6 @@ import { DBNotificationObj } from '@sofie-automation/corelib/dist/dataModel/Noti
 import { PlaylistNotificationsHandler } from './playlistNotificationsHandler.js'
 import { RundownNotificationsHandler } from './rundownNotificationsHandler.js'
 import _ from 'underscore'
-import { unprotectString } from '@sofie-automation/server-core-integration'
 
 const THROTTLE_PERIOD_MS = 100
 
@@ -59,33 +58,18 @@ export class NotificationsHandler extends PublicationCollection<
 	}
 
 	private updateCollectionData(): boolean {
-		const merged = new Map<string, DBNotificationObj>()
+		let merged: DBNotificationObj[] = []
 
-		// Pull data from the playlist notifications handler's collection
-		if (this._playlistNotificationsHandler) {
-			const playlistDocs = this._playlistNotificationsHandler.getPublishedDocs()
-			for (const d of playlistDocs) {
-				if (d._id && !merged.has(unprotectString(d._id))) {
-					merged.set(unprotectString(d._id), d)
-				}
-			}
+		if (this._playlistNotificationsHandler && this._rundownNotificationsHandler) {
+			merged = [
+				...this._playlistNotificationsHandler.getPublishedDocs(),
+				...this._rundownNotificationsHandler.getPublishedDocs(),
+			]
 		}
 
-		// Pull data from the rundown notifications handler's collection
-		if (this._rundownNotificationsHandler) {
-			const rundownDocs = this._rundownNotificationsHandler.getPublishedDocs()
-			for (const d of rundownDocs) {
-				if (d._id && !merged.has(unprotectString(d._id))) {
-					merged.set(unprotectString(d._id), d)
-				}
-			}
-		}
-
-		const newNotifications = Array.from(merged.values())
-
-		const hasAnythingChanged = !_.isEqual(this._collectionData, newNotifications)
+		const hasAnythingChanged = !_.isEqual(this._collectionData, merged)
 		if (hasAnythingChanged) {
-			this._collectionData = newNotifications
+			this._collectionData = merged
 		}
 
 		return hasAnythingChanged

packages/live-status-gateway/src/collections/notifications/playlistNotificationsHandler.ts

@@ -8,7 +8,10 @@ import { Logger } from 'winston'
 import { CoreHandler } from '../../coreHandler.js'
 import { CollectionHandlers } from '../../liveStatusServer.js'
 import { PublicationCollection } from '../../publicationCollection.js'
-import { DBNotificationObj } from '@sofie-automation/corelib/dist/dataModel/Notifications'
+import {
+	DBNotificationObj,
+	DBNotificationTargetRundownPlaylist,
+} from '@sofie-automation/corelib/dist/dataModel/Notifications'
 
 const PLAYLIST_KEYS = ['_id'] as const
 type Playlist = PickKeys<DBRundownPlaylist, typeof PLAYLIST_KEYS>
@@ -44,7 +47,15 @@ export class PlaylistNotificationsHandler extends PublicationCollection<
 
 	private updateCollectionData() {
 		const collection = this.getCollectionOrFail()
-		this._collectionData = collection.find({})
+		this._collectionData = collection.find((doc: DBNotificationObj) => {
+			const relatedTo: DBNotificationTargetRundownPlaylist | undefined = (doc.relatedTo as any).playlistId
+				? (doc.relatedTo as DBNotificationTargetRundownPlaylist)
+				: undefined
+
+			return (
+				relatedTo && relatedTo.playlistId === this._currentPlaylistId && this._studioId === relatedTo.studioId
+			)
+		})
 	}
 
 	private clearCollectionData() {

packages/live-status-gateway/src/collections/notifications/rundownNotificationsHandler.ts

@@ -7,7 +7,7 @@ import { Logger } from 'winston'
 import { CoreHandler } from '../../coreHandler.js'
 import { CollectionHandlers } from '../../liveStatusServer.js'
 import { PublicationCollection } from '../../publicationCollection.js'
-import { DBNotificationObj } from '@sofie-automation/corelib/dist/dataModel/Notifications'
+import { DBNotificationObj, DBNotificationTargetRundown } from '@sofie-automation/corelib/dist/dataModel/Notifications'
 import { PickKeys } from '@sofie-automation/shared-lib/dist/lib/types'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 
@@ -47,7 +47,17 @@ export class RundownNotificationsHandler extends PublicationCollection<
 
 	private updateCollectionData() {
 		const collection = this.getCollectionOrFail()
-		this._collectionData = collection.find({})
+		this._collectionData = collection.find((doc: DBNotificationObj) => {
+			const relatedTo: DBNotificationTargetRundown | undefined = (doc.relatedTo as any).rundownId
+				? (doc.relatedTo as DBNotificationTargetRundown)
+				: undefined
+
+			return (
+				relatedTo &&
+				this._currentRundownIds.includes(relatedTo.rundownId) &&
+				this._studioId === relatedTo.studioId
+			)
+		})
 	}
 
 	private clearCollectionData() {