fix

Author: Julusian

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

@@ -11,10 +11,7 @@ import { getCurrentTime } from '../../lib/lib'
 import { waitUntil } from '../../../__mocks__/helpers/jest'
 import { setupDefaultStudioEnvironment, DefaultEnvironment } from '../../../__mocks__/helpers/database'
 import { setLogLevel } from '../../logging'
-import {
-	IngestDeviceSettings,
-	IngestDeviceSecretSettings,
-} from '@sofie-automation/corelib/dist/dataModel/PeripheralDeviceSettings/ingestDevice'
+import { IngestDeviceSecretSettings } from '@sofie-automation/corelib/dist/dataModel/PeripheralDeviceSettings/ingestDevice'
 import { MediaWorkFlow } from '@sofie-automation/shared-lib/dist/core/model/MediaWorkFlows'
 import { MediaWorkFlowStep } from '@sofie-automation/shared-lib/dist/core/model/MediaWorkFlowSteps'
 import { MediaManagerAPI } from '@sofie-automation/meteor-lib/dist/api/mediaManager'
@@ -556,7 +553,7 @@ describe('test peripheralDevice general API methods', () => {
 		expect((deviceWithSecretToken.secretSettings as IngestDeviceSecretSettings).accessToken).toBe(
 			'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 		)
-		expect((deviceWithSecretToken.settings as IngestDeviceSettings).secretAccessToken).toBe(true)
+		expect(deviceWithSecretToken.secretSettingsStatus?.accessToken).toBe(true)
 	})
 
 	test('uninitialize', async () => {

meteor/server/api/integration/expectedPackages.ts

@@ -32,6 +32,7 @@ import {
 	PackageInfos,
 } from '../../collections'
 import { logger } from '../../logging'
+import _ from 'underscore'
 
 export namespace PackageManagerIntegration {
 	export async function updateExpectedPackageWorkStatuses(
@@ -150,11 +151,11 @@ export namespace PackageManagerIntegration {
 		const peripheralDevice = await checkAccessAndGetPeripheralDevice(deviceId, deviceToken, context)
 
 		await ExpectedPackageWorkStatuses.removeAsync({
-			$or: [
+			$or: _.compact([
 				{ deviceId: peripheralDevice._id },
 				// Since we only have one PM in a studio, we can remove everything in the studio:
-				{ studioId: peripheralDevice.studioAndConfigId.studioId },
-			],
+				peripheralDevice.studioAndConfigId ? { studioId: peripheralDevice.studioAndConfigId.studioId } : null,
+			]),
 		})
 	}
 
@@ -245,11 +246,11 @@ export namespace PackageManagerIntegration {
 		const peripheralDevice = await checkAccessAndGetPeripheralDevice(deviceId, deviceToken, context)
 
 		await PackageContainerPackageStatuses.removeAsync({
-			$or: [
+			$or: _.compact([
 				{ deviceId: peripheralDevice._id },
 				// Since we only have one PM in a studio, we can remove everything in the studio:
-				{ studioId: peripheralDevice.studioAndConfigId.studioId },
-			],
+				peripheralDevice.studioAndConfigId ? { studioId: peripheralDevice.studioAndConfigId.studioId } : null,
+			]),
 		})
 	}
 
@@ -332,11 +333,11 @@ export namespace PackageManagerIntegration {
 		const peripheralDevice = await checkAccessAndGetPeripheralDevice(deviceId, deviceToken, context)
 
 		await PackageContainerStatuses.removeAsync({
-			$or: [
+			$or: _.compact([
 				{ deviceId: peripheralDevice._id },
 				// Since we only have one PM in a studio, we can remove everything in the studio:
-				{ studioId: peripheralDevice.studioAndConfigId.studioId },
-			],
+				peripheralDevice.studioAndConfigId ? { studioId: peripheralDevice.studioAndConfigId.studioId } : null,
+			]),
 		})
 	}
 

meteor/server/migration/X_X_X.ts

@@ -15,7 +15,6 @@ import {
 import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { literal, unprotectString } from '../lib/tempLib'
 import { logger } from '../logging'
-import { IngestDeviceSecretSettingsStatus } from '@sofie-automation/corelib/src/dataModel/PeripheralDeviceSettings/ingestDevice'
 
 /*
  * **************************************************************************************
@@ -256,13 +255,13 @@ export const addSteps = addMigrationSteps(CURRENT_SYSTEM_VERSION, [
 
 			for (const device of devices) {
 				// @ts-expect-error settings is typed as Record<string, any>
-				const oldSettings = device.settings as IngestDeviceSecretSettingsStatus | undefined
+				const oldSettings = device.settings as Record<string, any> | undefined
 
 				await PeripheralDevices.updateAsync(device._id, {
 					$set: {
 						secretSettingsStatus: {
-							secretCredentials: oldSettings?.secretCredentials,
-							secretAccessToken: oldSettings?.secretAccessToken,
+							credentials: oldSettings?.secretCredentials,
+							accessToken: oldSettings?.secretAccessToken,
 						},
 					},
 					$unset: {

packages/job-worker/src/__mocks__/defaultCollectionObjects.ts

@@ -114,6 +114,7 @@ export function defaultStudio(_id: StudioId): DBStudio {
 		previewContainerIds: [],
 		thumbnailContainerIds: [],
 		peripheralDeviceSettings: {
+			deviceSettings: wrapDefaultObject({}),
 			playoutDevices: wrapDefaultObject({}),
 			ingestDevices: wrapDefaultObject({}),
 			inputDevices: wrapDefaultObject({}),