From 9304499f5418516ef7a491939774364005a11b69 Mon Sep 17 00:00:00 2001 From: Ethienne Roy Date: Mon, 21 Aug 2023 15:02:10 -0400 Subject: [PATCH 1/2] add check before saving savedFilters --- src/db/models/SavedFilter.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/db/models/SavedFilter.ts b/src/db/models/SavedFilter.ts index 38232b0..8c62068 100644 --- a/src/db/models/SavedFilter.ts +++ b/src/db/models/SavedFilter.ts @@ -92,5 +92,6 @@ SavedFilterModel.init( SavedFilterModel.beforeCreate(handleUniqueName); SavedFilterModel.beforeUpdate(handleUniqueName); +SavedFilterModel.beforeSave(handleUniqueName); export default SavedFilterModel; From 2eb6090aec363bb1162ab5ae6d1716fc57dd5f82 Mon Sep 17 00:00:00 2001 From: Ethienne Roy Date: Wed, 23 Aug 2023 10:32:12 -0400 Subject: [PATCH 2/2] saved filter update hook wasn't trigger everytime --- src/db/dal/savedFilter.ts | 1 + src/utils/savedFilters.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/db/dal/savedFilter.ts b/src/db/dal/savedFilter.ts index 9ababc7..f847242 100644 --- a/src/db/dal/savedFilter.ts +++ b/src/db/dal/savedFilter.ts @@ -56,6 +56,7 @@ export const update = async ( [Op.and]: [{ keycloak_id }, { id }], }, returning: true, + individualHooks: true, }, ); diff --git a/src/utils/savedFilters.ts b/src/utils/savedFilters.ts index 3088925..91685b1 100644 --- a/src/utils/savedFilters.ts +++ b/src/utils/savedFilters.ts @@ -80,7 +80,7 @@ export const uniqueNameErrorHandler = (e, res) => { res.status(StatusCodes.UNPROCESSABLE_ENTITY).send({ error: { message: err.message, - translationKey: `${err.instance.dataValues.type || 'filter'}.error.save.nameAlreadyExists`, + translationKey: `${err.instance?.dataValues.type || 'filter'}.error.save.nameAlreadyExists`, }, }); }