MAGETWO-52448: [Cloud] Customer address is displayed incorrectly

- fixed

Author: Ivan Gavryshko

app/code/Magento/Catalog/Setup/CategorySetup.php

@@ -24,6 +24,16 @@ class CategorySetup extends EavSetup
      */
     private $categoryFactory;
 
+    /**
+     * This should be set explicitly
+     */
+    const CATEGORY_ENTITY_TYPE_ID = 3;
+
+    /**
+     * This should be set explicitly
+     */
+    const CATALOG_PRODUCT_ENTITY_TYPE_ID = 4;
+
     /**
      * Init
      *
@@ -66,6 +76,7 @@ public function getDefaultEntities()
     {
         return [
             'catalog_category' => [
+                'entity_type_id' => self::CATEGORY_ENTITY_TYPE_ID,
                 'entity_model' => 'Magento\Catalog\Model\ResourceModel\Category',
                 'attribute_model' => 'Magento\Catalog\Model\ResourceModel\Eav\Attribute',
                 'table' => 'catalog_category_entity',
@@ -334,6 +345,7 @@ public function getDefaultEntities()
                 ],
             ],
             'catalog_product' => [
+                'entity_type_id' => self::CATALOG_PRODUCT_ENTITY_TYPE_ID,
                 'entity_model' => 'Magento\Catalog\Model\ResourceModel\Product',
                 'attribute_model' => 'Magento\Catalog\Model\ResourceModel\Eav\Attribute',
                 'table' => 'catalog_product_entity',

app/code/Magento/Customer/Setup/CustomerSetup.php

@@ -126,6 +126,7 @@ public function getDefaultEntities()
     {
         $entities = [
             'customer' => [
+                'entity_type_id' => \Magento\Customer\Api\CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER,
                 'entity_model' => 'Magento\Customer\Model\ResourceModel\Customer',
                 'attribute_model' => 'Magento\Customer\Model\Attribute',
                 'table' => 'customer_entity',
@@ -338,6 +339,7 @@ public function getDefaultEntities()
                 ],
             ],
             'customer_address' => [
+                'entity_type_id' => \Magento\Customer\Api\AddressMetadataInterface::ATTRIBUTE_SET_ID_ADDRESS,
                 'entity_model' => 'Magento\Customer\Model\ResourceModel\Address',
                 'attribute_model' => 'Magento\Customer\Model\Attribute',
                 'table' => 'customer_address_entity',

app/code/Magento/Eav/Setup/EavSetup.php

@@ -192,14 +192,21 @@ public function addEntityType($code, array $params)
             'additional_attribute_table' => $this->_getValue($params, 'additional_attribute_table'),
             'entity_attribute_collection' => $this->_getValue($params, 'entity_attribute_collection'),
         ];
+        if (isset($params['entity_type_id'])) {
+            $data['entity_type_id'] = $params['entity_type_id'];
+        }
 
         if ($this->getEntityType($code, 'entity_type_id')) {
             $this->updateEntityType($code, $data);
         } else {
             $this->setup->getConnection()->insert($this->setup->getTable('eav_entity_type'), $data);
         }
 
-        $this->addAttributeSet($code, $this->_defaultAttributeSetName);
+        if (isset($params['entity_type_id'])) {
+            $this->addAttributeSet($code, $this->_defaultAttributeSetName, null, $params['entity_type_id']);
+        } else {
+            $this->addAttributeSet($code, $this->_defaultAttributeSetName);
+        }
         $this->addAttributeGroup($code, $this->_defaultGroupName, $this->_generalGroupName);
 
         return $this;
@@ -310,16 +317,21 @@ public function getAttributeSetSortOrder($entityTypeId, $sortOrder = null)
      * @param int|string $entityTypeId
      * @param string $name
      * @param int $sortOrder
+     * @param int $setId
      * @return $this
      */
-    public function addAttributeSet($entityTypeId, $name, $sortOrder = null)
+    public function addAttributeSet($entityTypeId, $name, $sortOrder = null, $setId = null)
     {
         $data = [
             'entity_type_id' => $this->getEntityTypeId($entityTypeId),
             'attribute_set_name' => $name,
             'sort_order' => $this->getAttributeSetSortOrder($entityTypeId, $sortOrder),
         ];
 
+        if ($setId !== null) {
+            $data['attribute_set_id'] = $setId;
+        }
+
         $setId = $this->getAttributeSet($entityTypeId, $name, 'attribute_set_id');
         if ($setId) {
             $this->updateAttributeSet($entityTypeId, $setId, $data);

app/code/Magento/Sales/Setup/SalesSetup.php

@@ -18,6 +18,26 @@
  */
 class SalesSetup extends \Magento\Eav\Setup\EavSetup
 {
+    /**
+     * This should be set explicitly
+     */
+    const ORDER_ENTITY_TYPE_ID = 5;
+
+    /**
+     * This should be set explicitly
+     */
+    const INVOICE_PRODUCT_ENTITY_TYPE_ID = 6;
+
+    /**
+     * This should be set explicitly
+     */
+    const CREDITMEMO_PRODUCT_ENTITY_TYPE_ID = 7;
+
+    /**
+     * This should be set explicitly
+     */
+    const SHIPMENT_PRODUCT_ENTITY_TYPE_ID = 8;
+
     /**
      * @var ScopeConfigInterface
      */
@@ -214,27 +234,31 @@ public function getDefaultEntities()
     {
         $entities = [
             'order' => [
+                'entity_type_id' => self::ORDER_ENTITY_TYPE_ID,
                 'entity_model' => 'Magento\Sales\Model\ResourceModel\Order',
                 'table' => 'sales_order',
                 'increment_model' => 'Magento\Eav\Model\Entity\Increment\NumericValue',
                 'increment_per_store' => true,
                 'attributes' => [],
             ],
             'invoice' => [
+                'entity_type_id' => self::INVOICE_PRODUCT_ENTITY_TYPE_ID,
                 'entity_model' => 'Magento\Sales\Model\ResourceModel\Order\Invoice',
                 'table' => 'sales_invoice',
                 'increment_model' => 'Magento\Eav\Model\Entity\Increment\NumericValue',
                 'increment_per_store' => true,
                 'attributes' => [],
             ],
             'creditmemo' => [
+                'entity_type_id' => self::CREDITMEMO_PRODUCT_ENTITY_TYPE_ID,
                 'entity_model' => 'Magento\Sales\Model\ResourceModel\Order\Creditmemo',
                 'table' => 'sales_creditmemo',
                 'increment_model' => 'Magento\Eav\Model\Entity\Increment\NumericValue',
                 'increment_per_store' => true,
                 'attributes' => [],
             ],
             'shipment' => [
+                'entity_type_id' => self::SHIPMENT_PRODUCT_ENTITY_TYPE_ID,
                 'entity_model' => 'Magento\Sales\Model\ResourceModel\Order\Shipment',
                 'table' => 'sales_shipment',
                 'increment_model' => 'Magento\Eav\Model\Entity\Increment\NumericValue',