Fix transactions within rest + limit (#14264)

This commit is contained in:
Weiko
2025-09-02 21:54:43 +02:00
committed by GitHub
parent 89c620ee52
commit 1eeca13458
7 changed files with 25 additions and 34 deletions
@@ -56,10 +56,13 @@ export class RestApiCreateManyHandler extends RestApiBaseHandler {
this.getAuthContextFromRequest(request),
);
const createdRecords = await repository.save(recordsToCreate);
const createdRecords = await repository.insert(recordsToCreate);
const createdRecordsIds = createdRecords.identifiers.map(
(record) => record.id,
);
const records = await this.getRecord({
recordIds: createdRecords.map((record) => record.id),
recordIds: createdRecordsIds,
repository,
objectMetadata,
depth: this.depthInputFactory.create(request),
@@ -39,7 +39,8 @@ export class RestApiCreateOneHandler extends RestApiBaseHandler {
this.getAuthContextFromRequest(request),
);
const createdRecord = await repository.save(recordToCreate);
const createdRecordResult = await repository.insert(recordToCreate);
const createdRecord = createdRecordResult.identifiers[0];
const records = await this.getRecord({
recordIds: [createdRecord.id],
@@ -34,13 +34,12 @@ export class RestApiUpdateOneHandler extends RestApiBaseHandler {
objectMetadataMapItem: objectMetadata.objectMetadataMapItem,
});
const updatedRecord = await repository.save({
id: recordId,
...overriddenBody,
});
const updatedRecord = await repository.update(recordId, overriddenBody);
const updatedRecordId = updatedRecord.generatedMaps[0].id;
const records = await this.getRecord({
recordIds: [updatedRecord.id],
recordIds: [updatedRecordId],
repository,
objectMetadata,
depth: this.depthInputFactory.create(request),
@@ -1,17 +1,14 @@
import { Injectable, Logger } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { isDefined } from 'twenty-shared/utils';
import { Repository } from 'typeorm';
import { buildCreatedByFromApiKey } from 'src/engine/core-modules/actor/utils/build-created-by-from-api-key.util';
import { buildCreatedByFromFullNameMetadata } from 'src/engine/core-modules/actor/utils/build-created-by-from-full-name-metadata.util';
import { type AuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.validate';
import { type ActorMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type';
import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.validate';
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export type CreateInput = Record<string, any>;
@@ -21,35 +18,18 @@ export class CreatedByFromAuthContextService {
private readonly logger = new Logger(CreatedByFromAuthContextService.name);
constructor(
@InjectRepository(FieldMetadataEntity)
private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
) {}
async injectCreatedBy(
records: CreateInput[],
objectMetadataNameSingular: string,
_objectMetadataNameSingular: string,
authContext: AuthContext,
): Promise<CreateInput[]> {
const workspace = authContext.workspace;
workspaceValidator.assertIsDefinedOrThrow(workspace);
// TODO: Once all objects have it, we can remove this check
const createdByFieldMetadata = await this.fieldMetadataRepository.findOne({
where: {
object: {
nameSingular: objectMetadataNameSingular,
},
name: 'createdBy',
workspaceId: workspace.id,
},
});
if (!createdByFieldMetadata) {
return records;
}
const clonedRecords = structuredClone(records);
const createdBy = await this.buildCreatedBy(authContext);
@@ -156,6 +156,8 @@ export class WorkspaceSelectQueryBuilder<
this.internalContext,
);
this.take(1);
const result = await super.getOne();
const formattedResult = formatResult<T>(
@@ -222,9 +222,10 @@ export class MessagingMessageListFetchService {
`messageChannelId: ${messageChannel.id} launching workspace thread cleanup`,
);
await this.messagingMessageCleanerService.cleanWorkspaceThreads(
workspaceId,
);
// TODO: Re-enable this after we have a way to clean up threads without impacting the message import
// await this.messagingMessageCleanerService.cleanWorkspaceThreads(
// workspaceId,
// );
this.logger.log(
`messageChannelId: ${messageChannel.id} Total messages to import count: ${totalMessagesToImportCount}`,
@@ -424,6 +424,11 @@ export class WorkflowRunWorkspaceService {
);
}
await workflowRunRepository.update(workflowRunToUpdate.id, partialUpdate);
await workflowRunRepository.update(
workflowRunToUpdate.id,
partialUpdate,
undefined,
['id'],
);
}
}