Merge pull request #8 from akeneo/PIM-8320

PIM-8320: Upload media files during import
akeneo · May 3, 2019 · eb012ef · eb012ef
2 parents ee3d10a + 051dfa1
commit eb012ef
Show file tree

Hide file tree

Showing 21 changed files with 230 additions and 98 deletions.
diff --git a/config/data_converters.yml b/config/data_converters.yml
diff --git a/config/services.yaml b/config/services.yaml
@@ -11,14 +11,30 @@ services:
         autowire: true      # Automatically injects dependencies in your services.
         autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
 
+    # Tags
+    _instanceof:
+        App\Processor\Converter\DataConverterInterface:
+            tags: ['app.data_converter']
+
     # makes classes in src/ available to be used as services
     # this creates a service per class whose id is the fully-qualified class name
     App\:
         resource: '../src/*'
         exclude: '../src/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
 
+    Box\Spout\Writer\CSV\Writer: ~
+
     Akeneo\PimEnterprise\ApiClient\AkeneoPimEnterpriseClientBuilder:
         arguments:
             $baseUri: '%env(AKENEO_API_BASE_URI)%'
 
-    Box\Spout\Writer\CSV\Writer: ~
+    Akeneo\PimEnterprise\ApiClient\AkeneoPimEnterpriseClientInterface:
+        factory: 'Akeneo\PimEnterprise\ApiClient\AkeneoPimEnterpriseClientBuilder:buildAuthenticatedByPassword'
+        arguments:
+            - '%env(AKENEO_API_CLIENT_ID)%'
+            - '%env(AKENEO_API_CLIENT_SECRET)%'
+            - '%env(AKENEO_API_USERNAME)%'
+            - '%env(AKENEO_API_PASSWORD)%'
+
+    App\Processor\Converter\DataConverter:
+        arguments: [!tagged app.data_converter]
diff --git a/src/Command/ImportCommand.php b/src/Command/ImportCommand.php
@@ -5,6 +5,7 @@
 namespace App\Command;
 
 use Akeneo\PimEnterprise\ApiClient\AkeneoPimEnterpriseClientInterface;
+use App\ApiClientFactory;
 use App\FileLogger;
 use App\Processor\Converter\DataConverter;
 use App\Processor\RecordProcessor;
@@ -42,9 +43,6 @@ class ImportCommand extends Command
     /** @var StructureGenerator */
     private $structureGenerator;
 
-    /** @var AkeneoPimEnterpriseClientBuilder */
-    private $clientBuilder;
-
     /** @var DataConverter */
     private $converter;
 
@@ -68,20 +66,20 @@ class ImportCommand extends Command
 
     public function __construct(
         StructureGenerator $structureGenerator,
-        AkeneoPimEnterpriseClientBuilder $clientBuilder,
         DataConverter $converter,
         RecordProcessor $processor,
         FileLogger $logger,
-        InvalidFileGenerator $invalidFileGenerator
+        InvalidFileGenerator $invalidFileGenerator,
+        AkeneoPimEnterpriseClientInterface $apiClient
     ) {
         parent::__construct(static::$defaultName);
 
         $this->structureGenerator = $structureGenerator;
-        $this->clientBuilder = $clientBuilder;
         $this->converter = $converter;
         $this->processor = $processor;
         $this->logger = $logger;
         $this->invalidFileGenerator = $invalidFileGenerator;
+        $this->apiClient = $apiClient;
     }
 
     protected function configure()
@@ -126,8 +124,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             'If you want to automate this process or don\'t want to use default values, add the --no-interaction flag when you call this command.'
         ]);
 
-        $this->initializeApiClient($input);
-
         $this->io->newLine(2);
         $this->io->title(
             sprintf(
@@ -168,16 +164,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
     }
 
-    private function initializeApiClient(InputInterface $input): void
-    {
-        $this->apiClient = $this->clientBuilder->buildAuthenticatedByPassword(
-            $input->getOption('apiClientId'),
-            $input->getOption('apiClientSecret'),
-            $input->getOption('apiUsername'),
-            $input->getOption('apiPassword')
-        );
-    }
-
     private function fetchReferenceEntityAttributes(string $referenceEntityCode): array
     {
         $attributes = $this->apiClient->getReferenceEntityAttributeApi()->all($referenceEntityCode);
@@ -259,12 +245,12 @@ private function importRecords(
                 continue;
             }
 
-            if (count($this->reader->getHeaders()) !== count($row)) {
-                $this->logger->skip(sprintf(
+            if (!$this->isHeaderValid($row)) {
+                $message = sprintf(
                     'Skipped line %s: the number of values is not equal to the number of headers',
                     $lineNumber
-                ));
-                $this->invalidFileGenerator->fromRow($row, $filePath, $this->reader->getHeaders());
+                );
+                $this->skipRowWithMessage($filePath, $row, $message);
 
                 continue;
             }
@@ -275,7 +261,13 @@ private function importRecords(
             $structure = $this->structureGenerator->generate($attributes, $channels);
             $validStructure = array_intersect_key($structure, array_flip($validHeaders));
 
-            $recordsToWrite[] = $this->processor->process($line, $validStructure);
+            try {
+                $recordsToWrite[] = $this->processor->process($line, $validStructure, $filePath);
+            } catch (\Exception $e) {
+                $this->skipRowWithMessage($filePath, $row, $e->getMessage());
+
+                continue;
+            }
             $linesToWrite[] = $line;
 
             if (count($recordsToWrite) === self::BATCH_SIZE) {
@@ -307,4 +299,15 @@ private function writeRecords(
         $this->logger->logResponses($responses);
         $this->invalidFileGenerator->fromResponses($responses, $linesToWrite, $filePath, $this->reader->getHeaders());
     }
+
+    private function isHeaderValid($row): bool
+    {
+        return count($this->reader->getHeaders()) === count($row);
+    }
+
+    private function skipRowWithMessage(string $filePath, $row, string $message): void
+    {
+        $this->logger->skip($message);
+        $this->invalidFileGenerator->fromRow($row, $filePath, $this->reader->getHeaders());
+    }
 }
diff --git a/src/InvalidFileGenerator.php b/src/InvalidFileGenerator.php
@@ -4,9 +4,6 @@
 
 namespace App;
 
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
-use Box\Spout\Writer\WriterFactory;
-use Box\Spout\Common\Type;
 use Box\Spout\Writer\WriterInterface;
 use Box\Spout\Writer\CSV\Writer;
 use Box\Spout\Common\Helper\GlobalFunctionsHelper;

diff --git a/src/Processor/Converter/DataConverter.php b/src/Processor/Converter/DataConverter.php
@@ -4,43 +4,34 @@
 
 namespace App\Processor\Converter;
 
-use App\YamlReader;
-
 /**
  * Prepare the data to be sent to the API, using registered dedicated converters
  *
  * @author    Adrien Pétremann <[email protected]>
  * @copyright 2019 Akeneo SAS (https://www.akeneo.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
-class DataConverter implements DataConverterInterface
+class DataConverter
 {
     /** @var DataConverterInterface[] */
-    private $converters;
-
-    /** @var YamlReader */
-    private $yamlReader;
+    private $converters = [];
 
-    public function __construct(YamlReader $yamlReader)
+    public function __construct(iterable $dataConverters)
     {
-        $this->yamlReader = $yamlReader;
-        $dataConvertersConfig = $this->yamlReader->parseFile('config/data_converters.yml');
-        $dataConverterClasses = $dataConvertersConfig['data_converters'];
-
-        foreach ($dataConverterClasses as $dataConverterClass) {
-            $this->converters[] = new $dataConverterClass();
-        }
+        $array = [];
+        array_push($array, ...$dataConverters);
+        $this->converters = $array;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function convert(array $attribute, string $data)
+    public function convert(array $attribute, string $data, array $context)
     {
         /** @var DataConverterInterface $converter */
         foreach ($this->converters as $converter) {
             if ($converter->support($attribute)) {
-                return $converter->convert($attribute, $data);
+                return $converter->convert($attribute, $data, $context);
             }
         }
 

diff --git a/src/Processor/Converter/DataConverterInterface.php b/src/Processor/Converter/DataConverterInterface.php
@@ -21,5 +21,5 @@ public function support(array $attribute): bool;
     /**
      * Convert the given $data for the given $attribute to the correct format expected by the Akeneo API
      */
-    public function convert(array $attribute, string $data);
+    public function convert(array $attribute, string $data, array $context);
 }
diff --git a/src/Processor/Converter/MediaAttributeConverter.php b/src/Processor/Converter/MediaAttributeConverter.php
@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Processor\Converter;
+
+use Akeneo\PimEnterprise\ApiClient\AkeneoPimEnterpriseClientInterface;
+use Symfony\Component\Filesystem\Filesystem;
+
+/**
+ * @author    Samir Boulil <[email protected]>
+ * @copyright 2019 Akeneo SAS (http://www.akeneo.com)
+ * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+class MediaAttributeConverter implements DataConverterInterface
+{
+    private const IMAGE_ATTRIBUTE_TYPE = 'image';
+
+    /** @var AkeneoPimEnterpriseClientInterface */
+    private $pimClient;
+
+    /** @var Filesystem */
+    private $filesystem;
+
+    public function __construct(AkeneoPimEnterpriseClientInterface $pimClient, Filesystem $filesystem)
+    {
+        $this->filesystem = $filesystem;
+        $this->pimClient = $pimClient;
+    }
+
+    public function support(array $attribute): bool
+    {
+        return self::IMAGE_ATTRIBUTE_TYPE === $attribute['type'];
+    }
+
+    public function convert(array $attribute, string $data, array $context)
+    {
+        $mediaFilePath = $this->mediaFilePath($data, $context);
+        $this->checkMediaExists($mediaFilePath);
+        $mediaIdentifier = $this->uploadMediaToPIM($mediaFilePath);
+
+        return $mediaIdentifier;
+    }
+
+    private function mediaFilePath(string $relativeMediaPath, array $context): string
+    {
+        $fileToImportPath = $context['filePath'];
+
+        return sprintf('%s%s%s', dirname($fileToImportPath), DIRECTORY_SEPARATOR, $relativeMediaPath);
+    }
+
+    private function checkMediaExists(string $mediaFilePath): void
+    {
+        if (!$this->filesystem->exists($mediaFilePath)) {
+            throw new \RuntimeException(sprintf('media file at path "%s" was not found.', $mediaFilePath));
+        }
+    }
+
+    private function uploadMediaToPIM(string $mediaFilePath): string
+    {
+        try {
+            $mediaIdentifier = $this->pimClient->getReferenceEntityMediaFileApi()->create($mediaFilePath);
+
+            return $mediaIdentifier;
+        } catch (\Exception $exception) {
+            $message = sprintf(
+                'An error occured while uploading the media at path "%s" to the PIM: %s',
+                $mediaFilePath,
+                $exception->getMessage()
+            );
+
+            throw new \RuntimeException($message);
+        }
+    }
+}
diff --git a/src/Processor/Converter/MultipleOptionsConverter.php b/src/Processor/Converter/MultipleOptionsConverter.php
@@ -24,7 +24,7 @@ public function support(array $attribute): bool
     /**
      * {@inheritdoc}
      */
-    public function convert(array $attribute, string $data)
+    public function convert(array $attribute, string $data, array $context)
     {
         if (empty($data)) {
             return [];

diff --git a/src/Processor/Converter/ReferenceEntityMultipleLinksConverter.php b/src/Processor/Converter/ReferenceEntityMultipleLinksConverter.php
@@ -24,7 +24,7 @@ public function support(array $attribute): bool
     /**
      * {@inheritdoc}
      */
-    public function convert(array $attribute, string $data)
+    public function convert(array $attribute, string $data, array $context)
     {
         if (empty($data)) {
             return [];

diff --git a/src/Processor/Converter/ReferenceEntitySingleLinkConverter.php b/src/Processor/Converter/ReferenceEntitySingleLinkConverter.php
@@ -24,7 +24,7 @@ public function support(array $attribute): bool
     /**
      * {@inheritdoc}
      */
-    public function convert(array $attribute, string $data)
+    public function convert(array $attribute, string $data, array $context)
     {
         return $data;
     }

diff --git a/src/Processor/Converter/SingleOptionConverter.php b/src/Processor/Converter/SingleOptionConverter.php
@@ -24,7 +24,7 @@ public function support(array $attribute): bool
     /**
      * {@inheritdoc}
      */
-    public function convert(array $attribute, string $data)
+    public function convert(array $attribute, string $data, array $context)
     {
         return $data;
     }

diff --git a/src/Processor/Converter/TextAttributeConverter.php b/src/Processor/Converter/TextAttributeConverter.php
@@ -24,7 +24,7 @@ public function support(array $attribute): bool
     /**
      * {@inheritdoc}
      */
-    public function convert(array $attribute, string $data)
+    public function convert(array $attribute, string $data, array $context)
     {
         return $data;
     }

diff --git a/src/Processor/RecordProcessor.php b/src/Processor/RecordProcessor.php
@@ -20,7 +20,7 @@ public function __construct(ValueKeyGenerator $valueKeyGenerator, DataConverter
         $this->dataConverter = $dataConverter;
     }
 
-    public function process(array $line, array $validStructure): array
+    public function process(array $line, array $validStructure, string $filePath): array
     {
         $values = [];
         foreach ($validStructure as $valueKey => $attribute) {
@@ -29,7 +29,7 @@ public function process(array $line, array $validStructure): array
             $values[$attribute['code']][] = [
                 'channel' => $context['channel'],
                 'locale' => $context['locale'],
-                'data' => $this->dataConverter->convert($attribute, $line[$valueKey]),
+                'data' => $this->dataConverter->convert($attribute, $line[$valueKey], ['filePath' => $filePath]),
             ];
         }
 

diff --git a/src/YamlReader.php b/src/YamlReader.php