Add tests

Author: tatevikg1

src/Subscription/Controller/SubscribePageController.php

@@ -41,7 +41,7 @@ public function __construct(
         path: '/api/v2/subscribe-pages',
         description: '🚧 **Status: Beta** – This method is under development. Avoid using in production.',
         summary: 'Get subscribe pages list',
-        tags: ['subscriptions'],
+        tags: ['subscribe-pages'],
         parameters: [
             new OA\Parameter(
                 name: 'php-auth-pw',
@@ -137,7 +137,7 @@ className: SubscribePage::class,
                 ]
             )
         ),
-        tags: ['subscriptions'],
+        tags: ['subscribe-pages'],
         parameters: [
             new OA\Parameter(
                 name: 'php-auth-pw',
@@ -175,10 +175,14 @@ public function createPage(Request $request): JsonResponse
         /** @var SubscribePageRequest $createRequest */
         $createRequest = $this->validator->validate($request, SubscribePageRequest::class);
 
-        $page = $this->subscribePageManager->createPage($createRequest->title, $createRequest->active, $admin);
+        $page = $this->subscribePageManager->createPage(
+            title: $createRequest->title,
+            active: $createRequest->active,
+            owner: $admin
+        );
         if ($createRequest->hasData()) {
             $this->entityManager->flush();
-            $this->subscribePageManager->syncPageData($createRequest->getDataMap(), $page);
+            $this->subscribePageManager->syncPageData(data: $createRequest->getDataMap(), page: $page);
         }
         $this->entityManager->flush();
 
@@ -190,7 +194,7 @@ public function createPage(Request $request): JsonResponse
         path: '/api/v2/subscribe-pages/{id}',
         description: '🚧 **Status: Beta** – This method is under development. Avoid using in production.',
         summary: 'Get subscribe page',
-        tags: ['subscriptions'],
+        tags: ['subscribe-pages'],
         parameters: [
             new OA\Parameter(
                 name: 'php-auth-pw',
@@ -266,7 +270,7 @@ public function getPage(Request $request): JsonResponse
                 ]
             )
         ),
-        tags: ['subscriptions'],
+        tags: ['subscribe-pages'],
         parameters: [
             new OA\Parameter(
                 name: 'php-auth-pw',
@@ -336,7 +340,7 @@ public function updatePage(
         path: '/api/v2/subscribe-pages/{id}',
         description: '🚧 **Status: Beta** – This method is under development. Avoid using in production.',
         summary: 'Delete subscribe page',
-        tags: ['subscriptions'],
+        tags: ['subscribe-pages'],
         parameters: [
             new OA\Parameter(
                 name: 'php-auth-pw',

src/Subscription/Controller/SubscribePagePublicController.php

@@ -6,7 +6,7 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use OpenApi\Attributes as OA;
-use PhpList\Core\Domain\Subscription\Model\SubscriberList;
+use PhpList\Core\Domain\Subscription\Repository\SubscriberListRepository;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscribePageManager;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriberAttributeManager;
 use PhpList\Core\Domain\Subscription\Service\Manager\SubscriptionManager;
@@ -16,7 +16,6 @@
 use PhpList\RestBundle\Subscription\Request\PublicSubscriptionRequest;
 use PhpList\RestBundle\Subscription\Serializer\SubscribePagePublicNormalizer;
 use PhpList\RestBundle\Subscription\Serializer\SubscriptionNormalizer;
-use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -33,6 +32,7 @@ public function __construct(
         private readonly SubscriptionManager $subscriptionManager,
         private readonly SubscriptionNormalizer $subscriptionNormalizer,
         private readonly SubscriberAttributeManager $subscriberAttributeManager,
+        private readonly SubscriberListRepository $subscriberListRepository,
     ) {
         parent::__construct($authentication, $validator);
     }
@@ -42,7 +42,7 @@ public function __construct(
         path: '/api/v2/public/subscribe-pages/{pageId}',
         description: '🚧 **Status: Beta** – This method is under development. Avoid using in production.',
         summary: 'Get public subscribe page (placeholders replaced with actual values)',
-        tags: ['public'],
+        tags: ['subscribe-pages'],
         parameters: [
             new OA\Parameter(
                 name: 'pageId',
@@ -87,7 +87,7 @@ public function getPublicPage(Request $request, SubscribePagePublicNormalizer $n
             required: true,
             content: new OA\JsonContent(ref: '#/components/schemas/PublicSubscriptionRequest')
         ),
-        tags: ['public'],
+        tags: ['subscribe-pages'],
         parameters: [
             new OA\Parameter(
                 name: 'pageId',
@@ -139,7 +139,10 @@ public function subscribe(Request $request, int $pageId): JsonResponse
             }
         );
 
-        $list = $this->entityManager->getRepository(SubscriberList::class)->find($subscriptionRequest->listId);
+        $list = $this->subscriberListRepository->find($subscriptionRequest->listId);
+        if ($list === null) {
+            throw $this->createNotFoundException('Subscriber list does not exists.');
+        }
         $subscriptions = $this->subscriptionManager->createSubscriptions(
             subscriberList: $list,
             emails: [$subscriptionRequest->email],

src/Subscription/Request/PublicSubscriptionRequest.php

@@ -52,6 +52,7 @@ class PublicSubscriptionRequest implements RequestInterface
     public ?string $email = null;
 
     #[ListExistsPublic]
+    #[Assert\NotNull]
     #[Assert\Type(type: 'integer')]
     public ?int $listId = null;
 

src/Subscription/Serializer/SubscribePagePublicNormalizer.php

@@ -14,19 +14,65 @@
 #[OA\Schema(
     schema: 'SubscribePagePublic',
     properties: [
-        new OA\Property(property: 'id', type: 'integer', example: 1),
-        new OA\Property(property: 'title', type: 'string', example: 'Subscribe to our newsletter'),
+        new OA\Property(
+            property: 'id',
+            type: 'integer',
+            example: 1
+        ),
+        new OA\Property(
+            property: 'title',
+            type: 'string',
+            example: 'Subscribe to our newsletter'
+        ),
         new OA\Property(
             property: 'data',
-            type: 'array',
-            items: new OA\Items(
-                type: 'object',
-                additionalProperties: new OA\AdditionalProperties(
-                    type: 'string'
-                )
+            properties: [
+                new OA\Property(
+                    property: 'attributes',
+                    type: 'array',
+                    items: new OA\Items(
+                        properties: [
+                            new OA\Property(property: 'id', type: 'integer'),
+                            new OA\Property(property: 'name', type: 'string'),
+                            new OA\Property(property: 'type', type: 'string'),
+                            new OA\Property(property: 'required', type: 'boolean'),
+                            new OA\Property(property: 'default_value', type: 'string', nullable: true),
+                            new OA\Property(property: 'list_order', type: 'integer'),
+                            new OA\Property(
+                                property: 'options',
+                                type: 'array',
+                                items: new OA\Items(type: 'object')
+                            ),
+                        ],
+                        type: 'object'
+                    )
+                ),
+                new OA\Property(
+                    property: 'lists',
+                    type: 'array',
+                    items: new OA\Items(
+                        properties: [
+                            new OA\Property(property: 'id', type: 'integer'),
+                            new OA\Property(property: 'name', type: 'string'),
+                            new OA\Property(property: 'description', type: 'string', nullable: true),
+                            new OA\Property(property: 'list_position', type: 'integer'),
+                        ],
+                        type: 'object'
+                    )
+                ),
+            ],
+            type: 'object',
+            additionalProperties: new OA\AdditionalProperties(
+                oneOf: [
+                    new OA\Schema(type: 'string'),
+                    new OA\Schema(type: 'integer'),
+                    new OA\Schema(type: 'boolean'),
+                    new OA\Schema(type: 'array', items: new OA\Items(type: 'object')),
+                    new OA\Schema(type: 'object'),
+                ]
             )
         ),
-    ],
+    ]
 )]
 class SubscribePagePublicNormalizer implements NormalizerInterface
 {
@@ -53,7 +99,8 @@ public function normalize($object, string $format = null, array $context = []):
                 function (array $carry, SubscribePageData $data) {
                     $value = $data->getData();
                     if ($data->getName() === 'attributes') {
-                        $ids = array_filter(explode('+', $data->getData()));
+                        $attributeIds = str_replace('+', ',', $data->getData());
+                        $ids = array_filter(explode(',', $attributeIds));
                         $value = $this->getAttributeDefinitions($ids);
                     }
                     if ($data->getName() === 'lists') {

tests/Integration/Subscription/Controller/SubscribePageControllerTest.php

@@ -4,16 +4,11 @@
 
 namespace PhpList\RestBundle\Tests\Integration\Subscription\Controller;
 
-use PhpList\Core\Domain\Subscription\Model\Subscriber;
-use PhpList\Core\Domain\Subscription\Model\SubscriberAttributeDefinition;
-use PhpList\Core\Domain\Subscription\Model\SubscriberAttributeValue;
 use PhpList\RestBundle\Subscription\Controller\SubscribePageController;
 use PhpList\RestBundle\Tests\Integration\Common\AbstractTestController;
 use PhpList\RestBundle\Tests\Integration\Identity\Fixtures\AdministratorFixture;
 use PhpList\RestBundle\Tests\Integration\Identity\Fixtures\AdministratorTokenFixture;
 use PhpList\RestBundle\Tests\Integration\Subscription\Fixtures\SubscribePageFixture;
-use PhpList\RestBundle\Tests\Integration\Subscription\Fixtures\SubscriberAttributeDefinitionFixture;
-use PhpList\RestBundle\Tests\Integration\Subscription\Fixtures\SubscriberListFixture;
 
 class SubscribePageControllerTest extends AbstractTestController
 {
@@ -80,7 +75,7 @@ public function testCreateSubscribePageWithoutSessionReturnsForbidden(): void
             ],
         ], JSON_THROW_ON_ERROR);
 
-        $this->jsonRequest('POST', '/api/v2/subscribe-pages', content: $payload);
+        $this->jsonRequest('POST', '/api/v2/subscribe-pages/', content: $payload);
 
         $this->assertHttpForbidden();
     }
@@ -96,7 +91,7 @@ public function testCreateSubscribePageWithSessionCreatesPage(): void
             ],
         ], JSON_THROW_ON_ERROR);
 
-        $this->authenticatedJsonRequest('POST', '/api/v2/subscribe-pages', content: $payload);
+        $this->authenticatedJsonRequest('POST', '/api/v2/subscribe-pages/', content: $payload);
 
         $this->assertHttpCreated();
         $data = $this->getDecodedJsonResponseContent();
@@ -143,7 +138,7 @@ public function testCreateSubscribePageWithDataMissingValueReturnsUnprocessableE
             ],
         ], JSON_THROW_ON_ERROR);
 
-        $this->authenticatedJsonRequest('POST', '/api/v2/subscribe-pages', content: $payload);
+        $this->authenticatedJsonRequest('POST', '/api/v2/subscribe-pages/', content: $payload);
         $this->assertHttpUnprocessableEntity();
     }
 
@@ -221,44 +216,4 @@ public function testDeleteSubscribePageWithSessionNotFound(): void
         $this->authenticatedJsonRequest('DELETE', '/api/v2/subscribe-pages/9999');
         $this->assertHttpNotFound();
     }
