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
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user