fix: small fixes needed for composite key

jhipster · Mar 30, 2021 · eb33679 · eb33679
1 parent 074024a
commit eb33679
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/generators/entity-server/index.js b/generators/entity-server/index.js
@@ -115,10 +115,9 @@ module.exports = class extends BaseBlueprintGenerator {
       },
 
       useMapsIdRelation() {
-        const jpaDerivedRelation = this.relationships.find(rel => rel.id === true);
-        if (jpaDerivedRelation) {
+        if (this.primaryKey && this.primaryKey.derived) {
           this.isUsingMapsId = true;
-          this.mapsIdAssoc = jpaDerivedRelation;
+          this.mapsIdAssoc = this.relationships.find(rel => rel.id);
           this.hasOauthUser = this.mapsIdAssoc.otherEntityName === 'user' && this.authenticationType === 'oauth2';
         } else {
           this.isUsingMapsId = false;

diff --git a/utils/field.js b/utils/field.js
@@ -164,6 +164,7 @@ function prepareFieldForTemplates(entityWithConfig, field, generator) {
     fieldNameHumanized: _.startCase(field.fieldName),
     fieldTranslationKey: `${entityWithConfig.i18nKeyPrefix}.${field.fieldName}`,
     tsType: generator.getTypescriptKeyType(field.fieldType),
+    entity: entityWithConfig,
   });
   const fieldType = field.fieldType;
   if (field.mapstructExpression) {
@@ -298,6 +299,7 @@ function prepareFieldForTemplates(entityWithConfig, field, generator) {
     }
     return data;
   };
+  field.path = [field.fieldName];
   field.reference = fieldToReference(entityWithConfig, field);
 
   return field;

diff --git a/utils/relationship.js b/utils/relationship.js
@@ -112,16 +112,12 @@ function prepareRelationshipForTemplates(entityWithConfig, relationship, generat
   }
 
   relationship.relatedField = otherEntityData.fields.find(field => field.fieldName === relationship.otherEntityField);
-  if (!relationship.relatedField && !relationship.otherEntity.embedded) {
-    if (otherEntityData.primaryKey && otherEntityData.primaryKey.derived) {
-      Object.defineProperty(relationship, 'relatedField', {
-        get() {
-          return otherEntityData.primaryKey.derivedFields.find(field => field.fieldName === relationship.otherEntityField);
-        },
-      });
-    } else if (!ignoreMissingRequiredRelationship) {
-      throw new Error(`Error looking for field ${relationship.otherEntityField} at ${otherEntityData.name}`);
-    }
+  if (!relationship.relatedField && otherEntityData.primaryKey && otherEntityData.primaryKey.derived) {
+    Object.defineProperty(relationship, 'relatedField', {
+      get() {
+        return otherEntityData.primaryKey.derivedFields.find(field => field.fieldName === relationship.otherEntityField);
+      },
+    });
   }
   if (relationship.relatedField) {
     relationship.otherEntityFieldCapitalized = relationship.relatedField.fieldNameCapitalized;
@@ -147,6 +143,8 @@ function prepareRelationshipForTemplates(entityWithConfig, relationship, generat
     relationshipNameCapitalized: _.upperFirst(relationshipName),
     relationshipNameHumanized: _.startCase(relationshipName),
     columnName: generator.getColumnName(relationshipName),
+    columnNamePrefix:
+      relationship.id && relationship.relationshipType === 'one-to-one' ? '' : `${generator.getColumnName(relationshipName)}_`,
     otherEntityNamePlural: pluralize(otherEntityName),
     otherEntityNameCapitalized: _.upperFirst(otherEntityName),
     otherEntityTableName: