Merge pull request #101 from gyKa/multiple_shops

Fix multiple shop id functionality.

Resources/config/extractor.yml

@@ -1,19 +1,22 @@
 parameters:
+    ongr_connections.extractor.doctrine_extractor.class: ONGR\ConnectionsBundle\Sync\Extractor\DoctrineExtractor
     ongr_connections.extractor.passthrough_extractor.class: ONGR\ConnectionsBundle\Sync\Extractor\PassthroughExtractor
     ongr_connections.sync.relations_collection.class: ONGR\ConnectionsBundle\Sync\Extractor\Relation\RelationsCollection
 
 services:
     ongr_connections.sync.extractor.doctrine_extractor:
-        class: ONGR\ConnectionsBundle\Sync\Extractor\DoctrineExtractor
+        class: %ongr_connections.extractor.doctrine_extractor.class%
         calls:
             - [ setRelationsCollection, [ @ongr_connections.sync.relations_collection ] ]
             - [ setConnection, [ @database_connection ] ]
             - [ setStorageFacility, [ @ongr_connections.sync.sync_storage ] ]
+            - [ setContainer, [ @service_container ] ]
 
     ongr_connections.sync.extractor.passthrough_extractor:
         class: %ongr_connections.extractor.passthrough_extractor.class%
         calls:
             - [ setStorageFacility, [ @ongr_connections.sync.sync_storage ] ]
+            - [ setContainer, [ @service_container ] ]
 
     ongr_connections.sync.relations_collection:
         class: %ongr_connections.sync.relations_collection.class%

Sync/Extractor/AbstractExtractor.php

@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the ONGR package.
+ *
+ * (c) NFQ Technologies UAB <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ONGR\ConnectionsBundle\Sync\Extractor;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+
+/**
+ * Common actions required for all extractors.
+ */
+abstract class AbstractExtractor
+{
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    /**
+     * @param ContainerInterface $container
+     */
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
+    /**
+     * Gets ids of shops from the configuration.
+     *
+     * @return array
+     */
+    protected function getShopIds()
+    {
+        try {
+            $shops = $this->container->getParameter('shop_ids');
+        } catch (InvalidArgumentException $e) {
+            $shops = [];
+        }
+
+        return $shops;
+    }
+}

Sync/Extractor/DoctrineExtractor.php

@@ -27,7 +27,7 @@
 /**
  * Extractor that joins entities for insertion to SyncStorage.
  */
-class DoctrineExtractor implements ExtractorInterface
+class DoctrineExtractor extends AbstractExtractor implements ExtractorInterface
 {
     /**
      * @var SyncStorageInterface
@@ -69,7 +69,13 @@ public function extract(BaseDiffItem $item)
                 $itemId = $itemRow[$idFieldName];
 
                 $storage = $this->getStorageFacility();
-                $storage->save($action, $insertList[JobTableFields::TYPE]['value'], $itemId, $item->getTimestamp());
+                $storage->save(
+                    $action,
+                    $insertList[JobTableFields::TYPE]['value'],
+                    $itemId,
+                    $item->getTimestamp(),
+                    $this->getShopIds()
+                );
 
                 $statements = $relation->getStatements();
                 foreach ($statements as $statement) {
@@ -201,7 +207,8 @@ protected function saveResult(BaseDiffItem $item, Statement $results, $action =
                 $action,
                 $row[JobTableFields::TYPE],
                 $row[JobTableFields::ID],
-                $item->getTimestamp()
+                $item->getTimestamp(),
+                $this->getShopIds()
             );
         }
     }

Sync/Extractor/PassthroughExtractor.php

@@ -22,7 +22,7 @@
 /**
  * Very simple data extractor for data synchronization.
  */
-class PassthroughExtractor implements ExtractorInterface
+class PassthroughExtractor extends AbstractExtractor implements ExtractorInterface
 {
     /**
      * @var SyncStorageInterface
@@ -34,34 +34,18 @@ class PassthroughExtractor implements ExtractorInterface
      */
     public function extract(BaseDiffItem $item)
     {
-        $itemId = $item->getItemId();
-        if (!is_numeric($itemId)) {
+        if (!is_numeric($item->getItemId())) {
             throw new InvalidArgumentException('No valid item ID provided.');
         }
 
         if ($item instanceof CreateDiffItem) {
-            $this->storage->save(
-                ActionTypes::CREATE,
-                $item->getCategory(),
-                $itemId,
-                $item->getTimestamp()
-            );
+            $this->saveResult($item, ActionTypes::CREATE);
         }
         if ($item instanceof UpdateDiffItem) {
-            $this->storage->save(
-                ActionTypes::UPDATE,
-                $item->getCategory(),
-                $itemId,
-                $item->getTimestamp()
-            );
+            $this->saveResult($item, ActionTypes::UPDATE);
         }
         if ($item instanceof DeleteDiffItem) {
-            $this->storage->save(
-                ActionTypes::DELETE,
-                $item->getCategory(),
-                $itemId,
-                $item->getTimestamp()
-            );
+            $this->saveResult($item, ActionTypes::DELETE);
         }
     }
 
@@ -80,4 +64,21 @@ public function getStorageFacility()
     {
         return $this->storage;
     }
+
+    /**
+     * Save results to storage.
+     *
+     * @param BaseDiffItem $item
+     * @param string       $action
+     */
+    private function saveResult(BaseDiffItem $item, $action)
+    {
+        $this->storage->save(
+            $action,
+            $item->getCategory(),
+            $item->getItemId(),
+            $item->getTimestamp(),
+            $this->getShopIds()
+        );
+    }
 }

Sync/StorageManager/MysqlStorageManager.php

@@ -30,12 +30,13 @@ public function createStorage($shopId = null, $connection = null)
     {
         $connection = $connection ? : $this->getConnection();
         $schemaManager = $connection->getSchemaManager();
+        $tableName = $this->getTableName($shopId);
 
-        if ($schemaManager->tablesExist([$this->getTableName($shopId)])) {
+        if ($schemaManager->tablesExist([$tableName])) {
             return true;
         }
 
-        $table = new Table($this->getTableName($shopId));
+        $table = new Table($tableName);
         $this->buildTable($table);
         $schemaManager->createTable($table);
 
@@ -85,12 +86,11 @@ public function getTableName($shopId = null)
     {
         $tableName = parent::getTableName();
 
-        $suffix = null;
         if ($shopId !== null) {
-            $suffix = '_' . $shopId;
+            $tableName .= '_' . $shopId;
         }
 
-        return $tableName . $suffix;
+        return $tableName;
     }
 
     /**
@@ -101,6 +101,7 @@ public function addRecord($operationType, $documentType, $documentId, DateTime $
         if (empty($shopIds)) {
             $shopIds = [null];
         }
+
         $connection = $this->getConnection();
 
         foreach ($shopIds as $shopId) {