wip

app/DTO/ReportDatesDTO.php

+<?php
+
+namespace App\DTO;
+
+use Illuminate\Support\Carbon;
+
+class ReportDatesDTO
+{
+    public function __construct(
+        public Carbon $fiscalYearStartDate,
+        public Carbon $fiscalYearEndDate,
+        public string $defaultDateRange,
+        public Carbon $defaultStartDate,
+        public Carbon $defaultEndDate,
+    ) {}
+}

app/Factories/ReportDateFactory.php

+<?php
+
+namespace App\Factories;
+
+use App\DTO\ReportDatesDTO;
+use App\Models\Company;
+use Illuminate\Support\Carbon;
+
+class ReportDateFactory
+{
+    public static function create(Company $company): ReportDatesDTO
+    {
+        $fiscalYearStartDate = Carbon::parse($company->locale->fiscalYearStartDate())->startOfDay();
+        $fiscalYearEndDate = Carbon::parse($company->locale->fiscalYearEndDate())->endOfDay();
+        $defaultDateRange = 'FY-' . now()->year;
+        $defaultStartDate = $fiscalYearStartDate->startOfDay();
+        $defaultEndDate = $fiscalYearEndDate->isFuture() ? now()->endOfDay() : $fiscalYearEndDate->endOfDay();
+
+        // Return a new DTO with the calculated values
+        return new ReportDatesDTO(
+            $fiscalYearStartDate,
+            $fiscalYearEndDate,
+            $defaultDateRange,
+            $defaultStartDate,
+            $defaultEndDate
+        );
+    }
+}

app/Observers/TransactionObserver.php

 
 namespace App\Observers;
 
-use App\Enums\Accounting\JournalEntryType;
-use App\Models\Accounting\Account;
-use App\Models\Accounting\JournalEntry;
 use App\Models\Accounting\Transaction;
-use App\Utilities\Currency\CurrencyAccessor;
-use App\Utilities\Currency\CurrencyConverter;
-use Illuminate\Support\Facades\DB;
+use App\Services\TransactionService;
 
 class TransactionObserver
 {
+    public function __construct(
+        protected TransactionService $transactionService,
+    ) {}
+
     /**
      * Handle the Transaction "saving" event.
      */
      */
     public function created(Transaction $transaction): void
     {
-        // Additional check to avoid duplication during replication
-        if ($transaction->journalEntries()->exists() || $transaction->type->isJournal() || str_starts_with($transaction->description, '(Copy of)')) {
-            return;
-        }
-
-        [$debitAccount, $creditAccount] = $this->determineAccounts($transaction);
-
-        if ($debitAccount === null || $creditAccount === null) {
-            return;
-        }
-
-        $this->createJournalEntries($transaction, $debitAccount, $creditAccount);
+        $this->transactionService->createJournalEntries($transaction);
     }
 
     /**
     {
         $transaction->refresh(); // DO NOT REMOVE
 
-        if ($transaction->type->isJournal() || $this->hasRelevantChanges($transaction) === false) {
-            return;
-        }
-
-        $journalEntries = $transaction->journalEntries;
-
-        $debitEntry = $journalEntries->where('type', JournalEntryType::Debit)->first();
-        $creditEntry = $journalEntries->where('type', JournalEntryType::Credit)->first();
-
-        if ($debitEntry === null || $creditEntry === null) {
-            return;
-        }
-
-        [$debitAccount, $creditAccount] = $this->determineAccounts($transaction);
-
-        if ($debitAccount === null || $creditAccount === null) {
-            return;
-        }
-
-        $convertedTransactionAmount = $this->getConvertedTransactionAmount($transaction);
-
-        $this->updateJournalEntriesForTransaction($debitEntry, $debitAccount, $convertedTransactionAmount);
-        $this->updateJournalEntriesForTransaction($creditEntry, $creditAccount, $convertedTransactionAmount);
+        $this->transactionService->updateJournalEntries($transaction);
     }
 
     /**
      */
     public function deleting(Transaction $transaction): void
     {
-        DB::transaction(static function () use ($transaction) {
-            $transaction->journalEntries()->each(fn (JournalEntry $entry) => $entry->delete());
-        });
-    }
-
-    private function determineAccounts(Transaction $transaction): array
-    {
-        $chartAccount = $transaction->account;
-        $bankAccount = $transaction->bankAccount?->account;
-
-        if ($transaction->type->isTransfer()) {
-            // Essentially a withdrawal from the bank account and a deposit to the chart account (which is a bank account)
-            // Credit: bankAccount (source of funds, money is being withdrawn)
-            // Debit: chartAccount (destination of funds, money is being deposited)
-            return [$chartAccount, $bankAccount];
-        }
-
-        $debitAccount = $transaction->type->isWithdrawal() ? $chartAccount : $bankAccount;
-        $creditAccount = $transaction->type->isWithdrawal() ? $bankAccount : $chartAccount;
-
-        return [$debitAccount, $creditAccount];
-    }
-
-    private function createJournalEntries(Transaction $transaction, Account $debitAccount, Account $creditAccount): void
-    {
-        $convertedTransactionAmount = $this->getConvertedTransactionAmount($transaction);
-
-        $debitAccount->journalEntries()->create([
-            'company_id' => $transaction->company_id,
-            'transaction_id' => $transaction->id,
-            'type' => JournalEntryType::Debit,
-            'amount' => $convertedTransactionAmount,
-            'description' => $transaction->description,
-        ]);
-
-        $creditAccount->journalEntries()->create([
-            'company_id' => $transaction->company_id,
-            'transaction_id' => $transaction->id,
-            'type' => JournalEntryType::Credit,
-            'amount' => $convertedTransactionAmount,
-            'description' => $transaction->description,
-        ]);
-    }
-
-    private function getConvertedTransactionAmount(Transaction $transaction): string
-    {
-        $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
-        $bankAccountCurrency = $transaction->bankAccount->account->currency_code;
-        $chartAccountCurrency = $transaction->account->currency_code;
-
-        if ($bankAccountCurrency !== $defaultCurrency) {
-            return $this->convertToDefaultCurrency($transaction->amount, $bankAccountCurrency, $defaultCurrency);
-        } elseif ($chartAccountCurrency !== $defaultCurrency) {
-            return $this->convertToDefaultCurrency($transaction->amount, $chartAccountCurrency, $defaultCurrency);
-        }
-
-        return $transaction->amount;
-    }
-
-    private function convertToDefaultCurrency(string $amount, string $fromCurrency, string $toCurrency): string
-    {
-        $amountInCents = CurrencyConverter::prepareForAccessor($amount, $fromCurrency);
-
-        $convertedAmountInCents = CurrencyConverter::convertBalance($amountInCents, $fromCurrency, $toCurrency);
-
-        return CurrencyConverter::prepareForMutator($convertedAmountInCents, $toCurrency);
-    }
-
-    private function hasRelevantChanges(Transaction $transaction): bool
-    {
-        return $transaction->wasChanged(['amount', 'account_id', 'bank_account_id', 'type']);
-    }
-
-    private function updateJournalEntriesForTransaction(JournalEntry $journalEntry, Account $account, string $convertedTransactionAmount): void
-    {
-        DB::transaction(static function () use ($journalEntry, $account, $convertedTransactionAmount) {
-            $journalEntry->update([
-                'account_id' => $account->id,
-                'amount' => $convertedTransactionAmount,
-            ]);
-        });
+        $this->transactionService->deleteJournalEntries($transaction);
     }
 }

