wip: more refactoring

Author: Julusian

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

@@ -9,7 +9,6 @@ import { PlayoutPartInstanceModel } from '../playout/model/PlayoutPartInstanceMo
 import { IngestModelReadonly } from './model/IngestModel'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
-import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { logger } from '../logging'
 import {
@@ -35,16 +34,17 @@ import { PlayoutRundownModel } from '../playout/model/PlayoutRundownModel'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import { setNextPart } from '../playout/setNext'
 import { ensureNextPartIsValid } from './updateNext'
-import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { PartId, RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import type { WrappedShowStyleBlueprint } from '../blueprints/cache'
 
 type PlayStatus = 'previous' | 'current' | 'next'
 export interface PartInstanceToSync {
+	playoutRundownModel: PlayoutRundownModel
 	existingPartInstance: PlayoutPartInstanceModel
 	previousPartInstance: PlayoutPartInstanceModel | null
 	playStatus: PlayStatus
 	newPart: ReadonlyDeep<DBPart> | undefined
-	piecesThatMayBeActive: Promise<ReadonlyDeep<Piece>[]>
+	proposedPieceInstances: Promise<PieceInstance[]>
 }
 
 /**
@@ -84,7 +84,7 @@ export async function syncChangesToPartInstances(
 		blueprint
 	)
 
-	const instancesToSync = worker.findInstancesToSync(context, playoutModel, ingestModel)
+	const instancesToSync = worker.findInstancesToSync()
 
 	for (const instanceToSync of instancesToSync) {
 		await worker.syncChangesToPartInstance(instanceToSync)
@@ -120,14 +120,10 @@ export class SyncChangesToPartInstancesWorker {
 		this.#blueprint = blueprint
 	}
 
-	findInstancesToSync(
-		context: JobContext,
-		playoutModel: PlayoutModel,
-		ingestModel: IngestModelReadonly
-	): PartInstanceToSync[] {
-		const currentPartInstance = playoutModel.currentPartInstance
-		const nextPartInstance = playoutModel.nextPartInstance
-		const previousPartInstance = playoutModel.previousPartInstance
+	findInstancesToSync(): PartInstanceToSync[] {
+		const currentPartInstance = this.#playoutModel.currentPartInstance
+		const nextPartInstance = this.#playoutModel.nextPartInstance
+		const previousPartInstance = this.#playoutModel.previousPartInstance
 
 		const instancesToSync: PartInstanceToSync[] = []
 		if (currentPartInstance) {
@@ -138,39 +134,59 @@ export class SyncChangesToPartInstancesWorker {
 			// it's ran first through the blueprints.
 			if (currentPartInstance.partInstance.orphaned === 'adlib-part') {
 				const partAndPartInstance = findLastUnorphanedPartInstanceInSegment(
-					playoutModel,
+					this.#playoutModel,
 					currentPartInstance.partInstance
 				)
 				if (partAndPartInstance) {
+					const lastPartRundownModel = findPlayoutRundownModel(
+						this.#playoutRundownModel,
+						this.#playoutModel,
+						partAndPartInstance.partInstance.partInstance.part.rundownId
+					)
+
 					insertToSyncedInstanceCandidates(
-						context,
+						this.#context,
 						instancesToSync,
-						playoutModel,
-						ingestModel,
+						this.#playoutModel,
+						lastPartRundownModel,
+						this.#ingestModel,
 						partAndPartInstance.partInstance,
 						null,
 						partAndPartInstance.part,
 						'previous'
 					)
 				}
 			}
+
 			// We can now run the current Part Instance.
+			const currentPartRundownModel = findPlayoutRundownModel(
+				this.#playoutRundownModel,
+				this.#playoutModel,
+				currentPartInstance.partInstance.part.rundownId
+			)
 			findPartAndInsertToSyncedInstanceCandidates(
-				context,
+				this.#context,
 				instancesToSync,
-				playoutModel,
-				ingestModel,
+				this.#playoutModel,
+				currentPartRundownModel,
+				this.#ingestModel,
 				currentPartInstance,
 				previousPartInstance,
 				'current'
 			)
 		}
 		if (nextPartInstance) {
+			const nextPartRundownModel = findPlayoutRundownModel(
+				this.#playoutRundownModel,
+				this.#playoutModel,
+				nextPartInstance.partInstance.part.rundownId
+			)
 			findPartAndInsertToSyncedInstanceCandidates(
-				context,
+				this.#context,
 				instancesToSync,
-				playoutModel,
-				ingestModel,
+				this.#playoutModel,
+				nextPartRundownModel,
+				this.#ingestModel,
 				nextPartInstance,
 				currentPartInstance,
 				currentPartInstance?.isTooCloseToAutonext(false) ? 'current' : 'next'
@@ -192,40 +208,9 @@ export class SyncChangesToPartInstancesWorker {
 
 		const part = instanceToSync.newPart ?? existingPartInstance.partInstance.part
 
-		let playoutRundownModelForPart: PlayoutRundownModel | undefined = this.#playoutRundownModel
-		// Handle a case where the part is in a different rundown than the playoutRundownModel:
-		if (this.#playoutRundownModel.rundown._id !== part.rundownId) {
-			playoutRundownModelForPart = this.#playoutModel.getRundown(part.rundownId)
-		}
-		if (!playoutRundownModelForPart)
-			throw new Error(`Internal Error: playoutRundownModelForPart is undefined (it should never be)`)
-
-		// TMP: wrap in try/catch for troubleshooting:
-		let proposedPieceInstances: PieceInstance[] = []
-		try {
-			proposedPieceInstances = getPieceInstancesForPart(
-				this.#context,
-				this.#playoutModel,
-				instanceToSync.previousPartInstance,
-				playoutRundownModelForPart,
-				part,
-				await instanceToSync.piecesThatMayBeActive,
-				existingPartInstance.partInstance._id
-			)
-		} catch (e) {
-			logger.error(
-				`TROUBLESHOOTING: currentPartInstance: ${JSON.stringify(this.#playoutModel.currentPartInstance)}`
-			)
-			logger.error(`TROUBLESHOOTING: nextPartInstance: ${JSON.stringify(this.#playoutModel.nextPartInstance)}`)
-			logger.error(
-				`TROUBLESHOOTING: previousPartInstance: ${JSON.stringify(this.#playoutModel.previousPartInstance)}`
-			)
-
-			throw e
-		}
-
 		logger.info(`Syncing ingest changes for part: ${part._id} (orphaned: ${!!instanceToSync.newPart})`)
 
+		const proposedPieceInstances = await instanceToSync.proposedPieceInstances
 		const newResultData = this.collectNewIngestDataToSync(part._id, instanceToSync, proposedPieceInstances)
 		const partInstanceSnapshot = existingPartInstance.snapshotMakeCopy()
 
@@ -363,26 +348,59 @@ function insertToSyncedInstanceCandidates(
 	context: JobContext,
 	instances: PartInstanceToSync[],
 	playoutModel: PlayoutModel,
+	playoutRundownModel: PlayoutRundownModel,
 	ingestModel: IngestModelReadonly,
 	thisPartInstance: PlayoutPartInstanceModel,
 	previousPartInstance: PlayoutPartInstanceModel | null,
 	part: ReadonlyDeep<DBPart> | undefined,
 	playStatus: PlayStatus
 ): void {
+	const partOrInstancePart = part ?? thisPartInstance.partInstance.part
+
+	const piecesThatMayBeActive = fetchPiecesThatMayBeActiveForPart(
+		context,
+		playoutModel,
+		ingestModel,
+		partOrInstancePart
+	)
+
+	const proposedPieceInstances = piecesThatMayBeActive.then((piecesThatMayBeActive) =>
+		getPieceInstancesForPart(
+			context,
+			playoutModel,
+			previousPartInstance,
+			playoutRundownModel,
+			partOrInstancePart,
+			piecesThatMayBeActive,
+			thisPartInstance.partInstance._id
+		)
+	)
+
 	instances.push({
+		playoutRundownModel,
 		existingPartInstance: thisPartInstance,
 		previousPartInstance: previousPartInstance,
 		playStatus,
 		newPart: part,
-		piecesThatMayBeActive: fetchPiecesThatMayBeActiveForPart(
-			context,
-			playoutModel,
-			ingestModel,
-			part ?? thisPartInstance.partInstance.part
-		),
+		proposedPieceInstances,
 	})
 }
 
+function findPlayoutRundownModel(
+	ingestPlayoutRundownModel: PlayoutRundownModel,
+	playoutModel: PlayoutModel,
+	rundownId: RundownId
+): PlayoutRundownModel {
+	if (ingestPlayoutRundownModel.rundown._id === rundownId) return ingestPlayoutRundownModel
+
+	// Handle a case where the part is in a different rundown than the playoutRundownModel:
+	const playoutRundownModelForPart = playoutModel.getRundown(rundownId)
+	if (!playoutRundownModelForPart)
+		throw new Error(`Internal Error: playoutRundownModelForPart is undefined (it should never be)`)
+
+	return playoutRundownModelForPart
+}
+
 /**
  * Finds the underlying Part for a given `thisPartInstance` and inserts it to the list of PartInstances to be synced.
  * Doesn't do anything if it can't find the underlying Part in `model`.
@@ -391,6 +409,7 @@ function findPartAndInsertToSyncedInstanceCandidates(
 	context: JobContext,
 	instances: PartInstanceToSync[],
 	playoutModel: PlayoutModel,
+	playoutRundownModel: PlayoutRundownModel,
 	ingestModel: IngestModelReadonly,
 	thisPartInstance: PlayoutPartInstanceModel,
 	previousPartInstance: PlayoutPartInstanceModel | null,
@@ -402,6 +421,7 @@ function findPartAndInsertToSyncedInstanceCandidates(
 		context,
 		instances,
 		playoutModel,
+		playoutRundownModel,
 		ingestModel,
 		thisPartInstance,
 		previousPartInstance,