Merge branch 'MAGETWO-28011' of github.corp.ebay.com:magento-firedrakes/magento2ce into MAGETWO-28011

Author: Michael Logvin

app/code/Magento/Log/Model/Resource/Visitor/Collection.php

@@ -81,8 +81,8 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      * @var array
      */
     protected $_fieldMap = [
-        'customer_firstname' => 'customer_firstname_table.value',
-        'customer_lastname' => 'customer_lastname_table.value',
+        'customer_firstname' => 'customer_email_table.firstname',
+        'customer_lastname' => 'customer_email_table.lastname',
         'customer_email' => 'customer_email_table.email',
         'customer_id' => 'customer_table.customer_id',
         'url' => 'url_info_table.url',

app/code/Magento/Log/Model/Resource/Visitor/Online/Collection.php

@@ -65,39 +65,19 @@ public function addCustomerData()
     {
         // alias => attribute_code
         $attributes = [
-            'customer_lastname' => 'lastname',
-            'customer_firstname' => 'firstname',
-            'customer_email' => 'email',
+            'customer_lastname' => 'customer.lastname',
+            'customer_firstname' => 'customer.firstname',
+            'customer_email' => 'customer.email',
         ];
 
-        foreach ($attributes as $alias => $attributeCode) {
-            $attribute = $this->_eavHelper->getAttributeMetadata(
-                \Magento\Customer\Api\CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
-                $attributeCode
-            );
+        $this->getSelect()->joinLeft(
+            ['customer' => $this->getConnection()->getTableName('customer_entity')],
+            'customer.entity_id=main_table.customer_id',
+            $attributes
+        );
 
-            $tableAlias = 'customer_' . $attributeCode;
+        $this->_fields = array_merge($this->_fields, $attributes);
 
-            if ($attribute['backend_type'] == 'static') {
-                $this->getSelect()->joinLeft(
-                    [$tableAlias => $attribute['attribute_table']],
-                    sprintf('%s.entity_id=main_table.customer_id', $tableAlias),
-                    [$alias => $attributeCode]
-                );
-                $this->_fields[$alias] = sprintf('%s.%s', $tableAlias, $attributeCode);
-            } else {
-                $joinConds  = [
-                    sprintf('%s.entity_id=main_table.customer_id', $tableAlias),
-                    $this->getConnection()->quoteInto($tableAlias . '.attribute_id=?', $attribute['attribute_id']),
-                ];
-                $this->getSelect()->joinLeft(
-                    [$tableAlias => $attribute['attribute_table']],
-                    join(' AND ', $joinConds),
-                    [$alias => 'value']
-                );
-                $this->_fields[$alias] = sprintf('%s.value', $tableAlias);
-            }
-        }
         $this->setFlag('has_customer_data', true);
         return $this;
     }
@@ -111,7 +91,7 @@ public function addCustomerData()
     public function addWebsiteFilter($websiteIds)
     {
         if ($this->getFlag('has_customer_data')) {
-            $this->getSelect()->where('customer_email.website_id IN (?)', $websiteIds);
+            $this->getSelect()->where('customer.website_id IN (?)', $websiteIds);
         }
         return $this;
     }