- Added mergeFields as attribute in SubscriberList.

- Modified Sync Merge Fields command to use listProvider.
welpdev · Nov 15, 2017 · 06fb7e0 · 06fb7e0
1 parent efcd8da
commit 06fb7e0
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 9 deletions.
diff --git a/src/Command/SynchronizeMergeFieldsCommand.php b/src/Command/SynchronizeMergeFieldsCommand.php
@@ -5,6 +5,8 @@
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
+use Welp\MailchimpBundle\Provider\ListProviderInterface;
 
 class SynchronizeMergeFieldsCommand extends ContainerAwareCommand
 {
@@ -15,20 +17,28 @@ protected function configure()
             ->setName('welp:mailchimp:synchronize-merge-fields')
             // @TODO add params : listId
         ;
-    }
+    } 
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $output->writeln(sprintf('<info>%s</info>', $this->getDescription()));
 
-        $lists = $this->getContainer()->getParameter('welp_mailchimp.lists');
-        if (sizeof($lists) == 0) {
-            throw new \RuntimeException("No Mailchimp list has been defined. Check the your config.yml file based on MailchimpBundle's README.md");
+        $listProviderKey = $this->getContainer()->getParameter('welp_mailchimp.list_provider');
+        try {
+            $listProvider = $this->getContainer()->get($listProviderKey); 
+        } catch (ServiceNotFoundException $e) {
+            throw new \InvalidArgumentException(sprintf('List Provider "%s" should be defined as a service.', $listProviderKey), $e->getCode(), $e);
+        }
+
+        if (!$listProvider instanceof ListProviderInterface) {
+            throw new \InvalidArgumentException(sprintf('List Provider "%s" should implement Welp\MailchimpBundle\Provider\ListProviderInterface.', $listProviderKey));
         }
 
-        foreach ($lists as $listId => $listParameters) {
+        $lists = $listProvider->getLists();
+
+        foreach ($lists as $list) {
             $this->getContainer()->get('welp_mailchimp.list_synchronizer')
-                ->synchronizeMergeFields($listId, $listParameters['merge_fields']);
+                ->synchronizeMergeFields($list->getListId(), $list->getMergeFields());
             ;
         }
     }

diff --git a/src/Provider/ConfigListProvider.php b/src/Provider/ConfigListProvider.php
@@ -30,7 +30,7 @@ public function getLists()
             $providerServiceKey = $listParameters['subscriber_provider'];
 
             $provider = $this->providerFactory->create($providerServiceKey);
-            $lists[] = new SubscriberList($listId, $provider);           
+            $lists[] = new SubscriberList($listId, $provider, $listParameters['merge_fields']);           
         }
 
         return $lists;

diff --git a/src/Subscriber/SubscriberList.php b/src/Subscriber/SubscriberList.php
@@ -22,19 +22,28 @@ class SubscriberList
      */
     protected $provider;
 
+    /**
+     * Merge fields
+     * @var array
+     */
+    protected $mergeFields;
+
     /**
      *
      * @param string            $listId
      * @param ProviderInterface $provider
+     * @param array             $mergeFields
      */
-    public function __construct($listId, ProviderInterface $provider)
+    public function __construct($listId, ProviderInterface $provider, array $mergeFields = array())
     {
         $this->listId = $listId;
         $this->provider = $provider;
+        $this->mergeFields = $mergeFields;
+
         //If the provider implements DynamicProviderInterface, set the list id in the provider
         if ($this->provider instanceof DynamicProviderInterface) {
             $this->provider->setListId($this->listId);
-        }
+        }        
     }
 
     /**
@@ -54,4 +63,13 @@ public function getProvider()
     {
         return $this->provider;
     }
+
+    /**
+     * Get the list merge fields
+     * @return array
+     */
+    public function getMergeFields()
+    {
+        return $this->mergeFields;
+    }
 }