Fix vatNotice tests, refactor and extend revenue tests

Author: xam-ps

database/factories/RevenueFactory.php

@@ -2,53 +2,53 @@
 
 namespace Database\Factories;
 
+use App\Models\Revenue;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
  * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Revenue>
  */
 class RevenueFactory extends Factory
 {
+    protected $model = Revenue::class;
+
     /**
      * Define the model's default state.
      *
      * @return array<string, mixed>
      */
     public function definition(): array
     {
-        $net = $this->faker->randomFloat(2, 120, 3000);
-        $tax = (int) $net * env('DEFAULT_TAX_RATE') / 100;
-        $gross = $net + $tax;
-
-        $billigDate = $this->faker->dateTimeThisYear();
-
         return [
-            'billing_date' => $billigDate,
-            'payment_date' => $this->getPaymentDateFromBillingDate($billigDate),
+            'billing_date' => $this->faker->dateTimeThisYear(),
             'company_name' => $this->faker->company,
             'invoice_number' => $this->faker->randomNumber(8),
-            'net' => $net,
-            'tax' => $tax,
-            'gross' => $gross,
+            'net' => $this->faker->randomFloat(2, 120, 3000),
         ];
     }
 
-    public function yearsBack($yearsBack)
+    public function configure()
     {
-        return $this->state(function (array $attributes) use ($yearsBack) {
-            $revenue = $this->definition();
-            $revenue['billing_date'] = $this->faker->dateTimeBetween('-'.$yearsBack.' years', '-'.$yearsBack.' years');
-            $revenue['payment_date'] = $this->getPaymentDateFromBillingDate($revenue['billing_date']);
-
-            return $revenue;
+        return $this->afterMaking(function (Revenue $revenue) {
+            $rate = config('app.default_tax_rate', env('DEFAULT_TAX_RATE', 19));
+
+            $revenue->tax = (int) $revenue->net * $rate / 100;
+            $revenue->gross = $revenue->net + $revenue->tax;
+
+            $revenue->payment_date ??= $this->faker->dateTimeBetween(
+                $revenue->billing_date,
+                min(
+                    (clone $revenue->billing_date)->modify('+14 days'),
+                    (clone $revenue->billing_date)->setDate((int) $revenue->billing_date->format('Y'), 12, 31)
+                )
+            );
         });
     }
 
-    private function getPaymentDateFromBillingDate($billingDate)
+    public function yearsBack(int $years): static
     {
-        $maxPaymentDate = (clone $billingDate)->modify('+14 days');
-        $endOfYear = (clone $billingDate)->setDate($billingDate->format('Y'), 12, 31);
-
-        return $this->faker->dateTimeBetween($billingDate, min($maxPaymentDate, $endOfYear));
+        return $this->state(fn () => [
+            'billing_date' => $this->faker->dateTimeBetween("-{$years} years", "-{$years} years"),
+        ]);
     }
 }

resources/views/vat-notice/index.blade.php

@@ -14,22 +14,20 @@
                 </div>
                 <div class="p-6 text-gray-900 dark:text-gray-100">
                     <h1>Umsatzsteuer {{$year}}</h1>
-                    <div class="total_amounts flex flex-row text-center my-4">
-                        <div>
+                    <div class="total_amounts flex flex-row flex-wrap text-center my-4">
+                        <div class="font-semibold w-1/2">
                             <p>Zu meldende steuerpflichtige Umsätze</p>
                             <span>{{Number::currency($remainingNetRevenue, in: 'EUR', locale: 'de')}}</span>
                         </div>
-                        <div>
+                        <div class="opacity-30 w-1/2 mb-4">
                             <p>Gezahlte Steuern Gesamt</p>
                             <span>{{Number::currency($totalExpenseTax, in: 'EUR', locale: 'de')}}</span>
                         </div>
-                    </div>
-                    <div class="total_amounts flex flex-row text-center">
-                        <div>
+                        <div class="font-semibold w-1/2">
                             <p>Zu meldende Steuereinnahmen</p>
                             <span>{{Number::currency($remainingRevenueTax, in: 'EUR', locale: 'de')}}</span>
                         </div>
-                        <div>
+                        <div class="font-semibold w-1/2">
                             <p>Zu meldende Steuerzahlungen</p>
                             <span>{{Number::currency($remainingExpenseTax, in: 'EUR', locale: 'de')}}</span>
                         </div>

tests/Feature/RevenueTest.php

@@ -4,10 +4,21 @@
 
 use App\Models\Revenue;
 use App\Models\User;
+use Database\Seeders\CostTypeSeeder;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Number;
 use Tests\TestCase;
 
 class RevenueTest extends TestCase
 {
+    use RefreshDatabase;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->seed(CostTypeSeeder::class);
+    }
+
     public function test_create_revenue_page_is_loaded(): void
     {
         $user = User::factory()->create();
@@ -80,4 +91,28 @@ public function test_deleting_revenue_is_working(): void
         $user->delete();
         $revenue->delete();
     }
+
+    public function test_overview_page_shows_correct_total_for_multiple_revenues(): void
+    {
+        $user = User::factory()->createOne();
+
+        $revenues = collect([
+            Revenue::factory()->create(['net' => 112.38]),
+            Revenue::factory()->create(['net' => 238.47]),
+            Revenue::factory()->create(['net' => 323.99]),
+        ]);
+
+        $response = $this->actingAs($user)
+            ->get('');
+
+        $totalNet = $revenues->sum('net');
+        $totalTax = $revenues->sum('tax');
+        $totalGross = $revenues->sum('gross');
+
+        $formatEuro = fn ($value) => Number::currency($value, in: 'EUR', locale: 'de');
+
+        $response->assertSee($formatEuro($totalNet));
+        $response->assertSee($formatEuro($totalTax));
+        $response->assertSee($formatEuro($totalGross));
+    }
 }

tests/Feature/VatNoticeTest.php

@@ -6,17 +6,27 @@
 use App\Models\Revenue;
 use App\Models\User;
 use App\Models\VatNotice;
+use Database\Seeders\CostTypeSeeder;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Number;
 use Tests\TestCase;
 
 class VatNoticeTest extends TestCase
 {
+    use RefreshDatabase;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->seed(CostTypeSeeder::class);
+    }
+
     public function test_vat_notice_page_is_loaded(): void
     {
         $user = User::factory()->create();
 
         $vatNoticePage = $this->actingAs($user)
-            ->get('/vat-notice');
+            ->get('/vat-notice/');
 
         $vatNoticePage->assertSeeInOrder([
             'Zu meldende steuerpflichtige Umsätze',
@@ -30,18 +40,29 @@ public function test_vat_notice_page_is_loaded(): void
     public function test_vat_notice_page_calcs_total_tax(): void
     {
         $user = User::factory()->createOne();
-        $rev1 = Revenue::factory()->create();
-        $rev2 = Revenue::factory()->create();
+        $rev1 = Revenue::factory()->create(['net' => 5200]);
+        $rev2 = Revenue::factory()->create(['net' => 3200]);
         $exp1 = Expense::factory()->create();
         $exp2 = Expense::factory()->create();
+        $vatNotice1 = VatNotice::factory()->create();
+        $vatNotice2 = VatNotice::factory()->create();
+
         $totalReceivedTax = $rev1->tax + $rev2->tax;
+        $remainingRevenueTax = $totalReceivedTax - $vatNotice1->vat_received - $vatNotice2->vat_received;
+
+        $remainingNetRevenueRounded = round($remainingRevenueTax * 100 / 19, 0); // Elster only let you use non decimal numbers for the net revenue
+        $remainingRevenueTaxRounded = $remainingNetRevenueRounded * 19 / 100;
+
         $totalPaidTax = $exp1->tax + $exp2->tax;
+        $paidTaxToReport = $totalPaidTax - $vatNotice1->vat_paid - $vatNotice2->vat_paid;
 
         $vatNoticePage = $this->actingAs($user)
-            ->get('/vat-notice');
+            ->get('/vat-notice/');
 
-        $vatNoticePage->assertSee(Number::currency($totalReceivedTax, in: 'EUR', locale: 'de'));
+        $vatNoticePage->assertSee(Number::currency($remainingNetRevenueRounded, in: 'EUR', locale: 'de'));
+        $vatNoticePage->assertSee(Number::currency($remainingRevenueTaxRounded, in: 'EUR', locale: 'de'));
         $vatNoticePage->assertSee(Number::currency($totalPaidTax, in: 'EUR', locale: 'de'));
+        $vatNoticePage->assertSee(Number::currency($paidTaxToReport, in: 'EUR', locale: 'de'));
         $vatNoticePage->assertStatus(200);
 
         $rev1->delete();
@@ -92,6 +113,7 @@ public function test_vat_notice_page_shows_notices(): void
         $vatNoticePage->assertSee(Number::currency($vatNotice->vat_paid, in: 'EUR', locale: 'de'));
         $vatNoticePage->assertStatus(200);
 
+        $user->delete();
         $vatNotice->delete();
     }
 
@@ -105,6 +127,7 @@ public function test_create_vat_notice_page_is_loaded(): void
         $vatNoticePage->assertSeeInOrder([
             'Meldedatum',
         ]);
+        $user->delete();
         $vatNoticePage->assertStatus(200);
     }