Fix Tasks/Notes created with null position + set position non-nullabl…

…e + remove sync-metadata health-check
twentyhq · Dec 13, 2024 · 3340f01 · 3340f01
1 parent 07aaf08
commit 3340f01
Show file tree

Hide file tree

Showing 53 changed files with 489 additions and 482 deletions.
diff --git a/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts b/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts
@@ -31,7 +31,7 @@ export const useOpenCreateActivityDrawer = ({
   const setHotkeyScope = useSetHotkeyScope();
 
   const { createOneRecord: createOneActivity } = useCreateOneRecord<
-    Task | Note
+    (Task | Note) & { position: 'first' | 'last' }
   >({
     objectNameSingular: activityObjectNameSingular,
   });
@@ -74,6 +74,7 @@ export const useOpenCreateActivityDrawer = ({
 
     const activity = await createOneActivity({
       assigneeId: customAssignee?.id,
+      position: 'last',
     });
 
     if (targetableObjects.length > 0) {

diff --git a/packages/twenty-server/src/command/command.module.ts b/packages/twenty-server/src/command/command.module.ts
@@ -1,10 +1,10 @@
 import { Module } from '@nestjs/common';
 
+import { AppModule } from 'src/app.module';
 import { DatabaseCommandModule } from 'src/database/commands/database-command.module';
-import { WorkspaceHealthCommandModule } from 'src/engine/workspace-manager/workspace-health/commands/workspace-health-command.module';
 import { WorkspaceCleanerModule } from 'src/engine/workspace-manager/workspace-cleaner/workspace-cleaner.module';
-import { AppModule } from 'src/app.module';
-import { WorkspaceMigrationRunnerCommandsModule } from 'src/engine/workspace-manager/workspace-migration-runner/commands/workspace-sync-metadata-commands.module';
+import { WorkspaceHealthCommandModule } from 'src/engine/workspace-manager/workspace-health/commands/workspace-health-command.module';
+import { WorkspaceMigrationRunnerCommandsModule } from 'src/engine/workspace-manager/workspace-migration-runner/commands/workspace-migration-runner-commands.module';
 import { WorkspaceSyncMetadataCommandsModule } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module';
 
 @Module({

diff --git a/packages/twenty-server/src/database/commands/database-command.module.ts b/packages/twenty-server/src/database/commands/database-command.module.ts
@@ -10,6 +10,7 @@ import { ConfirmationQuestion } from 'src/database/commands/questions/confirmati
 import { UpgradeTo0_32CommandModule } from 'src/database/commands/upgrade-version/0-32/0-32-upgrade-version.module';
 import { UpgradeTo0_33CommandModule } from 'src/database/commands/upgrade-version/0-33/0-33-upgrade-version.module';
 import { UpgradeTo0_34CommandModule } from 'src/database/commands/upgrade-version/0-34/0-34-upgrade-version.module';
+import { UpgradeTo0_40CommandModule } from 'src/database/commands/upgrade-version/0-40/0-40-upgrade-version.module';
 import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
 import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
@@ -52,6 +53,7 @@ import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/worksp
     UpgradeTo0_33CommandModule,
     UpgradeTo0_34CommandModule,
     FeatureFlagModule,
+    UpgradeTo0_40CommandModule,
   ],
   providers: [
     DataSeedWorkspaceCommand,

diff --git a/...erver/src/database/commands/upgrade-version/0-40/0-40-record-position-backfill.command.ts b/...erver/src/database/commands/upgrade-version/0-40/0-40-record-position-backfill.command.ts
@@ -0,0 +1,36 @@
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Command } from 'nest-commander';
+import { Repository } from 'typeorm';
+
+import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command';
+import { BaseCommandOptions } from 'src/database/commands/base.command';
+import { RecordPositionBackfillService } from 'src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-service';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+
+@Command({
+  name: 'migrate-0.40:backfill-record-position',
+  description: 'Backfill record position',
+})
+export class RecordPositionBackfillCommand extends ActiveWorkspacesCommandRunner {
+  constructor(
+    @InjectRepository(Workspace, 'core')
+    protected readonly workspaceRepository: Repository<Workspace>,
+    private readonly recordPositionBackfillService: RecordPositionBackfillService,
+  ) {
+    super(workspaceRepository);
+  }
+
+  async executeActiveWorkspacesCommand(
+    _passedParam: string[],
+    options: BaseCommandOptions,
+    workspaceIds: string[],
+  ): Promise<void> {
+    for (const workspaceId of workspaceIds) {
+      await this.recordPositionBackfillService.backfill(
+        workspaceId,
+        options.dryRun ?? false,
+      );
+    }
+  }
+}
diff --git a/.../twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.command.ts b/.../twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.command.ts
@@ -0,0 +1,46 @@
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Command } from 'nest-commander';
+import { Repository } from 'typeorm';
+
+import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command';
+import { BaseCommandOptions } from 'src/database/commands/base.command';
+import { RecordPositionBackfillCommand } from 'src/database/commands/upgrade-version/0-40/0-40-record-position-backfill.command';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { SyncWorkspaceMetadataCommand } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command';
+
+@Command({
+  name: 'upgrade-0.40',
+  description: 'Upgrade to 0.40',
+})
+export class UpgradeTo0_40Command extends ActiveWorkspacesCommandRunner {
+  constructor(
+    @InjectRepository(Workspace, 'core')
+    protected readonly workspaceRepository: Repository<Workspace>,
+    private readonly recordPositionBackfillCommand: RecordPositionBackfillCommand,
+    private readonly syncWorkspaceMetadataCommand: SyncWorkspaceMetadataCommand,
+  ) {
+    super(workspaceRepository);
+  }
+
+  async executeActiveWorkspacesCommand(
+    passedParam: string[],
+    options: BaseCommandOptions,
+    workspaceIds: string[],
+  ): Promise<void> {
+    await this.recordPositionBackfillCommand.executeActiveWorkspacesCommand(
+      passedParam,
+      options,
+      workspaceIds,
+    );
+
+    await this.syncWorkspaceMetadataCommand.executeActiveWorkspacesCommand(
+      passedParam,
+      {
+        ...options,
+        force: true,
+      },
+      workspaceIds,
+    );
+  }
+}
diff --git a/...s/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.module.ts b/...s/twenty-server/src/database/commands/upgrade-version/0-40/0-40-upgrade-version.module.ts
@@ -0,0 +1,19 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { RecordPositionBackfillCommand } from 'src/database/commands/upgrade-version/0-40/0-40-record-position-backfill.command';
+import { UpgradeTo0_40Command } from 'src/database/commands/upgrade-version/0-40/0-40-upgrade-version.command';
+import { RecordPositionBackfillModule } from 'src/engine/api/graphql/workspace-query-runner/services/record-position-backfill-module';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { WorkspaceSyncMetadataCommandsModule } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([Workspace], 'core'),
+    WorkspaceSyncMetadataCommandsModule,
+    RecordPositionBackfillModule,
+    WorkspaceSyncMetadataCommandsModule,
+  ],
+  providers: [UpgradeTo0_40Command, RecordPositionBackfillCommand],
+})
+export class UpgradeTo0_40CommandModule {}
diff --git a/...ty-server/src/engine/api/graphql/graphql-query-runner/interfaces/base-resolver-service.ts b/...ty-server/src/engine/api/graphql/graphql-query-runner/interfaces/base-resolver-service.ts
@@ -18,6 +18,7 @@ import { GraphqlQueryParser } from 'src/engine/api/graphql/graphql-query-runner/
 import { ApiEventEmitterService } from 'src/engine/api/graphql/graphql-query-runner/services/api-event-emitter.service';
 import { QueryResultGettersFactory } from 'src/engine/api/graphql/workspace-query-runner/factories/query-result-getters/query-result-getters.factory';
 import { QueryRunnerArgsFactory } from 'src/engine/api/graphql/workspace-query-runner/factories/query-runner-args.factory';
+import { workspaceQueryRunnerGraphqlApiExceptionHandler } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
 import { WorkspaceQueryHookService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-hook/workspace-query-hook.service';
 import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';
 import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
@@ -56,77 +57,81 @@ export abstract class GraphqlQueryBaseResolverService<
     args: Input,
     options: WorkspaceQueryRunnerOptions,
     operationName: WorkspaceResolverBuilderMethodNames,
-  ): Promise<Response> {
-    const { authContext, objectMetadataItemWithFieldMaps } = options;
-
-    await this.validate(args, options);
-
-    const hookedArgs =
-      await this.workspaceQueryHookService.executePreQueryHooks(
-        authContext,
+  ): Promise<Response | undefined> {
+    try {
+      const { authContext, objectMetadataItemWithFieldMaps } = options;
+
+      await this.validate(args, options);
+
+      const hookedArgs =
+        await this.workspaceQueryHookService.executePreQueryHooks(
+          authContext,
+          objectMetadataItemWithFieldMaps.nameSingular,
+          operationName,
+          args,
+        );
+
+      const computedArgs = (await this.queryRunnerArgsFactory.create(
+        hookedArgs,
+        options,
+        ResolverArgsType[capitalize(operationName)],
+      )) as Input;
+
+      const dataSource =
+        await this.twentyORMGlobalManager.getDataSourceForWorkspace(
+          authContext.workspace.id,
+        );
+
+      const repository = dataSource.getRepository(
         objectMetadataItemWithFieldMaps.nameSingular,
-        operationName,
-        args,
       );
 
-    const computedArgs = (await this.queryRunnerArgsFactory.create(
-      hookedArgs,
-      options,
-      ResolverArgsType[capitalize(operationName)],
-    )) as Input;
-
-    const dataSource =
-      await this.twentyORMGlobalManager.getDataSourceForWorkspace(
-        authContext.workspace.id,
+      const graphqlQueryParser = new GraphqlQueryParser(
+        objectMetadataItemWithFieldMaps.fieldsByName,
+        options.objectMetadataMaps,
       );
 
-    const repository = dataSource.getRepository(
-      objectMetadataItemWithFieldMaps.nameSingular,
-    );
+      const selectedFields = graphqlFields(options.info);
+
+      const graphqlQuerySelectedFieldsResult =
+        graphqlQueryParser.parseSelectedFields(
+          objectMetadataItemWithFieldMaps,
+          selectedFields,
+        );
 
-    const graphqlQueryParser = new GraphqlQueryParser(
-      objectMetadataItemWithFieldMaps.fieldsByName,
-      options.objectMetadataMaps,
-    );
+      const graphqlQueryResolverExecutionArgs = {
+        args: computedArgs,
+        options,
+        dataSource,
+        repository,
+        graphqlQueryParser,
+        graphqlQuerySelectedFieldsResult,
+      };
 
-    const selectedFields = graphqlFields(options.info);
+      const results = await this.resolve(graphqlQueryResolverExecutionArgs);
 
-    const graphqlQuerySelectedFieldsResult =
-      graphqlQueryParser.parseSelectedFields(
+      const resultWithGetters = await this.queryResultGettersFactory.create(
+        results,
         objectMetadataItemWithFieldMaps,
-        selectedFields,
+        authContext.workspace.id,
+        options.objectMetadataMaps,
+      );
+
+      const resultWithGettersArray = Array.isArray(resultWithGetters)
+        ? resultWithGetters
+        : [resultWithGetters];
+
+      await this.workspaceQueryHookService.executePostQueryHooks(
+        authContext,
+        objectMetadataItemWithFieldMaps.nameSingular,
+        operationName,
+        resultWithGettersArray,
       );
 
-    const graphqlQueryResolverExecutionArgs = {
-      args: computedArgs,
-      options,
-      dataSource,
-      repository,
-      graphqlQueryParser,
-      graphqlQuerySelectedFieldsResult,
-    };
-
-    const results = await this.resolve(graphqlQueryResolverExecutionArgs);
-
-    const resultWithGetters = await this.queryResultGettersFactory.create(
-      results,
-      objectMetadataItemWithFieldMaps,
-      authContext.workspace.id,
-      options.objectMetadataMaps,
-    );
-
-    const resultWithGettersArray = Array.isArray(resultWithGetters)
-      ? resultWithGetters
-      : [resultWithGetters];
-
-    await this.workspaceQueryHookService.executePostQueryHooks(
-      authContext,
-      objectMetadataItemWithFieldMaps.nameSingular,
-      operationName,
-      resultWithGettersArray,
-    );
-
-    return resultWithGetters;
+      return resultWithGetters;
+    } catch (error) {
+      workspaceQueryRunnerGraphqlApiExceptionHandler(error, options);
+    }
   }
 
   protected abstract resolve(

diff --git a/...e/api/graphql/graphql-query-runner/resolvers/graphql-query-create-one-resolver.service.ts b/...e/api/graphql/graphql-query-runner/resolvers/graphql-query-create-one-resolver.service.ts
@@ -83,8 +83,6 @@ export class GraphqlQueryCreateOneResolverService extends GraphqlQueryBaseResolv
     });
   }
 
-  async;
-
   async validate(
     args: CreateOneResolverArgs<Partial<ObjectRecord>>,
     options: WorkspaceQueryRunnerOptions,

diff --git a/...src/engine/api/graphql/workspace-query-builder/factories/record-position-query.factory.ts b/...src/engine/api/graphql/workspace-query-builder/factories/record-position-query.factory.ts
@@ -45,7 +45,7 @@ export class RecordPositionQueryFactory {
     objectMetadata: { isCustom: boolean; nameSingular: string },
     dataSourceSchema: string,
   ): [RecordPositionQuery, RecordPositionQueryParams] {
-    const name = computeTableName(
+    const tableName = computeTableName(
       objectMetadata.nameSingular,
       objectMetadata.isCustom,
     );
@@ -54,17 +54,17 @@ export class RecordPositionQueryFactory {
       case RecordPositionQueryType.FIND_BY_POSITION:
         return this.buildFindByPositionQuery(
           recordPositionQueryArgs satisfies FindByPositionQueryArgs,
-          name,
+          tableName,
           dataSourceSchema,
         );
       case RecordPositionQueryType.FIND_MIN_POSITION:
-        return this.buildFindMinPositionQuery(name, dataSourceSchema);
+        return this.buildFindMinPositionQuery(tableName, dataSourceSchema);
       case RecordPositionQueryType.FIND_MAX_POSITION:
-        return this.buildFindMaxPositionQuery(name, dataSourceSchema);
+        return this.buildFindMaxPositionQuery(tableName, dataSourceSchema);
       case RecordPositionQueryType.UPDATE_POSITION:
         return this.buildUpdatePositionQuery(
           recordPositionQueryArgs satisfies UpdatePositionQueryArgs,
-          name,
+          tableName,
           dataSourceSchema,
         );
       default:

diff --git a/...gine/api/graphql/workspace-query-runner/commands/0-20-record-position-backfill.command.ts b/...gine/api/graphql/workspace-query-runner/commands/0-20-record-position-backfill.command.ts
-Original file line number
+Diff line change
@@ Expand Up @@
         });
       }
-      async;
       async validate(
         args: CreateOneResolverArgs<Partial<ObjectRecord>>,
         options: WorkspaceQueryRunnerOptions,
@@ Expand Down @@