Fix view performances (#14209)

packages/twenty-server/src/engine/core-modules/view/dtos/view.dto.ts

@@ -4,6 +4,11 @@ import { IDField } from '@ptc-org/nestjs-query-graphql';
 
 import { AggregateOperations } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant';
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+import { ViewFieldDTO } from 'src/engine/core-modules/view/dtos/view-field.dto';
+import { ViewFilterGroupDTO } from 'src/engine/core-modules/view/dtos/view-filter-group.dto';
+import { ViewFilterDTO } from 'src/engine/core-modules/view/dtos/view-filter.dto';
+import { ViewGroupDTO } from 'src/engine/core-modules/view/dtos/view-group.dto';
+import { ViewSortDTO } from 'src/engine/core-modules/view/dtos/view-sort.dto';
 import { ViewKey } from 'src/engine/core-modules/view/enums/view-key.enum';
 import { ViewOpenRecordIn } from 'src/engine/core-modules/view/enums/view-open-record-in';
 import { ViewType } from 'src/engine/core-modules/view/enums/view-type.enum';
@@ -67,4 +72,19 @@ export class ViewDTO {
 
   @Field(() => Date, { nullable: true })
   deletedAt?: Date | null;
+
+  @Field(() => [ViewFieldDTO])
+  viewFields: ViewFieldDTO[];
+
+  @Field(() => [ViewFilterDTO])
+  viewFilters: ViewFilterDTO[];
+
+  @Field(() => [ViewFilterGroupDTO])
+  viewFilterGroups: ViewFilterGroupDTO[];
+
+  @Field(() => [ViewSortDTO])
+  viewSorts: ViewSortDTO[];
+
+  @Field(() => [ViewGroupDTO])
+  viewGroups: ViewGroupDTO[];
 }

packages/twenty-server/src/engine/core-modules/view/entities/view-field.entity.ts

@@ -20,6 +20,9 @@ import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/
 
 @Entity({ name: 'viewField', schema: 'core' })
 @Index('IDX_VIEW_FIELD_WORKSPACE_ID_VIEW_ID', ['workspaceId', 'viewId'])
+@Index('IDX_VIEW_FIELD_VIEW_ID', ['viewId'], {
+  where: '"deletedAt" IS NULL',
+})
 @Index(
   'IDX_VIEW_FIELD_FIELD_METADATA_ID_VIEW_ID_UNIQUE',
   ['fieldMetadataId', 'viewId'],

packages/twenty-server/src/engine/core-modules/view/entities/view-filter-group.entity.ts

@@ -21,6 +21,9 @@ import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 
 @Entity({ name: 'viewFilterGroup', schema: 'core' })
 @Index('IDX_VIEW_FILTER_GROUP_WORKSPACE_ID_VIEW_ID', ['workspaceId', 'viewId'])
+@Index('IDX_VIEW_FILTER_GROUP_VIEW_ID', ['viewId'], {
+  where: '"deletedAt" IS NULL',
+})
 export class ViewFilterGroupEntity extends SyncableEntity {
   @PrimaryGeneratedColumn('uuid')
   id: string;

packages/twenty-server/src/engine/core-modules/view/entities/view-filter.entity.ts

@@ -22,6 +22,9 @@ import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/
 
 @Entity({ name: 'viewFilter', schema: 'core' })
 @Index('IDX_VIEW_FILTER_WORKSPACE_ID_VIEW_ID', ['workspaceId', 'viewId'])
+@Index('IDX_VIEW_FILTER_VIEW_ID', ['viewId'], {
+  where: '"deletedAt" IS NULL',
+})
 @Index('IDX_VIEW_FILTER_FIELD_METADATA_ID', ['fieldMetadataId'])
 export class ViewFilterEntity extends SyncableEntity {
   @PrimaryGeneratedColumn('uuid')

packages/twenty-server/src/engine/core-modules/view/entities/view-group.entity.ts

@@ -19,6 +19,9 @@ import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/
 
 @Entity({ name: 'viewGroup', schema: 'core' })
 @Index('IDX_VIEW_GROUP_WORKSPACE_ID_VIEW_ID', ['workspaceId', 'viewId'])
+@Index('IDX_VIEW_GROUP_VIEW_ID', ['viewId'], {
+  where: '"deletedAt" IS NULL',
+})
 export class ViewGroupEntity extends SyncableEntity {
   @PrimaryGeneratedColumn('uuid')
   id: string;

packages/twenty-server/src/engine/core-modules/view/entities/view-sort.entity.ts

@@ -20,6 +20,9 @@ import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/
 
 @Entity({ name: 'viewSort', schema: 'core' })
 @Index('IDX_VIEW_SORT_WORKSPACE_ID_VIEW_ID', ['workspaceId', 'viewId'])
+@Index('IDX_VIEW_SORT_VIEW_ID', ['viewId'], {
+  where: '"deletedAt" IS NULL',
+})
 @Index(
   'IDX_VIEW_SORT_FIELD_METADATA_ID_VIEW_ID_UNIQUE',
   ['fieldMetadataId', 'viewId'],

packages/twenty-server/src/engine/core-modules/view/resolvers/view.resolver.ts

@@ -13,15 +13,9 @@ import { isDefined } from 'twenty-shared/utils';
 
 import { I18nService } from 'src/engine/core-modules/i18n/i18n.service';
 import { type I18nContext } from 'src/engine/core-modules/i18n/types/i18n-context.type';
-import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
 import { generateMessageId } from 'src/engine/core-modules/i18n/utils/generateMessageId';
 import { CreateViewInput } from 'src/engine/core-modules/view/dtos/inputs/create-view.input';
 import { UpdateViewInput } from 'src/engine/core-modules/view/dtos/inputs/update-view.input';
-import { ViewFieldDTO } from 'src/engine/core-modules/view/dtos/view-field.dto';
-import { ViewFilterGroupDTO } from 'src/engine/core-modules/view/dtos/view-filter-group.dto';
-import { ViewFilterDTO } from 'src/engine/core-modules/view/dtos/view-filter.dto';
-import { ViewGroupDTO } from 'src/engine/core-modules/view/dtos/view-group.dto';
-import { ViewSortDTO } from 'src/engine/core-modules/view/dtos/view-sort.dto';
 import { ViewDTO } from 'src/engine/core-modules/view/dtos/view.dto';
 import { ViewFieldService } from 'src/engine/core-modules/view/services/view-field.service';
 import { ViewFilterGroupService } from 'src/engine/core-modules/view/services/view-filter-group.service';
@@ -31,6 +25,7 @@ import { ViewSortService } from 'src/engine/core-modules/view/services/view-sort
 import { ViewService } from 'src/engine/core-modules/view/services/view.service';
 import { ViewGraphqlApiExceptionFilter } from 'src/engine/core-modules/view/utils/view-graphql-api-exception.filter';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
 import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
 import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { resolveObjectMetadataStandardOverride } from 'src/engine/metadata-modules/object-metadata/utils/resolve-object-metadata-standard-override.util';
@@ -168,44 +163,4 @@ export class ViewResolver {
 
     return isDefined(deletedView);
   }
-
-  @ResolveField(() => [ViewFieldDTO])
-  async viewFields(
-    @Parent() view: ViewDTO,
-    @AuthWorkspace() workspace: Workspace,
-  ) {
-    return this.viewFieldService.findByViewId(workspace.id, view.id);
-  }
-
-  @ResolveField(() => [ViewFilterDTO])
-  async viewFilters(
-    @Parent() view: ViewDTO,
-    @AuthWorkspace() workspace: Workspace,
-  ) {
-    return this.viewFilterService.findByViewId(workspace.id, view.id);
-  }
-
-  @ResolveField(() => [ViewFilterGroupDTO])
-  async viewFilterGroups(
-    @Parent() view: ViewDTO,
-    @AuthWorkspace() workspace: Workspace,
-  ) {
-    return this.viewFilterGroupService.findByViewId(workspace.id, view.id);
-  }
-
-  @ResolveField(() => [ViewSortDTO])
-  async viewSorts(
-    @Parent() view: ViewDTO,
-    @AuthWorkspace() workspace: Workspace,
-  ) {
-    return this.viewSortService.findByViewId(workspace.id, view.id);
-  }
-
-  @ResolveField(() => [ViewGroupDTO])
-  async viewGroups(
-    @Parent() view: ViewDTO,
-    @AuthWorkspace() workspace: Workspace,
-  ) {
-    return this.viewGroupService.findByViewId(workspace.id, view.id);
-  }
 }