fetch only once if the first call returns a valid query (#182)

Signed-off-by: Kishore Kumaar Natarajan <[email protected]>
Co-authored-by: Kishore Kumaar Natarajan <[email protected]>
(cherry picked from commit b00c4b4)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: github-actions[bot]

common/utils/QueryUtils.test.ts

@@ -32,19 +32,33 @@ describe('retrieveQueryById - Fetch Query Record by ID from API', () => {
     },
   };
 
-  it('should make three GET requests to fetch different query records', async () => {
+  it('should fetch only once if the first call returns a valid query', async () => {
     mockCore.http.get.mockResolvedValue(mockResponse);
 
     await retrieveQueryById(mockCore, undefined, testStart, testEnd, testId);
 
-    expect(mockCore.http.get).toHaveBeenCalledTimes(3);
+    expect(mockCore.http.get).toHaveBeenCalledTimes(1);
     expect(mockCore.http.get).toHaveBeenCalledWith('/api/top_queries/latency', {
       query: { from: testStart, to: testEnd, id: testId, dataSourceId: undefined },
     });
-    expect(mockCore.http.get).toHaveBeenCalledWith('/api/top_queries/cpu', {
+  });
+
+  it('should try the next endpoints if the first call returns empty', async () => {
+    mockCore.http.get
+      .mockResolvedValueOnce({ response: { top_queries: [] } }) // latency - empty
+      .mockResolvedValueOnce({ response: { top_queries: [] } }) // cpu - empty
+      .mockResolvedValueOnce(mockResponse); // memory - found
+
+    await retrieveQueryById(mockCore, undefined, testStart, testEnd, testId);
+
+    expect(mockCore.http.get).toHaveBeenCalledTimes(3);
+    expect(mockCore.http.get).toHaveBeenNthCalledWith(1, '/api/top_queries/latency', {
+      query: { from: testStart, to: testEnd, id: testId, dataSourceId: undefined },
+    });
+    expect(mockCore.http.get).toHaveBeenNthCalledWith(2, '/api/top_queries/cpu', {
       query: { from: testStart, to: testEnd, id: testId, dataSourceId: undefined },
     });
-    expect(mockCore.http.get).toHaveBeenCalledWith('/api/top_queries/memory', {
+    expect(mockCore.http.get).toHaveBeenNthCalledWith(3, '/api/top_queries/memory', {
       query: { from: testStart, to: testEnd, id: testId, dataSourceId: undefined },
     });
   });
@@ -57,42 +71,39 @@ describe('retrieveQueryById - Fetch Query Record by ID from API', () => {
     expect(result).toEqual(mockResponse.response.top_queries[0]);
   });
 
-  it('should return null if no queries are found', async () => {
+  it('should return null if all responses are empty', async () => {
     mockCore.http.get.mockResolvedValue({ response: { top_queries: [] } });
 
     const result = await retrieveQueryById(mockCore, undefined, testStart, testEnd, testId);
 
     expect(result).toBeNull();
+    expect(mockCore.http.get).toHaveBeenCalledTimes(3);
   });
-  it('should return null if API response is missing the response field', async () => {
+
+  it('should return null if all API responses are missing response field', async () => {
     mockCore.http.get.mockResolvedValue({});
 
     const result = await retrieveQueryById(mockCore, undefined, testStart, testEnd, testId);
 
     expect(result).toBeNull();
+    expect(mockCore.http.get).toHaveBeenCalledTimes(3);
   });
 
-  it('should return null if API response contains an unexpected structure', async () => {
+  it('should return null if all API responses have unexpected structure', async () => {
     mockCore.http.get.mockResolvedValue({ unexpectedKey: {} });
 
     const result = await retrieveQueryById(mockCore, undefined, testStart, testEnd, testId);
 
     expect(result).toBeNull();
+    expect(mockCore.http.get).toHaveBeenCalledTimes(3);
   });
 
-  it('should return null if API request fails', async () => {
+  it('should return null if all API requests fail', async () => {
     mockCore.http.get.mockRejectedValue(new Error('API error'));
 
     const result = await retrieveQueryById(mockCore, undefined, testStart, testEnd, testId);
 
     expect(result).toBeNull();
-  });
-
-  it('should handle cases where API returns an empty object instead of expected response structure', async () => {
-    mockCore.http.get.mockResolvedValue({});
-
-    const result = await retrieveQueryById(mockCore, undefined, testStart, testEnd, testId);
-
-    expect(result).toBeNull();
+    expect(mockCore.http.get).toHaveBeenCalledTimes(3);
   });
 });

common/utils/QueryUtils.ts

@@ -45,12 +45,19 @@ export const retrieveQueryById = async (
   };
 
   try {
-    const topQueriesResponse = await Promise.any([
-      fetchMetric(`/api/top_queries/latency`),
-      fetchMetric(`/api/top_queries/cpu`),
-      fetchMetric(`/api/top_queries/memory`),
-    ]);
-    return topQueriesResponse.response.top_queries[0] || null;
+    const endpoints = [
+      `/api/top_queries/latency`,
+      `/api/top_queries/cpu`,
+      `/api/top_queries/memory`,
+    ];
+
+    for (const endpoint of endpoints) {
+      const result = await fetchMetric(endpoint);
+      if (result.response.top_queries.length > 0) {
+        return result.response.top_queries[0];
+      }
+    }
+    return null;
   } catch (error) {
     console.error('Error retrieving query details:', error);
     return null;