MDEE-376: bubble up errors in link command

Author: obarcelonap

SalesOrdersDataExporter/Console/Command/ExportOnDemand.php

@@ -13,7 +13,6 @@
 use Magento\DataExporter\Model\Logging\CommerceDataExportLoggerInterface;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Intl\DateTimeFactory;
-use Magento\SalesOrdersDataExporter\Console\Command\Link;
 use Magento\SalesOrdersDataExporter\Model\Indexer\DateTimeRangeOrderProcessor;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -46,8 +45,7 @@ public function __construct(
         DateTimeRangeOrderProcessor       $processor,
         DateTimeFactory                   $dateTimeFactory,
         Link                              $link
-    )
-    {
+    ) {
         $this->logger = $logger;
         $this->metadata = $metadata;
         $this->processor = $processor;
@@ -94,9 +92,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     private function ensureAssignedUuids(DateTime $from, DateTime $to, OutputInterface $output): int
     {
         $returnCode = $this->linkCommand->
-            prepareForExport(
+            assignUuidsToOrderEntities(
                 $this->metadata->getBatchSize(),
-                $output,
                 $from->format(DateTimeInterface::W3C),
                 $to->format(DateTimeInterface::W3C)
             );

SalesOrdersDataExporter/Console/Command/Link.php

@@ -135,35 +135,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 ? (new \DateTime($input->getOption(self::OPTION_TO)))->format(\DateTimeInterface::W3C)
                 : null;
 
-            return $this->prepareForExport($batchSize, $output, $from, $to, $state);
-        } catch (\Throwable $e) {
-            $output->writeln('<error>Failed to update UUID. Check logs</error>');
-            $this->logger->error(
-                sprintf('Command "%s" failed. Error message: %s', self::COMMAND_NAME, $e->getMessage())
-            );
-
-            return Cli::RETURN_FAILURE;
-        }
-    }
-
-    /**
-     * Updating UUID
-     *
-     * @param int $batchSize
-     * @param OutputInterface $output
-     * @param string $from
-     * @param string $to
-     * @param string $state
-     * @return int
-     */
-    public function prepareForExport(
-        int $batchSize,
-        OutputInterface $output,
-        string $from = null,
-        string $to = null,
-        string $state = ''
-    ) {
-        try {
             $output->writeln(
                 sprintf(
                     '<info>Start updating UUID with parameters [state=%s, from=%s, to=%s, batch_size=%s]</info>',
@@ -174,19 +145,16 @@ public function prepareForExport(
                 )
             );
 
-            $updatedEntities = 0;
-            foreach ($this->getOrders($state, $batchSize, $from, $to) as $type => $entityIds) {
-                $this->uuidManager->assignBulk($entityIds, $type);
-                $updatedEntities += count($entityIds);
-            }
+            $updatedEntities = $this->assignUuidsToOrderEntities($batchSize, $from, $to, $state);
+
             $output->writeln(
                 sprintf(
                     '<info>Update completed successfully, %s entities updated</info>',
                     $updatedEntities
                 )
             );
-            return Cli::RETURN_SUCCESS;
 
+            return CLI::RETURN_SUCCESS;
         } catch (\Throwable $e) {
             $output->writeln('<error>Failed to update UUID. Check logs</error>');
             $this->logger->error(
@@ -197,6 +165,29 @@ public function prepareForExport(
         }
     }
 
+    /**
+     * Updating UUID
+     *
+     * @param int $batchSize
+     * @param string|null $from
+     * @param string|null $to
+     * @param string $state
+     * @return int
+     */
+    public function assignUuidsToOrderEntities(
+        int $batchSize,
+        string $from = null,
+        string $to = null,
+        string $state = ''
+    ): int {
+        $updatedEntities = 0;
+        foreach ($this->getOrders($state, $batchSize, $from, $to) as $type => $entityIds) {
+            $this->uuidManager->assignBulk($entityIds, $type);
+            $updatedEntities += count($entityIds);
+        }
+        return $updatedEntities;
+    }
+
     /**
      * @param string $state
      * @param int $batchSize

SalesOrdersDataExporter/Model/OnDemandExportOrdersRepository.php

@@ -39,10 +39,10 @@ public function countOrders(): int
                 ['count' => 'COUNT(*)']
             );
         $row = $connection->fetchRow($select);
-        return $row['count'];
+        return intval($row['count']);
     }
 
-    public function fetchOrders(int $batchSize = 100): Generator
+    public function fetchOrders(): Generator
     {
         $tableName = $this->resourceConnection->getTableName($this->metadata->getFeedTableName());
         $connection = $this->resourceConnection->getConnection();
@@ -56,7 +56,7 @@ public function fetchOrders(int $batchSize = 100): Generator
         $iterator = $this->batchIteratorFactory->create(
             [
                 'select' => $select,
-                'batchSize' => $batchSize,
+                'batchSize' => $this->metadata->getBatchSize(),
                 'correlationName' => 'order',
                 'rangeField' => 'id',
                 'rangeFieldAlias' => 'id',

SalesOrdersDataExporter/Model/OnDemandOrdersExporter.php

@@ -11,11 +11,8 @@
 use DateTimeInterface;
 use Magento\DataExporter\Model\Indexer\FeedIndexMetadata;
 use Magento\DataExporter\Model\Logging\CommerceDataExportLoggerInterface;
-use Magento\Framework\Console\Cli;
 use Magento\SalesOrdersDataExporter\Console\Command\Link;
 use Magento\SalesOrdersDataExporter\Model\Indexer\DateTimeRangeOrderProcessor;
-use Symfony\Component\Console\Output\NullOutput;
-use Symfony\Component\Console\Output\OutputInterface;
 
 class OnDemandOrdersExporter
 {
@@ -36,23 +33,15 @@ public function __construct(
         $this->linkCommand = $linkCommand;
     }
 
-    public function export(DateTime $from, DateTime $to, OutputInterface $output = null): void
+    public function export(DateTime $from, DateTime $to): void
     {
-        $output = $output ?? new NullOutput();
-        $this->ensureAssignedUuids($from, $to, $output);
-        $this->processor->fullReindex($this->metadata, $from, $to);
-    }
-
-    private function ensureAssignedUuids(DateTime $from, DateTime $to, OutputInterface $output): void
-    {
-        $returnCode = $this->linkCommand->prepareForExport(
+        $this->linkCommand->assignUuidsToOrderEntities(
             $this->metadata->getBatchSize(),
-            $output,
             $from->format(DateTimeInterface::W3C),
             $to->format(DateTimeInterface::W3C)
         );
-        if ($returnCode != Cli::RETURN_SUCCESS) {
-            $this->logger->error('Command "commerce-data-export:orders:link" failed.');
-        }
+        $this->processor->fullReindex($this->metadata, $from, $to);
+        // TODO: would be interesting here to return the amount of orders indexed but impl needs further thinking
     }
+
 }