fix migrate persistance

Author: thomas-kl1

Cron/Migrate.php

@@ -7,7 +7,9 @@
 
 namespace Opengento\DocumentRestrict\Cron;
 
+use Magento\Framework\Exception\FileSystemException;
 use Opengento\DocumentRestrict\Model\Migrate as MigrateService;
+use Psr\Log\LoggerInterface;
 
 final class Migrate
 {
@@ -16,14 +18,25 @@ final class Migrate
      */
     private $migrateService;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     public function __construct(
-        MigrateService $migrateService
+        MigrateService $migrateService,
+        LoggerInterface $logger
     ) {
         $this->migrateService = $migrateService;
+        $this->logger = $logger;
     }
 
     public function execute(): void
     {
-        $this->migrateService->migrateQueue();
+        try {
+            $this->migrateService->migrateQueue();
+        } catch (FileSystemException $e) {
+            $this->logger->error($e->getLogMessage(), $e->getTrace());
+        }
     }
 }

Model/Document/Filesystem/UrlResolver/RestrictedResolver.php

@@ -41,7 +41,7 @@ public function __construct(
         $this->logger = $logger;
     }
 
-    public function getUrl(DocumentInterface $document): string
+    public function getFileUrl(DocumentInterface $document): string
     {
         try {
             $documentType = $this->documentTypeRepository->getById($document->getTypeId());

Model/Migrate.php

@@ -8,6 +8,12 @@
 namespace Opengento\DocumentRestrict\Model;
 
 use Exception;
+use Magento\Framework\EntityManager\HydratorInterface;
+use Magento\Framework\EntityManager\HydratorPool;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\FileSystemException;
+use Opengento\Document\Api\Data\DocumentInterface;
+use Opengento\Document\Api\DocumentRepositoryInterface;
 use Opengento\Document\Model\Document\Filesystem\File;
 use Opengento\Document\Model\ResourceModel\DocumentType\Collection as DocTypeCollection;
 use Opengento\Document\Model\ResourceModel\DocumentType\CollectionFactory as DocTypeCollectionFactory;
@@ -16,6 +22,8 @@
 use Opengento\Document\Model\ResourceModel\Document\CollectionFactory as DocumentCollectionFactory;
 use Psr\Log\LoggerInterface;
 use function array_diff;
+use function basename;
+use function dirname;
 
 final class Migrate
 {
@@ -34,6 +42,16 @@ final class Migrate
      */
     private $docTypeCollectionFactory;
 
+    /**
+     * @var DocumentRepositoryInterface
+     */
+    private $documentRepository;
+
+    /**
+     * @var HydratorInterface
+     */
+    private $hydrator;
+
     /**
      * @var File
      */
@@ -48,16 +66,23 @@ public function __construct(
         MigrateDb $migrateDb,
         DocumentCollectionFactory $documentCollectionFactory,
         DocTypeCollectionFactory $docTypeCollectionFactory,
+        DocumentRepositoryInterface $documentRepository,
+        HydratorPool $hydratorPool,
         File $file,
         LoggerInterface $logger
     ) {
         $this->migrateDb = $migrateDb;
         $this->documentCollectionFactory = $documentCollectionFactory;
         $this->docTypeCollectionFactory = $docTypeCollectionFactory;
+        $this->documentRepository = $documentRepository;
+        $this->hydrator = $hydratorPool->getHydrator(DocumentInterface::class);
         $this->file = $file;
         $this->logger = $logger;
     }
 
+    /**
+     * @throws FileSystemException
+     */
     public function migrateQueue(): void
     {
         $typeIds = $this->migrateDb->fetchPendingTypeIds();
@@ -72,11 +97,20 @@ public function migrateQueue(): void
 
         foreach ($documentCollection->getItems() as $document) {
             $filePath = $this->file->getFilePath($document);
+            $destPath = $this->file->getFileDestPath(
+                $docTypeCollection->getItemById($document->getTypeId()),
+                $filePath
+            );
+            $document = $this->hydrator->hydrate(
+                $document,
+                ['file_path' => dirname($destPath), 'file_name' => basename($destPath)]
+            );
             try {
-                $this->file->moveFile(
-                    $filePath,
-                    $this->file->getFileDestPath($docTypeCollection->getItemById($document->getTypeId()), $filePath)
-                );
+                $this->file->moveFile($filePath, $destPath);
+                $this->documentRepository->save($document);
+            } catch (CouldNotSaveException $e) {
+                $this->logger->error($e->getMessage(), $e->getTrace());
+                $this->file->moveFile($destPath, $filePath);
             } catch (Exception $e) {
                 $this->logger->error($e->getMessage(), $e->getTrace());
                 $failedTypeIds[$document->getTypeId()] = $document->getTypeId();

composer.json

@@ -15,12 +15,12 @@
     "type": "magento2-module",
     "require": {
         "magento/framework": "^103.0",
-        "opengento/module-document": "^1.0"
+        "opengento/module-document": "^2.0"
     },
     "require-dev": {
         "magento/magento-coding-standard": "^5",
         "magento/marketplace-eqp": "^4.0",
-        "roave/security-advisories": "dev-latest"
+        "roave/security-advisories": "dev-master"
     },
     "suggest": {
         "opengento/module-document-product-link": "This module aims to help merchants to link their documents to products in Magento 2.",

etc/db_schema.xml

@@ -44,6 +44,9 @@
         <index referenceId="OPENGENTO_DOCUMENT_TYPE_RESTRICT_MIGRATE_TYPE_ID" indexType="btree">
             <column name="type_id"/>
         </index>
+        <index referenceId="OPENGENTO_DOCUMENT_TYPE_RESTRICT_MIGRATE_STATE" indexType="btree">
+            <column name="state"/>
+        </index>
     </table>
     <!-- opengento_document_type_restrict_customer -->
     <!-- new relations in (document type or document) -->

etc/di.xml

@@ -53,8 +53,11 @@
     </type>
     <type name="Opengento\Document\Model\Document\Filesystem\UrlResolver">
         <arguments>
-            <argument name="urlResolvers" xsi:type="array">
-                <item name="restricted" xsi:type="object">Opengento\DocumentRestrict\Model\Document\Filesystem\UrlResolver\RestrictedResolver</item>
+            <argument name="resolvers" xsi:type="array">
+                <item name="restricted" xsi:type="array">
+                    <item name="sortOrder" xsi:type="number">10</item>
+                    <item name="resolver" xsi:type="object">Opengento\DocumentRestrict\Model\Document\Filesystem\UrlResolver\RestrictedResolver</item>
+                </item>
             </argument>
         </arguments>
     </type>