Use repo methods

Author: tatevikg1

composer.json

@@ -80,7 +80,8 @@
         "tatevikgr/rss-feed": "dev-main",
         "ext-pdo": "*",
         "ezyang/htmlpurifier": "^4.19",
-        "ext-libxml": "*"
+        "ext-libxml": "*",
+        "ext-gd": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",

config/parameters.yml.dist

@@ -93,3 +93,6 @@ parameters:
     env(DEFAULT_MESSAGEAGE): '691200'
     messaging.use_manual_text_part : '%%env(USE_MANUAL_TEXT_PART)%%'
     env(USE_MANUAL_TEXT_PART): 0
+
+    phplist.upload_images_dir: '%%env(PHPLIST_UPLOADIMAGES_DIR)%%'
+    env(PHPLIST_UPLOADIMAGES_DIR): 'images'

src/Domain/Configuration/Model/ConfigOption.php

@@ -25,4 +25,5 @@ enum ConfigOption: string
     case NotifyEndDefault = 'notifyend_default';
     case WordWrap = 'wordwrap';
     case RemoteUrlAppend = 'remoteurl_append';
+    case OrganisationLogo = 'organisation_logo';
 }

src/Domain/Identity/Model/AdminAttributeDefinition.php

@@ -4,6 +4,8 @@
 
 namespace PhpList\Core\Domain\Identity\Model;
 
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use PhpList\Core\Domain\Common\Model\Interfaces\DomainModel;
 use PhpList\Core\Domain\Common\Model\Interfaces\Identity;
@@ -37,6 +39,13 @@ class AdminAttributeDefinition implements DomainModel, Identity
     #[ORM\Column(name:'tablename', type: 'string', length: 255, nullable: true)]
     private ?string $tableName;
 
+    #[ORM\OneToMany(
+        targetEntity: AdminAttributeValue::class,
+        mappedBy: 'attributeDefinition',
+        orphanRemoval: true
+    )]
+    private Collection $attributeValues;
+
     public function __construct(
         string $name,
         ?string $type = null,
@@ -51,6 +60,7 @@ public function __construct(
         $this->defaultValue = $defaultValue;
         $this->required = $required;
         $this->tableName = $tableName;
+        $this->attributeValues = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -122,4 +132,10 @@ public function setRequired(?bool $required): self
 
         return $this;
     }
+
+    /** @return Collection<int, AdminAttributeValue> */
+    public function getAttributeValues(): Collection
+    {
+        return $this->attributeValues;
+    }
 }

src/Domain/Identity/Model/Administrator.php

@@ -5,6 +5,8 @@
 namespace PhpList\Core\Domain\Identity\Model;
 
 use DateTime;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use InvalidArgumentException;
 use PhpList\Core\Domain\Common\Model\Interfaces\CreationDate;
@@ -13,6 +15,7 @@
 use PhpList\Core\Domain\Common\Model\Interfaces\ModificationDate;
 use PhpList\Core\Domain\Common\Model\Interfaces\OwnableInterface;
 use PhpList\Core\Domain\Identity\Repository\AdministratorRepository;
+use PhpList\Core\Domain\Subscription\Model\SubscriberList;
 
 /**
  * This class represents an administrator who can log to the system, is allowed to administer
@@ -65,11 +68,15 @@ class Administrator implements DomainModel, Identity, CreationDate, Modification
     #[ORM\Column(name: 'privileges', type: 'text', nullable: true)]
     private ?string $privileges = null;
 
+    #[ORM\OneToMany(targetEntity: SubscriberList::class, mappedBy: 'owner')]
+    private Collection $ownedLists;
+
     public function __construct()
     {
         $this->createdAt = new DateTime();
         $this->updatedAt = new DateTime();
         $this->email = '';
+        $this->ownedLists = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -211,4 +218,12 @@ public function setUpdatedAt(): void
     {
         $this->updatedAt = new DateTime();
     }
+
+    /**
+     * @return Collection<int, SubscriberList>
+     */
+    public function getOwnedLists(): Collection
+    {
+        return $this->ownedLists;
+    }
 }

src/Domain/Identity/Repository/AdminAttributeDefinitionRepository.php

@@ -8,6 +8,7 @@
 use PhpList\Core\Domain\Common\Repository\CursorPaginationTrait;
 use PhpList\Core\Domain\Common\Repository\Interfaces\PaginatableRepositoryInterface;
 use PhpList\Core\Domain\Identity\Model\AdminAttributeDefinition;
+use PhpList\Core\Domain\Identity\Model\Administrator;
 
 class AdminAttributeDefinitionRepository extends AbstractRepository implements PaginatableRepositoryInterface
 {
@@ -17,4 +18,28 @@ public function findOneByName(string $name): ?AdminAttributeDefinition
     {
         return $this->findOneBy(['name' => $name]);
     }
+
+    /** @return array<int, array{value: mixed, name: string}> */
+    public function getForAdmin(Administrator $admin): array
+    {
+        return $this->createQueryBuilder('ad')
+            ->select("COALESCE(aav.value, '') AS value", 'ad.name')
+            ->leftJoin(
+                'ad.attributeValues',
+                'aav',
+                'WITH',
+                'aav.administrator = :admin'
+            )
+            ->setParameter('admin', $admin)
+            ->getQuery()
+            ->getResult();
+    }
+
+    public function getAllWIthEmptyValues(): array
+    {
+        return $this->createQueryBuilder('ad')
+            ->select("ad.name AS name", "'' AS value")
+            ->getQuery()
+            ->getResult();
+    }
 }

src/Domain/Messaging/Repository/TemplateImageRepository.php

@@ -7,8 +7,29 @@
 use PhpList\Core\Domain\Common\Repository\AbstractRepository;
 use PhpList\Core\Domain\Common\Repository\CursorPaginationTrait;
 use PhpList\Core\Domain\Common\Repository\Interfaces\PaginatableRepositoryInterface;
+use PhpList\Core\Domain\Messaging\Model\TemplateImage;
 
 class TemplateImageRepository extends AbstractRepository implements PaginatableRepositoryInterface
 {
     use CursorPaginationTrait;
+
+    public function findByFilename(string $filename): ?TemplateImage
+    {
+        return $this->createQueryBuilder('ti')
+            ->where('ti.filename = :filename')
+            ->setParameter('filename', $filename)
+            ->andWhere('ti.template = 0')
+            ->getQuery()
+            ->getOneOrNullResult();
+    }
+
+    public function findById(int $id): ?TemplateImage
+    {
+        return $this->createQueryBuilder('ti')
+            ->where('ti.id = :id')
+            ->setParameter('id', $id)
+            ->andWhere('ti.template = 0')
+            ->getQuery()
+            ->getOneOrNullResult();
+    }
 }