MAGETWO-37611: Refactor direct calls to attribute tables

Author: nsyvokonenko

app/code/Magento/Reports/Model/Resource/Quote/Collection.php

@@ -68,6 +68,34 @@ public function prepareForAbandonedReport($storeIds, $filter = null)
         return $this;
     }
 
+    /**
+     * Add customer data
+     *
+     * @param array|null $filter
+     * @return $this
+     */
+    public function addCustomerData($filter = null)
+    {
+        $customersSelect = $this->customerResource->getReadConnection()->select();
+        $customersSelect->from(
+            ['customer' => $this->customerResource->getTable('customer_entity')],
+            'entity_id'
+        );
+        if (isset($filter['customer_name'])) {
+            $customerName = $customersSelect->getAdapter()
+                ->getConcatSql(['customer.firstname', 'customer.lastname'], ' ');
+            $customersSelect->where(
+                $customerName . ' LIKE ?', '%' . $filter['customer_name'] . '%'
+            );
+        }
+        if (isset($filter['email'])) {
+            $customersSelect->where('customer.email LIKE ?', '%' . $filter['email'] . '%');
+        }
+        $filteredCustomers = $this->customerResource->getReadConnection()->fetchCol($customersSelect);
+        $this->getSelect()->where('main_table.customer_id IN (?)', $filteredCustomers);
+        return $this;
+    }
+
     /**
      * Add subtotals
      *

app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php

@@ -78,50 +78,13 @@ protected function _joinCustomers()
     {
         /** @var $adapter \Magento\Framework\DB\Adapter\AdapterInterface */
         $adapter = $this->getConnection();
-        /** @var $firstnameAttr \Magento\Eav\Model\Entity\Attribute */
-        $firstnameAttr = $this->_customerResource->getAttribute('firstname');
-        /** @var $lastnameAttr \Magento\Eav\Model\Entity\Attribute */
-        $lastnameAttr = $this->_customerResource->getAttribute('lastname');
-
-        $firstnameCondition = ['table_customer_firstname.entity_id = detail.customer_id'];
-
-        if ($firstnameAttr->getBackend()->isStatic()) {
-            $firstnameField = 'firstname';
-        } else {
-            $firstnameField = 'value';
-            $firstnameCondition[] = $adapter->quoteInto(
-                'table_customer_firstname.attribute_id = ?',
-                (int)$firstnameAttr->getAttributeId()
-            );
-        }
-
-        $this->getSelect()->joinInner(
-            ['table_customer_firstname' => $firstnameAttr->getBackend()->getTable()],
-            implode(' AND ', $firstnameCondition),
-            []
-        );
-
-        $lastnameCondition = ['table_customer_lastname.entity_id = detail.customer_id'];
-        if ($lastnameAttr->getBackend()->isStatic()) {
-            $lastnameField = 'lastname';
-        } else {
-            $lastnameField = 'value';
-            $lastnameCondition[] = $adapter->quoteInto(
-                'table_customer_lastname.attribute_id = ?',
-                (int)$lastnameAttr->getAttributeId()
-            );
-        }
-
         //Prepare fullname field result
-        $customerFullname = $adapter->getConcatSql(
-            ["table_customer_firstname.{$firstnameField}", "table_customer_lastname.{$lastnameField}"],
-            ' '
-        );
+        $customerFullname = $adapter->getConcatSql(['customer.firstname', 'customer.lastname'], ' ');
         $this->getSelect()->reset(
             \Zend_Db_Select::COLUMNS
         )->joinInner(
-            ['table_customer_lastname' => $lastnameAttr->getBackend()->getTable()],
-            implode(' AND ', $lastnameCondition),
+            ['customer' => $adapter->getTableName('customer_entity')],
+            'customer.entity_id = detail.customer_id',
             []
         )->columns(
             [