Skip to content

Commit eed20d8

Browse files
bohdan-harniukbohdan-harniuk
committed
Merge branch 'mainline-entity-manager' of github.com:magento/magento2-phpstorm-plugin into entity-save-command-class-generation
2 parents d1dee19 + 4b3ea8b commit eed20d8

File tree

10 files changed

+566
-2
lines changed

10 files changed

+566
-2
lines changed

‎resources/META-INF/plugin.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@
230230
<internalFileTemplate name="Magento Module Declarative Schema Whitelist JSON"/>
231231
<internalFileTemplate name="Magento Get List Query Model"/>
232232
<internalFileTemplate name="Magento Entity Save Controller Class"/>
233+
<internalFileTemplate name="Magento Entity Data Mapper"/>
233234
<internalFileTemplate name="Magento Save Entity Command Model"/>
234235

235236
<defaultLiveTemplates file="/liveTemplates/MagentoPWA.xml"/>

‎resources/fileTemplates/code/Magento Entity Data Mapper.html.ft

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<html lang="en">
2+
<body>
3+
<p face="verdana" size="-1">
4+
5+
</p>
6+
7+
<table width="100%" border="0" cellpadding="5" cellspacing="0" style="border-collapse: collapse">
8+
<tr>
9+
<td colspan="3"><font face="verdana" size="-1">Template's predefined variables:</font></td>
10+
</tr>
11+
<tr>
12+
<td valign="top"><nobr><font face="verdana" size="-2"><b>${NAMESPACE}</b></font></nobr></td>
13+
<td width="10">&nbsp;</td>
14+
<td width="100%" valign="top"><font face="verdana" size="-1"></font></td>
15+
</tr>
16+
</table>
17+
</body>
18+
</html>

‎resources/fileTemplates/code/Magento Entity Data Mapper.php.ft

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?php
2+
#parse("PHP File Header.php")
3+
4+
namespace ${NAMESPACE};
5+
6+
#set($uses = ${USES})
7+
#foreach ($use in $uses.split(","))
8+
use $use;
9+
#end
10+
11+
/**
12+
* Converts a collection of ${ENTITY_NAME} entities to an array of data transfer objects.
13+
*/
14+
class ${CLASS_NAME}
15+
{
16+
/**
17+
* @var ${DTO_FACTORY}
18+
*/
19+
private $entityDtoFactory;
20+
21+
/**
22+
* @param ${DTO_FACTORY} $entityDtoFactory
23+
*/
24+
public function __construct(
25+
${DTO_FACTORY} $entityDtoFactory
26+
) {
27+
$this->entityDtoFactory = $entityDtoFactory;
28+
}
29+
30+
/**
31+
* Map magento models to DTO array.
32+
*
33+
* @param ${ABSTRACT_COLLECTION} $collection
34+
*
35+
* @return array|${DTO_TYPE}[]
36+
*/
37+
public function map(${ABSTRACT_COLLECTION} $collection): array
38+
{
39+
$results = [];
40+
/** @var ${MAGENTO_MODEL_TYPE} $item */
41+
foreach ($collection->getItems() as $item) {
42+
/** @var ${DTO_TYPE}|${DATA_OBJECT} $entityDto */
43+
$entityDto = $this->entityDtoFactory->create();
44+
$entityDto->addData($item->getData());
45+
46+
#set($brackets = "[]")
47+
$results$brackets = $entityDto;
48+
}
49+
50+
return $results;
51+
}
52+
}

‎src/com/magento/idea/magento2plugin/actions/generation/data/EntityDataMapperData.java

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
/*
2+
* Copyright © Magento, Inc. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
6+
package com.magento.idea.magento2plugin.actions.generation.data;
7+
8+
import org.jetbrains.annotations.NotNull;
9+
10+
public class EntityDataMapperData {
11+
private final String moduleName;
12+
private final String entityName;
13+
private final String namespace;
14+
private final String classFqn;
15+
private final String modelClassFqn;
16+
private final String dataModelClassFqn;
17+
18+
/**
19+
* Magento entity data mapper data constructor.
20+
*
21+
* @param moduleName String
22+
* @param entityName String
23+
* @param namespace String
24+
* @param modelClassFqn String
25+
* @param dataModelClassFqn String
26+
*/
27+
public EntityDataMapperData(
28+
final @NotNull String moduleName,
29+
final @NotNull String entityName,
30+
final @NotNull String namespace,
31+
final @NotNull String classFqn,
32+
final @NotNull String modelClassFqn,
33+
final @NotNull String dataModelClassFqn
34+
) {
35+
this.moduleName = moduleName;
36+
this.entityName = entityName;
37+
this.namespace = namespace;
38+
this.classFqn = classFqn;
39+
this.modelClassFqn = modelClassFqn;
40+
this.dataModelClassFqn = dataModelClassFqn;
41+
}
42+
43+
/**
44+
* Get module name.
45+
*
46+
* @return String
47+
*/
48+
public String getModuleName() {
49+
return moduleName;
50+
}
51+
52+
/**
53+
* Get entity name.
54+
*
55+
* @return String
56+
*/
57+
public String getEntityName() {
58+
return entityName;
59+
}
60+
61+
/**
62+
* Get namespace.
63+
*
64+
* @return String
65+
*/
66+
public String getNamespace() {
67+
return namespace;
68+
}
69+
70+
/**
71+
* Get class fqn.
72+
*
73+
* @return String
74+
*/
75+
public String getClassFqn() {
76+
return classFqn;
77+
}
78+
79+
/**
80+
* Get model class fqn.
81+
*
82+
* @return String
83+
*/
84+
public String getModelClassFqn() {
85+
return modelClassFqn;
86+
}
87+
88+
/**
89+
* Get data model class fqn.
90+
*
91+
* @return String
92+
*/
93+
public String getDataModelClassFqn() {
94+
return dataModelClassFqn;
95+
}
96+
}

