Merge pull request #54 from andrewdwallo/development-3.x

performance improvements and bug fixes

app/Contracts/AccountHandler.php

@@ -17,7 +17,7 @@ interface AccountHandler
 
     public function getEndingBalance(Account $account, string $startDate, string $endDate): ?Money;
 
-    public function getBalances(Account $account, string $startDate, string $endDate): array;
+    public function getBalances(Account $account, string $startDate, string $endDate, array $fields): array;
 
     public function getTotalBalanceForAllBankAccounts(string $startDate, string $endDate): Money;
 

app/DTO/AccountBalanceDTO.php

@@ -8,8 +8,8 @@ class AccountBalanceDTO implements Wireable
 {
     public function __construct(
         public ?string $startingBalance,
-        public string $debitBalance,
-        public string $creditBalance,
+        public ?string $debitBalance,
+        public ?string $creditBalance,
         public ?string $netMovement,
         public ?string $endingBalance,
     ) {}

app/Services/AccountService.php

@@ -33,11 +33,9 @@ class AccountService implements AccountHandler
 
     public function getNetMovement(Account $account, string $startDate, string $endDate): Money
     {
-        $debitBalance = $this->journalEntryRepository->sumDebitAmounts($account, $startDate, $endDate);
-        $creditBalance = $this->journalEntryRepository->sumCreditAmounts($account, $startDate, $endDate);
-        $netMovement = $this->calculateNetMovementByCategory($account->category, $debitBalance, $creditBalance);
+        $balances = $this->calculateBalances($account, $startDate, $endDate);
 
-        return new Money($netMovement, $account->currency_code);
+        return new Money($balances['net_movement'], $account->currency_code);
     }
 
     public function getStartingBalance(Account $account, string $startDate): ?Money
@@ -46,23 +44,23 @@ class AccountService implements AccountHandler
             return null;
         }
 
-        $debitBalanceBefore = $this->journalEntryRepository->sumDebitAmounts($account, $startDate);
-        $creditBalanceBefore = $this->journalEntryRepository->sumCreditAmounts($account, $startDate);
-        $startingBalance = $this->calculateNetMovementByCategory($account->category, $debitBalanceBefore, $creditBalanceBefore);
+        $balances = $this->calculateStartingBalances($account, $startDate);
 
-        return new Money($startingBalance, $account->currency_code);
+        return new Money($balances['starting_balance'], $account->currency_code);
     }
 
     public function getEndingBalance(Account $account, string $startDate, string $endDate): ?Money
     {
-        $netMovement = $this->getNetMovement($account, $startDate, $endDate)->getAmount();
+        $calculatedBalances = $this->calculateBalances($account, $startDate, $endDate);
+        $startingBalances = $this->calculateStartingBalances($account, $startDate);
+
+        $netMovement = $calculatedBalances['net_movement'];
 
         if (in_array($account->category, [AccountCategory::Expense, AccountCategory::Revenue], true)) {
             return new Money($netMovement, $account->currency_code);
         }
 
-        $startingBalance = $this->getStartingBalance($account, $startDate)?->getAmount();
-        $endingBalance = $startingBalance + $netMovement;
+        $endingBalance = $startingBalances['starting_balance'] + $netMovement;
 
         return new Money($endingBalance, $account->currency_code);
     }
@@ -75,24 +73,54 @@ class AccountService implements AccountHandler
         };
     }
 
