Fix decimal parsing

aimenux · Dec 24, 2023 · f87c2ef · f87c2ef
1 parent e3da6ef
commit f87c2ef
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 6 deletions.
diff --git a/src/App/App.csproj b/src/App/App.csproj
@@ -5,7 +5,7 @@
         <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <UserSecretsId>QrCodeCli-UserSecrets</UserSecretsId>
-        <Version>0.0.4-preview</Version>
+        <Version>0.0.5-preview</Version>
         <Authors>Aymen TROUDI</Authors>
         <PackAsTool>true</PackAsTool>
         <PackageId>QrCodeCli</PackageId>

diff --git a/src/App/Extensions/StringExtensions.cs b/src/App/Extensions/StringExtensions.cs
@@ -1,4 +1,6 @@
-namespace App.Extensions;
+using System.Globalization;
+
+namespace App.Extensions;
 
 public static class StringExtensions
 {
@@ -21,4 +23,14 @@ public static bool IsValidCoordinate(this string input)
     {
         return !string.IsNullOrWhiteSpace(input) && input.All(c => char.IsDigit(c) || c == '.');
     }
+
+    public static bool IsDecimal(this string val, out decimal amount)
+    {
+        return decimal.TryParse(val, NumberStyles.Any, CultureInfo.InvariantCulture, out amount);
+    }
+
+    public static decimal ToDecimal(this string val)
+    {
+        return decimal.Parse(val, NumberStyles.Any, CultureInfo.InvariantCulture);
+    }
 }
diff --git a/src/App/Extensions/ValidationExtensions.cs b/src/App/Extensions/ValidationExtensions.cs
@@ -23,14 +23,14 @@ public static IRuleBuilderOptions<T, string> CoordinateIsValid<T>(this IRuleBuil
     public static IRuleBuilderOptions<T, string> AmountIsValid<T>(this IRuleBuilder<T, string> ruleBuilder)
     {
         return ruleBuilder
-            .Must<T, string>((Func<T, string, bool>) ((x, val) => decimal.TryParse(val, out _)))
+            .Must<T, string>((Func<T, string, bool>) ((x, val) => val.IsDecimal(out _)))
             .WithMessage("Amount '{PropertyValue}' is not valid.");
     }
 
     public static IRuleBuilderOptions<T, string> AmountIsBetween<T>(this IRuleBuilder<T, string> ruleBuilder, decimal min, decimal max)
     {
         return ruleBuilder
-            .Must<T, string>((Func<T, string, bool>) ((x, val) => decimal.TryParse(val, out var amount) && amount >= min && amount <= max))
+            .Must<T, string>((Func<T, string, bool>) ((x, val) => val.IsDecimal(out var amount) && amount >= min && amount <= max))
             .WithMessage("Amount '{PropertyValue}' is not between '{min}' and '{max}'.");
     }
 

diff --git a/src/App/Services/QrCode/QrCodeFormatsBuilder.cs b/src/App/Services/QrCode/QrCodeFormatsBuilder.cs
@@ -1,4 +1,5 @@
-using QRCoder;
+using App.Extensions;
+using QRCoder;
 
 namespace App.Services.QrCode;
 
@@ -24,7 +25,7 @@ string encoding
             iban,
             bic,
             name,
-            decimal.Parse(amount), 
+            amount.ToDecimal(), 
             information,
             remittanceType,
             purpose,

diff --git a/test/Tests/Extensions/StringExtensionsTests.cs b/test/Tests/Extensions/StringExtensionsTests.cs
@@ -38,4 +38,31 @@ public void Should_Not_Be_Equals(string left, string right)
         // assert
         areEquals.Should().BeFalse();
     }
+
+    [Theory]
+    [InlineData("10.23")]
+    [InlineData("10,23")]
+    public void Should_Be_Decimal(string val)
+    {
+        // arrange
+        // act
+        var isDecimal = val.IsDecimal(out var _);
+
+        // assert
+        isDecimal.Should().BeTrue();
+    }
+
+    [Theory]
+    [InlineData("1abc")]
+    [InlineData("10;23")]
+    [InlineData("10..23")]
+    public void Should_Not_Be_Decimal(string val)
+    {
+        // arrange
+        // act
+        var isDecimal = val.IsDecimal(out var _);
+
+        // assert
+        isDecimal.Should().BeFalse();
+    }
 }