wip

Author: Julusian

meteor/server/publications/packageManager/expectedPackages/generate.ts

@@ -1,5 +1,10 @@
-import { PackageContainerOnPackage, Accessor, AccessorOnPackage } from '@sofie-automation/blueprints-integration'
-import { PeripheralDeviceId, ExpectedPackageId, PieceInstanceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import {
+	PackageContainerOnPackage,
+	Accessor,
+	AccessorOnPackage,
+	ExpectedPackage,
+} from '@sofie-automation/blueprints-integration'
+import { PeripheralDeviceId, ExpectedPackageId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import {
 	PackageManagerExpectedPackage,
@@ -58,13 +63,7 @@ export async function updateCollectionForExpectedPackageIds(
 			// Filter, keep only the routed mappings for this device:
 			if (filterPlayoutDeviceIds && !filterPlayoutDeviceIds.includes(deviceId)) continue
 
-			const routedPackage = generateExpectedPackageForDevice(
-				studio,
-				packageDoc,
-				deviceId,
-				null,
-				packageContainers
-			)
+			const routedPackage = generateExpectedPackageForDevice(studio, packageDoc, deviceId, packageContainers)
 
 			updatedDocIds.add(routedPackage._id)
 			collection.replace(routedPackage)
@@ -73,11 +72,9 @@ export async function updateCollectionForExpectedPackageIds(
 
 	// Remove all documents for an ExpectedPackage that was regenerated, and no update was issues
 	collection.remove((doc) => {
-		if (doc.pieceInstanceId) return false
-
-		if (missingExpectedPackageIds.has(protectString(doc.expectedPackage._id))) return true
+		if (missingExpectedPackageIds.has(doc.expectedPackage._id)) return true
 
-		if (updatedDocIds.has(doc._id) && !regenerateIds.has(protectString(doc.expectedPackage._id))) return true
+		if (updatedDocIds.has(doc._id) && !regenerateIds.has(doc.expectedPackage._id)) return true
 
 		return false
 	})
@@ -100,7 +97,6 @@ function generateExpectedPackageForDevice(
 	>,
 	expectedPackage: ExpectedPackageDBCompact,
 	deviceId: PeripheralDeviceId,
-	pieceInstanceId: PieceInstanceId | null,
 	packageContainers: Record<string, StudioPackageContainer>
 ): PackageManagerExpectedPackage {
 	// Lookup Package sources:
@@ -135,17 +131,16 @@ function generateExpectedPackageForDevice(
 	const packageSideEffect = getSideEffect(expectedPackage.package, studio)
 
 	return {
-		_id: protectString(`${expectedPackage._id}_${deviceId}_${pieceInstanceId}`),
-		expectedPackageId: expectedPackage._id,
+		_id: protectString(`${expectedPackage._id}_${deviceId}`),
 		expectedPackage: {
 			...expectedPackage.package,
+			_id: expectedPackage._id,
 			sideEffect: packageSideEffect,
 		},
 		sources: combinedSources,
 		targets: combinedTargets,
 		priority: ExpectedPackagePriorities.OTHER, // This gets overriden later if needed
 		playoutDeviceId: deviceId,
-		pieceInstanceId,
 	}
 }
 
@@ -182,7 +177,7 @@ function calculateCombinedSource(
 	return combinedSource
 }
 function calculateCombinedTargets(
-	expectedPackage: PackageManagerExpectedPackageBase,
+	expectedPackage: ReadonlyDeep<ExpectedPackage.Base>,
 	deviceId: PeripheralDeviceId,
 	packageContainers: Record<string, StudioPackageContainer>
 ): PackageContainerOnPackage[] {

meteor/server/publications/packageManager/expectedPackages/publication.ts

@@ -214,7 +214,7 @@ function updatePackagePriorities(
 
 	// Iterate through and update each package
 	collection.updateAll((pkg) => {
-		const expectedPriority = highPriorityPackages.get(pkg.expectedPackageId) ?? ExpectedPackagePriorities.OTHER
+		const expectedPriority = highPriorityPackages.get(pkg.expectedPackage._id) ?? ExpectedPackagePriorities.OTHER
 		if (pkg.priority === expectedPriority) return false
 
 		return {

packages/shared-lib/src/package-manager/publications.ts

@@ -1,5 +1,5 @@
 import { ExpectedPackage, PackageContainer, PackageContainerOnPackage } from './package'
-import { ExpectedPackageId, PeripheralDeviceId, PieceInstanceId, RundownId, RundownPlaylistId } from '../core/model/Ids'
+import { ExpectedPackageId, PeripheralDeviceId, RundownId, RundownPlaylistId } from '../core/model/Ids'
 import { ProtectedString } from '../lib/protectedString'
 import { ReadonlyDeep } from 'type-fest'
 
@@ -28,20 +28,18 @@ export interface PackageManagerPackageContainers {
 
 export type PackageManagerExpectedPackageId = ProtectedString<'PackageManagerExpectedPackage'>
 
-export type PackageManagerExpectedPackageBase = ReadonlyDeep<ExpectedPackage.Base>
+export type PackageManagerExpectedPackageBase = ReadonlyDeep<Omit<ExpectedPackage.Base, '_id'>> & {
+	_id: ExpectedPackageId
+}
 
 export interface PackageManagerExpectedPackage {
 	/** Unique id of the expectedPackage */
 	_id: PackageManagerExpectedPackageId
 
-	expectedPackageId: ExpectedPackageId
-
 	expectedPackage: PackageManagerExpectedPackageBase
 	/** Lower should be done first */
 	priority: number
 	sources: PackageContainerOnPackage[]
 	targets: PackageContainerOnPackage[]
 	playoutDeviceId: PeripheralDeviceId
-
-	pieceInstanceId: PieceInstanceId | null
 }