Add options

Author: tatevikg1

composer.json

@@ -78,7 +78,8 @@
         "webklex/php-imap": "^6.2",
         "ext-imap": "*",
         "tatevikgr/rss-feed": "dev-main",
-        "ext-pdo": "*"
+        "ext-pdo": "*",
+        "ext-gd": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",

config/services/repositories.yml

@@ -60,9 +60,9 @@ services:
     arguments:
       - PhpList\Core\Domain\Subscription\Model\SubscriberAttributeValue
   PhpList\Core\Domain\Subscription\Repository\SubscriberAttributeDefinitionRepository:
-    parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:
-      - PhpList\Core\Domain\Subscription\Model\SubscriberAttributeDefinition
+      $entityManager: '@doctrine.orm.entity_manager'
+      $dynamicListAttrRepository: '@PhpList\Core\Domain\Subscription\Repository\DynamicListAttrRepository'
   PhpList\Core\Domain\Subscription\Repository\SubscriptionRepository:
     parent: PhpList\Core\Domain\Common\Repository\AbstractRepository
     arguments:

src/Domain/Subscription/Model/SubscriberAttributeDefinition.php

@@ -8,6 +8,7 @@
 use PhpList\Core\Domain\Common\Model\AttributeTypeEnum;
 use PhpList\Core\Domain\Common\Model\Interfaces\DomainModel;
 use PhpList\Core\Domain\Common\Model\Interfaces\Identity;
+use PhpList\Core\Domain\Subscription\Model\Dto\DynamicListAttrDto;
 use PhpList\Core\Domain\Subscription\Repository\SubscriberAttributeDefinitionRepository;
 
 #[ORM\Entity(repositoryClass: SubscriberAttributeDefinitionRepository::class)]
@@ -39,6 +40,14 @@ class SubscriberAttributeDefinition implements DomainModel, Identity
     #[ORM\Column(name: 'tablename', type: 'string', length: 255, nullable: true)]
     private ?string $tableName = null;
 
+    /**
+     * Doctrine does NOT map this property.
+     * It exists only for runtime usage (e.g. dynamic attribute options).
+     * Doctrine will ignore it completely.
+     * @var DynamicListAttrDto[]
+     */
+    private array $options = [];
+
     public function getId(): ?int
     {
         return $this->id;
@@ -120,4 +129,17 @@ public function setTableName(?string $tableName): self
         $this->tableName = $tableName;
         return $this;
     }
+
+    /** @param DynamicListAttrDto[] $options */
+    public function setOptions(array $options): self
+    {
+        $this->options = $options;
+        return $this;
+    }
+
+    /** @return DynamicListAttrDto[] */
+    public function getOptions(): array
+    {
+        return $this->options;
+    }
 }

src/Domain/Subscription/Repository/SubscriberAttributeDefinitionRepository.php

@@ -4,6 +4,7 @@
 
 namespace PhpList\Core\Domain\Subscription\Repository;
 
+use Doctrine\ORM\EntityManagerInterface;
 use PhpList\Core\Domain\Common\Repository\AbstractRepository;
 use PhpList\Core\Domain\Common\Repository\CursorPaginationTrait;
 use PhpList\Core\Domain\Common\Repository\Interfaces\PaginatableRepositoryInterface;
@@ -13,6 +14,50 @@ class SubscriberAttributeDefinitionRepository extends AbstractRepository impleme
 {
     use CursorPaginationTrait;
 
+    public function __construct(
+        EntityManagerInterface $entityManager,
+        private readonly DynamicListAttrRepository $dynamicListAttrRepository,
+    ) {
+        parent::__construct(
+            $entityManager,
+            $entityManager->getClassMetadata(SubscriberAttributeDefinition::class)
+        );
+    }
+
+    /**
+     * @param SubscriberAttributeDefinition[] $defs
+     * @return SubscriberAttributeDefinition[]
+     */
+    private function hydrateOptionsForAll(array $defs): array
+    {
+        foreach ($defs as $def) {
+            $this->hydrateOptions($def);
+        }
+        return $defs;
+    }
+
+    private function hydrateOptions(SubscriberAttributeDefinition $def): void
+    {
+        $table = $def->getTableName();
+        if ($table) {
+            $options = $this->dynamicListAttrRepository->getAll($table);
+            $def->setOptions($options);
+        }
+    }
+
+    public function getAfterId(int $lastId, int $limit): array
+    {
+        $result = $this->createQueryBuilder('e')
+            ->andWhere('e.id > :lastId')
+            ->setParameter('lastId', $lastId)
+            ->orderBy('e.id', 'ASC')
+            ->setMaxResults($limit)
+            ->getQuery()
+            ->getResult();
+
+        return $this->hydrateOptionsForAll($result);
+    }
+
     public function findOneByName(string $name): ?SubscriberAttributeDefinition
     {
         return $this->findOneBy(['name' => $name]);

src/Domain/Subscription/Service/Manager/AttributeDefinitionManager.php

@@ -57,12 +57,16 @@ public function create(AttributeDefinitionDto $attributeDefinitionDto): Subscrib
 
         $this->definitionRepository->persist($attributeDefinition);
 
+        $insertedOptions = [];
         if ($tableName) {
             $this->dynamicTablesManager->createOptionsTableIfNotExists($tableName);
-            $this->dynamicListAttrManager->insertOptions($tableName, $attributeDefinitionDto->options);
+            $insertedOptions = $this->dynamicListAttrManager->insertOptions(
+                $tableName,
+                $attributeDefinitionDto->options
+            );
         }
 
-        return $attributeDefinition;
+        return $attributeDefinition->setOptions($insertedOptions);
     }
 
     public function update(
@@ -85,15 +89,16 @@ public function update(
             ->setRequired($attributeDefinitionDto->required)
             ->setDefaultValue($attributeDefinitionDto->defaultValue);
 
+        $syncedOptions = [];
         if ($attributeDefinitionDto->type && $attributeDefinitionDto->type->isMultiValued()) {
             $tableName = $attributeDefinition->getTableName() ?? $this->dynamicTablesManager
                 ->resolveTableName(name: $attributeDefinitionDto->name, type: $attributeDefinitionDto->type);
             $this->dynamicTablesManager->createOptionsTableIfNotExists($tableName);
 
-            $this->dynamicListAttrManager->syncOptions($tableName, $attributeDefinitionDto->options);
+            $syncedOptions = $this->dynamicListAttrManager->syncOptions($tableName, $attributeDefinitionDto->options);
         }
 
-        return $attributeDefinition;
+        return $attributeDefinition->setOptions($syncedOptions);
     }
 
     public function delete(SubscriberAttributeDefinition $attributeDefinition): void