wip: bucket cleanup fix

Author: Julusian

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

@@ -10,7 +10,6 @@ import {
 } from '@sofie-automation/corelib/dist/worker/ingest'
 import {
 	cleanUpExpectedPackagesForBucketAdLibs,
-	cleanUpExpectedPackagesForBucketAdLibsActions,
 	updateExpectedPackagesForBucketAdLibPiece,
 	updateExpectedPackagesForBucketAdLibAction,
 } from '../expectedPackages'
@@ -59,7 +58,7 @@ export async function handleBucketRemoveAdlibAction(
 	await Promise.all([
 		context.directCollections.BucketAdLibActions.remove({ _id: { $in: idsToUpdate } }),
 		cleanUpExpectedMediaItemForBucketAdLibActions(context, idsToUpdate),
-		cleanUpExpectedPackagesForBucketAdLibsActions(context, action.bucketId, idsToUpdate),
+		cleanUpExpectedPackagesForBucketAdLibs(context, action.bucketId, idsToUpdate),
 	])
 }
 

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

@@ -12,7 +12,6 @@ import { getSystemVersion } from '../../lib'
 import { BucketItemImportProps, BucketItemRegenerateProps } from '@sofie-automation/corelib/dist/worker/ingest'
 import {
 	cleanUpExpectedPackagesForBucketAdLibs,
-	cleanUpExpectedPackagesForBucketAdLibsActions,
 	updateExpectedPackagesForBucketAdLibPiece,
 	updateExpectedPackagesForBucketAdLibAction,
 } from '../expectedPackages'
@@ -253,7 +252,7 @@ async function regenerateBucketItemFromIngestInfo(
 
 		ps.push(
 			cleanUpExpectedMediaItemForBucketAdLibActions(context, actionIdsToRemoveArray),
-			cleanUpExpectedPackagesForBucketAdLibsActions(context, bucketId, actionIdsToRemoveArray),
+			cleanUpExpectedPackagesForBucketAdLibs(context, bucketId, actionIdsToRemoveArray),
 			context.directCollections.BucketAdLibActions.remove({ _id: { $in: actionIdsToRemoveArray } })
 		)
 	}

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

@@ -175,38 +175,41 @@ export async function updateExpectedPackagesForBucketAdLibAction(
 export async function cleanUpExpectedPackagesForBucketAdLibs(
 	context: JobContext,
 	bucketId: BucketId,
-	adLibIds: PieceId[]
+	adLibIds: Array<PieceId | AdLibActionId>
 ): Promise<void> {
 	if (adLibIds.length > 0) {
-		await context.directCollections.ExpectedPackages.remove({
-			studioId: context.studioId,
-			bucketId: bucketId,
-			// Note: This assumes that there is only one ingest source for each piece
-			ingestSources: {
-				$elemMatch: {
-					fromPieceType: ExpectedPackageDBType.BUCKET_ADLIB,
-					pieceId: { $in: adLibIds },
+		// Remove the claim for the adlibs from any expected packages in the db
+		await context.directCollections.ExpectedPackages.update(
+			{
+				studioId: context.studioId,
+				bucketId: bucketId,
+				ingestSources: {
+					$elemMatch: {
+						fromPieceType: {
+							$in: [ExpectedPackageDBType.BUCKET_ADLIB, ExpectedPackageDBType.BUCKET_ADLIB_ACTION],
+						},
+						pieceId: { $in: adLibIds },
+					},
 				},
 			},
-		})
-	}
-}
-export async function cleanUpExpectedPackagesForBucketAdLibsActions(
-	context: JobContext,
-	bucketId: BucketId,
-	adLibIds: AdLibActionId[]
-): Promise<void> {
-	if (adLibIds.length > 0) {
+			{
+				$pull: {
+					ingestSources: {
+						fromPieceType: {
+							$in: [ExpectedPackageDBType.BUCKET_ADLIB, ExpectedPackageDBType.BUCKET_ADLIB_ACTION],
+						},
+						pieceId: { $in: adLibIds },
+					} as any, // nocommit - can we avoid this? Does this query even work?
+				},
+			}
+		)
+
+		// Remove any expected packages that have now have no owners
 		await context.directCollections.ExpectedPackages.remove({
 			studioId: context.studioId,
 			bucketId: bucketId,
-			// Note: This assumes that there is only one ingest source for each piece
-			ingestSources: {
-				$elemMatch: {
-					fromPieceType: ExpectedPackageDBType.BUCKET_ADLIB_ACTION,
-					pieceId: { $in: adLibIds },
-				},
-			},
+			ingestSources: { $size: 0 },
+			// Future: these currently can't be referenced by playoutSources, but they could be in the future
 		})
 	}
 }