Merge pull request #41 from cloudblue/LITE-23686-make-first-use-limit-1

LITE-23686 use limit=1 on calls to first

Author: d3rky

connect/client/models/resourceset.py

@@ -351,10 +351,12 @@ def count(self):
         :rtype: int
         """
         if not self._content_range:
-            url = self._get_request_url()
-            kwargs = self._get_request_kwargs()
+            copy = self._copy()
+            url = copy._get_request_url()
+            kwargs = copy._get_request_kwargs()
             kwargs['params']['limit'] = 0
-            self._execute_request(url, kwargs)
+            copy._execute_request(url, kwargs)
+            return copy._content_range.count
         return self._content_range.count
 
     def first(self):
@@ -365,8 +367,11 @@ def first(self):
         :return: The first resource.
         :rtype: dict, None
         """
-        self._fetch_all()
-        return self._results[0] if self._results else None
+        copy = self._copy()
+        copy._limit = 1
+        copy._offset = 0
+        copy._fetch_all()
+        return copy._results[0] if copy._results else None
 
     def _iterator(self):
         args = (
@@ -484,8 +489,11 @@ async def first(self):
         :return: The first resource.
         :rtype: dict, None
         """
-        await self._fetch_all()
-        return self._results[0] if self._results else None
+        copy = self._copy()
+        copy._limit = 1
+        copy._offset = 0
+        await copy._fetch_all()
+        return copy._results[0] if copy._results else None
 
     def _iterator(self):
         args = (

tests/client/test_models.py

@@ -701,11 +701,12 @@ def test_rs_count(mocker, rs_factory):
         'connect.client.models.resourceset.parse_content_range',
         return_value=content_range,
     )
+    rs_copy = rs_factory()
+    mocker.patch.object(ResourceSet, '_copy', return_value=rs_copy)
     rs = rs_factory()
     rs._client.get = mocker.MagicMock(return_value=[])
-
     assert rs.count() == 100
-    assert rs.content_range == content_range
+    assert rs_copy.content_range == content_range
 
 
 def test_rs_first(mocker, rs_factory):
@@ -716,18 +717,34 @@ def test_rs_first(mocker, rs_factory):
     )
     expected = [{'id': i} for i in range(10)]
     rs = rs_factory()
-    rs._client.get = mocker.MagicMock(return_value=expected)
+
+    rs_copy = rs_factory()
+
+    mocker.patch.object(ResourceSet, '_copy', return_value=rs_copy)
+
+    rs_copy._client.get = mocker.MagicMock(return_value=expected)
 
     first = rs.first()
 
     assert first == expected[0]
+    assert rs._results is None
+    assert rs_copy._results == expected
+    assert rs_copy._limit == 1
+    assert rs_copy._offset == 0
 
     rs = rs_factory()
+    rs_copy = rs_factory()
+
+    mocker.patch.object(ResourceSet, '_copy', return_value=rs_copy)
     rs._client.get = mocker.MagicMock(return_value=[])
 
     first = rs.first()
 
     assert first is None
+    assert rs._results is None
+    assert rs_copy._results == []
+    assert rs_copy._limit == 1
+    assert rs_copy._offset == 0
 
 
 def test_rs_all(rs_factory):