The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Hard-delete views and their children instead of soft-deleting them (#26002)
Weikoec41fb60a01b
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex c0d653db309..a967348c167 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -4497,7 +4497,7 @@ input UpdateViewFieldGroupInputUpdates {name: Stringposition: FloatisVisible: Boolean- deletedAt: String+ deletedAt: String @deprecated(reason: "Ignored: view field groups are no longer soft-deleted. Use destroyViewFieldGroup instead.")}input CreateViewFieldGroupInput {diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 6ae9e310e13..737399e55ee 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -6553,7 +6553,6 @@ export type UpdateViewFieldGroupInput = {};export type UpdateViewFieldGroupInputUpdates = {- deletedAt?: InputMaybe<Scalars['String']['input']>;isVisible?: InputMaybe<Scalars['Boolean']['input']>;name?: InputMaybe<Scalars['String']['input']>;position?: InputMaybe<Scalars['Float']['input']>;diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/2-42-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/2-42-upgrade-version-command.module.tsindex 6dd4015bc87..44067d63baf 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/2-42-upgrade-version-command.module.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/2-42-upgrade-version-command.module.ts@@ -1,6 +1,7 @@import { BackfillWorkspaceWorkflowVersionIdCommand } from 'src/database/commands/upgrade-version-command/2-42/2-42-workspace-command-1789652804001-backfill-workspace-workflow-version-id.command';import { BackfillWorkflowExecutionCoreIdsCommand } from 'src/database/commands/upgrade-version-command/2-42/2-42-workspace-command-1789719131001-backfill-workflow-execution-core-ids.command';import { MakeWorkflowRunProjectionRelationsNullableCommand } from 'src/database/commands/upgrade-version-command/2-42/2-42-workspace-command-1789719131002-make-workflow-run-projection-relations-nullable.command';+import { PurgeSoftDeletedViewsCommand } from 'src/database/commands/upgrade-version-command/2-42/2-42-workspace-command-1789744500000-purge-soft-deleted-views.command';import { Module } from '@nestjs/common';import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/workspace-iterator.module';@@ -31,6 +32,7 @@ import { WorkspaceSchemaMigrationRunnerActionHandlersModule } from 'src/engine/wBackfillWorkflowExecutionCoreIdsCommand,MakeWorkflowRunProjectionRelationsNullableCommand,BackfillMissingSystemRelationIndexesCommand,+ PurgeSoftDeletedViewsCommand,],exports: [RelinkWorkflowVersionsToCoreWorkflowsCommand],})diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/2-42-workspace-command-1789744500000-purge-soft-deleted-views.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/2-42-workspace-command-1789744500000-purge-soft-deleted-views.command.tsnew file mode 100644index 00000000000..842d246b664--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-42/2-42-workspace-command-1789744500000-purge-soft-deleted-views.command.ts@@ -0,0 +1,310 @@+import { Command } from 'nest-commander';++import { ViewType } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';++import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';+import { ApplicationService } from 'src/engine/core-modules/application/application.service';+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';+import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';+import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';++@RegisteredWorkspaceCommand('2.42.0', 1789744500000)+@Command({+ name: 'upgrade:2-42:purge-soft-deleted-views',+ description:+ 'Hard-delete soft-deleted views, view fields, view field groups, view filters, view filter groups, view groups and view sorts',+})+export class PurgeSoftDeletedViewsCommand extends ProvisionedWorkspaceCommandRunner {+ constructor(+ protected readonly workspaceIteratorService: WorkspaceIteratorService,+ private readonly applicationService: ApplicationService,+ private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,+ private readonly workspaceCacheService: WorkspaceCacheService,+ ) {+ super(workspaceIteratorService);+ }++ override async runOnWorkspace({+ workspaceId,+ options,+ }: RunOnWorkspaceArgs): Promise<void> {+ const isDryRun = options.dryRun ?? false;++ const {+ flatObjectMetadataMaps,+ flatViewMaps,+ flatViewFieldMaps,+ flatViewFieldGroupMaps,+ flatViewFilterMaps,+ flatViewFilterGroupMaps,+ flatViewGroupMaps,+ flatViewSortMaps,+ } = await this.workspaceCacheService.getOrRecompute(workspaceId, [+ 'flatObjectMetadataMaps',+ 'flatViewMaps',+ 'flatViewFieldMaps',+ 'flatViewFieldGroupMaps',+ 'flatViewFilterMaps',+ 'flatViewFilterGroupMaps',+ 'flatViewGroupMaps',+ 'flatViewSortMaps',+ ]);++ const flatViews = Object.values(flatViewMaps.byUniversalIdentifier).filter(+ isDefined,+ );++ const objectMetadataIdsWithRemainingView = new Set(+ flatViews+ .filter((flatView) => !isDefined(flatView.deletedAt))+ .map((flatView) => flatView.objectMetadataId),+ );++ const softDeletedViews = flatViews.filter((flatView) =>+ isDefined(flatView.deletedAt),+ );++ const viewsToDelete = softDeletedViews.filter((flatView) =>+ objectMetadataIdsWithRemainingView.has(flatView.objectMetadataId),+ );++ const skippedViewCount = softDeletedViews.length - viewsToDelete.length;++ if (skippedViewCount > 0) {+ this.logger.warn(+ `Skipping ${skippedViewCount} soft-deleted view(s) that are the last view of their object in workspace ${workspaceId}`,+ );+ }++ const deletedViewIds = new Set(+ viewsToDelete.map((flatView) => flatView.id),+ );++ const isSoftDeletedOutsideDeletedView = (flatEntity: {+ deletedAt?: string | null;+ viewId: string;+ }) =>+ isDefined(flatEntity.deletedAt) && !deletedViewIds.has(flatEntity.viewId);++ const hasSoftDeletedViewFilterGroupInChain = (+ viewFilterGroupId: string | null | undefined,+ ): boolean => {+ const visitedViewFilterGroupIds = new Set<string>();+ let currentViewFilterGroupId = viewFilterGroupId;++ while (+ isDefined(currentViewFilterGroupId) &&+ !visitedViewFilterGroupIds.has(currentViewFilterGroupId)+ ) {+ visitedViewFilterGroupIds.add(currentViewFilterGroupId);++ const flatViewFilterGroup = findFlatEntityByIdInFlatEntityMaps({+ flatEntityId: currentViewFilterGroupId,+ flatEntityMaps: flatViewFilterGroupMaps,+ });++ if (!isDefined(flatViewFilterGroup)) {+ return false;+ }++ if (isDefined(flatViewFilterGroup.deletedAt)) {+ return true;+ }++ currentViewFilterGroupId = flatViewFilterGroup.parentViewFilterGroupId;+ }++ return false;+ };++ const remainingFlatViewById = new Map(+ flatViews+ .filter((flatView) => !deletedViewIds.has(flatView.id))+ .map((flatView) => [flatView.id, flatView]),+ );++ const flatViewFields = Object.values(+ flatViewFieldMaps.byUniversalIdentifier,+ ).filter(isDefined);++ const isOnlyLabelIdentifierViewFieldOfItsView = (+ flatViewField: (typeof flatViewFields)[number],+ ): boolean => {+ const flatView = remainingFlatViewById.get(flatViewField.viewId);++ if (!isDefined(flatView) || flatView.type === ViewType.FIELDS_WIDGET) {+ return false;+ }++ const flatObjectMetadata = findFlatEntityByIdInFlatEntityMaps({+ flatEntityId: flatView.objectMetadataId,+ flatEntityMaps: flatObjectMetadataMaps,+ });++ if (+ !isDefined(flatObjectMetadata) ||+ flatObjectMetadata.labelIdentifierFieldMetadataId !==+ flatViewField.fieldMetadataId+ ) {+ return false;+ }++ return !flatViewFields.some(+ (otherFlatViewField) =>+ otherFlatViewField.id !== flatViewField.id &&+ otherFlatViewField.viewId === flatViewField.viewId &&+ otherFlatViewField.fieldMetadataId ===+ flatViewField.fieldMetadataId &&+ !isDefined(otherFlatViewField.deletedAt),+ );+ };++ const softDeletedViewFields = flatViewFields.filter(+ isSoftDeletedOutsideDeletedView,+ );++ const viewFieldsToDelete = softDeletedViewFields.filter(+ (flatViewField) =>+ !isOnlyLabelIdentifierViewFieldOfItsView(flatViewField),+ );++ const skippedViewFieldCount =+ softDeletedViewFields.length - viewFieldsToDelete.length;++ if (skippedViewFieldCount > 0) {+ this.logger.warn(+ `Skipping ${skippedViewFieldCount} soft-deleted view field(s) that are the only label identifier view field of their view in workspace ${workspaceId}`,+ );+ }+ const viewFieldGroupsToDelete = Object.values(+ flatViewFieldGroupMaps.byUniversalIdentifier,+ )+ .filter(isDefined)+ .filter(isSoftDeletedOutsideDeletedView);+ const viewFilterGroupsToDelete = Object.values(+ flatViewFilterGroupMaps.byUniversalIdentifier,+ )+ .filter(isDefined)+ .filter(+ (flatViewFilterGroup) =>+ isSoftDeletedOutsideDeletedView(flatViewFilterGroup) &&+ !hasSoftDeletedViewFilterGroupInChain(+ flatViewFilterGroup.parentViewFilterGroupId,+ ),+ );+ const viewFiltersToDelete = Object.values(+ flatViewFilterMaps.byUniversalIdentifier,+ )+ .filter(isDefined)+ .filter(+ (flatViewFilter) =>+ isSoftDeletedOutsideDeletedView(flatViewFilter) &&+ !hasSoftDeletedViewFilterGroupInChain(+ flatViewFilter.viewFilterGroupId,+ ),+ );+ const viewGroupsToDelete = Object.values(+ flatViewGroupMaps.byUniversalIdentifier,+ )+ .filter(isDefined)+ .filter(isSoftDeletedOutsideDeletedView);+ const viewSortsToDelete = Object.values(+ flatViewSortMaps.byUniversalIdentifier,+ )+ .filter(isDefined)+ .filter(isSoftDeletedOutsideDeletedView);++ const rowToDeleteCount =+ viewsToDelete.length ++ viewFieldsToDelete.length ++ viewFieldGroupsToDelete.length ++ viewFilterGroupsToDelete.length ++ viewFiltersToDelete.length ++ viewGroupsToDelete.length ++ viewSortsToDelete.length;++ if (rowToDeleteCount === 0) {+ this.logger.log(+ `No soft-deleted view or view child to purge for workspace ${workspaceId}, skipping`,+ );++ return;+ }++ const purgeSummary = `${viewsToDelete.length} view(s), ${viewFieldsToDelete.length} view field(s), ${viewFieldGroupsToDelete.length} view field group(s), ${viewFiltersToDelete.length} view filter(s), ${viewFilterGroupsToDelete.length} view filter group(s), ${viewGroupsToDelete.length} view group(s) and ${viewSortsToDelete.length} view sort(s)`;++ this.logger.log(+ `${isDryRun ? '[DRY RUN] ' : ''}Purging ${purgeSummary} for workspace ${workspaceId}`,+ );++ if (isDryRun) {+ return;+ }++ const { workspaceCustomFlatApplication } =+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(+ { workspaceId },+ );++ // Purged rows can belong to any application; this is only the runner's existence gate and the+ // builder's dependency-slice anchor, not a scope filter. One bundled build also keeps children+ // deleted before their view, which one build per application would not guarantee.+ const validateAndBuildResult =+ await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(+ {+ isSystemBuild: true,+ applicationUniversalIdentifier:+ workspaceCustomFlatApplication.universalIdentifier,+ workspaceId,+ allFlatEntityOperationByMetadataName: {+ view: {+ flatEntityToCreate: [],+ flatEntityToDelete: viewsToDelete,+ flatEntityToUpdate: [],+ },+ viewFieldGroup: {+ flatEntityToCreate: [],+ flatEntityToDelete: viewFieldGroupsToDelete,+ flatEntityToUpdate: [],+ },+ viewField: {+ flatEntityToCreate: [],+ flatEntityToDelete: viewFieldsToDelete,+ flatEntityToUpdate: [],+ },+ viewFilterGroup: {+ flatEntityToCreate: [],+ flatEntityToDelete: viewFilterGroupsToDelete,+ flatEntityToUpdate: [],+ },+ viewFilter: {+ flatEntityToCreate: [],+ flatEntityToDelete: viewFiltersToDelete,+ flatEntityToUpdate: [],+ },+ viewGroup: {+ flatEntityToCreate: [],+ flatEntityToDelete: viewGroupsToDelete,+ flatEntityToUpdate: [],+ },+ viewSort: {+ flatEntityToCreate: [],+ flatEntityToDelete: viewSortsToDelete,+ flatEntityToUpdate: [],+ },+ },+ },+ );++ if (validateAndBuildResult.status === 'fail') {+ throw new WorkspaceMigrationBuilderException(validateAndBuildResult);+ }++ this.logger.log(`Purged ${purgeSummary} for workspace ${workspaceId}`);+ }+}diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view-field-group/constants/flat-view-field-group-editable-properties.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view-field-group/constants/flat-view-field-group-editable-properties.constant.tsindex 0f25d04b72c..1d4e7f6c0c6 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-view-field-group/constants/flat-view-field-group-editable-properties.constant.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-view-field-group/constants/flat-view-field-group-editable-properties.constant.ts@@ -4,5 +4,4 @@ export const FLAT_VIEW_FIELD_GROUP_EDITABLE_PROPERTIES = ['name','position','isVisible',- 'deletedAt',] as const satisfies MetadataEntityPropertyName<'viewFieldGroup'>[];diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view-field-group/utils/from-delete-view-field-group-input-to-flat-view-field-group-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view-field-group/utils/from-delete-view-field-group-input-to-flat-view-field-group-or-throw.util.tsdeleted file mode 100644index 4891b413867..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/flat-view-field-group/utils/from-delete-view-field-group-input-to-flat-view-field-group-or-throw.util.ts+++ /dev/null@@ -1,46 +0,0 @@-import { t } from '@lingui/core/macro';-import {- extractAndSanitizeObjectStringFields,- isDefined,-} from 'twenty-shared/utils';--import { type FlatViewFieldGroupMaps } from 'src/engine/metadata-modules/flat-view-field-group/types/flat-view-field-group-maps.type';-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';-import { type DeleteViewFieldGroupInput } from 'src/engine/metadata-modules/view-field-group/dtos/inputs/delete-view-field-group.input';-import {- ViewFieldGroupException,- ViewFieldGroupExceptionCode,-} from 'src/engine/metadata-modules/view-field-group/exceptions/view-field-group.exception';-import { type UniversalFlatViewFieldGroup } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-view-field-group.type';--export const fromDeleteViewFieldGroupInputToFlatViewFieldGroupOrThrow = ({- deleteViewFieldGroupInput: rawDeleteViewFieldGroupInput,- flatViewFieldGroupMaps,-}: {- deleteViewFieldGroupInput: DeleteViewFieldGroupInput;- flatViewFieldGroupMaps: FlatViewFieldGroupMaps;-}): UniversalFlatViewFieldGroup => {- const { id: viewFieldGroupId } = extractAndSanitizeObjectStringFields(- rawDeleteViewFieldGroupInput,- ['id'],- );-- const existingFlatViewFieldGroupToDelete = findFlatEntityByIdInFlatEntityMaps(- {- flatEntityId: viewFieldGroupId,- flatEntityMaps: flatViewFieldGroupMaps,- },- );-- if (!isDefined(existingFlatViewFieldGroupToDelete)) {- throw new ViewFieldGroupException(- t`View field group to delete not found`,- ViewFieldGroupExceptionCode.VIEW_FIELD_GROUP_NOT_FOUND,- );- }-- return {- ...existingFlatViewFieldGroupToDelete,- deletedAt: new Date().toISOString(),- };-};diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view-field/utils/from-delete-view-field-input-to-flat-view-field-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view-field/utils/from-delete-view-field-input-to-flat-view-field-or-throw.util.tsdeleted file mode 100644index 247a1001c39..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/flat-view-field/utils/from-delete-view-field-input-to-flat-view-field-or-throw.util.ts+++ /dev/null@@ -1,44 +0,0 @@-import { t } from '@lingui/core/macro';-import {- extractAndSanitizeObjectStringFields,- isDefined,-} from 'twenty-shared/utils';--import { type FlatViewFieldMaps } from 'src/engine/metadata-modules/flat-view-field/types/flat-view-field-maps.type';-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';-import { type DeleteViewFieldInput } from 'src/engine/metadata-modules/view-field/dtos/inputs/delete-view-field.input';-import {- ViewFieldException,- ViewFieldExceptionCode,-} from 'src/engine/metadata-modules/view-field/exceptions/view-field.exception';-import { type UniversalFlatViewField } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-view-field.type';--export const fromDeleteViewFieldInputToFlatViewFieldOrThrow = ({- deleteViewFieldInput: rawDeleteViewFieldInput,- flatViewFieldMaps,-}: {- deleteViewFieldInput: DeleteViewFieldInput;- flatViewFieldMaps: FlatViewFieldMaps;-}): UniversalFlatViewField => {- const { id: viewFieldId } = extractAndSanitizeObjectStringFields(- rawDeleteViewFieldInput,- ['id'],- );-- const existingFlatViewFieldToDelete = findFlatEntityByIdInFlatEntityMaps({- flatEntityId: viewFieldId,- flatEntityMaps: flatViewFieldMaps,- });-- if (!isDefined(existingFlatViewFieldToDelete)) {- throw new ViewFieldException(- t`View field to delete not found`,- ViewFieldExceptionCode.VIEW_FIELD_NOT_FOUND,- );- }-- return {- ...existingFlatViewFieldToDelete,- deletedAt: new Date().toISOString(),- };-};diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view-filter-group/utils/from-delete-view-filter-group-input-to-flat-view-filter-group-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view-filter-group/utils/from-delete-view-filter-group-input-to-flat-view-filter-group-or-throw.util.tsdeleted file mode 100644index 550f39a6b2d..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/flat-view-filter-group/utils/from-delete-view-filter-group-input-to-flat-view-filter-group-or-throw.util.ts+++ /dev/null@@ -1,44 +0,0 @@-import {- extractAndSanitizeObjectStringFields,- isDefined,-} from 'twenty-shared/utils';--import { type FlatViewFilterGroupMaps } from 'src/engine/metadata-modules/flat-view-filter-group/types/flat-view-filter-group-maps.type';-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';-import { type DeleteViewFilterGroupInput } from 'src/engine/metadata-modules/view-filter-group/dtos/inputs/delete-view-filter-group.input';-import {- ViewFilterGroupException,- ViewFilterGroupExceptionCode,-} from 'src/engine/metadata-modules/view-filter-group/exceptions/view-filter-group.exception';-import { type UniversalFlatViewFilterGroup } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-view-filter-group.type';--export const fromDeleteViewFilterGroupInputToFlatViewFilterGroupOrThrow = ({- deleteViewFilterGroupInput: rawDeleteViewFilterGroupInput,- flatViewFilterGroupMaps,-}: {- deleteViewFilterGroupInput: DeleteViewFilterGroupInput;- flatViewFilterGroupMaps: FlatViewFilterGroupMaps;-}): UniversalFlatViewFilterGroup => {- const { id: viewFilterGroupId } = extractAndSanitizeObjectStringFields(- rawDeleteViewFilterGroupInput,- ['id'],- );-- const existingFlatViewFilterGroupToDelete =- findFlatEntityByIdInFlatEntityMaps({- flatEntityId: viewFilterGroupId,- flatEntityMaps: flatViewFilterGroupMaps,- });-- if (!isDefined(existingFlatViewFilterGroupToDelete)) {- throw new ViewFilterGroupException(- 'View filter group not found',- ViewFilterGroupExceptionCode.VIEW_FILTER_GROUP_NOT_FOUND,- );- }-- return {- ...existingFlatViewFilterGroupToDelete,- deletedAt: new Date().toISOString(),- };-};diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view-filter/utils/from-delete-view-filter-input-to-flat-view-filter-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view-filter/utils/from-delete-view-filter-input-to-flat-view-filter-or-throw.util.tsdeleted file mode 100644index 80a61c01079..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/flat-view-filter/utils/from-delete-view-filter-input-to-flat-view-filter-or-throw.util.ts+++ /dev/null@@ -1,44 +0,0 @@-import { t } from '@lingui/core/macro';-import {- extractAndSanitizeObjectStringFields,- isDefined,-} from 'twenty-shared/utils';--import { type FlatViewFilterMaps } from 'src/engine/metadata-modules/flat-view-filter/types/flat-view-filter-maps.type';-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';-import { type DeleteViewFilterInput } from 'src/engine/metadata-modules/view-filter/dtos/inputs/delete-view-filter.input';-import {- ViewFilterException,- ViewFilterExceptionCode,-} from 'src/engine/metadata-modules/view-filter/exceptions/view-filter.exception';-import { type UniversalFlatViewFilter } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-view-filter.type';--export const fromDeleteViewFilterInputToFlatViewFilterOrThrow = ({- deleteViewFilterInput: rawDeleteViewFilterInput,- flatViewFilterMaps,-}: {- deleteViewFilterInput: DeleteViewFilterInput;- flatViewFilterMaps: FlatViewFilterMaps;-}): UniversalFlatViewFilter => {- const { id: viewFilterId } = extractAndSanitizeObjectStringFields(- rawDeleteViewFilterInput,- ['id'],- );-- const existingFlatViewFilterToDelete = findFlatEntityByIdInFlatEntityMaps({- flatEntityId: viewFilterId,- flatEntityMaps: flatViewFilterMaps,- });-- if (!isDefined(existingFlatViewFilterToDelete)) {- throw new ViewFilterException(- t`View filter to delete not found`,- ViewFilterExceptionCode.VIEW_FILTER_NOT_FOUND,- );- }-- return {- ...existingFlatViewFilterToDelete,- deletedAt: new Date().toISOString(),- };-};diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view-group/utils/from-delete-view-group-input-to-flat-view-group-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view-group/utils/from-delete-view-group-input-to-flat-view-group-or-throw.util.tsdeleted file mode 100644index 5a559500ffa..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/flat-view-group/utils/from-delete-view-group-input-to-flat-view-group-or-throw.util.ts+++ /dev/null@@ -1,44 +0,0 @@-import { t } from '@lingui/core/macro';-import {- extractAndSanitizeObjectStringFields,- isDefined,-} from 'twenty-shared/utils';--import { type FlatViewGroupMaps } from 'src/engine/metadata-modules/flat-view-group/types/flat-view-group-maps.type';-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';-import { type DeleteViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/delete-view-group.input';-import {- ViewGroupException,- ViewGroupExceptionCode,-} from 'src/engine/metadata-modules/view-group/exceptions/view-group.exception';-import { type UniversalFlatViewGroup } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-view-group.type';--export const fromDeleteViewGroupInputToFlatViewGroupOrThrow = ({- deleteViewGroupInput: rawDeleteViewGroupInput,- flatViewGroupMaps,-}: {- deleteViewGroupInput: DeleteViewGroupInput;- flatViewGroupMaps: FlatViewGroupMaps;-}): UniversalFlatViewGroup => {- const { id: viewGroupId } = extractAndSanitizeObjectStringFields(- rawDeleteViewGroupInput,- ['id'],- );-- const existingFlatViewGroupToDelete = findFlatEntityByIdInFlatEntityMaps({- flatEntityId: viewGroupId,- flatEntityMaps: flatViewGroupMaps,- });-- if (!isDefined(existingFlatViewGroupToDelete)) {- throw new ViewGroupException(- t`View group to delete not found`,- ViewGroupExceptionCode.VIEW_GROUP_NOT_FOUND,- );- }-- return {- ...existingFlatViewGroupToDelete,- deletedAt: new Date().toISOString(),- };-};diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view-sort/utils/from-delete-view-sort-input-to-flat-view-sort-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view-sort/utils/from-delete-view-sort-input-to-flat-view-sort-or-throw.util.tsdeleted file mode 100644index 954baf41479..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/flat-view-sort/utils/from-delete-view-sort-input-to-flat-view-sort-or-throw.util.ts+++ /dev/null@@ -1,44 +0,0 @@-import { t } from '@lingui/core/macro';-import {- extractAndSanitizeObjectStringFields,- isDefined,-} from 'twenty-shared/utils';--import { type FlatViewSortMaps } from 'src/engine/metadata-modules/flat-view-sort/types/flat-view-sort-maps.type';-import { type DeleteViewSortInput } from 'src/engine/metadata-modules/view-sort/dtos/inputs/delete-view-sort.input';-import {- ViewSortException,- ViewSortExceptionCode,-} from 'src/engine/metadata-modules/view-sort/exceptions/view-sort.exception';-import { type UniversalFlatViewSort } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-view-sort.type';-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';--export const fromDeleteViewSortInputToFlatViewSortOrThrow = ({- deleteViewSortInput: rawDeleteViewSortInput,- flatViewSortMaps,-}: {- deleteViewSortInput: DeleteViewSortInput;- flatViewSortMaps: FlatViewSortMaps;-}): UniversalFlatViewSort => {- const { id: viewSortId } = extractAndSanitizeObjectStringFields(- rawDeleteViewSortInput,- ['id'],- );-- const existingFlatViewSortToDelete = findFlatEntityByIdInFlatEntityMaps({- flatEntityId: viewSortId,- flatEntityMaps: flatViewSortMaps,- });-- if (!isDefined(existingFlatViewSortToDelete)) {- throw new ViewSortException(- t`View sort not found`,- ViewSortExceptionCode.VIEW_SORT_NOT_FOUND,- );- }-- return {- ...existingFlatViewSortToDelete,- deletedAt: new Date().toISOString(),- };-};diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-delete-view-input-to-flat-view-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-delete-view-input-to-flat-view-or-throw.util.tsdeleted file mode 100644index 82066baab18..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/from-delete-view-input-to-flat-view-or-throw.util.ts+++ /dev/null@@ -1,73 +0,0 @@-import { t } from '@lingui/core/macro';-import {- extractAndSanitizeObjectStringFields,- isDefined,-} from 'twenty-shared/utils';--import { type FlatViewMaps } from 'src/engine/metadata-modules/flat-view/types/flat-view-maps.type';-import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';-import { isCallerOverridingEntity } from 'src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util';-import { type DeleteViewInput } from 'src/engine/metadata-modules/view/dtos/inputs/delete-view.input';-import {- ViewException,- ViewExceptionCode,-} from 'src/engine/metadata-modules/view/exceptions/view.exception';-import { type UniversalFlatView } from 'src/engine/workspace-manager/workspace-migration/universal-flat-entity/types/universal-flat-view.type';-import { dispatchIsActiveUpdateToAuthoredOverride } from 'src/engine/metadata-modules/overrides/utils/dispatch-is-active-update-to-authored-override.util';--export const fromDeleteViewInputToFlatViewOrThrow = ({- deleteViewInput: rawDeleteViewInput,- flatViewMaps,- callerApplicationUniversalIdentifier,- workspaceCustomApplicationUniversalIdentifier,-}: {- deleteViewInput: DeleteViewInput;- flatViewMaps: FlatViewMaps;- callerApplicationUniversalIdentifier: string;- workspaceCustomApplicationUniversalIdentifier: string;-}): UniversalFlatView => {- const { id: viewId } = extractAndSanitizeObjectStringFields(- rawDeleteViewInput,- ['id'],- );-- const existingFlatViewToDelete = findFlatEntityByIdInFlatEntityMaps({- flatEntityId: viewId,- flatEntityMaps: flatViewMaps,- });-- if (!isDefined(existingFlatViewToDelete)) {- throw new ViewException(- t`View to delete not found`,- ViewExceptionCode.VIEW_NOT_FOUND,- );- }-- const now = new Date().toISOString();-- const shouldDeactivate = isCallerOverridingEntity({- callerApplicationUniversalIdentifier,- entityApplicationUniversalIdentifier:- existingFlatViewToDelete.applicationUniversalIdentifier,- workspaceCustomApplicationUniversalIdentifier,- isSystemSideEffect: existingFlatViewToDelete.isSystemSideEffect,- });-- if (shouldDeactivate) {- return {- ...dispatchIsActiveUpdateToAuthoredOverride({- metadataName: 'view',- flatEntity: existingFlatViewToDelete,- isActive: false,- authorUniversalIdentifier: callerApplicationUniversalIdentifier,- workspaceCustomApplicationUniversalIdentifier,- }),- updatedAt: now,- };- }-- return {- ...existingFlatViewToDelete,- deletedAt: now,- };-};diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field-group/dtos/inputs/update-view-field-group.input.ts b/packages/twenty-server/src/engine/metadata-modules/view-field-group/dtos/inputs/update-view-field-group.input.tsindex a503cdab68a..d98ebd0ba26 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-field-group/dtos/inputs/update-view-field-group.input.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-field-group/dtos/inputs/update-view-field-group.input.ts@@ -32,7 +32,11 @@ class UpdateViewFieldGroupInputUpdates {@IsOptional()@IsString()- @Field({ nullable: true })+ @Field({+ nullable: true,+ deprecationReason:+ 'Ignored: view field groups are no longer soft-deleted. Use destroyViewFieldGroup instead.',+ })deletedAt?: string;}diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field-group/services/view-field-group.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-field-group/services/view-field-group.service.tsindex b6272b97e28..2a64dc30aaf 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-field-group/services/view-field-group.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-field-group/services/view-field-group.service.ts@@ -8,7 +8,6 @@ import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';import { findManyFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-many-flat-entity-by-id-in-flat-entity-maps-or-throw.util';import { fromCreateViewFieldGroupInputToFlatViewFieldGroupToCreate } from 'src/engine/metadata-modules/flat-view-field-group/utils/from-create-view-field-group-input-to-flat-view-field-group-to-create.util';-import { fromDeleteViewFieldGroupInputToFlatViewFieldGroupOrThrow } from 'src/engine/metadata-modules/flat-view-field-group/utils/from-delete-view-field-group-input-to-flat-view-field-group-or-throw.util';import { fromDestroyViewFieldGroupInputToFlatViewFieldGroupOrThrow } from 'src/engine/metadata-modules/flat-view-field-group/utils/from-destroy-view-field-group-input-to-flat-view-field-group-or-throw.util';import { fromUpdateViewFieldGroupInputToFlatViewFieldGroupToUpdateOrThrow } from 'src/engine/metadata-modules/flat-view-field-group/utils/from-update-view-field-group-input-to-flat-view-field-group-to-update-or-throw.util';import { CreateViewFieldGroupInput } from 'src/engine/metadata-modules/view-field-group/dtos/inputs/create-view-field-group.input';@@ -207,68 +206,10 @@ export class ViewFieldGroupService {deleteViewFieldGroupInput: DeleteViewFieldGroupInput;workspaceId: string;}): Promise<ViewFieldGroupDTO> {- const { workspaceCustomFlatApplication } =- await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(- {- workspaceId,- },- );-- const { flatViewFieldGroupMaps: existingFlatViewFieldGroupMaps } =- await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatViewFieldGroupMaps'],- },- );-- const optimisticallyUpdatedFlatViewFieldGroupWithDeletedAt =- fromDeleteViewFieldGroupInputToFlatViewFieldGroupOrThrow({- flatViewFieldGroupMaps: existingFlatViewFieldGroupMaps,- deleteViewFieldGroupInput,- });-- const validateAndBuildResult =- await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(- {- allFlatEntityOperationByMetadataName: {- viewFieldGroup: {- flatEntityToCreate: [],- flatEntityToDelete: [],- flatEntityToUpdate: [- optimisticallyUpdatedFlatViewFieldGroupWithDeletedAt,- ],- },- },- workspaceId,- isSystemBuild: false,- applicationUniversalIdentifier:- workspaceCustomFlatApplication.universalIdentifier,- },- );-- if (validateAndBuildResult.status === 'fail') {- throw new WorkspaceMigrationBuilderException(- validateAndBuildResult,- 'Multiple validation errors occurred while deleting view field group',- );- }-- const { flatViewFieldGroupMaps: recomputedExistingFlatViewFieldGroupMaps } =- await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatViewFieldGroupMaps'],- },- );-- return fromFlatViewFieldGroupToViewFieldGroupDto(- findFlatEntityByUniversalIdentifierOrThrow({- universalIdentifier:- optimisticallyUpdatedFlatViewFieldGroupWithDeletedAt.universalIdentifier,- flatEntityMaps: recomputedExistingFlatViewFieldGroupMaps,- }),- );+ return this.destroyOne({+ destroyViewFieldGroupInput: deleteViewFieldGroupInput,+ workspaceId,+ });}async destroyOne({diff --git a/packages/twenty-server/src/engine/metadata-modules/view-field/services/view-field.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-field/services/view-field.service.tsindex 6f710f6d095..235dd2190c0 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-field/services/view-field.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-field/services/view-field.service.ts@@ -8,7 +8,6 @@ import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';import { findManyFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-many-flat-entity-by-id-in-flat-entity-maps-or-throw.util';import { fromCreateViewFieldInputToFlatViewFieldToCreate } from 'src/engine/metadata-modules/flat-view-field/utils/from-create-view-field-input-to-flat-view-field-to-create.util';-import { fromDeleteViewFieldInputToFlatViewFieldOrThrow } from 'src/engine/metadata-modules/flat-view-field/utils/from-delete-view-field-input-to-flat-view-field-or-throw.util';import { fromDestroyViewFieldInputToFlatViewFieldOrThrow } from 'src/engine/metadata-modules/flat-view-field/utils/from-destroy-view-field-input-to-flat-view-field-or-throw.util';import { fromUpdateViewFieldInputToFlatViewFieldToUpdateOrThrow } from 'src/engine/metadata-modules/flat-view-field/utils/from-update-view-field-input-to-flat-view-field-to-update-or-throw.util';import { CreateViewFieldInput } from 'src/engine/metadata-modules/view-field/dtos/inputs/create-view-field.input';@@ -216,66 +215,10 @@ export class ViewFieldService {deleteViewFieldInput: DeleteViewFieldInput;workspaceId: string;}): Promise<ViewFieldDTO> {- const { workspaceCustomFlatApplication } =- await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(- {- workspaceId,- },- );-- const { flatViewFieldMaps: existingFlatViewFieldMaps } =- await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatViewFieldMaps'],- },- );-- const optimisticallyUpdatedFlatViewWithDeletedAt =- fromDeleteViewFieldInputToFlatViewFieldOrThrow({- flatViewFieldMaps: existingFlatViewFieldMaps,- deleteViewFieldInput,- });-- const validateAndBuildResult =- await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(- {- allFlatEntityOperationByMetadataName: {- viewField: {- flatEntityToCreate: [],- flatEntityToDelete: [],- flatEntityToUpdate: [optimisticallyUpdatedFlatViewWithDeletedAt],- },- },- workspaceId,- isSystemBuild: false,- applicationUniversalIdentifier:- workspaceCustomFlatApplication.universalIdentifier,- },- );-- if (validateAndBuildResult.status === 'fail') {- throw new WorkspaceMigrationBuilderException(- validateAndBuildResult,- 'Multiple validation errors occurred while deleting view field',- );- }-- const { flatViewFieldMaps: recomputedExistingFlatViewFieldMaps } =- await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatViewFieldMaps'],- },- );-- return fromFlatViewFieldToViewFieldDto(- findFlatEntityByUniversalIdentifierOrThrow({- universalIdentifier:- optimisticallyUpdatedFlatViewWithDeletedAt.universalIdentifier,- flatEntityMaps: recomputedExistingFlatViewFieldMaps,- }),- );+ return this.destroyOne({+ destroyViewFieldInput: deleteViewFieldInput,+ workspaceId,+ });}async destroyOne({diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/view-filter-group.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/view-filter-group.service.tsindex 4c5046faf30..085b383201f 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/view-filter-group.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter-group/services/view-filter-group.service.ts@@ -7,7 +7,6 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadatimport { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';import { fromCreateViewFilterGroupInputToFlatViewFilterGroupToCreate } from 'src/engine/metadata-modules/flat-view-filter-group/utils/from-create-view-filter-group-input-to-flat-view-filter-group-to-create.util';-import { fromDeleteViewFilterGroupInputToFlatViewFilterGroupOrThrow } from 'src/engine/metadata-modules/flat-view-filter-group/utils/from-delete-view-filter-group-input-to-flat-view-filter-group-or-throw.util';import { fromDestroyViewFilterGroupInputToFlatViewFilterGroupOrThrow } from 'src/engine/metadata-modules/flat-view-filter-group/utils/from-destroy-view-filter-group-input-to-flat-view-filter-group-or-throw.util';import { fromUpdateViewFilterGroupInputToFlatViewFilterGroupToUpdateOrThrow } from 'src/engine/metadata-modules/flat-view-filter-group/utils/from-update-view-filter-group-input-to-flat-view-filter-group-to-update-or-throw.util';import { type CreateViewFilterGroupInput } from 'src/engine/metadata-modules/view-filter-group/dtos/inputs/create-view-filter-group.input';@@ -187,70 +186,10 @@ export class ViewFilterGroupService {deleteViewFilterGroupInput: DeleteViewFilterGroupInput;workspaceId: string;}): Promise<ViewFilterGroupDTO> {- const { workspaceCustomFlatApplication } =- await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(- {- workspaceId,- },- );-- const { flatViewFilterGroupMaps: existingFlatViewFilterGroupMaps } =- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatViewFilterGroupMaps'],- },- );-- const optimisticallyUpdatedFlatViewFilterGroupWithDeletedAt =- fromDeleteViewFilterGroupInputToFlatViewFilterGroupOrThrow({- flatViewFilterGroupMaps: existingFlatViewFilterGroupMaps,- deleteViewFilterGroupInput,- });-- const validateAndBuildResult =- await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(- {- allFlatEntityOperationByMetadataName: {- viewFilterGroup: {- flatEntityToCreate: [],- flatEntityToDelete: [],- flatEntityToUpdate: [- optimisticallyUpdatedFlatViewFilterGroupWithDeletedAt,- ],- },- },- workspaceId,- isSystemBuild: false,- applicationUniversalIdentifier:- workspaceCustomFlatApplication.universalIdentifier,- },- );-- if (validateAndBuildResult.status === 'fail') {- throw new WorkspaceMigrationBuilderException(- validateAndBuildResult,- 'Multiple validation errors occurred while deleting view filter group',- );- }-- const {- flatViewFilterGroupMaps: recomputedExistingFlatViewFilterGroupMaps,- } =- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatViewFilterGroupMaps'],- },- );-- return fromFlatViewFilterGroupToViewFilterGroupDto(- findFlatEntityByUniversalIdentifierOrThrow({- universalIdentifier:- optimisticallyUpdatedFlatViewFilterGroupWithDeletedAt.universalIdentifier,- flatEntityMaps: recomputedExistingFlatViewFilterGroupMaps,- }),- );+ return this.destroyOne({+ destroyViewFilterGroupInput: deleteViewFilterGroupInput,+ workspaceId,+ });}async destroyOne({diff --git a/packages/twenty-server/src/engine/metadata-modules/view-filter/services/view-filter.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-filter/services/view-filter.service.tsindex 56825669cc9..a1ae2808c48 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-filter/services/view-filter.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-filter/services/view-filter.service.ts@@ -8,7 +8,6 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadatimport { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';import { fromCreateViewFilterInputToFlatViewFilterToCreate } from 'src/engine/metadata-modules/flat-view-filter/utils/from-create-view-filter-input-to-flat-view-filter-to-create.util';-import { fromDeleteViewFilterInputToFlatViewFilterOrThrow } from 'src/engine/metadata-modules/flat-view-filter/utils/from-delete-view-filter-input-to-flat-view-filter-or-throw.util';import { fromDestroyViewFilterInputToFlatViewFilterOrThrow } from 'src/engine/metadata-modules/flat-view-filter/utils/from-destroy-view-filter-input-to-flat-view-filter-or-throw.util';import { fromUpdateViewFilterInputToFlatViewFilterToUpdateOrThrow } from 'src/engine/metadata-modules/flat-view-filter/utils/from-update-view-filter-input-to-flat-view-filter-to-update-or-throw.util';import { type MetadataCursorPage } from 'src/engine/metadata-modules/pagination/types/metadata-cursor-page.type';@@ -196,68 +195,10 @@ export class ViewFilterService {deleteViewFilterInput: DeleteViewFilterInput;workspaceId: string;}): Promise<ViewFilterDTO> {- const { workspaceCustomFlatApplication } =- await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(- {- workspaceId,- },- );-- const { flatViewFilterMaps: existingFlatViewFilterMaps } =- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatViewFilterMaps'],- },- );-- const optimisticallyUpdatedFlatViewFilterWithDeletedAt =- fromDeleteViewFilterInputToFlatViewFilterOrThrow({- flatViewFilterMaps: existingFlatViewFilterMaps,- deleteViewFilterInput,- });-- const validateAndBuildResult =- await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(- {- allFlatEntityOperationByMetadataName: {- viewFilter: {- flatEntityToCreate: [],- flatEntityToDelete: [],- flatEntityToUpdate: [- optimisticallyUpdatedFlatViewFilterWithDeletedAt,- ],- },- },- workspaceId,- isSystemBuild: false,- applicationUniversalIdentifier:- workspaceCustomFlatApplication.universalIdentifier,- },- );-- if (validateAndBuildResult.status === 'fail') {- throw new WorkspaceMigrationBuilderException(- validateAndBuildResult,- 'Multiple validation errors occurred while deleting view filter',- );- }-- const { flatViewFilterMaps: recomputedExistingFlatViewFilterMaps } =- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatViewFilterMaps'],- },- );-- return fromFlatViewFilterToViewFilterDto(- findFlatEntityByUniversalIdentifierOrThrow({- universalIdentifier:- optimisticallyUpdatedFlatViewFilterWithDeletedAt.universalIdentifier,- flatEntityMaps: recomputedExistingFlatViewFilterMaps,- }),- );+ return this.destroyOne({+ destroyViewFilterInput: deleteViewFilterInput,+ workspaceId,+ });}async destroyOne({diff --git a/packages/twenty-server/src/engine/metadata-modules/view-group/services/view-group.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-group/services/view-group.service.tsindex 02db9a6691f..5d1324b74ec 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-group/services/view-group.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-group/services/view-group.service.ts@@ -10,7 +10,6 @@ import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-mimport { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';import { findManyFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-many-flat-entity-by-id-in-flat-entity-maps-or-throw.util';import { fromCreateViewGroupInputToFlatViewGroupToCreate } from 'src/engine/metadata-modules/flat-view-group/utils/from-create-view-group-input-to-flat-view-group-to-create.util';-import { fromDeleteViewGroupInputToFlatViewGroupOrThrow } from 'src/engine/metadata-modules/flat-view-group/utils/from-delete-view-group-input-to-flat-view-group-or-throw.util';import { fromDestroyViewGroupInputToFlatViewGroupOrThrow } from 'src/engine/metadata-modules/flat-view-group/utils/from-destroy-view-group-input-to-flat-view-group-or-throw.util';import { fromUpdateViewGroupInputToFlatViewGroupToUpdateOrThrow } from 'src/engine/metadata-modules/flat-view-group/utils/from-update-view-group-input-to-flat-view-group-to-update-or-throw.util';import { CreateViewGroupInput } from 'src/engine/metadata-modules/view-group/dtos/inputs/create-view-group.input';@@ -252,68 +251,10 @@ export class ViewGroupService {deleteViewGroupInput: DeleteViewGroupInput;workspaceId: string;}): Promise<ViewGroupDTO> {- const { workspaceCustomFlatApplication } =- await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(- {- workspaceId,- },- );-- const { flatViewGroupMaps: existingFlatViewGroupMaps } =- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatViewGroupMaps'],- },- );-- const optimisticallyUpdatedFlatViewGroupWithDeletedAt =- fromDeleteViewGroupInputToFlatViewGroupOrThrow({- flatViewGroupMaps: existingFlatViewGroupMaps,- deleteViewGroupInput,- });-- const validateAndBuildResult =- await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(- {- allFlatEntityOperationByMetadataName: {- viewGroup: {- flatEntityToCreate: [],- flatEntityToDelete: [],- flatEntityToUpdate: [- optimisticallyUpdatedFlatViewGroupWithDeletedAt,- ],- },- },- workspaceId,- isSystemBuild: false,- applicationUniversalIdentifier:- workspaceCustomFlatApplication.universalIdentifier,- },- );-- if (validateAndBuildResult.status === 'fail') {- throw new WorkspaceMigrationBuilderException(- validateAndBuildResult,- 'Multiple validation errors occurred while deleting view group',- );- }-- const { flatViewGroupMaps: recomputedExistingFlatViewGroupMaps } =- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatViewGroupMaps'],- },- );-- return fromFlatViewGroupToViewGroupDto(- findFlatEntityByUniversalIdentifierOrThrow({- universalIdentifier:- optimisticallyUpdatedFlatViewGroupWithDeletedAt.universalIdentifier,- flatEntityMaps: recomputedExistingFlatViewGroupMaps,- }),- );+ return this.destroyOne({+ destroyViewGroupInput: deleteViewGroupInput,+ workspaceId,+ });}async destroyOne({diff --git a/packages/twenty-server/src/engine/metadata-modules/view-sort/services/view-sort.service.ts b/packages/twenty-server/src/engine/metadata-modules/view-sort/services/view-sort.service.tsindex 7cf799f3a9b..809ae4d2601 100644--- a/packages/twenty-server/src/engine/metadata-modules/view-sort/services/view-sort.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view-sort/services/view-sort.service.ts@@ -7,7 +7,6 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadatimport { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-universal-identifier-or-throw.util';import { fromCreateViewSortInputToFlatViewSortToCreate } from 'src/engine/metadata-modules/flat-view-sort/utils/from-create-view-sort-input-to-flat-view-sort-to-create.util';-import { fromDeleteViewSortInputToFlatViewSortOrThrow } from 'src/engine/metadata-modules/flat-view-sort/utils/from-delete-view-sort-input-to-flat-view-sort-or-throw.util';import { fromDestroyViewSortInputToFlatViewSortOrThrow } from 'src/engine/metadata-modules/flat-view-sort/utils/from-destroy-view-sort-input-to-flat-view-sort-or-throw.util';import { fromUpdateViewSortInputToFlatViewSortToUpdateOrThrow } from 'src/engine/metadata-modules/flat-view-sort/utils/from-update-view-sort-input-to-flat-view-sort-to-update-or-throw.util';import { CreateViewSortInput } from 'src/engine/metadata-modules/view-sort/dtos/inputs/create-view-sort.input';@@ -177,68 +176,10 @@ export class ViewSortService {deleteViewSortInput: DeleteViewSortInput;workspaceId: string;}): Promise<ViewSortDTO> {- const { workspaceCustomFlatApplication } =- await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(- {- workspaceId,- },- );-- const { flatViewSortMaps: existingFlatViewSortMaps } =- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatViewSortMaps'],- },- );-- const optimisticallyUpdatedFlatViewSortWithDeletedAt =- fromDeleteViewSortInputToFlatViewSortOrThrow({- flatViewSortMaps: existingFlatViewSortMaps,- deleteViewSortInput,- });-- const validateAndBuildResult =- await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(- {- allFlatEntityOperationByMetadataName: {- viewSort: {- flatEntityToCreate: [],- flatEntityToDelete: [],- flatEntityToUpdate: [- optimisticallyUpdatedFlatViewSortWithDeletedAt,- ],- },- },- workspaceId,- isSystemBuild: false,- applicationUniversalIdentifier:- workspaceCustomFlatApplication.universalIdentifier,- },- );-- if (validateAndBuildResult.status === 'fail') {- throw new WorkspaceMigrationBuilderException(- validateAndBuildResult,- 'Multiple validation errors occurred while deleting view sort',- );- }-- const { flatViewSortMaps: recomputedExistingFlatViewSortMaps } =- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatViewSortMaps'],- },- );-- return fromFlatViewSortToViewSortDto(- findFlatEntityByUniversalIdentifierOrThrow({- universalIdentifier:- optimisticallyUpdatedFlatViewSortWithDeletedAt.universalIdentifier,- flatEntityMaps: recomputedExistingFlatViewSortMaps,- }),- );+ return this.destroyOne({+ destroyViewSortInput: deleteViewSortInput,+ workspaceId,+ });}async destroyOne({diff --git a/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts b/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.tsindex 26c90b31d5a..edcec49aca1 100644--- a/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/view/services/view.service.ts@@ -13,7 +13,6 @@ import { findFlatEntityByUniversalIdentifierOrThrow } from 'src/engine/metadata-import { findManyFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-many-flat-entity-by-id-in-flat-entity-maps.util';import { type FlatView } from 'src/engine/metadata-modules/flat-view/types/flat-view.type';import { fromCreateViewInputToFlatViewToCreate } from 'src/engine/metadata-modules/flat-view/utils/from-create-view-input-to-flat-view-to-create.util';-import { fromDeleteViewInputToFlatViewOrThrow } from 'src/engine/metadata-modules/flat-view/utils/from-delete-view-input-to-flat-view-or-throw.util';import { fromDestroyViewInputToFlatViewOrThrow } from 'src/engine/metadata-modules/flat-view/utils/from-destroy-view-input-to-flat-view-or-throw.util';import { fromUpdateViewInputToFlatViewToUpdateOrThrow } from 'src/engine/metadata-modules/flat-view/utils/from-update-view-input-to-flat-view-to-update-or-throw.util';import { isCallerOverridingEntity } from 'src/engine/metadata-modules/overrides/utils/is-caller-overriding-entity.util';@@ -229,69 +228,10 @@ export class ViewService {deleteViewInput: DeleteViewInput;workspaceId: string;}): Promise<ViewDTO> {- const { workspaceCustomFlatApplication } =- await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(- {- workspaceId,- },- );-- const { flatViewMaps: existingFlatViewMaps } =- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatViewMaps'],- },- );-- const optimisticallyUpdatedFlatViewWithDeletedAt =- fromDeleteViewInputToFlatViewOrThrow({- deleteViewInput,- flatViewMaps: existingFlatViewMaps,- callerApplicationUniversalIdentifier:- workspaceCustomFlatApplication.universalIdentifier,- workspaceCustomApplicationUniversalIdentifier:- workspaceCustomFlatApplication.universalIdentifier,- });-- const validateAndBuildResult =- await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(- {- allFlatEntityOperationByMetadataName: {- view: {- flatEntityToCreate: [],- flatEntityToDelete: [],- flatEntityToUpdate: [optimisticallyUpdatedFlatViewWithDeletedAt],- },- },- workspaceId,- isSystemBuild: false,- applicationUniversalIdentifier:- workspaceCustomFlatApplication.universalIdentifier,- },- );-- if (validateAndBuildResult.status === 'fail') {- throw new WorkspaceMigrationBuilderException(- validateAndBuildResult,- 'Multiple validation errors occurred while deleting view',- );- }-- const { flatViewMaps: recomputedExistingFlatViewMaps } =- await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(- {- workspaceId,- flatMapsKeys: ['flatViewMaps'],- },- );-- return fromFlatViewToViewDto(- findFlatEntityByIdInFlatEntityMapsOrThrow({- flatEntityId: deleteViewInput.id,- flatEntityMaps: recomputedExistingFlatViewMaps,- }),- );+ return this.destroyOne({+ destroyViewInput: deleteViewInput,+ workspaceId,+ });}async destroyOne({diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-label-identifier-field-metadata-id-flat-view-field.util.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-label-identifier-field-metadata-id-flat-view-field.util.tsindex cfa0de53983..cc0fd69e0e4 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-label-identifier-field-metadata-id-flat-view-field.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-builder/validators/utils/validate-label-identifier-field-metadata-id-flat-view-field.util.ts@@ -1,5 +1,4 @@import { msg, t } from '@lingui/core/macro';-import { isDefined } from 'twenty-shared/utils';import { isViewFieldInLowestPosition } from 'src/engine/metadata-modules/flat-view-field/utils/is-view-field-in-lowest-position.util';import { ViewExceptionCode } from 'src/engine/metadata-modules/view/exceptions/view.exception';@@ -38,13 +37,5 @@ export const validateLabelIdentifierFieldMetadataIdFlatViewField = ({});}- if (isDefined(flatViewFieldToValidate.deletedAt)) {- errors.push({- code: ViewExceptionCode.INVALID_VIEW_DATA,- message: t`Label identifier view field cannot be deleted`,- userFriendlyMessage: msg`Label identifier view field cannot be deleted`,- });- }-return errors;};diff --git a/packages/twenty-server/test/integration/graphql/suites/view/__snapshots__/delete-view.integration-spec.ts.snap b/packages/twenty-server/test/integration/graphql/suites/view/__snapshots__/delete-view.integration-spec.ts.snapindex 6b6a0badc4b..ed6be3fdeae 100644--- a/packages/twenty-server/test/integration/graphql/suites/view/__snapshots__/delete-view.integration-spec.ts.snap+++ b/packages/twenty-server/test/integration/graphql/suites/view/__snapshots__/delete-view.integration-spec.ts.snap@@ -6,7 +6,7 @@ exports[`Delete core view should throw an error when deleting non-existent view"code": "NOT_FOUND","userFriendlyMessage": "An error occurred.",},- "message": "View to delete not found",+ "message": "View to destroy not found","name": "NotFoundError",}`;diff --git a/packages/twenty-server/test/integration/graphql/suites/view/__snapshots__/view-filter-resolver.integration-spec.ts.snap b/packages/twenty-server/test/integration/graphql/suites/view/__snapshots__/view-filter-resolver.integration-spec.ts.snapindex 88723dc61f4..9c9d85b8186 100644--- a/packages/twenty-server/test/integration/graphql/suites/view/__snapshots__/view-filter-resolver.integration-spec.ts.snap+++ b/packages/twenty-server/test/integration/graphql/suites/view/__snapshots__/view-filter-resolver.integration-spec.ts.snap@@ -41,7 +41,7 @@ exports[`View Filter Resolver deleteViewFilter should throw an error when deleti"code": "NOT_FOUND","userFriendlyMessage": "An error occurred.",},- "message": "View filter to delete not found",+ "message": "View filter to destroy not found","name": "NotFoundError",}`;diff --git a/packages/twenty-server/test/integration/graphql/suites/view/__snapshots__/view-group-resolver.integration-spec.ts.snap b/packages/twenty-server/test/integration/graphql/suites/view/__snapshots__/view-group-resolver.integration-spec.ts.snapindex 816b64303fd..ed9969047cc 100644--- a/packages/twenty-server/test/integration/graphql/suites/view/__snapshots__/view-group-resolver.integration-spec.ts.snap+++ b/packages/twenty-server/test/integration/graphql/suites/view/__snapshots__/view-group-resolver.integration-spec.ts.snap@@ -6,7 +6,7 @@ exports[`View Group Resolver deleteViewGroup should throw an error when deleting"code": "NOT_FOUND","userFriendlyMessage": "An error occurred.",},- "message": "View group to delete not found",+ "message": "View group to destroy not found","name": "NotFoundError",}`;diff --git a/packages/twenty-server/test/integration/graphql/suites/view/destroy-view.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/view/destroy-view.integration-spec.tsindex df245cc1425..1aa90020726 100644--- a/packages/twenty-server/test/integration/graphql/suites/view/destroy-view.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/view/destroy-view.integration-spec.ts@@ -3,7 +3,6 @@ import { createOneObjectMetadata } from 'test/integration/metadata/suites/objectimport { deleteOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/delete-one-object-metadata.util';import { updateOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata.util';import { createOneView } from 'test/integration/metadata/suites/view/utils/create-one-view.util';-import { deleteOneView } from 'test/integration/metadata/suites/view/utils/delete-one-view.util';import { destroyOneView } from 'test/integration/metadata/suites/view/utils/destroy-one-view.util';import { findOneView } from 'test/integration/metadata/suites/view/utils/find-one-view.util';@@ -59,14 +58,6 @@ describe('Destroy core view', () => {expectToFail: false,});- const { data: deleteData, errors: deleteErrors } = await deleteOneView({- viewId: view.id,- expectToFail: false,- });-- expect(deleteErrors).toBeUndefined();- expect(deleteData.deleteView).toBe(true);-const { data: destroyData, errors: destroyErrors } = await destroyOneView({viewId: view.id,expectToFail: false,diff --git a/packages/twenty-server/test/integration/graphql/suites/view/view-field-group/__snapshots__/failing-delete-view-field-group.integration-spec.ts.snap b/packages/twenty-server/test/integration/graphql/suites/view/view-field-group/__snapshots__/failing-delete-view-field-group.integration-spec.ts.snapindex 8234ce2bafb..c5437353a05 100644--- a/packages/twenty-server/test/integration/graphql/suites/view/view-field-group/__snapshots__/failing-delete-view-field-group.integration-spec.ts.snap+++ b/packages/twenty-server/test/integration/graphql/suites/view/view-field-group/__snapshots__/failing-delete-view-field-group.integration-spec.ts.snap@@ -7,6 +7,6 @@ exports[`View Field Group Resolver - Failing Delete Operation should fail to del"exceptionEventId": Any<String>,"userFriendlyMessage": "A view field group error occurred.",},- "message": "View field group to delete not found",+ "message": "View field group to destroy not found",}`;diff --git a/packages/twenty-server/test/integration/graphql/suites/view/view-field-group/successful-create-many-view-field-groups.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/view/view-field-group/successful-create-many-view-field-groups.integration-spec.tsindex 0ebb8c142ec..3e1ee3a1533 100644--- a/packages/twenty-server/test/integration/graphql/suites/view/view-field-group/successful-create-many-view-field-groups.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/view/view-field-group/successful-create-many-view-field-groups.integration-spec.ts@@ -3,7 +3,6 @@ import { deleteOneObjectMetadata } from 'test/integration/metadata/suites/objectimport { updateOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata.util';import { createManyViewFieldGroups } from 'test/integration/metadata/suites/view-field-group/utils/create-many-view-field-groups.util';import { deleteOneViewFieldGroup } from 'test/integration/metadata/suites/view-field-group/utils/delete-one-view-field-group.util';-import { destroyOneViewFieldGroup } from 'test/integration/metadata/suites/view-field-group/utils/destroy-one-view-field-group.util';import { createOneView } from 'test/integration/metadata/suites/view/utils/create-one-view.util';import { isDefined } from 'twenty-shared/utils';@@ -79,12 +78,6 @@ describe('View Field Group Resolver - Successful Create Many Operations', () =>});expect(deleteViewFieldGroup.deletedAt).not.toBeNull();- await destroyOneViewFieldGroup({- expectToFail: false,- input: {- id: viewFieldGroupId,- },- });}}createdViewFieldGroupIds = [];diff --git a/packages/twenty-server/test/integration/graphql/suites/view/view-field-group/successful-create-view-field-group.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/view/view-field-group/successful-create-view-field-group.integration-spec.tsindex 78830ea16e7..6267ff3fb18 100644--- a/packages/twenty-server/test/integration/graphql/suites/view/view-field-group/successful-create-view-field-group.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/view/view-field-group/successful-create-view-field-group.integration-spec.ts@@ -5,7 +5,6 @@ import {} from 'test/integration/graphql/suites/view/utils/setup-view-field-group-test.util';import { createOneViewFieldGroup } from 'test/integration/metadata/suites/view-field-group/utils/create-one-view-field-group.util';import { deleteOneViewFieldGroup } from 'test/integration/metadata/suites/view-field-group/utils/delete-one-view-field-group.util';-import { destroyOneViewFieldGroup } from 'test/integration/metadata/suites/view-field-group/utils/destroy-one-view-field-group.util';import { assertViewFieldGroupStructure } from 'test/integration/utils/view-test.util';import {type EachTestingContext,@@ -47,12 +46,6 @@ describe('View Field Group Resolver - Successful Create Operations', () => {});expect(deleteViewFieldGroup.deletedAt).not.toBeNull();- await destroyOneViewFieldGroup({- expectToFail: false,- input: {- id: createdViewFieldGroupId,- },- });createdViewFieldGroupId = undefined;}});diff --git a/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/failing-delete-view-field.integration-spec.ts.snap b/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/failing-delete-view-field.integration-spec.ts.snapindex 9575b17b6be..208be2a5e7b 100644--- a/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/failing-delete-view-field.integration-spec.ts.snap+++ b/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/failing-delete-view-field.integration-spec.ts.snap@@ -6,7 +6,7 @@ exports[`View Field Resolver - Failing Delete Operation should fail to delete vi"code": "NOT_FOUND","userFriendlyMessage": "An error occurred.",},- "message": "View field to delete not found",+ "message": "View field to destroy not found","name": "NotFoundError",}`;diff --git a/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/object-identifier-update-side-effect-on-view-field.integration-spec.ts.snap b/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/object-identifier-update-side-effect-on-view-field.integration-spec.ts.snapindex 91074906d75..f7287f7b107 100644--- a/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/object-identifier-update-side-effect-on-view-field.integration-spec.ts.snap+++ b/packages/twenty-server/test/integration/graphql/suites/view/view-field/__snapshots__/object-identifier-update-side-effect-on-view-field.integration-spec.ts.snap@@ -57,8 +57,7 @@ exports[`View Field Resolver - Successful object metadata identifier update side"viewUniversalIdentifier": Any<String>,},"metadataName": "viewField",- "status": "fail",- "type": "update",+ "type": "delete",},],},diff --git a/packages/twenty-server/test/integration/graphql/suites/view/view-field/failing-create-view-field.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/view/view-field/failing-create-view-field.integration-spec.tsindex cfc8fea0d10..53aa607a7a1 100644--- a/packages/twenty-server/test/integration/graphql/suites/view/view-field/failing-create-view-field.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/view/view-field/failing-create-view-field.integration-spec.ts@@ -6,7 +6,6 @@ import {} from 'test/integration/graphql/suites/view/utils/setup-view-field-test.util';import { createOneViewField } from 'test/integration/metadata/suites/view-field/utils/create-one-view-field.util';import { deleteOneViewField } from 'test/integration/metadata/suites/view-field/utils/delete-one-view-field.util';-import { destroyOneViewField } from 'test/integration/metadata/suites/view-field/utils/destroy-one-view-field.util';import { findViewFields } from 'test/integration/metadata/suites/view-field/utils/find-view-fields.util';import { extractRecordIdsAndDatesAsExpectAny } from 'test/utils/extract-record-ids-and-dates-as-expect-any';import {@@ -42,13 +41,6 @@ describe('View Field Resolver - Failing Create Operation', () => {},expectToFail: false,});-- await destroyOneViewField({- input: {- id: viewFieldId,- },- expectToFail: false,- });}});diff --git a/packages/twenty-server/test/integration/graphql/suites/view/view-field/successful-create-many-view-fields.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/view/view-field/successful-create-many-view-fields.integration-spec.tsindex 45623ecda9a..29127ded4b8 100644--- a/packages/twenty-server/test/integration/graphql/suites/view/view-field/successful-create-many-view-fields.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/view/view-field/successful-create-many-view-fields.integration-spec.ts@@ -4,7 +4,6 @@ import { deleteOneObjectMetadata } from 'test/integration/metadata/suites/objectimport { updateOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata.util';import { createManyViewFields } from 'test/integration/metadata/suites/view-field/utils/create-many-view-fields.util';import { deleteOneViewField } from 'test/integration/metadata/suites/view-field/utils/delete-one-view-field.util';-import { destroyOneViewField } from 'test/integration/metadata/suites/view-field/utils/destroy-one-view-field.util';import { createOneView } from 'test/integration/metadata/suites/view/utils/create-one-view.util';import { FieldMetadataType } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -150,12 +149,6 @@ describe('View Field Resolver - Successful Create Many Operations', () => {});expect(deleteViewField.deletedAt).not.toBeNull();- await destroyOneViewField({- expectToFail: false,- input: {- id: viewFieldId,- },- });}}createdViewFieldIds = [];diff --git a/packages/twenty-server/test/integration/graphql/suites/view/view-field/successful-create-view-field.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/view/view-field/successful-create-view-field.integration-spec.tsindex 36899c913c3..c2406cb8dd1 100644--- a/packages/twenty-server/test/integration/graphql/suites/view/view-field/successful-create-view-field.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/view/view-field/successful-create-view-field.integration-spec.ts@@ -5,7 +5,6 @@ import {} from 'test/integration/graphql/suites/view/utils/setup-view-field-test.util';import { createOneViewField } from 'test/integration/metadata/suites/view-field/utils/create-one-view-field.util';import { deleteOneViewField } from 'test/integration/metadata/suites/view-field/utils/delete-one-view-field.util';-import { destroyOneViewField } from 'test/integration/metadata/suites/view-field/utils/destroy-one-view-field.util';import { assertViewFieldStructure } from 'test/integration/utils/view-test.util';import {type EachTestingContext,@@ -45,12 +44,6 @@ describe('View Field Resolver - Successful Create Operations', () => {});expect(deleteViewField.deletedAt).not.toBeNull();- await destroyOneViewField({- expectToFail: false,- input: {- id: createdViewFieldId,- },- });createdViewFieldId = undefined;}});diff --git a/packages/twenty-server/test/integration/graphql/suites/view/view-filter-resolver.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/view/view-filter-resolver.integration-spec.tsindex c7832781765..9c53d0ba53d 100644--- a/packages/twenty-server/test/integration/graphql/suites/view/view-filter-resolver.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/view/view-filter-resolver.integration-spec.ts@@ -270,7 +270,13 @@ describe('View Filter Resolver', () => {expect(data.deleteViewFilter).toMatchObject({id: viewFilterId,});- expect(data.deleteViewFilter.deletedAt).toBeDefined();++ const { data: findData } = await findViewFilters({+ viewId: testViewId,+ expectToFail: false,+ });++ expect(findData.getViewFilters).toEqual([]);});it('should throw an error when deleting non-existent view filter', async () => {@@ -297,12 +303,6 @@ describe('View Filter Resolver', () => {const viewFilterId = createData.createViewFilter.id;- await deleteOneViewFilter({- input: {- id: viewFilterId,- },- expectToFail: false,- });const { data, errors } = await destroyOneViewFilter({input: { id: viewFilterId },expectToFail: false,diff --git a/packages/twenty-server/test/integration/graphql/suites/view/view-group-resolver.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/view/view-group-resolver.integration-spec.tsindex 5d16e92b838..1bbac389323 100644--- a/packages/twenty-server/test/integration/graphql/suites/view/view-group-resolver.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/view/view-group-resolver.integration-spec.ts@@ -7,6 +7,7 @@ import { updateOneObjectMetadata } from 'test/integration/metadata/suites/objectimport { createOneViewGroup } from 'test/integration/metadata/suites/view-group/utils/create-one-view-group.util';import { deleteOneViewGroup } from 'test/integration/metadata/suites/view-group/utils/delete-one-view-group.util';import { destroyOneViewGroup } from 'test/integration/metadata/suites/view-group/utils/destroy-one-view-group.util';+import { findViewGroups } from 'test/integration/metadata/suites/view-group/utils/find-view-groups.util';import { updateOneViewGroup } from 'test/integration/metadata/suites/view-group/utils/update-one-view-group.util';import { destroyOneView } from 'test/integration/metadata/suites/view/utils/destroy-one-view.util';import { assertViewGroupStructure } from 'test/integration/utils/view-test.util';@@ -189,7 +190,15 @@ describe('View Group Resolver', () => {expect(data.deleteViewGroup).toMatchObject({id: viewGroup.id,});- expect(data.deleteViewGroup.deletedAt).toBeDefined();++ const { data: findData } = await findViewGroups({+ viewId: testViewId,+ expectToFail: false,+ });++ expect(+ findData.getViewGroups.map((existingViewGroup) => existingViewGroup.id),+ ).not.toContain(viewGroup.id);});it('should throw an error when deleting non-existent view group', async () => {@@ -217,13 +226,6 @@ describe('View Group Resolver', () => {});const viewGroup = createData.createViewGroup;- await deleteOneViewGroup({- input: {- id: viewGroup.id,- },- expectToFail: false,- });-const { data } = await destroyOneViewGroup({expectToFail: false,input: {diff --git a/packages/twenty-server/test/integration/graphql/suites/view/view-group/successful-create-many-view-groups-v2.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/view/view-group/successful-create-many-view-groups-v2.integration-spec.tsindex 2b622301d09..f01503b3820 100644--- a/packages/twenty-server/test/integration/graphql/suites/view/view-group/successful-create-many-view-groups-v2.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/view/view-group/successful-create-many-view-groups-v2.integration-spec.ts@@ -5,7 +5,6 @@ import { deleteOneObjectMetadata } from 'test/integration/metadata/suites/objectimport { updateOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata.util';import { createManyViewGroups } from 'test/integration/metadata/suites/view-group/utils/create-many-view-groups.util';import { deleteOneViewGroup } from 'test/integration/metadata/suites/view-group/utils/delete-one-view-group.util';-import { destroyOneViewGroup } from 'test/integration/metadata/suites/view-group/utils/destroy-one-view-group.util';import { createOneView } from 'test/integration/metadata/suites/view/utils/create-one-view.util';import { FieldMetadataType } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -159,12 +158,6 @@ describe('View Group Resolver - Successful Create Many Operations - v2', () => {});expect(deleteViewGroup.deletedAt).not.toBeNull();- await destroyOneViewGroup({- expectToFail: false,- input: {- id: viewGroupId,- },- });}}createdViewGroupIds = [];diff --git a/packages/twenty-server/test/integration/graphql/suites/view/view-group/successful-update-many-view-groups-v2.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/view/view-group/successful-update-many-view-groups-v2.integration-spec.tsindex 02450ff6b1b..a5c0ea60577 100644--- a/packages/twenty-server/test/integration/graphql/suites/view/view-group/successful-update-many-view-groups-v2.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/view/view-group/successful-update-many-view-groups-v2.integration-spec.ts@@ -4,7 +4,6 @@ import { deleteOneObjectMetadata } from 'test/integration/metadata/suites/objectimport { updateOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata.util';import { createManyViewGroups } from 'test/integration/metadata/suites/view-group/utils/create-many-view-groups.util';import { deleteOneViewGroup } from 'test/integration/metadata/suites/view-group/utils/delete-one-view-group.util';-import { destroyOneViewGroup } from 'test/integration/metadata/suites/view-group/utils/destroy-one-view-group.util';import { updateManyViewGroups } from 'test/integration/metadata/suites/view-group/utils/update-many-view-groups.util';import { createOneView } from 'test/integration/metadata/suites/view/utils/create-one-view.util';import { isDefined } from 'twenty-shared/utils';@@ -89,12 +88,6 @@ describe('View Group Resolver - Successful Update Many Operations - v2', () => {});expect(deleteViewGroup.deletedAt).not.toBeNull();- await destroyOneViewGroup({- expectToFail: false,- input: {- id: viewGroupId,- },- });}}createdViewGroupIds = [];diff --git a/packages/twenty-server/test/integration/metadata/suites/view-filter-group/successful-view-filter-group-deletion.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/view-filter-group/successful-view-filter-group-deletion.integration-spec.tsindex 3dde8c044b4..7e05200c4ce 100644--- a/packages/twenty-server/test/integration/metadata/suites/view-filter-group/successful-view-filter-group-deletion.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/view-filter-group/successful-view-filter-group-deletion.integration-spec.ts@@ -53,7 +53,7 @@ describe('View Filter Group deletion should succeed', () => {}});- it('should soft delete a view filter group', async () => {+ it('should delete a view filter group', async () => {const { data: createData } = await createOneViewFilterGroup({expectToFail: false,input: {@@ -71,9 +71,11 @@ describe('View Filter Group deletion should succeed', () => {expect(deleteData.deleteViewFilterGroup).toBe(true);- await destroyOneViewFilterGroup({- expectToFail: false,+ const { errors: destroyErrors } = await destroyOneViewFilterGroup({+ expectToFail: true,id: createdViewFilterGroupId,});++ expect(destroyErrors).toBeDefined();});});diff --git a/packages/twenty-server/test/integration/metadata/suites/view-sort/successful-view-sort-deletion.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/view-sort/successful-view-sort-deletion.integration-spec.tsindex 2c3b9a235ea..0e0b802adc9 100644--- a/packages/twenty-server/test/integration/metadata/suites/view-sort/successful-view-sort-deletion.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/view-sort/successful-view-sort-deletion.integration-spec.ts@@ -8,9 +8,11 @@ import { destroyOneViewSort } from 'test/integration/metadata/suites/view-sort/uimport { createOneView } from 'test/integration/metadata/suites/view/utils/create-one-view.util';import { destroyOneView } from 'test/integration/metadata/suites/view/utils/destroy-one-view.util';import { jestExpectToBeDefined } from 'test/utils/jest-expect-to-be-defined.util.test';-import { FieldMetadataType, ViewType } from 'twenty-shared/types';--import { ViewSortDirection } from 'twenty-shared/types';+import {+ FieldMetadataType,+ ViewSortDirection,+ ViewType,+} from 'twenty-shared/types';describe('View Sort deletion should succeed', () => {let testObjectMetadataId: string;@@ -85,7 +87,7 @@ describe('View Sort deletion should succeed', () => {});});- it('should soft delete a view sort', async () => {+ it('should delete a view sort', async () => {const { data: createData } = await createOneViewSort({expectToFail: false,input: {@@ -106,9 +108,11 @@ describe('View Sort deletion should succeed', () => {expect(deleteData.deleteViewSort).toBe(true);- await destroyOneViewSort({- expectToFail: false,+ const { errors: destroyErrors } = await destroyOneViewSort({+ expectToFail: true,input: { id: viewSortId },});++ expect(destroyErrors).toBeDefined();});});diff --git a/packages/twenty-server/test/integration/rest/suites/view-field.integration-spec.ts b/packages/twenty-server/test/integration/rest/suites/view-field.integration-spec.tsindex 6c654f9c4ce..6090ab54d19 100644--- a/packages/twenty-server/test/integration/rest/suites/view-field.integration-spec.ts+++ b/packages/twenty-server/test/integration/rest/suites/view-field.integration-spec.ts@@ -328,6 +328,7 @@ describe('View Field REST API', () => {assertRestApiSuccessfulResponse(deleteResponse);expect(deleteResponse.body.success).toBe(true);+ testViewFieldId = undefined;const getResponse = await makeRestAPIRequest({method: 'get',diff --git a/packages/twenty-server/test/integration/rest/suites/view-filter.integration-spec.ts b/packages/twenty-server/test/integration/rest/suites/view-filter.integration-spec.tsindex 2f9d2e6fca9..28b7bab7992 100644--- a/packages/twenty-server/test/integration/rest/suites/view-filter.integration-spec.ts+++ b/packages/twenty-server/test/integration/rest/suites/view-filter.integration-spec.ts@@ -328,6 +328,7 @@ describe('View Filter REST API', () => {assertRestApiSuccessfulResponse(deleteResponse);expect(deleteResponse.body.success).toBe(true);+ testViewFilterId = undefined;const getResponse = await makeRestAPIRequest({method: 'get',diff --git a/packages/twenty-server/test/integration/rest/suites/view-group.integration-spec.ts b/packages/twenty-server/test/integration/rest/suites/view-group.integration-spec.tsindex 874c244cfd5..d368ad1e9aa 100644--- a/packages/twenty-server/test/integration/rest/suites/view-group.integration-spec.ts+++ b/packages/twenty-server/test/integration/rest/suites/view-group.integration-spec.ts@@ -397,6 +397,7 @@ describe('View Group REST API', () => {assertRestApiSuccessfulResponse(deleteResponse);expect(deleteResponse.body).toEqual({ success: true });+ testViewGroupId = undefined;});it('should return 404 for non-existent view group', async () => {@@ -409,15 +410,13 @@ describe('View Group REST API', () => {assertRestApiErrorNotFoundResponse(response);});- it('should return success even when group is already deleted', async () => {+ it('should return 404 when the view group is already deleted', async () => {const viewGroup = await createTestViewGroupWithRestApi({viewId: testViewId,fieldMetadataId: testFieldMetadataId,fieldValue: 'double-delete-test',});- testViewGroupId = viewGroup.id;-const deleteResponse = await makeRestAPIRequest({method: 'delete',path: `/metadata/viewGroups/${viewGroup.id}`,@@ -426,13 +425,13 @@ describe('View Group REST API', () => {assertRestApiSuccessfulResponse(deleteResponse);- const deleteResponse2 = await makeRestAPIRequest({+ const secondDeleteResponse = await makeRestAPIRequest({method: 'delete',path: `/metadata/viewGroups/${viewGroup.id}`,bearer: APPLE_JANE_ADMIN_ACCESS_TOKEN,});- assertRestApiSuccessfulResponse(deleteResponse2);+ assertRestApiErrorNotFoundResponse(secondDeleteResponse);});});});diff --git a/packages/twenty-server/test/integration/rest/suites/view.integration-spec.ts b/packages/twenty-server/test/integration/rest/suites/view.integration-spec.tsindex 36294ebf50d..8c1c8240e04 100644--- a/packages/twenty-server/test/integration/rest/suites/view.integration-spec.ts+++ b/packages/twenty-server/test/integration/rest/suites/view.integration-spec.ts@@ -278,6 +278,7 @@ describe('View REST API', () => {assertRestApiSuccessfulResponse(deleteResponse);expect(deleteResponse.body.success).toBe(true);+ testViewId = undefined;const getResponse = await makeRestAPIRequest({method: 'get',diff --git a/packages/twenty-server/test/integration/upgrade/suites/2-42-workspace-command-1789744500000-purge-soft-deleted-views.integration-spec.ts b/packages/twenty-server/test/integration/upgrade/suites/2-42-workspace-command-1789744500000-purge-soft-deleted-views.integration-spec.tsnew file mode 100644index 00000000000..87a6bcb269c--- /dev/null+++ b/packages/twenty-server/test/integration/upgrade/suites/2-42-workspace-command-1789744500000-purge-soft-deleted-views.integration-spec.ts@@ -0,0 +1,399 @@+import { type EntityClassOrSchema } from '@nestjs/typeorm/dist/interfaces/entity-class-or-schema.type';+import { createOneFieldMetadata } from 'test/integration/metadata/suites/field-metadata/utils/create-one-field-metadata.util';+import { createOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/create-one-object-metadata.util';+import { deleteOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/delete-one-object-metadata.util';+import { updateOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/update-one-object-metadata.util';+import { createOneViewField } from 'test/integration/metadata/suites/view-field/utils/create-one-view-field.util';+import { createOneViewFilterGroup } from 'test/integration/metadata/suites/view-filter-group/utils/create-one-view-filter-group.util';+import { createOneViewFilter } from 'test/integration/metadata/suites/view-filter/utils/create-one-view-filter.util';+import { createOneViewSort } from 'test/integration/metadata/suites/view-sort/utils/create-one-view-sort.util';+import { createOneView } from 'test/integration/metadata/suites/view/utils/create-one-view.util';+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';+import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';+import {+ FieldMetadataType,+ ViewFilterGroupLogicalOperator,+ ViewFilterOperand,+ ViewSortDirection,+} from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';+import { In } from 'typeorm';++import { type PurgeSoftDeletedViewsCommand } from 'src/database/commands/upgrade-version-command/2-42/2-42-workspace-command-1789744500000-purge-soft-deleted-views.command';+import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';+import { ViewFieldEntity } from 'src/engine/metadata-modules/view-field/entities/view-field.entity';+import { ViewFilterGroupEntity } from 'src/engine/metadata-modules/view-filter-group/entities/view-filter-group.entity';+import { ViewFilterEntity } from 'src/engine/metadata-modules/view-filter/entities/view-filter.entity';+import { ViewSortEntity } from 'src/engine/metadata-modules/view-sort/entities/view-sort.entity';+import { ViewEntity } from 'src/engine/metadata-modules/view/entities/view.entity';+import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';+import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';+import { type WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';+import { TWENTY_STANDARD_APPLICATION } from 'src/engine/workspace-manager/twenty-standard-application/constants/twenty-standard-applications';++const authContext = buildSystemAuthContext(SEED_APPLE_WORKSPACE_ID);++const RUN_ON_WORKSPACE_ARGS = {+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ options: {},+ index: 0,+ total: 1,+};++const findRemainingIds = async (+ target: EntityClassOrSchema,+ ids: string[],+): Promise<string[]> => {+ const rows = await getCoreRepository<{ id: string }>(target).find({+ where: { id: In(ids) },+ withDeleted: true,+ });++ return rows.map(({ id }) => id).sort();+};++describe('2-42 workspace command 1789744500000 - PurgeSoftDeletedViewsCommand (integration)', () => {+ let command: PurgeSoftDeletedViewsCommand;+ let workspaceOrmManager: WorkspaceOrmManager;+ let objectMetadataId: string;+ let lastViewObjectMetadataId: string;+ let keptViewId: string;+ let purgedViewId: string;+ let lastViewIds: string[];+ let labelIdentifierViewFieldId: string;+ let softDeletedViewFieldId: string;+ let keptViewFilterId: string;+ let softDeletedViewFilterId: string;+ let nestedViewFilterId: string;+ let purgedViewFilterId: string;+ let softDeletedViewFilterGroupId: string;+ let softDeletedViewSortId: string;+ let twentyStandardApplicationId: string;++ const runCommand = (options: { dryRun?: boolean } = {}) =>+ workspaceOrmManager.executeInWorkspaceContext(+ () => command.runOnWorkspace({ ...RUN_ON_WORKSPACE_ARGS, options }),+ authContext,+ );++ beforeAll(async () => {+ command = getAppProviderByClassName<PurgeSoftDeletedViewsCommand>(+ 'PurgeSoftDeletedViewsCommand',+ );+ workspaceOrmManager = getAppProviderByClassName<WorkspaceOrmManager>(+ 'WorkspaceOrmManager',+ );++ const {+ data: {+ createOneObject: {+ id: createdObjectMetadataId,+ labelIdentifierFieldMetadataId,+ },+ },+ } = await createOneObjectMetadata({+ expectToFail: false,+ input: {+ nameSingular: 'purgeViewsObject',+ namePlural: 'purgeViewsObjects',+ labelSingular: 'Purge Views Object',+ labelPlural: 'Purge Views Objects',+ icon: 'IconEye',+ },+ gqlFields: 'id labelIdentifierFieldMetadataId',+ });++ if (!isDefined(labelIdentifierFieldMetadataId)) {+ throw new Error('purgeViewsObject has no label identifier field');+ }++ objectMetadataId = createdObjectMetadataId;++ const {+ data: {+ createOneObject: { id: createdLastViewObjectMetadataId },+ },+ } = await createOneObjectMetadata({+ expectToFail: false,+ input: {+ nameSingular: 'purgeLastViewObject',+ namePlural: 'purgeLastViewObjects',+ labelSingular: 'Purge Last View Object',+ labelPlural: 'Purge Last View Objects',+ icon: 'IconEye',+ },+ });++ lastViewObjectMetadataId = createdLastViewObjectMetadataId;++ const {+ data: {+ createOneField: { id: fieldMetadataId },+ },+ } = await createOneFieldMetadata({+ expectToFail: false,+ input: {+ name: 'purgeViewsField',+ label: 'Purge Views Field',+ type: FieldMetadataType.TEXT,+ objectMetadataId,+ isLabelSyncedWithName: true,+ },+ gqlFields: 'id',+ });++ const {+ data: { createView: keptView },+ } = await createOneView({+ expectToFail: false,+ input: {+ name: 'Kept view',+ objectMetadataId,+ icon: 'IconList',+ },+ });++ const {+ data: { createView: purgedView },+ } = await createOneView({+ expectToFail: false,+ input: {+ name: 'Purged view',+ objectMetadataId,+ icon: 'IconList',+ },+ });++ keptViewId = keptView.id;+ purgedViewId = purgedView.id;++ const {+ data: { createViewField: labelIdentifierViewField },+ } = await createOneViewField({+ expectToFail: false,+ input: {+ viewId: keptViewId,+ fieldMetadataId: labelIdentifierFieldMetadataId,+ position: 0,+ isVisible: true,+ },+ gqlFields: 'id',+ });++ labelIdentifierViewFieldId = labelIdentifierViewField.id;++ const {+ data: { createViewField: softDeletedViewField },+ } = await createOneViewField({+ expectToFail: false,+ input: {+ viewId: keptViewId,+ fieldMetadataId,+ position: 1,+ isVisible: true,+ },+ gqlFields: 'id',+ });++ softDeletedViewFieldId = softDeletedViewField.id;++ const {+ data: { createViewFilterGroup: viewFilterGroup },+ } = await createOneViewFilterGroup({+ expectToFail: false,+ input: {+ viewId: keptViewId,+ logicalOperator: ViewFilterGroupLogicalOperator.AND,+ },+ });++ softDeletedViewFilterGroupId = viewFilterGroup.id;++ const createViewFilter = async ({+ viewId,+ viewFilterGroupId,+ }: {+ viewId: string;+ viewFilterGroupId?: string;+ }) => {+ const {+ data: { createViewFilter: viewFilter },+ } = await createOneViewFilter({+ expectToFail: false,+ input: {+ fieldMetadataId,+ viewId,+ operand: ViewFilterOperand.CONTAINS,+ value: 'purge',+ viewFilterGroupId,+ },+ });++ return viewFilter.id;+ };++ keptViewFilterId = await createViewFilter({ viewId: keptViewId });+ softDeletedViewFilterId = await createViewFilter({ viewId: keptViewId });+ nestedViewFilterId = await createViewFilter({+ viewId: keptViewId,+ viewFilterGroupId: softDeletedViewFilterGroupId,+ });+ purgedViewFilterId = await createViewFilter({ viewId: purgedViewId });++ const {+ data: { createViewSort: viewSort },+ } = await createOneViewSort({+ expectToFail: false,+ input: {+ viewId: keptViewId,+ fieldMetadataId,+ direction: ViewSortDirection.ASC,+ },+ });++ softDeletedViewSortId = viewSort.id;++ const lastViews = await getCoreRepository<ViewEntity>(ViewEntity).find({+ where: { objectMetadataId: lastViewObjectMetadataId },+ });++ expect(lastViews.length).toBeGreaterThan(0);++ lastViewIds = lastViews.map(({ id }) => id).sort();++ const twentyStandardApplication =+ await getCoreRepository<ApplicationEntity>(+ ApplicationEntity,+ ).findOneOrFail({+ where: {+ universalIdentifier: TWENTY_STANDARD_APPLICATION.universalIdentifier,+ workspaceId: SEED_APPLE_WORKSPACE_ID,+ },+ });++ twentyStandardApplicationId = twentyStandardApplication.id;++ await getCoreRepository<ViewEntity>(ViewEntity).update(+ { id: purgedViewId },+ { applicationId: twentyStandardApplicationId },+ );++ await getCoreRepository<ViewEntity>(ViewEntity).softDelete({+ id: In([purgedViewId, ...lastViewIds]),+ });+ await getCoreRepository<ViewFieldEntity>(ViewFieldEntity).softDelete({+ id: In([labelIdentifierViewFieldId, softDeletedViewFieldId]),+ });+ await getCoreRepository<ViewFilterEntity>(ViewFilterEntity).softDelete({+ id: softDeletedViewFilterId,+ });+ await getCoreRepository<ViewFilterGroupEntity>(+ ViewFilterGroupEntity,+ ).softDelete({ id: softDeletedViewFilterGroupId });+ await getCoreRepository<ViewSortEntity>(ViewSortEntity).softDelete({+ id: softDeletedViewSortId,+ });++ await getAppProviderByClassName<WorkspaceCacheService>(+ 'WorkspaceCacheService',+ ).invalidateAndRecompute(SEED_APPLE_WORKSPACE_ID, [+ 'flatViewMaps',+ 'flatViewFieldMaps',+ 'flatViewFilterMaps',+ 'flatViewFilterGroupMaps',+ 'flatViewSortMaps',+ ]);+ });++ afterAll(async () => {+ for (const objectMetadataIdToDelete of [+ objectMetadataId,+ lastViewObjectMetadataId,+ ]) {+ await updateOneObjectMetadata({+ expectToFail: false,+ input: {+ idToUpdate: objectMetadataIdToDelete,+ updatePayload: { isActive: false },+ },+ });+ await deleteOneObjectMetadata({+ expectToFail: false,+ input: { idToDelete: objectMetadataIdToDelete },+ });+ }+ });++ it('keeps every soft-deleted row on a dry run', async () => {+ await runCommand({ dryRun: true });++ expect(+ await findRemainingIds(ViewEntity, [purgedViewId, ...lastViewIds]),+ ).toEqual([purgedViewId, ...lastViewIds].sort());+ expect(+ await findRemainingIds(ViewFieldEntity, [+ labelIdentifierViewFieldId,+ softDeletedViewFieldId,+ ]),+ ).toEqual([labelIdentifierViewFieldId, softDeletedViewFieldId].sort());+ expect(+ await findRemainingIds(ViewFilterEntity, [+ softDeletedViewFilterId,+ nestedViewFilterId,+ purgedViewFilterId,+ ]),+ ).toEqual(+ [softDeletedViewFilterId, nestedViewFilterId, purgedViewFilterId].sort(),+ );+ expect(+ await findRemainingIds(ViewFilterGroupEntity, [+ softDeletedViewFilterGroupId,+ ]),+ ).toEqual([softDeletedViewFilterGroupId]);+ expect(+ await findRemainingIds(ViewSortEntity, [softDeletedViewSortId]),+ ).toEqual([softDeletedViewSortId]);+ });++ it('hard-deletes soft-deleted views and children along with the rows under them, including a view owned by another application, skips the last views of an object and the only label identifier view field of a live view, and is a no-op on a second run', async () => {+ const purgedViewBeforeRun = await getCoreRepository<ViewEntity>(+ ViewEntity,+ ).findOneOrFail({ where: { id: purgedViewId }, withDeleted: true });++ expect(purgedViewBeforeRun.applicationId).toBe(twentyStandardApplicationId);++ await runCommand();+ await runCommand();++ expect(+ await findRemainingIds(ViewEntity, [+ keptViewId,+ purgedViewId,+ ...lastViewIds,+ ]),+ ).toEqual([keptViewId, ...lastViewIds].sort());+ expect(+ await findRemainingIds(ViewFieldEntity, [+ labelIdentifierViewFieldId,+ softDeletedViewFieldId,+ ]),+ ).toEqual([labelIdentifierViewFieldId]);+ expect(+ await findRemainingIds(ViewFilterEntity, [+ keptViewFilterId,+ softDeletedViewFilterId,+ nestedViewFilterId,+ purgedViewFilterId,+ ]),+ ).toEqual([keptViewFilterId]);+ expect(+ await findRemainingIds(ViewFilterGroupEntity, [+ softDeletedViewFilterGroupId,+ ]),+ ).toEqual([]);+ expect(+ await findRemainingIds(ViewSortEntity, [softDeletedViewSortId]),+ ).toEqual([]);+ });+});