Fix/activity durations

README.md

@@ -24,6 +24,20 @@ To (re)seed dummy data at any time:
 php artisan db:seed --class=DummySeeder
 ```
 
+## Commands
+
+### Rebundle entry suggestions
+
+Deletes all open (not accepted, not rejected) entry suggestions and rebundles their
+activities chronologically using the current matching rules:
+
+```bash
+php artisan timatic:rebundle-suggestions [--user=1] [--from=2026-06-01] [--to=2026-06-30]
+```
+
+Pause queue workers before running this against live data, so the `CreateSuggestion`
+listener cannot attach new activities while suggestions are being rebundled.
+
 ## License
 
 Copyright (c) 2025 Timatic.

app/Console/Commands/RebundleSuggestionsCommand.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Jobs\RebuildUserDay;
+use App\Models\EntrySuggestion;
+use Illuminate\Console\Command;
+
+class RebundleSuggestionsCommand extends Command
+{
+    protected $signature = 'timatic:rebundle-suggestions
+        {--user= : Only rebuild suggestions of this user id}
+        {--from= : Only rebuild suggestions on or after this date (Y-m-d)}
+        {--to= : Only rebuild suggestions on or before this date (Y-m-d)}';
+
+    protected $description = 'Rebuild the activities and open suggestions of every user-day that has an open suggestion';
+
+    public function handle(): int
+    {
+        $userDays = EntrySuggestion::query()
+            ->whereDoesntHave('entry')
+            ->when($this->option('user'), fn ($query, $user) => $query->where('user_id', $user))
+            ->when($this->option('from'), fn ($query, $from) => $query->where('date', '>=', $from))
+            ->when($this->option('to'), fn ($query, $to) => $query->where('date', '<=', $to))
+            ->get(['user_id', 'date'])
+            ->unique(fn (EntrySuggestion $suggestion) => $suggestion->user_id.':'.$suggestion->date)
+            ->values();
+
+        $userDays->each(fn (EntrySuggestion $suggestion) => RebuildUserDay::dispatchSync((int) $suggestion->user_id, (string) $suggestion->date));
+
+        $this->info(sprintf('Rebuilt %d user-days.', $userDays->count()));
+
+        return self::SUCCESS;
+    }
+}

app/Jobs/RebuildUserDay.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Activity;
+use App\Models\Entry;
+use App\Models\EntrySuggestion;
+use App\Models\Event;
+use App\Services\ActivityProjector;
+use App\Services\SuggestionProjector;
+use Carbon\Carbon;
+use Carbon\CarbonInterface;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Database\DatabaseManager;
+use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Support\Collection;
+
+class RebuildUserDay implements ShouldBeUnique, ShouldQueue
+{
+    use Queueable;
+
+    public function __construct(
+        public readonly int $userId,
+        public readonly string $date,
+    ) {}
+
+    public function uniqueId(): string
+    {
+        return $this->userId.':'.$this->date;
+    }
+
+    public function handle(ActivityProjector $activityProjector, SuggestionProjector $suggestionProjector, DatabaseManager $db): void
+    {
+        $day = Carbon::parse($this->date, config('timatic.preferred_timezone'))->startOfDay();
+
+        $events = Event::query()
+            ->with('eventType')
+            ->where('user_id', $this->userId)
+            ->where('ended_at', '>=', $day)
+            ->where('ended_at', '<', $day->copy()->addDay())
+            ->get();
+
+        $entries = Entry::query()
+            ->where('user_id', $this->userId)
+            ->where('started_at', '<', $day->copy()->addDay())
+            ->where('ended_at', '>', $day)
+            ->get();
+
+        $dismissedSuggestions = EntrySuggestion::onlyTrashed()
+            ->whereDoesntHave('entry')
+            ->where('user_id', $this->userId)
+            ->where('date', $day->toDateString())
+            ->get();
+
+        $activities = $activityProjector->project($events, $entries);
+        $suggestions = $suggestionProjector->project($activities, $dismissedSuggestions, $day);
+
+        $db->transaction(function () use ($activities, $suggestions, $day) {
+            $this->deleteProjectedState($day);
+            $this->saveProjectedState($activities, $suggestions);
+        });
+    }
+
+    private function deleteProjectedState(CarbonInterface $day): void
+    {
+        EntrySuggestion::query()
+            ->where('user_id', $this->userId)
+            ->where('date', $day->toDateString())
+            ->whereDoesntHave('entry')
+            ->whereNull('deleted_at')
+            ->forceDelete();
+
+        Activity::query()
+            ->where('user_id', $this->userId)
+            ->where('ended_at', '>=', $day)
+            ->where('ended_at', '<', $day->copy()->addDay())
+            ->delete();
+    }
+
+    /**
+     * @param  Collection<int, Activity>  $activities
+     * @param  Collection<int, EntrySuggestion>  $suggestions
+     */
+    private function saveProjectedState(Collection $activities, Collection $suggestions): void
+    {
+        $activities->each(function (Activity $activity) {
+            $activity->save();
+            $activity->events()->saveMany($activity->events);
+        });
+
+        $suggestions->each(function (EntrySuggestion $suggestion) {
+            $suggestion->save();
+            Activity::whereKey($suggestion->activities->pluck('id'))
+                ->update(['entry_suggestion_id' => $suggestion->id]);
+        });
+    }
+}