Support master ID

Author: Rayn93

src/Export/Data/Entity/ProductEntity.php

@@ -96,10 +96,12 @@ public function toArray(): array
     {
         $cachedProductFieldNames = array_map(fn (FieldInterface $field) => $field->getName(), iterator_to_array($this->cachedProductFields));
         $fields                  = array_filter($this->productFields, fn (FieldInterface $productField) => !in_array($productField->getName(), $cachedProductFieldNames));
-        $isVariant               = $this->product->getId() !== $this->product->getParentId() && isset($this->parent);
-        $defaultFields           = [
+        $isVariant = $this->product->getParentId() !== null;
+        $resolvedParent = $this->parent ?? $this->product->getParent();
+
+        $defaultFields = [
             'ProductNumber'    => $this->product->getProductNumber(),
-            'Master'           => $isVariant ? $this->parent->getProductNumber() : $this->product->getProductNumber(),
+            'Master'           => ($isVariant && $resolvedParent) ? $resolvedParent->getProductNumber() : $this->product->getProductNumber(),
             'Name'             => (string) $this->product->getTranslation('name'),
             'FilterAttributes' => $this->getFilterAttributes(),
             'CustomFields'     => $this->getCustomFields(),
@@ -109,7 +111,7 @@ public function toArray(): array
             $fields,
             fn (array $fields, FieldInterface $field): array => array_merge(
                 $fields,
-                [$field->getName() => ($this->getAdditionalCache($field->getName()) ?? $field->getValue($isVariant ? $this->parent : $this->product))]
+                [$field->getName() => ($this->getAdditionalCache($field->getName()) ?? $field->getValue($isVariant && $resolvedParent ? $resolvedParent : $this->product))]
             ),
             $defaultFields
         );

src/Export/Data/Factory/ProductEntityFactory.php

@@ -23,7 +23,7 @@ public function __construct(
         PropertyFormatter $propertyFormatter,
         FieldsProvider $fieldsProviders,
         CurrencyFieldsProvider $currencyFieldsProvider,
-        \Traversable $variantFields
+        \Traversable $variantFields,
     ) {
         $this->propertyFormatter      = $propertyFormatter;
         $this->fieldsProvider         = $fieldsProviders;
@@ -44,9 +44,6 @@ public function createEntities(Entity $entity, string $producedType = ProductEnt
         $fields = array_merge($this->fieldsProvider->getFields($producedType), $this->currencyFieldsProvider->getCurrencyFields());
 
         if ($entity->getParentId() !== null) {
-            // To jest WARIANT.
-            // Tworzymy bazową encję ProductEntity (odpowiednik rodzica), ponieważ wariant w
-            // Shopware posiada w sobie dziedziczone dane od rodzica (nazwa, opis, producent).
             $pseudoParent = new $producedType($entity, new \ArrayIterator($fields), new \ArrayIterator());
 
             yield new VariantEntity(
@@ -56,7 +53,6 @@ public function createEntities(Entity $entity, string $producedType = ProductEnt
                 iterator_to_array($this->variantFields)
             );
         } else {
-            // To jest PRODUKT GŁÓWNY (Rodzic lub samodzielny produkt).
             yield new $producedType($entity, new \ArrayIterator($fields), new \ArrayIterator());
         }
     }

src/Export/ExportProducts.php

@@ -6,7 +6,6 @@
 
 use Omikron\FactFinder\Shopware6\Export\Data\Entity\ProductEntity as ExportProductEntity;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
-use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
 use Shopware\Core\System\SalesChannel\Entity\SalesChannelRepository;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
 
@@ -35,7 +34,27 @@ public function getByContext(SalesChannelContext $context, int $batchSize = 100)
                 break;
             }
 
+            $parentIds = [];
+            // 1. Zbieramy unikalne ID rodziców z bieżącej paczki
             foreach ($products->getElements() as $product) {
+                if ($product->getParentId() !== null) {
+                    $parentIds[$product->getParentId()] = true;
+                }
+            }
+
+            $parents = [];
+            if (!empty($parentIds)) {
+                $parentCriteria = new Criteria(array_keys($parentIds));
+                $parentCriteria->addAssociation('categories');
+                $parentCriteria->addAssociation('categoriesRo');
+                $parents = $this->productRepository->search($parentCriteria, $context)->getElements();
+            }
+
+            foreach ($products->getElements() as $product) {
+                if ($product->getParentId() !== null && isset($parents[$product->getParentId()])) {
+                    $product->setParent($parents[$product->getParentId()]);
+                }
+
                 yield $product;
             }
 
@@ -71,6 +90,8 @@ private function getCriteria(int $batchSize, int $offset): Criteria
         $criteria = new Criteria();
         $criteria->setLimit($batchSize);
         $criteria->setOffset($offset);
+        $criteria->setTotalCountMode(Criteria::TOTAL_COUNT_MODE_NONE);
+
         $criteria->addAssociation('categories');
         $criteria->addAssociation('categoriesRo');
         $criteria->addAssociation('manufacturer');
@@ -87,10 +108,6 @@ private function getCriteria(int $batchSize, int $offset): Criteria
             $criteria->addAssociation($association);
         }
 
-        // UWAGA: Usunęliśmy addFilter(new EqualsFilter('parentId', null));
-        // Chcemy eksportować płasko wszystko: zarówno rodziców jak i warianty,
-        // więc nie filtrujemy tutaj po parentId!
-
         return $criteria;
     }
 }

