fix: limit and offset are required params for SearchQueryRegex; speci…

…fy them in test. Fix checking of result count to be against the SearchQueryRegex limit in order to account for both QSA and default limits.

prez/services/listings.py

@@ -99,7 +99,7 @@ async def listing_function(
     # count search results - hard to do in SPARQL as the SELECT part of the query is NOT aggregated
     if search_query:
         count = len(list(item_graph.subjects(RDF.type, PREZ.SearchResult)))
-        if count == settings.search_count_limit:
+        if count == search_query.limit:
             count_literal = f">{count-1}"
         else:
             count_literal = f"{count}"

prez/services/query_generation/search.py

@@ -49,9 +49,9 @@ class SearchQueryRegex(ConstructQuery):
     def __init__(
         self,
         term: str,
+        limit: int,
+        offset: int,
         predicates: Optional[List[str]] = None,
-        limit: int = None,
-        offset: int = None,
     ):
 
         limit += 1  # increase the limit by one so we know if there are further pages of results.

tests/test_query_construction.py

@@ -102,7 +102,7 @@ def test_basic_listing():
 
 
 def test_search_query_regex():
-    sq = SearchQueryRegex(term="test", predicates=[RDFS.label])
+    sq = SearchQueryRegex(term="test", predicates=[RDFS.label], limit=10, offset=0)
     test = PrezQueryConstructor(
         profile_triples=[
             TriplesSameSubjectPath.from_spo(