From 6c35ef12a27c7fe9bc8bb303f5ed0f83ccb1d092 Mon Sep 17 00:00:00 2001 From: Pau Date: Tue, 15 Apr 2025 21:01:38 +0200 Subject: [PATCH] excluded soft delete helper field from output --- src/models/authorization/roleModel.js | 6 +++--- src/models/authorization/userModel.js | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/models/authorization/roleModel.js b/src/models/authorization/roleModel.js index 4f3fff7..7729ee5 100644 --- a/src/models/authorization/roleModel.js +++ b/src/models/authorization/roleModel.js @@ -15,7 +15,7 @@ const getRoleModel = ({conn, ...rest}) => { return mysql .execute(getRoleQuery({...rest, now}), conn, {...rest, now}) - .then(queryResult => queryResult.map(({id, created, deleted, createdBy, deletedBy, ...resultFiltered}) => resultFiltered)) + .then(queryResult => queryResult.map(({id, name_active, created, deleted, createdBy, deletedBy, ...resultFiltered}) => resultFiltered)) } const countRoleModel = ({conn, ...rest}) => { @@ -31,7 +31,7 @@ const insertRoleModel = ({conn, ...params}) => { const uuid = uuidv4() return mysql.execute(insertRoleQuery({...params, uuid, now}), conn, {...params, uuid, now}) - .then(res => res[1].map(({id, created, deleted, createdBy, deletedBy, ...rest}) => ({...rest}))) + .then(res => res[1].map(({id, name_active, created, deleted, createdBy, deletedBy, ...rest}) => ({...rest}))) } const modifyRoleModel = ({uuid, name, conn}) => { @@ -46,7 +46,7 @@ const modifyRoleModel = ({uuid, name, conn}) => { if (deletedItem) { throw error404() } - return res[1].map(({id, created, deleted, createdBy, deletedBy, ...rest}) => ({...rest})) + return res[1].map(({id, name_active, created, deleted, createdBy, deletedBy, ...rest}) => ({...rest})) }) } diff --git a/src/models/authorization/userModel.js b/src/models/authorization/userModel.js index d57ce8a..3caba79 100644 --- a/src/models/authorization/userModel.js +++ b/src/models/authorization/userModel.js @@ -16,7 +16,7 @@ const getUserListModel = ({conn, ...rest}) => { const paramsToSearch = {...rest, now} return mysql .execute(getUserListQuery(paramsToSearch), conn, paramsToSearch) - .then(queryResult => queryResult.map(({id, created, deleted, createdBy, deletedBy, ...resultFiltered}) => resultFiltered)) + .then(queryResult => queryResult.map(({id, username_active, created, deleted, createdBy, deletedBy, ...resultFiltered}) => resultFiltered)) } const countUserListModel = ({conn, ...rest}) => { @@ -32,7 +32,7 @@ const getUserByUuidModel = ({conn, uuid}) => { const paramsToSearch = {uuid, now} return mysql .execute(getUserListQuery(paramsToSearch), conn, paramsToSearch) - .then(queryResult => queryResult.map(({id, created, deleted, createdBy, deletedBy, ...resultFiltered}) => resultFiltered)) + .then(queryResult => queryResult.map(({id, username_active, created, deleted, createdBy, deletedBy, ...resultFiltered}) => resultFiltered)) } const insertUserModel = ({conn, ...params}) => { @@ -40,7 +40,7 @@ const insertUserModel = ({conn, ...params}) => { const uuid = uuidv4() return mysql .execute(insertUserQuery({...params, uuid, now}), conn, {...params, uuid, now}) - .then(queryResult => queryResult[1].map(({id, password, created, deleted, createdBy, deletedBy, ...resultFiltered}) => resultFiltered)) + .then(queryResult => queryResult[1].map(({id, username_active, password, created, deleted, createdBy, deletedBy, ...resultFiltered}) => resultFiltered)) } const modifyUserModel = ({conn, ...params}) => { @@ -52,7 +52,7 @@ const modifyUserModel = ({conn, ...params}) => { if (deletedItem) { throw error404() } - return queryResult[1].map(({id, password, created, deleted, createdBy, deletedBy, ...resultFiltered}) => resultFiltered) + return queryResult[1].map(({id, username_active, password, created, deleted, createdBy, deletedBy, ...resultFiltered}) => resultFiltered) }) }