-    public function getBalances(Account $account, string $startDate, string $endDate): array
+    private function calculateBalances(Account $account, string $startDate, string $endDate): array
     {
-        $debitBalance = $this->getDebitBalance($account, $startDate, $endDate)->getAmount();
-        $creditBalance = $this->getCreditBalance($account, $startDate, $endDate)->getAmount();
-        $netMovement = $this->getNetMovement($account, $startDate, $endDate)->getAmount();
+        $debitBalance = $this->journalEntryRepository->sumDebitAmounts($account, $startDate, $endDate);
+        $creditBalance = $this->journalEntryRepository->sumCreditAmounts($account, $startDate, $endDate);
 
-        $balances = [
+        return [
             'debit_balance' => $debitBalance,
             'credit_balance' => $creditBalance,
-            'net_movement' => $netMovement,
+            'net_movement' => $this->calculateNetMovementByCategory($account->category, $debitBalance, $creditBalance),
+        ];
+    }
+
+    private function calculateStartingBalances(Account $account, string $startDate): array
+    {
+        $debitBalanceBefore = $this->journalEntryRepository->sumDebitAmounts($account, $startDate);
+        $creditBalanceBefore = $this->journalEntryRepository->sumCreditAmounts($account, $startDate);
+
+        return [
+            'debit_balance_before' => $debitBalanceBefore,
+            'credit_balance_before' => $creditBalanceBefore,
+            'starting_balance' => $this->calculateNetMovementByCategory($account->category, $debitBalanceBefore, $creditBalanceBefore),
         ];
+    }
+
+    public function getBalances(Account $account, string $startDate, string $endDate, array $fields): array
+    {
+        $balances = [];
+        $calculatedBalances = $this->calculateBalances($account, $startDate, $endDate);
+
+        // Calculate starting balances only if needed
+        $startingBalances = null;
+        $needStartingBalances = ! in_array($account->category, [AccountCategory::Expense, AccountCategory::Revenue], true)
+                                && (in_array('starting_balance', $fields) || in_array('ending_balance', $fields));
+
+        if ($needStartingBalances) {
+            $startingBalances = $this->calculateStartingBalances($account, $startDate);
+        }
 
-        if (! in_array($account->category, [AccountCategory::Expense, AccountCategory::Revenue], true)) {
-            $balances['starting_balance'] = $this->getStartingBalance($account, $startDate)?->getAmount();
-            $balances['ending_balance'] = $this->getEndingBalance($account, $startDate, $endDate)?->getAmount();
+        foreach ($fields as $field) {
+            $balances[$field] = match ($field) {
+                'debit_balance', 'credit_balance', 'net_movement' => $calculatedBalances[$field],
+                'starting_balance' => $needStartingBalances ? $startingBalances['starting_balance'] : null,
+                'ending_balance' => $needStartingBalances ? $startingBalances['starting_balance'] + $calculatedBalances['net_movement'] : null,
+                default => null,
+            };
         }
 
-        return $balances;
+        return array_filter($balances, static fn ($value) => $value !== null);
     }
 
     public function getTotalBalanceForAllBankAccounts(string $startDate, string $endDate): Money

app/Services/ReportService.php

@@ -8,6 +8,7 @@ use App\DTO\AccountDTO;
 use App\DTO\ReportDTO;
 use App\Enums\Accounting\AccountCategory;
 use App\Models\Accounting\Account;
+use App\Support\Column;
 use App\Utilities\Currency\CurrencyAccessor;
 use Illuminate\Database\Eloquent\Collection;
 
@@ -27,8 +28,8 @@ class ReportService
 
         return new AccountBalanceDTO(
             startingBalance: $balances['starting_balance'] ?? null,
-            debitBalance: $balances['debit_balance'],
-            creditBalance: $balances['credit_balance'],
+            debitBalance: $balances['debit_balance'] ?? null,
+            creditBalance: $balances['credit_balance'] ?? null,
             netMovement: $balances['net_movement'] ?? null,
             endingBalance: $balances['ending_balance'] ?? null,
         );
@@ -56,11 +57,15 @@ class ReportService
 
         $balanceFields = ['starting_balance', 'debit_balance', 'credit_balance', 'net_movement', 'ending_balance'];
 
+        $columnNameKeys = array_map(fn (Column $column) => $column->getName(), $columns);
+
+        $updatedBalanceFields = array_filter($balanceFields, fn (string $balanceField) => in_array($balanceField, $columnNameKeys, true));
+
         return $this->buildReport(
             $allCategories,
             $categoryGroupedAccounts,
-            fn (Account $account) => $this->accountService->getBalances($account, $startDate, $endDate),
-            $balanceFields,
+            fn (Account $account) => $this->accountService->getBalances($account, $startDate, $endDate, $updatedBalanceFields),
+            $updatedBalanceFields,
             $columns,
             fn (string $categoryName, array &$categorySummaryBalances) => $this->adjustAccountBalanceCategoryFields($categoryName, $categorySummaryBalances),
         );

database/factories/Accounting/TransactionFactory.php

@@ -18,7 +18,47 @@ class TransactionFactory extends Factory
     public function definition(): array
     {
         return [
-            //
+            'company_id' => 1,
+            'account_id' => $this->faker->numberBetween(1, 30),
+            'bank_account_id' => 1,
+            'type' => $this->faker->randomElement(['deposit', 'withdrawal', 'journal']),
+            'payment_channel' => $this->faker->randomElement(['online', 'in store', 'other']),
+            'description' => $this->faker->sentence,
+            'notes' => $this->faker->paragraph,
+            'reference' => $this->faker->word,
+            'amount' => $this->faker->numberBetween(100, 5000),
+            'pending' => $this->faker->boolean,
+            'reviewed' => $this->faker->boolean,
+            'posted_at' => $this->faker->dateTimeBetween('-2 years'),
+            'created_by' => 1,
+            'updated_by' => 1,
         ];
     }
+
+    public function configure(): static
+    {
+        return $this->afterCreating(function (Transaction $transaction) {
+            $transaction->journalEntries()->create([
+                'company_id' => $transaction->company_id,
+                'account_id' => $transaction->account_id,
+                'transaction_id' => $transaction->id,
+                'type' => 'debit',
+                'amount' => $transaction->amount,
+                'description' => $transaction->description,
+                'created_by' => $transaction->created_by,
+                'updated_by' => $transaction->updated_by,
+            ]);
+
+            $transaction->journalEntries()->create([
+                'company_id' => $transaction->company_id,
+                'account_id' => $transaction->account_id,
+                'transaction_id' => $transaction->id,
+                'type' => 'credit',
+                'amount' => $transaction->amount,
+                'description' => $transaction->description,
+                'created_by' => $transaction->created_by,
+                'updated_by' => $transaction->updated_by,
+            ]);
+        });
+    }
 }

database/factories/UserFactory.php

@@ -6,6 +6,7 @@ use App\Events\CompanyGenerated;
 use App\Models\Company;
 use App\Models\Setting\CompanyProfile;
 use App\Models\User;
+use Database\Factories\Accounting\TransactionFactory;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
@@ -87,6 +88,15 @@ class UserFactory extends Factory
                         'created_by' => $user->id,
                         'updated_by' => $user->id,
                     ]);
