Merge pull request #23931 from mshima/skip_ci-eager

use defaults utility at relationships.

generators/base-application/support/prepare-entity.mts

@@ -21,7 +21,14 @@ import pluralize from 'pluralize';
 
 import type BaseGenerator from '../../base-core/index.mjs';
 import { getDatabaseTypeData, hibernateSnakeCase } from '../../server/support/index.mjs';
-import { createFaker, parseChangelog, stringHashCode, upperFirstCamelCase, getMicroserviceAppName } from '../../base/support/index.mjs';
+import {
+  createFaker,
+  parseChangelog,
+  stringHashCode,
+  upperFirstCamelCase,
+  getMicroserviceAppName,
+  mutateData,
+} from '../../base/support/index.mjs';
 import { fieldToReference } from './prepare-field.mjs';
 import { getTypescriptKeyType, getEntityParentPathAddition } from '../../client/support/index.mjs';
 import {
@@ -620,14 +627,15 @@ function preparePostEntityCommonDerivedPropertiesNotTyped(entity: any) {
       relationship.relationshipEagerLoad = false;
       return;
     }
-    relationship.bagRelationship = relationship.ownerSide && relationship.collection;
-    if (relationship.relationshipEagerLoad === undefined) {
-      relationship.relationshipEagerLoad =
+
+    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);
-    }
+        (relationship.ownerSide && relationship.otherEntity.primaryKey.name !== relationship.otherEntityField),
+    });
   });
   entity.relationshipsContainEagerLoad = entity.relationships.some(relationship => relationship.relationshipEagerLoad);
   entity.containsBagRelationships = entity.relationships.some(relationship => relationship.bagRelationship);