feat: composite id backend support

jhipster · Jul 9, 2023 · ec79794 · ec79794
1 parent efede86
commit ec79794
Show file tree

Hide file tree

Showing 45 changed files with 1,818 additions and 1,345 deletions.
diff --git a/generators/angular/entity-files-angular.mts b/generators/angular/entity-files-angular.mts
@@ -69,7 +69,7 @@ export async function writeEntitiesFiles(
   for (const entity of entities.filter(entity => !entity.skipClient && !entity.builtIn)) {
     await this.writeFiles({
       sections: angularFiles,
-      context: { ...application, ...entity, getWebappTranslation: control.getWebappTranslation },
+      context: { ...application, ...entity, entity, getWebappTranslation: control.getWebappTranslation },
     });
   }
 }

diff --git a/generators/base-application/support/prepare-entity.mts b/generators/base-application/support/prepare-entity.mts
@@ -353,10 +353,12 @@ export function prepareEntityPrimaryKeyForTemplates(entityWithConfig, generator,
     entityWithConfig.primaryKey = {
       fieldName: 'id',
       derived: true,
-      // MapsId copy the id from the relationship.
-      autoGenerate: true,
       get fields() {
-        return this.derivedFields;
+        return this.derivedFields.map(field => preparePrimaryKeyFields(field));
+      },
+      get autoGenerate() {
+        // MapsId=!composite is autoGenerate because it copies the id from the relationship.
+        return !this.composite;
       },
       get derivedFields() {
         return relationshipId.derivedPrimaryKey.derivedFields;
@@ -380,9 +382,6 @@ export function prepareEntityPrimaryKeyForTemplates(entityWithConfig, generator,
       get composite() {
         return relationshipId.otherEntity.primaryKey.composite;
       },
-      get ids() {
-        return this.fields.map(field => fieldToId(field));
-      },
     };
   } else {
     const composite = enableCompositeId ? idCount > 1 : false;
@@ -414,7 +413,7 @@ export function prepareEntityPrimaryKeyForTemplates(entityWithConfig, generator,
       ownFields: idFields,
       // Fields declared and inherited
       get fields() {
-        return [...this.ownFields, ...this.derivedFields];
+        return [...this.ownFields, ...this.derivedFields].map(field => preparePrimaryKeyFields(field));
       },
       get autoGenerate() {
         return this.composite ? false : this.fields[0].autoGenerate;
@@ -423,42 +422,27 @@ export function prepareEntityPrimaryKeyForTemplates(entityWithConfig, generator,
       get derivedFields() {
         return this.relationships.map(rel => rel.derivedPrimaryKey.derivedFields).flat();
       },
-      get ids() {
-        return this.fields.map(field => fieldToId(field));
-      },
     };
   }
   return entityWithConfig;
 }
 
-function fieldToId(field) {
-  return {
-    field,
-    get name() {
-      return field.fieldName;
-    },
-    get nameCapitalized() {
-      return field.fieldNameCapitalized;
-    },
-    get nameDotted() {
+function preparePrimaryKeyFields(field) {
+  Object.defineProperty(field, 'fieldNameDotted', {
+    get() {
       return field.derivedPath ? field.derivedPath.join('.') : field.fieldName;
     },
-    get nameDottedAsserted() {
+    enumerable: true,
+    configurable: true,
+  });
+  Object.defineProperty(field, 'fieldNameDottedAsserted', {
+    get() {
       return field.derivedPath ? `${field.derivedPath.join('!.')}!` : `${field.fieldName}!`;
     },
-    get setter() {
-      return `set${this.nameCapitalized}`;
-    },
-    get getter() {
-      return (field.fieldType === BOOLEAN ? 'is' : 'get') + this.nameCapitalized;
-    },
-    get autoGenerate() {
-      return !!field.autoGenerate;
-    },
-    get relationshipsPath() {
-      return field.relationshipsPath;
-    },
-  };
+    enumerable: true,
+    configurable: true,
+  });
+  return field;
 }
 
 /**

diff --git a/generators/base-application/support/prepare-entity.spec.mts b/generators/base-application/support/prepare-entity.spec.mts
@@ -246,6 +246,8 @@ describe('generator - base-application - support - prepareEntity', () => {
           expect(field).to.deep.include({
             ...entity1.primaryKey.fields[0],
             fieldName: 'otherEntity1Id',
+            fieldNameDotted: 'otherEntity1.id',
+            fieldNameDottedAsserted: 'otherEntity1!.id!',
             fieldNameCapitalized: 'OtherEntity1Id',
             columnName: 'other_entity1_id',
             derivedPath: ['otherEntity1', 'id'],
@@ -258,14 +260,12 @@ describe('generator - base-application - support - prepareEntity', () => {
         });
 
         it('should prepare correct relationship id ids', () => {
-          const field = entity4.primaryKey.ids[1];
+          const field = entity4.primaryKey.fields[1];
           expect(field).to.deep.include({
-            name: 'otherEntity1Id',
-            nameCapitalized: 'OtherEntity1Id',
-            nameDotted: 'otherEntity1.id',
-            nameDottedAsserted: 'otherEntity1!.id!',
-            setter: 'setOtherEntity1Id',
-            getter: 'getOtherEntity1Id',
+            fieldName: 'otherEntity1Id',
+            fieldNameCapitalized: 'OtherEntity1Id',
+            fieldNameDotted: 'otherEntity1.id',
+            fieldNameDottedAsserted: 'otherEntity1!.id!',
           });
         });
 
@@ -275,6 +275,8 @@ describe('generator - base-application - support - prepareEntity', () => {
             ...entity3.primaryKey.fields[0],
             derived: true,
             fieldName: 'otherEntity3Uuid',
+            fieldNameDotted: 'otherEntity3.uuid',
+            fieldNameDottedAsserted: 'otherEntity3!.uuid!',
             fieldNameCapitalized: 'OtherEntity3Uuid',
             columnName: 'other_entity3_uuid',
             derivedPath: ['otherEntity3', 'uuid'],
@@ -286,14 +288,12 @@ describe('generator - base-application - support - prepareEntity', () => {
         });
 
         it('should prepare correct relationship id with derived primaryKey field ids', () => {
-          const field = entity4.primaryKey.ids[2];
+          const field = entity4.primaryKey.fields[2];
           expect(field).to.deep.include({
-            name: 'otherEntity3Uuid',
-            nameCapitalized: 'OtherEntity3Uuid',
-            nameDotted: 'otherEntity3.uuid',
-            nameDottedAsserted: 'otherEntity3!.uuid!',
-            setter: 'setOtherEntity3Uuid',
-            getter: 'getOtherEntity3Uuid',
+            fieldName: 'otherEntity3Uuid',
+            fieldNameCapitalized: 'OtherEntity3Uuid',
+            fieldNameDotted: 'otherEntity3.uuid',
+            fieldNameDottedAsserted: 'otherEntity3!.uuid!',
           });
         });
       });