From d9754a2af5de591333e3a03946505ca0bc5b80b8 Mon Sep 17 00:00:00 2001
From: Niclas Thobaben <nt@noske-office.de>
Date: Sat, 18 Sep 2021 14:36:29 +0200
Subject: [PATCH] added jpa entity generator

---
 src/java-jpa-entity.js | 5 ++++-
 src/java-type.js       | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/java-jpa-entity.js b/src/java-jpa-entity.js
index 078364a..e8aebf9 100644
--- a/src/java-jpa-entity.js
+++ b/src/java-jpa-entity.js
@@ -11,7 +11,7 @@ module.exports = {
             model.package = `${namespace}.${suffix}`;
             model.dir = model.package.replace(/\./g, '/')
             model.fields = model.fields.map(field => {
-                field.isEnum = service.enums.find(e => e.name == field.type.name)
+                field.isEnum = service.enums.find(e => e.name == field.type.name) != null
                 field.name = utils.camelcase(field.name)
                 field.type = javaType.mapJavaType(field.type, namespace, 'Record')
                 
@@ -23,6 +23,9 @@ module.exports = {
                 field.default = javaType.mapDefaultValue(field.type, field.default)
                 field.nullable = !field.required
                 field.isPkey = jpa.pkey == field.name
+
+                console.log("field", field)
+
                 return field
             })
 
diff --git a/src/java-type.js b/src/java-type.js
index 9bbd485..8539369 100644
--- a/src/java-type.js
+++ b/src/java-type.js
@@ -59,7 +59,7 @@ function getCustomType(type, namespace, suffix) {
         name = utils.pascalcase(match[2])+suffix
         importstatement = `${match[1].replace('enums', 'models')}.${name}${suffix}`
     }else {
-        name = utils.pascalcase(type)
+        name = utils.pascalcase(type)+suffix
         importstatement = `${namespace}.models.${name}${suffix}`
     }