Merge remote-tracking branch 'nrk/release52' into bbc-release52

Author: Julusian

meteor/server/api/__tests__/cleanup.test.ts

@@ -44,8 +44,8 @@ import {
 	TranslationsBundles,
 	PackageContainerStatuses,
 	TimelineDatastore,
-	SofieIngestDataCache,
 	Notifications,
+	SofieIngestDataCache,
 } from '../../collections'
 import { Collections } from '../../collections/lib'
 import { generateTranslationBundleOriginId } from '../translationsBundles'

meteor/server/api/cleanup.ts

@@ -69,8 +69,8 @@ import {
 	UserActionsLog,
 	Workers,
 	WorkerThreadStatuses,
-	SofieIngestDataCache,
 	Notifications,
+	SofieIngestDataCache,
 } from '../collections'
 import { AsyncOnlyMongoCollection, AsyncOnlyReadOnlyMongoCollection } from '../collections/collection'
 import { getCollectionKey } from '../collections/lib'

meteor/server/publications/system.ts

@@ -1,10 +1,10 @@
 import { meteorPublish } from './lib/lib'
 import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { CoreSystem, Notifications } from '../collections'
-import { SYSTEM_ID } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 import { RundownId, RundownPlaylistId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { triggerWriteAccessBecauseNoCheckNecessary } from '../security/securityVerify'
 import { check } from 'meteor/check'
+import { SYSTEM_ID } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
+import { triggerWriteAccessBecauseNoCheckNecessary } from '../security/securityVerify'
 
 meteorPublish(MeteorPubSub.coreSystem, async function (_token: string | undefined) {
 	triggerWriteAccessBecauseNoCheckNecessary()

packages/job-worker/src/__mocks__/collection.ts

@@ -285,8 +285,8 @@ export function getMockCollections(): {
 			BucketAdLibPieces: new MockMongoCollection<BucketAdLib>(CollectionName.BucketAdLibPieces),
 			ExpectedMediaItems: new MockMongoCollection(CollectionName.ExpectedMediaItems),
 			ExpectedPlayoutItems: new MockMongoCollection<ExpectedPlayoutItem>(CollectionName.ExpectedPlayoutItems),
-			SofieIngestDataCache: new MockMongoCollection<SofieIngestDataCacheObj>(CollectionName.SofieIngestDataCache),
 			Notifications: new MockMongoCollection<DBNotificationObj>(CollectionName.Notifications),
+			SofieIngestDataCache: new MockMongoCollection<SofieIngestDataCacheObj>(CollectionName.SofieIngestDataCache),
 			NrcsIngestDataCache: new MockMongoCollection<NrcsIngestDataCacheObj>(CollectionName.NrcsIngestDataCache),
 			Parts: new MockMongoCollection<DBPart>(CollectionName.Parts),
 			PartInstances: new MockMongoCollection<DBPartInstance>(CollectionName.PartInstances),
@@ -343,8 +343,8 @@ export interface IMockCollections {
 	BucketAdLibPieces: MockMongoCollection<BucketAdLib>
 	ExpectedMediaItems: MockMongoCollection<ExpectedMediaItem>
 	ExpectedPlayoutItems: MockMongoCollection<ExpectedPlayoutItem>
-	SofieIngestDataCache: MockMongoCollection<SofieIngestDataCacheObj>
 	Notifications: MockMongoCollection<DBNotificationObj>
+	SofieIngestDataCache: MockMongoCollection<SofieIngestDataCacheObj>
 	NrcsIngestDataCache: MockMongoCollection<NrcsIngestDataCacheObj>
 	Parts: MockMongoCollection<DBPart>
 	PartInstances: MockMongoCollection<DBPartInstance>

packages/job-worker/src/db/collections.ts

@@ -99,8 +99,8 @@ export interface IDirectCollections {
 	BucketAdLibPieces: ICollection<BucketAdLib>
 	ExpectedMediaItems: ICollection<ExpectedMediaItem>
 	ExpectedPlayoutItems: ICollection<ExpectedPlayoutItem>
-	SofieIngestDataCache: ICollection<SofieIngestDataCacheObj>
 	Notifications: ICollection<DBNotificationObj>
+	SofieIngestDataCache: ICollection<SofieIngestDataCacheObj>
 	NrcsIngestDataCache: ICollection<NrcsIngestDataCacheObj>
 	Parts: ICollection<DBPart>
 	PartInstances: ICollection<DBPartInstance>
@@ -162,11 +162,11 @@ export function getMongoCollections(
 				database.collection(CollectionName.ExpectedPlayoutItems),
 				allowWatchers
 			),
+			Notifications: wrapMongoCollection(database.collection(CollectionName.Notifications), allowWatchers),
 			SofieIngestDataCache: wrapMongoCollection(
 				database.collection(CollectionName.SofieIngestDataCache),
 				allowWatchers
 			),
-			Notifications: wrapMongoCollection(database.collection(CollectionName.Notifications), allowWatchers),
 			NrcsIngestDataCache: wrapMongoCollection(
 				database.collection(CollectionName.NrcsIngestDataCache),
 				allowWatchers

packages/job-worker/src/ingest/createAdlibTestingRundown.ts

@@ -13,12 +13,12 @@ import type {
 	IngestRundown,
 } from '@sofie-automation/blueprints-integration'
 import { logger } from '../logging'
-import { RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { handleUpdatedRundown } from './ingestRundownJobs'
-import { runIngestUpdateOperation } from './runOperation'
 import { NotificationsModelHelper } from '../notifications/NotificationsModelHelper'
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { convertNoteToNotification } from '../notifications/util'
+import { RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { handleUpdatedRundown } from './ingestRundownJobs'
+import { runIngestUpdateOperation } from './runOperation'
 
 export async function handleCreateAdlibTestingRundownForShowStyleVariant(
 	context: JobContext,

packages/job-worker/src/notifications/NotificationsModelHelper.ts

@@ -16,7 +16,6 @@ import { isEqual } from 'underscore'
 interface NotificationsLoadState {
 	dbNotifications: ReadonlyMap<string, DBNotificationObj> | null
 	updatedNotifications: Map<string, Omit<DBNotificationObj, 'created' | 'modified'> | null>
-	// createdTimestamps: Map<string, number>
 
 	removeAllMissing: boolean
 }
@@ -67,7 +66,7 @@ export class NotificationsModelHelper implements INotificationsModel {
 	}
 
 	async getAllNotifications(category: string): Promise<INotificationWithTarget[]> {
-		const notificationsForCategory = this.#getOrCategoryEntry(category)
+		const notificationsForCategory = this.#getOrCreateCategoryEntry(category)
 
 		await this.#getAllNotificationsRaw(notificationsForCategory, category)
 
@@ -99,14 +98,14 @@ export class NotificationsModelHelper implements INotificationsModel {
 	}
 
 	clearNotification(category: string, notificationId: string): void {
-		const notificationsForCategory = this.#getOrCategoryEntry(category)
+		const notificationsForCategory = this.#getOrCreateCategoryEntry(category)
 
 		// The notification may or may not be loaded, but this indicates that to the saving that we intend to delete it
 		notificationsForCategory.updatedNotifications.set(notificationId, null)
 	}
 
 	setNotification(category: string, notification: INotificationWithTarget): void {
-		const notificationsForCategory = this.#getOrCategoryEntry(category)
+		const notificationsForCategory = this.#getOrCreateCategoryEntry(category)
 
 		const fullCategory = this.#getFullCategoryName(category)
 		notificationsForCategory.updatedNotifications.set(notification.id, {
@@ -120,7 +119,7 @@ export class NotificationsModelHelper implements INotificationsModel {
 	}
 
 	clearAllNotifications(category: string): void {
-		const notificationsForCategory = this.#getOrCategoryEntry(category)
+		const notificationsForCategory = this.#getOrCreateCategoryEntry(category)
 
 		// Tell this store that any documents not in the `updatedNotifications` should be deleted
 		notificationsForCategory.removeAllMissing = true
@@ -129,7 +128,7 @@ export class NotificationsModelHelper implements INotificationsModel {
 		notificationsForCategory.updatedNotifications.clear()
 	}
 
-	#getOrCategoryEntry(category: string): NotificationsLoadState {
+	#getOrCreateCategoryEntry(category: string): NotificationsLoadState {
 		let notificationsForCategory = this.#notificationsByCategory.get(category)
 		if (!notificationsForCategory) {
 			notificationsForCategory = {
@@ -199,9 +198,7 @@ export class NotificationsModelHelper implements INotificationsModel {
 							updates.push({
 								replaceOne: {
 									filter: {
-										category: this.#getFullCategoryName(category),
-										localId: localId,
-										'relatedTo.studioId': this.#context.studioId,
+										_id: updatedNotification._id,
 									},
 									replacement: {
 										...updatedNotification,
@@ -218,9 +215,9 @@ export class NotificationsModelHelper implements INotificationsModel {
 						updates.push({
 							deleteMany: {
 								filter: {
+									'relatedTo.studioId': this.#context.studioId,
 									category: this.#getFullCategoryName(category),
 									localId: { $nin: localIdsToKeep },
-									'relatedTo.studioId': this.#context.studioId,
 								},
 							},
 						})
@@ -229,9 +226,9 @@ export class NotificationsModelHelper implements INotificationsModel {
 						updates.push({
 							deleteMany: {
 								filter: {
+									'relatedTo.studioId': this.#context.studioId,
 									category: this.#getFullCategoryName(category),
 									localId: { $in: localIdsToDelete },
-									'relatedTo.studioId': this.#context.studioId,
 								},
 							},
 						})

packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts

@@ -671,8 +671,8 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 			...writePartInstancesAndPieceInstances(this.context, this.allPartInstances),
 			writeAdlibTestingSegments(this.context, this.rundownsImpl),
 			this.#baselineHelper.saveAllToDatabase(),
-			this.context.saveRouteSetChanges(),
 			this.#notificationsHelper.saveAllToDatabase(),
+			this.context.saveRouteSetChanges(),
 		])
 
 		this.#playlistHasChanged = false