-
-    public function testPublicSubscribeCreatesSubscriptionAndAttributes(): void
-    {
-        $this->loadFixtures([
-            AdministratorFixture::class,
-            SubscribePageFixture::class,
-            SubscriberListFixture::class,
-            SubscriberAttributeDefinitionFixture::class,
-        ]);
-
-        $payload = json_encode([
-            'email' => 'public@example.com',
-            'confirmEmail' => 'public@example.com',
-            'attributes' => [
-                'Country' => 'Armenia',
-            ],
-        ]);
-
-        $this->jsonRequest('POST', '/api/v2/subscribe-pages/1/lists/1/subscribers', [], [], [], $payload);
-        $this->assertHttpCreated();
-
-        $response = $this->getDecodedJsonResponseContent();
-        self::assertSame('public@example.com', $response[0]['subscriber']['email'] ?? null);
-
-        $subscriber = $this->entityManager?->getRepository(Subscriber::class)
-            ->findOneBy(['email' => 'public@example.com']);
-        self::assertInstanceOf(Subscriber::class, $subscriber);
-
-        $definition = $this->entityManager?->getRepository(SubscriberAttributeDefinition::class)
-            ->findOneBy(['name' => 'Country']);
-        self::assertInstanceOf(SubscriberAttributeDefinition::class, $definition);
-
-        $value = $this->entityManager?->getRepository(SubscriberAttributeValue::class)
-            ->findOneBy([
-                'subscriber' => $subscriber,
-                'attributeDefinition' => $definition,
-            ]);
-        self::assertInstanceOf(SubscriberAttributeValue::class, $value);
-        self::assertSame('Armenia', $value->getValue());
-    }
 }