Remove instances of hard-coded table names (#720)

Author: ajello-meta

app/code/Meta/BusinessExtension/Model/ResourceModel/FacebookInstalledFeature.php

@@ -39,15 +39,17 @@ public function _construct()
     /**
      * Check if feature exists
      *
-     * @param  string $featureType
-     * @param  int    $storeId
+     * @param string $featureType
+     * @param int $storeId
      * @return bool
      */
     public function doesFeatureTypeExist($featureType, $storeId)
     {
         $connection = $this->getConnection();
+
+        $facebookInstalledFeaturesTable = $connection->getTableName(self::TABLE_NAME);
         $select = $connection->select()
-            ->from(self::TABLE_NAME)
+            ->from($facebookInstalledFeaturesTable)
             ->where('feature_type = ?', $featureType)
             ->where('store_id = ?', $storeId);
         return $connection->fetchRow($select) !== false;
@@ -56,20 +58,22 @@ public function doesFeatureTypeExist($featureType, $storeId)
     /**
      * Delete all features matching storeId
      *
-     * @param  int $storeId
+     * @param int $storeId
      * @return int
      */
     public function deleteAll($storeId)
     {
         $connection = $this->getConnection();
-        return $connection->delete(self::TABLE_NAME, ['store_id = ?' => $storeId]);
+
+        $facebookInstalledFeaturesTable = $connection->getTableName(self::TABLE_NAME);
+        return $connection->delete($facebookInstalledFeaturesTable, ['store_id = ?' => $storeId]);
     }
-    
+
     /**
      * Save response data from 'installed_features' to table
      *
-     * @param  array $features
-     * @param  int   $storeId
+     * @param array $features
+     * @param int $storeId
      * @return void
      */
     public function saveResponseData($features, $storeId)
@@ -84,16 +88,18 @@ function ($value) use ($storeId) {
             },
             array_values($features)
         );
-        
+
         $connection = $this->getConnection();
-        $connection->insertOnDuplicate(self::TABLE_NAME, $finalFeatures);
+
+        $facebookInstalledFeaturesTable = $connection->getTableName(self::TABLE_NAME);
+        $connection->insertOnDuplicate($facebookInstalledFeaturesTable, $finalFeatures);
     }
 
     /**
      * Format array data for insertion in DB
      *
-     * @param  array|string $feature
-     * @param  string       $key
+     * @param array|string $feature
+     * @param string $key
      * @return string|null
      */
     private function formatArrayData($feature, $key)

app/code/Meta/BusinessExtension/Model/ResourceModel/MetaIssueNotification.php

@@ -41,13 +41,15 @@ public function _construct()
     /**
      * Delete all notifications matching notification id
      *
-     * @param  string $notificationId
+     * @param string $notificationId
      * @return int
      */
     public function deleteByNotificationId(string $notificationId): int
     {
         $connection = $this->getConnection();
-        return $connection->delete(self::TABLE_NAME, ['notification_id = ?' => $notificationId]);
+
+        $metaIssueNotificationTable = $connection->getTableName(self::TABLE_NAME);
+        return $connection->delete($metaIssueNotificationTable, ['notification_id = ?' => $notificationId]);
     }
 
     /**
@@ -63,7 +65,9 @@ public function saveVersionNotification(MetaIssueNotificationInterface $notifica
             'message' => $notification->getMessage(),
             'severity' => $notification->getSeverity(),
         ];
-        $connection->insertOnDuplicate(self::TABLE_NAME, $version_notification);
+
+        $metaIssueNotificationTable = $connection->getTableName(self::TABLE_NAME);
+        $connection->insertOnDuplicate($metaIssueNotificationTable, $version_notification);
     }
 
     /**
@@ -72,8 +76,10 @@ public function saveVersionNotification(MetaIssueNotificationInterface $notifica
     public function loadVersionNotification()
     {
         $connection = $this->getConnection();
+
+        $metaIssueNotificationTable = $connection->getTableName(self::TABLE_NAME);
         $select = $connection->select()
-            ->from(self::TABLE_NAME)
+            ->from($metaIssueNotificationTable)
             ->where('notification_id = ?', MetaIssueNotification::VERSION_NOTIFICATION_ID);
         return $connection->fetchRow($select);
     }

app/code/Meta/Catalog/Model/ResourceModel/FacebookCatalogUpdate.php

@@ -65,11 +65,11 @@ class FacebookCatalogUpdate extends AbstractDb
      * @param string $connectionName
      */
     public function __construct(
-        Context $context,
+        Context           $context,
         CollectionFactory $collectionFactory,
-        Random $random,
-        OptionProvider $optionProvider,
-        DateTime $dateTime,
+        Random            $random,
+        OptionProvider    $optionProvider,
+        DateTime          $dateTime,
         $connectionName = null
     ) {
         parent::__construct($context, $connectionName);
@@ -106,7 +106,10 @@ public function addProductIds(array $ids, string $method): int
             }
         }
         if (!empty($dataToInsert)) {
-            return $this->getConnection()->insertMultiple(self::TABLE_NAME, $dataToInsert);
+            $connection = $this->getConnection();
+
+            $facebookCatalogUpdateTable = $connection->getTableName(self::TABLE_NAME);
+            return $connection->insertMultiple($facebookCatalogUpdateTable, $dataToInsert);
         }
         return 0;
     }