+
+                    TransactionFactory::new()
+                        ->count(2000)
+                        ->create([
+                            'company_id' => $company->id,
+                            'bank_account_id' => $defaultBankAccount?->id,
+                            'created_by' => $user->id,
+                            'updated_by' => $user->id,
+                        ]);
                 })
                 ->create([
                     'name' => $user->name . '\'s Company',

database/migrations/2024_01_01_234943_create_transactions_table.php

@@ -30,6 +30,9 @@ return new class extends Migration
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();
+
+            $table->index(['company_id', 'account_id', 'posted_at']);
+            $table->index(['company_id', 'bank_account_id', 'posted_at']);
         });
     }
 

database/migrations/2024_01_11_062614_create_journal_entries_table.php

@@ -22,6 +22,9 @@ return new class extends Migration
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();
+
+            $table->index(['company_id', 'account_id', 'type']);
+            $table->index(['company_id', 'account_id', 'transaction_id']);
         });
     }
 

database/seeders/DatabaseSeeder.php

@@ -12,93 +12,21 @@ class DatabaseSeeder extends Seeder
      */
     public function run(): void
     {
-        $startDate = today()->startOfYear();
-        $endDate = today();
-
-        // Change Company Name to ERPSAAS after Login
-        $firstCompanyOwner = User::factory()
-            ->withPersonalCompany()
+        // Create a single admin user and their personal company
+        $adminUser = User::factory()
+            ->withPersonalCompany()  // Ensures the user has a personal company created alongside
             ->create([
                 'name' => 'Admin',
                 'email' => 'admin@gmail.com',
                 'password' => bcrypt('password'),
-                'current_company_id' => 1,
-                'created_at' => $startDate->copy(),
+                'current_company_id' => 1,  // Assuming this will be the ID of the created company
+                'created_at' => now(),
             ]);
 
-        $firstCompanyOwner->ownedCompanies->first()->update(['created_at' => $startDate->copy()]);
-
-        // Function to create employees for a company (also creates companies for the employees)
-        $createUsers = static function ($company_id, $userCount, $minPercentage, $maxPercentage) use ($endDate, $startDate) {
-            $users = User::factory($userCount)
-                ->withPersonalCompany()
-                ->create([
-                    'password' => bcrypt('password'),
-                    'current_company_id' => $company_id,
-                ]);
-
-            $dateRange = $endDate->diffInMinutes($startDate);
-            $minOffset = (int) ($dateRange * $minPercentage);
-            $maxOffset = (int) ($dateRange * $maxPercentage);
-
-            for ($i = 0; $i < $userCount; $i++) {
-                $increment = (int) ($minOffset + ($i * ($maxOffset - $minOffset) / $userCount));
-                $userCreatedAt = $startDate->copy()->addMinutes($increment);
-
-                $user = $users[$i];
-
-                // Randomly assign a role to the user
-                $roles = ['editor', 'admin'];
-                $role = $roles[array_rand($roles)];
-
-                $user->companies()->attach($company_id, compact('role'));
-
-                $user->update(['created_at' => $userCreatedAt]);
-                $user->ownedCompanies->first()?->update(['created_at' => $userCreatedAt]);
-
-                // Generate random created_at date for the company_user pivot table (for employees)
-                $user->companies->first()?->users()->updateExistingPivot($user->id, ['created_at' => $userCreatedAt]);
-            }
-        };
-
-        // Users for the first company (excluding the first company owner)
-        $createUsers(1, 5, 0, 0.1);
-
-        // Second company owner
-        $secondCompanyOwner = User::factory()
-            ->withPersonalCompany()
-            ->create([
-                'password' => bcrypt('admin2'),
-                'current_company_id' => 2,
-                'created_at' => $startDate->addMinutes($endDate->diffInMinutes($startDate) * 0.1),
-            ]);
-
-        $secondCompanyOwner->ownedCompanies->first()->update(['created_at' => $startDate->addMinutes($endDate->diffInMinutes($startDate) * 0.1)]);
-
-        // Users for the second company (excluding the second company owner)
-        $createUsers(2, 5, 0.1, 0.2);
-
-        // Third company owner
-        $thirdCompanyOwner = User::factory()
-            ->withPersonalCompany()
-            ->create([
-                'password' => bcrypt('admin3'),
-                'current_company_id' => 3,
-                'created_at' => $startDate->addMinutes($endDate->diffInMinutes($startDate) * 0.2),
-            ]);
-
-        $thirdCompanyOwner->ownedCompanies->first()->update(['created_at' => $startDate->addMinutes($endDate->diffInMinutes($startDate) * 0.2)]);
-
-        // Users for the third company (excluding the third company owner)
-        $createUsers(3, 5, 0.2, 0.3);
-
-        // Create employees for each company (each employee has a company)
-        $createUsers(4, 5, 0.3, 0.4);
-        $createUsers(5, 5, 0.4, 0.5);
-        $createUsers(6, 5, 0.5, 0.6);
-        $createUsers(7, 5, 0.6, 0.7);
-        $createUsers(8, 5, 0.7, 0.8);
-        $createUsers(9, 5, 0.8, 0.9);
-        $createUsers(10, 5, 0.9, 1);
+        // Optionally, set additional properties or create related entities specific to this company
+        $adminUser->ownedCompanies->first()->update([
+            'name' => 'ERPSAAS',
+            'created_at' => now(),
+        ]);
     }
 }

