Fix: update taxpayer's full name when empty

Author: cpa-coder

DebitExpress.VatRelief/DebitExpress.VatRelief.csproj

@@ -22,6 +22,7 @@
       <PackageReference Include="DebitExpress.Controls" Version="2.1.24" />
       <PackageReference Include="DebitExpress.DialogService" Version="2.1.8" />
       <PackageReference Include="DebitExpress.Extensions" Version="1.0.11" />
+      <PackageReference Include="DebitExpress.StringBuilders" Version="1.0.5" />
     </ItemGroup>
 
     <ItemGroup>

DebitExpress.VatRelief/Models/Purchases.cs

@@ -1,4 +1,5 @@
 using System;
+using DebitExpress.StringBuilders;
 
 namespace DebitExpress.VatRelief.Models;
 
@@ -15,7 +16,11 @@ public struct Purchases
 
     public string MiddleName { get; set; }
 
-    public string FullName => $"{LastName}, {FirstName} {MiddleName}";
+    public string FullName => new NameBuilder()
+        .LastName(LastName)
+        .WithFirstName(FirstName)
+        .WithMiddleName(MiddleName)
+        .ToString() ?? string.Empty;
     public string Street { get; set; }
 
     public string City { get; set; }

DebitExpress.VatRelief/Models/Sales.cs

@@ -1,4 +1,5 @@
 using System;
+using DebitExpress.StringBuilders;
 
 namespace DebitExpress.VatRelief.Models;
 
@@ -10,7 +11,12 @@ public struct Sales
     public string LastName { get; set; }
     public string FirstName { get; set; }
     public string MiddleName { get; set; }
-    public string FullName => $"{LastName}, {FirstName} {MiddleName}";
+
+    public string FullName => new NameBuilder()
+        .LastName(LastName)
+        .WithFirstName(FirstName)
+        .WithMiddleName(MiddleName)
+        .ToString() ?? string.Empty;
     public string Street { get; set; }
     public string City { get; set; }
     public decimal Exempt { get; set; }

DebitExpress.VatRelief/Utils/ExcelReconWriter.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using ClosedXML.Excel;
+using DebitExpress.StringBuilders;
 using DebitExpress.VatRelief.Models;
 
 namespace DebitExpress.VatRelief.Utils;
@@ -101,7 +102,13 @@ private void WriteSalesData(IXLWorksheet sheet, Info info, List<Sales> sales)
         sheet.Cell("A2").Value = "RECONCILIATION OF LISTING FOR ENFORCEMENT";
         sheet.Cell("A6").Value = $"TIN : {info.Tin.Strip()}";
 
-        var name = info.NonIndividual ? info.RegName : $"{info.LastName}, {info.FirstName} {info.MiddleName}";
+        var taxPayer = new NameBuilder()
+            .LastName(info.LastName)
+            .WithFirstName(info.FirstName)
+            .WithMiddleName(info.MiddleName)
+            .ToString();
+
+        var name = info.NonIndividual ? info.RegName : taxPayer;
         sheet.Cell("A7").Value = $"OWNER'S NAME: {name}";
 
         sheet.Cell("A8").Value = $"OWNER'S TRADE NAME : {info.TradeName}";
@@ -195,7 +202,13 @@ private void WritePurchasesData(IXLWorksheet sheet, Info info, List<Purchases> p
         sheet.Cell("A2").Value = "RECONCILIATION OF LISTING FOR ENFORCEMENT";
         sheet.Cell("A6").Value = $"TIN : {info.Tin.Strip()}";
 
-        var name = info.NonIndividual ? info.RegName : $"{info.LastName}, {info.FirstName} {info.MiddleName}";
+        var taxPayer = new NameBuilder()
+            .LastName(info.LastName)
+            .WithFirstName(info.FirstName)
+            .WithMiddleName(info.MiddleName)
+            .ToString();
+
+        var name = info.NonIndividual ? info.RegName : taxPayer;
         sheet.Cell("A7").Value = $"OWNER'S NAME: {name}";
 
         sheet.Cell("A8").Value = $"OWNER'S TRADE NAME : {info.TradeName}";