wip: change assignment

Author: Julusian

meteor/server/api/peripheralDevice.ts

@@ -67,7 +67,7 @@ import { convertPeripheralDeviceForGateway } from '../publications/peripheralDev
 import { executePeripheralDeviceFunction } from './peripheralDevice/executeFunction'
 import KoaRouter from '@koa/router'
 import bodyParser from 'koa-bodyparser'
-import { DBStudio, StudioDeviceSettings } from '@sofie-automation/corelib/dist/dataModel/Studio'
+import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
 
 const apmNamespace = 'peripheralDevice'
 export namespace ServerPeripheralDeviceAPI {
@@ -439,7 +439,8 @@ export namespace ServerPeripheralDeviceAPI {
 		if (
 			// Debug states are only valid for Playout devices and must be enabled with the `debugState` option
 			peripheralDevice.type !== PeripheralDeviceType.PLAYOUT ||
-			!peripheralDevice.studioId // Must be attached to a studio`
+			!peripheralDevice.studioId || // Must be attached to a studio`
+			!peripheralDevice.configId // Must be assigned a config
 		) {
 			return {}
 		}
@@ -456,9 +457,10 @@ export namespace ServerPeripheralDeviceAPI {
 			studioForDevice.peripheralDeviceSettings.deviceSettings
 		).obj
 
-		const settingsForDevice = Object.values<StudioDeviceSettings>(studioDeviceSettings).find(
-			(s) => s.peripheralDeviceId === peripheralDevice._id
-		)
+		const settingsForDevice = studioDeviceSettings[peripheralDevice.configId]
+		//  Object.values<StudioDeviceSettings>(studioDeviceSettings).find(
+		// 	(s) => s.peripheralDeviceId === access.deviceId
+		// )
 		if (!settingsForDevice) return {}
 
 		// Make sure debugState is enabled

meteor/server/api/studio/api.ts

@@ -3,7 +3,7 @@ import { check } from '../../lib/check'
 import { registerClassToMeteorMethods } from '../../methods'
 import { NewStudiosAPI, StudiosAPIMethods } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import { literal, getRandomId } from '../../lib/tempLib'
+import { literal, getRandomId, protectString } from '../../lib/tempLib'
 import { lazyIgnore } from '../../lib/lib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import {
@@ -22,11 +22,12 @@ import {
 } from '../../collections'
 import { MethodContextAPI, MethodContext } from '../methodContext'
 import { wrapDefaultObject } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
-import { OrganizationId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { OrganizationId, PeripheralDeviceId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { logger } from '../../logging'
 import { DEFAULT_MINIMUM_TAKE_SPAN } from '@sofie-automation/shared-lib/dist/core/constants'
 import { UserPermissions } from '@sofie-automation/meteor-lib/dist/userPermissions'
 import { assertConnectionHasOneOfPermissions } from '../../security/auth'
+import { triggerWriteAccessBecauseNoCheckNecessary } from '../../security/lib/securityVerify'
 
 const PERMISSIONS_FOR_MANAGE_STUDIOS: Array<keyof UserPermissions> = ['configure']
 
@@ -119,6 +120,40 @@ class ServerStudiosAPI extends MethodContextAPI implements NewStudiosAPI {
 	async removeStudio(studioId: StudioId) {
 		return removeStudio(this, studioId)
 	}
+
+	async assignConfigToPeripheralDevice(studioId: StudioId, configId: string, deviceId: PeripheralDeviceId | null) {
+		triggerWriteAccessBecauseNoCheckNecessary()
+
+		// Unassign other uses
+		await PeripheralDevices.updateAsync(
+			{
+				studioId: studioId,
+				configId: configId,
+				_id: { $ne: deviceId ?? protectString('') },
+			},
+			{
+				$unset: {
+					// nocommit check this
+					studioId: 1,
+					configId: 1,
+				},
+			},
+			{
+				multi: true,
+			}
+		)
+
+		if (deviceId) {
+			// Set for the new one
+			await PeripheralDevices.updateAsync(deviceId, {
+				$set: {
+					// nocommit check this
+					studioId: studioId,
+					configId: configId,
+				},
+			})
+		}
+	}
 }
 registerClassToMeteorMethods(StudiosAPIMethods, ServerStudiosAPI, false)
 

meteor/server/collections/index.ts

@@ -141,6 +141,7 @@ export const PeripheralDevices = createAsyncOnlyMongoCollection<PeripheralDevice
 			'connected',
 			'connectionId',
 			'token',
+			'studioId', // nocommit ensure this is respected
 			// 'settings' is allowed
 		])
 	},

meteor/server/publications/peripheralDeviceForDevice.ts

@@ -14,7 +14,6 @@ import { Complete, assertNever, literal } from '@sofie-automation/corelib/dist/l
 import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo'
 import {
 	DBStudio,
-	StudioDeviceSettings,
 	StudioIngestDevice,
 	StudioInputDevice,
 	StudioPlayoutDevice,
@@ -44,13 +43,14 @@ const studioFieldsSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBStudi
 	peripheralDeviceSettings: 1,
 })
 
