From 22d4af2e0c1d6f9ba2086670069fbdfbd655d5e5 Mon Sep 17 00:00:00 2001
From: Weiko <corentin@twenty.com>
Date: Thu, 28 Mar 2024 16:15:14 +0100
Subject: [PATCH] Fix events being created for system objects (#4694)

* Fix events being created for system objects

* move the condition above to avoid unnecessary db calls
---
 .../listeners/entity-events-to-db.listener.ts                 | 4 ++++
 .../metadata-modules/field-metadata/field-metadata.service.ts | 1 +
 2 files changed, 5 insertions(+)

diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
index b77db9c38..8288a94d4 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
@@ -49,6 +49,10 @@ export class EntityEventsToDbListener {
     payload: ObjectRecordCreateEvent<any>,
     operation: string,
   ) {
+    if (payload.objectMetadata.isSystem) {
+      return;
+    }
+
     const isEventObjectEnabledFeatureFlag =
       await this.featureFlagRepository.findOneBy({
         workspaceId: payload.workspaceId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts
index b8c41f8e7..1599d8363 100644
--- a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts
@@ -208,6 +208,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
       view[0].id
     }')`,
         );
+        await workspaceQueryRunner.commitTransaction();
       } catch (error) {
         await workspaceQueryRunner.rollbackTransaction();
         throw error;