Update: config provider

Author: tatevikg1

src/Domain/Configuration/Model/ConfigOption.php

@@ -7,5 +7,12 @@
 enum ConfigOption: string
 {
     case MaintenanceMode = 'maintenancemode';
-    case SendSubscribeMessage = 'subscribemessage';
+    case SubscribeMessage = 'subscribemessage';
+    case SubscribeEmailSubject = 'subscribesubject';
+    case UnsubscribeUrl = 'unsubscribeurl';
+    case ConfirmationUrl = 'confirmationurl';
+    case PreferencesUrl = 'preferencesurl';
+    case SubscribeUrl = 'subscribeurl';
+    case Domain = 'domain';
+    case Website = 'website';
 }

src/Domain/Configuration/Repository/ConfigRepository.php

@@ -8,4 +8,8 @@
 
 class ConfigRepository extends AbstractRepository
 {
+    public function findValueByItem(string $name): ?string
+    {
+        return $this->findOneBy(['item' => $name])?->getValue();
+    }
 }

src/Domain/Configuration/Service/Provider/ConfigProvider.php

@@ -7,19 +7,19 @@
 use InvalidArgumentException;
 use PhpList\Core\Domain\Configuration\Model\ConfigOption;
 use PhpList\Core\Domain\Configuration\Repository\ConfigRepository;
+use Psr\SimpleCache\CacheInterface;
 
 class ConfigProvider
 {
     private array $booleanValues = [
         ConfigOption::MaintenanceMode,
-        ConfigOption::SendSubscribeMessage,
     ];
 
-    private ConfigRepository $configRepository;
-
-    public function __construct(ConfigRepository $configRepository)
-    {
-        $this->configRepository = $configRepository;
+    public function __construct(
+        private readonly ConfigRepository $configRepository,
+        private readonly CacheInterface $cache,
+        private readonly int $ttlSeconds = 300
+    ) {
     }
 
     public function isEnabled(ConfigOption $key): bool
@@ -35,11 +35,35 @@ public function isEnabled(ConfigOption $key): bool
     /**
      * Get configuration value by its key
      */
-    public function getValue(string $ikey, ?string $default = null): ?string
+    public function getValue(ConfigOption $key, ?string $default = null): ?string
     {
-        $config = $this->configRepository->findOneBy(['item' => $ikey]);
+        if (in_array($key, $this->booleanValues)) {
+            throw new InvalidArgumentException('Key is a boolean value, use isEnabled instead');
+        }
+        $cacheKey = 'cfg:' . $key->value;
+        $value = $this->cache->get($cacheKey);
+        if ($value === null) {
+            $value = $this->configRepository->findValueByItem($key->value);
+            $this->cache->set($cacheKey, $value, $this->ttlSeconds);
+        }
 
-        return $config?->getValue() ?? $default;
+        return $value ?? $default;
     }
 
+    public function getValueWithNamespace(ConfigOption $key, ?string $default = null): ?string
+    {
+        $full = $this->getValue($key);
+        if ($full !== null && $full !== '') {
+            return $full;
+        }
+
+        if (str_contains($key->value, ':')) {
+            [$parent] = explode(':', $key->value, 2);
+            $parentKey = ConfigOption::from($parent);
+
+            return $this->getValue($parentKey, $default);
+        }
+
+        return $default;
+    }
 }

src/Domain/Subscription/Model/Dto/SubscriberImportOptions.php

@@ -14,6 +14,7 @@ public function __construct(
         public readonly array $listIds = [],
         public readonly bool $dryRun = false,
         public readonly bool $skipInvalidEmail = true,
+        public readonly bool $notifySubscribers = false,
     ) {
     }
 }

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

@@ -32,12 +32,12 @@ public function __construct(
         $this->translator = $translator;
     }
 
-    public function addSubscriberToAList(Subscriber $subscriber, int $listId): Subscription
+    public function addSubscriberToAList(Subscriber $subscriber, int $listId): ?Subscription
     {
         $existingSubscription = $this->subscriptionRepository
             ->findOneBySubscriberEmailAndListId($listId, $subscriber->getEmail());
         if ($existingSubscription) {
-            return $existingSubscription;
+            return null;
         }
         $subscriberList = $this->subscriberListRepository->find($listId);
         if (!$subscriberList) {

src/Domain/Subscription/Service/SubscriberCsvImporter.php

@@ -185,15 +185,19 @@ private function processRow(
 
         $this->processAttributes($subscriber, $dto);
 
+        $addedNewSubscriberToList = false;
         if (!$subscriber->isBlacklisted() && count($options->listIds) > 0) {
             foreach ($options->listIds as $listId) {
-                $this->subscriptionManager->addSubscriberToAList($subscriber, $listId);
+                $created = $this->subscriptionManager->addSubscriberToAList($subscriber, $listId);
+                if ($created) {
+                    $addedNewSubscriberToList = true;
+                }
             }
         }
 
         if (!$options->dryRun) {
             $this->entityManager->flush();
-            if ($this->configProvider->isEnabled(ConfigOption::SendSubscribeMessage)) {
+            if ($options->notifySubscribers && $addedNewSubscriberToList) {
                 $this->sendSubscribeEmail($dto->email, $options->listIds);
             }
         }