wip

Author: Julusian

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

@@ -23,7 +23,6 @@ import {
 import { omit } from '@sofie-automation/corelib/dist/lib'
 import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece'
 import { BucketAdLibAction } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibAction'
-import { ExpectedPackageDBType } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 import { MongoQuery } from '../../db'
 
 export async function handleBucketRemoveAdlibPiece(

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

@@ -161,7 +161,13 @@ async function regenerateBucketItemFromIngestInfo(
 		if (!showStyleCompound)
 			throw new Error(`Unable to create a ShowStyleCompound for ${showStyleBase._id}, ${showStyleVariant._id} `)
 
-		const rawAdlib = await generateBucketAdlibForVariant(context, blueprint, showStyleCompound, ingestInfo.payload)
+		const rawAdlib = await generateBucketAdlibForVariant(
+			context,
+			blueprint,
+			showStyleCompound,
+			bucketId,
+			ingestInfo.payload
+		)
 
 		if (rawAdlib) {
 			const importVersions: RundownImportVersions = {
@@ -258,16 +264,22 @@ async function generateBucketAdlibForVariant(
 	context: JobContext,
 	blueprint: ReadonlyDeep<WrappedShowStyleBlueprint>,
 	showStyleCompound: ReadonlyDeep<ProcessedShowStyleCompound>,
+	bucketId: BucketId,
 	// pieceId: BucketAdLibId | BucketAdLibActionId,
 	payload: IngestAdlib
 ): Promise<IBlueprintAdLibPiece | IBlueprintActionManifest | null> {
 	if (!blueprint.blueprint.getAdlibItem) return null
 
 	const watchedPackages = await WatchedPackagesHelper.create(context, {
-		// We don't know what the `pieceId` will be, but we do know the `externalId`
-		pieceExternalId: payload.externalId,
-		fromPieceType: {
-			$in: [ExpectedPackageDBType.BUCKET_ADLIB, ExpectedPackageDBType.BUCKET_ADLIB_ACTION],
+		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,
+			},
 		},
 	})
 

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

@@ -76,17 +76,6 @@ export async function executeAdlibActionAndSaveModel(
 		throw UserError.create(UserErrorMessage.ActionsNotSupported)
 	}
 
-	const watchedPackages = await WatchedPackagesHelper.create(context, {
-		pieceId: data.actionDocId,
-		fromPieceType: {
-			$in: [
-				ExpectedPackageDBType.ADLIB_ACTION,
-				ExpectedPackageDBType.BASELINE_ADLIB_ACTION,
-				ExpectedPackageDBType.BUCKET_ADLIB_ACTION,
-			],
-		},
-	})
-
 	const [adLibAction, baselineAdLibAction, bucketAdLibAction] = await Promise.all([
 		context.directCollections.AdLibActions.findOne(data.actionDocId as AdLibActionId, {
 			projection: { _id: 1, privateData: 1 },
@@ -103,6 +92,24 @@ 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,
+			},
+		},
+		pieceId: data.actionDocId,
+	})
+
 	const actionParameters: ExecuteActionParameters = {
 		actionId: data.actionId,
 		userData: data.userData,

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

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