refactor: remove validation from converter

src/DependencyInjection/shopware.xml

@@ -212,8 +212,8 @@
 
         <service id="SwagMigrationAssistant\Profile\Shopware\Converter\LanguageConverter"
                  parent="SwagMigrationAssistant\Profile\Shopware\Converter\ShopwareConverter" abstract="true">
-            <argument type="service" id="SwagMigrationAssistant\Migration\Mapping\Lookup\LanguageLookup"/>
             <argument type="service" id="SwagMigrationAssistant\Migration\Mapping\Lookup\LocaleLookup"/>
+            <argument type="service" id="SwagMigrationAssistant\Migration\Mapping\Lookup\LanguageLookup"/>
         </service>
 
         <service id="SwagMigrationAssistant\Profile\Shopware\Converter\SalesChannelConverter"

src/Migration/Converter/ConverterInterface.php

@@ -38,9 +38,11 @@ public function getMediaUuids(array $converted): ?array;
     /**
      * Converts the given data into the internal structure
      *
+     * A converter also could return null in various cases
+     *
      * @param array<string, mixed> $data
      */
-    public function convert(array $data, Context $context, MigrationContextInterface $migrationContext): ConvertStruct;
+    public function convert(array $data, Context $context, MigrationContextInterface $migrationContext): ?ConvertStruct;
 
     public function writeMapping(Context $context): void;
 }

src/Migration/Logging/Log/MainVariantRelationNotConverted.php

