Merge pull request #110 from buggregator/feauture/107

Adds an ability to remove events by uuids
buggregator · Dec 4, 2023 · 462101b · 462101b
2 parents 6e291e3 + 351e2eb
commit 462101b
Show file tree

Hide file tree

Showing 17 changed files with 175 additions and 16 deletions.
diff --git a/app/modules/Events/Interfaces/Commands/ClearEventsHandler.php b/app/modules/Events/Interfaces/Commands/ClearEventsHandler.php
@@ -21,7 +21,16 @@ public function __construct(
     #[CommandHandler]
     public function __invoke(ClearEvents $command): void
     {
-        $this->events->deleteAll($command->type ? ['type' => $command->type] : []);
+        $args = [];
+        if ($command->type) {
+            $args['type'] = $command->type;
+        }
+
+        if ($command->uuids) {
+            $args['uuid'] = $command->uuids;
+        }
+
+        $this->events->deleteAll($args);
         $this->dispatcher->dispatch(new EventsWasClear(type: $command->type));
     }
 }
diff --git a/app/modules/Events/Interfaces/Http/Controllers/ClearAction.php b/app/modules/Events/Interfaces/Http/Controllers/ClearAction.php
@@ -33,7 +33,7 @@ final class ClearAction
     public function __invoke(ClearEventsRequest $request, CommandBusInterface $bus): ResourceInterface
     {
         $bus->dispatch(
-            new ClearEvents(type: $request->type),
+            new ClearEvents(type: $request->type, uuids: $request->uuids),
         );
 
         return new SuccessResource();

diff --git a/app/modules/Events/Interfaces/Http/Request/ClearEventsRequest.php b/app/modules/Events/Interfaces/Http/Request/ClearEventsRequest.php
@@ -4,6 +4,7 @@
 
 namespace Modules\Events\Interfaces\Http\Request;
 
+use Modules\Events\Interfaces\Http\Resources\EventResource;
 use Spiral\Filters\Attribute\Input\Data;
 use Spiral\Filters\Model\Filter;
 use Spiral\Filters\Model\FilterDefinitionInterface;
@@ -26,10 +27,21 @@ final class ClearEventsRequest extends Filter implements HasFilterDefinition
     #[Data]
     public ?string $type = null;
 
+    #[OA\Property(
+        property: 'uuids',
+        description: 'Uuids',
+        type: 'array',
+        items: new OA\Items(type: 'string', format: 'uuid'),
+        nullable: true,
+    )]
+    #[Data]
+    public ?array $uuids = null;
+
     public function filterDefinition(): FilterDefinitionInterface
     {
         return new FilterDefinition([
             'type' => ['string'],
+            'uuids' => ['array'],
         ]);
     }
 }
diff --git a/app/src/Application/Commands/ClearEvents.php b/app/src/Application/Commands/ClearEvents.php
@@ -9,6 +9,7 @@
 class ClearEvents implements CommandInterface
 {
     public function __construct(
-        public readonly ?string $type = null
+        public readonly ?string $type = null,
+        public readonly ?array $uuids = null,
     ) {}
 }
diff --git a/app/src/Application/Persistence/CacheEventRepository.php b/app/src/Application/Persistence/CacheEventRepository.php
@@ -56,6 +56,7 @@ public function store(Event $event): bool
         $id = (string)$event->getUuid();
         $ids = $this->getEventIds();
         $ids[$id] = [
+            'uuid' => (string)$event->getUuid(),
             'type' => $event->getType(),
             'date' => \microtime(true),
         ];
@@ -168,7 +169,11 @@ private function getFilteredEventIds(array $scope = [], array $orderBy = []): ar
     {
         $criteria = (new Criteria())->orderBy($orderBy);
         foreach ($scope as $key => $value) {
-            $criteria->andWhere(Criteria::expr()->eq($key, $value));
+            match (true) {
+                \is_array($value) => $criteria->orWhere(Criteria::expr()->in($key, $value)),
+                null === $value => $criteria->orWhere(Criteria::expr()->isNull($key)),
+                default => $criteria->orWhere(Criteria::expr()->eq($key, $value)),
+            };
         }
 
         $ids = (new ArrayCollection($this->getEventIds()))->matching($criteria)->toArray();

diff --git a/tests/App/Events/EventsMocker.php b/tests/App/Events/EventsMocker.php
@@ -7,6 +7,7 @@
 use App\Application\Domain\ValueObjects\Uuid;
 use Mockery\MockInterface;
 use Modules\Events\Domain\EventRepositoryInterface;
+use PHPUnit\Framework\TestCase;
 
 final class EventsMocker
 {
@@ -34,11 +35,23 @@ public function eventShouldBeDeleted(Uuid $uuid, bool $status = true): void
             ->andReturn($status);
     }
 
-    public function eventShouldBeClear(?string $type = null): void
+    public function eventShouldBeClear(?string $type = null, ?array $uuids = null): void
     {
+        $args = [];
+        if ($type) {
+            $args['type'] = $type;
+        }
+
+        if ($uuids) {
+            $args['uuid'] = $uuids;
+        }
+
         $this->events
             ->shouldReceive('deleteAll')
-            ->with($type ? ['type' => $type] : [])
+            ->withArgs(function (array $data) use($args): bool {
+                TestCase::assertSame($args, $data);
+                return true;
+            })
             ->once();
     }
 }
