opensource/magistrala
1
0
Fork 0
mirror of https://github.com/absmach/magistrala.git synced 2026-06-23 04:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SMQ-3053 - Fix listing subgroups for users with subgroup related actions (#3066)

Browse Source 
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
This commit is contained in:
Felix Gateru
2025-08-18 10:24:23 +03:00
committed by GitHub
parent 0178594c25
commit b942a42271
3 changed files with 60 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/postgres/channels.go
+20 -16
View File
@@ -701,38 +701,42 @@ direct_groups_with_subgroup AS (
"groups" g ON g.id = gr.entity_id
JOIN
groups_role_actions all_actions ON all_actions.role_id = grm.role_id
LEFT JOIN "groups" g2
ON g2.path <@ g.path AND nlevel(g2.path) = nlevel(g.path) + 1
WHERE
grm.member_id = '%s'
AND g.domain_id = '%s'
AND gra."action" LIKE 'subgroup_channel%%'
AND g2.path IS NULL
GROUP BY
gr.entity_id, grm.member_id, gr.id, gr."name", g."path", g.id
),
direct_leaf_groups_with_subgroup AS (
SELECT dgws.*
FROM direct_groups_with_subgroup dgws
WHERE NOT EXISTS (
SELECT 1
FROM direct_groups_with_subgroup dgws2
WHERE
dgws2.path @> dgws.path
AND dgws2.id != dgws.id
)
),
indirect_child_groups AS (
SELECT
DISTINCT indirect_child_groups.id as child_id,
indirect_child_groups.*,
dgws.id as access_provider_id,
dgws.role_id as access_provider_role_id,
dgws.role_name as access_provider_role_name,
dgws.actions as access_provider_role_actions
dlgws.id as access_provider_id,
dlgws.role_id as access_provider_role_id,
dlgws.role_name as access_provider_role_name,
dlgws.actions as access_provider_role_actions
FROM
direct_groups_with_subgroup dgws
direct_leaf_groups_with_subgroup dlgws
JOIN
groups indirect_child_groups ON indirect_child_groups.path <@ dgws.path
groups indirect_child_groups ON indirect_child_groups.path <@ dlgws.path
WHERE
indirect_child_groups.domain_id = '%s'
AND NOT EXISTS (
AND NOT EXISTS (
SELECT 1
FROM (
SELECT id FROM direct_groups_with_subgroup
UNION ALL
SELECT id FROM direct_groups
) excluded
WHERE excluded.id = indirect_child_groups.id
FROM direct_groups_with_subgroup dgws
WHERE dgws.id = indirect_child_groups.id
)
),
final_groups AS (
clients/postgres/clients.go
+22 -18
View File
@@ -736,39 +736,43 @@ func (repo *clientRepo) userClientBaseQuery(domainID, userID string) string {
"groups" g ON g.id = gr.entity_id
JOIN
groups_role_actions all_actions ON all_actions.role_id = grm.role_id
LEFT JOIN "groups" g2
ON g2.path <@ g.path AND nlevel(g2.path) = nlevel(g.path) + 1
WHERE
grm.member_id = '%s'
AND g.domain_id = '%s'
AND gra."action" LIKE 'subgroup_client%%'
AND g2.path IS NULL
GROUP BY
gr.entity_id, grm.member_id, gr.id, gr."name", g."path", g.id
),
direct_leaf_groups_with_subgroup AS (
SELECT dgws.*
FROM direct_groups_with_subgroup dgws
WHERE NOT EXISTS (
SELECT 1
FROM direct_groups_with_subgroup dgws2
WHERE
dgws2.path @> dgws.path
AND dgws2.id != dgws.id
)
),
indirect_child_groups AS (
SELECT
DISTINCT indirect_child_groups.id as child_id,
indirect_child_groups.*,
dgws.id as access_provider_id,
dgws.role_id as access_provider_role_id,
dgws.role_name as access_provider_role_name,
dgws.actions as access_provider_role_actions
dlgws.id as access_provider_id,
dlgws.role_id as access_provider_role_id,
dlgws.role_name as access_provider_role_name,
dlgws.actions as access_provider_role_actions
FROM
direct_groups_with_subgroup dgws
direct_leaf_groups_with_subgroup dlgws
JOIN
groups indirect_child_groups ON indirect_child_groups.path <@ dgws.path
groups indirect_child_groups ON indirect_child_groups.path <@ dlgws.path -- Finds all children of entity_id based on ltree path
WHERE
indirect_child_groups.domain_id = '%s'
AND NOT EXISTS (
SELECT 1
FROM (
SELECT id FROM direct_groups_with_subgroup
UNION ALL
SELECT id FROM direct_groups
) excluded
WHERE excluded.id = indirect_child_groups.id
)
AND NOT EXISTS (
SELECT 1
FROM direct_groups_with_subgroup dgws
WHERE dgws.id = indirect_child_groups.id
)
),
final_groups AS (
SELECT
groups/postgres/groups.go
+18 -10
View File
@@ -963,28 +963,36 @@ direct_groups_with_subgroup AS (
"groups" g ON g.id = gr.entity_id
JOIN
groups_role_actions all_actions ON all_actions.role_id = grm.role_id
LEFT JOIN "groups" g2
ON g2.path <@ g.path AND nlevel(g2.path) = nlevel(g.path) + 1
WHERE
grm.member_id = '%s'
AND g.domain_id = '%s'
AND gra."action" LIKE 'subgroup_%%'
AND g2.path IS NULL
GROUP BY
gr.entity_id, grm.member_id, gr.id, gr."name", g."path", g.id
),
direct_leaf_groups_with_subgroup AS (
SELECT dgws.*
FROM direct_groups_with_subgroup dgws
WHERE NOT EXISTS (
SELECT 1
FROM direct_groups_with_subgroup dgws2
WHERE
dgws2.path @> dgws.path
AND dgws2.id != dgws.id
)
),
indirect_child_groups AS (
SELECT
DISTINCT indirect_child_groups.id as child_id,
indirect_child_groups.*,
dgws.id as access_provider_id,
dgws.role_id as access_provider_role_id,
dgws.role_name as access_provider_role_name,
dgws.actions as access_provider_role_actions
dlgws.id as access_provider_id,
dlgws.role_id as access_provider_role_id,
dlgws.role_name as access_provider_role_name,
dlgws.actions as access_provider_role_actions
FROM
direct_groups_with_subgroup dgws
direct_leaf_groups_with_subgroup dlgws
JOIN
groups indirect_child_groups ON indirect_child_groups.path <@ dgws.path -- Finds all children of entity_id based on ltree path
groups indirect_child_groups ON indirect_child_groups.path <@ dlgws.path -- Finds all children of entity_id based on ltree path
WHERE
indirect_child_groups.domain_id = '%s'
AND
@@ -1107,7 +1115,7 @@ final_groups AS (
SELECT 1 FROM direct_indirect_groups dig
WHERE dig.id = dg.id
)
GROUP BY
GROUP BY
dg.id, d.id, dr.id
)
`, userID, domainID, userID, domainID, domainID, userID, domainID)