@@ -0,0 +1,30 @@
+<?php declare(strict_types=1);
+/*
+ * (c) shopware AG <[email protected]>
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SwagMigrationAssistant\Migration\Logging\Log;
+
+use Shopware\Core\Framework\Log\Package;
+use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry;
+
+#[Package('after-sales')]
+readonly class MainVariantRelationNotConverted extends AbstractMigrationLogEntry
+{
+    public function getLevel(): string
+    {
+        return self::LOG_LEVEL_ERROR;
+    }
+
+    public function getCode(): string
+    {
+        return 'SWAG_MIGRATION__MAIN_VARIANT_RELATION_NOT_CONVERTED';
+    }
+
+    public function isUserFixable(): bool
+    {
+        return false;
+    }
+}

src/Migration/Logging/Log/NotConvertedLog.php

@@ -0,0 +1,30 @@
+<?php declare(strict_types=1);
+/*
+ * (c) shopware AG <[email protected]>
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SwagMigrationAssistant\Migration\Logging\Log;
+
+use Shopware\Core\Framework\Log\Package;
+use SwagMigrationAssistant\Migration\Logging\Log\Builder\AbstractMigrationLogEntry;
+
+#[Package('after-sales')]
+readonly class NotConvertedLog extends AbstractMigrationLogEntry
+{
+    public function getLevel(): string
+    {
+        return self::LOG_LEVEL_INFO;
+    }
+
+    public function getCode(): string
+    {
+        return 'SWAG_MIGRATION__ENTITY_NOT_CONVERTED';
+    }
+
+    public function isUserFixable(): bool
+    {
+        return false;
+    }
+}

src/Migration/Service/MigrationDataConverter.php

@@ -15,9 +15,11 @@
 use Shopware\Core\Framework\Util\Hasher;
 use SwagMigrationAssistant\Migration\Converter\ConverterInterface;
 use SwagMigrationAssistant\Migration\Converter\ConverterRegistryInterface;
+use SwagMigrationAssistant\Migration\Converter\ConvertStruct;
 use SwagMigrationAssistant\Migration\DataSelection\DataSet\DataSet;
 use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder;
 use SwagMigrationAssistant\Migration\Logging\Log\ExceptionRunLog;
+use SwagMigrationAssistant\Migration\Logging\Log\NotConvertedLog;
 use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface;
 use SwagMigrationAssistant\Migration\Mapping\MappingDeltaResult;
 use SwagMigrationAssistant\Migration\Mapping\MappingServiceInterface;
@@ -96,6 +98,17 @@ private function convertData(
         foreach ($data as $item) {
             try {
                 $convertStruct = $converter->convert($item, $context, $migrationContext);
+                if (!$convertStruct instanceof ConvertStruct) {
+                    $this->loggingService->addLogEntry(
+                        MigrationLogBuilder::fromMigrationContext($migrationContext)
+                            ->withSourceData($item)
+                            ->withEntityName($dataSet::getEntity())
+                            ->build(NotConvertedLog::class)
+                    );
+
+                    continue;
+                }
+
                 $convertFailureFlag = empty($convertStruct->getConverted());
 
                 $this->validationService->validate(

src/Profile/Shopware/Converter/CategoryConverter.php

@@ -14,8 +14,6 @@
 use SwagMigrationAssistant\Exception\MigrationException;
 use SwagMigrationAssistant\Migration\Converter\ConvertStruct;
 use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities;
-use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder;
-use SwagMigrationAssistant\Migration\Logging\Log\EmptyNecessaryFieldRunLog;
 use SwagMigrationAssistant\Migration\Logging\LoggingServiceInterface;
 use SwagMigrationAssistant\Migration\Mapping\Lookup\DefaultCmsPageLookup;
 use SwagMigrationAssistant\Migration\Mapping\Lookup\LanguageLookup;
@@ -37,7 +35,7 @@ abstract class CategoryConverter extends ShopwareConverter
 
     protected string $oldCategoryId;
 
-    protected string $locale;
+    protected ?string $locale = null;
 
     protected string $runId;
 
@@ -84,19 +82,13 @@ public function convert(
         $this->connectionId = $connection->getId();
         $this->connectionName = $connection->getName();
 
-        if (!isset($data['_locale'])) {
-            $this->loggingService->addLogEntry(
-                MigrationLogBuilder::fromMigrationContext($migrationContext)
-                    ->withEntityName(CategoryDefinition::ENTITY_NAME)
-                    ->withFieldSourcePath('_locale')
-                    ->withSourceData($data)
-                    ->build(EmptyNecessaryFieldRunLog::class)
-            );
+        $converted = [];
 
-            return new ConvertStruct(null, $data);
+        if (isset($data['_locale'])) {
+            $this->locale = $data['_locale'];
+        } else {
+            $this->locale = null;
         }
-        $this->locale = $data['_locale'];
-        $converted = [];
 
         $cmsPageUuid = $this->defaultCmsPageLookup->get($context);
         if ($cmsPageUuid !== null) {
@@ -244,8 +236,7 @@ protected function setGivenCategoryTranslation(array &$data, array &$converted):
         }
 
         $locale = $language->getLocale();
-
-        if ($locale === null || $locale->getCode() === $data['_locale']) {
+        if (!isset($data['_locale']) || $locale?->getCode() === $data['_locale']) {
             return;
         }
 
@@ -364,10 +355,12 @@ protected function addMediaTranslation(array &$media, array $data): void
         $localeTranslation['id'] = $mapping['entityId'];
         $this->mappingIds[] = $mapping['id'];
 
-        $languageUuid = $this->languageLookup->get($this->locale, $this->context);
-        if ($languageUuid !== null) {
-            $localeTranslation['languageId'] = $languageUuid;
-            $media['translations'][$languageUuid] = $localeTranslation;
+        if ($this->locale !== null) {
+            $languageUuid = $this->languageLookup->get($this->locale, $this->context);
+            if ($languageUuid !== null) {
+                $localeTranslation['languageId'] = $languageUuid;
+                $media['translations'][$languageUuid] = $localeTranslation;
+            }
         }
     }
 }

src/Profile/Shopware/Converter/CrossSellingConverter.php

@@ -7,13 +7,10 @@
 
 namespace SwagMigrationAssistant\Profile\Shopware\Converter;
 
-use Shopware\Core\Content\Product\Aggregate\ProductCrossSelling\ProductCrossSellingDefinition;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\Log\Package;
 use SwagMigrationAssistant\Migration\Converter\ConvertStruct;
 use SwagMigrationAssistant\Migration\DataSelection\DefaultEntities;
-use SwagMigrationAssistant\Migration\Logging\Log\AssociationRequiredMissingLog;
-use SwagMigrationAssistant\Migration\Logging\Log\Builder\MigrationLogBuilder;
 use SwagMigrationAssistant\Migration\MigrationContextInterface;
 
 #[Package('fundamentals@after-sales')]
@@ -59,36 +56,14 @@ public function convert(array $data, Context $context, MigrationContextInterface
         $converted['id'] = $crossSellingMapping['entityId'];
 
         $sourceProductMapping = $this->getProductMapping($data['articleID']);
-        if ($sourceProductMapping === null) {
-            $this->loggingService->addLogEntry(
-                MigrationLogBuilder::fromMigrationContext($migrationContext)
-                    ->withEntityName(ProductCrossSellingDefinition::ENTITY_NAME)
-                    ->withFieldName('id')
-                    ->withFieldSourcePath('articleID')
-                    ->withSourceData($data)
-                    ->withConvertedData($converted)
-                    ->build(AssociationRequiredMissingLog::class)
-            );
-
-            return new ConvertStruct(null, $data);
+        if ($sourceProductMapping !== null) {
+            $this->mappingIds[] = $sourceProductMapping['id'];
         }
-        $this->mappingIds[] = $sourceProductMapping['id'];
 
         $relatedProductMapping = $this->getProductMapping($data['relatedarticle']);
-        if ($relatedProductMapping === null) {
-            $this->loggingService->addLogEntry(
-                MigrationLogBuilder::fromMigrationContext($migrationContext)
-                    ->withEntityName(ProductCrossSellingDefinition::ENTITY_NAME)
-                    ->withFieldName('id')
-                    ->withFieldSourcePath('relatedarticle')
-                    ->withSourceData($data)
-                    ->withConvertedData($converted)
-                    ->build(AssociationRequiredMissingLog::class)
-            );
-
-            return new ConvertStruct(null, $data);
+        if ($relatedProductMapping !== null) {
+            $this->mappingIds[] = $relatedProductMapping['id'];
         }
-        $this->mappingIds[] = $relatedProductMapping['id'];
 
         if ($data['type'] === DefaultEntities::CROSS_SELLING_SIMILAR) {
             $converted['name'] = 'Similar Items';
@@ -105,15 +80,17 @@ public function convert(array $data, Context $context, MigrationContextInterface
 
         $converted['type'] = 'productList';
         $converted['active'] = true;
-        $converted['productId'] = $sourceProductMapping['entityId'];
         $converted['assignedProducts'] = [
             [
-                'id' => $relationMapping['entityId'],
-                'position' => $data['position'],
-                'productId' => $relatedProductMapping['entityId'],
+                'id' => $relationMapping['entityId'] ?? null,
+                'position' => $data['position'] ?? null,
+                'productId' => $relatedProductMapping['entityId'] ?? null,
             ],
         ];
 
+        if (isset($sourceProductMapping['entityId'])) {
+            $converted['productId'] = $sourceProductMapping['entityId'];
+        }
         unset(
             $data['type'],
             $data['id'],

src/Profile/Shopware/Converter/CurrencyConverter.php

@@ -40,7 +40,7 @@ public function getSourceIdentifier(array $data): string
         return $data['currency'];
     }
 
-    public function convert(array $data, Context $context, MigrationContextInterface $migrationContext): ConvertStruct
+    public function convert(array $data, Context $context, MigrationContextInterface $migrationContext): ?ConvertStruct
     {
         $this->generateChecksum($data);
         $this->context = $context;
@@ -63,7 +63,7 @@ public function convert(array $data, Context $context, MigrationContextInterface
                 );
             }
 
-            return new ConvertStruct(null, $data);
+            return null;
         }
 
         $converted = [];