Removed: Wait() method for MCM

Author: Ant-hem

src/Algolia.Search.Test/EndToEnd/Index/MultiClusterManagementTest.cs

@@ -21,6 +21,7 @@
 * THE SOFTWARE.
 */
 
+using Algolia.Search.Exceptions;
 using Algolia.Search.Models.Mcm;
 using Algolia.Search.Models.Search;
 using NUnit.Framework;
@@ -45,7 +46,7 @@ public async Task McmTest()
             string userId = TestHelper.GetMcmUserId();
             AssignUserIdResponse assignResponse =
                 await BaseTest.McmClient.AssignUserIdAsync(userId, listClusters.ElementAt(0).ClusterName);
-            assignResponse.Wait();
+            WaitUserId(userId);
 
             SearchResponse<UserIdResponse> searchResponse =
                 await BaseTest.McmClient.SearchUserIDsAsync(new SearchUserIdsRequest
@@ -58,8 +59,7 @@ await BaseTest.McmClient.SearchUserIDsAsync(new SearchUserIdsRequest
             TopUserIdResponse topUserIds = await BaseTest.McmClient.GetTopUserIdAsync();
             Assert.True(topUserIds.TopUsers.Any());
 
-            RemoveUserIdResponse removeResponse = await BaseTest.McmClient.RemoveUserIdAsync(userId);
-            removeResponse.Wait();
+            RemoveUserId(userId);
 
             ListUserIdsResponse listUserIdsTwo = await BaseTest.McmClient.ListUserIdsAsync();
             var yesterday = DateTime.UtcNow.AddDays(-1).ToString("yyyy-MM-dd", CultureInfo.InvariantCulture);
@@ -70,5 +70,55 @@ await BaseTest.McmClient.SearchUserIDsAsync(new SearchUserIdsRequest
                 userIdsToRemove.Select(x => BaseTest.McmClient.RemoveUserIdAsync(x.UserID)).ToArray();
             await Task.WhenAll(delete);
         }
+        
+        private void WaitUserId(string userId)
+        {
+            while (true)
+            {
+                try
+                {
+                    BaseTest.McmClient.GetUserId(userId);
+                }
+                catch (AlgoliaApiException ex)
+                {
+                    // Loop until we have found the userID
+                    if (ex.HttpErrorCode == 404)
+                    {
+                        Task.Delay(1000);
+                        continue;
+                    }
+
+                    throw;
+                }
+
+                break;
+            }
+        }
+        
+        private void RemoveUserId(String userId)
+        {
+            RemoveUserIdResponse deleteResponse;
+
+            while (true)
+            {
+                try
+                {
+                    deleteResponse = BaseTest.McmClient.RemoveUserId(userId);
+                }
+                catch (AlgoliaApiException ex)
+                {
+                    // Loop until we don't have Error 400: "Another mapping operation is already running for this userID"
+                    if (ex.Message.Contains("Another mapping operation is already running for this userID"))
+                    {
+                        Task.Delay(1000);
+                        continue;
+                    }
+
+                    throw;
+                }
+
+                break;
+            }
+        }
     }
-}
+}

src/Algolia.Search/Clients/SearchClient.cs

@@ -466,26 +466,10 @@ public async Task<RemoveUserIdResponse> RemoveUserIdAsync(string userId, Request
             var userIdHeader = new Dictionary<string, string>() { { "X-Algolia-USER-ID", userId } };
             requestOptions = requestOptions.AddHeaders(userIdHeader);
 
-            try
-            {
-                RemoveUserIdResponse response = await _transport.ExecuteRequestAsync<RemoveUserIdResponse>(
-                        HttpMethod.Delete,
-                        $"/1/clusters/mapping", CallType.Write, requestOptions, ct)
-                    .ConfigureAwait(false);
-
-                response.UserId = userId;
-                response.RemoveUserId = u => RemoveUserId(u);
-                return response;
-            }
-            catch (AlgoliaApiException ex)
-            {
-                if (!ex.Message.Contains("Another mapping operation is already running for this userID"))
-                {
-                    throw;
-                }
-
-                return new RemoveUserIdResponse { UserId = userId, RemoveUserId = u => RemoveUserId(u) };
-            }
+            return await _transport.ExecuteRequestAsync<RemoveUserIdResponse>(
+                    HttpMethod.Delete,
+                    $"/1/clusters/mapping", CallType.Write, requestOptions, ct)
+                .ConfigureAwait(false);
         }
 
         /// <inheritdoc />
@@ -664,4 +648,4 @@ public async Task<TResult> CustomRequestAsync<TResult, TData>(TData data, string
                 .ConfigureAwait(false);
         }
     }
-}
+}

src/Algolia.Search/Models/Mcm/AssignUserIdResponse.cs

@@ -31,7 +31,7 @@ namespace Algolia.Search.Models.Mcm
     /// <summary>
     /// Waitable response of assignUserid method
     /// </summary>
-    public class AssignUserIdResponse : IAlgoliaWaitableResponse
+    public class AssignUserIdResponse
     {
         internal Func<string, UserIdResponse> GetUserId { get; set; }
 
@@ -41,36 +41,8 @@ public class AssignUserIdResponse : IAlgoliaWaitableResponse
         public string UserId { get; set; }
 
         /// <summary>
-        /// Date of creation of the userId
+        /// /// Date of creation of the userId
         /// </summary>
         public DateTime CreatedAt { get; set; }
-
-        /// <summary>
-        /// Wait until the userID is created on the API
-        /// Loop until httpErrorCode != 404
-        /// </summary>
-        public void Wait()
-        {
-            while (true)
-            {
-                try
-                {
-                    GetUserId(UserId);
-                }
-                catch (AlgoliaApiException ex)
-                {
-                    // Loop until we have found the userID
-                    if (ex.HttpErrorCode == 404)
-                    {
-                        Task.Delay(1000);
-                        continue;
-                    }
-
-                    throw;
-                }
-
-                break;
-            }
-        }
     }
-}
+}

src/Algolia.Search/Models/Mcm/RemoveUserIdResponse.cs

@@ -31,7 +31,7 @@ namespace Algolia.Search.Models.Mcm
     /// <summary>
     /// Waitable response for removeUserId
     /// </summary>
-    public class RemoveUserIdResponse : IAlgoliaWaitableResponse
+    public class RemoveUserIdResponse
     {
         internal Func<string, RemoveUserIdResponse> RemoveUserId { get; set; }
 
@@ -44,36 +44,5 @@ public class RemoveUserIdResponse : IAlgoliaWaitableResponse
         /// Date of deletion
         /// </summary>
         public DateTime DeletedAt { get; set; }
-
-        /// <summary>
-        /// As the delete operation is asynchronous
-        /// Wait until the userId is deleted on the API
-        /// </summary>
-        public void Wait()
-        {
-            RemoveUserIdResponse deleteResponse;
-
-            while (true)
-            {
-                try
-                {
-                    deleteResponse = RemoveUserId(UserId);
-                }
-                catch (AlgoliaApiException ex)
-                {
-                    // Loop until we don't have Error 400: "Another mapping operation is already running for this userID"
-                    if (ex.Message.Contains("Another mapping operation is already running for this userID"))
-                    {
-                        Task.Delay(1000);
-                        continue;
-                    }
-
-                    throw;
-                }
-
-                DeletedAt = deleteResponse.DeletedAt;
-                break;
-            }
-        }
     }
-}
+}