app/Services/TransactionService.php

 
 use App\Enums\Accounting\AccountCategory;
 use App\Enums\Accounting\AccountType;
+use App\Enums\Accounting\JournalEntryType;
 use App\Enums\Accounting\TransactionType;
 use App\Models\Accounting\Account;
+use App\Models\Accounting\JournalEntry;
 use App\Models\Accounting\Transaction;
 use App\Models\Banking\BankAccount;
 use App\Models\Company;
+use App\Utilities\Currency\CurrencyAccessor;
+use App\Utilities\Currency\CurrencyConverter;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\DB;
 
 class TransactionService
 {
             ->where('name', $name)
             ->firstOrFail();
     }
+
+    public function createJournalEntries(Transaction $transaction): void
+    {
+        // Additional check to avoid duplication during replication
+        if ($transaction->journalEntries()->exists() || $transaction->type->isJournal() || str_starts_with($transaction->description, '(Copy of)')) {
+            return;
+        }
+
+        [$debitAccount, $creditAccount] = $this->determineAccounts($transaction);
+
+        if ($debitAccount === null || $creditAccount === null) {
+            return;
+        }
+
+        $this->createJournalEntriesForTransaction($transaction, $debitAccount, $creditAccount);
+    }
+
+    public function updateJournalEntries(Transaction $transaction): void
+    {
+        if ($transaction->type->isJournal() || $this->hasRelevantChanges($transaction) === false) {
+            return;
+        }
+
+        $journalEntries = $transaction->journalEntries;
+
+        $debitEntry = $journalEntries->where('type', JournalEntryType::Debit)->first();
+        $creditEntry = $journalEntries->where('type', JournalEntryType::Credit)->first();
+
+        if ($debitEntry === null || $creditEntry === null) {
+            return;
+        }
+
+        [$debitAccount, $creditAccount] = $this->determineAccounts($transaction);
+
+        if ($debitAccount === null || $creditAccount === null) {
+            return;
+        }
+
+        $convertedTransactionAmount = $this->getConvertedTransactionAmount($transaction);
+
+        DB::transaction(function () use ($debitEntry, $debitAccount, $convertedTransactionAmount, $creditEntry, $creditAccount) {
+            $this->updateJournalEntryForTransaction($debitEntry, $debitAccount, $convertedTransactionAmount);
+            $this->updateJournalEntryForTransaction($creditEntry, $creditAccount, $convertedTransactionAmount);
+        });
+    }
+
+    public function deleteJournalEntries(Transaction $transaction): void
+    {
+        DB::transaction(static function () use ($transaction) {
+            $transaction->journalEntries()->each(fn (JournalEntry $entry) => $entry->delete());
+        });
+    }
+
+    private function determineAccounts(Transaction $transaction): array
+    {
+        $chartAccount = $transaction->account;
+        $bankAccount = $transaction->bankAccount?->account;
+
+        if ($transaction->type->isTransfer()) {
+            // Essentially a withdrawal from the bank account and a deposit to the chart account (which is a bank account)
+            // Credit: bankAccount (source of funds, money is being withdrawn)
+            // Debit: chartAccount (destination of funds, money is being deposited)
+            return [$chartAccount, $bankAccount];
+        }
+
+        $debitAccount = $transaction->type->isWithdrawal() ? $chartAccount : $bankAccount;
+        $creditAccount = $transaction->type->isWithdrawal() ? $bankAccount : $chartAccount;
+
+        return [$debitAccount, $creditAccount];
+    }
+
+    private function createJournalEntriesForTransaction(Transaction $transaction, Account $debitAccount, Account $creditAccount): void
+    {
+        $convertedTransactionAmount = $this->getConvertedTransactionAmount($transaction);
+
+        DB::transaction(function () use ($debitAccount, $transaction, $convertedTransactionAmount, $creditAccount) {
+            $debitAccount->journalEntries()->create([
+                'company_id' => $transaction->company_id,
+                'transaction_id' => $transaction->id,
+                'type' => JournalEntryType::Debit,
+                'amount' => $convertedTransactionAmount,
+                'description' => $transaction->description,
+            ]);
+
+            $creditAccount->journalEntries()->create([
+                'company_id' => $transaction->company_id,
+                'transaction_id' => $transaction->id,
+                'type' => JournalEntryType::Credit,
+                'amount' => $convertedTransactionAmount,
+                'description' => $transaction->description,
+            ]);
+        });
+    }
+
+    private function getConvertedTransactionAmount(Transaction $transaction): string
+    {
+        $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
+        $bankAccountCurrency = $transaction->bankAccount->account->currency_code;
+        $chartAccountCurrency = $transaction->account->currency_code;
+
+        if ($bankAccountCurrency !== $defaultCurrency) {
+            return $this->convertToDefaultCurrency($transaction->amount, $bankAccountCurrency, $defaultCurrency);
+        } elseif ($chartAccountCurrency !== $defaultCurrency) {
+            return $this->convertToDefaultCurrency($transaction->amount, $chartAccountCurrency, $defaultCurrency);
+        }
+
+        return $transaction->amount;
+    }
+
+    private function convertToDefaultCurrency(string $amount, string $fromCurrency, string $toCurrency): string
+    {
+        $amountInCents = CurrencyConverter::prepareForAccessor($amount, $fromCurrency);
+
+        $convertedAmountInCents = CurrencyConverter::convertBalance($amountInCents, $fromCurrency, $toCurrency);
+
+        return CurrencyConverter::prepareForMutator($convertedAmountInCents, $toCurrency);
+    }
+
+    private function hasRelevantChanges(Transaction $transaction): bool
+    {
+        return $transaction->wasChanged(['amount', 'account_id', 'bank_account_id', 'type']);
+    }
+
+    private function updateJournalEntryForTransaction(JournalEntry $journalEntry, Account $account, string $convertedTransactionAmount): void
+    {
+        DB::transaction(static function () use ($journalEntry, $account, $convertedTransactionAmount) {
+            $journalEntry->update([
+                'account_id' => $account->id,
+                'amount' => $convertedTransactionAmount,
+            ]);
+        });
+    }
 }

