Merge pull request #23942 from mshima/skip_ci-eager

don't override relationshipEagerLoad
jhipster · Oct 22, 2023 · 9a22239 · 9a22239
2 parents 3611803 + be7f5db
commit 9a22239
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/generators/base-application/support/prepare-entity.mts b/generators/base-application/support/prepare-entity.mts
@@ -630,11 +630,12 @@ function preparePostEntityCommonDerivedPropertiesNotTyped(entity: any) {
 
     mutateData(relationship, {
       bagRelationship: relationship.ownerSide && relationship.collection,
-      relationshipEagerLoad: () =>
-        relationship.bagRelationship ||
-        entity.eagerLoad ||
-        // Fetch relationships if otherEntityField differs otherwise the id is enough
-        (relationship.ownerSide && relationship.otherEntity.primaryKey.name !== relationship.otherEntityField),
+      relationshipEagerLoad: ({ relationshipEagerLoad, bagRelationship, ownerSide, otherEntity, otherEntityField }) =>
+        relationshipEagerLoad ??
+        (bagRelationship ||
+          entity.eagerLoad ||
+          // Fetch relationships if otherEntityField differs otherwise the id is enough
+          (ownerSide && otherEntity.primaryKey.name !== otherEntityField)),
     });
   });
   entity.relationshipsContainEagerLoad = entity.relationships.some(relationship => relationship.relationshipEagerLoad);