-type PeripheralDeviceFields = '_id' | 'category' | 'studioId' | 'secretSettings'
+type PeripheralDeviceFields = '_id' | 'category' | 'studioId' | 'configId' | 'secretSettings'
 const peripheralDeviceFieldsSpecifier = literal<
 	MongoFieldSpecifierOnesStrict<Pick<PeripheralDevice, PeripheralDeviceFields>>
 >({
 	_id: 1,
 	category: 1,
 	studioId: 1,
+	configId: 1,
 	secretSettings: 1,
 })
 
@@ -65,11 +65,15 @@ export function convertPeripheralDeviceForGateway(
 	let deviceSettings: PeripheralDeviceForDevice['deviceSettings'] = {}
 
 	if (studio) {
-		const allDeviceSettingsInStudio = applyAndValidateOverrides(studio.peripheralDeviceSettings.deviceSettings).obj
-		deviceSettings =
-			Object.values<StudioDeviceSettings>(allDeviceSettingsInStudio).find(
-				(v) => v.peripheralDeviceId === peripheralDevice._id
-			)?.options ?? deviceSettings
+		if (peripheralDevice.configId) {
+			const allDeviceSettingsInStudio = applyAndValidateOverrides(
+				studio.peripheralDeviceSettings.deviceSettings
+			).obj
+			deviceSettings = allDeviceSettingsInStudio[peripheralDevice.configId] ?? deviceSettings
+			// Object.values<StudioDeviceSettings>(allDeviceSettingsInStudio).find(
+			// 	(v) => v.peripheralDeviceId === peripheralDevice._id
+			// )?.options ?? deviceSettings
+		}
 
 		switch (peripheralDevice.category) {
 			case PeripheralDeviceCategory.INGEST: {

packages/corelib/src/dataModel/PeripheralDevice.ts

@@ -28,8 +28,11 @@ export interface PeripheralDevice {
 	/** Name of the device (set by the device) */
 	deviceName: string
 
+	// TODO: combine these into a single property, so that they will always be defined at the same times
 	/** The studio this device is assigned to. Will be undefined for sub-devices */
 	studioId?: StudioId
+	/** The config object this device uses from the studio. Will be undefined for sub-devices */
+	configId?: string
 
 	category: PeripheralDeviceCategory
 	type: PeripheralDeviceType

packages/corelib/src/dataModel/Studio.ts

@@ -195,11 +195,11 @@ export interface StudioPlayoutDevice {
 }
 
 export interface StudioDeviceSettings {
-	/**
-	 * The id of the gateway this is assigned to
-	 * Future: This may be replaced with some other grouping or way of assigning devices
-	 */
-	peripheralDeviceId: PeripheralDeviceId | undefined
+	// /**
+	//  * The id of the gateway this is assigned to
+	//  * Future: This may be replaced with some other grouping or way of assigning devices
+	//  */
+	// peripheralDeviceId: PeripheralDeviceId | undefined
 
 	/**
 	 * User friendly name for the device

packages/meteor-lib/src/api/studios.ts

@@ -1,4 +1,4 @@
-import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { PeripheralDeviceId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import {
 	IStudioSettings,
 	MappingsExt,
@@ -9,11 +9,19 @@ import {
 export interface NewStudiosAPI {
 	insertStudio(): Promise<StudioId>
 	removeStudio(studioId: StudioId): Promise<void>
+
+	assignConfigToPeripheralDevice(
+		studioId: StudioId,
+		configId: string,
+		deviceId: PeripheralDeviceId | null
+	): Promise<void>
 }
 
 export enum StudiosAPIMethods {
 	'insertStudio' = 'studio.insertStudio',
 	'removeStudio' = 'studio.removeStudio',
+
+	'assignConfigToPeripheralDevice' = 'studio.assignConfigToPeripheralDevice',
 }
 
 /**