diff --git a/tests/App/Http/HttpFaker.php b/tests/App/Http/HttpFaker.php
@@ -40,12 +40,21 @@ public function deleteEvent(Uuid $uuid): ResponseAssertions
         );
     }
 
-    public function clearEvents(?string $type = null): ResponseAssertions
+    public function clearEvents(?string $type = null, ?array $uuids = null): ResponseAssertions
     {
+        $args = [];
+        if ($type) {
+            $args['type'] = $type;
+        }
+
+        if ($uuids) {
+            $args['uuids'] = $uuids;
+        }
+
         return $this->makeResponse(
             $this->http->deleteJson(
                 uri: '/api/events/',
-                data: $type ? ['type' => $type] : [],
+                data: $args,
             ),
         );
     }

diff --git a/tests/Feature/Interfaces/Http/Events/ClearActionTest.php b/tests/Feature/Interfaces/Http/Events/ClearActionTest.php
@@ -25,4 +25,22 @@ public function testClearEventsByType(): void
             ->clearEvents(type: 'test')
             ->assertSuccessResource();
     }
+
+    public function testClearEventsByUuids(): void
+    {
+        $this->fakeEvents()->eventShouldBeClear(uuids: ['foo', 'bar']);
+
+        $this->http
+            ->clearEvents(uuids: ['foo', 'bar'])
+            ->assertSuccessResource();
+    }
+
+    public function testClearEventsByTypeAndUuids(): void
+    {
+        $this->fakeEvents()->eventShouldBeClear(type: 'test', uuids: ['foo', 'bar']);
+
+        $this->http
+            ->clearEvents(type: 'test', uuids: ['foo', 'bar'])
+            ->assertSuccessResource();
+    }
 }
diff --git a/tests/Feature/Interfaces/Http/Inspector/InspectorActionTest.php b/tests/Feature/Interfaces/Http/Inspector/InspectorActionTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Interfaces\Http\Inspector;
+namespace Tests\Feature\Interfaces\Http\Inspector;
 
 use Nyholm\Psr7\Stream;
 use Tests\Feature\Interfaces\Http\ControllerTestCase;

diff --git a/tests/Feature/Interfaces/Http/Ray/AvailabilityCheckActionTest.php b/tests/Feature/Interfaces/Http/Ray/AvailabilityCheckActionTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Interfaces\Http\Ray;
+namespace Tests\Feature\Interfaces\Http\Ray;
 
 use Tests\Feature\Interfaces\Http\ControllerTestCase;
 

diff --git a/tests/Feature/Interfaces/Http/Ray/LocksActionTest.php b/tests/Feature/Interfaces/Http/Ray/LocksActionTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Interfaces\Http\Ray;
+namespace Tests\Feature\Interfaces\Http\Ray;
 
 use Psr\SimpleCache\CacheInterface;
 use Tests\Feature\Interfaces\Http\ControllerTestCase;

diff --git a/tests/Feature/Interfaces/Http/Ray/RayActionTest.php b/tests/Feature/Interfaces/Http/Ray/RayActionTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Interfaces\Http\Ray;
+namespace Tests\Feature\Interfaces\Http\Ray;
 
 use Nyholm\Psr7\Stream;
 use Tests\Feature\Interfaces\Http\ControllerTestCase;

diff --git a/tests/Feature/Interfaces/Http/Sentry/SentryV3ActionTest.php b/tests/Feature/Interfaces/Http/Sentry/SentryV3ActionTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Interfaces\Http\Sentry;
+namespace Tests\Feature\Interfaces\Http\Sentry;
 
 use Nyholm\Psr7\Stream;
 use Tests\Feature\Interfaces\Http\ControllerTestCase;

