convert responses to dict

Author: shemogumbe

src/msgraph_core/requests/batch_response_content.py

@@ -20,7 +20,7 @@ def __init__(self) -> None:
         BatchResponseContent is a collection of BatchResponseItem items,
          each with a unique request ID.
         """
-        self._responses: Optional[List['BatchResponseItem']] = []
+        self._responses: Optional[Dict[str, 'BatchResponseItem']] = {}
 
     @property
     def responses(self) -> Optional[List['BatchResponseItem']]:
@@ -38,10 +38,7 @@ def responses(self, responses: Optional[List['BatchResponseItem']]) -> None:
         :param responses: The responses to set in the collection
         :type responses: Optional[Dict[str, BatchResponseItem]]
         """
-        if isinstance(responses, dict):
-            self._responses = {response.id: response for response in responses.values()}
-        else:
-            self._responses = responses
+        self._responses = responses
 
     def response(self, request_id: str) -> 'BatchResponseItem':
         """
@@ -53,19 +50,10 @@ def response(self, request_id: str) -> 'BatchResponseItem':
         """
         if self._responses is None:
             raise ValueError("Responses list is not initialized.")
-        for response in self._responses:
-            if response.request_id == request_id:
-                return response
+        if request_id in self._responses:
+            return self._responses[request_id]
         raise KeyError(f"Response with request ID {request_id} not found.")
 
-    # def get_response_by_id(self, request_id: str) -> 'BatchResponseItem':
-    #     if self._responses is None:
-    #         raise ValueError("Responses list is not initialized.")
-    #     for response in self._responses:
-    #         if response.request_id == request_id:
-    #             return response
-    #     raise KeyError(f"Response with request ID {request_id} not found.")
-
     def response_body(self, request_id: str, type: Type[T]) -> Optional[T]:
         """ 
         Get the body of a response by its request ID from the collection
@@ -114,16 +102,20 @@ def get_field_deserializers(self) -> Dict[str, Callable[[ParseNode], None]]:
         """
         return {
             'responses':
-            lambda n:
-            setattr(self, 'responses', n.get_collection_of_object_values(BatchResponseItem))
+            lambda n: setattr(
+                self, 'responses',
+                {item.id: item
+                 for item in n.get_collection_of_object_values(BatchResponseItem)}
+            )
         }
 
     def serialize(self, writer: SerializationWriter) -> None:
         """
         Writes the objects properties to the current writer.
         :param writer: The writer to write to
         """
-        writer.write_collection_of_object_values('responses', self._responses)
+        if self._responses:
+            writer.write_collection_of_object_values('responses', list(self._responses.values()))
 
     @staticmethod
     def create_from_discriminator_value(

tests/requests/test_batch_response_content.py

@@ -12,7 +12,8 @@ def batch_response_content():
 
 
 def test_initialization(batch_response_content):
-    assert batch_response_content.responses == []
+    assert batch_response_content.responses == {}
+    assert isinstance(batch_response_content._responses, dict)
 
 
 def test_responses_property(batch_response_content):
@@ -24,7 +25,7 @@ def test_responses_property(batch_response_content):
 def test_response_method(batch_response_content):
     response_item = Mock(spec=BatchResponseItem)
     response_item.request_id = "12345"
-    batch_response_content.responses = [response_item]
+    batch_response_content.responses = {"12345": response_item}
     assert batch_response_content.response("12345") == response_item
 
 
@@ -53,7 +54,7 @@ def test_get_field_deserializers(batch_response_content):
 def test_serialize(batch_response_content):
     writer = Mock(spec=SerializationWriter)
     response_item = Mock(spec=BatchResponseItem)
-    batch_response_content.responses = [response_item]
+    batch_response_content.responses = {"12345": response_item}
     batch_response_content.serialize(writer)
     writer.write_collection_of_object_values.assert_called_once_with('responses', [response_item])