wip: fixup contentVersionHash

Author: Julusian

meteor/server/api/__tests__/cleanup.test.ts

@@ -259,7 +259,6 @@ async function setDefaultDatatoDB(env: DefaultEnvironment, now: number) {
 		studioId,
 		rundownId,
 		bucketId: null,
-		contentVersionHash: '',
 		created: 0,
 		package: {} as any,
 		ingestSources: [] as any,

meteor/server/migration/X_X_X.ts

@@ -120,7 +120,6 @@ export const addSteps = addMigrationSteps(CURRENT_SYSTEM_VERSION, [
 						studioId: pkg.studioId,
 						rundownId: rundownId,
 						bucketId: bucketId,
-						contentVersionHash: pkg.contentVersionHash,
 						package: {
 							...(pkg as any), // Some fields should be pruned off this, but this is fine
 							_id: pkg.blueprintPackageId,

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

@@ -1,5 +1,5 @@
 import { PackageContainerOnPackage, Accessor, AccessorOnPackage } from '@sofie-automation/blueprints-integration'
-import { getContentVersionHash, getExpectedPackageId } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
+import { getExpectedPackageId } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 import { PeripheralDeviceId, ExpectedPackageId, PieceInstanceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import {
@@ -140,7 +140,6 @@ export async function updateCollectionForPieceInstanceIds(
 						...expectedPackage,
 						_id: unprotectString(sanitisedPackageId),
 						rundownId: pieceInstanceDoc.rundownId,
-						contentVersionHash: getContentVersionHash(expectedPackage),
 					},
 					deviceId,
 					pieceInstanceId,

packages/corelib/src/dataModel/ExpectedPackages.ts

@@ -1,6 +1,6 @@
 import { ExpectedPackage, Time } from '@sofie-automation/blueprints-integration'
 import { protectString, unprotectString } from '../protectedString'
-import { assertNever, getHash, hashObj } from '../lib'
+import { assertNever, getHash } from '../lib'
 import {
 	AdLibActionId,
 	BucketAdLibActionId,
@@ -77,9 +77,6 @@ export interface ExpectedPackageDBNew {
 	/** The bucket this package belongs to, if any. Must not be set when rundownId is set */
 	bucketId: BucketId | null
 
-	/** Hash that changes whenever the content or version changes. See getContentVersionHash() */
-	contentVersionHash: string
-
 	created: Time
 
 	package: ReadonlyDeep<ExpectedPackage.Any>
@@ -162,14 +159,6 @@ export type ExpectedPackageIngestSource =
 	| ExpectedPackageIngestSourceBucket
 	| ExpectedPackageIngestSourceStudioBaseline
 
-export function getContentVersionHash(expectedPackage: ReadonlyDeep<Omit<ExpectedPackage.Any, '_id'>>): string {
-	return hashObj({
-		content: expectedPackage.content,
-		version: expectedPackage.version,
-		// todo: should expectedPackage.sources.containerId be here as well?
-	})
-}
-
 export function getExpectedPackageId(
 	/** _id of the owner (the piece, adlib etc..) */
 	ownerId: PieceInstanceId,

packages/corelib/src/dataModel/PackageInfos.ts

@@ -1,6 +1,5 @@
 import { PackageInfo, Time } from '@sofie-automation/blueprints-integration'
 import { protectString } from '../protectedString'
-import type { ExpectedPackageDBNew } from './ExpectedPackages'
 import { ExpectedPackageId, PackageInfoId, PeripheralDeviceId, StudioId } from './Ids'
 
 /**
@@ -14,7 +13,7 @@ export interface PackageInfoDB extends PackageInfo.Base {
 	/** Reference to the Package this document has info about */
 	packageId: ExpectedPackageId
 	/** Reference to the contentVersionHash of the ExpectedPackage, used to reference the expected content+version of the Package */
-	expectedContentVersionHash: ExpectedPackageDBNew['contentVersionHash']
+	expectedContentVersionHash: string
 	/** Referring to the actual contentVersionHash of the Package, used to reference the exact content+version of the Package */
 	actualContentVersionHash: string
 

packages/job-worker/src/ingest/expectedPackages.ts

@@ -2,7 +2,6 @@ import { BucketAdLibAction } from '@sofie-automation/corelib/dist/dataModel/Buck
 import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece'
 import {
 	ExpectedPackageDBType,
-	getContentVersionHash,
 	ExpectedPackageDBNew,
 	getExpectedPackageIdFromIngestSource,
 	ExpectedPackageIngestSource,
@@ -22,7 +21,7 @@ import {
 import { JobContext, JobStudio } from '../jobs'
 import { IngestModel } from './model/IngestModel'
 import { IngestPartModel } from './model/IngestPartModel'
-import { clone } from '@sofie-automation/corelib/dist/lib'
+import { clone, hashObj } from '@sofie-automation/corelib/dist/lib'
 
 export function updateExpectedMediaAndPlayoutItemsForPartModel(context: JobContext, part: IngestPartModel): void {
 	updateExpectedMediaItemsForPartModel(context, part)
@@ -96,7 +95,6 @@ function generateBucketExpectedPackages(
 				...clone<ExpectedPackage.Any>(expectedPackage),
 				_id: id,
 			},
-			contentVersionHash: getContentVersionHash(expectedPackage),
 			studioId: studio._id,
 			rundownId: null,
 			bucketId: bucketId,
@@ -227,6 +225,16 @@ export function setDefaultIdOnExpectedPackages(expectedPackages: ExpectedPackage
 			if (!expectedPackage._id) {
 				expectedPackage._id = `__index${i}`
 			}
+
+			expectedPackage.contentVersionHash = getContentVersionHash(expectedPackage)
 		}
 	}
 }
+
+function getContentVersionHash(expectedPackage: ReadonlyDeep<Omit<ExpectedPackage.Any, '_id'>>): string {
+	return hashObj({
+		content: expectedPackage.content,
+		version: expectedPackage.version,
+		// todo: should expectedPackage.sources.containerId be here as well?
+	})
+}

packages/job-worker/src/ingest/generationRundown.ts

@@ -1,7 +1,6 @@
 import {
 	ExpectedPackageDBType,
 	ExpectedPackageIngestSourceRundownBaseline,
-	getContentVersionHash,
 	getExpectedPackageIdFromIngestSource,
 } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 import { BlueprintId, RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids'
@@ -355,9 +354,6 @@ function generateExpectedPackagesForBaseline(
 		return {
 			_id: getExpectedPackageIdFromIngestSource(rundownId, source, expectedPackage._id),
 
-			// nocommit - what about the version of this inside the package?
-			contentVersionHash: getContentVersionHash(expectedPackage),
-
 			package: expectedPackage,
 
 			ingestSources: [source],

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

@@ -18,9 +18,6 @@ export interface IngestExpectedPackage<
 > {
 	_id: ExpectedPackageId
 
-	/** Hash that changes whenever the content or version changes. See getContentVersionHash() */
-	contentVersionHash: string
-
 	package: ReadonlyDeep<ExpectedPackage.Any>
 
 	// HACK: Temporary single item
@@ -32,7 +29,6 @@ export function stripExpectedPackageDBToIngestExpectedPackage(
 ): IngestExpectedPackage {
 	return {
 		_id: expectedPackage._id,
-		contentVersionHash: expectedPackage.contentVersionHash,
 		package: expectedPackage.package,
 		ingestSources: expectedPackage.ingestSources as any, // Future: can this be omitted
 	}

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

@@ -13,7 +13,6 @@ import { calculatePartExpectedDurationWithTransition } from '@sofie-automation/c
 import { clone } from '@sofie-automation/corelib/dist/lib'
 import { getPartId } from '../../lib'
 import {
-	getContentVersionHash,
 	ExpectedPackageDBType,
 	getExpectedPackageIdFromIngestSource,
 	ExpectedPackageIngestSourcePart,
@@ -278,8 +277,6 @@ function generateExpectedPackagesForPart(
 		return {
 			_id: getExpectedPackageIdFromIngestSource(rundownId, source, expectedPackage._id),
 
-			contentVersionHash: getContentVersionHash(expectedPackage),
-
 			package: expectedPackage,
 
 			ingestSources: [source],

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

@@ -130,7 +130,6 @@ export async function writeExpectedPackagesChangesForRundown(
 			rundownId: rundownId,
 			bucketId: null,
 			created: Date.now(),
-			contentVersionHash: doc.contentVersionHash,
 			package: doc.package,
 			ingestSources: doc.ingestSources,
 		}