refactor: single EventPresenter and ManualEvents shared by /api, /me, inbox, webhook; editable flag

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BCrwHHnGCB5XH968Nxokqw
2026-09-05 06:01:55 -03:00
parent 2ec71ab710
commit 9163ff97f9
10 changed files with 297 additions and 75 deletions
--- a/core/app/Http/Controllers/Api/EventsController.php
+++ b/core/app/Http/Controllers/Api/EventsController.php
@@ -2,14 +2,13 @@

 namespace App\Http\Controllers\Api;

-use App\Enums\DueMode;
 use App\Enums\EventState;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\UpsertEventsRequest;
 use App\Ingest\EventUpserter;
 use App\Models\Event;
 use App\Models\Source;
-use App\Scheduling\DueResolver;
+use App\Presenters\EventPresenter;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -30,7 +29,7 @@ class EventsController extends Controller
    {
        $event = $this->lookup($request);

-        return response()->json(self::present($event));
+        return response()->json(EventPresenter::forClient($event));
    }

    public function destroy(Request $request): Response
@@ -51,30 +50,4 @@ class EventsController extends Controller

        return $event;
    }
-
-    /** @return array<string,mixed> */
-    public static function present(Event $event): array
-    {
-        return [
-            'id' => $event->id,
-            'source_ref' => $event->source_ref,
-            'topic' => $event->topic,
-            'state' => $event->state->value,
-            'due_at' => self::dueAt($event),
-            'fire_at' => $event->fire_on->format('Y-m-d'),
-            'after_due' => $event->after_due->value,
-            'payload' => $event->payload,
-            'done_at' => $event->done_at?->toIso8601String(),
-        ];
-    }
-
-    private static function dueAt(Event $event): string
-    {
-        if ($event->due_mode === DueMode::Fixed) {
-            return $event->due_instant->toIso8601String();
-        }
-        $date = $event->due_date->format('Y-m-d');
-
-        return $event->due_time === DueResolver::WHOLE_DAY ? $date : $date.'T'.substr($event->due_time, 0, 5);
-    }
 }
--- a/core/app/Http/Controllers/InboxController.php
+++ b/core/app/Http/Controllers/InboxController.php
@@ -3,11 +3,12 @@
 namespace App\Http\Controllers;

 use App\Enums\EventState;
-use App\Http\Controllers\Api\EventsController as Presenter;
 use App\Http\Controllers\Me\ChannelsController;
 use App\Http\Controllers\Me\ProfileController;
+use App\Ingest\ManualEvents;
 use App\Models\Event;
 use App\Models\User;
+use App\Presenters\EventPresenter;
 use App\Scheduling\DueResolver;
 use Carbon\CarbonImmutable;
 use Illuminate\Contracts\View\View;
@@ -36,14 +37,12 @@ class InboxController extends Controller
            $groups[] = ['state' => $state, 'jp' => $jp, 'ru' => $ru, 'events' => $live->where('state', $state)->values()->all()];
        }

-        $archive = $user->events()->with('source')
-            ->whereIn('state', [EventState::Done->value, EventState::Expired->value])
-            ->orderByDesc('updated_at')->limit(100)->get()
+        $archive = $user->archive()->get()
            ->map(fn (Event $e) => [
                'title' => $e->payload['title'],
                'source' => self::sourceLabel($e->source->name),
-                'due' => Presenter::present($e)['due_at'],
-                'closed_as' => $e->state === EventState::Expired ? 'Истекло' : ($e->payload['done_label'] ?? 'Сделано'),
+                'due' => EventPresenter::dueAt($e),
+                'closed_as' => EventPresenter::closedAs($e),
            ])->values()->all();

        $profile = ProfileController::present($user);
@@ -74,7 +73,7 @@ class InboxController extends Controller
            'done_label' => $e->payload['done_label'] ?? 'Сделано',
            'can_remind' => $e->state !== EventState::Scheduled,
            'source' => self::sourceLabel($e->source->name),
-            'due' => Presenter::present($e)['due_at'],
+            'due' => EventPresenter::dueAt($e),
            'due_month' => self::MONTHS[(int) $due->day->format('n') - 1],
            'due_day' => $due->day->format('d'),
            'due_time' => $wholeDay ? null : $due->moment->format('H:i'),
@@ -85,7 +84,7 @@ class InboxController extends Controller

    public static function sourceLabel(string $name): string
    {
-        return $name === 'manual' ? 'вручную' : $name;
+        return $name === ManualEvents::SOURCE ? 'вручную' : $name;
    }

    /** Пропускает только относительные пути и http(s)-ссылки; прочее (напр. javascript:) отбрасывает. */
