diff --git a/src/Migration/Step/Eav/Data.php b/src/Migration/Step/Eav/Data.php index b178f33a3..c87d290ba 100644 --- a/src/Migration/Step/Eav/Data.php +++ b/src/Migration/Step/Eav/Data.php @@ -214,6 +214,7 @@ protected function migrateEntityTypes() $this->destination->backupDocument($destinationDocument->getName()); $destinationRecords = $this->helper->getDestinationRecords($documentName, [$mappingField]); $recordsToSave = $destinationDocument->getRecords(); + $recordTransformer = $this->helper->getRecordTransformer($sourceDocument, $destinationDocument); foreach ($this->helper->getSourceRecords($documentName) as $recordData) { /** @var Record $sourceRecord */ $sourceRecord = $this->factory->create(['document' => $sourceDocument, 'data' => $recordData]); @@ -227,8 +228,7 @@ protected function migrateEntityTypes() $destinationRecordData = $destinationRecord->getDataDefault(); } $destinationRecord->setData($destinationRecordData); - $this->helper->getRecordTransformer($sourceDocument, $destinationDocument) - ->transform($sourceRecord, $destinationRecord); + $recordTransformer->transform($sourceRecord, $destinationRecord); $recordsToSave->addRecord($destinationRecord); } $this->destination->clearDocument($destinationDocument->getName()); @@ -419,8 +419,8 @@ protected function migrateAttributes() $this->destination->backupDocument($destinationDocument->getName()); $sourceRecords = $this->ignoredAttributes->clearIgnoredAttributes($this->initialData->getAttributes('source')); $destinationRecords = $this->initialData->getAttributes('dest'); - $recordsToSave = $destinationDocument->getRecords(); + $recordTransformer = $this->helper->getRecordTransformer($sourceDocument, $destinationDocument); foreach ($sourceRecords as $sourceRecordData) { /** @var Record $sourceRecord */ $sourceRecord = $this->factory->create(['document' => $sourceDocument, 'data' => $sourceRecordData]); @@ -440,9 +440,7 @@ protected function migrateAttributes() $destinationRecordData = $destinationRecord->getDataDefault(); } $destinationRecord->setData($destinationRecordData); - - $this->helper->getRecordTransformer($sourceDocument, $destinationDocument) - ->transform($sourceRecord, $destinationRecord); + $recordTransformer->transform($sourceRecord, $destinationRecord); $recordsToSave->addRecord($destinationRecord); } @@ -476,14 +474,14 @@ protected function migrateEntityAttributes() ); $this->destination->backupDocument($destinationDocument->getName()); $recordsToSave = $destinationDocument->getRecords(); + $recordTransformer = $this->helper->getRecordTransformer($sourceDocument, $destinationDocument); foreach ($this->helper->getSourceRecords($sourceDocName) as $sourceRecordData) { $sourceRecord = $this->factory->create([ 'document' => $sourceDocument, 'data' => $sourceRecordData ]); $destinationRecord = $this->factory->create(['document' => $destinationDocument]); - $this->helper->getRecordTransformer($sourceDocument, $destinationDocument) - ->transform($sourceRecord, $destinationRecord); + $recordTransformer->transform($sourceRecord, $destinationRecord); $recordsToSave->addRecord($destinationRecord); } @@ -790,6 +788,7 @@ protected function migrateAttributesExtended() $recordsToSave = $destinationDocument->getRecords(); $sourceRecords = $this->ignoredAttributes ->clearIgnoredAttributes($this->helper->getSourceRecords($documentName)); + $recordTransformer = $this->helper->getRecordTransformer($sourceDocument, $destinationDocument); foreach ($sourceRecords as $recordData) { /** @var Record $sourceRecord */ $sourceRecord = $this->factory->create(['document' => $sourceDocument, 'data' => $recordData]); @@ -805,8 +804,7 @@ protected function migrateAttributesExtended() $destinationRecordData = $destinationRecord->getDataDefault(); } $destinationRecord->setData($destinationRecordData); - $this->helper->getRecordTransformer($sourceDocument, $destinationDocument) - ->transform($sourceRecord, $destinationRecord); + $recordTransformer->transform($sourceRecord, $destinationRecord); $recordsToSave->addRecord($destinationRecord); } $this->destination->clearDocument($destinationDocument->getName()); diff --git a/src/Migration/Step/TierPrice/Data.php b/src/Migration/Step/TierPrice/Data.php index 50544acb2..76ca03b7a 100644 --- a/src/Migration/Step/TierPrice/Data.php +++ b/src/Migration/Step/TierPrice/Data.php @@ -107,25 +107,25 @@ public function perform() $this->logger->debug('migrating', ['table' => $sourceDocName]); $this->progress->start($this->source->getRecordsCount($sourceDocName), LogManager::LOG_LEVEL_DEBUG); + $destinationName = $this->helper->getMappedDocumentName($sourceDocName, MapInterface::TYPE_SOURCE); + $destDocument = $this->destination->getDocument($destinationName); + $sourceDocument = $this->source->getDocument($sourceDocName); + + /** @var \Migration\RecordTransformer $recordTransformer */ + $recordTransformer = $this->recordTransformerFactory->create( + [ + 'sourceDocument' => $sourceDocument, + 'destDocument' => $destDocument, + 'mapReader' => $this->map + ] + ); + $recordTransformer->init(); + while (!empty($items = $this->source->getRecords($sourceDocName, $pageNumber))) { $this->progress->advance(LogManager::LOG_LEVEL_INFO); $pageNumber++; - $destinationName = $this->helper->getMappedDocumentName($sourceDocName, MapInterface::TYPE_SOURCE); - $destDocument = $this->destination->getDocument($destinationName); $destinationRecords = $destDocument->getRecords(); - - $sourceDocument = $this->source->getDocument($sourceDocName); - /** @var \Migration\RecordTransformer $recordTransformer */ - $recordTransformer = $this->recordTransformerFactory->create( - [ - 'sourceDocument' => $sourceDocument, - 'destDocument' => $destDocument, - 'mapReader' => $this->map - ] - ); - $recordTransformer->init(); - foreach ($items as $recordData) { $this->progress->advance(LogManager::LOG_LEVEL_DEBUG);