From 9bd76a07d0cbc9980184de567bbab401367631a0 Mon Sep 17 00:00:00 2001 From: Iraq Jaber Date: Thu, 20 Mar 2025 13:49:52 +0400 Subject: [PATCH] fixup! Merge branch 'main' into syste-users-permissions --- cmd/setup/52/01-get-permissions-from-JSON.sql | 2 +- internal/api/grpc/user/v2/integration_test/query_test.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/setup/52/01-get-permissions-from-JSON.sql b/cmd/setup/52/01-get-permissions-from-JSON.sql index 2c8b750582..f7e87f72b8 100644 --- a/cmd/setup/52/01-get-permissions-from-JSON.sql +++ b/cmd/setup/52/01-get-permissions-from-JSON.sql @@ -18,7 +18,7 @@ BEGIN (perm)->>'member_type' AS member_type, (perm)->>'aggregate_id' AS aggregate_id, (perm)->>'object_id' AS object_id, - permission-- AS permission + permission FROM jsonb_array_elements(permissions_json) AS perm CROSS JOIN jsonb_array_elements_text(perm->'permissions') AS permission) AS res WHERE res. permission= permm; diff --git a/internal/api/grpc/user/v2/integration_test/query_test.go b/internal/api/grpc/user/v2/integration_test/query_test.go index 80f9ccd1aa..15dc959151 100644 --- a/internal/api/grpc/user/v2/integration_test/query_test.go +++ b/internal/api/grpc/user/v2/integration_test/query_test.go @@ -1248,7 +1248,6 @@ func TestServer_SystemUsers_ListUsers(t *testing.T) { retryDuration, tick := integration.WaitForAndTickWithMaxDuration(tt.ctx, 1*time.Minute) require.EventuallyWithT(t, func(ttt *assert.CollectT) { got, err := Client.ListUsers(tt.ctx, tt.req) - fmt.Printf("@@ >>>>>>>>>>>>>>>>>>>>>>>>>>>> got = %+v\n", got) require.NoError(ttt, err) if tt.checkNumberOfUsersReturned {