wip

Author: Julusian

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

@@ -6,7 +6,6 @@ import {
 	ExpectedPlayoutItemId,
 	PartId,
 	RundownId,
-	SegmentId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ReadonlyDeep } from 'type-fest'
 import {
@@ -75,20 +74,17 @@ export class ExpectedPackagesStore<TPackageSource extends { fromPieceType: Expec
 	}
 
 	#rundownId: RundownId
-	#segmentId: SegmentId | undefined
 	#partId: PartId | undefined
 
 	constructor(
 		isBeingCreated: boolean,
 		rundownId: RundownId,
-		segmentId: SegmentId | undefined,
 		partId: PartId | undefined,
 		expectedMediaItems: ExpectedMediaItemRundown[],
 		expectedPlayoutItems: ExpectedPlayoutItemRundown[],
 		expectedPackages: IngestExpectedPackage<TPackageSource>[]
 	) {
 		this.#rundownId = rundownId
-		this.#segmentId = segmentId
 		this.#partId = partId
 
 		this.#expectedMediaItems = expectedMediaItems
@@ -111,12 +107,10 @@ export class ExpectedPackagesStore<TPackageSource extends { fromPieceType: Expec
 
 	setOwnerIds(
 		rundownId: RundownId,
-		segmentId: SegmentId | undefined,
 		partId: PartId | undefined,
 		updatePackageSource: (source: TPackageSource) => boolean
 	): void {
 		this.#rundownId = rundownId
-		this.#segmentId = segmentId
 		this.#partId = partId
 
 		setValuesAndTrackChanges(this.#expectedPlayoutItemsWithChanges, this.#expectedPlayoutItems, {

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

@@ -183,7 +183,6 @@ export class IngestModelImpl implements IngestModel, DatabasePersistedModel {
 				false,
 				this.rundownId,
 				undefined,
-				undefined,
 				groupedExpectedMediaItems.get(undefined) ?? [],
 				groupedExpectedPlayoutItems.get(undefined) ?? [],
 				baselineExpectedPackages
@@ -235,7 +234,6 @@ export class IngestModelImpl implements IngestModel, DatabasePersistedModel {
 				true,
 				this.rundownId,
 				undefined,
-				undefined,
 				[],
 				[],
 				[]

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

@@ -165,7 +165,6 @@ export class IngestPartModelImpl implements IngestPartModel {
 		this.expectedPackagesStore = new ExpectedPackagesStore(
 			isBeingCreated,
 			part.rundownId,
-			part.segmentId,
 			part._id,
 			expectedMediaItems,
 			expectedPlayoutItems,
@@ -212,7 +211,7 @@ export class IngestPartModelImpl implements IngestPartModel {
 		this.#compareAndSetPartValue('segmentId', segmentId)
 		this.#compareAndSetPartValue('rundownId', rundownId)
 
-		this.expectedPackagesStore.setOwnerIds(rundownId, segmentId, this.part._id, (pkgSource) => {
+		this.expectedPackagesStore.setOwnerIds(rundownId, this.part._id, (pkgSource) => {
 			if (pkgSource.partId !== this.part._id || pkgSource.segmentId !== segmentId) {
 				pkgSource.partId = this.part._id
 				pkgSource.segmentId = segmentId