Add options to SubscriberAttributeDefinition

Author: tatevikg1

src/Subscription/OpenApi/SwaggerSchemasResponse.php

@@ -108,7 +108,7 @@
     properties: [
         new OA\Property(property: 'id', type: 'integer', example: 1, nullable: false),
         new OA\Property(property: 'name', type: 'string', example: 'United States'),
-        new OA\Property(property: 'listorder', type: 'integer', example: 1, nullable: false),
+        new OA\Property(property: 'list_order', type: 'integer', example: 1, nullable: false),
     ],
     type: 'object',
 )]

src/Subscription/Request/SubscriberAttributeDefinitionRequest.php

@@ -55,7 +55,7 @@ enum: [
     properties: [
         new OA\Property(property: 'id', type: 'integer', example: 1, nullable: true),
         new OA\Property(property: 'name', type: 'string', example: 'United States'),
-        new OA\Property(property: 'listorder', type: 'integer', example: 10, nullable: true),
+        new OA\Property(property: 'list_order', type: 'integer', example: 10, nullable: true),
     ],
     type: 'object',
 )]

src/Subscription/Serializer/AttributeDefinitionNormalizer.php

@@ -4,6 +4,7 @@
 
 namespace PhpList\RestBundle\Subscription\Serializer;
 
+use PhpList\Core\Domain\Subscription\Model\Dto\DynamicListAttrDto;
 use PhpList\Core\Domain\Subscription\Model\SubscriberAttributeDefinition;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
@@ -18,13 +19,28 @@ public function normalize($object, string $format = null, array $context = []):
             return [];
         }
 
+        $options = $object->getOptions();
+        if (!empty($options)) {
+            $options = array_map(function ($option) {
+                if ($option instanceof DynamicListAttrDto) {
+                    return [
+                        'id' => $option->id,
+                        'name' => $option->name,
+                        'list_order' => $option->listOrder,
+                    ];
+                }
+                return $option;
+            }, $options);
+        }
+
         return [
             'id' => $object->getId(),
             'name' => $object->getName(),
             'type' => $object->getType() ? $object->getType()->value : null,
             'list_order' => $object->getListOrder(),
             'default_value' => $object->getDefaultValue(),
             'required' => $object->isRequired(),
+            'options' => $options,
         ];
     }
 

tests/Unit/Subscription/Serializer/AttributeDefinitionNormalizerTest.php

@@ -5,6 +5,7 @@
 namespace PhpList\RestBundle\Tests\Unit\Subscription\Serializer;
 
 use PhpList\Core\Domain\Common\Model\AttributeTypeEnum;
+use PhpList\Core\Domain\Subscription\Model\Dto\DynamicListAttrDto;
 use PhpList\Core\Domain\Subscription\Model\SubscriberAttributeDefinition;
 use PhpList\RestBundle\Subscription\Serializer\AttributeDefinitionNormalizer;
 use PHPUnit\Framework\TestCase;
@@ -43,6 +44,7 @@ public function testNormalize(): void
             'list_order' => 12,
             'default_value' => 'US',
             'required' => true,
+            'options' => [],
         ], $result);
     }
 
@@ -53,4 +55,56 @@ public function testNormalizeWithInvalidObjectReturnsEmptyArray(): void
 
         self::assertSame([], $result);
     }
+
+    public function testNormalizeWithOptions(): void
+    {
+        $options = [
+            new DynamicListAttrDto(
+                id: 10,
+                name: 'USA',
+                listOrder: 1
+            ),
+            new DynamicListAttrDto(
+                id: 20,
+                name: 'Canada',
+                listOrder: 2
+            ),
+        ];
+
+        $definition = $this->createMock(SubscriberAttributeDefinition::class);
+        $definition->method('getId')->willReturn(5);
+        $definition->method('getName')->willReturn('Country');
+        $definition->method('getType')->willReturn(AttributeTypeEnum::Select);
+        $definition->method('getListOrder')->willReturn(3);
+        $definition->method('getDefaultValue')->willReturn(null);
+        $definition->method('isRequired')->willReturn(false);
+        $definition->method('getOptions')->willReturn($options);
+
+        $normalizer = new AttributeDefinitionNormalizer();
+        $result = $normalizer->normalize($definition);
+
+        self::assertIsArray($result);
+
+        self::assertSame([
+            'id' => 5,
+            'name' => 'Country',
+            'type' => 'select',
+            'list_order' => 3,
+            'default_value' => null,
+            'required' => false,
+            'options' => [
+                [
+                    'id' => 10,
+                    'name' => 'USA',
+                    'list_order' => 1,
+                ],
+                [
+                    'id' => 20,
+                    'name' => 'Canada',
+                    'list_order' => 2,
+                ],
+            ],
+        ], $result);
+    }
+
 }