From 680224264845cc50d847463c0911b951e3c80efc Mon Sep 17 00:00:00 2001 From: George Garber Date: Mon, 24 Feb 2025 19:34:19 +0000 Subject: [PATCH 1/3] fix: removed extra slash --- src/msgraph_core/requests/batch_request_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/msgraph_core/requests/batch_request_builder.py b/src/msgraph_core/requests/batch_request_builder.py index ab544c7c..b400e4ec 100644 --- a/src/msgraph_core/requests/batch_request_builder.py +++ b/src/msgraph_core/requests/batch_request_builder.py @@ -31,7 +31,7 @@ def __init__( if request_adapter is None: raise ValueError("request_adapter cannot be Null.") self._request_adapter = request_adapter - self.url_template = f"{self._request_adapter.base_url}/$batch" + self.url_template = f"{self._request_adapter.base_url}$batch" self.error_map = error_map or {} async def post( From ac1f7d7670d418cd021af2e5f6f37ec852244c72 Mon Sep 17 00:00:00 2001 From: George Garber Date: Mon, 24 Feb 2025 19:34:44 +0000 Subject: [PATCH 2/3] fix: finalise returns the whole BatchRequestContent --- src/msgraph_core/requests/batch_request_content.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/msgraph_core/requests/batch_request_content.py b/src/msgraph_core/requests/batch_request_content.py index 0235df8a..fad6053d 100644 --- a/src/msgraph_core/requests/batch_request_content.py +++ b/src/msgraph_core/requests/batch_request_content.py @@ -125,7 +125,7 @@ def finalize(self): Finalizes the batch request content. """ self.is_finalized = True - return self._requests + return self def _request_by_id(self, request_id: str) -> Optional[BatchRequestItem]: """ From 99863700fbaf64e0fc751f73c601df55d2b99e8e Mon Sep 17 00:00:00 2001 From: George Garber Date: Tue, 25 Feb 2025 11:42:22 +0000 Subject: [PATCH 3/3] fix: fixed test --- src/msgraph_core/requests/batch_request_builder.py | 2 +- tests/requests/test_batch_request_content.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/msgraph_core/requests/batch_request_builder.py b/src/msgraph_core/requests/batch_request_builder.py index b400e4ec..5bf647cf 100644 --- a/src/msgraph_core/requests/batch_request_builder.py +++ b/src/msgraph_core/requests/batch_request_builder.py @@ -31,7 +31,7 @@ def __init__( if request_adapter is None: raise ValueError("request_adapter cannot be Null.") self._request_adapter = request_adapter - self.url_template = f"{self._request_adapter.base_url}$batch" + self.url_template = f"{self._request_adapter.base_url.removesuffix('/')}/$batch" self.error_map = error_map or {} async def post( diff --git a/tests/requests/test_batch_request_content.py b/tests/requests/test_batch_request_content.py index 81cac044..21554644 100644 --- a/tests/requests/test_batch_request_content.py +++ b/tests/requests/test_batch_request_content.py @@ -88,9 +88,9 @@ def test_add_urllib_request(batch_request_content): def test_finalize(batch_request_content): - finalized_requests = batch_request_content.finalize() + finalized_batch_request_content = batch_request_content.finalize() assert batch_request_content.is_finalized - assert finalized_requests == batch_request_content.requests + assert finalized_batch_request_content.requests == batch_request_content.requests def test_create_from_discriminator_value():