MAGETWO-32116: Customer model and tables cleaning

Author: irenelagno

app/code/Magento/Customer/Model/Address.php

@@ -127,7 +127,9 @@ public function updateData(AddressInterface $address)
         // Need to explicitly set this due to discrepancy in the keys between model and data object
         $this->setIsDefaultBilling($address->isDefaultBilling());
         $this->setIsDefaultShipping($address->isDefaultShipping());
-
+        if (!$this->getAttributeSetId()) {
+            $this->setAttributeSetId(AddressMetadataInterface::ATTRIBUTE_SET_ID_ADDRESS);
+        }
         $customAttributes = $address->getCustomAttributes();
         if (!is_null($customAttributes)) {
             foreach ($customAttributes as $attribute) {
@@ -278,4 +280,14 @@ protected function _createCustomer()
     {
         return $this->_customerFactory->create();
     }
+
+    /**
+     * Return Entity Type ID
+     *
+     * @return int
+     */
+    public function getEntityTypeId()
+    {
+        return $this->getEntityType()->getId();
+    }
 }

app/code/Magento/Customer/Model/Resource/Address/Collection.php

@@ -9,7 +9,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Collection extends \Magento\Customer\Model\Resource\Collection\AbstractCollection
+class Collection extends \Magento\Eav\Model\Entity\Collection\AbstractCollection
 {
     /**
      * Resource initialization

app/code/Magento/Customer/Model/Resource/Collection/AbstractCollection.php

@@ -9,7 +9,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Collection extends \Magento\Customer\Model\Resource\Collection\AbstractCollection
+class Collection extends \Magento\Eav\Model\Entity\Collection\AbstractCollection
 {
     /**
      * Name of collection model

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

@@ -581,7 +581,6 @@ protected function _saveCustomerDefaults(array $defaults)
     {
         /** @var $entity \Magento\Customer\Model\Customer */
         $entity = $this->_customerFactory->create();
-        $entityTypeId = $entity->getEntityTypeId();
 
         foreach ($defaults as $tableName => $data) {
             $tableData = [];

app/code/Magento/CustomerImportExport/Model/Import/Address.php

@@ -113,6 +113,13 @@ abstract class AbstractCollection extends \Magento\Framework\Data\Collection\Db
      */
     protected $_universalFactory;
 
+    /**
+     * Specific entity types which not required "entity_type_id" for select
+     *
+     * @var array
+     */
+    protected $entityTypes = ['customer', 'customer_address'];
+
     /**
      * @param \Magento\Core\Model\EntityFactory $entityFactory
      * @param \Magento\Framework\Logger $logger
@@ -191,7 +198,8 @@ protected function _prepareStaticFields()
     protected function _initSelect()
     {
         $this->getSelect()->from(['e' => $this->getEntity()->getEntityTable()]);
-        if ($this->getEntity()->getTypeId()) {
+        $entity = $this->getEntity();
+        if ($entity->getTypeId() && !in_array($entity->getType(), $this->entityTypes)) {
             $this->addAttributeToFilter('entity_type_id', $this->getEntity()->getTypeId());
         }
         return $this;
@@ -1165,16 +1173,21 @@ protected function _getLoadAttributesSelect($table, $attributeIds = [])
         $select = $this->getConnection()->select()->from(
             $table,
             [$entityIdField, 'attribute_id']
-        )->where(
-            'entity_type_id =?',
-            $this->getEntity()->getTypeId()
         )->where(
             "{$entityIdField} IN (?)",
             array_keys($this->_itemsById)
         )->where(
             'attribute_id IN (?)',
             $attributeIds
         );
+
+        if(!in_array($this->getEntity()->getType(), $this->entityTypes))
+        {
+            $select->where(
+                'entity_type_id =?',
+                $this->getEntity()->getTypeId()
+            );
+        }
         return $select;
     }
 

app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php

@@ -121,4 +121,20 @@ public function testRegionId()
         $this->address->setRegionId(1);
         $this->assertEquals(1, $this->address->getRegionId());
     }
+
+    public function testGetEntityTypeId()
+    {
+        $mockEntityType = $this->getMockBuilder('Magento\Eav\Model\Entity\Type')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $mockEntityType->expects($this->any())
+            ->method('getId')
+            ->will($this->returnValue(self::ORIG_CUSTOMER_ID));
+
+        $this->resource->expects($this->any())
+            ->method('getEntityType')
+            ->will($this->returnValue($mockEntityType));
+
+        $this->assertEquals(self::ORIG_CUSTOMER_ID, $this->address->getEntityTypeId());
+    }
 }