EE Staging compatibility + Media & Related code refactoring

Author: magentix

CHANGELOG.md

@@ -2,7 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
-## [not-released]
+## [100.2.0] - 2017-02-03
+
+  * add: code refactoring for media and related
+  * add: compatibility with staging modules
+
+## [100.1.2] - 2017-02-01
 
   * fix: load model import
   * fix: Use the configured category suffix instead of hardcoded.html

Category/Model/Factory/Import.php

@@ -11,6 +11,7 @@
 use \Magento\Framework\App\Cache\TypeListInterface;
 use \Magento\Framework\Module\Manager as moduleManager;
 use \Magento\Framework\App\Config\ScopeConfigInterface as scopeConfig;
+use \Magento\Staging\Model\VersionManager;
 use \Zend_Db_Expr as Expr;
 use \Exception;
 
@@ -229,6 +230,20 @@ public function createEntities()
         $connection = $this->_entities->getResource()->getConnection();
         $tmpTable = $this->_entities->getTableName($this->getCode());
 
+        if ($connection->isTableExists($connection->getTableName('sequence_catalog_category'))) {
+            $values = array(
+                'sequence_value' => '_entity_id',
+            );
+            $parents = $connection->select()->from($tmpTable, $values);
+            $connection->query(
+                $connection->insertFromSelect(
+                    $parents, $connection->getTableName('sequence_catalog_category'), array_keys($values), 1
+                )
+            );
+        }
+
+        $table = $connection->getTableName('catalog_category_entity');
+
         $values = array(
             'entity_id'        => '_entity_id',
             'attribute_set_id' => new Expr(3),
@@ -239,17 +254,24 @@ public function createEntities()
             'level'            => 'level',
             'children_count'   => new Expr('0'),
         );
+
+        if ($this->_entities->getColumnIdentifier($table) == 'row_id') {
+            $values['row_id'] = '_entity_id';
+            $values['created_in'] = new Expr(1);
+            $values['updated_in'] = new Expr(VersionManager::MAX_VERSION);
+        }
+
         $parents = $connection->select()->from($tmpTable, $values);
         $connection->query(
             $connection->insertFromSelect(
-                $parents, $connection->getTableName('catalog_category_entity'), array_keys($values), 1
+                $parents, $table, array_keys($values), 1
             )
         );
 
         $values = array(
             'created_at' => new Expr('now()')
         );
-        $connection->update($connection->getTableName('catalog_category_entity'), $values, 'created_at IS NULL');
+        $connection->update($table, $values, 'created_at IS NULL');
     }
 
     /**

Entities/Model/Entities.php

@@ -187,6 +187,17 @@ public function setValues($tableSuffix, $entityTable, $values, $entityTypeId, $s
         return $this;
     }
 
+    /**
+     * Retrieve column identifier
+     *
+     * @param string $table
+     * @return string
+     */
+    public function getColumnIdentifier($table)
+    {
+        return $this->_getResource()->getColumnIdentifier($table);
+    }
+
     /**
      * Copy column to an other
      *

Entities/Model/ResourceModel/Entities.php

@@ -293,6 +293,10 @@ public function matchEntity($tableName, $pimKey, $entityTable, $entityKey, $impo
         $pimgentoTable = $connection->getTableName('pimgento_entities');
         $entityTable   = $connection->getTableName($entityTable);
 
+        if ($entityKey == 'entity_id') {
+            $entityKey = $this->getColumnIdentifier($entityTable);
+        }
+
         /* Update entity_id column from pimgento_entities table */
         $connection->query('
             UPDATE `' . $tableName . '` t
@@ -370,25 +374,28 @@ public function setValues($tableName, $entityTable, $values, $entityTypeId, $sto
         foreach ($values as $code => $value) {
             if (($attribute = $this->getAttribute($code, $entityTypeId))) {
                 if ($attribute['backend_type'] !== 'static') {
+                    $backendType = $attribute['backend_type'];
+
+                    $identifier = $this->getColumnIdentifier($entityTable . '_' . $backendType);
+
                     $select = $connection->select()
                         ->from(
                             $tableName,
                             array(
                                 'attribute_id'   => new Expr($attribute['attribute_id']),
                                 'store_id'       => new Expr($storeId),
-                                'entity_id'      => '_entity_id',
+                                $identifier      => '_entity_id',
                                 'value'          => $value
                             )
                         );
                     if ($connection->tableColumnExists($tableName, $value)) {
                         $select->where('TRIM(`' . $value . '`) <> ?', new Expr('""'));
                     }
-                    $backendType = $attribute['backend_type'];
 
                     $insert = $connection->insertFromSelect(
                         $select,
                         $connection->getTableName($entityTable . '_' . $backendType),
-                        array('attribute_id', 'store_id', 'entity_id', 'value'),
+                        array('attribute_id', 'store_id', $identifier, 'value'),
                         $mode
                     );
                     $connection->query($insert);
@@ -465,4 +472,22 @@ protected function formatColumn($column)
         return trim(str_replace(PHP_EOL, '', preg_replace('/\s+/', ' ', trim($column))), '""');
     }
 
+    /**
+     * Retrieve if row id column exists
+     *
+     * @param string $table
+     * @param string $identifier
+     * @return string
+     */
+    public function getColumnIdentifier($table, $identifier = 'entity_id')
+    {
+        $connection = $this->getConnection();
+
+        if ($connection->tableColumnExists($table, 'row_id')) {
+            $identifier = 'row_id';
+        }
+
+        return $identifier;
+    }
+
 }

Product/Helper/Media.php

@@ -179,7 +179,7 @@ public function getMediaAbsolutePath()
      */
     public function isCleanFiles()
     {
-        return $this->imageConfig['clean_files'];
+        return isset($this->imageConfig['clean_files']) ? $this->imageConfig['clean_files'] : 0;
     }
 
     /**
@@ -199,7 +199,7 @@ public function getMediaGalleryAttributeId()
      */
     public function cleanFiles()
     {
-        $folder = $this->getImportFolder().'files/';
+        $folder = $this->getImportFolder() . 'files/';
 
         if (is_dir($folder)) {
             $this->delTree($folder);