From 40f53e3dde0446469578793eff03250716eb7bff Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 25 Mar 2023 09:26:27 +1100
Subject: [PATCH] Refactor for taxes

---
 app/DataMapper/Tax/ClientTaxData.php          | 28 -------------------
 app/DataMapper/Tax/CompanyTaxData.php         | 28 -------------------
 .../Tax/{InvoiceTaxData.php => TaxData.php}   |  2 +-
 tests/Unit/Tax/SumTaxTest.php                 | 18 ++++++------
 4 files changed, 9 insertions(+), 67 deletions(-)
 delete mode 100644 app/DataMapper/Tax/ClientTaxData.php
 delete mode 100644 app/DataMapper/Tax/CompanyTaxData.php
 rename app/DataMapper/Tax/{InvoiceTaxData.php => TaxData.php} (96%)

diff --git a/app/DataMapper/Tax/ClientTaxData.php b/app/DataMapper/Tax/ClientTaxData.php
deleted file mode 100644
index 3f92e8866781..000000000000
--- a/app/DataMapper/Tax/ClientTaxData.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Invoice Ninja (https://invoiceninja.com).
- *
- * @link https://github.com/invoiceninja/invoiceninja source repository
- *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
- *
- * @license https://www.elastic.co/licensing/elastic-license
- */
-
-namespace App\DataMapper\Tax;
-
-use App\DataMapper\Tax\ZipTax\Response;
-
-/**
- * ClientTaxData
- * 
- * Definition for the client tax data
- */
-class ClientTaxData
-{
-    public int $updated_at;
-    
-    public function __construct(public Response $origin, public Response $destination)
-    {
-    }
-}
\ No newline at end of file
diff --git a/app/DataMapper/Tax/CompanyTaxData.php b/app/DataMapper/Tax/CompanyTaxData.php
deleted file mode 100644
index 269d2b8a12e9..000000000000
--- a/app/DataMapper/Tax/CompanyTaxData.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Invoice Ninja (https://invoiceninja.com).
- *
- * @link https://github.com/invoiceninja/invoiceninja source repository
- *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
- *
- * @license https://www.elastic.co/licensing/elastic-license
- */
-
-namespace App\DataMapper\Tax;
-
-use App\DataMapper\Tax\ZipTax\Response;
-
-/**
- * CompanyTaxData
- * 
- * Definition for the company tax data structure
- */
-class CompanyTaxData
-{
-    public int $updated_at;
-    
-    public function __construct(public Response $origin)
-    {
-    }
-}
diff --git a/app/DataMapper/Tax/InvoiceTaxData.php b/app/DataMapper/Tax/TaxData.php
similarity index 96%
rename from app/DataMapper/Tax/InvoiceTaxData.php
rename to app/DataMapper/Tax/TaxData.php
index 1c265f37fb06..c1696ef2a43e 100644
--- a/app/DataMapper/Tax/InvoiceTaxData.php
+++ b/app/DataMapper/Tax/TaxData.php
@@ -18,7 +18,7 @@ use App\DataMapper\Tax\ZipTax\Response;
  * 
  * Definition for the invoice tax data structure
  */
-class InvoiceTaxData
+class TaxData
 {
     public int $updated_at;
     
diff --git a/tests/Unit/Tax/SumTaxTest.php b/tests/Unit/Tax/SumTaxTest.php
index 91e50be5aaa1..471956e39bce 100644
--- a/tests/Unit/Tax/SumTaxTest.php
+++ b/tests/Unit/Tax/SumTaxTest.php
@@ -17,9 +17,7 @@ use App\Models\Invoice;
 use App\Models\Product;
 use Tests\MockAccountData;
 use App\DataMapper\InvoiceItem;
-use App\DataMapper\Tax\ClientTaxData;
-use App\DataMapper\Tax\CompanyTaxData;
-use App\DataMapper\Tax\InvoiceTaxData;
+use App\DataMapper\Tax\TaxData;
 use App\DataMapper\Tax\ZipTax\Response;
 use App\Factory\InvoiceFactory;
 use Illuminate\Routing\Middleware\ThrottleRequests;
@@ -89,7 +87,7 @@ class SumTaxTest extends TestCase
 
     }
 
-
+    /** Proves that we do not charge taxes automatically */
     public function testCalcInvoiceNoTax()
     {
         $this->company->calculate_taxes = false;
@@ -108,7 +106,7 @@ class SumTaxTest extends TestCase
 
         $line_items = [];
 
-        $invoice->tax_data = new InvoiceTaxData($this->response);
+        $invoice->tax_data = new TaxData($this->response);
 
         $line_item = new InvoiceItem();
         $line_item->quantity = 1;
@@ -131,7 +129,7 @@ class SumTaxTest extends TestCase
         $this->assertEquals(0, $line_items[0]->tax_rate1);
     }
 
-
+    /** Proves that we do calc taxes automatically */
     public function testCalcInvoiceTax()
     {
 
@@ -151,7 +149,7 @@ class SumTaxTest extends TestCase
 
         $line_items = [];
 
-        $invoice->tax_data = new InvoiceTaxData($this->response);
+        $invoice->tax_data = new TaxData($this->response);
         
         $line_item = new InvoiceItem;
         $line_item->quantity = 1;
@@ -177,7 +175,7 @@ class SumTaxTest extends TestCase
     public function testTaxOnCompany()
     {
         
-        $tax_class = new CompanyTaxData($this->response);
+        $tax_class = new TaxData($this->response);
 
         $this->company->tax_data = $tax_class;
         $this->company->save();
@@ -194,7 +192,7 @@ class SumTaxTest extends TestCase
             'company_id' => $this->company->id,
         ]);
     
-        $tax_class = new ClientTaxData($this->response, $this->response);
+        $tax_class = new TaxData($this->response, $this->response);
 
         $c->tax_data = $tax_class;
         $c->save();
@@ -213,7 +211,7 @@ class SumTaxTest extends TestCase
             'user_id' => $this->user->id,
         ]);
 
-        $tax_class = new InvoiceTaxData($this->response);
+        $tax_class = new TaxData($this->response);
 
         $i->tax_data = $tax_class;
         $i->save();