Refactor processing to first prep only unique identifier fields (used…

… to find existing elements), doing all other prepping later
craftcms · May 6, 2018 · 1d193f9 · 1d193f9
1 parent 57dea04
commit 1d193f9
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 32 deletions.
diff --git a/src/base/Element.php b/src/base/Element.php
@@ -93,11 +93,11 @@ public function matchExistingElement($data, $settings)
         foreach ($settings['fieldUnique'] as $handle => $value) {
             $feedValue = Hash::get($data, $handle);
 
-            if (is_object($feedValue) && get_class($feedValue) === 'DateTime') {
-                $feedValue = $feedValue->format('Y-m-d H:i:s');
-            }
-
             if ($feedValue) {
+                if (is_object($feedValue) && get_class($feedValue) === 'DateTime') {
+                    $feedValue = $feedValue->format('Y-m-d H:i:s');
+                }
+
                 $criteria[$handle] = $feedValue;
             }
         }

diff --git a/src/services/Process.php b/src/services/Process.php
@@ -154,33 +154,30 @@ public function processFeed($step, $feed)
         // From the raw data in our feed, we need to fix it up so its Craft-ready for the element and fields
         $feedData = $this->_data[$step];
 
-        // Parse the just the element attributes first. We use these in our field contexts, and need a fully-prepped element
-        foreach ($feed['fieldMapping'] as $fieldHandle => $fieldInfo) {
-            if (Hash::get($fieldInfo, 'attribute')) {
-                $attributeData[$fieldHandle] = $this->_service->parseAttribute($feedData, $fieldHandle, $fieldInfo);
+        // We need to first find a potentially existing element, and to do that, we need to prep just the fields
+        // that are selected as the unique identifier. We prep everything else later on.
+        $matchExistingElementData = [];
+
+        foreach ($feed['fieldUnique'] as $fieldHandle => $value) {
+            $mappingInfo = Hash::get($feed['fieldMapping'], $fieldHandle);
+
+            if (!$mappingInfo) {
+                continue;
             }
-        }
 
-        // Set the attributes for the element
-        $element->setAttributes($attributeData);
+            if (Hash::get($mappingInfo, 'attribute')) {
+                $matchExistingElementData[$fieldHandle] = $this->_service->parseAttribute($feedData, $fieldHandle, $mappingInfo);
+            }
 
-        // Then, do the same for custom fields. Again, this should be done after populating the element attributes
-        foreach ($feed['fieldMapping'] as $fieldHandle => $fieldInfo) {
-            if (Hash::get($fieldInfo, 'field')) {
-                $fieldValue = FeedMe::$plugin->fields->parseField($feed, $element, $feedData, $fieldHandle, $fieldInfo);;
+            if (Hash::get($mappingInfo, 'field')) {
+                $fieldValue = FeedMe::$plugin->fields->parseField($feed, $element, $feedData, $fieldHandle, $mappingInfo);
 
                 if ($fieldValue !== null) {
-                    $fieldData[$fieldHandle] = $fieldValue;
+                    $matchExistingElementData[$fieldHandle] = $fieldValue;
                 }
             }
         }
 
-        // Do the same with our custom field data
-        $element->setFieldValues($fieldData);
-
-        // We need to keep these separate to apply to the element but required when matching against existing elements
-        $contentData = $attributeData + $fieldData;
-
 
         //
         // Check for Add/Update/Delete for existing elements
@@ -190,11 +187,11 @@ public function processFeed($step, $feed)
         $this->_triggerEvent(self::EVENT_STEP_BEFORE_ELEMENT_MATCH, [
             'feed' => $feed,
             'feedData' => $feedData,
-            'contentData' => $contentData,
+            'contentData' => $matchExistingElementData,
         ]);
 
         // Check to see if an element already exists
-        $existingElement = $this->_service->matchExistingElement($contentData, $feed);
+        $existingElement = $this->_service->matchExistingElement($matchExistingElementData, $feed);
 
         // If there's an existing matching element
         if ($existingElement) {
@@ -245,17 +242,38 @@ public function processFeed($step, $feed)
             return;
         }
 
-        // If we've just fetched an existing element, we need to re-apply our changed field data. The reason this is done
-        // twice is we need to have the element attributes and custom fields populated before we try to find an existing element
-        // but then we need to update that element once matched. It's the chicken and the egg!
-        if ($existingElement) {
-            // Do the same with our custom field data
-            $element->setFieldValues($fieldData);
 
-            // We need to keep these separate to apply to the element but required when matching against existing elements
-            $contentData = $attributeData + $fieldData;
+        // 
+        // Now, parse all element attributes and custom fields
+        //
+
+        // Parse the just the element attributes first. We use these in our field contexts, and need a fully-prepped element
+        foreach ($feed['fieldMapping'] as $fieldHandle => $fieldInfo) {
+            if (Hash::get($fieldInfo, 'attribute')) {
+                $attributeData[$fieldHandle] = $this->_service->parseAttribute($feedData, $fieldHandle, $fieldInfo);
+            }
         }
 
+        // Set the attributes for the element
+        $element->setAttributes($attributeData);
+
+        // Then, do the same for custom fields. Again, this should be done after populating the element attributes
+        foreach ($feed['fieldMapping'] as $fieldHandle => $fieldInfo) {
+            if (Hash::get($fieldInfo, 'field')) {
+                $fieldValue = FeedMe::$plugin->fields->parseField($feed, $element, $feedData, $fieldHandle, $fieldInfo);;
+
+                if ($fieldValue !== null) {
+                    $fieldData[$fieldHandle] = $fieldValue;
+                }
+            }
+        }
+
+        // Do the same with our custom field data
+        $element->setFieldValues($fieldData);
+
+        // We need to keep these separate to apply to the element but required when matching against existing elements
+        $contentData = $attributeData + $fieldData;
+
         FeedMe::debug($feed, $contentData);