fix: PlayoutModel has unsaved changes (Sofie-Automation#1697)

Author: Julusian

packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts

@@ -737,11 +737,11 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 			this.#playlistHasChanged
 				? this.context.directCollections.RundownPlaylists.replace(this.playlistImpl)
 				: undefined,
-			...writePartInstancesAndPieceInstances(this.context, this.allPartInstances),
 			writeAdlibTestingSegments(this.context, this.rundownsImpl),
 			...Array.from(partInstancesByRundownId.entries()).map(async ([rundownId, partInstances]) =>
 				writeExpectedPackagesForPlayoutSources(this.context, this.playlistId, rundownId, partInstances)
 			),
+			...writePartInstancesAndPieceInstances(this.context, this.allPartInstances), // After the ExpectedPackages, as this clears the change flags
 			this.#baselineHelper.saveAllToDatabase(),
 			this.#notificationsHelper.saveAllToDatabase(),
 			this.context.saveRouteSetChanges(),

packages/job-worker/src/playout/model/implementation/PlayoutPieceInstanceModelImpl.ts

@@ -80,6 +80,7 @@ export class PlayoutPieceInstanceModelImpl implements PlayoutPieceInstanceModel
 	 */
 	clearChangedFlag(): void {
 		this.#hasChanges = false
+		this.updatedExpectedPackages = null
 	}
 
 	get pieceInstance(): ReadonlyDeep<PieceInstance> {

packages/job-worker/src/workers/context/JobContextImpl.ts

@@ -34,6 +34,7 @@ export class JobContextImpl extends StudioCacheContextImpl implements JobContext
 		private readonly locksManager: LocksManager,
 		private readonly transaction: ApmTransaction | undefined,
 		private readonly queueJob: QueueJobFunc,
+		private readonly jobName: string,
 		private readonly fastTrackTimeline: FastTrackTimelineFunc | null
 	) {
 		super(directCollections, cacheData)
@@ -126,7 +127,7 @@ export class JobContextImpl extends StudioCacheContextImpl implements JobContext
 			try {
 				cache.assertNoChanges()
 			} catch (e) {
-				logger.warn(`${cache.displayName} has unsaved changes: ${stringifyError(e)}`)
+				logger.warn(`${cache.displayName} from "${this.jobName}" has unsaved changes: ${stringifyError(e)}`)
 			}
 		}
 	}

packages/job-worker/src/workers/events/child.ts

@@ -127,6 +127,7 @@ export class EventsWorkerChild {
 			this.#locks,
 			transaction,
 			this.#queueJob,
+			jobName,
 			this.#fastTrackTimeline
 		)
 

packages/job-worker/src/workers/ingest/child.ts

@@ -114,6 +114,7 @@ export class IngestWorkerChild {
 			this.#locks,
 			transaction,
 			this.#queueJob,
+			jobName,
 			this.#fastTrackTimeline
 		)
 

packages/job-worker/src/workers/studio/child.ts

@@ -124,6 +124,7 @@ export class StudioWorkerChild {
 			this.#locks,
 			transaction,
 			this.#queueJob,
+			jobName,
 			this.#fastTrackTimeline
 		)