fix object metadata renaming (#8175)

## Context Latest refactoring broke the findOneWithinWorkspace method which is called during object update, I'm simply reverting this change. object-metadata-relation.service was naively computing a namePlural based on the nameSingular while we already had that info in the DB... Should fix some issues with renaming as well because the original field was not computed with the right name.
twentyhq · Oct 29, 2024 · 31ecaf2 · 31ecaf2
1 parent fe2c8bb
commit 31ecaf2
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 15 deletions.
diff --git a/...ages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts b/...ages/twenty-server/src/engine/metadata-modules/object-metadata/object-metadata.service.ts
@@ -320,33 +320,36 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEnt
     return objectMetadata;
   }
 
-  public async findMany(options?: FindManyOptions<ObjectMetadataEntity>) {
-    return this.objectMetadataRepository.find({
+  public async findOneWithinWorkspace(
+    workspaceId: string,
+    options: FindOneOptions<ObjectMetadataEntity>,
+  ): Promise<ObjectMetadataEntity | null> {
+    return this.objectMetadataRepository.findOne({
       relations: [
         'fields',
         'fields.fromRelationMetadata',
         'fields.toRelationMetadata',
-        'fields.fromRelationMetadata.toObjectMetadata',
       ],
       ...options,
       where: {
-        ...options?.where,
+        ...options.where,
+        workspaceId,
       },
     });
   }
 
-  public async findOneWithinWorkspace(
-    workspaceId: string,
-    options: FindOneOptions<ObjectMetadataEntity>,
-  ): Promise<ObjectMetadataEntity | null> {
-    return this.findManyWithinWorkspace(workspaceId, options)[0] ?? null;
-  }
-
   public async findManyWithinWorkspace(
     workspaceId: string,
     options?: FindManyOptions<ObjectMetadataEntity>,
   ) {
-    return this.findMany({
+    return this.objectMetadataRepository.find({
+      relations: [
+        'fields.object',
+        'fields',
+        'fields.fromRelationMetadata',
+        'fields.toRelationMetadata',
+        'fields.fromRelationMetadata.toObjectMetadata',
+      ],
       ...options,
       where: {
         ...options?.where,
@@ -355,6 +358,21 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEnt
     });
   }
 
+  public async findMany(options?: FindManyOptions<ObjectMetadataEntity>) {
+    return this.objectMetadataRepository.find({
+      relations: [
+        'fields',
+        'fields.fromRelationMetadata',
+        'fields.toRelationMetadata',
+        'fields.fromRelationMetadata.toObjectMetadata',
+      ],
+      ...options,
+      where: {
+        ...options?.where,
+      },
+    });
+  }
+
   public async deleteObjectsMetadata(workspaceId: string) {
     await this.objectMetadataRepository.delete({ workspaceId });
     await this.workspaceMetadataVersionService.incrementMetadataVersion(

diff --git a/.../src/engine/metadata-modules/object-metadata/services/object-metadata-relation.service.ts b/.../src/engine/metadata-modules/object-metadata/services/object-metadata-relation.service.ts
@@ -139,8 +139,7 @@ export class ObjectMetadataRelationService {
     createdObjectMetadata: ObjectMetadataEntity,
     relatedObjectMetadata: ObjectMetadataEntity,
   ) {
-    const relationObjectMetadataNamePlural =
-      relatedObjectMetadata.nameSingular + 's';
+    const relationObjectMetadataNamePlural = relatedObjectMetadata.namePlural;
 
     return {
       standardId:
@@ -151,7 +150,7 @@ export class ObjectMetadataRelationService {
       isActive: true,
       isSystem: true,
       type: FieldMetadataType.RELATION,
-      name: relationObjectMetadataNamePlural,
+      name: relatedObjectMetadata.namePlural,
       label: capitalize(relationObjectMetadataNamePlural),
       description: `${capitalize(relationObjectMetadataNamePlural)} tied to the ${createdObjectMetadata.labelSingular}`,
       icon: