wip

app/Filament/Company/Resources/Accounting/BudgetResource/RelationManagers/BudgetItemsRelationManager.php

@@ -19,7 +19,9 @@ use Filament\Tables\Grouping\Group;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Support\Str;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\DB;
+use stdClass;
 
 class BudgetItemsRelationManager extends RelationManager
 {
@@ -27,8 +29,6 @@ class BudgetItemsRelationManager extends RelationManager
 
     protected static bool $isLazy = false;
 
-    protected const AMOUNT_PREFIX = 'amount_';
-
     protected const TOTAL_COLUMN = 'total';
 
     public array $batchChanges = [];
@@ -36,9 +36,13 @@ class BudgetItemsRelationManager extends RelationManager
     /**
      * Generate a consistent key for the budget item and period
      */
-    protected static function generatePeriodKey(int $recordId, string $period): string
+    protected static function generatePeriodKey(int $recordId, string | Carbon $startDate): string
     {
-        return "{$recordId}." . self::AMOUNT_PREFIX . Str::snake($period);
+        $formattedDate = $startDate instanceof Carbon
+            ? $startDate->format('Y_m_d')
+            : Carbon::parse($startDate)->format('Y_m_d');
+
+        return "{$recordId}.{$formattedDate}";
     }
 
     /**
@@ -49,18 +53,6 @@ class BudgetItemsRelationManager extends RelationManager
         return "{$recordId}." . self::TOTAL_COLUMN;
     }
 
-    /**
-     * Extract the period from a column name
-     */
-    protected static function extractPeriodFromColumn(string $columnName): ?string
-    {
-        if (preg_match('/' . self::AMOUNT_PREFIX . '(.+)/', $columnName, $matches)) {
-            return str_replace('_', ' ', $matches[1] ?? '');
-        }
-
-        return null;
-    }
-
     public function handleBatchColumnChanged($data): void
     {
         $key = "{$data['recordKey']}.{$data['name']}";
@@ -72,8 +64,9 @@ class BudgetItemsRelationManager extends RelationManager
         foreach ($this->batchChanges as $key => $value) {
             [$recordKey, $column] = explode('.', $key, 2);
 
-            $period = self::extractPeriodFromColumn($column);
-            if (! $period) {
+            try {
+                $startDate = Carbon::createFromFormat('Y_m_d', $column);
+            } catch (\Exception) {
                 continue;
             }
 
@@ -82,15 +75,11 @@ class BudgetItemsRelationManager extends RelationManager
                 continue;
             }
 
-            $allocation = $record->allocations->firstWhere('period', $period);
-            if ($allocation) {
-                $allocation->update(['amount' => $value]);
-            } else {
-                $record->allocations()->create([
-                    'period' => $period,
-                    'amount' => $value,
-                ]);
-            }
+            $allocation = $record->allocations()
+                ->whereDate('start_date', $startDate)
+                ->first();
+
+            $allocation?->update(['amount' => $value]);
         }
 
         $this->batchChanges = [];
@@ -101,37 +90,23 @@ class BudgetItemsRelationManager extends RelationManager
             ->send();
     }
 
-    protected function calculateTotalSum(array $budgetItemIds): int
+    protected function calculatePeriodSum(array $budgetItemIds, string | Carbon $startDate): int
     {
-        $periods = BudgetAllocation::whereIn('budget_item_id', $budgetItemIds)
-            ->pluck('period')
-            ->unique()
-            ->values()
-            ->toArray();
-
-        $total = 0;
-        foreach ($periods as $period) {
-            $total += $this->calculatePeriodSum($budgetItemIds, $period);
-        }
+        $allocations = DB::table('budget_allocations')
+            ->whereIn('budget_item_id', $budgetItemIds)
+            ->whereDate('start_date', $startDate)
+            ->pluck('amount', 'budget_item_id');
 
-        return $total;
-    }
-
-    protected function calculatePeriodSum(array $budgetItemIds, string $period): int
-    {
-        $dbTotal = BudgetAllocation::whereIn('budget_item_id', $budgetItemIds)
-            ->where('period', $period)
-            ->sum('amount');
+        $dbTotal = $allocations->sum();
 
         $batchTotal = 0;
+
         foreach ($budgetItemIds as $itemId) {
-            $key = self::generatePeriodKey($itemId, $period);
+            $key = self::generatePeriodKey($itemId, $startDate);
+
             if (isset($this->batchChanges[$key])) {
                 $batchValue = CurrencyConverter::convertToCents($this->batchChanges[$key]);
-                $existingAmount = BudgetAllocation::where('budget_item_id', $itemId)
-                    ->where('period', $period)
-                    ->first()
-                    ?->getRawOriginal('amount') ?? 0;
+                $existingAmount = $allocations[$itemId] ?? 0;
 
                 $batchTotal += ($batchValue - $existingAmount);
             }
@@ -144,21 +119,21 @@ class BudgetItemsRelationManager extends RelationManager
     {
         /** @var Budget $budget */
         $budget = $this->getOwnerRecord();
-        $periods = $budget->getPeriods();
+        $allocationPeriods = $budget->getPeriods();
 
         return $table
             ->recordTitleAttribute('account_id')
             ->paginated(false)
             ->heading(null)
-            ->modifyQueryUsing(function (Builder $query) use ($periods) {
+            ->modifyQueryUsing(function (Builder $query) use ($allocationPeriods) {
                 $query->select('budget_items.*')
                     ->leftJoin('budget_allocations', 'budget_allocations.budget_item_id', '=', 'budget_items.id');
 
-                foreach ($periods as $period) {
-                    $alias = self::AMOUNT_PREFIX . Str::snake($period);
+                foreach ($allocationPeriods as $period) {
+                    $alias = $period->start_date->format('Y_m_d');
                     $query->selectRaw(
-                        "SUM(CASE WHEN budget_allocations.period = ? THEN budget_allocations.amount ELSE 0 END) as {$alias}",
-                        [$period]
+                        "SUM(CASE WHEN budget_allocations.start_date = ? THEN budget_allocations.amount ELSE 0 END) as {$alias}",
+                        [$period->start_date->toDateString()]
                     );
                 }
 
@@ -202,8 +177,32 @@ class BudgetItemsRelationManager extends RelationManager
                     ->summarize(
                         Summarizer::make()
                             ->using(function (\Illuminate\Database\Query\Builder $query) {
-                                $budgetItemIds = $query->pluck('id')->toArray();
-                                $total = $this->calculateTotalSum($budgetItemIds);
+                                $allocations = $query
+                                    ->leftJoin('budget_allocations', 'budget_allocations.budget_item_id', '=', 'budget_items.id')
+                                    ->select('budget_allocations.budget_item_id', 'budget_allocations.start_date', 'budget_allocations.amount')
+                                    ->get();
+
+                                $allocationsByDate = $allocations->groupBy('start_date');
+
+                                $total = 0;
+
+                                /** @var \Illuminate\Support\Collection<string, \Illuminate\Support\Collection<int, stdClass>> $allocationsByDate */
+                                foreach ($allocationsByDate as $startDate => $group) {
+                                    $dbTotal = $group->sum('amount');
+                                    $amounts = $group->pluck('amount', 'budget_item_id');
+                                    $batchTotal = 0;
+
+                                    foreach ($amounts as $itemId => $existingAmount) {
+                                        $key = self::generatePeriodKey($itemId, $startDate);
+
+                                        if (isset($this->batchChanges[$key])) {
+                                            $batchValue = CurrencyConverter::convertToCents($this->batchChanges[$key]);
+                                            $batchTotal += ($batchValue - $existingAmount);
+                                        }
+                                    }
+
+                                    $total += $dbTotal + $batchTotal;
+                                }
 
                                 return CurrencyConverter::convertCentsToFormatSimple($total);
                             })
@@ -217,8 +216,8 @@ class BudgetItemsRelationManager extends RelationManager
                     ->action(
                         Action::make('disperse')
                             ->label('Disperse')
-                            ->action(function (BudgetItem $record) use ($periods) {
-                                if (empty($periods)) {
+                            ->action(function (BudgetItem $record) use ($allocationPeriods) {
+                                if (empty($allocationPeriods)) {
                                     return;
                                 }
 
@@ -233,38 +232,34 @@ class BudgetItemsRelationManager extends RelationManager
                                     });
                                 }
 
-                                $numPeriods = count($periods);
-
-                                if ($numPeriods === 0) {
-                                    return;
-                                }
-
                                 if ($totalCents <= 0) {
-                                    foreach ($periods as $period) {
-                                        $periodKey = self::generatePeriodKey($record->getKey(), $period);
+                                    foreach ($allocationPeriods as $period) {
+                                        $periodKey = self::generatePeriodKey($record->getKey(), $period->start_date);
                                         $this->batchChanges[$periodKey] = CurrencyConverter::convertCentsToFormatSimple(0);
                                     }
 
                                     return;
                                 }
 
+                                $numPeriods = count($allocationPeriods);
+
                                 $baseAmount = floor($totalCents / $numPeriods);
                                 $remainder = $totalCents - ($baseAmount * $numPeriods);
 
-                                foreach ($periods as $index => $period) {
+                                foreach ($allocationPeriods as $index => $period) {
                                     $amount = $baseAmount + ($index === 0 ? $remainder : 0);
                                     $formattedAmount = CurrencyConverter::convertCentsToFormatSimple($amount);
 
-                                    $periodKey = self::generatePeriodKey($record->getKey(), $period);
+                                    $periodKey = self::generatePeriodKey($record->getKey(), $period->start_date);
                                     $this->batchChanges[$periodKey] = $formattedAmount;
                                 }
                             }),
                     ),
-                ...array_map(function (string $period) {
-                    $alias = self::AMOUNT_PREFIX . Str::snake($period);
+                ...$allocationPeriods->map(function (BudgetAllocation $period) {
+                    $alias = $period->start_date->format('Y_m_d');
 
                     return DeferredTextInputColumn::make($alias)
-                        ->label($period)
+                        ->label($period->period)
                         ->alignRight()
                         ->batchMode()
                         ->mask(RawJs::make('$money($input)'))
@@ -277,12 +272,12 @@ class BudgetItemsRelationManager extends RelationManager
                             Summarizer::make()
                                 ->using(function (\Illuminate\Database\Query\Builder $query) use ($period) {
                                     $budgetItemIds = $query->pluck('id')->toArray();
-                                    $total = $this->calculatePeriodSum($budgetItemIds, $period);
+                                    $total = $this->calculatePeriodSum($budgetItemIds, $period->start_date);
 
                                     return CurrencyConverter::convertCentsToFormatSimple($total);
                                 })
                         );
-                }, $periods),
+                })->toArray(),
             ])
             ->bulkActions([
                 BulkAction::make('clearAllocations')
@@ -291,10 +286,10 @@ class BudgetItemsRelationManager extends RelationManager
                     ->color('danger')
                     ->requiresConfirmation()
                     ->deselectRecordsAfterCompletion()
-                    ->action(function (Collection $records) use ($periods) {
+                    ->action(function (Collection $records) use ($allocationPeriods) {
                         foreach ($records as $record) {
-                            foreach ($periods as $period) {
-                                $periodKey = self::generatePeriodKey($record->getKey(), $period);
+                            foreach ($allocationPeriods as $period) {
+                                $periodKey = self::generatePeriodKey($record->getKey(), $period->start_date);
                                 $this->batchChanges[$periodKey] = CurrencyConverter::convertCentsToFormatSimple(0);
                             }
                         }

app/Models/Accounting/Budget.php

@@ -20,6 +20,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
 
 class Budget extends Model
 {
@@ -81,14 +82,13 @@ class Budget extends Model
         return $this->hasManyThrough(BudgetAllocation::class, BudgetItem::class);
     }
 
-    public function getPeriods(): array
+    public function getPeriods(): Collection
     {
         return $this->allocations()
             ->select(['period', 'start_date'])
             ->distinct()
             ->orderBy('start_date')
-            ->pluck('period')
-            ->toArray();
+            ->get();
     }
 
     public function isDraft(): bool

composer.lock

@@ -9306,16 +9306,16 @@
     "packages-dev": [
         {
             "name": "brianium/paratest",
-            "version": "v7.7.0",
+            "version": "v7.8.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paratestphp/paratest.git",
-                "reference": "4fb3f73bc5a4c3146bac2850af7dc72435a32daf"
+                "reference": "a585c346ddf1bec22e51e20b5387607905604a71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paratestphp/paratest/zipball/4fb3f73bc5a4c3146bac2850af7dc72435a32daf",
-                "reference": "4fb3f73bc5a4c3146bac2850af7dc72435a32daf",
+                "url": "https://api.github.com/repos/paratestphp/paratest/zipball/a585c346ddf1bec22e51e20b5387607905604a71",
+                "reference": "a585c346ddf1bec22e51e20b5387607905604a71",
                 "shasum": ""
             },
             "require": {
@@ -9326,23 +9326,23 @@
                 "fidry/cpu-core-counter": "^1.2.0",
                 "jean85/pretty-package-versions": "^2.1.0",
                 "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
-                "phpunit/php-code-coverage": "^11.0.8",
-                "phpunit/php-file-iterator": "^5.1.0",
-                "phpunit/php-timer": "^7.0.1",
-                "phpunit/phpunit": "^11.5.1",
-                "sebastian/environment": "^7.2.0",
-                "symfony/console": "^6.4.14 || ^7.2.1",
-                "symfony/process": "^6.4.14 || ^7.2.0"
+                "phpunit/php-code-coverage": "^11.0.9 || ^12.0.4",
+                "phpunit/php-file-iterator": "^5.1.0 || ^6",
+                "phpunit/php-timer": "^7.0.1 || ^8",
+                "phpunit/phpunit": "^11.5.11 || ^12.0.6",
+                "sebastian/environment": "^7.2.0 || ^8",
+                "symfony/console": "^6.4.17 || ^7.2.1",
+                "symfony/process": "^6.4.19 || ^7.2.4"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^12.0.0",
                 "ext-pcov": "*",
                 "ext-posix": "*",
-                "phpstan/phpstan": "^2.0.3",
+                "phpstan/phpstan": "^2.1.6",
                 "phpstan/phpstan-deprecation-rules": "^2.0.1",
-                "phpstan/phpstan-phpunit": "^2.0.1",
-                "phpstan/phpstan-strict-rules": "^2",
-                "squizlabs/php_codesniffer": "^3.11.1",
+                "phpstan/phpstan-phpunit": "^2.0.4",
+                "phpstan/phpstan-strict-rules": "^2.0.3",
+                "squizlabs/php_codesniffer": "^3.11.3",
                 "symfony/filesystem": "^6.4.13 || ^7.2.0"
             },
             "bin": [
@@ -9383,7 +9383,7 @@
             ],
             "support": {
                 "issues": "https://github.com/paratestphp/paratest/issues",
-                "source": "https://github.com/paratestphp/paratest/tree/v7.7.0"
+                "source": "https://github.com/paratestphp/paratest/tree/v7.8.3"
             },
             "funding": [
                 {
@@ -9395,7 +9395,7 @@
                     "type": "paypal"
                 }
             ],
-            "time": "2024-12-11T14:50:44+00:00"
+            "time": "2025-03-05T08:29:11+00:00"
         },
         {
             "name": "fakerphp/faker",
@@ -10075,38 +10075,38 @@
         },
         {
             "name": "pestphp/pest",
-            "version": "v3.7.4",
+            "version": "v3.7.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pestphp/pest.git",
-                "reference": "4a987d3d5c4e3ba36c76fecbf56113baac2d1b2b"
+                "reference": "4969526ef2841118aa9d8b13ae2dad40f3d91492"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pestphp/pest/zipball/4a987d3d5c4e3ba36c76fecbf56113baac2d1b2b",
-                "reference": "4a987d3d5c4e3ba36c76fecbf56113baac2d1b2b",
+                "url": "https://api.github.com/repos/pestphp/pest/zipball/4969526ef2841118aa9d8b13ae2dad40f3d91492",
+                "reference": "4969526ef2841118aa9d8b13ae2dad40f3d91492",
                 "shasum": ""
             },
             "require": {
-                "brianium/paratest": "^7.7.0",
-                "nunomaduro/collision": "^8.6.1",
+                "brianium/paratest": "^7.8.3",
+                "nunomaduro/collision": "^8.7.0",
                 "nunomaduro/termwind": "^2.3.0",
                 "pestphp/pest-plugin": "^3.0.0",
                 "pestphp/pest-plugin-arch": "^3.0.0",
                 "pestphp/pest-plugin-mutate": "^3.0.5",
                 "php": "^8.2.0",
-                "phpunit/phpunit": "^11.5.3"
+                "phpunit/phpunit": "^11.5.15"
             },
             "conflict": {
                 "filp/whoops": "<2.16.0",
-                "phpunit/phpunit": ">11.5.3",
+                "phpunit/phpunit": ">11.5.15",
                 "sebastian/exporter": "<6.0.0",
                 "webmozart/assert": "<1.11.0"
             },
             "require-dev": {
-                "pestphp/pest-dev-tools": "^3.3.0",
-                "pestphp/pest-plugin-type-coverage": "^3.2.3",
-                "symfony/process": "^7.2.0"
+                "pestphp/pest-dev-tools": "^3.4.0",
+                "pestphp/pest-plugin-type-coverage": "^3.5.0",
+                "symfony/process": "^7.2.5"
             },
             "bin": [
                 "bin/pest"
@@ -10171,7 +10171,7 @@
             ],
             "support": {
                 "issues": "https://github.com/pestphp/pest/issues",
-                "source": "https://github.com/pestphp/pest/tree/v3.7.4"
+                "source": "https://github.com/pestphp/pest/tree/v3.7.5"
             },
             "funding": [
                 {
@@ -10183,7 +10183,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-01-23T14:03:29+00:00"
+            "time": "2025-03-29T17:57:53+00:00"
         },
         {
             "name": "pestphp/pest-plugin",
@@ -11256,16 +11256,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.3",
+            "version": "11.5.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "30e319e578a7b5da3543073e30002bf82042f701"
+                "reference": "4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/30e319e578a7b5da3543073e30002bf82042f701",
-                "reference": "30e319e578a7b5da3543073e30002bf82042f701",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c",
+                "reference": "4b6a4ee654e5e0c5e1f17e2f83c0f4c91dee1f9c",
                 "shasum": ""
             },
             "require": {
@@ -11275,24 +11275,24 @@
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.12.1",
+                "myclabs/deep-copy": "^1.13.0",
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.2",
-                "phpunit/php-code-coverage": "^11.0.8",
+                "phpunit/php-code-coverage": "^11.0.9",
                 "phpunit/php-file-iterator": "^5.1.0",
                 "phpunit/php-invoker": "^5.0.1",
                 "phpunit/php-text-template": "^4.0.1",
                 "phpunit/php-timer": "^7.0.1",
                 "sebastian/cli-parser": "^3.0.2",
-                "sebastian/code-unit": "^3.0.2",
-                "sebastian/comparator": "^6.3.0",
+                "sebastian/code-unit": "^3.0.3",
+                "sebastian/comparator": "^6.3.1",
                 "sebastian/diff": "^6.0.2",
                 "sebastian/environment": "^7.2.0",
                 "sebastian/exporter": "^6.3.0",
                 "sebastian/global-state": "^7.0.2",
                 "sebastian/object-enumerator": "^6.0.1",
-                "sebastian/type": "^5.1.0",
+                "sebastian/type": "^5.1.2",
                 "sebastian/version": "^5.0.2",
                 "staabm/side-effects-detector": "^1.0.5"
             },
@@ -11337,7 +11337,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.3"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.15"
             },
             "funding": [
                 {
@@ -11353,7 +11353,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-01-13T09:36:00+00:00"
+            "time": "2025-03-23T16:02:11+00:00"
         },
         {
             "name": "sebastian/cli-parser",