Refactoring

Author: Ruben Bisharyan

src/Communicator/Services/Implementations/SmsService.cs

@@ -81,6 +81,12 @@ private HttpClient GenerateProviderHttpClient()
 
         var properties = _smsConfiguration.Properties;
 
+        return SetRequestHeaders(client, provider, properties);
+    }
+
+    private HttpClient SetRequestHeaders(HttpClient client, SmsProviders provider,
+        Dictionary<string, string> properties)
+    {
         switch (provider)
         {
             case SmsProviders.Dexatel:
@@ -111,7 +117,7 @@ private async Task<List<GeneralSmsResponse>> SendSmsAsync(SmsMessage smsMessage,
                 return await SendSmsViaTwilioAsync(smsMessage, cancellationToken);
 
             default:
-                throw new ArgumentOutOfRangeException();
+                throw new InvalidOperationException();
         }
     }
 
@@ -129,18 +135,7 @@ private async Task<List<GeneralSmsResponse>> SendSmsViaDexatelAsync(SmsMessage s
             }
         };
 
-        var response = await _httpClient.PostAsync(
-            $"{SmsProviderIntegrations.BaseUrls[_smsConfiguration.Provider]}/v1/messages",
-            new StringContent(
-                JsonConvert.SerializeObject(request, new JsonSerializerSettings
-                {
-                    ContractResolver = new DefaultContractResolver
-                    {
-                        NamingStrategy = new SnakeCaseNamingStrategy()
-                    }
-                }),
-                Encoding.UTF8,
-                "application/json"), cancellationToken);
+        var response = await PostAsyncViaDexatelHttpClient(request, cancellationToken);
 
         var responseContent = await response.Content.ReadAsStringAsync(cancellationToken);
 
@@ -165,23 +160,33 @@ private async Task<List<GeneralSmsResponse>> SendSmsViaDexatelAsync(SmsMessage s
                 Body = x.Text
             }).ToList() ?? [];
     }
-
+    
+    private async Task<HttpResponseMessage> PostAsyncViaDexatelHttpClient(DexatelSmsSendRequest request,
+        CancellationToken cancellationToken)
+    {
+        return await _httpClient.PostAsync(
+            $"{SmsProviderIntegrations.BaseUrls[_smsConfiguration.Provider]}/v1/messages",
+            new StringContent(
+                JsonConvert.SerializeObject(request, new JsonSerializerSettings
+                {
+                    ContractResolver = new DefaultContractResolver
+                    {
+                        NamingStrategy = new SnakeCaseNamingStrategy()
+                    }
+                }),
+                Encoding.UTF8,
+                "application/json"), cancellationToken);
+    }
+    
     private async Task<List<GeneralSmsResponse>> SendSmsViaTwilioAsync(SmsMessage smsMessage,
         CancellationToken cancellationToken)
     {
         var result = new List<TwilioSmsSendResponse>();
 
         foreach (var phone in smsMessage.Recipients.MakeDistinct())
         {
-            var response = await _httpClient.PostAsync(
-                $"{SmsProviderIntegrations.BaseUrls[_smsConfiguration.Provider]}/2010-04-01/Accounts/{_smsConfiguration.Properties["SID"]}/Messages.json",
-                new FormUrlEncodedContent(new[]
-                {
-                    new KeyValuePair<string, string>("To", phone),
-                    new KeyValuePair<string, string>("From", _smsConfiguration.From),
-                    new KeyValuePair<string, string>("Body", smsMessage.Message)
-                }), cancellationToken);
-
+            var response = await PostAsyncViaTwilioHttpClient(phone, smsMessage.Message, cancellationToken);
+            
             var responseContent = await response.Content.ReadAsStringAsync(cancellationToken);
 
             var responseObject = JsonConvert.DeserializeObject<TwilioSmsSendResponse>(responseContent,
@@ -208,4 +213,17 @@ private async Task<List<GeneralSmsResponse>> SendSmsViaTwilioAsync(SmsMessage sm
                 Body = x.Body
             }).ToList();
     }
+    
+    private async Task<HttpResponseMessage> PostAsyncViaTwilioHttpClient(string phone, string smsMessage,
+        CancellationToken cancellationToken)
+    {
+        return await _httpClient.PostAsync(
+            $"{SmsProviderIntegrations.BaseUrls[_smsConfiguration.Provider]}/2010-04-01/Accounts/{_smsConfiguration.Properties["SID"]}/Messages.json",
+            new FormUrlEncodedContent(new[]
+            {
+                new KeyValuePair<string, string>("To", phone),
+                new KeyValuePair<string, string>("From", _smsConfiguration.From),
+                new KeyValuePair<string, string>("Body", smsMessage)
+            }), cancellationToken);
+    }
 }