fix pagination

pixee · Jun 25, 2024 · 518ceb7 · 518ceb7
1 parent ef2f900
commit 518ceb7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -47376,7 +47376,8 @@ async function fetchOrLocateSonarResultsFile(resultType) {
         let file = await fetchOrLocateResultsFile("sonar", sonarResults.results, fileName);
         let total = sonarResults.totalResults;
         files.push(file);
-        isAllResults = total <= pageSize;
+        // Update isAllResults correctly
+        isAllResults = page * pageSize >= total;
         page++;
     }
     return files;

diff --git a/src/action.ts b/src/action.ts
@@ -79,29 +79,31 @@ async function fetchOrLocateContrastResultsFile() {
 }
 
 async function fetchOrLocateSonarResultsFile(
-  resultType: SONAR_RESULT) : Promise<Array<string>>{
-    // TODO update
-    const pageSize = 1;
-    let page = 1 ;
-    const files = new Array();
-    let isAllResults = false;
-
-    while(!isAllResults){
-      let sonarResults =
+  resultType: SONAR_RESULT
+): Promise<Array<string>> {
+  // TODO update
+  const pageSize = 1;
+  let page = 1;
+  const files = new Array();
+  let isAllResults = false;
+
+  while (!isAllResults) {
+    let sonarResults =
       resultType == "issues"
         ? await fetchSonarIssues(pageSize, page)
         : await fetchSonarHotspots(pageSize, page);
-      let fileName = `sonar-${resultType}-${page}.json`;
-
-      let file = await fetchOrLocateResultsFile("sonar", sonarResults.results, fileName);
-
-      let total = sonarResults.totalResults;
-
-      files.push(file);
-
-      isAllResults = total <= pageSize;
-      page ++;
-    }
+    let fileName = `sonar-${resultType}-${page}.json`;
+
+    let file = await fetchOrLocateResultsFile("sonar", sonarResults.results, fileName);
+
+    let total = sonarResults.totalResults;
+
+    files.push(file);
+
+    // Update isAllResults correctly
+    isAllResults = page * pageSize >= total;
+    page++;
+  }
 
   return files;
 }