AKM-36: Unexpected fs operations for invalid products (#78)

* AKM-36: Unexpected fs operations for invalid products
oroinc · Nov 1, 2022 · 70b7e8f · 70b7e8f
1 parent 29e75c5
commit 70b7e8f
Show file tree

Hide file tree

Showing 13 changed files with 123 additions and 241 deletions.
diff --git a/Command/CleanupCommand.php b/Command/CleanupCommand.php
@@ -60,6 +60,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         ));
 
         $output->writeln('<info>Fields changes cleanup complete</info>');
+
+        return 0;
     }
 
     private function deleteRecords(): int

diff --git a/Entity/AkeneoSettings.php b/Entity/AkeneoSettings.php
@@ -643,7 +643,7 @@ public function getTokenExpiryDateTime()
         return $this->tokenExpiryDateTime;
     }
 
-    public function setTokenExpiryDateTime(DateTime $tokenExpiryDateTime): self
+    public function setTokenExpiryDateTime(\DateTime $tokenExpiryDateTime): self
     {
         $this->tokenExpiryDateTime = $tokenExpiryDateTime;
 

diff --git a/ImportExport/Processor/ProductVariantProcessor.php b/ImportExport/Processor/ProductVariantProcessor.php
@@ -70,14 +70,22 @@ public function process($items)
         $parentProduct = $productRepository->findOneBySku($parentSku);
         if (!$parentProduct instanceof Product) {
             $context->incrementErrorEntriesCount();
-            $errorMessages = [
+            $context->addError(
                 $this->translator->trans(
-                    'oro.akeneo.validator.product_by_sku.not_found',
-                    ['%sku%' => $parentSku],
-                    'validators'
-                ),
-            ];
-            $this->strategyHelper->addValidationErrors($errorMessages, $context);
+                    'oro.akeneo.error',
+                    [
+                        '%error%' => $this->translator->trans(
+                            'oro.akeneo.validator.product_by_sku.not_found',
+                            ['%sku%' => $parentSku],
+                            'validators'
+                        ),
+                        '%item%' => json_encode(
+                            $context->getValue('rawItemData'),
+                            \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE
+                        ),
+                    ]
+                )
+            );
 
             return null;
         }
@@ -121,15 +129,22 @@ function ($variantSku) {
             $variantProduct = $productRepository->findOneBySku($variantSku);
             if (!$variantProduct instanceof Product) {
                 $context->incrementErrorEntriesCount();
-
-                $errorMessages = [
+                $context->addError(
                     $this->translator->trans(
-                        'oro.akeneo.validator.product_by_sku.not_found',
-                        ['%sku%' => $variantSku],
-                        'validators'
-                    ),
-                ];
-                $this->strategyHelper->addValidationErrors($errorMessages, $context);
+                        'oro.akeneo.error',
+                        [
+                            '%error%' => $this->translator->trans(
+                                'oro.akeneo.validator.product_by_sku.not_found',
+                                ['%sku%' => $variantSku],
+                                'validators'
+                            ),
+                            '%item%' => json_encode(
+                                $context->getValue('rawItemData'),
+                                \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE
+                            ),
+                        ]
+                    )
+                );
 
                 continue;
             }
@@ -152,7 +167,20 @@ function ($variantSku) {
         $validationErrors = $this->strategyHelper->validateEntity($parentProduct);
         if ($validationErrors) {
             $context->incrementErrorEntriesCount();
-            $this->strategyHelper->addValidationErrors($validationErrors, $context);
+            foreach ($validationErrors as $validationError) {
+                $context->addError(
+                    $this->translator->trans(
+                        'oro.akeneo.error',
+                        [
+                            '%error%' => $validationError,
+                            '%item%' => json_encode(
+                                $context->getValue('rawItemData'),
+                                \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE
+                            ),
+                        ]
+                    )
+                );
+            }
 
             $objectManager->clear();
 
@@ -170,14 +198,22 @@ function ($variantSku) {
             $parentProduct->setStatus(Product::STATUS_DISABLED);
 
             $context->incrementErrorEntriesCount();
-            $errorMessages = [
+            $context->addError(
                 $this->translator->trans(
-                    'oro.akeneo.validator.product_variants.empty',
-                    ['%sku%' => $parentSku],
-                    'validators'
-                ),
-            ];
-            $this->strategyHelper->addValidationErrors($errorMessages, $context);
+                    'oro.akeneo.error',
+                    [
+                        '%error%' => $this->translator->trans(
+                            'oro.akeneo.validator.product_variants.empty',
+                            ['%sku%' => $parentSku],
+                            'validators'
+                        ),
+                        '%item%' => json_encode(
+                            $context->getValue('rawItemData'),
+                            \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE
+                        ),
+                    ]
+                )
+            );
         }
 
         $context->incrementUpdateCount();

diff --git a/ImportExport/Strategy/AttributeImportStrategy.php b/ImportExport/Strategy/AttributeImportStrategy.php
@@ -13,6 +13,8 @@
  */
 class AttributeImportStrategy extends EntityFieldImportStrategy
 {
+    use StrategyValidationTrait;
+
     /**
      * @var FieldHelper
      */
@@ -88,4 +90,23 @@ protected function processEntity(FieldConfigModel $entity)
 
         return $entity;
     }
+
+    protected function addErrors($errors)
+    {
+        $this->context->incrementErrorEntriesCount();
+        foreach ((array)$errors as $validationError) {
+            $this->context->addError(
+                $this->translator->trans(
+                    'oro.akeneo.error',
+                    [
+                        '%error%' => $validationError,
+                        '%item%' => json_encode(
+                            $this->context->getValue('rawItemData'),
+                            \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE
+                        ),
+                    ]
+                )
+            );
+        }
+    }
 }
diff --git a/ImportExport/Strategy/ImportLogStrategyHelper.php b/ImportExport/Strategy/ImportLogStrategyHelper.php
diff --git a/ImportExport/Strategy/ImportStrategyHelper.php b/ImportExport/Strategy/ImportStrategyHelper.php
diff --git a/ImportExport/Strategy/ProductImageImportStrategy.php b/ImportExport/Strategy/ProductImageImportStrategy.php
@@ -12,6 +12,8 @@
  */
 class ProductImageImportStrategy extends ConfigurableAddOrReplaceStrategy implements ClosableInterface
 {
+    use StrategyValidationTrait;
+
     /**
      * @var Product[]
      */

diff --git a/ImportExport/Strategy/ProductPriceImportStrategy.php b/ImportExport/Strategy/ProductPriceImportStrategy.php
@@ -11,6 +11,7 @@
 class ProductPriceImportStrategy extends BaseStrategy
 {
     use AkeneoIntegrationTrait;
+    use StrategyValidationTrait;
 
     /**
      * {@inheritdoc}

diff --git a/ImportExport/Strategy/StrategyRelationsTrait.php b/ImportExport/Strategy/StrategyRelationsTrait.php
@@ -23,7 +23,6 @@ trait StrategyRelationsTrait
      * @param object $entity
      *
      * @see \Oro\Bundle\ImportExportBundle\Strategy\Import\ImportStrategyHelper::importEntity
-     * @see \Oro\Bundle\AkeneoBundle\ImportExport\Strategy\ImportStrategyHelper::importEntity
      * @see \Oro\Bundle\ImportExportBundle\Strategy\Import\ConfigurableAddOrReplaceStrategy::updateRelations
      */
     protected function updateRelations($entity, array $itemData = null)
-Original file line number
+Diff line change
@@ Expand Up @@
             ));
             $output->writeln('<info>Fields changes cleanup complete</info>');
+            return 0;
         }
         private function deleteRecords(): int
@@ Expand Down @@