Code review adjustments

Vitaliy Boyko · Vitaliy Boyko · commit 94a915a5c104 · 2022-02-15T15:39:16.000+03:00
diff --git a/resources/fileTemplates/internal/Magento Customer Eav Attribute Data Patch Class.php.ft b/resources/fileTemplates/internal/Magento Customer Eav Attribute Data Patch Class.php.ft
@@ -26,18 +26,27 @@ class ${CLASS_NAME} implements ${IMPLEMENTS}
      */
     private $eavConfig;
 
+    /**
+     * @var ${ATTRIBUTE_RESOURCE}
+     */
+    private $attributeResource;
+
      /**
      * @param ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup
      * @param ${EAV_SETUP_FACTORY} $eavSetupFactory
+     * @param ${EAV_CONFIG_CLASS} $eavConfig
+     * @param ${ATTRIBUTE_RESOURCE} $attributeResource
      */
     public function __construct(
         ${MODULE_DATA_SETUP_INTERFACE} $moduleDataSetup,
         ${EAV_SETUP_FACTORY} $eavSetupFactory,
-        ${EAV_CONFIG_CLASS} $eavConfig
+        ${EAV_CONFIG_CLASS} $eavConfig,
+        ${ATTRIBUTE_RESOURCE} $attributeResource
     ) {
         $this->moduleDataSetup = $moduleDataSetup;
         $this->eavSetupFactory = $eavSetupFactory;
         $this->eavConfig = $eavConfig;
+        $this->attributeResource = $attributeResource;
     }
 
     /**
@@ -78,7 +87,7 @@ class ${CLASS_NAME} implements ${IMPLEMENTS}
                 'used_in_forms',
                 [${CUSTOMER_FORMS}]
             );
-            $attribute->save();
+            $this->attributeResource->save($attribute);
         #end
 
         return $this;
diff --git a/resources/fileTemplates/internal/Magento Customer Eav Attribute Data Patch Class.php.html b/resources/fileTemplates/internal/Magento Customer Eav Attribute Data Patch Class.php.html
@@ -0,0 +1,15 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<html lang="en">
+<body>
+<font face="verdana" size="-1">
+    <p>
+        Data patch for the customer EAV attribute
+    </p>
+</font>
+</body>
+</html>
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/data/CustomerEntityData.java b/src/com/magento/idea/magento2plugin/actions/generation/data/CustomerEntityData.java
@@ -1,7 +1,6 @@
 /*
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
- *
  */
 
 package com.magento.idea.magento2plugin.actions.generation.data;