app/Testing/TestsReport.php

+<?php
+
+namespace App\Testing;
+
+use App\Contracts\ExportableReport;
+use Closure;
+use Livewire\Features\SupportTesting\Testable;
+
+/**
+ * @mixin Testable
+ */
+class TestsReport
+{
+    /**
+     * Asserts the report table data.
+     */
+    public function assertReportTableData(): Closure
+    {
+        return function (): static {
+            /** @var ExportableReport $report */
+            $report = $this->get('report');
+
+            // Assert headers
+            $this->assertSeeTextInOrder($report->getHeaders());
+
+            // Assert categories, headers, data, and summaries
+            $categories = $report->getCategories();
+            foreach ($categories as $category) {
+                $header = $category->header;
+                $data = $category->data;
+                $summary = $category->summary;
+
+                // Assert header
+                $this->assertSeeTextInOrder($header);
+
+                // Assert data rows
+                foreach ($data as $row) {
+                    $flatRow = [];
+
+                    foreach ($row as $value) {
+                        if (is_array($value)) {
+                            $flatRow[] = $value['name'];
+                        } else {
+                            $flatRow[] = $value;
+                        }
+                    }
+
+                    $this->assertSeeTextInOrder($flatRow);
+                }
+
+                // Assert summary
+                $this->assertSeeTextInOrder($summary);
+            }
+
+            // Assert overall totals
+            $this->assertSeeTextInOrder($report->getOverallTotals());
+
+            return $this;
+        };
+    }
+}

composer.lock

         },
         {
             "name": "anourvalar/eloquent-serialize",
-            "version": "1.2.24",
+            "version": "1.2.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/AnourValar/eloquent-serialize.git",
-                "reference": "77e3fc7da44fa96b6148a1613dd76fe954a5f279"
+                "reference": "6d7a868ae4218b9d7796334ff9a17e1539bad48a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/AnourValar/eloquent-serialize/zipball/77e3fc7da44fa96b6148a1613dd76fe954a5f279",
-                "reference": "77e3fc7da44fa96b6148a1613dd76fe954a5f279",
+                "url": "https://api.github.com/repos/AnourValar/eloquent-serialize/zipball/6d7a868ae4218b9d7796334ff9a17e1539bad48a",
+                "reference": "6d7a868ae4218b9d7796334ff9a17e1539bad48a",
                 "shasum": ""
             },
             "require": {
             ],
             "support": {
                 "issues": "https://github.com/AnourValar/eloquent-serialize/issues",
-                "source": "https://github.com/AnourValar/eloquent-serialize/tree/1.2.24"
+                "source": "https://github.com/AnourValar/eloquent-serialize/tree/1.2.25"
             },
-            "time": "2024-09-08T15:57:08+00:00"
+            "time": "2024-09-16T12:59:37+00:00"
         },
         {
             "name": "awcodes/filament-table-repeater",
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.321.11",
+            "version": "3.321.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "bbd357d246350ffcd0dd8df30951d2d46c5ddadb"
+                "reference": "6330c3367f303ef4430fca605df9e411abe34d48"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/bbd357d246350ffcd0dd8df30951d2d46c5ddadb",
-                "reference": "bbd357d246350ffcd0dd8df30951d2d46c5ddadb",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6330c3367f303ef4430fca605df9e411abe34d48",
+                "reference": "6330c3367f303ef4430fca605df9e411abe34d48",
                 "shasum": ""
             },
             "require": {
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.321.11"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.321.13"
             },
-            "time": "2024-09-13T18:05:10+00:00"
+            "time": "2024-09-17T18:08:34+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
         },
         {
             "name": "filament/actions",
-            "version": "v3.2.112",
+            "version": "v3.2.113",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/actions.git",
-                "reference": "df3310607b49dad302b03516c558c93cb82c5164"
+                "reference": "4cf93bf9ff04a76a9256ce6df88216583aeccb15"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/actions/zipball/df3310607b49dad302b03516c558c93cb82c5164",
-                "reference": "df3310607b49dad302b03516c558c93cb82c5164",
+                "url": "https://api.github.com/repos/filamentphp/actions/zipball/4cf93bf9ff04a76a9256ce6df88216583aeccb15",
+                "reference": "4cf93bf9ff04a76a9256ce6df88216583aeccb15",
                 "shasum": ""
             },
             "require": {
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-09-11T08:25:31+00:00"
+            "time": "2024-09-17T08:30:20+00:00"
         },
         {
             "name": "filament/filament",
-            "version": "v3.2.112",
+            "version": "v3.2.113",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/panels.git",
-                "reference": "86aa182deceedce5970560c60ceae30c2c40632d"
+                "reference": "cea015f11b3d1b41bbf826e6f724e444e5fda3cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/86aa182deceedce5970560c60ceae30c2c40632d",
-                "reference": "86aa182deceedce5970560c60ceae30c2c40632d",
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/cea015f11b3d1b41bbf826e6f724e444e5fda3cb",
+                "reference": "cea015f11b3d1b41bbf826e6f724e444e5fda3cb",
                 "shasum": ""
             },
             "require": {
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-09-11T08:25:51+00:00"
+            "time": "2024-09-17T08:30:28+00:00"
         },
         {
             "name": "filament/forms",
-            "version": "v3.2.112",
+            "version": "v3.2.113",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
-                "reference": "99d72777f1e6dc5d42d936e7deb53148e4233ec3"
+                "reference": "46a42dbc18f9273a3a59c54e94222fa62855c702"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/99d72777f1e6dc5d42d936e7deb53148e4233ec3",
-                "reference": "99d72777f1e6dc5d42d936e7deb53148e4233ec3",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/46a42dbc18f9273a3a59c54e94222fa62855c702",
+                "reference": "46a42dbc18f9273a3a59c54e94222fa62855c702",
                 "shasum": ""
             },
             "require": {
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-09-12T12:27:13+00:00"
+            "time": "2024-09-17T08:30:15+00:00"
         },
         {
             "name": "filament/infolists",
-            "version": "v3.2.112",
+            "version": "v3.2.113",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/infolists.git",
-                "reference": "e50bd9a5fc623320bd79508e3bfb72ff9e309edf"
+                "reference": "dd6e2319aea92c5444c52792c750edfeb057f62a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/e50bd9a5fc623320bd79508e3bfb72ff9e309edf",
-                "reference": "e50bd9a5fc623320bd79508e3bfb72ff9e309edf",
+                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/dd6e2319aea92c5444c52792c750edfeb057f62a",
+                "reference": "dd6e2319aea92c5444c52792c750edfeb057f62a",
                 "shasum": ""
             },
             "require": {
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-09-11T08:25:25+00:00"
+            "time": "2024-09-17T08:30:15+00:00"
         },
         {
             "name": "filament/notifications",
-            "version": "v3.2.112",
+            "version": "v3.2.113",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
         },
         {
             "name": "filament/support",
-            "version": "v3.2.112",
+            "version": "v3.2.113",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
-                "reference": "d07086506d39f318398c13a0b8d689f75cbc14d6"
+                "reference": "d2825e1c116e50d440bb3e7ac56ebcb8d1ddf184"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/support/zipball/d07086506d39f318398c13a0b8d689f75cbc14d6",
-                "reference": "d07086506d39f318398c13a0b8d689f75cbc14d6",
+                "url": "https://api.github.com/repos/filamentphp/support/zipball/d2825e1c116e50d440bb3e7ac56ebcb8d1ddf184",
+                "reference": "d2825e1c116e50d440bb3e7ac56ebcb8d1ddf184",
                 "shasum": ""
             },
             "require": {
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-09-11T08:25:46+00:00"
+            "time": "2024-09-17T08:30:37+00:00"
         },
         {
             "name": "filament/tables",
-            "version": "v3.2.112",
+            "version": "v3.2.113",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
-                "reference": "4285a031dd36250a86710631a5b1fea1372097a1"
+                "reference": "75acf6f38a8ccfded57dc62bc3af0dd0bb04069d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/4285a031dd36250a86710631a5b1fea1372097a1",
-                "reference": "4285a031dd36250a86710631a5b1fea1372097a1",
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/75acf6f38a8ccfded57dc62bc3af0dd0bb04069d",
+                "reference": "75acf6f38a8ccfded57dc62bc3af0dd0bb04069d",
                 "shasum": ""
             },
             "require": {
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-09-11T08:25:43+00:00"
+            "time": "2024-09-17T08:30:46+00:00"
         },
         {
             "name": "filament/widgets",
-            "version": "v3.2.112",
+            "version": "v3.2.113",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/widgets.git",
-                "reference": "909fc82bae2cf41d70b3cd7dda8982245b2ea723"
+                "reference": "d168a97f0861b7964437652e64fa5af83212d1f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/widgets/zipball/909fc82bae2cf41d70b3cd7dda8982245b2ea723",
-                "reference": "909fc82bae2cf41d70b3cd7dda8982245b2ea723",
+                "url": "https://api.github.com/repos/filamentphp/widgets/zipball/d168a97f0861b7964437652e64fa5af83212d1f4",
+                "reference": "d168a97f0861b7964437652e64fa5af83212d1f4",
                 "shasum": ""
             },
             "require": {
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-07-31T11:53:30+00:00"
+            "time": "2024-09-17T08:30:51+00:00"
         },
         {
             "name": "firebase/php-jwt",
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.41",
+            "version": "3.0.42",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb"
+                "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/621c73f7dcb310b61de34d1da4c4204e8ace6ceb",
-                "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/db92f1b1987b12b13f248fe76c3a52cadb67bb98",
+                "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98",
                 "shasum": ""
             },
             "require": {
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.41"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.42"
             },
             "funding": [
                 {
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-12T00:13:54+00:00"
+            "time": "2024-09-16T03:06:04+00:00"
         },
         {
             "name": "psr/cache",
         },
         {
             "name": "sebastian/type",
-            "version": "5.0.1",
+            "version": "5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "fb6a6566f9589e86661291d13eba708cce5eb4aa"
+                "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb6a6566f9589e86661291d13eba708cce5eb4aa",
-                "reference": "fb6a6566f9589e86661291d13eba708cce5eb4aa",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/461b9c5da241511a2a0e8f240814fb23ce5c0aac",
+                "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.0"
+                "phpunit/phpunit": "^11.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "5.0-dev"
+                    "dev-main": "5.1-dev"
                 }
             },
             "autoload": {
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
                 "security": "https://github.com/sebastianbergmann/type/security/policy",
-                "source": "https://github.com/sebastianbergmann/type/tree/5.0.1"
+                "source": "https://github.com/sebastianbergmann/type/tree/5.1.0"
             },
             "funding": [
                 {
                     "type": "github"
                 }
             ],
