fixed #156

jhipster · Aug 5, 2020 · 5172443 · 5172443
1 parent e893d81
commit 5172443
Show file tree

Hide file tree

Showing 6 changed files with 1,746 additions and 5,435 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 
 # [1.1.1](https://github.com/jhipster/generator-jhipster-nodejs/tree/v1.1.1)
 
+-   enum type values not correctly mapped in the server side [issue #156](https://github.com/jhipster/generator-jhipster-nodejs/issues/156)
 -   Error when fetch list of entities from react client [issue #155](https://github.com/jhipster/generator-jhipster-nodejs/issues/155)
 -   double stitch port on app.yml [issue #153](https://github.com/jhipster/generator-jhipster-nodejs/issues/153)
 

diff --git a/generators/entity-server/files.js b/generators/entity-server/files.js
@@ -58,7 +58,7 @@ function writeFiles() {
                     const enumFileName = _.kebabCase(field.fieldType);
                     const enumInfo = utils.buildEnumInfo(field, this.angularAppName, this.packageName, this.clientRootFolder);
                     this.template(
-                        `${SERVER_NODEJS_DIR}src/domain/enumeration/Enum.ts.ejs`,
+                        `${SERVER_NODEJS_DIR}src/domain/enumeration/enum-type.ts.ejs`,
                         `${SERVER_NODEJS_DIR}src/domain/enumeration/${enumFileName}.ts`,
                         this,
                         {},

diff --git a/generators/entity-server/templates/server/src/domain/enumeration/Enum.ts.ejs b/generators/entity-server/templates/server/src/domain/enumeration/Enum.ts.ejs
diff --git a/generators/entity-server/templates/server/src/domain/enumeration/enum-type.ts.ejs b/generators/entity-server/templates/server/src/domain/enumeration/enum-type.ts.ejs
@@ -0,0 +1,8 @@
+/**
+ * The <%= enumName %> enumeration.
+ */
+export enum <%= enumName %> {
+    <%_ for (idx in enumValues) { _%>
+      <%= enumValues[idx] %> = '<%= enumValues[idx] %>',
+    <%_ } _%>
+}
diff --git a/generators/utils.js b/generators/utils.js
@@ -121,9 +121,10 @@ function addServiceToAppModule(generator, serviceClass) {
 function buildEnumInfo(field, angularAppName, packageName, clientRootFolder) {
     const fieldType = field.fieldType;
     field.enumInstance = _.lowerFirst(fieldType);
+
     const enumInfo = {
         enumName: fieldType,
-        enumValues: field.fieldValues.split(',').join(', '),
+        enumValues: field.fieldValues.split(','),
         enumInstance: field.enumInstance,
         enums: field.fieldValues.replace(/\s/g, '').split(','),
         angularAppName,