@@ -29,6 +28,7 @@ public class CustomerEntityData implements EavEntityDataInterface {
     private boolean visible;
     private boolean userDefined;
     private boolean useInAdminhtmlCustomerForm;
+    private boolean useInAdminhtmlCheckoutForm;
     private boolean useInCustomerAccountCreateForm;
     private boolean useInCustomerAccountEditForm;
     private boolean usedInGrid;
@@ -119,6 +119,10 @@ public void setUseInAdminhtmlCustomerForm(final boolean useInAdminhtmlCustomerFo
         this.useInAdminhtmlCustomerForm = useInAdminhtmlCustomerForm;
     }
 
+    public void setUseInAdminhtmlCheckoutForm(final boolean useInAdminhtmlCheckoutForm) {
+        this.useInAdminhtmlCheckoutForm = useInAdminhtmlCheckoutForm;
+    }
+
     public void setUseInCustomerAccountCreateForm(final boolean useInCustomerAccountCreateForm) {
         this.useInCustomerAccountCreateForm = useInCustomerAccountCreateForm;
     }
@@ -235,6 +239,10 @@ public boolean isUseInAdminhtmlCustomerForm() {
         return useInAdminhtmlCustomerForm;
     }
 
+    public boolean isUseInAdminhtmlCheckoutForm() {
+        return useInAdminhtmlCheckoutForm;
+    }
+
     public boolean isUseInCustomerAccountCreateForm() {
         return useInCustomerAccountCreateForm;
     }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCustomerEavAttributeDialog.form b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCustomerEavAttributeDialog.form
@@ -3,11 +3,10 @@
   <grid id="28350" binding="contentPanel" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="-1" y="5" width="764" height="810"/>
+      <xy x="-1" y="5" width="764" height="843"/>
     </constraints>
     <properties>
       <enabled value="true"/>
-      <preferredSize width="800" height="800"/>
     </properties>
     <border type="none"/>
     <children>
@@ -365,6 +364,14 @@
               <text value="System"/>
             </properties>
           </component>
+          <component id="ba7a3" class="javax.swing.JCheckBox" binding="useInAdminhtmlCheckoutCheckBox">
+            <constraints>
+              <grid row="17" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Admin Checkout"/>
+            </properties>
+          </component>
         </children>
       </grid>
       <hspacer id="75d92">
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCustomerEavAttributeDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewCustomerEavAttributeDialog.java
@@ -1,7 +1,6 @@
 /*
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
- *
  */
 
 package com.magento.idea.magento2plugin.actions.generation.dialog;
@@ -83,6 +82,7 @@ public class NewCustomerEavAttributeDialog extends EavAttributeDialog {
     private JCheckBox filterableInGridCheckBox;
     private JCheckBox visibleInGridCheckBox;
     private JCheckBox systemAttributeCheckBox;
+    private JCheckBox useInAdminhtmlCheckoutCheckBox;
 
     /**
      * Constructor.
@@ -236,6 +236,9 @@ private CustomerEntityData populateCategoryEntityData(
         customerEntityData.setUseInAdminhtmlCustomerForm(
                 useInAdminhtmlCustomerCheckBox.isSelected()
         );
+        customerEntityData.setUseInAdminhtmlCheckoutForm(
+            useInAdminhtmlCheckoutCheckBox.isSelected()
+        );
         customerEntityData.setUseInCustomerAccountCreateForm(
                 useInCustomerAccountCreateCheckBox.isSelected()
         );
@@ -320,4 +323,8 @@ public void itemStateChanged(final ItemEvent itemEvent) {
             }
         });
     }
+
+    private void createUIComponents() {
+        // TODO: place custom component creation code here
+    }
 }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/CustomerEavAttributePatchGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/CustomerEavAttributePatchGenerator.java
@@ -86,6 +86,12 @@ private String getFormsForAttribute(final CustomerEntityData customerEntityData)
             );
         }
 
+        if (customerEntityData.isUseInAdminhtmlCheckoutForm()) {
+            usedInForms.add(
+                "'" + CustomerForm.ADMINHTML_CHECKOUT.getFormCode() + "'"
+            );
+        }
+
         if (customerEntityData.isUseInCustomerAccountCreateForm()) {
             usedInForms.add(
                     "'" + CustomerForm.CUSTOMER_ACCOUNT_CREATE.getFormCode() + "'"
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/EavAttributeSetupPatchGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/EavAttributeSetupPatchGenerator.java
@@ -76,6 +76,9 @@ protected void fillAttributes(final Properties attributes) {
                 .append(
                         "MODULE_DATA_SETUP_INTERFACE",
                         DataPatchDependency.MODULE_DATA_SETUP_INTERFACE.getClassPatch()
+                ).append(
+                        "ATTRIBUTE_RESOURCE",
+                        DataPatchDependency.ATTRIBUTE_RESOURCE.getClassPatch()
                 )
                 .append(
                         "EAV_SETUP_FACTORY",
diff --git a/src/com/magento/idea/magento2plugin/magento/packages/eav/DataPatchDependency.java b/src/com/magento/idea/magento2plugin/magento/packages/eav/DataPatchDependency.java
@@ -11,7 +11,8 @@ public enum DataPatchDependency {
     EAV_CONFIG("Magento\\Eav\\Model\\Config"),
     EAV_SETUP_FACTORY("Magento\\Eav\\Setup\\EavSetupFactory"),
     ENV_SETUP("Magento\\Eav\\Setup\\EavSetup"),
-    MODULE_DATA_SETUP_INTERFACE("Magento\\Framework\\Setup\\ModuleDataSetupInterface");
+    MODULE_DATA_SETUP_INTERFACE("Magento\\Framework\\Setup\\ModuleDataSetupInterface"),
+    ATTRIBUTE_RESOURCE("Magento\\Customer\\Model\\ResourceModel\\Attribute");
 
     private String classPatch;
 
diff --git a/testData/actions/generation/generator/CustomerAttributeSetupPatchGenerator/generateMultiselectAttributeDataPatch/AddMultiselectTestCustomerAttribute.php b/testData/actions/generation/generator/CustomerAttributeSetupPatchGenerator/generateMultiselectAttributeDataPatch/AddMultiselectTestCustomerAttribute.php
@@ -4,6 +4,7 @@
 
 use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\ResourceModel\Attribute;
 use Magento\Eav\Model\Config;
 use Magento\Eav\Setup\EavSetup;
 use Magento\Eav\Setup\EavSetupFactory;
@@ -27,19 +28,28 @@ class AddMultiselectTestCustomerAttribute implements DataPatchInterface
      */
     private $eavConfig;
 
+    /**
+     * @var Attribute
+     */
+    private $attributeResource;
+
     /**
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @param EavSetupFactory $eavSetupFactory
+     * @param Config $eavConfig
+     * @param Attribute $attributeResource
      */
     public function __construct(
         ModuleDataSetupInterface $moduleDataSetup,
         EavSetupFactory $eavSetupFactory,
-        Config $eavConfig
+        Config $eavConfig,
+        Attribute $attributeResource
     )
     {
         $this->moduleDataSetup = $moduleDataSetup;
         $this->eavSetupFactory = $eavSetupFactory;
         $this->eavConfig = $eavConfig;
+        $this->attributeResource = $attributeResource;
     }
 
     /**
@@ -95,7 +105,7 @@ public function apply()
             'used_in_forms',
             ['adminhtml_customer']
         );
-        $attribute->save();
+        $this->attributeResource->save($attribute);
 
         return $this;
     }