@@ -146,7 +149,9 @@ public function reserveProductsForBatchId(string $method, string $batchId): int
 
         $connection = $this->getConnection();
         $updateWhere = $connection->quoteInto('row_id IN (?)', $data);
-        return $connection->update(self::TABLE_NAME, ['batch_id' => $batchId], $updateWhere);
+
+        $facebookCatalogUpdateTable = $connection->getTableName(self::TABLE_NAME);
+        return $connection->update($facebookCatalogUpdateTable, ['batch_id' => $batchId], $updateWhere);
     }
 
     /**
@@ -158,7 +163,9 @@ public function reserveProductsForBatchId(string $method, string $batchId): int
     public function deleteBatch(string $batchId): int
     {
         $connection = $this->getConnection();
-        return $connection->delete(self::TABLE_NAME, ['batch_id = ?' => $batchId]);
+
+        $facebookCatalogUpdateTable = $connection->getTableName(self::TABLE_NAME);
+        return $connection->delete($facebookCatalogUpdateTable, ['batch_id = ?' => $batchId]);
     }
 
     /**
@@ -170,7 +177,9 @@ public function deleteBatch(string $batchId): int
     public function clearBatchId(string $batchId): int
     {
         $connection = $this->getConnection();
-        return $connection->update(self::TABLE_NAME, ['batch_id' => null], ['batch_id = ?' => $batchId]);
+
+        $facebookCatalogUpdateTable = $connection->getTableName(self::TABLE_NAME);
+        return $connection->update($facebookCatalogUpdateTable, ['batch_id' => null], ['batch_id = ?' => $batchId]);
     }
 
     /**
@@ -206,11 +215,16 @@ public function getReservedProducts(string $batchId): Collection
     private function getChildProductLinks(array $parentIds)
     {
         $parentLinkField = $this->optionProvider->getProductEntityLinkField();
-        $select = $this->getConnection()->select()
-            ->from($this->getTable('catalog_product_super_link'), ['parent_id', 'product_id'])
-            ->joinLeft(['e' => $this->getTable('catalog_product_entity')], "e.{$parentLinkField} = parent_id")
+        $connection = $this->getConnection();
+
+        $catalogProductSuperLinkTable = $connection->getTableName('catalog_product_super_link');
+        $catalogProductEntityTable = $connection->getTableName('catalog_product_entity');
+
+        $select = $connection->select()
+            ->from($catalogProductSuperLinkTable, ['parent_id', 'product_id'])
+            ->joinLeft(['e' => $catalogProductEntityTable], "e.{$parentLinkField} = parent_id")
             ->where('e.entity_id IN (?)', $parentIds);
-        return $this->getConnection()->fetchAll($select);
+        return $connection->fetchAll($select);
     }
 
     /**
@@ -225,7 +239,9 @@ public function deleteUpdateProductEntries($sku): void
             return;
         }
         $connection = $this->getConnection();
-        $connection->delete(self::TABLE_NAME, ['sku = ?' => $sku, 'method = ?' => 'update']);
+
+        $facebookCatalogUpdateTable = $connection->getTableName(self::TABLE_NAME);
+        $connection->delete($facebookCatalogUpdateTable, ['sku = ?' => $sku, 'method = ?' => 'update']);
     }
 
     /**
@@ -259,8 +275,10 @@ public function cleanupTable()
     {
         $dateLimit = $this->dateTime->date(null, '-7 days');
         $connection = $this->getConnection();
+
+        $facebookCatalogUpdateTable = $connection->getTableName(self::TABLE_NAME);
         return $connection->delete(
-            self::TABLE_NAME,
+            $facebookCatalogUpdateTable,
             [
                 "batch_id IS NOT NULL",
                 "created_at < '{$dateLimit}'"