feat: remote user, ack/done actions and /me API

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BCrwHHnGCB5XH968Nxokqw
This commit is contained in:
nikita.hohlov
2026-09-04 07:05:50 -03:00
parent 5ea5c045a7
commit 1b03fe0796
6 changed files with 320 additions and 2 deletions

View File

@@ -0,0 +1,39 @@
<?php
namespace App\Delivery;
use App\Enums\EventState;
use App\Models\Event;
use App\Scheduling\DueResolver;
use App\Scheduling\QuietRule;
final class EventActions
{
public function __construct(
private readonly DueResolver $due,
private readonly QuietRule $quiet,
) {}
/** «Помню»: молчать до следующей контрольной точки текущего состояния. */
public function ack(Event $event): void
{
if ($event->isTerminal()) {
return;
}
$user = $event->user;
$now = $user->now();
$event->quiet_until = $this->quiet->afterAck($event, $user, $event->state, $this->due->resolve($event, $user), $now);
$event->save();
}
/** «Сделано»: закрыть событие целиком. */
public function done(Event $event): void
{
if ($event->isTerminal()) {
return;
}
$event->state = EventState::Done;
$event->done_at = now();
$event->save();
}
}

View File

@@ -0,0 +1,54 @@
<?php
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\Models\Event;
use App\Models\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class EventsController extends Controller
{
public function __construct(private readonly EventActions $actions) {}
public function index(Request $request): JsonResponse
{
/** @var User $user */
$user = $request->attributes->get('user');
$states = $request->query('state')
? [$request->query('state')]
: EventState::nonTerminalValues();
$events = $user->events()->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()]);
}
public function ack(Request $request, int $event): JsonResponse
{
$model = $this->own($request, $event);
$this->actions->ack($model);
return response()->json(ApiPresenter::present($model->fresh()));
}
public function done(Request $request, int $event): JsonResponse
{
$model = $this->own($request, $event);
$this->actions->done($model);
return response()->json(ApiPresenter::present($model->fresh()));
}
private function own(Request $request, int $id): Event
{
/** @var User $user */
$user = $request->attributes->get('user');
return $user->events()->whereKey($id)->firstOrFail();
}
}

View File

@@ -0,0 +1,70 @@
<?php
namespace App\Http\Controllers\Me;
use App\Enums\EventState;
use App\Http\Controllers\Controller;
use App\Models\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Cache;
use Illuminate\Validation\Rule;
use Illuminate\Validation\Validator;
class ProfileController extends Controller
{
public function show(Request $request): JsonResponse
{
return response()->json(self::present($request->attributes->get('user')));
}
public function update(Request $request): JsonResponse
{
/** @var User $user */
$user = $request->attributes->get('user');
$data = $request->validate([
'tz' => ['sometimes', 'string', Rule::in(\DateTimeZone::listIdentifiers())],
'quiet_start' => ['sometimes', 'date_format:H:i'],
'quiet_end' => ['sometimes', 'date_format:H:i'],
]);
$start = $data['quiet_start'] ?? substr($user->quiet_start, 0, 5);
$end = $data['quiet_end'] ?? substr($user->quiet_end, 0, 5);
if ($end >= $start) {
throw \Illuminate\Validation\ValidationException::withMessages([
'quiet_end' => 'Тихие часы должны переходить через полночь: quiet_end раньше quiet_start',
]);
}
$user->fill([
'tz' => $data['tz'] ?? $user->tz,
'quiet_start' => $start.':00',
'quiet_end' => $end.':00',
])->save();
return response()->json(self::present($user));
}
public function heartbeat(Request $request): Response
{
/** @var User $user */
$user = $request->attributes->get('user');
Cache::put("heartbeat:{$user->id}", true, config('hado.web_heartbeat_ttl'));
return response()->noContent();
}
/** @return array<string,mixed> */
public static function present(User $user): array
{
return [
'login' => $user->login,
'tz' => $user->tz,
'quiet_start' => substr($user->quiet_start, 0, 5),
'quiet_end' => substr($user->quiet_end, 0, 5),
'badge' => $user->events()->whereIn('state', [EventState::Today->value, EventState::Overdue->value])->count(),
];
}
}

View File

@@ -2,14 +2,28 @@
namespace App\Http\Middleware;
use App\Ingest\EventUpserter;
use Closure;
use Illuminate\Http\Request;
use Symfony\Component\HttpFoundation\Response;
/**
* Доверяет X-Remote-User от Caddy forward_auth (сеть изолирована, как в sekai).
* На публичных маршрутах (/api, /a, /hooks) этот middleware не стоит.
*/
class RemoteUser
{
public function __construct(private readonly EventUpserter $users) {}
public function handle(Request $request, Closure $next): Response
{
$login = trim((string) $request->header('X-Remote-User', ''));
if ($login === '') {
return response()->json(['message' => 'Нет X-Remote-User: запрос должен идти через хаб'], 401);
}
$request->attributes->set('user', $this->users->ensureUser($login));
return $next($request);
}
}