Allow + characters in enskild firma.

Signed-off-by: Johannes Tegnér <[email protected]>
organisationsnummer · Feb 20, 2024 · 8a697cd · 8a697cd
1 parent 4877d48
commit 8a697cd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Organisationsnummer.Tests/OrganisationsnummerTests.cs b/Organisationsnummer.Tests/OrganisationsnummerTests.cs
@@ -39,7 +39,8 @@ public void TestFormatWithOutSeparator(OrganisationsnummerData input)
     public void TestFormatWithSeparator(OrganisationsnummerData input)
     {
         Assert.Equal(input.LongFormat, Organisationsnummer.Parse(input.LongFormat).Format(true));
-        Assert.Equal(input.LongFormat, Organisationsnummer.Parse(input.ShortFormat).Format(true));
+        // If short format in, we must presume it's not a + expected.
+        Assert.Equal(input.LongFormat.Replace('+', '-'), Organisationsnummer.Parse(input.ShortFormat).Format(true));
     }
 
     [Theory]

diff --git a/Organisationsnummer/Organisationsnummer.cs b/Organisationsnummer/Organisationsnummer.cs
@@ -141,6 +141,11 @@ public Organisationsnummer(string number)
         /// <returns></returns>
         public string Format(bool separator = true)
         {
+            if (IsPersonnummer)
+            {
+                return _personnummer!.Format(false, !separator);
+            }
+
             var num = ShortString;
             return separator ? $"{num!.Substring(0, 6)}-{num!.Substring(6)}" : num!;
         }
@@ -151,6 +156,7 @@ public string Format(bool separator = true)
 
         private void InnerParse(string input)
         {
+            var originalInput = input;
             if (input.Length is > 13 or < 10)
             {
                 var state = input.Length > 13 ? "long" : "short";
@@ -197,7 +203,7 @@ private void InnerParse(string input)
             {
                 try
                 {
-                    _personnummer = PerNr.Parse(input);
+                    _personnummer = PerNr.Parse(originalInput);
                 }
                 catch
                 {