From bb8496a161fca69aaa1dcc3ee8e7c891519865e9 Mon Sep 17 00:00:00 2001 From: Pau Date: Wed, 16 Apr 2025 12:41:38 +0200 Subject: [PATCH] fixed naming error --- .../roles_has_permissionsRepository.js | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/repositories/authorization/roles_has_permissionsRepository.js b/src/repositories/authorization/roles_has_permissionsRepository.js index a8bb934..552912d 100644 --- a/src/repositories/authorization/roles_has_permissionsRepository.js +++ b/src/repositories/authorization/roles_has_permissionsRepository.js @@ -2,9 +2,9 @@ import { pagination } from '../../utils/pagination.js' const _rolesHasPermissionsQuery = (_pagination = '') => ({count}) => ({uuid, role_uuid, permission_uuid, roleName}) => { const uuidCondition = uuid ? 'AND r.uuid = :uuid' : ''; - const roleUuidCondition = role_uuid ? 'AND fk_role = (SELECT id from mydb.roles WHERE uuid = :role_uuid)' : ''; - const roleNameCondition = roleName ? 'AND fk_role = (SELECT id from mydb.roles WHERE name = :roleName)' : ''; - const permissionsUuidCondition = permission_uuid ? 'AND fk_permission = (SELECT id from mydb.permissions WHERE uuid = :permission_uuid)' : ''; + const roleUuidCondition = role_uuid ? 'AND fk_role = (SELECT id from dbmaster.roles WHERE uuid = :role_uuid)' : ''; + const roleNameCondition = roleName ? 'AND fk_role = (SELECT id from dbmaster.roles WHERE name = :roleName)' : ''; + const permissionsUuidCondition = permission_uuid ? 'AND fk_permission = (SELECT id from dbmaster.permissions WHERE uuid = :permission_uuid)' : ''; return ` SELECT ${count || @@ -15,13 +15,13 @@ const _rolesHasPermissionsQuery = (_pagination = '') => ({count}) => ({uuid, rol p.uuid as permission_uuid, p.fk_endpoint as permission_endpoint`} FROM - mydb.roles_has_permissions as r + dbmaster.roles_has_permissions as r JOIN - mydb.roles as r2 ON r.fk_role = r2.id + dbmaster.roles as r2 ON r.fk_role = r2.id AND r2.created <= :now AND (r2.deleted > :now OR r2.deleted IS NULL) JOIN - mydb.permissions as p ON r.fk_permission = p.id + dbmaster.permissions as p ON r.fk_permission = p.id AND p.created <= :now AND (p.deleted > :now OR p.deleted IS NULL) WHERE @@ -45,7 +45,7 @@ const countRolesHasPermissionsQuery = rest => const insertRolesHasPermissionsQuery = () => { return ` - INSERT INTO mydb.roles_has_permissions ( + INSERT INTO dbmaster.roles_has_permissions ( uuid, fk_role, fk_permission, @@ -54,8 +54,8 @@ const insertRolesHasPermissionsQuery = () => { ) VALUES ( :uuid, - (SELECT id FROM mydb.roles WHERE uuid = :role_uuid), - (SELECT id FROM mydb.permissions WHERE uuid = :permission_uuid), + (SELECT id FROM dbmaster.roles WHERE uuid = :role_uuid), + (SELECT id FROM dbmaster.permissions WHERE uuid = :permission_uuid), :now, :createdBy ); @@ -63,41 +63,41 @@ const insertRolesHasPermissionsQuery = () => { permissions.uuid as permission_uuid, roles.uuid as role_uuid, roles.name as role_name - FROM mydb.roles_has_permissions as rp - LEFT JOIN mydb.permissions as permissions ON rp.fk_permission = permissions.id - LEFT JOIN mydb.roles as roles ON rp.fk_role = roles.id + FROM dbmaster.roles_has_permissions as rp + LEFT JOIN dbmaster.permissions as permissions ON rp.fk_permission = permissions.id + LEFT JOIN dbmaster.roles as roles ON rp.fk_role = roles.id WHERE rp.uuid = :uuid; ` } const modifyRolesHasPermissionsQuery = (new_role_uuid, new_permission_uuid) => { - const roleUuidCondition = new_role_uuid ? 'fk_role = (SELECT id from mydb.roles WHERE uuid = :new_role_uuid),' : ''; - const permissionUuidCondition = new_permission_uuid ? 'fk_permission = (SELECT id from mydb.permissions WHERE uuid = :new_permission_uuid),' : ''; + const roleUuidCondition = new_role_uuid ? 'fk_role = (SELECT id from dbmaster.roles WHERE uuid = :new_role_uuid),' : ''; + const permissionUuidCondition = new_permission_uuid ? 'fk_permission = (SELECT id from dbmaster.permissions WHERE uuid = :new_permission_uuid),' : ''; return ` UPDATE - mydb.roles_has_permissions as roles_has_permissions + dbmaster.roles_has_permissions as roles_has_permissions SET ${roleUuidCondition} ${permissionUuidCondition} uuid = :uuid WHERE - roles_has_permissions.fk_role = (SELECT id from mydb.roles WHERE uuid = :role_uuid) - AND roles_has_permissions.fk_permission = (SELECT id from mydb.permissions WHERE uuid = :permission_uuid) + roles_has_permissions.fk_role = (SELECT id from dbmaster.roles WHERE uuid = :role_uuid) + AND roles_has_permissions.fk_permission = (SELECT id from dbmaster.permissions WHERE uuid = :permission_uuid) AND roles_has_permissions.deleted IS NULL; - SELECT * FROM mydb.roles_has_permissions WHERE uuid = :uuid; + SELECT * FROM dbmaster.roles_has_permissions WHERE uuid = :uuid; ` } const softDeleteRolesHasPermissionsQuery = (permission_uuid) => { - const permissionUuidCondition = permission_uuid ? 'AND roles_has_permissions.fk_permission = (SELECT id from mydb.permissions WHERE uuid = :permission_uuid)' : ''; + const permissionUuidCondition = permission_uuid ? 'AND roles_has_permissions.fk_permission = (SELECT id from dbmaster.permissions WHERE uuid = :permission_uuid)' : ''; return ` UPDATE - mydb.roles_has_permissions as roles_has_permissions + dbmaster.roles_has_permissions as roles_has_permissions SET deleted = :deleted, deletedBy = :deletedBy WHERE - roles_has_permissions.fk_role = (SELECT id from mydb.roles WHERE uuid = :role_uuid) + roles_has_permissions.fk_role = (SELECT id from dbmaster.roles WHERE uuid = :role_uuid) ${permissionUuidCondition} AND roles_has_permissions.deleted IS NULL