Add projects for events

Default project is assigned to events by default. For sentry events project id is taken from projectId param in sentry.event.store route. Events can by filtered by setting projectId in events.type route.
buggregator · Aug 1, 2022 · e063e6e · e063e6e
1 parent 2b45d6b
commit e063e6e
Show file tree

Hide file tree

Showing 47 changed files with 439 additions and 60 deletions.
diff --git a/app/Application/Commands/FindAllEvents.php b/app/Application/Commands/FindAllEvents.php
@@ -10,7 +10,8 @@ final class FindAllEvents implements Query
 {
  // TODO: use readonly property
  public function __construct(
- public ?string $type = null
+ public ?string $type = null,
+ public ?int $projectId = null,
  ) {
  }
 }
diff --git a/app/Application/Commands/FindAllProjects.php b/app/Application/Commands/FindAllProjects.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Commands;
+
+use App\Contracts\Query\Query;
+
+class FindAllProjects implements Query
+{
+}
diff --git a/app/Application/Commands/FindProjectByName.php b/app/Application/Commands/FindProjectByName.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Commands;
+
+use App\Contracts\Query\Query;
+
+class FindProjectByName implements Query
+{
+ public function __construct(
+ public string $name
+ ) {
+ }
+}
diff --git a/app/Application/Commands/HandleReceivedEvent.php b/app/Application/Commands/HandleReceivedEvent.php
@@ -13,6 +13,7 @@ final class HandleReceivedEvent implements Command
  public int $timestamp;
 
  public function __construct(
+ public int $projectId,
  public string $type,
  public array $payload,
  public bool $sendToConsole = false
@@ -24,6 +25,7 @@ public function __construct(
  public function toArray(): array
  {
  return [
+ 'projectId' => $this->projectId,
  'type' => $this->type,
  'payload' => $this->payload,
  'uuid' => (string) $this->uuid,

diff --git a/app/Modules/Events/Application/Commands/StoreEvent/Command.php b/app/Modules/Events/Application/Commands/StoreEvent/Command.php
@@ -15,6 +15,7 @@ public function __construct(
  public Uuid $uuid,
  public DateTimeImmutable $date,
  public array $payload,
+ public int $projectId,
  ) {
  }
 }
diff --git a/app/Modules/Events/Application/Commands/StoreEvent/Handler.php b/app/Modules/Events/Application/Commands/StoreEvent/Handler.php
@@ -29,7 +29,8 @@ public function handle(Command $command): void
  $command->uuid,
  $command->type,
  new Json($command->payload),
- $command->date
+ $command->date,
+ $command->projectId
  )
  );
 
@@ -44,13 +45,14 @@ public function __invoke(HandleReceivedEvent $command): void
  type: $command->type,
  uuid: $command->uuid,
  date: Carbon::createFromTimestamp($command->timestamp)->toDateTimeImmutable(),
- payload: $command->payload
+ payload: $command->payload,
+ projectId: $command->projectId
  )
  );
 
  $this->dispatcher->dispatch(
  new EventWasReceived(
- $command->uuid, $command->type, $command->payload, $command->timestamp, $command->sendToConsole
+ $command->projectId, $command->uuid, $command->type, $command->payload, $command->timestamp, $command->sendToConsole
  )
  );
  }

diff --git a/app/Modules/Events/Application/Queries/FindAllEvents/Handler.php b/app/Modules/Events/Application/Queries/FindAllEvents/Handler.php
@@ -23,6 +23,9 @@ public function __invoke(FindAllEvents $query): iterable
  if ($query->type) {
  $scope['type'] = $query->type;
  }
