fixed collectionName, tableName

improved api-path now kebab-case!
rocketbase-io · Mar 11, 2018 · 2dd3acc · 2dd3acc
1 parent 229ab80
commit 2dd3acc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/generators/service/index.js b/generators/service/index.js
@@ -98,8 +98,9 @@ module.exports = class extends Generator {
         this.props.mongoDb = answers.springData === 'mongodb'
         this.props.idClass = this.props.mongoDb ? 'String' : 'Long'
 
-        this.props.entityVariable = answers.entityName.charAt(0)
-          .toLowerCase() + answers.entityName.slice(1)
+        this.props.entityCamelCase = _.lowerFirst(answers.entityName)
+        this.props.entityKebabCase = _.kebabCase(answers.entityName)
+        this.props.entitySnakeCase = _.kebabCase(answers.entityName).replace('-','_')
 
         this.props.entityFolder = answers.entityName.toLowerCase()
         // some transformations

diff --git a/generators/service/templates/api/java/package/resource/_EntityResource.java b/generators/service/templates/api/java/package/resource/_EntityResource.java
@@ -23,7 +23,7 @@ public class <%= entityName %>Resource extends AbstractCrudRestResource<<%= enti
 
     @Override
     protected String getBaseApiUrl() {
-        return baseApiUrl + "/api/<%= entityVariable %>";
+        return baseApiUrl + "/api/<%= entityKebabCase %>";
     }
 
     @Override

diff --git a/generators/service/templates/server/java/package/controller/_EntityController.java b/generators/service/templates/server/java/package/controller/_EntityController.java
@@ -14,7 +14,7 @@
 
 @Slf4j
 @RestController
-@RequestMapping("/api/<%= entityVariable %>")
+@RequestMapping("/api/<%= entityKebabCase %>")
 public class <%= entityName %>Controller extends AbstractCrudController<<%= entityName %>Entity, <%= entityName %>Read, <%= entityName %>Write, <%= idClass %>, <%= entityName %>Converter> {
 
     @Autowired

diff --git a/generators/service/templates/server/java/package/model/_EntityEntity.java b/generators/service/templates/server/java/package/model/_EntityEntity.java
@@ -14,9 +14,10 @@
 import java.io.Serializable;
 
 <%_ if (mongoDb) { _%>
-@Document
+@Document(collection = "<%= entityCamelCase %>")
 <%_ } else { _%>
 @Entity
+@Table(name =  "<%= entitySnakeCase %>")
 <%_ } _%>
 @Data
 @Builder