ISSUE-345: naming

Author: tatevikg1

src/Controller/AttributeDefinitionController.php

@@ -5,7 +5,7 @@
 namespace PhpList\RestBundle\Controller;
 
 use OpenApi\Attributes as OA;
-use PhpList\Core\Domain\Model\Subscription\AttributeDefinition;
+use PhpList\Core\Domain\Model\Subscription\SubscriberAttributeDefinition;
 use PhpList\Core\Domain\Service\Manager\AttributeDefinitionManager;
 use PhpList\Core\Security\Authentication;
 use PhpList\RestBundle\Entity\Request\CreateAttributeDefinitionRequest;
@@ -159,7 +159,7 @@ public function create(Request $request,): JsonResponse
     )]
     public function update(
         Request $request,
-        #[MapEntity(mapping: ['definitionId' => 'id'])] ?AttributeDefinition $attributeDefinition,
+        #[MapEntity(mapping: ['definitionId' => 'id'])] ?SubscriberAttributeDefinition $attributeDefinition,
     ): JsonResponse {
         $this->requireAuthentication($request);
         if (!$attributeDefinition) {
@@ -219,7 +219,7 @@ public function update(
     )]
     public function delete(
         Request $request,
-        #[MapEntity(mapping: ['definitionId' => 'id'])] ?AttributeDefinition $attributeDefinition,
+        #[MapEntity(mapping: ['definitionId' => 'id'])] ?SubscriberAttributeDefinition $attributeDefinition,
     ): JsonResponse {
         $this->requireAuthentication($request);
         if (!$attributeDefinition) {
@@ -290,7 +290,11 @@ public function getPaginated(Request $request,): JsonResponse
         $this->requireAuthentication($request);
 
         return $this->json(
-            $this->paginatedDataProvider->getPaginatedList($request, $this->normalizer, AttributeDefinition::class),
+            $this->paginatedDataProvider->getPaginatedList(
+                $request,
+                $this->normalizer,
+                SubscriberAttributeDefinition::class,
+            ),
             Response::HTTP_OK
         );
     }
@@ -346,7 +350,7 @@ public function getPaginated(Request $request,): JsonResponse
     )]
     public function getAttributeDefinition(
         Request $request,
-        #[MapEntity(mapping: ['definitionId' => 'id'])] ?AttributeDefinition $attributeDefinition,
+        #[MapEntity(mapping: ['definitionId' => 'id'])] ?SubscriberAttributeDefinition $attributeDefinition,
     ): JsonResponse {
         $this->requireAuthentication($request);
         if (!$attributeDefinition) {

src/Serializer/AttributeDefinitionNormalizer.php

@@ -4,7 +4,7 @@
 
 namespace PhpList\RestBundle\Serializer;
 
-use PhpList\Core\Domain\Model\Subscription\AttributeDefinition;
+use PhpList\Core\Domain\Model\Subscription\SubscriberAttributeDefinition;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 class AttributeDefinitionNormalizer implements NormalizerInterface
@@ -14,7 +14,7 @@ class AttributeDefinitionNormalizer implements NormalizerInterface
      */
     public function normalize($object, string $format = null, array $context = []): array
     {
-        if (!$object instanceof AttributeDefinition) {
+        if (!$object instanceof SubscriberAttributeDefinition) {
             return [];
         }
 
@@ -34,6 +34,6 @@ public function normalize($object, string $format = null, array $context = []):
      */
     public function supportsNormalization($data, string $format = null): bool
     {
-        return $data instanceof AttributeDefinition;
+        return $data instanceof SubscriberAttributeDefinition;
     }
 }

tests/Integration/Controller/AttributeDefinitionControllerTest.php

@@ -4,7 +4,7 @@
 
 namespace PhpList\RestBundle\Tests\Integration\Controller;
 
-use PhpList\Core\Domain\Repository\Subscription\AttributeDefinitionRepository;
+use PhpList\Core\Domain\Repository\Subscription\SubscriberAttributeDefinitionRepository;
 use PhpList\RestBundle\Controller\AttributeDefinitionController;
 use PhpList\RestBundle\Tests\Integration\Controller\Fixtures\Identity\AdministratorFixture;
 use PhpList\RestBundle\Tests\Integration\Controller\Fixtures\Identity\AdministratorTokenFixture;
@@ -95,7 +95,7 @@ public function testDeleteAttributeDefinition()
         $this->authenticatedJsonRequest('DELETE', '/api/v2/attributes/1');
         $this->assertHttpNoContent();
 
-        $repo = self::getContainer()->get(AttributeDefinitionRepository::class);
+        $repo = self::getContainer()->get(SubscriberAttributeDefinitionRepository::class);
         self::assertNull($repo->find(1));
     }
 

tests/Integration/Controller/Fixtures/Subscription/AttributeDefinitionFixture.php

@@ -7,13 +7,13 @@
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use PhpList\Core\Domain\Model\Subscription\AttributeDefinition;
+use PhpList\Core\Domain\Model\Subscription\SubscriberAttributeDefinition;
 
 class AttributeDefinitionFixture extends Fixture implements FixtureInterface
 {
     public function load(ObjectManager $manager): void
     {
-        $definition = new AttributeDefinition();
+        $definition = new SubscriberAttributeDefinition();
         $definition->setName('Country');
         $definition->setType('checkbox');
         $definition->setListOrder(1);

tests/Unit/Serializer/AttributeDefinitionNormalizerTest.php

@@ -4,7 +4,7 @@
 
 namespace PhpList\RestBundle\Tests\Unit\Serializer;
 
-use PhpList\Core\Domain\Model\Subscription\AttributeDefinition;
+use PhpList\Core\Domain\Model\Subscription\SubscriberAttributeDefinition;
 use PhpList\RestBundle\Serializer\AttributeDefinitionNormalizer;
 use PHPUnit\Framework\TestCase;
 
@@ -14,7 +14,7 @@ public function testSupportsNormalization(): void
     {
         $normalizer = new AttributeDefinitionNormalizer();
 
-        $definition = $this->createMock(AttributeDefinition::class);
+        $definition = $this->createMock(SubscriberAttributeDefinition::class);
         self::assertTrue($normalizer->supportsNormalization($definition));
 
         $nonSupported = new \stdClass();
@@ -23,7 +23,7 @@ public function testSupportsNormalization(): void
 
     public function testNormalize(): void
     {
-        $definition = $this->createMock(AttributeDefinition::class);
+        $definition = $this->createMock(SubscriberAttributeDefinition::class);
         $definition->method('getId')->willReturn(1);
         $definition->method('getName')->willReturn('Country');
         $definition->method('getType')->willReturn('text');