Add v7 read translation for device service environment variable servi…

…ce install Change-type: patch
balena-io · Nov 29, 2024 · 39ab00d · 39ab00d
1 parent bc6381f
commit 39ab00d
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 79 deletions.
diff --git a/src/balena-model.ts b/src/balena-model.ts
@@ -937,15 +937,6 @@ export interface ServiceInstall {
 			| { __id: Service['Read']['id'] }
 			| [Service['Read']];
 		is_installed_on__device: { __id: Device['Read']['id'] } | [Device['Read']];
-		is_of__device__has__application__has__service_name__has__env_var_name?: Array<
-			DeviceServiceEnvironmentVariable['Read']
-		>;
-		is_of__device__has__service__has__env_var_name?: Array<
-			DeviceServiceEnvironmentVariable['Read']
-		>;
-		is_of__device_service_environment_variable?: Array<
-			DeviceServiceEnvironmentVariable['Read']
-		>;
 	};
 	Write: {
 		created_at: Types['Date Time']['Write'];
@@ -965,15 +956,6 @@ export interface DeviceServiceEnvironmentVariable {
 		name: Types['Short Text']['Read'];
 		id: Types['Serial']['Read'];
 		value: Types['Text']['Read'];
-		service_install:
-			| { __id: ServiceInstall['Read']['id'] }
-			| [ServiceInstall['Read']];
-		device__installs__application__has__service_name:
-			| { __id: ServiceInstall['Read']['id'] }
-			| [ServiceInstall['Read']];
-		device__installs__service:
-			| { __id: ServiceInstall['Read']['id'] }
-			| [ServiceInstall['Read']];
 		application__has__service_name:
 			| { __id: Service['Read']['id'] }
 			| [Service['Read']];
@@ -986,7 +968,6 @@ export interface DeviceServiceEnvironmentVariable {
 		name: Types['Short Text']['Write'];
 		id: Types['Serial']['Write'];
 		value: Types['Text']['Write'];
-		service_install: ServiceInstall['Write']['id'];
 	};
 }
 

diff --git a/src/balena.sbvr b/src/balena.sbvr
@@ -812,8 +812,6 @@ Fact type: image environment variable has value
 
 Fact type: device service environment variable has value
 	Necessity: each device service environment variable has exactly one value.
-Fact type: device service environment variable has service install
-	Necessity: each device service environment variable has exactly one service install.
 
 
 -- application tag

diff --git a/src/features/cascade-delete/hooks.ts b/src/features/cascade-delete/hooks.ts
@@ -21,6 +21,7 @@ setupDeleteCascade('device', {
 	device_tag: 'device',
 	image_install: 'device',
 	service_install: 'device',
+	device_service_environment_variable: 'device',
 });
 
 setupDeleteCascade('image', {
@@ -45,11 +46,37 @@ setupDeleteCascade('service', {
 	service_install: 'installs__service',
 	image: 'is_a_build_of__service',
 	service_label: 'service',
+	device_service_environment_variable: 'service',
 });
 
-setupDeleteCascade('service_install', {
-	device_service_environment_variable: 'service_install',
-});
+// hooks.addPureHook('DELETE', 'resin', 'service install', {
+// 	PRERUN: async (args) => {
+// 		const serviceInstallIds = await getAffectedIds(args);
+// 		if (serviceInstallIds.length === 0) {
+// 			return;
+// 		}
+
+// 		// Delete all device_service_environment_variable (dsev) where
+// 		// dsev.device = service_install.device and dsev.service = service_install.installs__service
+// 		await args.api.delete({
+// 			resource: 'device_service_environment_variable',
+// 			passthrough: {
+// 				tx: args.tx,
+// 				req: permissions.root,
+// 			},
+// 			options: {
+// 				$filter: {
+
+// 				},
+// 			},
+// 		});
+
+// 	},
+// });
+
+// setupDeleteCascade('service_install', {
+// 	device_service_environment_variable: 'service_install',
+// });
 
 const deleteApiKeyHooks: hooks.Hooks = {
 	PRERUN: async (args) => {

diff --git a/src/translations/v7/v7.ts b/src/translations/v7/v7.ts
@@ -22,6 +22,44 @@ export const getV7Translations = (_abstractSqlModel = v7AbstractSqlModel) => {
 	return {
 		'device-installs-application-has-service name-has-name': {
 			$toResource: 'device-has-application-has-service name-has-env var name',
+			'service install': [
+				'SelectQuery',
+				['Select', [['ReferencedField', 'si', 'id']]],
+				[
+					'From',
+					[
+						'Alias',
+						// TODO: should this be changed from table to resource? How?
+						['Table', 'device service environment variable'],
+						'dsev',
+					],
+				],
+				[
+					'Join',
+					[
+						'Alias',
+						// TODO: should this be changed from table to resource? How?
+						['Table', 'service install'],
+						'si',
+					],
+					[
+						'On',
+						[
+							'And',
+							[
+								'Equals',
+								['ReferencedField', 'dsev', 'device'],
+								['ReferencedField', 'si', 'device'],
+							],
+							[
+								'Equals',
+								['ReferencedField', 'dsev', 'service'],
+								['ReferencedField', 'si', 'installs-service'],
+							],
+						],
+					],
+				],
+			],
 		},
 	} satisfies ConfigLoader.Model['translations'];
 };
diff --git a/test/25_service-installs.ts b/test/25_service-installs.ts
@@ -284,68 +284,70 @@ export default () => {
 					);
 				});
 
-				it('should be able to update device_service_environment_variable service_install', async () => {
-					const { body: serviceInstallService1 } = await pineUser
-						.get({
-							resource: 'service_install',
-							id: {
-								device: ctx.device.id,
-								installs__service: ctx.app2Service1.id,
-							},
-						})
-						.expect(200);
-					assertExists(serviceInstallService1);
+				if (versions.lte(version, 'v7')) {
+					it('should be able to update device_service_environment_variable service_install', async () => {
+						const { body: serviceInstallService1 } = await pineUser
+							.get({
+								resource: 'service_install',
+								id: {
+									device: ctx.device.id,
+									installs__service: ctx.app2Service1.id,
+								},
+							})
+							.expect(200);
+						assertExists(serviceInstallService1);
 
-					const { body: serviceInstallService2 } = await pineUser
-						.get({
-							resource: 'service_install',
-							id: {
-								device: ctx.device.id,
-								installs__service: ctx.app2Service2.id,
-							},
-						})
-						.expect(200);
-					assertExists(serviceInstallService2);
+						const { body: serviceInstallService2 } = await pineUser
+							.get({
+								resource: 'service_install',
+								id: {
+									device: ctx.device.id,
+									installs__service: ctx.app2Service2.id,
+								},
+							})
+							.expect(200);
+						assertExists(serviceInstallService2);
 
-					const {
-						body: [deviceServiceEnvVar],
-					} = await pineUser
-						.get({
-							resource: 'device_service_environment_variable',
-							options: {
-								$filter: {
-									service_install: serviceInstallService1.id,
+						const {
+							body: [deviceServiceEnvVar],
+						} = await pineUser
+							.get({
+								resource: 'device_service_environment_variable',
+								options: {
+									$filter: {
+										service_install: serviceInstallService1.id,
+									},
 								},
-							},
-						})
-						.expect(200);
-					assertExists(deviceServiceEnvVar);
+							})
+							.expect(200);
+						assertExists(deviceServiceEnvVar);
+
+						await pineUser
+							.patch({
+								resource: 'device_service_environment_variable',
+								id: deviceServiceEnvVar.id,
+								body: {
+									service_install: serviceInstallService2.id,
+								},
+							})
+							.expect(200);
 
-					await pineUser
-						.patch({
-							resource: 'device_service_environment_variable',
-							id: deviceServiceEnvVar.id,
+						const {
 							body: {
-								service_install: serviceInstallService2.id,
+								d: [dbDeviceServiceEnvVar],
 							},
-						})
-						.expect(200);
-
-					const {
-						body: {
-							d: [dbDeviceServiceEnvVar],
-						},
-					} = await supertest(ctx.admin)
-						.get(
-							`/resin/device_service_environment_variable(${deviceServiceEnvVar.id})?$select=device,service`,
-						)
-						.expect(200);
+						} = await supertest(ctx.admin)
+							.get(
+								`/resin/device_service_environment_variable(${deviceServiceEnvVar.id})?$select=device,service`,
+							)
+							.expect(200);
 
-					expect(dbDeviceServiceEnvVar.device.__id).to.equal(ctx.device.id);
-					expect(dbDeviceServiceEnvVar.service.__id).to.equal(
-						ctx.app2Service2.id,
-					);
-				});
+						expect(dbDeviceServiceEnvVar.device.__id).to.equal(ctx.device.id);
+						expect(dbDeviceServiceEnvVar.service.__id).to.equal(
+							ctx.app2Service2.id,
+						);
+					});
+				}
 			});
 		});
 	});