ISSUE-345: add relation to subscriber attributes

Author: tatevikg1

src/Domain/Model/Subscription/Subscriber.php

@@ -9,7 +9,6 @@
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use PhpList\Core\Domain\Repository\Subscription\SubscriberRepository;
-use Symfony\Component\Serializer\Annotation\Ignore;
 use Symfony\Component\Serializer\Annotation\SerializedName;
 use PhpList\Core\Domain\Model\Interfaces\CreationDate;
 use PhpList\Core\Domain\Model\Interfaces\DomainModel;
@@ -24,6 +23,7 @@
  * This class represents subscriber who can subscribe to multiple subscriber lists and can receive email messages from
  * campaigns for those subscriber lists.
  * @author Oliver Klee <[email protected]>
+ * @author Tatevik Grigoryan <[email protected]>
  */
 #[ORM\Entity(repositoryClass: SubscriberRepository::class)]
 #[ORM\Table(name: 'phplist_user_user')]
@@ -83,16 +83,28 @@ class Subscriber implements DomainModel, Identity, CreationDate, ModificationDat
     private ?string $extraData;
 
     #[ORM\OneToMany(
-        targetEntity: 'PhpList\Core\Domain\Model\Subscription\Subscription',
+        targetEntity: Subscription::class,
         mappedBy: 'subscriber',
         cascade: ['remove'],
         orphanRemoval: true,
     )]
     private Collection $subscriptions;
 
+    /**
+     * @var Collection<int, SubscriberAttribute>
+     */
+    #[ORM\OneToMany(
+        targetEntity: SubscriberAttribute::class,
+        mappedBy: 'subscriber',
+        cascade: ['persist', 'remove'],
+        orphanRemoval: true
+    )]
+    private Collection $attributes;
+
     public function __construct()
     {
         $this->subscriptions = new ArrayCollection();
+        $this->attributes = new ArrayCollection();
         $this->extraData = '';
     }
 
@@ -223,4 +235,24 @@ public function getSubscribedLists(): Collection
 
         return $result;
     }
+
+    public function getAttributes(): Collection
+    {
+        return $this->attributes;
+    }
+
+    public function addAttribute(SubscriberAttribute $attribute): self
+    {
+        if (!$this->attributes->contains($attribute)) {
+            $this->attributes[] = $attribute;
+        }
+
+        return $this;
+    }
+
+    public function removeAttribute(SubscriberAttribute $attribute): self
+    {
+        $this->attributes->removeElement($attribute);
+        return $this;
+    }
 }

src/Domain/Model/Subscription/SubscriberAttribute.php

@@ -15,8 +15,9 @@
 class SubscriberAttribute implements DomainModel
 {
     #[ORM\Id]
-    #[ORM\Column(name: 'attributeid', type: 'integer', nullable: false)]
-    private int $id;
+    #[ORM\ManyToOne(targetEntity: SubscriberAttributeDefinition::class)]
+    #[ORM\JoinColumn(name: 'attributeid', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')]
+    private SubscriberAttributeDefinition $attributeDefinition;
 
     #[ORM\Id]
     #[ORM\ManyToOne(targetEntity: Subscriber::class)]
@@ -26,15 +27,15 @@ class SubscriberAttribute implements DomainModel
     #[ORM\Column(name: 'value', type: 'text', nullable: true)]
     private ?string $value = null;
 
-    public function __construct(int $id, Subscriber $subscriber)
+    public function __construct(SubscriberAttributeDefinition $attributeDefinition, Subscriber $subscriber)
     {
-        $this->id = $id;
+        $this->attributeDefinition = $attributeDefinition;
         $this->subscriber = $subscriber;
     }
 
-    public function getId(): int
+    public function getAttributeDefinition(): SubscriberAttributeDefinition
     {
-        return $this->id;
+        return $this->attributeDefinition;
     }
 
     public function getSubscriber(): Subscriber

…/Domain/Model/Identity/UserAttribute.php …iption/SubscriberAttributeDefinition.phpsrc/Domain/Model/Identity/UserAttribute.php renamed to src/Domain/Model/Subscription/SubscriberAttributeDefinition.php src/Domain/Model/Identity/UserAttribute.php renamed to src/Domain/Model/Subscription/SubscriberAttributeDefinition.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpList\Core\Domain\Model\Identity;
+namespace PhpList\Core\Domain\Model\Subscription;
 
 use Doctrine\ORM\Mapping as ORM;
 use PhpList\Core\Domain\Model\Interfaces\DomainModel;
@@ -13,7 +13,7 @@
 #[ORM\Table(name: 'phplist_user_attribute')]
 #[ORM\Index(name: 'idnameindex', columns: ['id', 'name'])]
 #[ORM\Index(name: 'nameindex', columns: ['name'])]
-class UserAttribute implements DomainModel, Identity
+class SubscriberAttributeDefinition implements DomainModel, Identity
 {
     use IdentityTrait;