fixed naming error
This commit is contained in:
parent
6c35ef12a2
commit
bb8496a161
|
|
@ -2,9 +2,9 @@ import { pagination } from '../../utils/pagination.js'
|
||||||
|
|
||||||
const _rolesHasPermissionsQuery = (_pagination = '') => ({count}) => ({uuid, role_uuid, permission_uuid, roleName}) => {
|
const _rolesHasPermissionsQuery = (_pagination = '') => ({count}) => ({uuid, role_uuid, permission_uuid, roleName}) => {
|
||||||
const uuidCondition = uuid ? 'AND r.uuid = :uuid' : '';
|
const uuidCondition = uuid ? 'AND r.uuid = :uuid' : '';
|
||||||
const roleUuidCondition = role_uuid ? 'AND fk_role = (SELECT id from mydb.roles WHERE uuid = :role_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 mydb.roles WHERE name = :roleName)' : '';
|
const roleNameCondition = roleName ? 'AND fk_role = (SELECT id from dbmaster.roles WHERE name = :roleName)' : '';
|
||||||
const permissionsUuidCondition = permission_uuid ? 'AND fk_permission = (SELECT id from mydb.permissions WHERE uuid = :permission_uuid)' : '';
|
const permissionsUuidCondition = permission_uuid ? 'AND fk_permission = (SELECT id from dbmaster.permissions WHERE uuid = :permission_uuid)' : '';
|
||||||
return `
|
return `
|
||||||
SELECT
|
SELECT
|
||||||
${count ||
|
${count ||
|
||||||
|
|
@ -15,13 +15,13 @@ const _rolesHasPermissionsQuery = (_pagination = '') => ({count}) => ({uuid, rol
|
||||||
p.uuid as permission_uuid,
|
p.uuid as permission_uuid,
|
||||||
p.fk_endpoint as permission_endpoint`}
|
p.fk_endpoint as permission_endpoint`}
|
||||||
FROM
|
FROM
|
||||||
mydb.roles_has_permissions as r
|
dbmaster.roles_has_permissions as r
|
||||||
JOIN
|
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.created <= :now
|
||||||
AND (r2.deleted > :now OR r2.deleted IS NULL)
|
AND (r2.deleted > :now OR r2.deleted IS NULL)
|
||||||
JOIN
|
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.created <= :now
|
||||||
AND (p.deleted > :now OR p.deleted IS NULL)
|
AND (p.deleted > :now OR p.deleted IS NULL)
|
||||||
WHERE
|
WHERE
|
||||||
|
|
@ -45,7 +45,7 @@ const countRolesHasPermissionsQuery = rest =>
|
||||||
|
|
||||||
const insertRolesHasPermissionsQuery = () => {
|
const insertRolesHasPermissionsQuery = () => {
|
||||||
return `
|
return `
|
||||||
INSERT INTO mydb.roles_has_permissions (
|
INSERT INTO dbmaster.roles_has_permissions (
|
||||||
uuid,
|
uuid,
|
||||||
fk_role,
|
fk_role,
|
||||||
fk_permission,
|
fk_permission,
|
||||||
|
|
@ -54,8 +54,8 @@ const insertRolesHasPermissionsQuery = () => {
|
||||||
)
|
)
|
||||||
VALUES (
|
VALUES (
|
||||||
:uuid,
|
:uuid,
|
||||||
(SELECT id FROM mydb.roles WHERE uuid = :role_uuid),
|
(SELECT id FROM dbmaster.roles WHERE uuid = :role_uuid),
|
||||||
(SELECT id FROM mydb.permissions WHERE uuid = :permission_uuid),
|
(SELECT id FROM dbmaster.permissions WHERE uuid = :permission_uuid),
|
||||||
:now,
|
:now,
|
||||||
:createdBy
|
:createdBy
|
||||||
);
|
);
|
||||||
|
|
@ -63,41 +63,41 @@ const insertRolesHasPermissionsQuery = () => {
|
||||||
permissions.uuid as permission_uuid,
|
permissions.uuid as permission_uuid,
|
||||||
roles.uuid as role_uuid,
|
roles.uuid as role_uuid,
|
||||||
roles.name as role_name
|
roles.name as role_name
|
||||||
FROM mydb.roles_has_permissions as rp
|
FROM dbmaster.roles_has_permissions as rp
|
||||||
LEFT JOIN mydb.permissions as permissions ON rp.fk_permission = permissions.id
|
LEFT JOIN dbmaster.permissions as permissions ON rp.fk_permission = permissions.id
|
||||||
LEFT JOIN mydb.roles as roles ON rp.fk_role = roles.id
|
LEFT JOIN dbmaster.roles as roles ON rp.fk_role = roles.id
|
||||||
WHERE rp.uuid = :uuid;
|
WHERE rp.uuid = :uuid;
|
||||||
`
|
`
|
||||||
}
|
}
|
||||||
|
|
||||||
const modifyRolesHasPermissionsQuery = (new_role_uuid, new_permission_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 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 mydb.permissions WHERE uuid = :new_permission_uuid),' : '';
|
const permissionUuidCondition = new_permission_uuid ? 'fk_permission = (SELECT id from dbmaster.permissions WHERE uuid = :new_permission_uuid),' : '';
|
||||||
return `
|
return `
|
||||||
UPDATE
|
UPDATE
|
||||||
mydb.roles_has_permissions as roles_has_permissions
|
dbmaster.roles_has_permissions as roles_has_permissions
|
||||||
SET
|
SET
|
||||||
${roleUuidCondition}
|
${roleUuidCondition}
|
||||||
${permissionUuidCondition}
|
${permissionUuidCondition}
|
||||||
uuid = :uuid
|
uuid = :uuid
|
||||||
WHERE
|
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)
|
||||||
AND roles_has_permissions.fk_permission = (SELECT id from mydb.permissions WHERE uuid = :permission_uuid)
|
AND roles_has_permissions.fk_permission = (SELECT id from dbmaster.permissions WHERE uuid = :permission_uuid)
|
||||||
AND
|
AND
|
||||||
roles_has_permissions.deleted IS NULL;
|
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 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 `
|
return `
|
||||||
UPDATE
|
UPDATE
|
||||||
mydb.roles_has_permissions as roles_has_permissions
|
dbmaster.roles_has_permissions as roles_has_permissions
|
||||||
SET
|
SET
|
||||||
deleted = :deleted, deletedBy = :deletedBy
|
deleted = :deleted, deletedBy = :deletedBy
|
||||||
WHERE
|
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}
|
${permissionUuidCondition}
|
||||||
AND
|
AND
|
||||||
roles_has_permissions.deleted IS NULL
|
roles_has_permissions.deleted IS NULL
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue