Merge pull request #54 from vseager/patch-2

Use config id_field for SkipExistingProducts
WeareJH · Oct 24, 2022 · 918b68e · 918b68e
2 parents a22fc80 + 40c7528
commit 918b68e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/src/Filter/LoggingSkipNonExistingProducts.php b/src/Filter/LoggingSkipNonExistingProducts.php
@@ -19,7 +19,7 @@ class LoggingSkipNonExistingProducts implements RequiresPreparation
     /**
      * @var string
      */
-    private $skuField = 'sku';
+    private $idField = '';
 
     public function __construct(SkipNonExistingProducts $skipNonExistingProducts)
     {
@@ -29,7 +29,7 @@ public function __construct(SkipNonExistingProducts $skipNonExistingProducts)
     public function prepare(Config $config): void
     {
         $this->skipNonExistingProducts->prepare($config);
-        $this->skuField = $config->getIdField();
+        $this->idField = $config->getIdField();
     }
 
     public function __invoke(Record $record, ReportItem $reportItem): bool
@@ -39,7 +39,7 @@ public function __invoke(Record $record, ReportItem $reportItem): bool
         if (!$found) {
             //TODO: Make level configurable so we can cause import to fail
             //warning will not cause a fail, whereas errror will
-            $reportItem->addWarning(sprintf('Product: "%s" does not exist.', $record->getColumnValue($this->skuField)));
+            $reportItem->addWarning(sprintf('Product: "%s" does not exist.', $record->getColumnValue($this->idField)));
         }
 
         return $found;

diff --git a/src/Filter/SkipExistingProducts.php b/src/Filter/SkipExistingProducts.php
@@ -2,16 +2,23 @@
 
 namespace Jh\Import\Filter;
 
+use Jh\Import\Config;
 use Jh\Import\Import\Record;
+use Jh\Import\Import\RequiresPreparation;
 use Magento\Framework\App\ResourceConnection;
 
-class SkipExistingProducts
+class SkipExistingProducts implements RequiresPreparation
 {
     /**
      * @var array
      */
     private $existingSkus = [];
 
+    /**
+     * @var string
+     */
+    private $idField = '';
+
     public function __construct(ResourceConnection $connection)
     {
         $select = $connection->getConnection()
@@ -21,8 +28,13 @@ public function __construct(ResourceConnection $connection)
         $this->existingSkus = $connection->getConnection()->fetchCol($select);
     }
 
+    public function prepare(Config $config): void
+    {
+        $this->idField = $config->getIdField();
+    }
+
     public function __invoke(Record $record): bool
     {
-        return !in_array($record->getColumnValue('sku'), $this->existingSkus, true);
+        return !in_array($record->getColumnValue($this->idField), $this->existingSkus, true);
     }
 }
diff --git a/src/Filter/SkipNonExistingProducts.php b/src/Filter/SkipNonExistingProducts.php
@@ -17,7 +17,7 @@ class SkipNonExistingProducts implements RequiresPreparation
     /**
      * @var string
      */
-    private $skuField = 'sku';
+    private $idField = '';
 
     public function __construct(ResourceConnection $connection)
     {
@@ -30,11 +30,11 @@ public function __construct(ResourceConnection $connection)
 
     public function prepare(Config $config): void
     {
-        $this->skuField = $config->getIdField();
+        $this->idField = $config->getIdField();
     }
 
     public function __invoke(Record $record): bool
     {
-        return in_array($record->getColumnValue($this->skuField), $this->existingSkus, true);
+        return in_array($record->getColumnValue($this->idField), $this->existingSkus, true);
     }
 }