Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/CLAUDE.md

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions backend/app-modules/notifications/src/Actions/QueueEmail.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,22 @@
use PHPeste\Notifications\Enums\DeliveryStatus;
use PHPeste\Notifications\Enums\EmailTemplate;
use PHPeste\Notifications\Jobs\SendEmailDelivery;
use PHPeste\Notifications\Mail\EmailComposer;
use PHPeste\Notifications\Models\EmailDelivery;
use PHPeste\Notifications\Models\EmailSuppression;
use PHPeste\Notifications\Models\EmailUnsubscribe;

class QueueEmail implements EditionMailer
{
public function __construct(private readonly EmailComposer $composer) {}

public function preview(string $editionId, EmailTemplate $template, string $email, array $variables = [], ?string $actionUrl = null): array
{
$rendered = $this->composer->compose($editionId, $template, $email, $variables, $actionUrl);

return ['subject' => $rendered->subject, 'html' => $rendered->html, 'text' => $rendered->text];
}

public function send(string $editionId, EmailTemplate $template, string $email, string $name, array $variables = [], ?string $actionUrl = null): string
{
return $this->queue($editionId, $template, $email, $name, $variables, $actionUrl)->id;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,12 @@ interface EditionMailer
* @param array<string, string> $variables
*/
public function send(string $editionId, EmailTemplate $template, string $email, string $name, array $variables = [], ?string $actionUrl = null): string;

/**
* O e-mail como sairia, com o tema e o texto da edição, sem enviar.
*
* @param array<string, string> $variables
* @return array{subject: string, html: string, text: string}
*/
public function preview(string $editionId, EmailTemplate $template, string $email, array $variables = [], ?string $actionUrl = null): array;
}
10 changes: 8 additions & 2 deletions backend/app-modules/notifications/src/Enums/EmailTemplate.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ enum EmailTemplate: string
case SpeakerInvited = 'speaker_invited';
case TaskAssigned = 'task_assigned';
case TaskDueSoon = 'task_due_soon';
case AttendeeDataReminder = 'attendee_data_reminder';

public function label(): string
{
Expand All @@ -36,6 +37,7 @@ public function label(): string
self::SpeakerInvited => 'Convite para palestrar',
self::TaskAssigned => 'Tarefa atribuída',
self::TaskDueSoon => 'Prazo de tarefa chegando',
self::AttendeeDataReminder => 'Dados do crachá faltando',
};
}

Expand All @@ -54,6 +56,7 @@ public function trigger(): string
self::SpeakerInvited => 'Ao convidar alguém direto para palestrar',
self::TaskAssigned => 'Ao virar responsável por uma tarefa',
self::TaskDueSoon => '1 dia antes do prazo da tarefa',
self::AttendeeDataReminder => 'Quando a organização cobra os dados faltando',
};
}

Expand All @@ -72,7 +75,7 @@ public function variables(): array
self::OrderRefunded => ['nome', 'edicao', 'pedido', 'valor', 'ingressos'],
self::TicketTransferred => ['nome', 'edicao', 'data', 'remetente', 'ingresso'],
self::CfpAccepted, self::CfpWaitlisted => ['nome', 'edicao', 'proposta', 'data', 'prazo'],
self::EventReminder => ['nome', 'edicao', 'data'],
self::EventReminder, self::AttendeeDataReminder => ['nome', 'edicao', 'data'],
self::TeamInvite => ['nome', 'edicao', 'papel'],
self::ProposalReceived => ['nome', 'edicao', 'proposta', 'data'],
self::SpeakerConfirmationReminder, self::SpeakerInvited => ['nome', 'edicao', 'proposta', 'prazo'],
Expand All @@ -96,6 +99,7 @@ public function defaultSubject(): string
self::SpeakerInvited => 'Convite para palestrar no {edicao}',
self::TaskAssigned => 'Nova tarefa para você no {edicao}: {tarefa}',
self::TaskDueSoon => 'O prazo de "{tarefa}" é {prazo}',
self::AttendeeDataReminder => 'Complete seus dados para o crachá do {edicao}',
};
}

