[REQUIRES_FULL_CACHE_FLUSH_WHEN_RELEASED] Refactor FlatEntity to be UniversalFlatEntity superset (#17452)

# Introduction In this PR we're refactoring the `FlatEntity` type to become a superset of the `UniversalFlatEntity`. Right now we're storing all the extra properties in `__universal` property, at some point it might just be sibling to other entity and we might rely on the `propertiesToCompare` constants and TypeScript allowing passing a superset type into a smaller subset type ## FromTo utils The entity to flat entity method now computes the universal information, standardized a typing and pattern to do ## Example Also strictly type ```ts "bbb019ea-6205-498c-aea5-67bc53bce8a9": { "workspaceId": "20202020-1c25-4d02-bf25-6aeccf7ea419", "universalIdentifier": "20202020-d111-4d11-8d11-da5ab0a11002", "applicationId": "d01b010d-b984-465b-b40b-370e954e5188", "id": "bbb019ea-6205-498c-aea5-67bc53bce8a9", "pageLayoutTabId": "791a512f-169f-4209-b731-aa86716668c6", "title": "Deals by Company", "type": "GRAPH", "objectMetadataId": "9e14efea-df5b-4c0e-aba9-cfe455f32397", "gridPosition": { "row": 0, "column": 6, "rowSpan": 6, "columnSpan": 6 }, "configuration": { "color": "orange", "orderBy": "FIELD_ASC", "timezone": "UTC", "displayLegend": true, "displayDataLabel": false, "showCenterMetric": true, "configurationType": "PIE_CHART", "firstDayOfTheWeek": 0, "aggregateOperation": "COUNT", "groupBySubFieldName": "name", "groupByFieldMetadataId": "6673ff18-63d2-47a1-8f85-2b9b09ca27a5", "aggregateFieldMetadataId": "8d64ee41-5dd4-4de6-945a-7c0c18399715" }, "createdAt": "2026-01-28T14:08:52.140Z", "updatedAt": "2026-01-28T14:08:52.140Z", "deletedAt": null, "__universal": { "universalIdentifier": "20202020-d111-4d11-8d11-da5ab0a11002", "applicationUniversalIdentifier": "20202020-64aa-4b6f-b003-9c74b97cee20", "pageLayoutTabUniversalIdentifier": "20202020-d011-4d11-8d11-da5ab0a01001", "objectMetadataUniversalIdentifier": "20202020-9549-49dd-b2b2-883999db8938", "gridPosition": { "row": 0, "column": 6, "rowSpan": 6, "columnSpan": 6 }, "configuration": { "color": "orange", "orderBy": "FIELD_ASC", "timezone": "UTC", "displayLegend": true, "displayDataLabel": false, "showCenterMetric": true, "configurationType": "PIE_CHART", "firstDayOfTheWeek": 0, "aggregateOperation": "COUNT", "groupBySubFieldName": "name", "aggregateFieldMetadataUniversalIdentifier": "20202020-d01a-4131-8a31-f123456789ab", "groupByFieldMetadataUniversalIdentifier": "20202020-cbac-457e-b565-adece5fc815f" } } }, ```
2026-01-28 17:46:34 +01:00
parent 81eaee81a8
commit fe9d6f34ff
90 changed files with 3058 additions and 538 deletions
@@ -1,12 +1,21 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';

+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
 import { WorkspaceFlatPageLayoutMapCacheService } from 'src/engine/metadata-modules/flat-page-layout/services/workspace-flat-page-layout-map-cache.service';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity';
 import { PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout.entity';

@Module({
-  imports: [TypeOrmModule.forFeature([PageLayoutEntity, PageLayoutTabEntity])],
+  imports: [
+    TypeOrmModule.forFeature([
+      PageLayoutEntity,
+      PageLayoutTabEntity,
+      ApplicationEntity,
+      ObjectMetadataEntity,
+    ]),
+  ],
  providers: [WorkspaceFlatPageLayoutMapCacheService],
  exports: [WorkspaceFlatPageLayoutMapCacheService],
 })
@@ -5,12 +5,15 @@ import { Repository } from 'typeorm';

 import { WorkspaceCacheProvider } from 'src/engine/workspace-cache/interfaces/workspace-cache-provider.service';

+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
 import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
 import { type FlatPageLayoutMaps } from 'src/engine/metadata-modules/flat-page-layout/types/flat-page-layout-maps.type';
 import { transformPageLayoutEntityToFlatPageLayout } from 'src/engine/metadata-modules/flat-page-layout/utils/transform-page-layout-entity-to-flat-page-layout.util';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { PageLayoutTabEntity } from 'src/engine/metadata-modules/page-layout-tab/entities/page-layout-tab.entity';
 import { PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout.entity';
 import { WorkspaceCache } from 'src/engine/workspace-cache/decorators/workspace-cache.decorator';
+import { createIdToUniversalIdentifierMap } from 'src/engine/workspace-cache/utils/create-id-to-universal-identifier-map.util';
 import { regroupEntitiesByRelatedEntityId } from 'src/engine/workspace-cache/utils/regroup-entities-by-related-entity-id';
 import { addFlatEntityToFlatEntityMapsThroughMutationOrThrow } from 'src/engine/workspace-manager/workspace-migration/utils/add-flat-entity-to-flat-entity-maps-through-mutation-or-throw.util';

@@ -22,21 +25,37 @@ export class WorkspaceFlatPageLayoutMapCacheService extends WorkspaceCacheProvid
    private readonly pageLayoutRepository: Repository<PageLayoutEntity>,
    @InjectRepository(PageLayoutTabEntity)
    private readonly pageLayoutTabRepository: Repository<PageLayoutTabEntity>,
+    @InjectRepository(ApplicationEntity)
+    private readonly applicationRepository: Repository<ApplicationEntity>,
+    @InjectRepository(ObjectMetadataEntity)
+    private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
  ) {
    super();
  }

  async computeForCache(workspaceId: string): Promise<FlatPageLayoutMaps> {
-    const [pageLayouts, pageLayoutTabs] = await Promise.all([
-      await this.pageLayoutRepository.find({
-        where: { workspaceId },
-        withDeleted: true,
-      }),
-      await this.pageLayoutTabRepository.find({
-        where: { workspaceId },
-        withDeleted: true,
-      }),
-    ]);
+    const [pageLayouts, pageLayoutTabs, applications, objectMetadatas] =
+      await Promise.all([
+        this.pageLayoutRepository.find({
+          where: { workspaceId },
+          withDeleted: true,
+        }),
+        this.pageLayoutTabRepository.find({
+          where: { workspaceId },
+          select: ['id', 'universalIdentifier', 'pageLayoutId'],
+          withDeleted: true,
+        }),
+        this.applicationRepository.find({
+          where: { workspaceId },
+          select: ['id', 'universalIdentifier'],
+          withDeleted: true,
+        }),
+        this.objectMetadataRepository.find({
+          where: { workspaceId },
+          select: ['id', 'universalIdentifier'],
+          withDeleted: true,
+        }),
+      ]);

    const [pageLayoutTabsByPageLayoutId] = (
      [
@@ -47,13 +66,22 @@ export class WorkspaceFlatPageLayoutMapCacheService extends WorkspaceCacheProvid
      ] as const
    ).map(regroupEntitiesByRelatedEntityId);

+    const applicationIdToUniversalIdentifierMap =
+      createIdToUniversalIdentifierMap(applications);
+    const objectMetadataIdToUniversalIdentifierMap =
+      createIdToUniversalIdentifierMap(objectMetadatas);
+
    const flatPageLayoutMaps = createEmptyFlatEntityMaps();

    for (const pageLayoutEntity of pageLayouts) {
      const flatPageLayout = transformPageLayoutEntityToFlatPageLayout({
-        ...pageLayoutEntity,
-        tabs: pageLayoutTabsByPageLayoutId.get(pageLayoutEntity.id) || [],
-      } as PageLayoutEntity);
+        entity: {
+          ...pageLayoutEntity,
+          tabs: pageLayoutTabsByPageLayoutId.get(pageLayoutEntity.id) || [],
+        },
+        applicationIdToUniversalIdentifierMap,
+        objectMetadataIdToUniversalIdentifierMap,
+      });

      addFlatEntityToFlatEntityMapsThroughMutationOrThrow({
        flatEntity: flatPageLayout,
@@ -1,9 +1,43 @@
-import { type FlatPageLayout } from 'src/engine/metadata-modules/flat-page-layout/types/flat-page-layout.type';
-import { type PageLayoutEntity } from 'src/engine/metadata-modules/page-layout/entities/page-layout.entity';
+import { isDefined } from 'twenty-shared/utils';
+
+import {
+  FlatEntityMapsException,
+  FlatEntityMapsExceptionCode,
+} from 'src/engine/metadata-modules/flat-entity/exceptions/flat-entity-maps.exception';
+import { type FlatPageLayout } from 'src/engine/metadata-modules/flat-page-layout/types/flat-page-layout.type';
+import { type FromEntityToFlatEntityArgs } from 'src/engine/workspace-cache/types/from-entity-to-flat-entity-args.type';
+
+export const transformPageLayoutEntityToFlatPageLayout = ({
+  entity: pageLayoutEntity,
+  applicationIdToUniversalIdentifierMap,
+  objectMetadataIdToUniversalIdentifierMap,
+}: FromEntityToFlatEntityArgs<'pageLayout'>): FlatPageLayout => {
+  const applicationUniversalIdentifier =
+    applicationIdToUniversalIdentifierMap.get(pageLayoutEntity.applicationId);
+
+  if (!isDefined(applicationUniversalIdentifier)) {
+    throw new FlatEntityMapsException(
+      `Application with id ${pageLayoutEntity.applicationId} not found for pageLayout ${pageLayoutEntity.id}`,
+      FlatEntityMapsExceptionCode.ENTITY_NOT_FOUND,
+    );
+  }
+
+  let objectMetadataUniversalIdentifier: string | null = null;
+
+  if (isDefined(pageLayoutEntity.objectMetadataId)) {
+    objectMetadataUniversalIdentifier =
+      objectMetadataIdToUniversalIdentifierMap.get(
+        pageLayoutEntity.objectMetadataId,
+      ) ?? null;
+
+    if (!isDefined(objectMetadataUniversalIdentifier)) {
+      throw new FlatEntityMapsException(
+        `ObjectMetadata with id ${pageLayoutEntity.objectMetadataId} not found for pageLayout ${pageLayoutEntity.id}`,
+        FlatEntityMapsExceptionCode.ENTITY_NOT_FOUND,
+      );
+    }
+  }

-export const transformPageLayoutEntityToFlatPageLayout = (
-  pageLayoutEntity: PageLayoutEntity,
-): FlatPageLayout => {
  return {
    createdAt: pageLayoutEntity.createdAt.toISOString(),
    deletedAt: pageLayoutEntity.deletedAt?.toISOString() ?? null,
@@ -16,5 +50,13 @@ export const transformPageLayoutEntityToFlatPageLayout = (
    universalIdentifier: pageLayoutEntity.universalIdentifier,
    applicationId: pageLayoutEntity.applicationId,
    tabIds: pageLayoutEntity.tabs.map((tab) => tab.id),
+    __universal: {
+      universalIdentifier: pageLayoutEntity.universalIdentifier,
+      applicationUniversalIdentifier,
+      objectMetadataUniversalIdentifier,
+      tabUniversalIdentifiers: pageLayoutEntity.tabs.map(
+        (tab) => tab.universalIdentifier,
+      ),
+    },
  };
 };