wip

app/DTO/ReportDatesDTO.php

@@ -1,16 +0,0 @@
-<?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

@@ -2,27 +2,62 @@
 
 namespace App\Factories;
 
-use App\DTO\ReportDatesDTO;
 use App\Models\Company;
 use Illuminate\Support\Carbon;
 
 class ReportDateFactory
 {
-    public static function create(Company $company): ReportDatesDTO
+    public Carbon $fiscalYearStartDate;
+
+    public Carbon $fiscalYearEndDate;
+
+    public string $defaultDateRange;
+
+    public Carbon $defaultStartDate;
+
+    public Carbon $defaultEndDate;
+
+    public Carbon $earliestTransactionDate;
+
+    protected Company $company;
+
+    public function __construct(Company $company)
+    {
+        $this->company = $company;
+        $this->buildReportDates();
+    }
+
+    protected function buildReportDates(): void
     {
-        $fiscalYearStartDate = Carbon::parse($company->locale->fiscalYearStartDate())->startOfDay();
-        $fiscalYearEndDate = Carbon::parse($company->locale->fiscalYearEndDate())->endOfDay();
+        $fiscalYearStartDate = Carbon::parse($this->company->locale->fiscalYearStartDate())->startOfDay();
+        $fiscalYearEndDate = Carbon::parse($this->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
-        );
+        // Calculate the earliest transaction date based on the company's transactions
+        $earliestTransactionDate = $this->company->transactions()->min('posted_at')
+            ? Carbon::parse($this->company->transactions()->min('posted_at'))->startOfDay()
+            : $defaultStartDate;
+
+        // Assign values to properties
+        $this->fiscalYearStartDate = $fiscalYearStartDate;
+        $this->fiscalYearEndDate = $fiscalYearEndDate;
+        $this->defaultDateRange = $defaultDateRange;
+        $this->defaultStartDate = $defaultStartDate;
+        $this->defaultEndDate = $defaultEndDate;
+        $this->earliestTransactionDate = $earliestTransactionDate;
+    }
+
+    public function refresh(): self
+    {
+        $this->buildReportDates();
+
+        return $this;
+    }
+
+    public static function create(Company $company): self
+    {
+        return new static($company);
     }
 }

app/Repositories/Accounting/JournalEntryRepository.php