-            "time": "2024-07-03T05:11:49+00:00"
+            "time": "2024-09-17T13:12:04+00:00"
         },
         {
             "name": "sebastian/version",

database/factories/Accounting/TransactionFactory.php

 
 namespace Database\Factories\Accounting;
 
-use App\Enums\Accounting\JournalEntryType;
+use App\Enums\Accounting\AccountType;
 use App\Enums\Accounting\TransactionType;
 use App\Models\Accounting\Account;
 use App\Models\Accounting\Transaction;
 use App\Models\Banking\BankAccount;
 use App\Models\Company;
+use App\Models\Setting\CompanyDefault;
+use App\Services\TransactionService;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Facades\DB;
 
 /**
  * @extends Factory<Transaction>
     public function configure(): static
     {
         return $this->afterCreating(function (Transaction $transaction) {
-            $chartAccount = $transaction->account;
-            $bankAccount = $transaction->bankAccount->account;
-
-            $debitAccount = $transaction->type->isWithdrawal() ? $chartAccount : $bankAccount;
-            $creditAccount = $transaction->type->isWithdrawal() ? $bankAccount : $chartAccount;
-
-            if ($debitAccount === null || $creditAccount === null) {
-                return;
+            if (DB::getDefaultConnection() === 'sqlite') {
+                app(TransactionService::class)->createJournalEntries($transaction);
             }
-
-            $debitAccount->journalEntries()->create([
-                'company_id' => $transaction->company_id,
-                'transaction_id' => $transaction->id,
-                'type' => JournalEntryType::Debit,
-                'amount' => $transaction->amount,
-                'description' => $transaction->description,
-                'created_by' => $transaction->created_by,
-                'updated_by' => $transaction->updated_by,
-            ]);
-
-            $creditAccount->journalEntries()->create([
-                'company_id' => $transaction->company_id,
-                'transaction_id' => $transaction->id,
-                'type' => JournalEntryType::Credit,
-                'amount' => $transaction->amount,
-                'description' => $transaction->description,
-                'created_by' => $transaction->created_by,
-                'updated_by' => $transaction->updated_by,
-            ]);
         });
     }
 
             ];
         });
     }
+
+    public function forDefaultBankAccount(): static
+    {
+        return $this->state(function (array $attributes) {
+            $defaultBankAccount = CompanyDefault::first()->bankAccount;
+
+            return [
+                'bank_account_id' => $defaultBankAccount->id,
+            ];
+        });
+    }
+
+    public function forUncategorizedRevenue(): static
+    {
+        return $this->state(function (array $attributes) {
+            $account = Account::where('type', AccountType::UncategorizedRevenue)->firstOrFail();
+
+            return [
+                'account_id' => $account->id,
+            ];
+        });
+    }
+
+    public function forUncategorizedExpense(): static
+    {
+        return $this->state(function (array $attributes) {
+            $account = Account::where('type', AccountType::UncategorizedExpense)->firstOrFail();
+
+            return [
+                'account_id' => $account->id,
+            ];
+        });
+    }
+
+    public function asDeposit(int $amount): static
+    {
+        return $this->state(function () use ($amount) {
+            return [
+                'type' => TransactionType::Deposit,
+                'amount' => $amount,
+            ];
+        });
+    }
+
+    public function asWithdrawal(int $amount): static
+    {
+        return $this->state(function () use ($amount) {
+            return [
+                'type' => TransactionType::Withdrawal,
+                'amount' => $amount,
+            ];
+        });
+    }
 }

package-lock.json

             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.23",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.23.tgz",
-            "integrity": "sha512-mBhODedOXg4v5QWwl21DjM5amzjmI1zw9EPrPK/5Wx7C8jt33bpZNrC7OhHUG3pxRtbLpr3W2dXT+Ph1SsfRZA==",
+            "version": "1.5.25",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.25.tgz",
+            "integrity": "sha512-kMb204zvK3PsSlgvvwzI3wBIcAw15tRkYk+NQdsjdDtcQWTp2RABbMQ9rUBy8KNEOM+/E6ep+XC3AykiWZld4g==",
             "dev": true,
             "license": "ISC"
         },
             }
         },
         "node_modules/tailwindcss": {
-            "version": "3.4.11",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.11.tgz",
-            "integrity": "sha512-qhEuBcLemjSJk5ajccN9xJFtM/h0AVCPaA6C92jNP+M2J8kX+eMJHI7R2HFKUvvAsMpcfLILMCFYSeDwpMmlUg==",
+            "version": "3.4.12",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.12.tgz",
+            "integrity": "sha512-Htf/gHj2+soPb9UayUNci/Ja3d8pTmu9ONTfh4QY8r3MATTZOzmv6UYWF7ZwikEIC8okpfqmGqrmDehua8mF8w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
             "license": "MIT"
         },
         "node_modules/vite": {
-            "version": "5.4.5",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.5.tgz",
-            "integrity": "sha512-pXqR0qtb2bTwLkev4SE3r4abCNioP3GkjvIDLlzziPpXtHgiJIjuKl+1GN6ESOT3wMjG3JTeARopj2SwYaHTOA==",
+            "version": "5.4.6",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.6.tgz",
+            "integrity": "sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {

resources/css/filament/company/theme.css

 
 @config './tailwind.config.js';
 
-.fi-fo-field-wrp.report-hidden-label div.flex.items-center {
+.fi-fo-field-wrp.report-hidden-label > div.grid.gap-y-2 > div.flex.items-center {
     @apply hidden;
 }
 

tests/Feature/Reports/TrialBalanceReportTest.php

 <?php
 
-use App\Contracts\ExportableReport;
-use App\Enums\Accounting\AccountCategory;
+use App\Factories\ReportDateFactory;
 use App\Filament\Company\Pages\Reports\TrialBalance;
 use App\Models\Accounting\Transaction;
-use App\Services\AccountService;
-use App\Services\ReportService;
-use Filament\Facades\Filament;
-use Illuminate\Support\Carbon;
+use App\Utilities\Currency\CurrencyAccessor;
 
 use function Pest\Livewire\livewire;
 
 it('correctly builds a standard trial balance report', function () {
-    $testUser = $this->testUser;
     $testCompany = $this->testCompany;
-    $defaultBankAccount = $testCompany->default->bankAccount;
 
-    $fiscalYearStartDate = $testCompany->locale->fiscalYearStartDate();
-    $fiscalYearEndDate = $testCompany->locale->fiscalYearEndDate();
-    $defaultEndDate = Carbon::parse($fiscalYearEndDate);
-    $defaultAsOfDate = $defaultEndDate->isFuture() ? now()->endOfDay() : $defaultEndDate->endOfDay();
+    $reportDatesDTO = ReportDateFactory::create($testCompany);
+    $defaultDateRange = $reportDatesDTO->defaultDateRange;
+    $defaultEndDate = $reportDatesDTO->defaultEndDate;
 
-    $defaultDateRange = 'FY-' . now()->year;
     $defaultReportType = 'standard';
 
     // Create transactions for the company
     Transaction::factory()
-        ->forCompanyAndBankAccount($testCompany, $defaultBankAccount)
+        ->forDefaultBankAccount()
+        ->forUncategorizedRevenue()
+        ->asDeposit(1000)
         ->count(10)
         ->create();
 
-    // Instantiate services
-    $accountService = app(AccountService::class);
-    $reportService = app(ReportService::class);
+    $expectedBankAccountDebit = 10000;
+    $expectedBankAccountCredit = 0;
 
-    // Calculate balances
-    $asOfStartDate = $accountService->getEarliestTransactionDate();
-    $netMovement = $accountService->getNetMovement($defaultBankAccount->account, $asOfStartDate, $defaultAsOfDate);
-    $netMovementAmount = $netMovement->getAmount();
-
-    // Verify trial balance calculations
-    $trialBalance = $reportService->calculateTrialBalance($defaultBankAccount->account->category, $netMovementAmount);
-    expect($trialBalance)->toMatchArray([
-        'debit_balance' => max($netMovementAmount, 0),
-        'credit_balance' => $netMovementAmount < 0 ? abs($netMovementAmount) : 0,
-    ]);
-
-    $formattedBalances = $reportService->formatBalances($trialBalance);
-
-    $accountCategoryPluralLabels = array_map(fn ($category) => $category->getPluralLabel(), AccountCategory::getOrderedCategories());
-
-    Filament::setTenant($testCompany);
-
-    $component = livewire(TrialBalance::class)
+    livewire(TrialBalance::class)
         ->assertFormSet([
             'deferredFilters.reportType' => $defaultReportType,
             'deferredFilters.dateRange' => $defaultDateRange,
-            'deferredFilters.asOfDate' => $defaultAsOfDate->toDateTimeString(),
+            'deferredFilters.asOfDate' => $defaultEndDate->toDateTimeString(),
         ])
         ->assertSet('filters', [
             'reportType' => $defaultReportType,
             'dateRange' => $defaultDateRange,
-            'asOfDate' => $defaultAsOfDate->toDateString(),
+            'asOfDate' => $defaultEndDate->toDateString(),
         ])
         ->call('applyFilters')
-        ->assertSeeTextInOrder($accountCategoryPluralLabels)
         ->assertDontSeeText('Retained Earnings')
         ->assertSeeTextInOrder([
-            $formattedBalances->debitBalance,
-            $formattedBalances->creditBalance,
-        ]);
-
-    /** @var ExportableReport $report */
-    $report = $component->report;
-
-    $columnLabels = array_map(static fn ($column) => $column->getLabel(), $report->getColumns());
-
-    $component->assertSeeTextInOrder($columnLabels);
-
-    $categories = $report->getCategories();
-
-    foreach ($categories as $category) {
-        $header = $category->header;
-        $data = $category->data;
-        $summary = $category->summary;
-
-        $component->assertSeeTextInOrder($header);
-
-        foreach ($data as $row) {
-            $flatRow = [];
-
-            foreach ($row as $value) {
-                if (is_array($value)) {
-                    $flatRow[] = $value['name'];
-                } else {
-                    $flatRow[] = $value;
-                }
-            }
-
-            $component->assertSeeTextInOrder($flatRow);
-        }
-
-        $component->assertSeeTextInOrder($summary);
-    }
-
-    $overallTotals = $report->getOverallTotals();
-    $component->assertSeeTextInOrder($overallTotals);
+            'Cash on Hand',
+            money($expectedBankAccountDebit, CurrencyAccessor::getDefaultCurrency(), true),
+            money($expectedBankAccountCredit, CurrencyAccessor::getDefaultCurrency(), true),
+        ])
+        ->assertReportTableData();
 });
 
 it('correctly builds a post-closing trial balance report', function () {
-    $testUser = $this->testUser;
     $testCompany = $this->testCompany;
-    $defaultBankAccount = $testCompany->default->bankAccount;
 
-    $fiscalYearStartDate = $testCompany->locale->fiscalYearStartDate();
-    $fiscalYearEndDate = $testCompany->locale->fiscalYearEndDate();
-    $defaultEndDate = Carbon::parse($fiscalYearEndDate);
-    $defaultAsOfDate = $defaultEndDate->isFuture() ? now()->endOfDay() : $defaultEndDate->endOfDay();
+    $reportDatesDTO = ReportDateFactory::create($testCompany);
+    $defaultDateRange = $reportDatesDTO->defaultDateRange;
+    $defaultEndDate = $reportDatesDTO->defaultEndDate;
 
-    $defaultDateRange = 'FY-' . now()->year;
     $defaultReportType = 'postClosing';
 
     // Create transactions for the company
-    Transaction::factory()
-        ->forCompanyAndBankAccount($testCompany, $defaultBankAccount)
-        ->count(10)
+    $transaction1 = Transaction::factory()
+        ->forDefaultBankAccount()
+        ->forUncategorizedRevenue()
+        ->asDeposit(1000)
         ->create();
 
-    // Instantiate services
-    $accountService = app(AccountService::class);
-    $reportService = app(ReportService::class);
-
-    // Calculate balances
-    $asOfStartDate = $accountService->getEarliestTransactionDate();
-    $netMovement = $accountService->getNetMovement($defaultBankAccount->account, $asOfStartDate, $defaultAsOfDate);
-    $netMovementAmount = $netMovement->getAmount();
-
-    // Verify trial balance calculations
-    $trialBalance = $reportService->calculateTrialBalance($defaultBankAccount->account->category, $netMovementAmount);
-    expect($trialBalance)->toMatchArray([
-        'debit_balance' => max($netMovementAmount, 0),
-        'credit_balance' => $netMovementAmount < 0 ? abs($netMovementAmount) : 0,
-    ]);
-
-    $formattedBalances = $reportService->formatBalances($trialBalance);
-
-    $accountCategoryPluralLabels = array_map(fn ($category) => $category->getPluralLabel(), AccountCategory::getOrderedCategories());
-
-    $retainedEarningsAmount = $reportService->calculateRetainedEarnings($asOfStartDate, $defaultAsOfDate)->getAmount();
-
-    $isCredit = $retainedEarningsAmount >= 0;
-
-    $retainedEarningsDebitAmount = $isCredit ? 0 : abs($retainedEarningsAmount);
-    $retainedEarningsCreditAmount = $isCredit ? $retainedEarningsAmount : 0;
-
-    $formattedRetainedEarnings = $reportService->formatBalances([
-        'debit_balance' => $retainedEarningsDebitAmount,
-        'credit_balance' => $retainedEarningsCreditAmount,
-    ]);
+    $transaction2 = Transaction::factory()
+        ->forDefaultBankAccount()
+        ->forUncategorizedExpense()
+        ->asWithdrawal(500)
+        ->create();
 
-    $retainedEarningsRow = [
-        'RE',
-        'Retained Earnings',
-        $formattedRetainedEarnings->debitBalance,
-        $formattedRetainedEarnings->creditBalance,
-    ];
+    $expectedRetainedEarningsDebit = 0;
+    $expectedRetainedEarningsCredit = 500;
 
-    Filament::setTenant($testCompany);
+    $defaultCurrencyCode = CurrencyAccessor::getDefaultCurrency();
 
-    $component = livewire(TrialBalance::class)
+    livewire(TrialBalance::class)
         ->set('deferredFilters.reportType', $defaultReportType)
         ->call('applyFilters')
         ->assertFormSet([
             'deferredFilters.reportType' => $defaultReportType,
             'deferredFilters.dateRange' => $defaultDateRange,
-            'deferredFilters.asOfDate' => $defaultAsOfDate->toDateTimeString(),
+            'deferredFilters.asOfDate' => $defaultEndDate->toDateTimeString(),
         ])
         ->assertSet('filters', [
             'reportType' => $defaultReportType,
             'dateRange' => $defaultDateRange,
-            'asOfDate' => $defaultAsOfDate->toDateString(),
+            'asOfDate' => $defaultEndDate->toDateString(),
         ])
         ->call('applyFilters')
-        ->assertSeeTextInOrder($retainedEarningsRow)
+        ->assertSeeTextInOrder([
+            'RE',
+            'Retained Earnings',
+            money($expectedRetainedEarningsDebit, $defaultCurrencyCode, true),
+            money($expectedRetainedEarningsCredit, $defaultCurrencyCode, true),
+        ])
         ->assertSeeTextInOrder([
             'Total Revenue',
-            '$0.00',
-            '$0.00',
+            money(0, $defaultCurrencyCode, true),
+            money(0, $defaultCurrencyCode, true),
         ])
         ->assertSeeTextInOrder([
             'Total Expenses',
-            '$0.00',
-            '$0.00',
+            money(0, $defaultCurrencyCode, true),
+            money(0, $defaultCurrencyCode, true),
         ])
-        ->assertSeeTextInOrder($accountCategoryPluralLabels)
-        ->assertSeeTextInOrder([
-            $formattedBalances->debitBalance,
-            $formattedBalances->creditBalance,
-        ]);
-
-    /** @var ExportableReport $report */
-    $report = $component->report;
-
-    $columnLabels = array_map(static fn ($column) => $column->getLabel(), $report->getColumns());
-
-    $component->assertSeeTextInOrder($columnLabels);
-
-    $categories = $report->getCategories();
-
-    foreach ($categories as $category) {
-        $header = $category->header;
-        $data = $category->data;
-        $summary = $category->summary;
-
-        $component->assertSeeTextInOrder($header);
-
-        foreach ($data as $row) {
-            $flatRow = [];
-
-            foreach ($row as $value) {
-                if (is_array($value)) {
-                    $flatRow[] = $value['name'];
-                } else {
-                    $flatRow[] = $value;
-                }
-            }
-
-            $component->assertSeeTextInOrder($flatRow);
-        }
-
-        $component->assertSeeTextInOrder($summary);
-    }
-
-    $overallTotals = $report->getOverallTotals();
-    $component->assertSeeTextInOrder($overallTotals);
+        ->assertReportTableData();
 });

