EZP-25756: Can't index data in solrBundle (#47)

Author: alongosz

bundle/Command/SolrCreateIndexCommand.php

@@ -15,6 +15,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use eZ\Publish\SPI\Persistence\Content\ContentInfo;
+use eZ\Publish\Core\Base\Exceptions\NotFoundException;
 use EzSystems\EzPlatformSolrSearchEngine\Handler as SolrSearchEngineHandler;
 use RuntimeException;
 use PDO;
@@ -78,18 +79,26 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $progress = $this->getHelperSet()->get('progress');
         $progress->start($output, $totalCount);
         $i = 0;
+        $logger = $this->getContainer()->get('logger');
+        /* @var \Psr\Log\LoggerInterface $logger */
         do {
             $contentObjects = array();
 
             for ($k = 0; $k <= $bulkCount; ++$k) {
                 if (!$row = $stmt->fetch(PDO::FETCH_ASSOC)) {
                     break;
                 }
-
-                $contentObjects[] = $persistenceHandler->contentHandler()->load(
-                    $row['id'],
-                    $row['current_version']
-                );
+                try {
+                    $contentObjects[] = $persistenceHandler->contentHandler()->load(
+                        $row['id'],
+                        $row['current_version']
+                    );
+                } catch (NotFoundException $e) {
+                    $progress->clear();
+                    $output->write("\r"); // get rid of padding (side effect of displaying progress bar)
+                    $logger->warning("Could not load current version of Content with id ${row['id']}, so skipped for indexing. Full exception: " . $e->getMessage());
+                    $progress->display();
+                }
             }
 
             if (!empty($contentObjects)) {

lib/Handler.php

@@ -246,7 +246,11 @@ public function bulkIndexContent(array $contentObjects)
         $documents = array();
 
         foreach ($contentObjects as $content) {
-            $documents[] = $this->mapper->mapContentBlock($content);
+            try {
+                $documents[] = $this->mapper->mapContentBlock($content);
+            } catch (NotFoundException $ex) {
+                // ignore content objects without assigned state id
+            }
         }
 
         if (!empty($documents)) {