Correct pagination logic when rate limiting data is present in response

quarkusio · Nov 3, 2023 · 4e3470d · 4e3470d
1 parent 82e4c46
commit 4e3470d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/plugins/github-enricher/github-helper.js b/plugins/github-enricher/github-helper.js
@@ -84,17 +84,27 @@ function findPaginatedElements(data, name, inPath) {
   let currentPath = inPath || []
   let contents
 
+  let answer
+
   for (let key in data) {
     if (key === name) {
       contents = data[key]
       break
     } else if (typeof data[key] == "object") {
       currentPath.push(key)
-      return findPaginatedElements(data[key], name, currentPath)
+      answer = findPaginatedElements(data[key], name, currentPath)
+      if (answer) {
+        contents = answer.contents
+        break
+      } else {
+        currentPath.pop(key)
+      }
     }
   }
 
-  return { keys: currentPath, contents }
+  if (contents) {
+    return { keys: currentPath, contents }
+  }
 }
 
 /*
@@ -106,7 +116,6 @@ const queryGraphQl = async (query) => {
 
   const amendedQuery = query.replace(/edges\s*{/, PAGE_INFO_SUBQUERY).replace("query {", "query {" + RATE_LIMIT_PREQUERY)
 
-
   const answer = await tolerantFetch("https://api.github.com/graphql", {
       method: "POST",
       body: JSON.stringify({ query: amendedQuery })

diff --git a/plugins/github-enricher/github-helper.test.js b/plugins/github-enricher/github-helper.test.js
@@ -67,6 +67,13 @@ describe("the github helper", () => {
 
       const response1 = {
         data: {
+          rateLimit: {
+            limit: 5000,
+            cost: 1,
+            remaining: 727,
+            resetAt: "2023-11-02T21:53:43Z"
+          },
+
           holder: {
             information: {
               pageInfo: {