From d26951723637e201efa1f75ec74ac3a845d8f20b Mon Sep 17 00:00:00 2001 From: Marios Kranitsas Date: Tue, 7 Feb 2023 16:48:47 +0200 Subject: [PATCH 1/3] Fix group patch --- src/services/GroupService.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/services/GroupService.js b/src/services/GroupService.js index 3462019..1eadbd3 100644 --- a/src/services/GroupService.js +++ b/src/services/GroupService.js @@ -308,6 +308,9 @@ updateGroup.schema = { * @returns {Object} the updated group */ async function patchGroup(currentUser, groupId, data) { + if (!data.oldId) { + throw new error.BadRequestError('Can not Patch without oldId') + } const session = helper.createDBSession() const tx = session.beginTransaction() try { From 19f0763b54dc97701dd9d09436010b4681d276ed Mon Sep 17 00:00:00 2001 From: Marios Kranitsas Date: Tue, 7 Feb 2023 16:49:41 +0200 Subject: [PATCH 2/3] Fix Typo --- src/services/GroupService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/GroupService.js b/src/services/GroupService.js index 1eadbd3..5b18e39 100644 --- a/src/services/GroupService.js +++ b/src/services/GroupService.js @@ -309,7 +309,7 @@ updateGroup.schema = { */ async function patchGroup(currentUser, groupId, data) { if (!data.oldId) { - throw new error.BadRequestError('Can not Patch without oldId') + throw new errors.BadRequestError('Can not Patch without oldId') } const session = helper.createDBSession() const tx = session.beginTransaction() From 2ff2fd7a5f3cc8b53dd70f1cae560420db6b2f16 Mon Sep 17 00:00:00 2001 From: Marios Kranitsas Date: Tue, 7 Feb 2023 17:21:51 +0200 Subject: [PATCH 3/3] move oldId check to joi validation --- src/services/GroupService.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/services/GroupService.js b/src/services/GroupService.js index 5b18e39..87f4a0d 100644 --- a/src/services/GroupService.js +++ b/src/services/GroupService.js @@ -308,9 +308,6 @@ updateGroup.schema = { * @returns {Object} the updated group */ async function patchGroup(currentUser, groupId, data) { - if (!data.oldId) { - throw new errors.BadRequestError('Can not Patch without oldId') - } const session = helper.createDBSession() const tx = session.beginTransaction() try { @@ -357,9 +354,9 @@ async function patchGroup(currentUser, groupId, data) { patchGroup.schema = { currentUser: Joi.any(), groupId: Joi.string(), // defined in app-bootstrap - data: Joi.object() + data: Joi.object().required() .keys({ - oldId: Joi.string(), + oldId: Joi.string().required(), }) }