fix batch request builder for updated requests in dictionaries

Author: shemogumbe

src/msgraph_core/requests/batch_request_builder.py

@@ -61,6 +61,8 @@ async def post(
 
         if isinstance(batch_request_content, BatchRequestContent):
             request_info = await self.to_post_request_information(batch_request_content)
+            request_info.content = request_info.content.strip(b'[]')
+            print(f"Request info: {request_info.content}")
             error_map = error_map or self.error_map
             response = None
             try:
@@ -69,9 +71,9 @@ async def post(
                 )
                 print(f"Response type returned for content : {type(response)}")
                 print(f"Batch response responses returned for content : {response.responses}")
-                for key in response.responses:
-                    print(f"Response key -id: {key}")
-                    print(f"Response value: {response.response(key).body}")
+                # for key in response.responses:
+                #     print(f"Response key -id: {key}")
+                #     print(f"Response value: {response.response(key).body}")
             except APIError as e:
                 logging.error("API Error: %s", e)
                 raise e
@@ -129,16 +131,18 @@ async def to_post_request_information(
         Returns:
             RequestInformation: The request information.
         """
+
         if batch_request_content is None:
             raise ValueError("batch_request_content cannot be Null.")
-        if isinstance(batch_request_content, BatchRequestContent):
-            request_info = RequestInformation()
-            request_info.http_method = Method.POST
-            request_info.url_template = self.url_template
-            request_info.headers = HeadersCollection()
-            request_info.headers.try_add("Content-Type", APPLICATION_JSON)
-            request_info.set_content_from_parsable(
-                self._request_adapter, APPLICATION_JSON, batch_request_content
-            )
-
-            return request_info
+        batch_request_items = list(batch_request_content.requests.values())
+
+        request_info = RequestInformation()
+        request_info.http_method = Method.POST
+        request_info.url_template = self.url_template
+        request_info.headers = HeadersCollection()
+        request_info.headers.try_add("Content-Type", APPLICATION_JSON)
+        request_info.set_content_from_parsable(
+            self._request_adapter, APPLICATION_JSON, batch_request_items
+        )
+
+        return request_info

src/msgraph_core/requests/batch_request_content.py

@@ -19,18 +19,18 @@ def __init__(self, requests: Dict[str, Union['BatchRequestItem', 'RequestInforma
         """
         Initializes a new instance of the BatchRequestContent class.
         """
-        self._requests: Dict[str, Union[BatchRequestItem, 'RequestInformation']] = {}
+        self._requests: Dict[str, Union[BatchRequestItem, 'RequestInformation']] = requests or {}
 
         self.is_finalized = False
         for request_id, request in requests.items():
             self.add_request(request_id, request)
 
     @property
-    def requests(self) -> List:
+    def requests(self) -> Dict:
         """
         Gets  the requests.
         """
-        return list(self._requests.values())
+        return self._requests
 
     @requests.setter
     def requests(self, requests: List[BatchRequestItem]) -> None:
@@ -104,7 +104,7 @@ def finalize(self):
         Finalizes the batch request content.
         """
         self.is_finalized = True
-        return list(self._requests.values())
+        return self._requests
 
     def _request_by_id(self, request_id: str) -> Optional[BatchRequestItem]:
         """

src/msgraph_core/requests/batch_response_content.py

@@ -40,6 +40,20 @@ def responses(self, responses: Optional[Dict[str, 'BatchResponseItem']]) -> None
         """
         self._responses = responses
 
+    def get_response_by_id(
+        self,
+        request_id: str,
+        response_type: Optional[Type[T]] = None,
+    ) -> 'BatchResponseItem':
+        """
+        Get a response by its request ID from the collection
+        :param request_id: The request ID of the response to get
+        :type request_id: str
+        :return: The response with the specified request ID as a BatchResponseItem
+        :rtype: BatchResponseItem
+        """
+        return self._responses.get(request_id)
+
     def response(
         self,
         request_id: str,
@@ -105,22 +119,27 @@ def get_field_deserializers(self) -> Dict[str, Callable[[ParseNode], None]]:
         :return: The deserialization information for this object
         :rtype: Dict[str, Callable[[ParseNode], None]]
         """
-        return {
-            'responses':
-            lambda n: setattr(
-                self, 'responses',
-                {item.id: item
-                 for item in n.get_collection_of_object_values(BatchResponseItem)}
-            )
+        fields = {
+            "responses":
+            lambda n:
+            setattr(self, 'responses', n.get_collection_of_object_values(BatchResponseItem))
         }
+        return fields
+        # return {
+        #     'responses':
+        #     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
         """
-        if self._responses:
-            writer.write_collection_of_object_values('responses', self.responses())
+        writer.write_collection_of_object_values('responses', self._responses)
 
     @staticmethod
     def create_from_discriminator_value(