OXDEV-8388 Fix export command

Author: TitaKoleva

Application/Export/Cli/ExportCommand.php

@@ -24,11 +24,6 @@ class ExportCommand
      */
     private $config;
 
-    /**
-     * @var string
-     */
-    private $eShopSourcePath;
-
     /**
      * @var Exporter
      */
@@ -37,12 +32,10 @@ class ExportCommand
     /**
      * @param array   $cliArguments
      * @param Factory $factory
-     * @param string  $eShopSourcePath
      */
-    public function __construct($cliArguments, $factory, string $eShopSourcePath)
+    public function __construct($cliArguments, $factory)
     {
         Registry::getConfig()->setAdminMode(true);
-        $this->eShopSourcePath = $eShopSourcePath;
         $this->config = $this->getConfigurationParameters($cliArguments);
         Registry::getConfig()->setShopId($this->config['shopId']);
 
@@ -85,25 +78,17 @@ public function export()
     }
 
     /**
-     * @param array $cliArguments
+     * @param string $cliArguments
      *
      * @return string
      */
     private function getConfigFile($cliArguments)
     {
-        $configFile = Path::join($this->eShopSourcePath, 'modules/oe/personalization/config/default_params.php');
-        array_shift($cliArguments);
-        if (isset($cliArguments[0])) {
-            if ($cliArguments[0] === '--config') {
-                $configFile = (isset($cliArguments[1])) ? $cliArguments[1] : '';
-                if (!file_exists($configFile)) {
-                    exit('File does not exist: ' . $configFile . "\n");
-                }
-            } else {
-                $message = 'Unknown command: ' . $cliArguments[0] .
-                    '. If you want to override the configuration file for the export, please, use the "--config" command' .
-                    "\n";
-                exit($message);
+        $configFile = Path::join(__DIR__, '../../../config/default_params.php');
+        if (isset($cliArguments)) {
+            $configFile = $cliArguments;
+            if (!file_exists($configFile)) {
+                exit('File does not exist: ' . $configFile . "\n");
             }
         }
 
@@ -114,7 +99,7 @@ private function getConfigFile($cliArguments)
     }
 
     /**
-     * @param array $argv
+     * @param string $argv
      *
      * @return array
      */

Command/ExportDataCommand.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+namespace OxidEsales\PersonalizationModule\Command;
+
+use OxidEsales\PersonalizationModule\Application\Export\Cli\ExportCommand;
+use OxidEsales\PersonalizationModule\Application\Factory;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ExportDataCommand extends Command
+{
+
+    protected function configure()
+    {
+        $this
+            ->setName('oe:personalization:export')
+            ->setDescription('Export data')
+            ->addOption('config', null, InputOption::VALUE_OPTIONAL, 'Path to configuration file');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $configFile = $input->hasOption('config') ? $input->getOption('config') : null;
+        $exporter = oxNew(ExportCommand::class, $configFile, oxNew(Factory::class));
+        $exporter->export();
+
+        return Command::SUCCESS;
+    }
+}

README.md

@@ -81,11 +81,11 @@ There are 2 ways of exporting data:
 
 To export data via CLI execute command:
 ```bash
-vendor/bin/oe-personalization-data-feed
+bin/oe-console oe:personalization:export
 ```
 or if there is a need to customize configuration parameters:
 ```bash
-vendor/bin/oe-personalization-data-feed --config /path/to/your/config/file.php
+bin/oe-console oe:personalization:export --config /path/to/your/config/file.php
 ```
 
 ## Bugs and Issues

bin/oe-personalization-data-feed

@@ -12,4 +12,9 @@ services:
   OxidEsales\PersonalizationModule\Twig\Extensions\Tracker:
     decorates: OxidEsales\Twig\Extensions\InsertTrackerExtension
     decoration_on_invalid: ignore
-    arguments: ['@.inner']
+    arguments: ['@.inner']
+
+  oxid_esales.personalization.command.export_data:
+    class: OxidEsales\PersonalizationModule\Command\ExportDataCommand
+    tags:
+      - { name: 'console.command', command: 'oe:personalization:export' }

services.yaml

@@ -7,6 +7,8 @@
 namespace OxidEsales\PersonalizationModule\Tests\Integration\Application;
 
 use OxidEsales\Eshop\Core\Registry;
+use OxidEsales\PersonalizationModule\Command\ExportDataCommand;
+use Symfony\Component\Console\Tester\CommandTester;
 
 class ExportViaCmdTest extends AbstractExportDataInCSV
 {
@@ -57,14 +59,15 @@ protected function setParametersForExport($exportParentProducts, $exportVars, $c
 
     protected function runExport($configFile = null)
     {
-        $addArguments = ($this->configFile ) ? ' --config ' . escapeshellarg($this->configFile) : '';
-        $feedFile = VENDOR_PATH. '/bin/oe-personalization-data-feed';
-        exec($this->phpBin . ' ' . escapeshellarg($feedFile) . $addArguments, $returnOutput);
-        $isFound = false;
-        if (array_search('Export completed.', $returnOutput) !== false) {
-            $isFound = true;
+        $command = new ExportDataCommand();
+        $commandTester = new CommandTester($command);
+        $commandTester->execute(['--config' => $configFile]);
+        $exportDir = Registry::getConfig()->getConfigParam('sShopDir') . $this->exportPath;
+        $success = false;
+        if (file_exists($exportDir.'/products.csv') && file_exists($exportDir.'/categories.csv')) {
+            $success = true;
         }
-        $this->assertTrue($isFound);
+        $this->assertTrue($success);
     }
 
     public function testIfWrongCommandWillBeUsed()