magento#888 update custom product attribute groups sort order

Author: schnere

Diff for: src/Migration/Step/Eav/Data.php

@@ -392,15 +392,18 @@ private function migrateAttributeGroups($attributeGroupIds)
             $sourceRecord = $this->factory->create(['document' => $sourceDocument, 'data' => $recordData]);
             $destinationRecord = $this->factory->create(['document' => $destinationDocument]);
             $recordTransformer->transform($sourceRecord, $destinationRecord);
-            $recordsToSave->addRecord($destinationRecord);
+            
 
             $sourceAttributeGroupName = $recordData['attribute_group_name'];
             $destAttributeGroupName = $destinationRecord->getValue('attribute_group_name');
             if (in_array($recordData['attribute_set_id'], $productAttributeSetIds)
                 && !in_array($sourceAttributeGroupName, $attributeNameMapping)
                 && $sourceAttributeGroupName != $destAttributeGroupName ) {
                 $attributeNameMapping[$sourceAttributeGroupName] = $destAttributeGroupName;
+                $sortOrder = $destinationRecord->getValue('sort_order') + 200;
+                $destinationRecord->setValue('sort_order', $sortOrder);
             }
+            $recordsToSave->addRecord($destinationRecord);
         }
         $this->saveRecords($destinationDocument, $recordsToSave);
         $this->mapProductAttributeGroupNamesSourceDest = $attributeNameMapping;
@@ -645,6 +648,9 @@ private function createMapAttributeSetIds()
         );
         foreach ($this->initialData->getAttributeSets(ModelData::TYPE_DEST) as $attributeSetId => $record) {
             $entityTypeId = $this->mapEntityTypeIdsDestOldNew[$record['entity_type_id']];
+            if (!isset($this->newAttributeSets[$entityTypeId . '-' . $record['attribute_set_name']])) {
+                continue;
+            }
             $newAttributeSet = $this->newAttributeSets[$entityTypeId . '-' . $record['attribute_set_name']];
             $this->mapAttributeSetIdsDestOldNew[$attributeSetId] = $newAttributeSet['attribute_set_id'];
             $this->defaultAttributeSetIds[$newAttributeSet['entity_type_id']] = $newAttributeSet['attribute_set_id'];