diff --git a/tests/Feature/Interfaces/Http/Sentry/SentryV4ActionTest.php b/tests/Feature/Interfaces/Http/Sentry/SentryV4ActionTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Interfaces\Http\Sentry;
+namespace Tests\Feature\Interfaces\Http\Sentry;
 
 use Nyholm\Psr7\Stream;
 use Tests\Feature\Interfaces\Http\ControllerTestCase;

diff --git a/tests/Feature/Interfaces/TCP/VarDumper/SymfonyV6Test.php b/tests/Feature/Interfaces/TCP/VarDumper/SymfonyV6Test.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Interfaces\TCP\VarDumper;
+namespace Tests\Feature\Interfaces\TCP\VarDumper;
 
 use Modules\VarDumper\Interfaces\TCP\Service;
 use Spiral\RoadRunner\Tcp\Request;

diff --git a/tests/Feature/Interfaces/TCP/VarDumper/SymfonyV7Test.php b/tests/Feature/Interfaces/TCP/VarDumper/SymfonyV7Test.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Interfaces\TCP\VarDumper;
+namespace Tests\Feature\Interfaces\TCP\VarDumper;
 
 use Modules\VarDumper\Interfaces\TCP\Service;
 use Spiral\RoadRunner\Tcp\Request;

diff --git a/tests/Unit/Modules/Events/Domain/CacheEventRepositoryTest.php b/tests/Unit/Modules/Events/Domain/CacheEventRepositoryTest.php
@@ -0,0 +1,92 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Modules\Events\Domain;
+
+use App\Application\Domain\Entity\Json;
+use App\Application\Domain\ValueObjects\Uuid;
+use App\Application\Persistence\CacheEventRepository;
+use Tests\TestCase;
+
+final class CacheEventRepositoryTest extends TestCase
+{
+    private CacheEventRepository $repository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->repository = $this->get(CacheEventRepository::class);
+    }
+
+    public function testStoreEvent(): void
+    {
+        $this->assertCount(0, $this->repository->findAll());
+
+        $this->createEvent();
+
+        $this->assertCount(1, $this->repository->findAll());
+    }
+
+    public function testDeleteByType(): void
+    {
+        $this->createEvent(type: 'foo');
+        $this->createEvent(type: 'foo');
+        $this->createEvent(type: 'bar');
+
+        $this->assertCount(3, $this->repository->findAll());
+
+        $this->repository->deleteAll(['type' => 'foo']);
+        $this->assertCount(1, $this->repository->findAll());
+    }
+
+    public function testDeleteByUuids(): void
+    {
+        $this->createEvent(uuid: $uuid1 = $this->randomUuid());
+        $this->createEvent(uuid: $uuid2 = $this->randomUuid());
+        $this->createEvent(uuid: $uuid3 = $this->randomUuid());
+
+        $this->assertCount(3, $this->repository->findAll());
+
+        $this->repository->deleteAll(['uuid' => [(string)$uuid1, (string)$uuid3]]);
+        $this->assertCount(1, $this->repository->findAll());
+
+        $result = \iterator_to_array($this->repository->findAll());
+
+        $this->assertSame((string)$uuid2, (string)$result[0]->getUuid());
+    }
+
+    public function testDeleteByTypeAndUuids(): void
+    {
+        $this->createEvent(type: 'foo');
+        $this->createEvent(type: 'foo');
+        $this->createEvent(type: 'bar', uuid: $uuid1 = $this->randomUuid());
+        $this->createEvent(uuid: $uuid2 = $this->randomUuid());
+        $this->createEvent(uuid: $uuid3 = $this->randomUuid());
+
+        $this->assertCount(5, $this->repository->findAll());
+
+        $this->repository->deleteAll(['type' => 'foo', 'uuid' => [(string)$uuid1, (string)$uuid3]]);
+        $this->assertCount(1, $this->repository->findAll());
+
+        $result = \iterator_to_array($this->repository->findAll());
+
+        $this->assertSame((string)$uuid2, (string)$result[0]->getUuid());
+    }
+
+    private function createEvent(string $type = 'test', ?Uuid $uuid = null): Event
+    {
+        $this->repository->store(
+            $event = new Event(
+                uuid: $uuid ?? $this->randomUuid(),
+                type: $type,
+                payload: new Json([]),
+                timestamp: \microtime(true),
+                projectId: null,
+            ),
+        );
+
+        return $event;
+    }
+}