wip

Author: Julusian

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

@@ -110,16 +110,9 @@ export class ExpectedPackagesStore<TPackageSource extends { fromPieceType: Expec
 			rundownId,
 			partId,
 		})
-		setValuesAndTrackChangesFunc(this.#expectedPackagesWithChanges, this.#expectedPackages, (pkg) => {
-			let changed = false
-
-			for (const source of pkg.ingestSources) {
-				const sourceChanged = updatePackageSource(source)
-				changed = changed || sourceChanged
-			}
-
-			return changed
-		})
+		setValuesAndTrackChangesFunc(this.#expectedPackagesWithChanges, this.#expectedPackages, (pkg) =>
+			updatePackageSource(pkg.source)
+		)
 	}
 
 	compareToPreviousData(oldStore: ExpectedPackagesStore<TPackageSource>): void {

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

@@ -341,14 +341,14 @@ export class IngestModelImpl implements IngestModel, IngestDatabasePersistedMode
 	findExpectedPackageIngestSources(packageId: ExpectedPackageId): ReadonlyDeep<ExpectedPackageIngestSource>[] {
 		const sources: ReadonlyDeep<ExpectedPackageIngestSource>[] = []
 
-		const baselinePackage = this.#rundownBaselineExpectedPackagesStore.expectedPackages.find(
-			(pkg) => pkg._id === packageId
-		)
-		if (baselinePackage) sources.push(...baselinePackage.ingestSources)
+		for (const baselinePackage of this.#rundownBaselineExpectedPackagesStore.expectedPackages) {
+			if (baselinePackage._id === packageId) sources.push(baselinePackage.source)
+		}
 
 		for (const part of this.getAllOrderedParts()) {
-			const partPackage = part.expectedPackages.find((pkg) => pkg._id === packageId)
-			if (partPackage) sources.push(...partPackage.ingestSources)
+			for (const partPackage of part.expectedPackages) {
+				if (partPackage._id === packageId) sources.push(partPackage.source)
+			}
 		}
 
 		return sources

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

@@ -1,7 +1,11 @@
 import { AdLibAction } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'
 import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
 import { ExpectedMediaItem } from '@sofie-automation/corelib/dist/dataModel/ExpectedMediaItem'
-import { ExpectedPackageDB, ExpectedPackageDBType } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
+import {
+	ExpectedPackageDB,
+	ExpectedPackageDBType,
+	getExpectedPackageIdNew,
+} from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 import { ExpectedPlayoutItem } from '@sofie-automation/corelib/dist/dataModel/ExpectedPlayoutItem'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
@@ -15,7 +19,7 @@ import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
 import { IngestExpectedPackage } from '../IngestExpectedPackage'
 import { AnyBulkWriteOperation } from 'mongodb'
 import { ExpectedPackageId, RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { Complete, normalizeArrayToMap } from '@sofie-automation/corelib/dist/lib'
+import { normalizeArrayToMap } from '@sofie-automation/corelib/dist/lib'
 
 export class SaveIngestModelHelper {
 	readonly #rundownId: RundownId
@@ -87,6 +91,8 @@ export class SaveIngestModelHelper {
 			writeExpectedPackagesChangesForRundown(
 				context,
 				this.#rundownId,
+				// This isn't using the expectedPackages store fully, because we know the content of the documents is immutable
+				// But it is easier to keep using the store for the sake of consistency
 				Array.from(this.#expectedPackages.getDocumentsToSave().values())
 			),
 			context.directCollections.ExpectedPlayoutItems.bulkWrite(this.#expectedPlayoutItems.generateWriteOps()),
@@ -121,53 +127,62 @@ async function writeExpectedPackagesChangesForRundown(
 	)) as Pick<ExpectedPackageDB, '_id' | 'created'>[]
 	const existingDocsMap = normalizeArrayToMap(existingDocs, '_id')
 
-	// Generate any insert and update operations
-	const ops: AnyBulkWriteOperation<ExpectedPackageDB>[] = []
+	const packagesToSave = new Map<ExpectedPackageId, ExpectedPackageDB>()
 	for (const doc of documentsToSave) {
-		const newDbDoc: Complete<Omit<ExpectedPackageDB, '_id'>> = {
+		const packageId = getExpectedPackageIdNew(context.studioId, doc.package)
+		const partialDoc = packagesToSave.get(packageId)
+
+		if (partialDoc) {
+			// Add the source to the existing document
+			partialDoc.ingestSources.push(doc.source)
+
+			// TODO - should we check for duplicates entries?
+		} else {
+			// Add a new document
 			// Future: omit 'playoutSources from this doc
-			studioId: context.studioId,
-			rundownId: rundownId,
-			bucketId: null,
-			created: Date.now(),
-			package: doc.package,
-			ingestSources: doc.ingestSources,
+			packagesToSave.set(packageId, {
+				_id: packageId,
+				studioId: context.studioId,
+				rundownId: rundownId,
+				bucketId: null,
+				created: Date.now(),
+				package: doc.package,
+				ingestSources: [doc.source],
+			})
 		}
+	}
 
+	// Generate any insert and update operations
+	const ops: AnyBulkWriteOperation<ExpectedPackageDB>[] = []
+	for (const doc of packagesToSave.values()) {
 		const existingDoc = existingDocsMap.get(doc._id)
 		if (existingDoc) {
 			// Document already exists, perform an update to preserve other fields
 			ops.push({
 				updateOne: {
 					filter: { _id: doc._id },
 					update: {
-						$set: {
-							// Update every field that we want to define
-							...newDbDoc,
-						},
+						// Update every field that we want to define
+						$set: doc,
 					},
 				},
 			})
 		} else {
 			// Insert this new document
 			ops.push({
 				insertOne: {
-					document: {
-						...newDbDoc,
-						_id: doc._id,
-					},
+					document: doc,
 				},
 			})
 		}
 	}
 
 	// Look over the existing documents, and see is no longer referenced
-	const documentsToSaveMap = normalizeArrayToMap(documentsToSave, '_id')
 	const idsToDelete: ExpectedPackageId[] = []
 
 	for (const doc of existingDocs) {
 		// Skip if this document is in the list of documents to save
-		if (documentsToSaveMap.has(doc._id)) continue
+		if (packagesToSave.has(doc._id)) continue
 
 		// Future: check for playoutSources
 		idsToDelete.push(doc._id)