+ if ($query->projectId) {
+ $scope['project_id'] = $query->projectId;
+ }
 
  return EventCollection::make(
  $this->events->findAll($scope, [

diff --git a/app/Modules/Events/Domain/Event.php b/app/Modules/Events/Domain/Event.php
@@ -28,7 +28,10 @@ public function __construct(
  private Json $payload,
 
  #[Column(type: 'datetime')]
- private DateTimeImmutable $date
+ private DateTimeImmutable $date,
+
+ #[Column(type: 'integer', nullable: false)]
+ private int $projectId
  ) {
  }
 
@@ -51,4 +54,9 @@ public function getDate(): DateTimeImmutable
  {
  return $this->date;
  }
+
+ public function getProjectId(): int
+ {
+ return $this->projectId;
+ }
 }
diff --git a/app/Modules/Events/Interfaces/Http/Controllers/ListAction.php b/app/Modules/Events/Interfaces/Http/Controllers/ListAction.php
@@ -16,7 +16,7 @@
 class ListAction extends Controller
 {
  #[Get(uri: '/', name: 'events', middleware: 'auth')]
- public function eventList(Request $request, QueryBus $bus, ActionMap $actionMap, ?string $type = null)
+ public function eventList(Request $request, QueryBus $bus, ActionMap $actionMap, ?string $type = null, ?int $projectId = null)
  {
  $action = 'Events';
  if ($type) {
@@ -28,15 +28,15 @@ public function eventList(Request $request, QueryBus $bus, ActionMap $actionMap,
  }
 
  return Inertia::render($action, [
- 'events' => $bus->ask(new FindAllEvents(type: $type)),
+ 'events' => $bus->ask(new FindAllEvents(type: $type, projectId: $projectId)),
  'version' => config('app.version'),
  'name' => config('app.name'),
  ]);
  }
 
- #[Get(uri: '/events/{type}', name: 'events.type')]
- public function eventListByType(Request $request, QueryBus $bus, ActionMap $actionMap, string $type)
+ #[Get(uri: '/events/type/{type}/{projectId?}', name: 'events.type')]
+ public function eventListByType(Request $request, QueryBus $bus, ActionMap $actionMap, string $type, ?int $projectId = null)
  {
- return $this->eventList($request, $bus, $actionMap, $type);
+ return $this->eventList($request, $bus, $actionMap, $type, $projectId);
  }
 }
diff --git a/app/Modules/Events/Projectors/EventProjector.php b/app/Modules/Events/Projectors/EventProjector.php
@@ -26,7 +26,8 @@ public function onEventWasReceived(EventWasReceived $event): void
  $event->type,
  $event->uuid,
  Carbon::createFromTimestamp($event->timestamp)->toDateTimeImmutable(),
- $event->payload
+ $event->payload,
+ $event->projectId
  )
  );
  }

diff --git a/app/Modules/IncommingEvents/Application/Commands/HandleReceivedEvent/Handler.php b/app/Modules/IncommingEvents/Application/Commands/HandleReceivedEvent/Handler.php
@@ -20,6 +20,7 @@ public function __invoke(HandleReceivedEvent $command): void
  {
  $this->repository->persist(
  EventProcess::received(
+ $command->projectId,
  $command->uuid,
  $command->type,
  $command->payload,

diff --git a/app/Modules/IncommingEvents/Domain/EventProcess.php b/app/Modules/IncommingEvents/Domain/EventProcess.php
@@ -21,11 +21,11 @@ final class EventProcess implements AggregateRoot
  private DateTimeImmutable $date;
  private bool $deleted = false;
 
- public static function received(Uuid $uuid, string $type, array $payload, int $timestamp): static
+ public static function received(int $projectId, Uuid $uuid, string $type, array $payload, int $timestamp): static
  {
  $process = new static($uuid);
  $process->recordThat(
- new EventWasReceived($uuid, $type, $payload, $timestamp)
+ new EventWasReceived($projectId, $uuid, $type, $payload, $timestamp)
  );
 
  return $process;

diff --git a/app/Modules/IncommingEvents/Domain/Events/EventWasReceived.php b/app/Modules/IncommingEvents/Domain/Events/EventWasReceived.php
@@ -14,6 +14,7 @@ final class EventWasReceived implements Event, ShouldBroadcastNow
 {
  // TODO: use readonly property
  public function __construct(
+ public int $projectId,
  public Uuid $uuid,
  public string $type,
  public array $payload,
@@ -25,6 +26,7 @@ public function __construct(
  public function toPayload(): array
  {
  return [
+ 'projectId' => $this->projectId,
  'uuid' => (string) $this->uuid,
  'type' => $this->type,
  'payload' => $this->payload,

diff --git a/app/Modules/Inspector/Interfaces/Http/Controllers/StoreEventAction.php b/app/Modules/Inspector/Interfaces/Http/Controllers/StoreEventAction.php
@@ -4,8 +4,10 @@
 
 namespace Modules\Inspector\Interfaces\Http\Controllers;
 
+use App\Commands\FindProjectByName;
 use App\Commands\HandleReceivedEvent;
 use App\Contracts\Command\CommandBus;
+use App\Contracts\Query\QueryBus;
 use Illuminate\Http\Request;
 use Interfaces\Http\Controllers\Controller;
 use Spatie\RouteAttributes\Attributes\Post;
@@ -17,6 +19,7 @@ class StoreEventAction extends Controller
  public function __invoke(
  Request $request,
  CommandBus $commands,
+ QueryBus $queryBus,
  ): void {
  $data = json_decode(base64_decode($request->getContent()), true)
  ?? throw new HttpException(500, 'Invalid data');
@@ -27,8 +30,10 @@ public function __invoke(
  abort(403);
  }
 
+ $project = $queryBus->ask(new FindProjectByName('default'));
+ $projectId = $project->getId();
  $commands->dispatch(
- new HandleReceivedEvent('inspector', $data, true)
+ new HandleReceivedEvent((int) $projectId, 'inspector', $data, true)
  );
  }
 }
diff --git a/app/Modules/Monolog/Console/TcpHandler.php b/app/Modules/Monolog/Console/TcpHandler.php
@@ -4,8 +4,10 @@
 
 namespace Modules\Monolog\Console;
 
+use App\Commands\FindProjectByName;
 use App\Commands\HandleReceivedEvent;
 use App\Contracts\Command\CommandBus;
+use App\Contracts\Query\QueryBus;
 use App\Contracts\TCP\Handler;
 use App\Contracts\TCP\Response;
 use App\TCP\CloseConnection;
@@ -19,7 +21,8 @@ class TcpHandler implements Handler
 {
  public function __construct(
  private CommandBus $commands,
- private \Interfaces\Console\StreamHandler $streamHandler
+ private \Interfaces\Console\StreamHandler $streamHandler,
+ private QueryBus $queryBus,
  ) {
  }
 
@@ -39,8 +42,10 @@ public function handle(Request $request, OutputInterface $output): Response
  throw new RuntimeException("Unable to decode a message from [{$request->connectionUuid}] client.");
  }
 
+ $project = $this->queryBus->ask(new FindProjectByName('default'));
+ $projectId = $project->getId();
  $this->commands->dispatch(
- $command = new HandleReceivedEvent('monolog', $payload)
+ $command = new HandleReceivedEvent((int) $projectId, 'monolog', $payload)
  );
 
  $this->streamHandler->handle($command->toArray());

diff --git a/app/Modules/Monolog/Interfaces/Http/Controllers/Slack/StoreEventAction.php b/app/Modules/Monolog/Interfaces/Http/Controllers/Slack/StoreEventAction.php
@@ -4,8 +4,10 @@
 
 namespace Modules\Monolog\Interfaces\Http\Controllers\Slack;
 
+use App\Commands\FindProjectByName;
 use App\Commands\HandleReceivedEvent;
 use App\Contracts\Command\CommandBus;
+use App\Contracts\Query\QueryBus;
 use Illuminate\Http\Request;
 use Interfaces\Http\Controllers\Controller;
 use Spatie\RouteAttributes\Attributes\Post;
@@ -16,9 +18,12 @@ class StoreEventAction extends Controller
  public function __invoke(
  Request $request,
  CommandBus $commands,
+ QueryBus $queryBus,
  ): void {
+ $project = $queryBus->ask(new FindProjectByName('default'));
+ $projectId = $project->getId();
  $commands->dispatch(
- new HandleReceivedEvent('slack', $request->all())
+ new HandleReceivedEvent((int) $projectId, 'slack', $request->all())
  );
  }
 }
diff --git a/app/Modules/Project/Application/Queries/FindAllProjects/Handler.php b/app/Modules/Project/Application/Queries/FindAllProjects/Handler.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Modules\Project\Application\Queries\FindAllProjects;
+
+use App\Commands\FindAllProjects;
+use App\Contracts\Query\QueryHandler;
+use Modules\Project\Application\Resources\ProjectCollection;
+use Modules\Project\Domain\ProjectRepository;
+
+class Handler implements QueryHandler
+{
+ public function __construct(
+ private ProjectRepository $projects
+ ) {
+ }
+
+ #[\App\Attributes\QueryBus\QueryHandler]
+ public function __invoke(FindAllProjects $query): iterable
+ {
+ return ProjectCollection::make(
+ $this->projects->findAll()
+ );
+ }
+}
diff --git a/app/Modules/Project/Application/Queries/FindByName/Handler.php b/app/Modules/Project/Application/Queries/FindByName/Handler.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Modules\Project\Application\Queries\FindByName;
+
+use App\Commands\FindProjectByName;
+use App\Contracts\Query\QueryHandler;
+use App\Exceptions\EntityNotFoundException;
+use Modules\Project\Application\Resources\ProjectResource;
+use Modules\Project\Domain\ProjectRepository;
+
+class Handler implements QueryHandler
+{
+ public function __construct(private ProjectRepository $projectRepository)
+ {
+ }
+
+ #[\App\Attributes\QueryBus\QueryHandler]
+ public function __invoke(FindProjectByName $query): ProjectResource
+ {
+ $project = $this->projectRepository->findOne(['name' => $query->name]);
+ if (! $project) {
+ throw new EntityNotFoundException(
+ sprintf('Project with given name [%s] was not found.', $query->name)
+ );
+ }
+
+ return new ProjectResource($project);
+ }
+}
diff --git a/app/Modules/Project/Application/Resources/ProjectCollection.php b/app/Modules/Project/Application/Resources/ProjectCollection.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Modules\Project\Application\Resources;
+
+use Illuminate\Http\Resources\Json\ResourceCollection;
+
+class ProjectCollection extends ResourceCollection
+{
+ public $collects = ProjectResource::class;
+}
diff --git a/app/Modules/Project/Application/Resources/ProjectResource.php b/app/Modules/Project/Application/Resources/ProjectResource.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Modules\Project\Application\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ProjectResource extends JsonResource
+{
+ public function toArray($request): array
+ {
+ return [
+ 'id' => $this->getId(),
+ 'name' => $this->getName(),
+ ];
+ }
+}