Merge pull request #100 from js361014/performance

Added performance module
buggregator · Oct 28, 2022 · 6578ce4 · 6578ce4
2 parents 9de3cf1 + 158c594
commit 6578ce4
Show file tree

Hide file tree

Showing 64 changed files with 1,303 additions and 77 deletions.
diff --git a/app/Application/Commands/FindAllEvents.php → app/Application/Commands/AskEvents.php b/app/Application/Commands/FindAllEvents.php → app/Application/Commands/AskEvents.php
@@ -1,17 +1,15 @@
 <?php
 
-declare(strict_types=1);
-
 namespace App\Commands;
 
 use App\Contracts\Query\Query;
 
-final class FindAllEvents implements Query
+abstract class AskEvents implements Query
 {
-    // TODO: use readonly property
     public function __construct(
         public ?string $type = null,
         public ?int $projectId = null,
+        public ?int $transactionId = null,
     ) {
     }
 }
diff --git a/app/Application/Commands/CountEvents.php b/app/Application/Commands/CountEvents.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Commands;
+
+use App\Contracts\Query\Query;
+
+final class CountEvents extends AskEvents implements Query
+{
+}
diff --git a/app/Application/Commands/FindAllTransactions.php b/app/Application/Commands/FindAllTransactions.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Commands;
+
+use App\Contracts\Query\Query;
+
+class FindAllTransactions implements Query
+{
+}
diff --git a/app/Application/Commands/FindEvents.php b/app/Application/Commands/FindEvents.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Commands;
+
+use App\Contracts\Query\Query;
+
+final class FindEvents extends AskEvents implements Query
+{
+    // TODO: use readonly property
+    public function __construct(
+        public ?string $type = null,
+        public ?int $projectId = null,
+        public ?int $transactionId = null,
+        public ?int $offset = null,
+        public ?int $limit = null,
+    ) {
+        parent::__construct($this->type, $this->projectId, $this->transactionId);
+    }
+}
diff --git a/app/Application/Commands/FindTransactionByName.php b/app/Application/Commands/FindTransactionByName.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Commands;
+
+use App\Contracts\Query\Query;
+
+class FindTransactionByName implements Query
+{
+    public function __construct(
+        public string $name
+    ) {
+    }
+}
diff --git a/app/Application/Commands/HandleReceivedEvent.php b/app/Application/Commands/HandleReceivedEvent.php
@@ -16,7 +16,8 @@ public function __construct(
         public int $projectId,
         public string $type,
         public array $payload,
-        public bool $sendToConsole = false
+        public bool $sendToConsole = false,
+        public ?int $transactionId = null,
     ) {
         $this->uuid = Uuid::generate();
         $this->timestamp = time();
@@ -26,6 +27,7 @@ public function toArray(): array
     {
         return [
             'projectId' => $this->projectId,
+            'transactionId' => $this->transactionId,
             'type' => $this->type,
             'payload' => $this->payload,
             'uuid' => (string) $this->uuid,

diff --git a/app/Infrastructure/CycleOrm/Repository.php b/app/Infrastructure/CycleOrm/Repository.php
@@ -9,11 +9,22 @@
 
 class Repository extends BaseRepository
 {
-    public function findAll(array $scope = [], array $orderBy = []): Collection
+    public function findAll(array $scope = [], array $orderBy = [], $limit = null, $offset = null): Collection
     {
-        return $this->newCollection(
-            $this->select()->where($scope)->orderBy($orderBy)->fetchAll()
-        );
+        $select = $this->select()->where($scope)->orderBy($orderBy);
+        if (! is_null($limit)) {
+            $select = $select->limit($limit);
+        }
+        if (! is_null($offset)) {
+            $select = $select->offset($offset);
+        }
+
+        return $this->newCollection($select->fetchAll());
+    }
+
+    public function count(array $scope = []): int
+    {
+        return $this->select()->where($scope)->count();
     }
 
     private function newCollection(array $items): Collection

diff --git a/app/Modules/Events/Application/Commands/ClearEvents/Handler.php b/app/Modules/Events/Application/Commands/ClearEvents/Handler.php
@@ -27,6 +27,8 @@ public function __invoke(Command $command): void
         $scope = [];
         if ($command->type) {
             $scope['type'] = $command->type;
+        } else {
+            $scope['type'] = ['<>' => 'sentryTransaction'];
         }
 
         // TODO: make more optimized

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

diff --git a/app/Modules/Events/Application/Queries/CountEvents/Handler.php b/app/Modules/Events/Application/Queries/CountEvents/Handler.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Modules\Events\Application\Queries\CountEvents;
+
+use App\Commands\CountEvents;
+use App\Contracts\Query\QueryHandler;
+use Modules\Events\Application\Queries\EventsHandler;
+use Modules\Events\Domain\EventRepository;
+
+class Handler extends EventsHandler implements QueryHandler
+{
+    public function __construct(
+        private EventRepository $events
+    ) {
+    }
+
+    #[\App\Attributes\QueryBus\QueryHandler]
+    public function __invoke(CountEvents $query): int
+    {
+        return $this->events->count(self::getScopeFromFindEvents($query));
+    }
+}
diff --git a/app/Modules/Events/Application/Queries/EventsHandler.php b/app/Modules/Events/Application/Queries/EventsHandler.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Modules\Events\Application\Queries;
+
+use App\Commands\AskEvents;
+
+abstract class EventsHandler
+{
+    protected static function getScopeFromFindEvents(AskEvents $query): array
+    {
+        $scope = [];
+        if ($query->type) {
+            $scope['type'] = $query->type;
+        } else {
+            $scope['type'] = ['<>' => 'sentryTransaction'];
+        }
+        if ($query->projectId) {
+            $scope['project_id'] = $query->projectId;
+        }
+        if ($query->transactionId) {
+            $scope['transaction_id'] = $query->transactionId;
+        }
+
+        return $scope;
+    }
+}
diff --git a/app/Modules/Events/Application/Queries/FindAllEvents/Handler.php b/app/Modules/Events/Application/Queries/FindAllEvents/Handler.php
diff --git a/app/Modules/Events/Application/Queries/FindEvents/Handler.php b/app/Modules/Events/Application/Queries/FindEvents/Handler.php
@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Modules\Events\Application\Queries\FindEvents;
+
+use App\Commands\FindEvents;
+use App\Contracts\Query\QueryHandler;
+use Modules\Events\Application\Queries\EventsHandler;
+use Modules\Events\Application\Resources\EventCollection;
+use Modules\Events\Domain\EventRepository;
+
+class Handler extends EventsHandler implements QueryHandler
+{
+    public function __construct(
+        private EventRepository $events
+    ) {
+    }
+
+    #[\App\Attributes\QueryBus\QueryHandler]
+    public function __invoke(FindEvents $query): iterable
+    {
+        return EventCollection::make(
+            $this->events->findAll(
+                self::getScopeFromFindEvents($query),
+                ['date' => 'asc'],
+                $query->limit,
+                $query->offset,
+            )
+        );
+    }
+}
diff --git a/app/Modules/Events/Application/Resources/EventResource.php b/app/Modules/Events/Application/Resources/EventResource.php
@@ -15,6 +15,8 @@ public function toArray($request)
             'type' => $this->getType(),
             'payload' => $this->getPayload()->toArray(),
             'timestamp' => $this->getDate()->getTimestamp(),
+            'projectId' => $this->getProjectId(),
+            'transactionId' => $this->getTransactionId(),
         ];
     }
 }
diff --git a/app/Modules/Events/Domain/Event.php b/app/Modules/Events/Domain/Event.php
@@ -31,7 +31,10 @@ public function __construct(
         private DateTimeImmutable $date,
 
         #[Column(type: 'integer', nullable: false)]
-        private int $projectId
+        private int $projectId,
+
+        #[Column(type: 'integer', nullable: true)]
+        private ?int $transactionId
     ) {
     }
 
@@ -59,4 +62,9 @@ public function getProjectId(): int
     {
         return $this->projectId;
     }
+
+    public function getTransactionId(): ?int
+    {
+        return $this->transactionId;
+    }
 }