tests/Helpers/helpers.php

 <?php
 
+use App\DTO\AccountBalanceDTO;
 use App\Enums\Setting\EntityType;
 use App\Filament\Company\Pages\CreateCompany;
 use App\Models\Company;
+use App\Services\ReportService;
 
 use function Pest\Livewire\livewire;
 
 
     return auth()->user()->currentCompany;
 }
+
+function calculateRetainedEarningsBalances(ReportService $reportService, $startDate, $endDate): AccountBalanceDTO
+{
+    $retainedEarningsAmount = $reportService->calculateRetainedEarnings($startDate, $endDate)->getAmount();
+
+    $isCredit = $retainedEarningsAmount >= 0;
+    $retainedEarningsDebitAmount = $isCredit ? 0 : abs($retainedEarningsAmount);
+    $retainedEarningsCreditAmount = $isCredit ? $retainedEarningsAmount : 0;
+
+    return $reportService->formatBalances([
+        'debit_balance' => $retainedEarningsDebitAmount,
+        'credit_balance' => $retainedEarningsCreditAmount,
+    ]);
+}

tests/TestCase.php

 
 use App\Models\Company;
 use App\Models\User;
+use App\Testing\TestsReport;
 use Database\Seeders\TestDatabaseSeeder;
+use Filament\Facades\Filament;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
+use Livewire\Features\SupportTesting\Testable;
 
 abstract class TestCase extends BaseTestCase
 {
     {
         parent::setUp();
 
+        Testable::mixin(new TestsReport);
+
         $this->testUser = User::first();
 
         $this->testCompany = $this->testUser->ownedCompanies->first();
 
         $this->testUser->switchCompany($this->testCompany);
 
-        $this->actingAs($this->testUser)
-            ->withSession(['current_company_id' => $this->testCompany->id]);
+        $this->actingAs($this->testUser);
+
+        Filament::setTenant($this->testCompany);
     }
 }