src/Export/Field/CategoryPath.php

@@ -61,6 +61,6 @@ private function getCategories(Entity $entity): CategoryCollection
             return new CategoryCollection([$entity]);
         }
 
-        return $entity->getCategories();
+        return $entity->getCategories() ?? new CategoryCollection();
     }
 }

src/Export/Field/FilterAttributes.php

@@ -32,25 +32,24 @@ public function getName(): string
      */
     public function getValue(Entity $entity): string
     {
-        // 1. Bazowe właściwości (dziedziczone lub bezpośrednie)
         $properties = $this->applyPropertyGroupsFilter($entity);
         $attributes = $properties ? array_map($this->propertyFormatter, $properties) : [];
 
-        // 2. Pobieranie opcji bez ładowania całych encji dzieci
         if ($entity->getParentId() !== null) {
-            // Jesteśmy w wariancie - pobieramy jego konkretne opcje
-            $options = $entity->getOptions() ? $entity->getOptions()->getElements() : [];
+            $options    = $entity->getOptions() ? $entity->getOptions()->getElements() : [];
             $attributes = array_merge($attributes, array_map($this->propertyFormatter, $options));
         } else {
-            // Jesteśmy w produkcie głównym - pobieramy agregację opcji ze wszystkich wariantów
             $configuratorSettings = $entity->getConfiguratorSettings();
+
             if ($configuratorSettings) {
                 $options = [];
+
                 foreach ($configuratorSettings as $setting) {
                     if ($setting->getOption()) {
                         $options[] = $setting->getOption();
                     }
                 }
+
                 $attributes = array_merge($attributes, array_map($this->propertyFormatter, $options));
             }
         }

src/Export/Stream/ConsoleOutput.php

@@ -23,7 +23,7 @@ public function addEntity(array $entity): void
     {
         $this->fileResource = $this->fileResource ?? new File('php://output', 'w');
         ob_start();
-        $this->fileResource->fputcsv($entity, $this->delimiter);
+        $this->fileResource->fputcsv($entity, $this->delimiter, '"', '\\');
         $this->output->writeln(rtrim(ob_get_clean()));
     }
 }

src/Export/Stream/CsvFile.php

@@ -23,6 +23,6 @@ public function __construct($fileResource, string $delimiter = ';')
 
     public function addEntity(array $entity): void
     {
-        fputcsv($this->fileResource, $entity, $this->delimiter);
+        fputcsv($this->fileResource, $entity, $this->delimiter, '"', '\\');
     }
 }

src/Resources/config/services.xml

@@ -45,7 +45,7 @@
             <parameter key="productNumber">ProductNumber</parameter>
         </parameter>
         <parameter key="factfinder.export.associations" type="collection">
-            <parameter key="variant_cover">children.media</parameter>
+            <parameter key="variant_cover">cover.media</parameter>
         </parameter>
         <parameter key="factfinder.category_page.add_params" type="collection">
         </parameter>