Merge pull request #512 from bohdan-harniuk/enhancing-model-resource-model-collection-generation

Enhanced Model, Resource Model, Collection generation, fixed collection path bug, added PhpClassTypesBuilder, added new testcases testing

Author: eduard13

src/com/magento/idea/magento2plugin/actions/generation/data/CollectionData.java

@@ -5,54 +5,39 @@
 
 package com.magento.idea.magento2plugin.actions.generation.data;
 
-@SuppressWarnings({"PMD.ExcessiveParameterList"})
 public class CollectionData {
+
     private final String moduleName;
     private final String dbTableName;
     private final String modelName;
     private final String collectionName;
-    private final String collectionFqn;
     private final String collectionDirectory;
-    private final String collectionNamespace;
     private final String resourceModelName;
-    private final String resourceModelFqn;
-    private final String modelFqn;
 
     /**
      * Models Data.
      *
      * @param moduleName String
      * @param dbTableName String
      * @param modelName String
+     * @param resourceModelName String
      * @param collectionName String
-     * @param collectionFqn String
      * @param collectionDirectory String
-     * @param resourceModelName String
-     * @param resourceModelFqn String
-     * @param modelFqn String
      */
     public CollectionData(
             final String moduleName,
             final String dbTableName,
             final String modelName,
-            final String collectionName,
-            final String collectionFqn,
-            final String collectionDirectory,
-            final String collectionNamespace,
             final String resourceModelName,
-            final String resourceModelFqn,
-            final String modelFqn
+            final String collectionName,
+            final String collectionDirectory
     ) {
         this.moduleName = moduleName;
         this.dbTableName = dbTableName;
         this.modelName = modelName;
         this.collectionName = collectionName;
-        this.collectionFqn = collectionFqn;
         this.collectionDirectory = collectionDirectory;
-        this.collectionNamespace = collectionNamespace;
         this.resourceModelName = resourceModelName;
-        this.resourceModelFqn = resourceModelFqn;
-        this.modelFqn = modelFqn;
     }
 
     /**
@@ -82,42 +67,6 @@ public String getModelName() {
         return modelName;
     }
 
-    /**
-     * Collection Name.
-     *
-     * @return String
-     */
-    public String getCollectionName() {
-        return collectionName;
-    }
-
-    /**
-     * Collection FQN.
-     *
-     * @return String
-     */
-    public String getCollectionFqn() {
-        return collectionFqn;
-    }
-
-    /**
-     * Collection Directory.
-     *
-     * @return String
-     */
-    public String getCollectionDirectory() {
-        return collectionDirectory;
-    }
-
-    /**
-     * Collection Namespace.
-     *
-     * @return String
-     */
-    public String getCollectionNamespace() {
-        return collectionNamespace;
-    }
-
     /**
      * Resource Model Name.
      *
@@ -128,20 +77,20 @@ public String getResourceModelName() {
     }
 
     /**
-     * Resource Model FQN.
+     * Collection Name.
      *
      * @return String
      */
-    public String getResourceModelFqn() {
-        return resourceModelFqn;
+    public String getCollectionName() {
+        return collectionName;
     }
 
     /**
-     * Model FQN.
+     * Collection Directory.
      *
      * @return String
      */
-    public String getModelFqn() {
-        return modelFqn;
+    public String getCollectionDirectory() {
+        return collectionDirectory;
     }
 }

src/com/magento/idea/magento2plugin/actions/generation/data/ModelData.java

@@ -6,13 +6,11 @@
 package com.magento.idea.magento2plugin.actions.generation.data;
 
 public class ModelData {
+
     private final String moduleName;
     private final String dbTableName;
     private final String modelName;
     private final String resourceName;
-    private final String fqn;
-    private final String namespace;
-    private final String resourceModelFqn;
 
     /**
      * Model Data.
@@ -21,26 +19,17 @@ public class ModelData {
      * @param dbTableName String
      * @param modelName String
      * @param resourceName String
-     * @param fqn String
-     * @param namespace String
-     * @param resourceModelFqn String
      */
     public ModelData(
             final String moduleName,
             final String dbTableName,
             final String modelName,
-            final String resourceName,
-            final String fqn,
-            final String namespace,
-            final String resourceModelFqn
+            final String resourceName
     ) {
         this.moduleName = moduleName;
         this.dbTableName = dbTableName;
         this.modelName = modelName;
         this.resourceName = resourceName;
-        this.fqn = fqn;
-        this.namespace = namespace;
-        this.resourceModelFqn = resourceModelFqn;
     }
 
     /**
@@ -78,31 +67,4 @@ public String getModelName() {
     public String getResourceName() {
         return resourceName;
     }
-
-    /**
-     * Class FQN.
-     *
-     * @return String
-     */
-    public String getFqn() {
-        return fqn;
-    }
-
-    /**
-     * Class Namespace.
-     *
-     * @return String
-     */
-    public String getNamespace() {
-        return namespace;
-    }
-
-    /**
-     * Resource model FQN.
-     *
-     * @return String
-     */
-    public String getResourceModelFqn() {
-        return resourceModelFqn;
-    }
 }

src/com/magento/idea/magento2plugin/actions/generation/data/ResourceModelData.java

@@ -6,12 +6,11 @@
 package com.magento.idea.magento2plugin.actions.generation.data;
 
 public class ResourceModelData {
+
     private final String moduleName;
     private final String dbTableName;
     private final String resourceModelName;
     private final String entityIdColumn;
-    private final String namespace;
-    private final String fqn;
 
     /**
      * Resource Model Data.
@@ -20,23 +19,17 @@ public class ResourceModelData {
      * @param dbTableName String
      * @param resourceModelName String
      * @param entityIdColumn String
-     * @param namespace String
-     * @param fqn String
      */
     public ResourceModelData(
             final String moduleName,
             final String dbTableName,
             final String resourceModelName,
-            final String entityIdColumn,
-            final String namespace,
-            final String fqn
+            final String entityIdColumn
     ) {
         this.moduleName = moduleName;
         this.dbTableName = dbTableName;
         this.resourceModelName = resourceModelName;
         this.entityIdColumn = entityIdColumn;
-        this.namespace = namespace;
-        this.fqn = fqn;
     }
 
     /**
@@ -74,22 +67,4 @@ public String getEntityIdColumn() {
     public String getResourceModelName() {
         return resourceModelName;
     }
-
-    /**
-     * Namespace getter.
-     *
-     * @return String.
-     */
-    public String getNamespace() {
-        return namespace;
-    }
-
-    /**
-     * FQN getter.
-     *
-     * @return String.
-     */
-    public String getFqn() {
-        return fqn;
-    }
 }

src/com/magento/idea/magento2plugin/actions/generation/data/converter/newentitydialog/CollectionModelDtoConverter.java

@@ -9,8 +9,6 @@
 import com.magento.idea.magento2plugin.actions.generation.data.converter.DataObjectConverter;
 import com.magento.idea.magento2plugin.actions.generation.data.dialog.EntityCreatorContextData;
 import com.magento.idea.magento2plugin.actions.generation.data.dialog.NewEntityDialogData;
-import com.magento.idea.magento2plugin.magento.files.ResourceModelFile;
-import com.magento.idea.magento2plugin.magento.packages.File;
 import org.jetbrains.annotations.NotNull;
 
 public class CollectionModelDtoConverter extends CollectionData implements DataObjectConverter {
@@ -29,14 +27,9 @@ public CollectionModelDtoConverter(
                 generationContextData.getModuleName(),
                 newEntityDialogData.getTableName(),
                 newEntityDialogData.getEntityName().concat("Model"),
-                newEntityDialogData.getEntityName().concat("Collection"),
-                generationContextData.getCollectionModelNamespaceBuilder().getClassFqn(),
-                ResourceModelFile.RESOURCE_MODEL_DIRECTORY + File.separator
-                        + newEntityDialogData.getEntityName(),
-                generationContextData.getCollectionModelNamespaceBuilder().getNamespace(),
                 newEntityDialogData.getEntityName().concat("Resource"),
-                generationContextData.getResourceModelNamespaceBuilder().getClassFqn(),
-                generationContextData.getModelNamespaceBuilder().getClassFqn()
+                newEntityDialogData.getEntityName().concat("Collection"),
+                newEntityDialogData.getEntityName().concat("Model")
         );
     }
 }

src/com/magento/idea/magento2plugin/actions/generation/data/converter/newentitydialog/ModelDtoConverter.java

@@ -27,10 +27,7 @@ public ModelDtoConverter(
                 generationContextData.getModuleName(),
                 newEntityDialogData.getTableName(),
                 newEntityDialogData.getEntityName().concat("Model"),
-                newEntityDialogData.getEntityName().concat("Resource"),
-                generationContextData.getModelNamespaceBuilder().getClassFqn(),
-                generationContextData.getModelNamespaceBuilder().getNamespace(),
-                generationContextData.getResourceModelNamespaceBuilder().getClassFqn()
+                newEntityDialogData.getEntityName().concat("Resource")
         );
     }
 }

src/com/magento/idea/magento2plugin/actions/generation/data/converter/newentitydialog/ResourceModelDtoConverter.java

@@ -27,9 +27,7 @@ public ResourceModelDtoConverter(
                 generationContextData.getModuleName(),
                 newEntityDialogData.getTableName(),
                 newEntityDialogData.getEntityName().concat("Resource"),
-                newEntityDialogData.getIdFieldName(),
-                generationContextData.getResourceModelNamespaceBuilder().getNamespace(),
-                generationContextData.getResourceModelNamespaceBuilder().getClassFqn()
+                newEntityDialogData.getIdFieldName()
         );
     }
 }