Expand All @@ -114,7 +118,8 @@ public function defaultBody(): string
self::SpeakerConfirmationReminder => "Oi, {nome}!\n\nAinda não recebemos sua confirmação para a palestra \"{proposta}\" no {edicao}. O prazo vai até {prazo}; depois disso a vaga pode ir para a lista de espera.",
self::SpeakerInvited => "Oi, {nome}!\n\nA organização do {edicao} convidou você para apresentar \"{proposta}\". Confirme sua participação pelo link abaixo até {prazo}.\n\nPara entrar, use este e-mail: se ainda não tem senha na plataforma, entre pelo GitHub ou peça uma senha em \"Esqueci minha senha\".",
self::TaskAssigned => "Oi, {nome}!\n\nVocê é responsável pela tarefa \"{tarefa}\" no {edicao}. Prazo: {prazo}.",
self::TaskDueSoon => "Oi, {nome}!\n\nA tarefa \"{tarefa}\" do {edicao}, que está com você, vence {prazo}. Se já terminou, mova para a coluna de concluídas no painel."
self::TaskDueSoon => "Oi, {nome}!\n\nA tarefa \"{tarefa}\" do {edicao}, que está com você, vence {prazo}. Se já terminou, mova para a coluna de concluídas no painel.",
self::AttendeeDataReminder => "Oi, {nome}!\n\nAinda faltam dados do seu ingresso para o {edicao}, em {data}: o nome que vai no crachá e o tamanho da camiseta. Leva um minuto: entre com este e-mail pelo link abaixo e complete.",
};
}

