wip

Author: Julusian

meteor/server/api/integration/expectedPackages.ts

@@ -33,6 +33,7 @@ import {
 } from '../../collections'
 import { logger } from '../../logging'
 import _ from 'underscore'
+import { ExpectedPackageDB } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 
 export namespace PackageManagerIntegration {
 	export async function updateExpectedPackageWorkStatuses(
@@ -98,9 +99,17 @@ export namespace PackageManagerIntegration {
 					const fromPackageIds = workStatus.fromPackages.map((p) => p.id)
 					if (fromPackageIds.length) {
 						ps.push(
-							ExpectedPackages.findOneAsync({
-								_id: { $in: fromPackageIds },
-							}).then((expPackage) => {
+							ExpectedPackages.findOneAsync(
+								{
+									_id: { $in: fromPackageIds },
+								},
+								{
+									projection: {
+										_id: 1,
+										studioId: 1,
+									},
+								}
+							).then((expPackage: Pick<ExpectedPackageDB, '_id' | 'studioId'> | undefined) => {
 								if (!expPackage)
 									throw new Meteor.Error(404, `ExpectedPackages "${fromPackageIds}" not found`)
 

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

@@ -28,15 +28,24 @@ export const pieceInstanceFieldsSpecifier = literal<MongoFieldSpecifierOnesStric
 	},
 })
 
+export type ExpectedPackageDBCompact = Pick<ExpectedPackageDB, '_id' | 'rundownId' | 'bucketId' | 'package'>
+
+export const expectedPackageDBFieldsSpecifier = literal<MongoFieldSpecifierOnesStrict<ExpectedPackageDB>>({
+	_id: 1,
+	rundownId: 1,
+	bucketId: 1,
+	package: 1,
+})
+
 export interface ExpectedPackagesContentCache {
-	ExpectedPackages: ReactiveCacheCollection<ExpectedPackageDB>
+	ExpectedPackages: ReactiveCacheCollection<ExpectedPackageDBCompact>
 	RundownPlaylists: ReactiveCacheCollection<RundownPlaylistCompact>
 	PieceInstances: ReactiveCacheCollection<PieceInstanceCompact>
 }
 
 export function createReactiveContentCache(): ExpectedPackagesContentCache {
 	const cache: ExpectedPackagesContentCache = {
-		ExpectedPackages: new ReactiveCacheCollection<ExpectedPackageDB>('expectedPackages'),
+		ExpectedPackages: new ReactiveCacheCollection<ExpectedPackageDBCompact>('expectedPackages'),
 		RundownPlaylists: new ReactiveCacheCollection<RundownPlaylistCompact>('rundownPlaylists'),
 		PieceInstances: new ReactiveCacheCollection<PieceInstanceCompact>('pieceInstances'),
 	}

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

@@ -5,6 +5,7 @@ import {
 	ExpectedPackagesContentCache,
 	rundownPlaylistFieldSpecifier,
 	pieceInstanceFieldsSpecifier,
+	expectedPackageDBFieldsSpecifier,
 } from './contentCache'
 import { ExpectedPackages, PieceInstances, RundownPlaylists } from '../../../collections'
 import { ReactiveMongoObserverGroup, ReactiveMongoObserverGroupHandle } from '../../lib/observerGroup'
@@ -61,7 +62,10 @@ export class ExpectedPackagesContentObserver implements Meteor.LiveQueryHandle {
 				{
 					studioId: studioId,
 				},
-				cache.ExpectedPackages.link()
+				cache.ExpectedPackages.link(),
+				{
+					projection: expectedPackageDBFieldsSpecifier,
+				}
 			),
 
 			RundownPlaylists.observeChanges(

meteor/server/publications/pieceContentStatusUI/checkPieceContentStatus.ts

@@ -642,7 +642,7 @@ async function checkPieceContentExpectedPackageStatus(
 				checkedPackageContainers.add(matchedPackageContainer[0])
 
 				const expectedPackageIds = [
-					// Syntehise the expected packageId from the piece
+					// Synthesize the expected packageId from the piece
 					getExpectedPackageIdFromIngestSource(
 						packageOwnerId,
 						{

packages/corelib/src/dataModel/ExpectedPackages.ts

@@ -138,12 +138,6 @@ export type ExpectedPackageIngestSource =
 export function getExpectedPackageIdForPieceInstance(
 	/** _id of the owner (the piece, adlib etc..) */
 	ownerId: PieceInstanceId,
-	// | AdLibActionId
-	// | RundownBaselineAdLibActionId
-	// | BucketAdLibId
-	// | BucketAdLibActionId
-	// | RundownId
-	// | StudioId,
 	/** The locally unique id of the expectedPackage */
 	localExpectedPackageId: ExpectedPackage.Base['_id']
 ): ExpectedPackageId {
@@ -189,6 +183,7 @@ export function getExpectedPackageIdFromIngestSource(
 	return protectString(`${parentId}_${ownerId}_${getHash(localExpectedPackageId)}`)
 }
 
+// Future implementation of id generation, once shared ownership is implemented
 // export function getExpectedPackageIdNew(
 // 	/** _id of the rundown*/
 // 	rundownId: RundownId,