@@ -4,6 +4,7 @@ namespace App\Repositories\Accounting;
 
 use App\Models\Accounting\Account;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
 
 class JournalEntryRepository
 {
@@ -11,13 +12,16 @@ class JournalEntryRepository
     {
         $query = $account->journalEntries()->where('type', $type);
 
+        $startDateCarbon = Carbon::parse($startDate)->startOfDay();
+        $endDateCarbon = Carbon::parse($endDate)->endOfDay();
+
         if ($startDate && $endDate) {
-            $query->whereHas('transaction', static function (Builder $query) use ($startDate, $endDate) {
-                $query->whereBetween('posted_at', [$startDate, $endDate]);
+            $query->whereHas('transaction', static function (Builder $query) use ($startDateCarbon, $endDateCarbon) {
+                $query->whereBetween('posted_at', [$startDateCarbon, $endDateCarbon]);
             });
         } elseif ($startDate) {
-            $query->whereHas('transaction', static function (Builder $query) use ($startDate) {
-                $query->where('posted_at', '<=', $startDate);
+            $query->whereHas('transaction', static function (Builder $query) use ($startDateCarbon) {
+                $query->where('posted_at', '<=', $startDateCarbon);
             });
         }
 

app/Services/AccountService.php

@@ -240,9 +240,8 @@ class AccountService implements AccountHandler
 
     public function getEarliestTransactionDate(): string
     {
-        $earliestDate = Transaction::oldest('posted_at')
-            ->value('posted_at');
+        $earliestDate = Transaction::min('posted_at');
 
-        return $earliestDate ?? now()->toDateString();
+        return $earliestDate ?? now()->toDateTimeString();
     }
 }

app/Services/ReportService.php

@@ -96,7 +96,7 @@ class ReportService
         return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
     }
 
-    private function calculateAccountBalances(Account $account, AccountCategory $category): array
+    public function calculateAccountBalances(Account $account, AccountCategory $category): array
     {
         $balances = [
             'debit_balance' => $account->total_debit ?? 0,

composer.lock

@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "akaunting/laravel-money",
-            "version": "5.2.1",
+            "version": "5.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/akaunting/laravel-money.git",
-                "reference": "6cc8abb912286c671de5993ffbcd3225588aeace"
+                "reference": "d99a9e8e576cac40668d0a5afaf7ea153590aff9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/akaunting/laravel-money/zipball/6cc8abb912286c671de5993ffbcd3225588aeace",
-                "reference": "6cc8abb912286c671de5993ffbcd3225588aeace",
+                "url": "https://api.github.com/repos/akaunting/laravel-money/zipball/d99a9e8e576cac40668d0a5afaf7ea153590aff9",
+                "reference": "d99a9e8e576cac40668d0a5afaf7ea153590aff9",
                 "shasum": ""
             },
             "require": {
@@ -71,9 +71,9 @@
             ],
             "support": {
                 "issues": "https://github.com/akaunting/laravel-money/issues",
-                "source": "https://github.com/akaunting/laravel-money/tree/5.2.1"
+                "source": "https://github.com/akaunting/laravel-money/tree/5.2.2"
             },
-            "time": "2024-07-23T15:01:26+00:00"
+            "time": "2024-09-25T10:06:11+00:00"
         },
         {
             "name": "andrewdwallo/filament-companies",
@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.322.4",
+            "version": "3.322.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "f6d2c64cb87d9e70ad99aeaffcd879a412d2ccb5"
+                "reference": "968fe51da0854eac0e0aeac6ec8b86856c6bd83e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f6d2c64cb87d9e70ad99aeaffcd879a412d2ccb5",
-                "reference": "f6d2c64cb87d9e70ad99aeaffcd879a412d2ccb5",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/968fe51da0854eac0e0aeac6ec8b86856c6bd83e",
+                "reference": "968fe51da0854eac0e0aeac6ec8b86856c6bd83e",
                 "shasum": ""
             },
             "require": {
@@ -589,9 +589,9 @@
             "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.322.4"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.322.5"
             },
-            "time": "2024-09-24T18:10:10+00:00"
+            "time": "2024-09-25T18:14:27+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -2981,16 +2981,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.24.0",
+            "version": "v11.24.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "557da2b02e298acbd12b3fb7d04d16ea253c5f20"
+                "reference": "e063fa80ac5818099f45a3a57dd803476c8f3a2a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/557da2b02e298acbd12b3fb7d04d16ea253c5f20",
-                "reference": "557da2b02e298acbd12b3fb7d04d16ea253c5f20",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/e063fa80ac5818099f45a3a57dd803476c8f3a2a",
+                "reference": "e063fa80ac5818099f45a3a57dd803476c8f3a2a",
                 "shasum": ""
             },
             "require": {
@@ -3186,7 +3186,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-09-24T14:46:11+00:00"
+            "time": "2024-09-25T07:21:24+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -9450,26 +9450,26 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.15.4",
+            "version": "2.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546"
+                "reference": "befcdc0e5dce67252aa6322d82424be928214fa2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/a139776fa3f5985a50b509f2a02ff0f709d2a546",
-                "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/befcdc0e5dce67252aa6322d82424be928214fa2",
+                "reference": "befcdc0e5dce67252aa6322d82424be928214fa2",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9 || ^7.0 || ^8.0",
+                "php": "^7.1 || ^8.0",
                 "psr/log": "^1.0.1 || ^2.0 || ^3.0"
             },
             "require-dev": {
-                "mockery/mockery": "^0.9 || ^1.0",
-                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3",
-                "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0"
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.3",
+                "symfony/var-dumper": "^4.0 || ^5.0"
             },
             "suggest": {
                 "symfony/var-dumper": "Pretty print complex values better with var-dumper available",
@@ -9509,7 +9509,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.15.4"
+                "source": "https://github.com/filp/whoops/tree/2.16.0"
             },
             "funding": [
                 {
@@ -9517,7 +9517,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-03T12:00:00+00:00"
+            "time": "2024-09-25T12:00:00+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -10000,16 +10000,16 @@
         },
         {
             "name": "pestphp/pest",
-            "version": "v3.2.2",
+            "version": "v3.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pestphp/pest.git",
-                "reference": "989e43d1a01e5a3b5333cffe5c8e633ac4d17da2"
+                "reference": "4e2987d438a3c3b2f291d2c991049544ab2f52bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pestphp/pest/zipball/989e43d1a01e5a3b5333cffe5c8e633ac4d17da2",
-                "reference": "989e43d1a01e5a3b5333cffe5c8e633ac4d17da2",
+                "url": "https://api.github.com/repos/pestphp/pest/zipball/4e2987d438a3c3b2f291d2c991049544ab2f52bb",
+                "reference": "4e2987d438a3c3b2f291d2c991049544ab2f52bb",
                 "shasum": ""
             },
             "require": {
@@ -10095,7 +10095,7 @@
             ],
             "support": {
                 "issues": "https://github.com/pestphp/pest/issues",
-                "source": "https://github.com/pestphp/pest/tree/v3.2.2"
+                "source": "https://github.com/pestphp/pest/tree/v3.2.3"
             },
             "funding": [
                 {
@@ -10107,7 +10107,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-24T09:23:43+00:00"
+            "time": "2024-09-25T15:19:39+00:00"
         },
         {
             "name": "pestphp/pest-plugin",

package-lock.json

@@ -955,9 +955,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.23.3",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
-            "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
+            "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
             "dev": true,
             "funding": [
                 {
@@ -975,8 +975,8 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "caniuse-lite": "^1.0.30001646",
-                "electron-to-chromium": "^1.5.4",
+                "caniuse-lite": "^1.0.30001663",
+                "electron-to-chromium": "^1.5.28",
                 "node-releases": "^2.0.18",
                 "update-browserslist-db": "^1.1.0"
             },
@@ -998,9 +998,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001663",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001663.tgz",
-            "integrity": "sha512-o9C3X27GLKbLeTYZ6HBOLU1tsAcBZsLis28wrVzddShCS16RujjHp9GDHKZqrB3meE0YjhawvMFsGb/igqiPzA==",
+            "version": "1.0.30001664",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz",
+            "integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==",
             "dev": true,
             "funding": [
                 {
@@ -1159,9 +1159,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.28",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.28.tgz",
-            "integrity": "sha512-VufdJl+rzaKZoYVUijN13QcXVF5dWPZANeFTLNy+OSpHdDL5ynXTF35+60RSBbaQYB1ae723lQXHCrf4pyLsMw==",
+            "version": "1.5.29",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz",
+            "integrity": "sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==",
             "dev": true,
             "license": "ISC"
         },
@@ -2550,9 +2550,9 @@
             "license": "MIT"
         },
         "node_modules/vite": {
-            "version": "5.4.7",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.7.tgz",
-            "integrity": "sha512-5l2zxqMEPVENgvzTuBpHer2awaetimj2BGkhBPdnwKbPNOlHsODU+oiazEZzLK7KhAnOrO+XGYJYn4ZlUhDtDQ==",
+            "version": "5.4.8",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz",
+            "integrity": "sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {

tests/Feature/Reports/AccountBalancesReportTest.php

@@ -7,20 +7,19 @@ use App\Models\Accounting\Transaction;
 
 use function Pest\Livewire\livewire;
 
-it('correctly builds a account balances report', function () {
+it('correctly builds an account balances report for the current fiscal year', function () {
     $testCompany = $this->testCompany;
 
-    $reportDatesDTO = ReportDateFactory::create($testCompany);
-    $defaultDateRange = $reportDatesDTO->defaultDateRange;
-    $defaultStartDate = $reportDatesDTO->defaultStartDate->toImmutable();
-    $defaultEndDate = $reportDatesDTO->defaultEndDate->toImmutable();
+    $reportDates = ReportDateFactory::create($testCompany);
+    $defaultDateRange = $reportDates->defaultDateRange;
+    $defaultStartDate = $reportDates->defaultStartDate->toImmutable();
+    $defaultEndDate = $reportDates->defaultEndDate->toImmutable();
 
     $depositAmount = 1000;
     $withdrawalAmount = 1000;
     $depositCount = 10;
     $withdrawalCount = 10;
 
-    // Create transactions for the company
     Transaction::factory()
         ->forDefaultBankAccount()
         ->forUncategorizedRevenue()
@@ -41,11 +40,16 @@ it('correctly builds a account balances report', function () {
         ])
         ->create();
 
-    $defaultBankAccount = $testCompany->default->bankAccount->account;
+    $defaultBankAccountAccount = $testCompany->default->bankAccount->account;
 
-    $fields = $defaultBankAccount->category->getRelevantBalanceFields();
+    $fields = $defaultBankAccountAccount->category->getRelevantBalanceFields();
 
-    $expectedBalances = Accounting::getBalances($defaultBankAccount, $defaultStartDate->toDateString(), $defaultEndDate->toDateString(), $fields);
+    $expectedBalances = Accounting::getBalances(
+        $defaultBankAccountAccount,
+        $defaultStartDate->toDateString(),
+        $defaultEndDate->toDateString(),
+        $fields
+    );
 
     $formattedExpectedBalances = formatReportBalances($expectedBalances);
 
@@ -62,7 +66,7 @@ it('correctly builds a account balances report', function () {
         ])
         ->call('applyFilters')
         ->assertSeeTextInOrder([
-            'Cash on Hand',
+            $defaultBankAccountAccount->name,
             $formattedExpectedBalances->startingBalance,
             $formattedExpectedBalances->debitBalance,
             $formattedExpectedBalances->creditBalance,
@@ -70,8 +74,51 @@ it('correctly builds a account balances report', function () {
             $formattedExpectedBalances->endingBalance,
         ])
         ->assertReportTableData();
+});
+
+it('correctly builds an account balances report for the previous fiscal year', function () {
+    $testCompany = $this->testCompany;
+
+    $reportDatesDTO = ReportDateFactory::create($testCompany);
+    $defaultDateRange = $reportDatesDTO->defaultDateRange;
+    $defaultStartDate = $reportDatesDTO->defaultStartDate->toImmutable();
+    $defaultEndDate = $reportDatesDTO->defaultEndDate->toImmutable();
+
+    $depositAmount = 1000;
+    $withdrawalAmount = 1000;
+    $depositCount = 10;
+    $withdrawalCount = 10;
+
+    Transaction::factory()
+        ->forDefaultBankAccount()
+        ->forUncategorizedRevenue()
+        ->asDeposit($depositAmount)
+        ->count($depositCount)
+        ->state([
+            'posted_at' => $defaultStartDate->subWeek(),
+        ])
+        ->create();
+
+    Transaction::factory()
+        ->forDefaultBankAccount()
+        ->forUncategorizedExpense()
+        ->asWithdrawal($withdrawalAmount)
+        ->count($withdrawalCount)
+        ->state([
+            'posted_at' => $defaultEndDate,
+        ])
+        ->create();
+
+    $defaultBankAccountAccount = $testCompany->default->bankAccount->account;
+
+    $fields = $defaultBankAccountAccount->category->getRelevantBalanceFields();
 
-    $expectedBalancesSubYear = Accounting::getBalances($defaultBankAccount, $defaultStartDate->subYear()->startOfYear()->toDateString(), $defaultEndDate->subYear()->endOfYear()->toDateString(), $fields);
+    $expectedBalancesSubYear = Accounting::getBalances(
+        $defaultBankAccountAccount,
+        $defaultStartDate->subYear()->startOfYear()->toDateString(),
+        $defaultEndDate->subYear()->endOfYear()->toDateString(),
+        $fields
+    );
 
     $formattedExpectedBalancesSubYear = formatReportBalances($expectedBalancesSubYear);
 
@@ -92,7 +139,7 @@ it('correctly builds a account balances report', function () {
         ])
         ->call('applyFilters')
         ->assertSeeTextInOrder([
-            'Cash on Hand',
+            $defaultBankAccountAccount->name,
             $formattedExpectedBalancesSubYear->startingBalance,
             $formattedExpectedBalancesSubYear->debitBalance,
             $formattedExpectedBalancesSubYear->creditBalance,

tests/Feature/Reports/TrialBalanceReportTest.php

@@ -1,33 +1,64 @@
 <?php
 
+use App\Facades\Accounting;
 use App\Factories\ReportDateFactory;
 use App\Filament\Company\Pages\Reports\TrialBalance;
 use App\Models\Accounting\Transaction;
-use App\Utilities\Currency\CurrencyAccessor;
+use App\Services\AccountService;
+use App\Services\ReportService;
 
 use function Pest\Livewire\livewire;
 
 it('correctly builds a standard trial balance report', function () {
     $testCompany = $this->testCompany;
 
-    $reportDatesDTO = ReportDateFactory::create($testCompany);
-    $defaultDateRange = $reportDatesDTO->defaultDateRange;
-    $defaultEndDate = $reportDatesDTO->defaultEndDate;
+    $reportDates = ReportDateFactory::create($testCompany);
+    $defaultDateRange = $reportDates->defaultDateRange;
+    $defaultStartDate = $reportDates->defaultStartDate->toImmutable();
+    $defaultEndDate = $reportDates->defaultEndDate->toImmutable();
 
     $defaultReportType = 'standard';
 
-    // Create transactions for the company
+    $depositAmount = 1000;
+    $withdrawalAmount = 1000;
+    $depositCount = 10;
+    $withdrawalCount = 10;
+
     Transaction::factory()
         ->forDefaultBankAccount()
         ->forUncategorizedRevenue()
-        ->asDeposit(1000)
-        ->count(10)
+        ->asDeposit($depositAmount)
+        ->count($depositCount)
+        ->state([
+            'posted_at' => $defaultStartDate->subWeek(),
+        ])
+        ->create();
+
+    Transaction::factory()
+        ->forDefaultBankAccount()
+        ->forUncategorizedExpense()
+        ->asWithdrawal($withdrawalAmount)
+        ->count($withdrawalCount)
+        ->state([
+            'posted_at' => now()->subWeek(),
+        ])
         ->create();
 
-    $expectedBankAccountDebit = 10000;
-    $expectedBankAccountCredit = 0;
+    $defaultBankAccountAccount = $testCompany->default->bankAccount->account;
+    $earliestTransactionDate = $reportDates->refresh()->earliestTransactionDate;
+
+    $fields = $defaultBankAccountAccount->category->getRelevantBalanceFields();
+
+    $expectedBalances = Accounting::getBalances(
+        $defaultBankAccountAccount,
+        $earliestTransactionDate->toDateString(),
+        $defaultEndDate->toDateString(),
+        $fields
+    );
+
+    $calculatedTrialBalances = calculateTrialBalances($defaultBankAccountAccount->category, $expectedBalances['ending_balance']);
 
-    $defaultCurrencyCode = CurrencyAccessor::getDefaultCurrency();
+    $formattedExpectedBalances = formatReportBalances($calculatedTrialBalances);
 
     livewire(TrialBalance::class)
         ->assertFormSet([
@@ -43,9 +74,9 @@ it('correctly builds a standard trial balance report', function () {
         ->call('applyFilters')
         ->assertDontSeeText('Retained Earnings')
         ->assertSeeTextInOrder([
-            'Cash on Hand',
-            money($expectedBankAccountDebit, $defaultCurrencyCode, true),
-            money($expectedBankAccountCredit, $defaultCurrencyCode, true),
+            $defaultBankAccountAccount->name,
+            $formattedExpectedBalances->debitBalance,
+            $formattedExpectedBalances->creditBalance,
         ])
         ->assertReportTableData();
 });
@@ -53,59 +84,76 @@ it('correctly builds a standard trial balance report', function () {
 it('correctly builds a post-closing trial balance report', function () {
     $testCompany = $this->testCompany;
 
-    $reportDatesDTO = ReportDateFactory::create($testCompany);
-    $defaultDateRange = $reportDatesDTO->defaultDateRange;
-    $defaultEndDate = $reportDatesDTO->defaultEndDate;
+    $reportDates = ReportDateFactory::create($testCompany);
+    $defaultDateRange = $reportDates->defaultDateRange;
+    $defaultStartDate = $reportDates->defaultStartDate->toImmutable();
+    $defaultEndDate = $reportDates->defaultEndDate->toImmutable();
 
     $defaultReportType = 'postClosing';
 
-    // Create transactions for the company
+    $depositAmount = 2000;
+    $withdrawalAmount = 1000;
+    $depositCount = 5;
+    $withdrawalCount = 5;
+
     Transaction::factory()
         ->forDefaultBankAccount()
         ->forUncategorizedRevenue()
-        ->asDeposit(1000)
+        ->asDeposit($depositAmount)
+        ->count($depositCount)
+        ->state([
+            'posted_at' => $defaultStartDate->subWeek(),
+        ])
         ->create();
 
     Transaction::factory()
         ->forDefaultBankAccount()
         ->forUncategorizedExpense()
-        ->asWithdrawal(500)
+        ->asWithdrawal($withdrawalAmount)
+        ->count($withdrawalCount)
+        ->state([
+            'posted_at' => now()->subWeek(),
+        ])
         ->create();
 
-    $expectedRetainedEarningsDebit = 0;
-    $expectedRetainedEarningsCredit = 500;
+    $defaultBankAccountAccount = $testCompany->default->bankAccount->account;
+    $earliestTransactionDate = $reportDates->refresh()->earliestTransactionDate->toImmutable();
 
-    $defaultCurrencyCode = CurrencyAccessor::getDefaultCurrency();
+    $fields = $defaultBankAccountAccount->category->getRelevantBalanceFields();
 
+    $accountService = app(AccountService::class);
+
+    $balances = $accountService->getAccountBalances($earliestTransactionDate->toDateTimeString(), $defaultEndDate->toDateTimeString(), [$defaultBankAccountAccount->id]);
+
+    $account = $balances->find($defaultBankAccountAccount->id);
+
+    $reportService = app(ReportService::class);
+
+    $calculatedBalances = $reportService->calculateAccountBalances($account, $account->category);
+
+    $calculatedTrialBalances = calculateTrialBalances($defaultBankAccountAccount->category, $calculatedBalances['ending_balance']);
+
+    $formattedExpectedBalances = formatReportBalances($calculatedTrialBalances);
+
+    // Use Livewire to assert the report's filters and displayed data
     livewire(TrialBalance::class)
         ->set('deferredFilters.reportType', $defaultReportType)
-        ->call('applyFilters')
         ->assertFormSet([
             'deferredFilters.reportType' => $defaultReportType,
             'deferredFilters.dateRange' => $defaultDateRange,
             'deferredFilters.asOfDate' => $defaultEndDate->toDateTimeString(),
         ])
+        ->call('applyFilters')
         ->assertSet('filters', [
             'reportType' => $defaultReportType,
             'dateRange' => $defaultDateRange,
             'asOfDate' => $defaultEndDate->toDateString(),
         ])
-        ->call('applyFilters')
-        ->assertSeeTextInOrder([
-            'RE',
-            'Retained Earnings',
-            money($expectedRetainedEarningsDebit, $defaultCurrencyCode, true),
-            money($expectedRetainedEarningsCredit, $defaultCurrencyCode, true),
-        ])
-        ->assertSeeTextInOrder([
-            'Total Revenue',
-            money(0, $defaultCurrencyCode, true),
-            money(0, $defaultCurrencyCode, true),
-        ])
+        ->assertSeeText('Retained Earnings')
         ->assertSeeTextInOrder([
-            'Total Expenses',
-            money(0, $defaultCurrencyCode, true),
-            money(0, $defaultCurrencyCode, true),
+            $defaultBankAccountAccount->name,
+            $formattedExpectedBalances->debitBalance,
+            $formattedExpectedBalances->creditBalance,
         ])
         ->assertReportTableData();
 });

tests/Helpers/helpers.php

@@ -1,6 +1,7 @@
 <?php
 
 use App\DTO\AccountBalanceDTO;
+use App\Enums\Accounting\AccountCategory;
 use App\Enums\Setting\EntityType;
 use App\Filament\Company\Pages\CreateCompany;
 use App\Models\Company;
@@ -45,3 +46,10 @@ function formatReportBalances(array $balances): AccountBalanceDTO
 
     return $reportService->formatBalances($balances);
 }
+
+function calculateTrialBalances(AccountCategory $accountCategory, int $endingBalance): array
+{
+    $reportService = app(ReportService::class);
+
+    return $reportService->calculateTrialBalance($accountCategory, $endingBalance);
+}