Merge pull request #89 from python-scim/84-start-index

fix startIndex and count lower limits

Author: azmeuk

doc/changelog.rst

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+[0.3.1] - Unreleased
+--------------------
+
+Fixed
+^^^^^
+- Fix :attr:`~SearchRequest.start_index` and :attr:`~SearchRequest.count` limits. :issue:`84`
+
 [0.3.0] - 2024-12-11
 --------------------
 

scim2_models/rfc7644/search_request.py

@@ -49,11 +49,11 @@ class SortOrder(str, Enum):
     @field_validator("start_index")
     @classmethod
     def start_index_floor(cls, value: int) -> int:
-        """According to :rfc:`RFC7644 §3.4.2 <7644#section-3.4.2.4>, start_index values less than 0 are interpreted as 0.
+        """According to :rfc:`RFC7644 §3.4.2 <7644#section-3.4.2.4>, start_index values less than 1 are interpreted as 1.
 
         A value less than 1 SHALL be interpreted as 1.
         """
-        return None if value is None else max(0, value)
+        return None if value is None else max(1, value)
 
     count: Optional[int] = None
     """An integer indicating the desired maximum number of query results per
@@ -62,11 +62,11 @@ def start_index_floor(cls, value: int) -> int:
     @field_validator("count")
     @classmethod
     def count_floor(cls, value: int) -> int:
-        """According to :rfc:`RFC7644 §3.4.2 <7644#section-3.4.2.4>, count values less than 1 are interpreted as 1.
+        """According to :rfc:`RFC7644 §3.4.2 <7644#section-3.4.2.4>, count values less than 0 are interpreted as 0.
 
-        A value less than 1 SHALL be interpreted as 1.
+        A negative value SHALL be interpreted as 0.
         """
-        return None if value is None else max(1, value)
+        return None if value is None else max(0, value)
 
     @model_validator(mode="after")
     def attributes_validator(self):

tests/test_search_request.py

@@ -29,30 +29,27 @@ def test_start_index_floor():
 
     https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.4
 
-        A negative value SHALL be interpreted as 0.
+        A value less than 1 SHALL be interpreted as 1.
     """
     sr = SearchRequest(start_index=100)
     assert sr.start_index == 100
 
-    sr = SearchRequest(start_index=-1)
-    assert sr.start_index == 0
+    sr = SearchRequest(start_index=0)
+    assert sr.start_index == 1
 
 
 def test_count_floor():
     """Test that count values less than 1 are interpreted as 1.
 
     https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.4
 
-        A value less than 1 SHALL be interpreted as 1.
+        A negative value SHALL be interpreted as 0.
     """
     sr = SearchRequest(count=100)
     assert sr.count == 100
 
-    sr = SearchRequest(count=0)
-    assert sr.count == 1
-
     sr = SearchRequest(count=-1)
-    assert sr.count == 1
+    assert sr.count == 0
 
 
 def test_attributes_or_excluded_attributes():