wip: rework studio baseline packages

Author: Julusian

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

@@ -270,9 +270,6 @@ export function updateBaselineExpectedPackagesOnStudio(
 ): void {
 	updateBaselineExpectedPlayoutItemsOnStudio(context, playoutModel, baseline.expectedPlayoutItems ?? [])
 
-	// Fill in ids of unnamed expectedPackages
-	setDefaultIdOnExpectedPackages(baseline.expectedPackages)
-
 	playoutModel.setExpectedPackagesForStudioBaseline(baseline.expectedPackages ?? [])
 }
 

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

@@ -101,7 +101,7 @@ export class SaveIngestModelHelper {
 	}
 }
 
-export async function writeExpectedPackagesChangesForRundown(
+async function writeExpectedPackagesChangesForRundown(
 	context: JobContext,
 	rundownId: RundownId | null,
 	documentsToSave: IngestExpectedPackage<any>[]

packages/job-worker/src/studio/model/StudioBaselineHelper.ts

@@ -1,21 +1,25 @@
 import { JobContext } from '../../jobs'
 import {
+	ExpectedPackageDB,
 	ExpectedPackageDBType,
 	ExpectedPackageIngestSource,
 	ExpectedPackageIngestSourceStudioBaseline,
-	getExpectedPackageIdFromIngestSource,
+	getExpectedPackageIdNew,
 } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 import { ExpectedPlayoutItemStudio } from '@sofie-automation/corelib/dist/dataModel/ExpectedPlayoutItem'
 import { saveIntoDb } from '../../db/changes'
 import { ExpectedPackage } from '@sofie-automation/blueprints-integration'
 import type { IngestExpectedPackage } from '../../ingest/model/IngestExpectedPackage'
-import { writeExpectedPackagesChangesForRundown } from '../../ingest/model/implementation/SaveIngestModel'
 import { setDefaultIdOnExpectedPackages } from '../../ingest/expectedPackages'
+import { ExpectedPackageId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { Complete } from '@sofie-automation/corelib/dist/lib'
 
 export class StudioBaselineHelper {
 	readonly #context: JobContext
 
-	#pendingExpectedPackages: IngestExpectedPackage<ExpectedPackageIngestSourceStudioBaseline>[] | undefined
+	#pendingExpectedPackages:
+		| Map<ExpectedPackageId, IngestExpectedPackage<ExpectedPackageIngestSourceStudioBaseline>>
+		| undefined
 	#pendingExpectedPlayoutItems: ExpectedPlayoutItemStudio[] | undefined
 
 	constructor(context: JobContext) {
@@ -31,16 +35,19 @@ export class StudioBaselineHelper {
 
 		setDefaultIdOnExpectedPackages(packages)
 
-		this.#pendingExpectedPackages = packages.map(
-			(expectedPackage) =>
-				({
-					_id: getExpectedPackageIdFromIngestSource(this.#context.studioId, source, expectedPackage._id),
+		// Using a map here is a bit excessive, but it makes it easier to remove duplicates
+		this.#pendingExpectedPackages = new Map()
+		for (const expectedPackage of packages) {
+			const id = getExpectedPackageIdNew(this.#context.studioId, expectedPackage)
 
-					package: expectedPackage,
+			this.#pendingExpectedPackages.set(id, {
+				_id: id,
 
-					ingestSources: [source],
-				} satisfies IngestExpectedPackage<ExpectedPackageIngestSourceStudioBaseline>)
-		)
+				package: expectedPackage,
+
+				ingestSources: [source],
+			})
+		}
 	}
 	setExpectedPlayoutItems(playoutItems: ExpectedPlayoutItemStudio[]): void {
 		this.#pendingExpectedPlayoutItems = playoutItems
@@ -57,7 +64,36 @@ export class StudioBaselineHelper {
 				  )
 				: undefined,
 			this.#pendingExpectedPackages
-				? writeExpectedPackagesChangesForRundown(this.#context, null, this.#pendingExpectedPackages)
+				? // We can be naive here, as we know the packages will have only one owner (the studio baseline)
+				  saveIntoDb<ExpectedPackageDB>(
+						this.#context,
+						this.#context.directCollections.ExpectedPackages,
+						{
+							studioId: this.#context.studioId,
+							rundownId: null,
+							bucketId: null,
+						},
+						Array.from(this.#pendingExpectedPackages.values()).map(
+							(pkg) =>
+								({
+									_id: pkg._id,
+									studioId: this.#context.studioId,
+									rundownId: null,
+									bucketId: null,
+
+									created: Date.now(),
+									package: pkg.package,
+									ingestSources: pkg.ingestSources,
+								} satisfies Complete<ExpectedPackageDB>)
+						),
+						{
+							beforeDiff: (doc, oldDoc) => {
+								// Preserve the created date
+								doc.created = oldDoc.created
+								return doc
+							},
+						}
+				  )
 				: undefined,
 		])