Use utility paging calculation

Author: okorach

sonar/aggregations.py

@@ -31,7 +31,7 @@
 import sonar.platform as pf
 
 import sonar.components as comp
-
+from sonar import utilities
 from sonar.audit.rules import get_rule
 from sonar.audit.problem import Problem
 
@@ -110,5 +110,4 @@ def count(api: str, endpoint: pf.Platform, params: types.ApiParams = None) -> in
     if params is None:
         params = {}
     params["ps"] = 1
-    data = json.loads(endpoint.get(api, params=params).text)
-    return data["paging"]["total"]
+    return utilities.nbr_total_elements(json.loads(endpoint.get(api, params=params).text))

sonar/applications.py

@@ -443,8 +443,7 @@ def count(endpoint: pf.Platform) -> int:
     :rtype: int
     """
     check_supported(endpoint)
-    data = json.loads(endpoint.get(APIS["search"], params={"ps": 1, "filter": "qualifier = APP"}).text)
-    return data["paging"]["total"]
+    return util.nbr_total_elements(json.loads(endpoint.get(APIS["search"], params={"ps": 1, "filter": "qualifier = APP"}).text))
 
 
 def check_supported(endpoint: pf.Platform) -> None:

sonar/components.py

@@ -23,6 +23,7 @@
 
 """
 from __future__ import annotations
+import math
 import json
 
 from datetime import datetime
@@ -104,9 +105,9 @@ def get_subcomponents(self, strategy: str = "children", with_issues: bool = Fals
             "metricKeys": "bugs,vulnerabilities,code_smells,security_hotspots",
         }
         data = json.loads(self.get("measures/component_tree", params=parms).text)
-        nb_comp = data["paging"]["total"]
+        nb_comp = utilities.nbr_total_elements(data)
         log.debug("Found %d subcomponents to %s", nb_comp, str(self))
-        nb_pages = (nb_comp + 500 - 1) // 500
+        nb_pages = math.ceil(nb_comp / 500)
         comp_list = {}
         parms["ps"] = 500
         for page in range(nb_pages):

sonar/measures.py

@@ -83,8 +83,7 @@ def count_history(self, params: ApiParams = None) -> int:
         if params is None:
             params = {}
         params.update({"component": self.concerned_object.key, "metrics": self.metric, "ps": 1})
-        data = json.loads(self.get(Measure.API_HISTORY, params=params).text)
-        return data["paging"]["total"]
+        return util.nbr_total_elements(json.loads(self.get(Measure.API_HISTORY, params=params).text))
 
     def search_history(self, params: ApiParams = None) -> dict[str, any]:
         """Searches the history of the measure

sonar/projects.py

@@ -1321,8 +1321,7 @@ def count(endpoint: pf.Platform, params: types.ApiParams = None) -> int:
     """
     new_params = {} if params is None else params.copy()
     new_params.update({"ps": 1, "p": 1})
-    data = json.loads(endpoint.get(Project.SEARCH_API, params=params).text)
-    return data["paging"]["total"]
+    util.nbr_total_elements(json.loads(endpoint.get(Project.SEARCH_API, params=params).text))
 
 
 def search(endpoint: pf.Platform, params: types.ApiParams = None) -> dict[str, Project]:

sonar/qualityprofiles.py

@@ -433,8 +433,7 @@ def projects(self) -> types.KeyList:
                     self._projects += [p["key"] for p in data["results"]]
                     page += 1
                     if self.endpoint.version() >= (10, 0, 0):
-                        nb_pages = (data["paging"]["total"] + 500 - 1) // 500
-                        more = nb_pages >= page
+                        more = util.nbr_pages(data) >= page
                     else:
                         more = data["more"]