Merge pull request #7 from PandaTechAM/development

Add Outlook support with different response

Author: ruboarm

src/Communicator/Communicator.csproj

@@ -8,7 +8,7 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>1.0.3</Version>
+        <Version>1.0.4</Version>
         <PackageId>Pandatech.Communicator</PackageId>
         <Title>SMS and Email Communication helper</Title>
         <PackageTags>Pandatech, library, Sms, Email, Messages</PackageTags>

src/Communicator/Models/GeneralResponses/GeneralEmailResponse.cs

@@ -6,56 +6,98 @@ public class GeneralEmailResponse
 {
     public string Status { get; set; } = null!;
     public string Code { get; set; } = null!;
-    public string TrackingId { get; set; } = null!;
+    public string? TrackingId { get; set; }
     public string Id { get; set; } = null!;
     public string Service { get; set; } = null!;
 
     // Define a regular expression pattern to extract relevant parts of the response
-    private const string Pattern = @"^(\d+\.\d+\.\d+)\s+(\w+)\s+(\d+)\s+(\S+)\s+\-\s+(\w+)$";
+    private const string GmailPattern = @"^(\d+\.\d+\.\d+)\s+(\w+)\s+(\d+)\s+(\S+)\s+\-\s+(\w+)$";
+
+    private const string OutlookPattern =
+        @"^(?<Version>\d+\.\d+\.\d+)\s(?<Status>\w+)\s<(?<EmailId>[^>]+)>\s\[Hostname=(?<Hostname>[^\]]+)\]$";
 
     public static GeneralEmailResponse Parse(string response)
     {
-        // Match the response string against the pattern
-        var match = Regex.Match(response, Pattern);
+        var match = Regex.Match(response, GmailPattern);
+        
+        if (!match.Success)
+        {
+            match = Regex.Match(response, OutlookPattern);
 
-        // Check if the response string matches the expected format
-        if (!match.Success || match.Groups.Count != 6)
+            if (!match.Success)
+            {
+                throw new ArgumentException("Invalid response string format.");
+            }
+        }
+        
+        if (match.Groups.Count == 5)
         {
-            throw new ArgumentException("Invalid response string format.");
+            return new GeneralEmailResponse
+            {
+                Status = match.Groups[1].Value,
+                Code = match.Groups[2].Value,
+                TrackingId = null,
+                Id = match.Groups[3].Value,
+                Service = match.Groups[4].Value
+            };
         }
 
-        // Create a new instance of EmailSendResponse and populate its properties
-        return new GeneralEmailResponse
+        if (match.Groups.Count == 6)
         {
-            Status = match.Groups[1].Value,
-            Code = match.Groups[2].Value,
-            TrackingId = match.Groups[3].Value,
-            Id = match.Groups[4].Value,
-            Service = match.Groups[5].Value
-        };
+            return new GeneralEmailResponse
+            {
+                Status = match.Groups[1].Value,
+                Code = match.Groups[2].Value,
+                TrackingId = match.Groups[3].Value,
+                Id = match.Groups[4].Value,
+                Service = match.Groups[5].Value
+            };
+        }
+
+        throw new ArgumentException("Invalid response string format.");
     }
 
     public static List<GeneralEmailResponse> Parse(IEnumerable<string> responses)
     {
         var responseList = new List<GeneralEmailResponse>();
 
-        foreach (var match in responses.Select(response => Regex.Match(response, Pattern)))
+        foreach (var response in responses)
         {
-            // Check if the response string matches the expected format
-            if (!match.Success || match.Groups.Count != 6)
+            var match = Regex.Match(response, GmailPattern);
+        
+            if (!match.Success)
             {
-                throw new ArgumentException("Invalid response string format.");
+                match = Regex.Match(response, OutlookPattern);
+
+                if (!match.Success)
+                {
+                    throw new ArgumentException("Invalid response string format.");
+                }
             }
 
-            // Create a new instance of EmailSendResponse and populate its properties
-            responseList.Add(new GeneralEmailResponse
+            if (match.Groups.Count == 5)
             {
-                Status = match.Groups[1].Value,
-                Code = match.Groups[2].Value,
-                TrackingId = match.Groups[3].Value,
-                Id = match.Groups[4].Value,
-                Service = match.Groups[5].Value
-            });
+                responseList.Add(new GeneralEmailResponse
+                {
+                    Status = match.Groups[1].Value,
+                    Code = match.Groups[2].Value,
+                    TrackingId = null,
+                    Id = match.Groups[3].Value,
+                    Service = match.Groups[4].Value
+                });
+            }
+
+            if (match.Groups.Count == 6)
+            {
+                responseList.Add(new GeneralEmailResponse
+                {
+                    Status = match.Groups[1].Value,
+                    Code = match.Groups[2].Value,
+                    TrackingId = match.Groups[3].Value,
+                    Id = match.Groups[4].Value,
+                    Service = match.Groups[5].Value
+                });
+            }
         }
 
         return responseList;