Add applicationId to syncableEntity and fix syncApp deletion (#15170)

## Context - All flatEntity should extend SyncableEntity - SyncableEntity should now have applicationId and application relation - Fix syncApp deletion, should now properly use migration v2 to delete syncable entities
2025-10-17 17:23:00 +00:00
parent 84e7fabaab
commit cceeb6ed4d
79 changed files with 734 additions and 271 deletions
@@ -15,20 +15,26 @@ import {
  ServerlessFunctionManifest,
  ServerlessFunctionTriggerManifest,
 } from 'src/engine/core-modules/application/types/application.types';
+import { ApplicationVariableService } from 'src/engine/core-modules/applicationVariable/application-variable.service';
 import { AgentService } from 'src/engine/metadata-modules/agent/agent.service';
 import { CronTriggerV2Service } from 'src/engine/metadata-modules/cron-trigger/services/cron-trigger-v2.service';
 import { FlatCronTrigger } from 'src/engine/metadata-modules/cron-trigger/types/flat-cron-trigger.type';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { DatabaseEventTriggerV2Service } from 'src/engine/metadata-modules/database-event-trigger/services/database-event-trigger-v2.service';
 import { FlatDatabaseEventTrigger } from 'src/engine/metadata-modules/database-event-trigger/types/flat-database-event-trigger.type';
+import { ALL_METADATA_NAME } from 'src/engine/metadata-modules/flat-entity/constant/all-metadata-name.constant';
+import { EMPTY_FLAT_ENTITY_MAPS } from 'src/engine/metadata-modules/flat-entity/constant/empty-flat-entity-maps.constant';
 import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
+import { AllMetadataName } from 'src/engine/metadata-modules/flat-entity/types/all-metadata-name.type';
+import { getFlatEntitiesByApplicationId } from 'src/engine/metadata-modules/flat-entity/utils/get-flat-entities-by-application-id.util';
+import { getSubFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/get-sub-flat-entity-maps-or-throw.util';
 import { ObjectMetadataServiceV2 } from 'src/engine/metadata-modules/object-metadata/object-metadata-v2.service';
 import { RouteTriggerV2Service } from 'src/engine/metadata-modules/route-trigger/services/route-trigger-v2.service';
 import { FlatRouteTrigger } from 'src/engine/metadata-modules/route-trigger/types/flat-route-trigger.type';
 import { ServerlessFunctionLayerService } from 'src/engine/metadata-modules/serverless-function-layer/serverless-function-layer.service';
 import { ServerlessFunctionV2Service } from 'src/engine/metadata-modules/serverless-function/services/serverless-function-v2.service';
 import { FlatServerlessFunction } from 'src/engine/metadata-modules/serverless-function/types/flat-serverless-function.type';
-import { ApplicationVariableService } from 'src/engine/core-modules/applicationVariable/application-variable.service';
+import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration-v2/services/workspace-migration-validate-build-and-run-service';

@Injectable()
 export class ApplicationSyncService {
@@ -46,6 +52,7 @@ export class ApplicationSyncService {
    private readonly databaseEventTriggerV2Service: DatabaseEventTriggerV2Service,
    private readonly cronTriggerV2Service: CronTriggerV2Service,
    private readonly routeTriggerV2Service: RouteTriggerV2Service,
+    private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
  ) {}

  public async synchronizeFromManifest({
@@ -795,4 +802,109 @@ export class ApplicationSyncService {
      );
    }
  }
+
+  public async deleteApplication({
+    workspaceId,
+    applicationUniversalIdentifier,
+  }: {
+    workspaceId: string;
+    applicationUniversalIdentifier: string;
+  }) {
+    const {
+      flatObjectMetadataMaps: existingFlatObjectMetadataMaps,
+      flatIndexMaps: existingFlatIndexMetadataMaps,
+      flatFieldMetadataMaps: existingFlatFieldMetadataMaps,
+    } = await this.flatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+      {
+        workspaceId,
+        flatMapsKeys: [
+          'flatObjectMetadataMaps',
+          'flatIndexMaps',
+          'flatFieldMetadataMaps',
+        ],
+      },
+    );
+
+    const application = await this.applicationService.findByUniversalIdentifier(
+      applicationUniversalIdentifier,
+      workspaceId,
+    );
+
+    if (!isDefined(application)) {
+      throw new ApplicationException(
+        `Application with universalIdentifier ${applicationUniversalIdentifier} not found`,
+        ApplicationExceptionCode.ENTITY_NOT_FOUND,
+      );
+    }
+
+    const flatObjectMetadataMapsByApplicationId =
+      getFlatEntitiesByApplicationId(
+        existingFlatObjectMetadataMaps,
+        application.id,
+      );
+
+    const fromFlatObjectMetadataMaps = getSubFlatEntityMapsOrThrow({
+      flatEntityIds: flatObjectMetadataMapsByApplicationId.map((obj) => obj.id),
+      flatEntityMaps: existingFlatObjectMetadataMaps,
+    });
+
+    const flatIndexMetadataMapsByApplicationId = getFlatEntitiesByApplicationId(
+      existingFlatIndexMetadataMaps,
+      application.id,
+    );
+
+    const fromFlatIndexMetadataMaps = getSubFlatEntityMapsOrThrow({
+      flatEntityIds: flatIndexMetadataMapsByApplicationId.map(
+        (field) => field.id,
+      ),
+      flatEntityMaps: existingFlatIndexMetadataMaps,
+    });
+
+    const flatFieldMetadataMapsByApplicationId = getFlatEntitiesByApplicationId(
+      existingFlatFieldMetadataMaps,
+      application.id,
+    );
+
+    const fromFlatFieldMetadataMaps = getSubFlatEntityMapsOrThrow({
+      flatEntityIds: flatFieldMetadataMapsByApplicationId.map((idx) => idx.id),
+      flatEntityMaps: existingFlatFieldMetadataMaps,
+    });
+
+    await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
+      {
+        fromToAllFlatEntityMaps: {
+          flatObjectMetadataMaps: {
+            from: fromFlatObjectMetadataMaps,
+            to: EMPTY_FLAT_ENTITY_MAPS,
+          },
+          flatIndexMaps: {
+            from: fromFlatIndexMetadataMaps,
+            to: EMPTY_FLAT_ENTITY_MAPS,
+          },
+          flatFieldMetadataMaps: {
+            from: fromFlatFieldMetadataMaps,
+            to: EMPTY_FLAT_ENTITY_MAPS,
+          },
+        },
+        workspaceId,
+        buildOptions: {
+          isSystemBuild: true,
+          inferDeletionFromMissingEntities: {
+            ...Object.values(ALL_METADATA_NAME).reduce(
+              (acc, metadataName) => ({
+                ...acc,
+                [metadataName]: true,
+              }),
+              {} as Partial<Record<AllMetadataName, boolean>>,
+            ),
+          },
+        },
+      },
+    );
+
+    await this.applicationService.delete(
+      applicationUniversalIdentifier,
+      workspaceId,
+    );
+  }
 }
