Enhance access query logic to handle user ID and name conditions more…

… robustly
elastic · Dec 3, 2024 · fee5a59 · fee5a59
1 parent 56f2e22
commit fee5a59
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/...observability_solution/observability_ai_assistant/server/service/util/get_access_query.ts b/...observability_solution/observability_ai_assistant/server/service/util/get_access_query.ts
@@ -20,7 +20,17 @@ export function getAccessQuery({
               should: [
                 { term: { public: true } },
                 ...(user
-                  ? [{ term: user.id ? { 'user.id': user.id } : { 'user.name': user.name } }]
+                  ? user.id
+                    ? [
+                        { term: { 'user.id': user.id } },
+                        {
+                          bool: {
+                            must_not: { exists: { field: 'user.id' } },
+                            must: { term: { 'user.name': user.name } },
+                          },
+                        },
+                      ]
+                    : [{ term: { 'user.name': user.name } }]
                   : []),
               ],
               minimum_should_match: 1,