fix wrong error code in validation error message

zapadi · Jan 29, 2025 · 22ae8b4 · 22ae8b4
1 parent ef07205
commit 22ae8b4
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/src/vies-dotnet-api/Validators/BGVatValidator.cs b/src/vies-dotnet-api/Validators/BGVatValidator.cs
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2017-2024 Adrian Popescu.
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ protected override VatValidationResult OnValidate(string vat)
             VatValidationResult.Failed($"Invalid {CountryCode} VAT number");
     }
 
-    private static VatValidationResult Validate9DigitVat(ReadOnlySpan<char> vatSpan)
+    private VatValidationResult Validate9DigitVat(ReadOnlySpan<char> vatSpan)
     {
         var sum = vatSpan.Sum(MultipliersPhysicalPerson);
 

diff --git a/src/vies-dotnet-api/Validators/LTVatValidator.cs b/src/vies-dotnet-api/Validators/LTVatValidator.cs
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2017-2024 Adrian Popescu.
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ protected override VatValidationResult OnValidate(string vat)
             : ValidateTemporaryVat(vatSpan);
     }
 
-    private static VatValidationResult ValidateNineDigitVat(ReadOnlySpan<char> vatSpan)
+    private VatValidationResult ValidateNineDigitVat(ReadOnlySpan<char> vatSpan)
     {
         if (vatSpan[7] != '1')
         {
@@ -78,7 +78,7 @@ private static VatValidationResult ValidateNineDigitVat(ReadOnlySpan<char> vatSp
         return ValidateChecksumDigit(vatSpan[8].ToInt(), checkDigit);
     }
 
-    private static VatValidationResult ValidateTemporaryVat(ReadOnlySpan<char> vatSpan)
+    private VatValidationResult ValidateTemporaryVat(ReadOnlySpan<char> vatSpan)
     {
         if (vatSpan[10] != '1')
         {

diff --git a/src/vies-dotnet-api/VatValidatorAbstract.cs b/src/vies-dotnet-api/VatValidatorAbstract.cs
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2017-2024 Adrian Popescu.
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ namespace Padi.Vies;
 /// </summary>
 public abstract class VatValidatorAbstract : IVatValidator
 {
-    protected static string CountryCode { get; set; }
+    protected string CountryCode { get; set; }
 
     /// <summary>
     ///
@@ -37,15 +37,15 @@ public VatValidationResult Validate(string vat)
     }
     protected abstract VatValidationResult OnValidate(string vat);
 
-    protected static VatValidationResult ValidateChecksumDigit(int digit, int checkDigit, string message = null)
+    protected VatValidationResult ValidateChecksumDigit(int digit, int checkDigit, string message = null)
     {
         var isValid = checkDigit == digit;
         return !isValid
             ? VatValidationResult.Failed(message ?? $"Invalid {CountryCode} VAT: checkValue")
             : VatValidationResult.Success();
     }
 
-    protected static VatValidationResult ValidateChecksumDigit(bool isValid, string message = null)
+    protected VatValidationResult ValidateChecksumDigit(bool isValid, string message = null)
     {
         return !isValid
             ? VatValidationResult.Failed(message ?? $"Invalid {CountryCode} VAT: checkValue")

diff --git a/tests/vies-dotnet-api-test/ViesEUUnitTests.cs b/tests/vies-dotnet-api-test/ViesEUUnitTests.cs
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2017-2024 Adrian Popescu.
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -435,4 +435,22 @@ public void Should_Validate_Vat(string vatNumber)
         VatValidationResult result = ViesManager.IsValid(vatNumber);
         Assert.True(result.IsValid, $"VAT '{vatNumber}' is invalid");
     }
+
+    [Fact]
+    public void ErrorMessage_Should_Contain_CountryCode()
+    {
+        var data = new TheoryData<string, string>
+        {
+            { "IT00000010210", "IT" },
+            { "DE000000206", "DE" },
+            { "IT00000010210", "IT" } // test duplicate
+        };
+
+        foreach (var item in data)
+        {
+            VatValidationResult result = ViesManager.IsValid((string)item[0]);
+            Assert.False(result.IsValid, $"VAT '{item[0]}' is VALID");
+            Assert.Contains((string)item[1], result.Error, System.StringComparison.OrdinalIgnoreCase);
+        }
+    }
 }