diff --git a/app/Modules/Events/Interfaces/Http/Controllers/ListAction.php b/app/Modules/Events/Interfaces/Http/Controllers/ListAction.php
@@ -4,7 +4,8 @@
 
 namespace Modules\Events\Interfaces\Http\Controllers;
 
-use App\Commands\FindAllEvents;
+use App\Commands\CountEvents;
+use App\Commands\FindEvents;
 use App\Contracts\Query\QueryBus;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
@@ -16,7 +17,7 @@
 class ListAction extends Controller
 {
     #[Get(uri: '/', name: 'events', middleware: 'auth')]
-    public function eventList(Request $request, QueryBus $bus, ActionMap $actionMap, ?string $type = null, ?int $projectId = null)
+    public function eventList(Request $request, QueryBus $bus, ActionMap $actionMap, ?string $type = null, ?int $projectId = null, ?int $transactionId = null)
     {
         $action = 'Events';
         if ($type) {
@@ -27,16 +28,38 @@ public function eventList(Request $request, QueryBus $bus, ActionMap $actionMap,
             }
         }
 
-        return Inertia::render($action, [
-            'events' => $bus->ask(new FindAllEvents(type: $type, projectId: $projectId)),
+        $props = [
             'version' => config('app.version'),
             'name' => config('app.name'),
-        ]);
+        ];
+
+        if ($action == 'SentryTransaction/Index') {
+            $props = array_merge($props, [
+                'eventsCount' => $bus->ask(new CountEvents(
+                    type: $type, projectId: $projectId, transactionId: $transactionId
+                )),
+                'type' => $type,
+                'projectId' => $projectId,
+                'transactionId' => $transactionId,
+            ]);
+        } else {
+            $props = array_merge($props, [
+                'events' => $bus->ask(new FindEvents(type: $type, projectId: $projectId)),
+            ]);
+        }
+
+        return Inertia::render($action, $props);
     }
 
     #[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, $projectId);
     }
+
+    #[Get(uri: '/events/transactions/{transactionId}/{projectId}', name: 'events.transactions', middleware: 'auth')]
+    public function transactionEventList(Request $request, QueryBus $bus, ActionMap $actionMap, int $transactionId, int $projectId): \Inertia\Response
+    {
+        return $this->eventList($request, $bus, $actionMap, 'sentryTransaction', $projectId, $transactionId);
+    }
 }