Expand All @@ -132,6 +137,7 @@ public function actionLabel(): string
self::ProposalReceived => 'Ver minha proposta',
self::SpeakerConfirmationReminder, self::SpeakerInvited => 'Confirmar participação',
self::TaskAssigned, self::TaskDueSoon => 'Ver tarefa',
self::AttendeeDataReminder => 'Completar meus dados',
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
it('lista os modelos da edição com o padrão de cada um', function (): void {
$this->getJson($this->url)
->assertOk()
->assertJsonCount(13, 'data')
->assertJsonCount(14, 'data')
->assertJsonPath('data.0.id', 'order_confirmed')
->assertJsonPath('data.0.label', 'Confirmação de compra')
->assertJsonPath('data.0.trigger', 'Ao pagar o pedido')
Expand Down
3 changes: 3 additions & 0 deletions backend/app-modules/ticketing/routes/ticketing-routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@
Route::post('/orders/{order}/refunds', [OrderRefundController::class, 'store'])->whereUuid('order')->name('ticketing.orders.refunds.store');
Route::post('/orders/{order}/refunds/{refund}/settle', [OrderRefundController::class, 'settle'])->whereUuid(['order', 'refund'])->name('ticketing.orders.refunds.settle');
Route::get('/tickets', [TicketController::class, 'index'])->name('ticketing.tickets.index');
Route::get('/tickets/badges', [TicketController::class, 'badges'])->name('ticketing.tickets.badges');
Route::get('/tickets/data-reminder', [TicketController::class, 'reminderPreview'])->name('ticketing.tickets.data-reminder.preview');
Route::post('/tickets/data-reminder', [TicketController::class, 'remind'])->middleware('throttle:6,1')->name('ticketing.tickets.data-reminder');
Route::get('/tickets/{ticket}', [TicketController::class, 'show'])->whereUuid('ticket')->name('ticketing.tickets.show');
Route::patch('/tickets/{ticket}', [TicketController::class, 'update'])->whereUuid('ticket')->name('ticketing.tickets.update');
Route::post('/tickets/{ticket}/transfer', [TicketController::class, 'transfer'])->whereUuid('ticket')->name('ticketing.tickets.transfer');
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php

declare(strict_types=1);

namespace PHPeste\Ticketing\Actions;

use Illuminate\Support\Facades\DB;
use Illuminate\Validation\ValidationException;
use PHPeste\Ticketing\Events\AttendeeDataReminderSent;
use PHPeste\Ticketing\Jobs\SendAttendeeDataReminders;
use PHPeste\Ticketing\Models\Ticket;
use PHPeste\Ticketing\Tickets\AttendeeData;

/**
* Cobra por e-mail quem ainda não preencheu o crachá ou a camiseta. Uma
* mensagem por pessoa, mesmo com vários ingressos. Como na importação, a
* organização vê quantas pessoas vão receber e confirma esse número.
*/
class RemindMissingAttendeeData
{
public function __construct(private readonly AttendeeData $data) {}

public function recipients(): int
{
return $this->data->missing(Ticket::query())->distinct()->count('holder_email');
}

public function handle(string $editionId, bool $confirm, ?int $recipients, ?string $actorId): int
{
$pending = $this->recipients();

if ($pending === 0) {
throw ValidationException::withMessages(['recipients' => 'Ninguém está com dados faltando.']);
}

if (!$confirm || $recipients !== $pending) {
throw ValidationException::withMessages(['confirm' => sprintf('Confirme a cobrança por e-mail para %d %s.', $pending, $pending === 1 ? 'pessoa' : 'pessoas')]);
}

DB::transaction(function () use ($editionId, $pending, $actorId): void {
event(new AttendeeDataReminderSent($editionId, $pending, $actorId));
dispatch(new SendAttendeeDataReminders($editionId));
});

return $pending;
}
}
43 changes: 41 additions & 2 deletions backend/app-modules/ticketing/src/Actions/UpdateTicketAttendee.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,63 @@

namespace PHPeste\Ticketing\Actions;

use BackedEnum;
use Illuminate\Support\Facades\DB;
use Illuminate\Validation\ValidationException;
use PHPeste\Ticketing\Events\TicketAttendeeUpdated;
use PHPeste\Ticketing\Models\Ticket;

/**
* Muda os dados de quem usa o ingresso e registra na auditoria o que mudou,
* com o valor de antes e o de depois. A acessibilidade entra só como
* "mudou", sem o texto.
*/
class UpdateTicketAttendee
{
public const array FIELDS = ['holder_name', 'badge_name', 'company', 'tshirt_size', 'accessibility'];

/**
* @param array<string, mixed> $data
*/
public function handle(Ticket $ticket, array $data): Ticket
public function handle(Ticket $ticket, array $data, ?string $actorId = null): Ticket
{
if (!$ticket->isActive()) {
throw ValidationException::withMessages(['ticket' => 'Ingresso cancelado não pode ser alterado.']);
}

$ticket->update(array_intersect_key($data, array_flip(self::FIELDS)));
$ticket->fill(array_intersect_key($data, array_flip(self::FIELDS)));
$changed = array_keys($ticket->getDirty());

if ($changed === []) {
return $ticket;
}

$before = [];
$after = [];

foreach ($changed as $field) {
$before[$field] = $this->value($field, $ticket->getOriginal($field));
$after[$field] = $this->value($field, $ticket->getAttribute($field));
}

DB::transaction(function () use ($ticket, $before, $after, $actorId): void {
$ticket->save();
event(new TicketAttendeeUpdated($ticket->edition_id, $ticket->id, $before, $after, $actorId));
});

return $ticket->refresh();
}

private function value(string $field, mixed $value): ?string
{
if ($field === 'accessibility') {
return $value === null ? null : 'preenchido';
}

if ($value instanceof BackedEnum) {
return (string) $value->value;
}

return is_scalar($value) ? (string) $value : null;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?php

declare(strict_types=1);

namespace PHPeste\Ticketing\Events;

use Illuminate\Contracts\Events\ShouldDispatchAfterCommit;
use Illuminate\Foundation\Events\Dispatchable;
use PHPeste\Audit\Contracts\Auditable;
use PHPeste\Audit\Data\AuditRecord;

/**
* A organização cobrou por e-mail os dados de crachá que faltavam.
*/
class AttendeeDataReminderSent implements Auditable, ShouldDispatchAfterCommit
{
use Dispatchable;

public function __construct(
public readonly string $editionId,
public readonly int $recipients,
public readonly ?string $actorId,
) {}

public function auditRecord(): AuditRecord
{
return new AuditRecord($this->editionId, 'ticketing.attendee_data_reminder_sent', 'edition', $this->editionId, $this->actorId, null, ['recipients' => $this->recipients]);
}
}
37 changes: 37 additions & 0 deletions backend/app-modules/ticketing/src/Events/TicketAttendeeUpdated.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?php

declare(strict_types=1);

namespace PHPeste\Ticketing\Events;

use Illuminate\Contracts\Events\ShouldDispatchAfterCommit;
use Illuminate\Foundation\Events\Dispatchable;
use PHPeste\Audit\Contracts\Auditable;
use PHPeste\Audit\Data\AuditRecord;

/**
* Os dados de quem usa o ingresso mudaram (nome, crachá, empresa, camiseta
* ou acessibilidade). A acessibilidade é sensível: a auditoria guarda só que
* ela mudou, nunca o texto.
*/
class TicketAttendeeUpdated implements Auditable, ShouldDispatchAfterCommit
{
use Dispatchable;

/**
* @param array<string, string|null> $before
* @param array<string, string|null> $after
*/
public function __construct(
public readonly string $editionId,
public readonly string $ticketId,
public readonly array $before,
public readonly array $after,
public readonly ?string $actorId,
) {}

public function auditRecord(): AuditRecord
{
return new AuditRecord($this->editionId, 'ticketing.ticket_attendee_updated', 'ticket', $this->ticketId, $this->actorId, $this->before, $this->after);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function update(UpdateTicketAttendeeRequest $request, UpdateTicketAttende
/** @var array<string, mixed> $data */
$data = $request->validated();

return $this->present($update->handle($this->ticket($request), $data)->load(['item', 'order']));
return $this->present($update->handle($this->ticket($request), $data, (string) $this->user($request)->getAuthIdentifier())->load(['item', 'order']));
}

public function transfer(TransferTicketRequest $request, TransferTicket $transfer): TicketResource
Expand Down
Loading
Loading