Use paging utility functions

Author: okorach

sonar/hotspots.py

@@ -21,6 +21,7 @@
 
 from __future__ import annotations
 
+import math
 import json
 import re
 from http import HTTPStatus
@@ -71,7 +72,7 @@
 SEVERITIES = ()
 
 # Filters for search of hotspots are different than for issues :-(
-_FILTERS_HOTSPOTS_REMAPPING = {"resolutions": "resolution", "statuses": "status", "componentsKey": PROJECT_FILTER_OLD, "components": PROJECT_FILTER}
+_FILTERS_HOTSPOTS_REMAPPING = {"resolutions": "resolution", "statuses": "status", "componentsKey": PROJECT_FILTER, "components": PROJECT_FILTER}
 
 _OBJECTS = {}
 
@@ -384,8 +385,7 @@ def search(endpoint: pf.Platform, filters: types.ApiParams = None) -> dict[str,
     :rtype: dict{<key>: <Hotspot>}
     """
     hotspots_list = {}
-    new_params = get_search_filters(endpoint=endpoint, params=filters)
-    new_params = util.dict_remap(original_dict=new_params, remapping=_FILTERS_HOTSPOTS_REMAPPING)
+    new_params = sanitize_search_filters(endpoint=endpoint, params=filters)
     filters_iterations = split_search_filters(new_params)
     ps = 500 if "ps" not in new_params else new_params["ps"]
     for inline_filters in filters_iterations:
@@ -395,16 +395,15 @@ def search(endpoint: pf.Platform, filters: types.ApiParams = None) -> dict[str,
         while True:
             inline_filters["p"] = p
             try:
-                resp = endpoint.get("hotspots/search", params=inline_filters, mute=(HTTPStatus.NOT_FOUND,))
-                data = json.loads(resp.text)
-                nbr_hotspots = data["paging"]["total"]
+                data = json.loads(endpoint.get("hotspots/search", params=inline_filters, mute=(HTTPStatus.NOT_FOUND,)).text)
+                nbr_hotspots = util.nbr_total_elements(data)
             except HTTPError as e:
                 if e.response.status_code == HTTPStatus.NOT_FOUND:
                     log.warning("No hotspots found with search params %s", str(inline_filters))
                     nbr_hotspots = 0
                     return {}
                 raise e
-            nbr_pages = (nbr_hotspots + ps - 1) // ps
+            nbr_pages = util.nbr_pages(data)
             log.debug("Number of hotspots: %d - Page: %d/%d", nbr_hotspots, inline_filters["p"], nbr_pages)
             if nbr_hotspots > 10000:
                 raise TooManyHotspotsError(
@@ -432,7 +431,7 @@ def get_object(endpoint: pf.Platform, key: str, data: dict[str] = None, from_exp
     return _OBJECTS[uid]
 
 
-def get_search_filters(endpoint: pf.Platform, params: types.ApiParams) -> types.ApiParams:
+def sanitize_search_filters(endpoint: pf.Platform, params: types.ApiParams) -> types.ApiParams:
     """Returns the filtered list of params that are allowed for api/hotspots/search"""
     log.debug("Sanitizing hotspot search criteria %s", str(params))
     if params is None:
@@ -446,6 +445,8 @@ def get_search_filters(endpoint: pf.Platform, params: types.ApiParams) -> types.
         criterias["status"] = "REVIEWED"
     if endpoint.version() <= (10, 2, 0):
         criterias = util.dict_remap(original_dict=criterias, remapping={PROJECT_FILTER: PROJECT_FILTER_OLD})
+    else:
+        criterias = util.dict_remap(original_dict=criterias, remapping={PROJECT_FILTER_OLD: PROJECT_FILTER})
     criterias = util.dict_subset(criterias, SEARCH_CRITERIAS)
     log.debug("Sanitized hotspot search criteria %s", str(criterias))
     return criterias