@@ -7,18 +7,16 @@ import {
  JoinColumn,
  ManyToOne,
  OneToMany,
-  OneToOne,
  PrimaryGeneratedColumn,
  Relation,
  UpdateDateColumn,
 } from 'typeorm';

+import { ApplicationVariable } from 'src/engine/core-modules/applicationVariable/application-variable.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { AgentEntity } from 'src/engine/metadata-modules/agent/agent.entity';
 import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { ServerlessFunctionLayerEntity } from 'src/engine/metadata-modules/serverless-function-layer/serverless-function-layer.entity';
 import { ServerlessFunctionEntity } from 'src/engine/metadata-modules/serverless-function/serverless-function.entity';
-import { ApplicationVariable } from 'src/engine/core-modules/applicationVariable/application-variable.entity';

@Entity({ name: 'application', schema: 'core' })
@Index('IDX_APPLICATION_WORKSPACE_ID', ['workspaceId'])
@@ -58,15 +56,11 @@ export class ApplicationEntity {
  @Column({ nullable: false, type: 'uuid' })
  serverlessFunctionLayerId: string;

-  @OneToOne(
-    () => ServerlessFunctionLayerEntity,
-    (serverlessFunctionLayer) => serverlessFunctionLayer.application,
-    {
-      onDelete: 'CASCADE',
-    },
-  )
-  @JoinColumn({ name: 'serverlessFunctionLayerId' })
-  serverlessFunctionLayer: Relation<ServerlessFunctionLayerEntity>;
+  @ManyToOne(() => Workspace, {
+    onDelete: 'CASCADE',
+  })
+  @JoinColumn({ name: 'workspaceId' })
+  workspace: Relation<Workspace>;

  @OneToMany(() => AgentEntity, (agent) => agent.application, {
    onDelete: 'CASCADE',
@@ -96,12 +90,6 @@ export class ApplicationEntity {
  )
  applicationVariables: Relation<ApplicationVariable[]>;

-  @ManyToOne(() => Workspace, {
-    onDelete: 'CASCADE',
-  })
-  @JoinColumn({ name: 'workspaceId' })
-  workspace: Relation<Workspace>;
-
  @CreateDateColumn({ type: 'timestamptz' })
  createdAt: Date;

@@ -5,6 +5,7 @@ import { ApplicationSyncService } from 'src/engine/core-modules/application/appl
 import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
 import { ApplicationResolver } from 'src/engine/core-modules/application/application.resolver';
 import { ApplicationService } from 'src/engine/core-modules/application/application.service';
+import { ApplicationVariableModule } from 'src/engine/core-modules/applicationVariable/application-variable.module';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { AgentEntity } from 'src/engine/metadata-modules/agent/agent.entity';
 import { AgentModule } from 'src/engine/metadata-modules/agent/agent.module';
@@ -16,7 +17,7 @@ import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadat
 import { RouteTriggerModule } from 'src/engine/metadata-modules/route-trigger/route-trigger.module';
 import { ServerlessFunctionLayerModule } from 'src/engine/metadata-modules/serverless-function-layer/serverless-function-layer.module';
 import { ServerlessFunctionModule } from 'src/engine/metadata-modules/serverless-function/serverless-function.module';
-import { ApplicationVariableModule } from 'src/engine/core-modules/applicationVariable/application-variable.module';
+import { WorkspaceMigrationV2Module } from 'src/engine/workspace-manager/workspace-migration-v2/workspace-migration-v2.module';

@Module({
  imports: [
@@ -31,6 +32,7 @@ import { ApplicationVariableModule } from 'src/engine/core-modules/applicationVa
    DatabaseEventTriggerModule,
    CronTriggerModule,
    RouteTriggerModule,
+    WorkspaceMigrationV2Module,
  ],
  providers: [ApplicationResolver, ApplicationService, ApplicationSyncService],
 })
@@ -1,18 +1,18 @@
 import { UseFilters, UseGuards } from '@nestjs/common';
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';

-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
-import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
-import { ApplicationSyncService } from 'src/engine/core-modules/application/application-sync.service';
-import { ApplicationInput } from 'src/engine/core-modules/application/dtos/application.input';
-import { DeleteApplicationInput } from 'src/engine/core-modules/application/dtos/deleteApplication.input';
-import { ApplicationService } from 'src/engine/core-modules/application/application.service';
-import { RequireFeatureFlag } from 'src/engine/guards/feature-flag.guard';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { ApplicationDTO } from 'src/engine/core-modules/application/dtos/application.dto';
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 import { ApplicationExceptionFilter } from 'src/engine/core-modules/application/application-exception-filter';
+import { ApplicationSyncService } from 'src/engine/core-modules/application/application-sync.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
+import { ApplicationDTO } from 'src/engine/core-modules/application/dtos/application.dto';
+import { ApplicationInput } from 'src/engine/core-modules/application/dtos/application.input';
+import { DeleteApplicationInput } from 'src/engine/core-modules/application/dtos/deleteApplication.input';
+import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
+import { RequireFeatureFlag } from 'src/engine/guards/feature-flag.guard';
+import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';

@UseGuards(WorkspaceAuthGuard)
@Resolver()
@@ -58,10 +58,10 @@ export class ApplicationResolver {
    @Args() { packageJson }: DeleteApplicationInput,
    @AuthWorkspace() { id: workspaceId }: Workspace,
  ) {
-    await this.applicationService.delete(
-      packageJson.universalIdentifier,
+    await this.applicationSyncService.deleteApplication({
+      applicationUniversalIdentifier: packageJson.universalIdentifier,
      workspaceId,
-    );
+    });

    return true;
  }