From f22c0f2b1621f80403b2caa2657d5be2e153cf2b Mon Sep 17 00:00:00 2001 From: Ben Allfree Date: Thu, 16 Nov 2023 01:57:19 +0000 Subject: [PATCH] enh: improve version error information --- .../pb_hooks/src/instances-validate-before-create.pb.js | 7 +++++-- .../pb_hooks/src/instances-validate-before-update.pb.js | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/mothership-app/pb_hooks/src/instances-validate-before-create.pb.js b/src/mothership-app/pb_hooks/src/instances-validate-before-create.pb.js index 01c21eb7..27a99f1d 100644 --- a/src/mothership-app/pb_hooks/src/instances-validate-before-create.pb.js +++ b/src/mothership-app/pb_hooks/src/instances-validate-before-create.pb.js @@ -6,9 +6,12 @@ onModelBeforeCreate((e) => { const { versions } = require(`${__hooks}/versions.pb.js`) - if (!versions.includes(e.model.get('version'))) { + const version = e.model.get('version') + if (!versions.includes(version)) { throw new BadRequestError( - `'version' must be one of: ${versions.join(', ')}`, + `Invalid version ${version}. Version must be one of: ${versions.join( + ', ', + )}`, ) } }, 'instances') diff --git a/src/mothership-app/pb_hooks/src/instances-validate-before-update.pb.js b/src/mothership-app/pb_hooks/src/instances-validate-before-update.pb.js index cc946040..6575ff06 100644 --- a/src/mothership-app/pb_hooks/src/instances-validate-before-update.pb.js +++ b/src/mothership-app/pb_hooks/src/instances-validate-before-update.pb.js @@ -6,9 +6,12 @@ onModelBeforeUpdate((e) => { const { versions } = require(`${__hooks}/versions.pb.js`) - if (!versions.includes(e.model.get('version'))) { + const version = e.model.get('version') + if (!versions.includes(version)) { throw new BadRequestError( - `'version' must be one of: ${versions.join(', ')}`, + `Invalid version ${version}. Version must be one of: ${versions.join( + ', ', + )}`, ) } }, 'instances')