convert requests to dictionary in batch request content

Author: shemogumbe

src/msgraph_core/requests/batch_request_content.py

@@ -1,5 +1,5 @@
 import uuid
-from typing import List, Dict, Union, Any, Optional
+from typing import List, Dict, Union, Optional
 
 from kiota_abstractions.request_information import RequestInformation
 from kiota_abstractions.serialization import Parsable, ParseNode
@@ -19,15 +19,18 @@ def __init__(self, requests: List[Union['BatchRequestItem', 'RequestInformation'
         """
         Initializes a new instance of the BatchRequestContent class.
         """
-        self._requests: List[Union[BatchRequestItem, 'RequestInformation']] = requests or []
+        self._requests: Dict[str, Union[BatchRequestItem, 'RequestInformation']] = {}
+
         self.is_finalized = False
+        for request in requests:
+            self.add_request(request)
 
     @property
     def requests(self) -> List:
         """
         Gets  the requests.
         """
-        return self._requests
+        return list(self._requests.values())
 
     @requests.setter
     def requests(self, requests: List[BatchRequestItem]) -> None:
@@ -52,8 +55,8 @@ def add_request(self, request: BatchRequestItem) -> None:
                 if dependent_id not in [req.id for req in self.requests]:
                     dependent_request = self._request_by_id(dependent_id)
                     if dependent_request:
-                        self._requests.append(dependent_request)
-        self._requests.append(request)
+                        self._requests[dependent_id] = dependent_request
+        self._requests[request.id] = request
 
     def add_request_information(self, request_information: RequestInformation) -> None:
         """ 
@@ -83,7 +86,7 @@ def remove(self, request_id: str) -> None:
                 if request_id in request.depends_on:
                     request.depends_on.remove(request_id)
         if request_to_remove:
-            self._requests.remove(request_to_remove)
+            del self._requests[request_to_remove.id]
         else:
             raise ValueError(f"Request ID {request_id} not found in requests.")
 
@@ -98,7 +101,7 @@ def finalize(self):
         Finalizes the batch request content.
         """
         self.is_finalized = True
-        return self._requests
+        return list(self._requests.values())
 
     def _request_by_id(self, request_id: str) -> Optional[BatchRequestItem]:
         """
@@ -110,10 +113,7 @@ def _request_by_id(self, request_id: str) -> Optional[BatchRequestItem]:
         Returns:
             The request with the given ID, or None if not found.
         """
-        for req in self.requests:
-            if req.id == request_id:
-                return req
-        return None
+        return self._requests.get(request_id)
 
     @staticmethod
     def create_from_discriminator_value(

tests/requests/test_batch_request_content.py

@@ -55,8 +55,8 @@ def test_initialization(batch_request_content, batch_request_item1, batch_reques
 def test_requests_property(batch_request_content, batch_request_item1, batch_request_item2):
     new_request_item = batch_request_item1
     batch_request_content.requests = [batch_request_item1, batch_request_item2, new_request_item]
-    assert len(batch_request_content.requests) == 5
-    assert batch_request_content.requests[2] == new_request_item
+    assert len(batch_request_content.requests) == 2
+    assert batch_request_content.requests[0] == new_request_item
 
 
 def test_add_request(batch_request_content, batch_request_item1):