resources/views/components/panel-shift-dropdown.blade.php

@@ -92,9 +92,7 @@
             },
 
             setActiveMenu(menu) {
-                if (this.open) {
-                    this.transitionPanel(menu, 'forward');
-                }
+                this.transitionPanel(menu, 'forward');
             },
 
             focusMenuItem(menuItemRef) {
@@ -160,7 +158,9 @@
                             mainPanel.style.transform = 'translateX(0)';
                         }
                     } else {
-                        this.navigationStack = ['main'];
+                        if (this.currentActiveMenu() !== 'main') {
+                            this.setActiveMenu('main');
+                        }
                     }
                 });
             },

resources/views/filament/company/pages/reports/detailed-report.blade.php

@@ -16,8 +16,16 @@
                     </div>
                 </form>
             </div>
-            <div class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10">
-                <x-company.tables.reports.detailed-report :report="$this->report" />
+            <div class="divide-y divide-gray-200 overflow-x-auto overflow-y-hidden dark:divide-white/10 dark:border-t-white/10">
+                <div class="flex items-center justify-center">
+                    <div wire:loading.delay wire:target="loadReportData">
+                        <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300" />
+                    </div>
+                </div>
+
+                <div wire:loading.remove wire:target="loadReportData">
+                    <x-company.tables.reports.detailed-report :report="$this->report" />
+                </div>
             </div>
             <div class="es-table__footer-ctn border-t border-gray-200"></div>
         </x-filament-tables::container>