pauher
/
LocationAPI
mirror of https://github.com/Misscott/LocationAPI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed small problems regarding role has permission usage and implementation

This commit is contained in:
Pau 2025-04-17 08:31:42 +02:00
parent bb8496a161
commit f680bb87fb
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/controllers/authorization/roles_has_permissionsController.js
View File

@ -87,9 +87,9 @@ const postRolesHasPermissionsController = (req, res, next, config) => {
const putRolesHasPermissionsController = (req, res, next, config) => { const putRolesHasPermissionsController = (req, res, next, config) => {
const conn = mysql.start(config) const conn = mysql.start(config)
modifyRolesHasPermissionsModel({ ...req.body, ...req.params, modifiedBy, conn }) modifyRolesHasPermissionsModel({ ...req.body, ...req.params, conn })
.then((roles_has_permissions) => { .then((roles_has_permissions) => {
if (noResults(response)) { if (noResults(roles_has_permissions)) {
const err = error404() const err = error404()
const error = errorHandler(err, config.environment) const error = errorHandler(err, config.environment)
return sendResponseNotFound(res, error) return sendResponseNotFound(res, error)

23
src/repositories/authorization/roles_has_permissionsRepository.js
View File

@ -59,7 +59,7 @@ const insertRolesHasPermissionsQuery = () => {
:now, :now,
:createdBy :createdBy
); );
SELECT permissions.*, SELECT roles_has_permissions.*,
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
@ -70,26 +70,39 @@ const insertRolesHasPermissionsQuery = () => {
` `
} }
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 dbmaster.roles WHERE uuid = :new_role_uuid),' : ''; const roleUuidCondition = new_role_uuid ? 'fk_role = (SELECT id from dbmaster.roles WHERE uuid = :new_role_uuid),' : '';
const showNewRoleCondition = new_role_uuid ? 'AND dbmaster.roles.uuid = :new_role_uuid' : ''
const permissionUuidCondition = new_permission_uuid ? 'fk_permission = (SELECT id from dbmaster.permissions WHERE uuid = :new_permission_uuid),' : ''; const permissionUuidCondition = new_permission_uuid ? 'fk_permission = (SELECT id from dbmaster.permissions WHERE uuid = :new_permission_uuid),' : '';
const showNewPermissionCondition = new_permission_uuid? 'AND dbmaster.permissions.uuid = :new_permission_uuid' : ''
return ` return `
UPDATE UPDATE
dbmaster.roles_has_permissions as roles_has_permissions dbmaster.roles_has_permissions as roles_has_permissions
SET SET
${roleUuidCondition} ${roleUuidCondition}
${permissionUuidCondition} ${permissionUuidCondition}
uuid = :uuid roles_has_permissions.created = roles_has_permissions.created
WHERE WHERE
roles_has_permissions.fk_role = (SELECT id from dbmaster.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 dbmaster.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 dbmaster.roles_has_permissions WHERE uuid = :uuid;
SELECT rp.*,
permissions.uuid as permission_uuid,
roles.uuid as role_uuid,
roles.name as role_name
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
true
${showNewPermissionCondition}
${showNewRoleCondition};
` `
} }
const softDeleteRolesHasPermissionsQuery = (permission_uuid) => { const softDeleteRolesHasPermissionsQuery = ({permission_uuid}) => {
const permissionUuidCondition = permission_uuid ? 'AND roles_has_permissions.fk_permission = (SELECT id from dbmaster.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