optimize try parse logic

nager · Jan 15, 2025 · 51caec6 · 51caec6
1 parent f986dfa
commit 51caec6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/Nager.EmailAuthentication.UnitTest/DmarcRecordParserTests/BasicTest.cs b/src/Nager.EmailAuthentication.UnitTest/DmarcRecordParserTests/BasicTest.cs
@@ -24,11 +24,11 @@ public void TryParse_InvalidDmarcString2_ReturnsTrueAndPopulatesDmarcRecord()
         }
 
         [TestMethod]
-        public void TryParse_CorruptDmarcString1_ReturnsTrueAndParseErrors()
+        public void TryParse_CorruptDmarcString1_ReturnsFalseAndParseErrors()
         {
             var isSuccessful = DmarcRecordParser.TryParse("verification=123456789", out var dmarcDataFragment, out var parseErrors);
 
-            Assert.IsTrue(isSuccessful);
+            Assert.IsFalse(isSuccessful);
             Assert.IsNotNull(dmarcDataFragment);
             Assert.IsNotNull(parseErrors, "ParseErrors is null");
             Assert.IsTrue(parseErrors.Length == 2);

diff --git a/src/Nager.EmailAuthentication/DmarcRecordParser.cs b/src/Nager.EmailAuthentication/DmarcRecordParser.cs
@@ -162,6 +162,8 @@ public static bool TryParse(
                 }
             };
 
+            var mappingFound = false;
+
             foreach (var keyValue in parseResult.KeyValues)
             {
                 if (string.IsNullOrEmpty(keyValue.Key))
@@ -176,7 +178,9 @@ public static bool TryParse(
                         errors.AddRange([.. handler.Validate(new ValidateRequest { Field = keyValue.Key, Value = keyValue.Value })]);
                     }
                     handler.Map(keyValue.Value ?? "");
-
+
+                    mappingFound = true;
+
                     continue;
                 }
 
@@ -190,7 +194,7 @@ public static bool TryParse(
             parseErrors = errors.Count == 0 ? null : [.. errors];
             dmarcDataFragment = dataFragment;
 
-            return true;
+            return mappingFound;
         }
 
         private static ParseError[] ValidateDomainPolicy(ValidateRequest validateRequest)

diff --git a/src/Nager.EmailAuthentication/Nager.EmailAuthentication.csproj b/src/Nager.EmailAuthentication/Nager.EmailAuthentication.csproj
@@ -20,7 +20,7 @@
 
     <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
   </PropertyGroup>
 
   <ItemGroup>