wip

app/Enums/Accounting/AccountType.php

@@ -129,4 +129,15 @@ enum AccountType: string implements HasLabel
     {
         return ! $this->isNominal();
     }
+
+    public function isContra(): bool
+    {
+        return in_array($this, [
+            self::ContraAsset,
+            self::ContraLiability,
+            self::ContraEquity,
+            self::ContraRevenue,
+            self::ContraExpense,
+        ], true);
+    }
 }

app/Services/ReportService.php

@@ -63,7 +63,7 @@ class ReportService
 
             /** @var Account $account */
             foreach ($accountsInCategory as $account) {
-                $accountBalances = $this->calculateAccountBalances($account, $category);
+                $accountBalances = $this->calculateAccountBalances($account);
 
                 foreach ($relevantFields as $field) {
                     $categorySummaryBalances[$field] += $accountBalances[$field];
@@ -98,8 +98,9 @@ class ReportService
         return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
     }
 
-    public function calculateAccountBalances(Account $account, AccountCategory $category): array
+    public function calculateAccountBalances(Account $account): array
     {
+        $category = $account->category;
         $balances = [
             'debit_balance' => $account->total_debit ?? 0,
             'credit_balance' => $account->total_credit ?? 0,
@@ -130,12 +131,12 @@ class ReportService
         $expenseTotal = 0;
 
         foreach ($revenueAccounts as $account) {
-            $revenueBalances = $this->calculateAccountBalances($account, AccountCategory::Revenue);
+            $revenueBalances = $this->calculateAccountBalances($account);
             $revenueTotal += $revenueBalances['net_movement'];
         }
 
         foreach ($expenseAccounts as $account) {
-            $expenseBalances = $this->calculateAccountBalances($account, AccountCategory::Expense);
+            $expenseBalances = $this->calculateAccountBalances($account);
             $expenseTotal += $expenseBalances['net_movement'];
         }
 
@@ -259,7 +260,7 @@ class ReportService
 
             /** @var Account $account */
             foreach ($accountsInCategory as $account) {
-                $accountBalances = $this->calculateAccountBalances($account, $category);
+                $accountBalances = $this->calculateAccountBalances($account);
 
                 $endingBalance = $accountBalances['ending_balance'] ?? $accountBalances['net_movement'];
 
@@ -402,7 +403,7 @@ class ReportService
                 };
 
                 if ($category !== null) {
-                    $accountBalances = $this->calculateAccountBalances($account, $category);
+                    $accountBalances = $this->calculateAccountBalances($account);
                     $movement = $accountBalances['net_movement'];
                     $netMovement += $movement;
                     $group['total'] += $movement;
@@ -517,7 +518,7 @@ class ReportService
         foreach ([$accounts, $adjustments] as $entries) {
             foreach ($entries as $entry) {
                 $accountCategory = $entry->type->getCategory();
-                $accountBalances = $this->calculateAccountBalances($entry, $accountCategory);
+                $accountBalances = $this->calculateAccountBalances($entry);
                 $netCashFlow = $accountBalances['net_movement'] ?? 0;
 
                 if ($entry->subtype->inverse_cash_flow) {
@@ -608,7 +609,7 @@ class ReportService
             /** @var Account $account */
             foreach ($accounts as $account) {
                 if ($account->type->getCategory() === $category) {
-                    $accountBalances = $this->calculateAccountBalances($account, $category);
+                    $accountBalances = $this->calculateAccountBalances($account);
                     $endingBalance = $accountBalances['ending_balance'] ?? $accountBalances['net_movement'];
 
                     $categorySummaryBalances['ending_balance'] += $endingBalance;

composer.lock

@@ -4585,20 +4585,20 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.8.0",
+            "version": "3.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f"
+                "reference": "10ac0aa86b8062219ce21e8189123d611ca3ecd9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bbd3eef89af8ba66a3aa7952b5439168fbcc529f",
-                "reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/10ac0aa86b8062219ce21e8189123d611ca3ecd9",
+                "reference": "10ac0aa86b8062219ce21e8189123d611ca3ecd9",
                 "shasum": ""
             },
             "require": {
-                "carbonphp/carbon-doctrine-types": "*",
+                "carbonphp/carbon-doctrine-types": "<100.0",
                 "ext-json": "*",
                 "php": "^8.1",
                 "psr/clock": "^1.0",
@@ -4687,7 +4687,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-19T06:22:39+00:00"
+            "time": "2024-11-03T16:02:24+00:00"
         },
         {
             "name": "nette/schema",

database/factories/Accounting/TransactionFactory.php

@@ -49,13 +49,27 @@ class TransactionFactory extends Factory
             $type = $this->faker->randomElement([TransactionType::Deposit, TransactionType::Withdrawal]);
 
             $associatedAccountTypes = match ($type) {
-                TransactionType::Deposit => ['asset', 'liability', 'equity', 'revenue'],
-                TransactionType::Withdrawal => ['asset', 'liability', 'equity', 'expense'],
+                TransactionType::Deposit => [
+                    AccountType::CurrentLiability,
+                    AccountType::NonCurrentLiability,
+                    AccountType::Equity,
+                    AccountType::OperatingRevenue,
+                    AccountType::NonOperatingRevenue,
+                    AccountType::ContraExpense,
+                ],
+                TransactionType::Withdrawal => [
+                    AccountType::OperatingExpense,
+                    AccountType::NonOperatingExpense,
+                    AccountType::CurrentLiability,
+                    AccountType::NonCurrentLiability,
+                    AccountType::Equity,
+                    AccountType::ContraRevenue,
+                ],
             };
 
             $accountIdForBankAccount = $bankAccount->account->id;
 
-            $account = Account::where('category', $this->faker->randomElement($associatedAccountTypes))
+            $account = Account::whereIn('type', $associatedAccountTypes)
                 ->where('company_id', $company->id)
                 ->whereKeyNot($accountIdForBankAccount)
                 ->inRandomOrder()

package-lock.json

@@ -1026,9 +1026,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001676",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001676.tgz",
-            "integrity": "sha512-Qz6zwGCiPghQXGJvgQAem79esjitvJ+CxSbSQkW9H/UX5hg8XM88d4lp2W+MEQ81j+Hip58Il+jGVdazk1z9cw==",
+            "version": "1.0.30001677",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001677.tgz",
+            "integrity": "sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog==",
             "dev": true,
             "funding": [
                 {