Fixed model generation with same names

Author: drpayyne

src/com/magento/idea/magento2plugin/actions/generation/dialog/NewModelsDialog.java

@@ -223,14 +223,22 @@ private void onOK() {
     private PsiFile generateModelFile() {
         final NamespaceBuilder modelNamespace = getModelNamespace();
         final NamespaceBuilder resourceModelNamespace = getResourceModelNamespace();
+        String resourceModelFqn = resourceModelNamespace.getClassFqn();
+        String resorceModelName = getResourceModelName();
+
+        if (getModelName().equals(getResourceModelName())) {
+            resourceModelFqn += " as ResourceModel";
+            resorceModelName = "ResourceModel";
+        }
+
         return new ModuleModelGenerator(new ModelData(
                 getModuleName(),
                 getDbTableName(),
                 getModelName(),
-                getResourceModelName(),
+                resorceModelName,
                 modelNamespace.getClassFqn(),
                 modelNamespace.getNamespace(),
-                resourceModelNamespace.getClassFqn()
+                resourceModelFqn
         ), project).generate(NewModelsDialog.ACTION_NAME, true);
     }
 
@@ -250,17 +258,30 @@ private PsiFile generateCollectionFile() {
         final NamespaceBuilder resourceModelNamespace = getResourceModelNamespace();
         final NamespaceBuilder modelNamespace = getModelNamespace();
         final NamespaceBuilder collectionNamespace = getCollectionNamespace();
+        String modelFqn = modelNamespace.getClassFqn();
+        String modelName = getModelName();
+        String resourceModelFqn = resourceModelNamespace.getClassFqn();
+        String resorceModelName = getResourceModelName();
+
+
+        if (getModelName().equals(getResourceModelName())) {
+            modelFqn += " as Model";
+            modelName = "Model";
+            resourceModelFqn += " as ResourceModel";
+            resorceModelName = "ResourceModel";
+        }
+
         return new ModuleCollectionGenerator(new CollectionData(
             getModuleName(),
             getDbTableName(),
-            getModelName(),
+            modelName,
             getCollectionName(),
             collectionNamespace.getClassFqn(),
             getCollectionDirectory(),
             collectionNamespace.getNamespace(),
-            getResourceModelName(),
-            resourceModelNamespace.getClassFqn(),
-            modelNamespace.getClassFqn()
+            resorceModelName,
+            resourceModelFqn,
+            modelFqn
         ), project).generate(NewModelsDialog.ACTION_NAME, true);
     }
 

src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleModelGenerator.java

@@ -150,9 +150,7 @@ protected void fillAttributes(final Properties attributes) {
         attributes.setProperty("NAMESPACE", modelData.getNamespace());
 
         attributes.setProperty("DB_NAME", modelData.getDbTableName());
-        attributes.setProperty("RESOURCE_MODEL", PhpClassGeneratorUtil.getNameFromFqn(
-                modelData.getResourceModelFqn())
-        );
+        attributes.setProperty("RESOURCE_MODEL", modelData.getResourceName());
         final List<String> uses = getUses();
 
         attributes.setProperty(