--- a/core/app/Http/Controllers/Me/EventsController.php
+++ b/core/app/Http/Controllers/Me/EventsController.php
@@ -4,21 +4,18 @@ namespace App\Http\Controllers\Me;

 use App\Delivery\EventActions;
 use App\Enums\EventState;
-use App\Http\Controllers\Api\EventsController as ApiPresenter;
 use App\Http\Controllers\Controller;
-use App\Ingest\EventUpserter;
+use App\Ingest\ManualEvents;
 use App\Models\Event;
-use App\Models\Source;
 use App\Models\User;
-use Carbon\CarbonImmutable;
+use App\Presenters\EventPresenter;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;

 class EventsController extends Controller
 {
-    public function __construct(private readonly EventActions $actions, private readonly EventUpserter $upserter) {}
+    public function __construct(private readonly EventActions $actions, private readonly ManualEvents $manual) {}

    public function index(Request $request): JsonResponse
    {
@@ -33,7 +30,7 @@ class EventsController extends Controller

        $events = $user->events()->with('source')->whereIn('state', $states)->orderBy('due_date')->orderBy('due_instant')->get();

-        return response()->json(['events' => $events->map(fn (Event $e) => ApiPresenter::present($e) + ['source' => $e->source->name])->values()]);
+        return response()->json(['events' => $events->map(EventPresenter::forUser(...))->values()]);
    }

    public function ack(Request $request, int $event): JsonResponse
@@ -41,7 +38,7 @@ class EventsController extends Controller
        $model = $this->own($request, $event);
        $this->actions->ack($model);

-        return response()->json(ApiPresenter::present($model->fresh()));
+        return response()->json(EventPresenter::forUser($model->fresh('source')));
    }

    public function done(Request $request, int $event): JsonResponse
@@ -49,7 +46,7 @@ class EventsController extends Controller
        $model = $this->own($request, $event);
        $this->actions->done($model);

-        return response()->json(ApiPresenter::present($model->fresh()));
+        return response()->json(EventPresenter::forUser($model->fresh('source')));
    }

    public function store(Request $request): JsonResponse
@@ -63,39 +60,22 @@ class EventsController extends Controller
            'due_time' => ['sometimes', 'nullable', 'date_format:H:i'],
        ]);

-        $source = Source::firstOrCreate(['name' => 'manual'], ['token_hash' => hash('sha256', Str::random(64))]);
-        $dueAt = $data['due_date'].(empty($data['due_time']) ? '' : 'T'.$data['due_time']);
+        $event = $this->manual->create($user, [
+            'title' => $data['title'],
+            'subtitle' => $data['subtitle'] ?? null,
+            'due_at' => $data['due_date'].(empty($data['due_time']) ? '' : 'T'.$data['due_time']),
+        ]);

-        [$result] = $this->upserter->upsert($source, [[
-            'user' => $user->login,
-            'source_ref' => 'manual:'.Str::ulid(),
-            'topic' => '',
-            'due_at' => $dueAt,
-            'fire_at' => CarbonImmutable::createFromFormat('Y-m-d', $data['due_date'])->subDays(30)->format('Y-m-d'),
-            'after_due' => 'keep',
-            'payload' => array_filter([
-                'title' => $data['title'],
-                'subtitle' => $data['subtitle'] ?? null,
-                'done_label' => 'Сделано',
-            ], fn ($v) => $v !== null && $v !== ''),
-        ]]);
-
-        $event = Event::with('source')->findOrFail($result['id']);
-
-        return response()->json(ApiPresenter::present($event) + ['source' => $event->source->name], 201);
+        return response()->json(EventPresenter::forUser($event), 201);
    }

    public function archive(Request $request): JsonResponse
    {
        /** @var User $user */
        $user = $request->attributes->get('user');
-        $events = $user->events()->with('source')
-            ->whereIn('state', [EventState::Done->value, EventState::Expired->value])
-            ->orderByDesc('updated_at')->limit(100)->get();

-        return response()->json(['events' => $events->map(fn (Event $e) => ApiPresenter::present($e) + [
-            'source' => $e->source->name,
-            'closed_as' => $e->state === EventState::Expired ? 'Истекло' : ($e->payload['done_label'] ?? 'Сделано'),
+        return response()->json(['events' => $user->archive()->get()->map(fn (Event $e) => EventPresenter::forUser($e) + [
+            'closed_as' => EventPresenter::closedAs($e),
        ])->values()]);
    }

@@ -104,6 +84,6 @@ class EventsController extends Controller
        /** @var User $user */
        $user = $request->attributes->get('user');

-        return $user->events()->whereKey($id)->firstOrFail();
+        return $user->ownEvent($id);
    }
 }