Skip to content

Initializing the record transformer before the loop #778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 3, 2020
Merged

Initializing the record transformer before the loop #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions src/Migration/Step/Eav/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand All @@ -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());
Expand Down Expand Up @@ -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]);
Expand All @@ -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);
}

Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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]);
Expand All @@ -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());
Expand Down
28 changes: 14 additions & 14 deletions src/Migration/Step/TierPrice/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down