Remove sorting

Author: tatevikg1

src/Subscription/Controller/SubscriberController.php

@@ -98,24 +98,6 @@ enum: ['true', 'false', '0', '1'],
                     example: '1'
                 )
             ),
-            new OA\Parameter(
-                name: 'sort_by',
-                description: 'Column to sort by',
-                in: 'query',
-                required: false,
-                schema: new OA\Schema(type: 'string', example: 'id')
-            ),
-            new OA\Parameter(
-                name: 'sort_direction',
-                description: 'Sort direction',
-                in: 'query',
-                required: false,
-                schema: new OA\Schema(
-                    type: 'string',
-                    enum: ['asc', 'desc'],
-                    example: 'desc'
-                )
-            ),
             new OA\Parameter(
                 name: 'find_column',
                 description: 'Column to search in (requires find_value)',

src/Subscription/Request/SubscribersFilterRequest.php

@@ -22,18 +22,6 @@ class SubscribersFilterRequest implements RequestInterface
     )]
     public mixed $isBlacklisted = null;
 
-    #[Assert\Choice(
-        choices: ['email', 'confirmedAt', 'createdAt'],
-        message: 'Invalid sortBy value'
-    )]
-    public ?string $sortBy = null;
-
-    #[Assert\Choice(
-        choices: ['asc', 'desc'],
-        message: 'sortDirection must be asc or desc'
-    )]
-    public ?string $sortDirection = null;
-
     #[Assert\Choice(
         choices: ['email', 'foreignKey', 'uniqueId'],
         message: 'Invalid findColumn value'
@@ -48,8 +36,6 @@ public function getDto(): SubscriberFilter
         return new SubscriberFilter(
             isConfirmed: $this->normalizeBoolean($this->isConfirmed),
             isBlacklisted: $this->normalizeBoolean($this->isBlacklisted),
-            sortBy: $this->sortBy,
-            sortDirection: $this->sortDirection,
             findColumn: $this->findColumn,
             findValue: $this->findColumn ? $this->findValue : null,
         );

tests/Helpers/DummyDomainModel.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpList\RestBundle\Tests\Helpers;
+
+use PhpList\Core\Domain\Common\Model\Interfaces\DomainModel;
+
+class DummyDomainModel implements DomainModel
+{
+    public function __construct(
+        public int $id,
+        public string $name,
+    ) {
+    }
+}

tests/Helpers/DummyPaginatableRepository.php

@@ -15,8 +15,8 @@ public function getFilteredAfterId(int $lastId, int $limit, ?FilterRequestInterf
     {
         return new PaginatedResult(
             [
-                (object)['id' => 1, 'name' => 'Item 1'],
-                (object)['id' => 2, 'name' => 'Item 2'],
+                new DummyDomainModel(1, 'Item 1'),
+                new DummyDomainModel(2, 'Item 2'),
             ],
             2,
             10,

tests/Unit/Common/Service/Provider/PaginatedDataProviderTest.php

@@ -5,7 +5,6 @@
 namespace PhpList\RestBundle\Tests\Unit\Common\Service\Provider;
 
 use Doctrine\ORM\EntityManagerInterface;
-use PhpList\Core\Domain\Common\Model\PaginatedResult;
 use PhpList\RestBundle\Common\Dto\CursorPaginationResult;
 use PhpList\RestBundle\Common\Request\PaginationCursorRequest;
 use PhpList\RestBundle\Common\Serializer\CursorPaginationNormalizer;
@@ -37,17 +36,7 @@ public function testGetPaginatedListSuccess(): void
         $entityManager->method('getRepository')->willReturn($repository);
         $repository->expects($this->once())
             ->method('getFilteredAfterId')
-            ->with(0, 2)
-            ->willReturn(
-                new PaginatedResult([
-                        (object)['id' => 1, 'name' => 'Item 1'],
-                        (object)['id' => 2, 'name' => 'Item 2'],
-                    ],
-                    2,
-                    10,
-                    2,
-                )
-            );
+            ->with(0, 2);
 
         $entityManager->method('getRepository')
             ->willReturn($repository);

tests/Unit/Subscription/Request/SubscribersFilterRequestTest.php

@@ -15,8 +15,6 @@ public function testGetDtoReturnsCorrectDtoWithAllValues(): void
         $request = new SubscribersFilterRequest();
         $request->isConfirmed = 'true';
         $request->isBlacklisted = 'false';
-        $request->sortBy = 'email';
-        $request->sortDirection = 'desc';
         $request->findColumn = 'email';
         $request->findValue = 'test@example.com';
 
@@ -25,8 +23,6 @@ public function testGetDtoReturnsCorrectDtoWithAllValues(): void
         $this->assertInstanceOf(SubscriberFilter::class, $dto);
         $this->assertTrue($dto->getIsConfirmed());
         $this->assertFalse($dto->getIsBlacklisted());
-        $this->assertEquals('email', $dto->getSortBy());
-        $this->assertEquals('desc', $dto->getSortDirection());
         $this->assertEquals('email', $dto->getFindColumn());
         $this->assertEquals('test@example.com', $dto->getFindValue());
     }
@@ -64,8 +60,6 @@ public function testGetDtoReturnsCorrectDtoWithNullValues(): void
         $this->assertInstanceOf(SubscriberFilter::class, $dto);
         $this->assertNull($dto->getIsConfirmed());
         $this->assertNull($dto->getIsBlacklisted());
-        $this->assertNull($dto->getSortBy());
-        $this->assertNull($dto->getSortDirection());
         $this->assertNull($dto->getFindColumn());
         $this->assertNull($dto->getFindValue());
     }