Merge pull request #887 from MichaMican/main

feat: Add option to specify requestId manually when calling AddBatchRequestStepAsync()
microsoftgraph · Aug 19, 2024 · 7c7511c · 7c7511c
2 parents 766c000 + 8c474c4
commit 7c7511c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/Microsoft.Graph.Core/Requests/Content/BatchRequestContent.cs b/src/Microsoft.Graph.Core/Requests/Content/BatchRequestContent.cs
@@ -130,13 +130,17 @@ public string AddBatchRequestStep(HttpRequestMessage httpRequestMessage)
         /// Adds a <see cref="RequestInformation"/> to batch request content
         /// </summary>
         /// <param name="requestInformation">A <see cref="RequestInformation"/> to use to build a <see cref="BatchRequestStep"/> to add.</param>
+        /// <param name="requestId">An optional string that will be used as the requestId of the batch request</param>
         /// <returns>The requestId of the  newly created <see cref="BatchRequestStep"/></returns>
         [Obsolete("Please use the BatchRequestContentCollection for making batch requests as it supports handling more than 20 requests and provides a similar API experience.")]
-        public async Task<string> AddBatchRequestStepAsync(RequestInformation requestInformation)
+        public async Task<string> AddBatchRequestStepAsync(RequestInformation requestInformation, string requestId = null)
         {
             if (BatchRequestSteps.Count >= CoreConstants.BatchRequest.MaxNumberOfRequests)
                 throw new ArgumentException(string.Format(ErrorConstants.Messages.MaximumValueExceeded, "Number of batch request steps", CoreConstants.BatchRequest.MaxNumberOfRequests));
-            string requestId = Guid.NewGuid().ToString();
+            if (string.IsNullOrEmpty(requestId))
+            {
+                requestId = Guid.NewGuid().ToString();
+            }
             var requestMessage = await RequestAdapter.ConvertToNativeRequestAsync<HttpRequestMessage>(requestInformation);
             BatchRequestStep batchRequestStep = new BatchRequestStep(requestId, requestMessage);
             (BatchRequestSteps as IDictionary<string, BatchRequestStep>)!.Add(batchRequestStep.RequestId, batchRequestStep);

diff --git a/src/Microsoft.Graph.Core/Requests/Content/BatchRequestContentCollection.cs b/src/Microsoft.Graph.Core/Requests/Content/BatchRequestContentCollection.cs
@@ -101,12 +101,13 @@ public string AddBatchRequestStep(HttpRequestMessage httpRequestMessage)
         /// Adds a <see cref="RequestInformation"/> to batch request content
         /// </summary>
         /// <param name="requestInformation">A <see cref="RequestInformation"/> to use to build a <see cref="BatchRequestStep"/> to add.</param>
+        /// <param name="requestId">An optional string that will be used as the requestId of the batch request</param>
         /// <returns>The requestId of the  newly created <see cref="BatchRequestStep"/></returns>
-        public Task<string> AddBatchRequestStepAsync(RequestInformation requestInformation)
+        public Task<string> AddBatchRequestStepAsync(RequestInformation requestInformation, string requestId = null)
         {
             SetupCurrentRequest();
 #pragma warning disable CS0618
-            return currentRequest.AddBatchRequestStepAsync(requestInformation);
+            return currentRequest.AddBatchRequestStepAsync(requestInformation, requestId);
 #pragma warning restore CS0618
         }