wip: tidy

Author: Julusian

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

@@ -28,12 +28,10 @@ export const pieceInstanceFieldsSpecifier = literal<MongoFieldSpecifierOnesStric
 	},
 })
 
-export type ExpectedPackageDBCompact = Pick<ExpectedPackageDB, '_id' | 'rundownId' | 'bucketId' | 'package'>
+export type ExpectedPackageDBCompact = Pick<ExpectedPackageDB, '_id' | 'package'>
 
 export const expectedPackageDBFieldsSpecifier = literal<MongoFieldSpecifierOnesStrict<ExpectedPackageDB>>({
 	_id: 1,
-	rundownId: 1,
-	bucketId: 1,
 	package: 1,
 })
 

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

@@ -63,7 +63,6 @@ export async function updateCollectionForExpectedPackageIds(
 				studio,
 				{
 					...packageDoc.package,
-					rundownId: packageDoc.rundownId,
 					_id: unprotectString(packageDoc._id),
 				},
 				deviceId,
@@ -142,7 +141,6 @@ export async function updateCollectionForPieceInstanceIds(
 					{
 						...expectedPackage,
 						_id: unprotectString(sanitisedPackageId),
-						rundownId: pieceInstanceDoc.rundownId,
 					},
 					deviceId,
 					pieceInstanceId,

packages/corelib/src/dataModel/ExpectedPackages.ts

@@ -57,7 +57,7 @@ export interface ExpectedPackageDB {
 	ingestSources: [ExpectedPackageIngestSource]
 
 	// playoutSources: {
-	// 	/** Any playout PieceInstance. This is limited to the current and next partInstances */ // nocommit - verify this
+	// 	/** Any playout PieceInstance. This is limited to the current and next partInstances */
 	// 	pieceInstanceIds: PieceInstanceId[]
 	// }
 }

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

@@ -28,7 +28,7 @@ export interface PackageManagerPackageContainers {
 
 export type PackageManagerExpectedPackageId = ProtectedString<'PackageManagerExpectedPackage'>
 
-export type PackageManagerExpectedPackageBase = ReadonlyDeep<ExpectedPackage.Base & { rundownId: RundownId | null }>
+export type PackageManagerExpectedPackageBase = ReadonlyDeep<ExpectedPackage.Base>
 
 export interface PackageManagerExpectedPackage {
 	/** Unique id of the expectedPackage */