‎src/com/magento/idea/magento2plugin/actions/generation/dialog/NewEntityDialog.java

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.magento.idea.magento2plugin.actions.generation.data.DataModelData;
1919
import com.magento.idea.magento2plugin.actions.generation.data.DataModelInterfaceData;
2020
import com.magento.idea.magento2plugin.actions.generation.data.DbSchemaXmlData;
21+
import com.magento.idea.magento2plugin.actions.generation.data.EntityDataMapperData;
2122
import com.magento.idea.magento2plugin.actions.generation.data.GetListQueryModelData;
2223
import com.magento.idea.magento2plugin.actions.generation.data.LayoutXmlData;
2324
import com.magento.idea.magento2plugin.actions.generation.data.MenuXmlData;
@@ -41,6 +42,7 @@
4142
import com.magento.idea.magento2plugin.actions.generation.generator.DataModelInterfaceGenerator;
4243
import com.magento.idea.magento2plugin.actions.generation.generator.DbSchemaWhitelistJsonGenerator;
4344
import com.magento.idea.magento2plugin.actions.generation.generator.DbSchemaXmlGenerator;
45+
import com.magento.idea.magento2plugin.actions.generation.generator.EntityDataMapperGenerator;
4446
import com.magento.idea.magento2plugin.actions.generation.generator.GetListQueryModelGenerator;
4547
import com.magento.idea.magento2plugin.actions.generation.generator.LayoutXmlGenerator;
4648
import com.magento.idea.magento2plugin.actions.generation.generator.MenuXmlGenerator;
@@ -60,6 +62,7 @@
6062
import com.magento.idea.magento2plugin.magento.files.ControllerBackendPhp;
6163
import com.magento.idea.magento2plugin.magento.files.DataModel;
6264
import com.magento.idea.magento2plugin.magento.files.DataModelInterface;
65+
import com.magento.idea.magento2plugin.magento.files.EntityDataMapperFile;
6366
import com.magento.idea.magento2plugin.magento.files.ModelPhp;
6467
import com.magento.idea.magento2plugin.magento.files.ModuleMenuXml;
6568
import com.magento.idea.magento2plugin.magento.files.ResourceModelPhp;
@@ -287,6 +290,7 @@ private void onOK() {
287290
generateRoutesXmlFile();
288291
generateViewControllerFile();
289292
generateSaveControllerFile();
293+
generateEntityDataMapperFile();
290294
generateModelGetListQueryFile();
291295
generateSaveEntityCommandFile();
292296
generateDataProviderFile();
@@ -1067,6 +1071,41 @@ private void generateWhitelistJsonFile(final @NotNull DbSchemaXmlData dbSchemaXm
10671071
).generate(ACTION_NAME, false);
10681072
}
10691073

1074+
/**
1075+
* Generate entity data mapper type.
1076+
*/
1077+
private void generateEntityDataMapperFile() {
1078+
final EntityDataMapperFile entityDataMapperFile =
1079+
new EntityDataMapperFile(getEntityName());
1080+
1081+
final String namespace = entityDataMapperFile.getNamespace(getModuleName());
1082+
final String classFqn = entityDataMapperFile.getClassFqn(getModuleName());
1083+
1084+
final NamespaceBuilder modelNamespace = getModelNamespace();
1085+
final NamespaceBuilder dtoModelNamespace = getDataModelNamespace();
1086+
final NamespaceBuilder dtoInterfaceModelNamespace = getDataModelInterfaceNamespace();
1087+
1088+
final String dtoType;
1089+
1090+
if (createInterface.isSelected()) {
1091+
dtoType = dtoInterfaceModelNamespace.getClassFqn();
1092+
} else {
1093+
dtoType = dtoModelNamespace.getClassFqn();
1094+
}
1095+
1096+
new EntityDataMapperGenerator(
1097+
new EntityDataMapperData(
1098+
getModuleName(),
1099+
getEntityName(),
1100+
namespace,
1101+
classFqn,
1102+
modelNamespace.getClassFqn(),
1103+
dtoType
1104+
),
1105+
project
1106+
).generate(ACTION_NAME, false);
1107+
}
1108+
10701109
/**
10711110
* Run GetListQuery.php file generator.
10721111
*/
@@ -1090,8 +1129,10 @@ private void generateModelGetListQueryFile() {
10901129
* @return String
10911130
*/
10921131
private String getEntityDataMapperType() {
1093-
// TODO: implement with entity data mapper generation.
1094-
return "Test\\Test\\Mapper\\" + getEntityName() + "DataMapper";
1132+
final EntityDataMapperFile entityDataMapperFile =
1133+
new EntityDataMapperFile(getEntityName());
1134+
1135+
return entityDataMapperFile.getClassFqn(getModuleName());
10951136
}
10961137

10971138
/**

0 commit comments

Comments
 (0)