chore: tidy

Author: Julusian

packages/job-worker/src/blueprints/context/watchedPackages.ts

@@ -1,6 +1,6 @@
 import { PackageInfoDB } from '@sofie-automation/corelib/dist/dataModel/PackageInfos'
 import { JobContext } from '../../jobs'
-import { ExpectedPackageId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { BucketId, ExpectedPackageId, RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { Filter as FilterQuery } from 'mongodb'
 import { PackageInfo } from '@sofie-automation/blueprints-integration'
 import { unprotectObjectArray } from '@sofie-automation/corelib/dist/protectedString'
@@ -10,7 +10,7 @@ import {
 	stripExpectedPackageDBToIngestExpectedPackage,
 	type IngestExpectedPackage,
 } from '../../ingest/model/IngestExpectedPackage'
-import { ExpectedPackageDB } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
+import type { ExpectedPackageIngestSource } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 
 /**
  * This is a helper class to simplify exposing packageInfo to various places in the blueprints
@@ -41,12 +41,18 @@ export class WatchedPackagesHelper {
 	 */
 	static async create(
 		context: JobContext,
-		filter: FilterQuery<Omit<ExpectedPackageDB, 'studioId'>>
+		rundownId: RundownId | null,
+		bucketId: BucketId | null,
+		filterIngestSources: FilterQuery<ExpectedPackageIngestSource>
 	): Promise<WatchedPackagesHelper> {
 		// Load all the packages and the infos that are watched
 		const watchedPackages = await context.directCollections.ExpectedPackages.findFetch({
-			...filter,
 			studioId: context.studioId,
+			rundownId: rundownId,
+			bucketId: bucketId,
+			ingestSources: {
+				$elemMatch: filterIngestSources,
+			},
 		})
 		const watchedPackageInfos = await context.directCollections.PackageInfos.findFetch({
 			studioId: context.studioId,

packages/job-worker/src/ingest/bucket/import.ts

@@ -270,17 +270,12 @@ async function generateBucketAdlibForVariant(
 ): Promise<IBlueprintAdLibPiece | IBlueprintActionManifest | null> {
 	if (!blueprint.blueprint.getAdlibItem) return null
 
-	const watchedPackages = await WatchedPackagesHelper.create(context, {
-		bucketId,
-		ingestSources: {
-			$elemMatch: {
-				fromPieceType: {
-					$in: [ExpectedPackageDBType.BUCKET_ADLIB, ExpectedPackageDBType.BUCKET_ADLIB_ACTION],
-				},
-				// We don't know what the `pieceId` will be, but we do know the `externalId`
-				pieceExternalId: payload.externalId,
-			},
+	const watchedPackages = await WatchedPackagesHelper.create(context, null, bucketId, {
+		fromPieceType: {
+			$in: [ExpectedPackageDBType.BUCKET_ADLIB, ExpectedPackageDBType.BUCKET_ADLIB_ACTION],
 		},
+		// We don't know what the `pieceId` will be, but we do know the `externalId`
+		pieceExternalId: payload.externalId,
 	})
 
 	const contextForVariant = new ShowStyleUserContext(

packages/job-worker/src/ingest/model/IngestModel.ts

@@ -204,12 +204,6 @@ export interface IngestModel extends IngestModelReadonly, BaseModel, INotificati
 	 */
 	setExpectedMediaItemsForRundownBaseline(expectedMediaItems: ExpectedMediaItemRundown[]): void
 
-	// /**
-	//  * Set the ExpectedPackages for the baseline of this Rundown
-	//  * @param expectedPackages The new ExpectedPackages
-	//  */
-	// setExpectedPackagesForRundownBaseline(expectedPackages: ExpectedPackageForIngestModelBaseline[]): void
-
 	/**
 	 * Set the data for this Rundown.
 	 * This will either update or create the Rundown

packages/job-worker/src/ingest/model/implementation/IngestModelImpl.ts

@@ -404,10 +404,6 @@ export class IngestModelImpl implements IngestModel, IngestDatabasePersistedMode
 	setExpectedMediaItemsForRundownBaseline(expectedMediaItems: ExpectedMediaItemRundown[]): void {
 		this.#rundownBaselineExpectedPackagesStore.setExpectedMediaItems(expectedMediaItems)
 	}
-	// setExpectedPackagesForRundownBaseline(expectedPackages: ExpectedPackageForIngestModelBaseline[]): void {
-	// 	// Future: should these be here, or held as part of each adlib?
-	// 	this.#rundownBaselineExpectedPackagesStore.setExpectedPackages(expectedPackages)
-	// }
 
 	setRundownData(
 		rundownData: IBlueprintRundown,

packages/job-worker/src/playout/adlibAction.ts

@@ -92,23 +92,20 @@ export async function executeAdlibActionAndSaveModel(
 	])
 	const adLibActionDoc = adLibAction ?? baselineAdLibAction ?? bucketAdLibAction
 
-	const watchedPackages = await WatchedPackagesHelper.create(context, {
-		rundownId: adLibActionDoc && 'rundownId' in adLibActionDoc ? adLibActionDoc.rundownId : null,
-		bucketId: adLibActionDoc && 'bucketId' in adLibActionDoc ? adLibActionDoc.bucketId : null,
-		ingestSources: {
-			$elemMatch: {
-				fromPieceType: {
-					$in: [
-						ExpectedPackageDBType.ADLIB_ACTION,
-						ExpectedPackageDBType.BASELINE_ADLIB_ACTION,
-						ExpectedPackageDBType.BUCKET_ADLIB_ACTION,
-					],
-				},
-				pieceId: data.actionDocId,
+	let watchedPackages = WatchedPackagesHelper.empty(context)
+	if (adLibActionDoc && 'rundownId' in adLibActionDoc) {
+		watchedPackages = await WatchedPackagesHelper.create(context, adLibActionDoc.rundownId, null, {
+			fromPieceType: {
+				$in: [ExpectedPackageDBType.ADLIB_ACTION, ExpectedPackageDBType.BASELINE_ADLIB_ACTION],
 			},
-		},
-		pieceId: data.actionDocId,
-	})
+			pieceId: data.actionDocId,
+		})
+	} else if (adLibActionDoc && 'bucketId' in adLibActionDoc) {
+		watchedPackages = await WatchedPackagesHelper.create(context, null, adLibActionDoc.bucketId, {
+			fromPieceType: ExpectedPackageDBType.BUCKET_ADLIB_ACTION,
+			pieceId: data.actionDocId,
+		})
+	}
 
 	const actionParameters: ExecuteActionParameters = {
 		actionId: data.actionId,

packages/job-worker/src/playout/timeline/generate.ts

@@ -86,14 +86,8 @@ export async function updateStudioTimeline(
 
 	const studioBlueprint = context.studioBlueprint
 	if (studioBlueprint) {
-		const watchedPackages = await WatchedPackagesHelper.create(context, {
-			rundownId: null,
-			bucketId: null,
-			ingestSources: {
-				$elemMatch: {
-					fromPieceType: ExpectedPackageDBType.STUDIO_BASELINE_OBJECTS,
-				},
-			},
+		const watchedPackages = await WatchedPackagesHelper.create(context, null, null, {
+			fromPieceType: ExpectedPackageDBType.STUDIO_BASELINE_OBJECTS,
 		})
 
 		const blueprint = studioBlueprint.blueprint