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

fixed badly written queries

This commit is contained in:
Pau 2025-04-11 20:32:39 +02:00
parent 5ca63437ca
commit 8e10c2aebb
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/repositories/authorization/permissionsRepository.js
View File

@ -12,8 +12,10 @@ const _permissionsQuery = (_pagination = '') => ({count}) => ({uuid, action, end
acloc.permissions as p
LEFT JOIN
acloc.endpoints as e ON p.fk_endpoint = e.id
AND e.created <= :now
WHERE
e.created <= :now
AND (e.deleted > :now OR e.deleted IS NULL)
AND
p.created <= :now
AND
(p.deleted > :now OR p.deleted IS NULL)
@ -31,11 +33,11 @@ const getPermissionsQuery = ({ limit, page, ...rest }) =>
const countPermissionsQuery = rest =>
_permissionsQuery()({ count: 'COUNT(*) AS count' })(rest);
const insertPermissionsQuery = () => {
const insertPermissionsQuery = (createdBy) => {
const createdByCondition = createdBy ? ':createdBy' : null;
return `
INSERT INTO acloc.permissions (
uuid,
name,
action,
fk_endpoint,
created,
@ -43,11 +45,10 @@ const insertPermissionsQuery = () => {
)
VALUES (
:uuid,
:name,
:action,
(SELECT id FROM acloc.endpoints WHERE route = :endpoint),
:now,
:createdBy
${createdByCondition}
);
SELECT * FROM acloc.permissions WHERE uuid = :uuid;
`
@ -57,7 +58,7 @@ const modifyPermissionsQuery = (action, endpoint) => {
const actionCondition = action ? 'action = :action ,' : '';
const endpointCondition = endpoint ? 'fk_endpoint = (SELECT id from acloc.endpoints WHERE route = :endpoint),' : '';
return `
UPDATE acloc.permissions
UPDATE acloc.permissions AS permissions
SET
${actionCondition}
${endpointCondition}
@ -73,13 +74,13 @@ const modifyPermissionsQuery = (action, endpoint) => {
const softDeletePermissionsQuery = () => {
return `
UPDATE
acloc.permissions
acloc.permissions AS permissions
SET
deleted = :now, deletedBy = :deletedBy
WHERE
permissions.uuid = :uuid
AND
permissions.deleted IS NULL
permissions.deleted IS NULL;
SELECT * FROM acloc.permissions WHERE uuid = :uuid;
`
}

4
src/repositories/authorization/userRepository.js
View File

@ -23,7 +23,7 @@ const _userListSelectQuery = (_pagination = '') =>
${count || `users.*, r.name AS role`}
FROM
acloc.users as users
LEFT JOIN acloc.roles as r ON acloc.fk_role = r.id
LEFT JOIN acloc.roles as r ON users.fk_role = r.id
WHERE
users.created <= :now
AND
@ -63,7 +63,7 @@ const countUserListQuery = rest =>
const insertUserQuery = ({email, fk_role, createdBy}) => {
const emailCondition = email ? ':email' : null;
const roleCondition = fk_role ? '(SELECT id FROM acloc.roles WHERE name = :fk_role)' : `(SELECT id FROM acloc.roles WHERE name = 'viewer')`;
const createdByCondition = createdBy ? 'createdBy = :createdBy' : null;
const createdByCondition = createdBy ? ':createdBy' : null;
return `
INSERT INTO acloc.users (
uuid,