WIP

Author: mpysiak

config/services.xml

@@ -57,6 +57,7 @@
             <argument type="service" id="sylius_import_export.repository.process_import" />
             <argument type="service" id="sylius_import_export.denormalizer.registry" />
             <argument type="service" id="doctrine.orm.entity_manager" />
+            <argument type="service" id="sylius.resource_registry" />
 
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
         </service>
@@ -100,11 +101,15 @@
             <tag name="controller.service_arguments" />
         </service>
 
+        <service id="sylius_import_export.uploader.import_file" class="Sylius\ImportExport\Uploader\ImportFileUploader">
+            <argument>%sylius_import_export.import_files_directory%</argument>
+        </service>
+
         <service id="sylius_import_export.controller.import_action" class="Sylius\ImportExport\Controller\ImportAction" public="true">
             <argument type="service" id="form.factory" />
             <argument type="service" id="sylius.command_bus" />
             <argument>%sylius_import_export.import.form_class%</argument>
-            <argument>%sylius_import_export.import_files_directory%</argument>
+            <argument type="service" id="sylius_import_export.uploader.import_file" />
             <argument type="service" id="sylius.resource_registry" />
 
             <tag name="controller.service_arguments" />

src/Controller/ImportAction.php

@@ -14,6 +14,7 @@
 namespace Sylius\ImportExport\Controller;
 
 use Sylius\ImportExport\Messenger\Command\CreateImportProcess;
+use Sylius\ImportExport\Uploader\ImportFileUploader;
 use Sylius\Resource\Metadata\RegistryInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
@@ -29,7 +30,7 @@ public function __construct(
         private FormFactoryInterface $formFactory,
         private MessageBusInterface $commandBus,
         private string $importForm,
-        private string $importFilesDirectory,
+        private ImportFileUploader $importFileUploader,
         private RegistryInterface $metadataRegistry,
     ) {
     }
@@ -59,23 +60,14 @@ public function __invoke(Request $request, string $grid): Response
 
         $data = $form->getData();
         $resourceClass = $data['resourceClass'];
-        
+
         /** @var UploadedFile $file */
         $file = $data['file'];
 
         try {
-            if (!is_dir($this->importFilesDirectory)) {
-                mkdir($this->importFilesDirectory, 0755, true);
-            }
-
-            $fileName = uniqid() . '_' . $file->getClientOriginalName();
-            $filePath = $this->importFilesDirectory . '/' . $fileName;
-            
-            $file->move($this->importFilesDirectory, $fileName);
-
-            $format = $this->getFormatFromMimeType($file->getMimeType());
+            $format = $this->importFileUploader->getFormatFromMimeType($file->getMimeType());
+            $filePath = $this->importFileUploader->upload($file);
 
-            // Convert FQCN to resource alias (like sylius.product)
             $metadata = $this->metadataRegistry->getByClass($resourceClass);
             $resourceAlias = $metadata->getAlias();
 
@@ -87,19 +79,10 @@ public function __invoke(Request $request, string $grid): Response
             ));
 
             $session->getFlashBag()->add('success', 'sylius_import_export.import_started');
-        } catch (\Throwable) {
-            $session->getFlashBag()->add('error', 'sylius_import_export.import_failed');
+        } catch (\Throwable $e) {
+            $session->getFlashBag()->add('error', 'sylius_import_export.upload_failed');
         }
 
         return new RedirectResponse($request->headers->get('referer') ?? '/');
     }
-
-    private function getFormatFromMimeType(?string $mimeType): string
-    {
-        return match ($mimeType) {
-            'application/json' => 'json',
-            'text/csv', 'text/plain' => 'csv',
-            default => 'json', // Default fallback
-        };
-    }
 }

src/Messenger/Handler/ImportCommandHandler.php

@@ -19,6 +19,7 @@
 use Sylius\ImportExport\Exception\ImportFailedException;
 use Sylius\ImportExport\Messenger\Command\ImportCommand;
 use Sylius\Resource\Doctrine\Persistence\RepositoryInterface;
+use Sylius\Resource\Metadata\RegistryInterface;
 
 class ImportCommandHandler
 {
@@ -27,6 +28,7 @@ public function __construct(
         protected RepositoryInterface $processRepository,
         protected DenormalizerRegistryInterface $denormalizerRegistry,
         protected EntityManagerInterface $entityManager,
+        protected RegistryInterface $metadataRegistry,
     ) {
     }
 
@@ -39,7 +41,8 @@ public function __invoke(ImportCommand $command): void
 
         try {
             $importedCount = 0;
-            $resourceClass = $process->getResource();
+            $resourceMetadata = $this->metadataRegistry->get($process->getResource());
+            $resourceClass = $resourceMetadata->getClass('model');
             $denormalizer = $this->denormalizerRegistry->get($resourceClass);
 
             foreach ($command->batchData as $recordData) {

src/Uploader/ImportFileUploader.php

@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Sylius Sp. z o.o.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\ImportExport\Uploader;
+
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+
+final readonly class ImportFileUploader
+{
+    public function __construct(
+        private string $importFilesDirectory,
+    ) {
+    }
+
+    public function upload(UploadedFile $file): string
+    {
+        if (!is_dir($this->importFilesDirectory)) {
+            mkdir($this->importFilesDirectory, 0755, true);
+        }
+
+        $fileName = uniqid() . '_' . $file->getClientOriginalName();
+        $filePath = $this->importFilesDirectory . '/' . $fileName;
+
+        $file->move($this->importFilesDirectory, $fileName);
+
+        return $filePath;
+    }
+
+    public function getFormatFromMimeType(?string $mimeType): string
+    {
+        return match ($mimeType) {
+            'application/json' => 'json',
+            'text/csv', 'text/plain' => 'csv',
+            default => 'json',
+        };
+    }
+}

translations/messages.en.yaml

@@ -25,6 +25,7 @@ sylius_import_export:
         file_not_ready: "File not ready for download"
         export_failed: "Export failed"
         import_failed: "Import failed"
+        upload_failed: "Upload failed"
         import_started: "Import started successfully"
         import_form_invalid: "Import form is invalid"
         imported_count: "Imported Count"