hack

Author: Julusian

packages/job-worker/src/ingest/model/IngestPartModel.ts

@@ -3,9 +3,9 @@ import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
 import { AdLibAction } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'
 import { ExpectedMediaItemRundown } from '@sofie-automation/corelib/dist/dataModel/ExpectedMediaItem'
-import { ExpectedPackageFromRundown } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 import { ExpectedPlayoutItemRundown } from '@sofie-automation/corelib/dist/dataModel/ExpectedPlayoutItem'
 import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
+import { IngestExpectedPackage } from './IngestExpectedPackage'
 
 export interface IngestPartModelReadonly {
 	/**
@@ -37,7 +37,7 @@ export interface IngestPartModelReadonly {
 	/**
 	 * The ExpectedPackages belonging to this Part
 	 */
-	readonly expectedPackages: ReadonlyDeep<ExpectedPackageFromRundown>[]
+	readonly expectedPackages: ReadonlyDeep<IngestExpectedPackage>[]
 }
 /**
  * Wrap a Part and its contents in a view for Ingest operations
@@ -61,9 +61,9 @@ export interface IngestPartModel extends IngestPartModelReadonly {
 	 */
 	setExpectedMediaItems(expectedMediaItems: ExpectedMediaItemRundown[]): void
 
-	/**
-	 * Set the ExpectedPackages for the contents of this Part
-	 * @param expectedPackages The new ExpectedPackages
-	 */
-	setExpectedPackages(expectedPackages: ExpectedPackageFromRundown[]): void
+	// /**
+	//  * Set the ExpectedPackages for the contents of this Part
+	//  * @param expectedPackages The new ExpectedPackages
+	//  */
+	// setExpectedPackages(expectedPackages: ReadonlyDeep<ExpectedPackage.Any>[]): void
 }

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

@@ -7,7 +7,6 @@ import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
 import { AdLibAction } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'
 import { ExpectedMediaItemRundown } from '@sofie-automation/corelib/dist/dataModel/ExpectedMediaItem'
 import { ExpectedPlayoutItemRundown } from '@sofie-automation/corelib/dist/dataModel/ExpectedPlayoutItem'
-import { ExpectedPackageFromRundown } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { ExpectedPackagesStore } from './ExpectedPackagesStore'
 import {
@@ -17,13 +16,15 @@ import {
 	getDocumentChanges,
 	setValuesAndTrackChanges,
 } from './utils'
+import { IngestExpectedPackage } from '../IngestExpectedPackage'
+import { ExpectedPackageDBNew } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 
 export class IngestPartModelImpl implements IngestPartModel {
 	readonly partImpl: DBPart
 	readonly #pieces: Piece[]
 	readonly #adLibPieces: AdLibPiece[]
 	readonly #adLibActions: AdLibAction[]
-	readonly expectedPackagesStore: ExpectedPackagesStore<ExpectedPackageFromRundown>
+	readonly expectedPackagesStore: ExpectedPackagesStore
 
 	#setPartValue<T extends keyof DBPart>(key: T, newValue: DBPart[T]): void {
 		if (newValue === undefined) {
@@ -90,7 +91,7 @@ export class IngestPartModelImpl implements IngestPartModel {
 	get expectedPlayoutItems(): ReadonlyDeep<ExpectedPlayoutItemRundown>[] {
 		return [...this.expectedPackagesStore.expectedPlayoutItems]
 	}
-	get expectedPackages(): ReadonlyDeep<ExpectedPackageFromRundown>[] {
+	get expectedPackages(): ReadonlyDeep<IngestExpectedPackage>[] {
 		return [...this.expectedPackagesStore.expectedPackages]
 	}
 
@@ -140,7 +141,7 @@ export class IngestPartModelImpl implements IngestPartModel {
 		adLibActions: AdLibAction[],
 		expectedMediaItems: ExpectedMediaItemRundown[],
 		expectedPlayoutItems: ExpectedPlayoutItemRundown[],
-		expectedPackages: ExpectedPackageFromRundown[]
+		expectedPackages: ExpectedPackageDBNew[]
 	) {
 		this.partImpl = part
 		this.#pieces = pieces
@@ -234,8 +235,8 @@ export class IngestPartModelImpl implements IngestPartModel {
 	setExpectedMediaItems(expectedMediaItems: ExpectedMediaItemRundown[]): void {
 		this.expectedPackagesStore.setExpectedMediaItems(expectedMediaItems)
 	}
-	setExpectedPackages(expectedPackages: ExpectedPackageFromRundown[]): void {
-		// Future: should these be here, or held as part of each adlib/piece?
-		this.expectedPackagesStore.setExpectedPackages(expectedPackages)
-	}
+	// setExpectedPackages(expectedPackages: ExpectedPackageFromRundown[]): void {
+	// 	// Future: should these be here, or held as part of each adlib/piece?
+	// 	this.expectedPackagesStore.setExpectedPackages(expectedPackages)
+	// }
 }

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

@@ -1,9 +1,8 @@
 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 } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
+import { ExpectedPackageDBNew } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 import { ExpectedPlayoutItem } from '@sofie-automation/corelib/dist/dataModel/ExpectedPlayoutItem'
-import { RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
@@ -15,7 +14,7 @@ import { logger } from '../../../logging'
 import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
 
 export class SaveIngestModelHelper {
-	#expectedPackages = new DocumentChangeTracker<ExpectedPackageDB>()
+	#expectedPackages = new DocumentChangeTracker<ExpectedPackageDBNew>()
 	#expectedPlayoutItems = new DocumentChangeTracker<ExpectedPlayoutItem>()
 	#expectedMediaItems = new DocumentChangeTracker<ExpectedMediaItem>()
 
@@ -25,10 +24,7 @@ export class SaveIngestModelHelper {
 	#adLibPieces = new DocumentChangeTracker<AdLibPiece>()
 	#adLibActions = new DocumentChangeTracker<AdLibAction>()
 
-	addExpectedPackagesStore(
-		store: ExpectedPackagesStore<ExpectedPackageDB & { rundownId: RundownId }>,
-		deleteAll?: boolean
-	): void {
+	addExpectedPackagesStore(store: ExpectedPackagesStore, deleteAll?: boolean): void {
 		this.#expectedPackages.addChanges(store.expectedPackagesChanges, deleteAll ?? false)
 		this.#expectedPlayoutItems.addChanges(store.expectedPlayoutItemsChanges, deleteAll ?? false)
 		this.#expectedMediaItems.addChanges(store.expectedMediaItemsChanges, deleteAll ?? false)