From 4b42997fedc70eef17823746f191e99c4317f1d0 Mon Sep 17 00:00:00 2001
From: nichenqin <nichenqin@hotmail.com>
Date: Fri, 18 Oct 2024 16:51:16 +0800
Subject: [PATCH] fix: fix event spaceis

---
 packages/base/src/events/base-created.event.ts   |  7 +++++--
 packages/base/src/events/base-updated.event.ts   |  4 ++--
 packages/space/src/events/space-created.event.ts |  7 +++++--
 packages/space/src/events/space-updated.event.ts |  7 +++++--
 packages/table/src/events/field-created.event.ts |  7 +++++--
 packages/table/src/events/field-deleted.event.ts |  7 +++++--
 packages/table/src/events/field-updated.event.ts |  7 +++++--
 .../table/src/events/set-table-form.event.ts     |  7 +++++--
 packages/table/src/events/set-table-rls.event.ts |  7 +++++--
 .../table/src/events/set-view-aggregate.event.ts |  7 +++++--
 .../table/src/events/set-view-color.event.ts     |  7 +++++--
 .../table/src/events/set-view-fields.event.ts    |  7 +++++--
 .../table/src/events/set-view-filter.event.ts    |  7 +++++--
 .../table/src/events/set-view-option.event.ts    |  7 +++++--
 packages/table/src/events/set-view-sort.event.ts |  7 +++++--
 packages/table/src/events/table-created.event.ts |  7 +++++--
 packages/table/src/events/view-created.event.ts  |  7 +++++--
 packages/table/src/events/view-deleted.event.ts  |  7 +++++--
 packages/table/src/events/view-updated.event.ts  |  7 +++++--
 .../table/src/methods/create-field.method.ts     | 15 +++++++++------
 packages/table/src/methods/create-view.method.ts | 11 +++++++----
 .../table/src/methods/delete-field.method.ts     | 11 +++++++----
 packages/table/src/methods/delete-view.method.ts | 11 +++++++----
 .../table/src/methods/duplicate-view.method.ts   | 11 +++++++----
 .../table/src/methods/set-table-form.method.ts   | 13 ++++++++-----
 .../src/methods/set-view-aggregate.method.ts     | 16 +++++++++-------
 .../table/src/methods/set-view-color.method.ts   | 16 +++++++++-------
 .../table/src/methods/set-view-fields.method.ts  | 16 +++++++++-------
 .../table/src/methods/set-view-filter.method.ts  | 15 +++++++++------
 .../table/src/methods/set-view-option.method.ts  | 16 +++++++++-------
 .../table/src/methods/set-view-sort.method.ts    | 16 +++++++++-------
 .../table/src/methods/update-field.method.ts     | 13 ++++++++-----
 packages/table/src/methods/update-view.method.ts | 13 ++++++++-----
 33 files changed, 207 insertions(+), 116 deletions(-)

diff --git a/packages/base/src/events/base-created.event.ts b/packages/base/src/events/base-created.event.ts
index 763240999..ff3190fed 100644
--- a/packages/base/src/events/base-created.event.ts
+++ b/packages/base/src/events/base-created.event.ts
@@ -13,7 +13,10 @@ export type IBaseCreatedEventPayload = z.infer<typeof baseCreatedEventPayload>
 export class BaseCreatedEvent extends BaseEvent<IBaseCreatedEventPayload, typeof EVT_BASE_CREATED> {
   name = EVT_BASE_CREATED
 
-  constructor(public readonly payload: IBaseCreatedEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: IBaseCreatedEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/base/src/events/base-updated.event.ts b/packages/base/src/events/base-updated.event.ts
index b67283c0a..2e5d11462 100644
--- a/packages/base/src/events/base-updated.event.ts
+++ b/packages/base/src/events/base-updated.event.ts
@@ -14,7 +14,7 @@ export type IBaseUpdatedEventPayload = z.infer<typeof baseUpdatedEventPayload>
 export class BaseUpdatedEvent extends BaseEvent<IBaseUpdatedEventPayload, typeof EVT_BASE_UPDATED> {
   name = EVT_BASE_UPDATED
 
-  constructor(public readonly payload: IBaseUpdatedEventPayload) {
-    super(payload, undefined)
+  constructor(public readonly payload: IBaseUpdatedEventPayload, spaceId: string  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/space/src/events/space-created.event.ts b/packages/space/src/events/space-created.event.ts
index a0c277c0e..0735aa631 100644
--- a/packages/space/src/events/space-created.event.ts
+++ b/packages/space/src/events/space-created.event.ts
@@ -13,7 +13,10 @@ export type ISpaceCreatedEventPayload = z.infer<typeof spaceCreatedEventPayload>
 export class SpaceCreatedEvent extends BaseEvent<ISpaceCreatedEventPayload, typeof EVT_SPACE_CREATED> {
   name = EVT_SPACE_CREATED
 
-  constructor(public readonly payload: ISpaceCreatedEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: ISpaceCreatedEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/space/src/events/space-updated.event.ts b/packages/space/src/events/space-updated.event.ts
index 38571458b..a67b3e5b6 100644
--- a/packages/space/src/events/space-updated.event.ts
+++ b/packages/space/src/events/space-updated.event.ts
@@ -14,7 +14,10 @@ export type ISpaceUpdatedEventPayload = z.infer<typeof spaceUpdatedEventPayload>
 export class SpaceUpdatedEvent extends BaseEvent<ISpaceUpdatedEventPayload, typeof EVT_SPACE_UPDATED> {
   name = EVT_SPACE_UPDATED
 
-  constructor(public readonly payload: ISpaceUpdatedEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: ISpaceUpdatedEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/table/src/events/field-created.event.ts b/packages/table/src/events/field-created.event.ts
index b1231b84a..f8b80c6ee 100644
--- a/packages/table/src/events/field-created.event.ts
+++ b/packages/table/src/events/field-created.event.ts
@@ -17,7 +17,10 @@ export type IFieldCreatedEventPayload = z.infer<typeof fieldCreatedEventPayload>
 export class FieldCreatedEvent extends BaseEvent<IFieldCreatedEventPayload, typeof EVT_FIELD_CREATED> {
   name = EVT_FIELD_CREATED
 
-  constructor(public readonly payload: IFieldCreatedEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: IFieldCreatedEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/table/src/events/field-deleted.event.ts b/packages/table/src/events/field-deleted.event.ts
index aa24a334e..27a8285b5 100644
--- a/packages/table/src/events/field-deleted.event.ts
+++ b/packages/table/src/events/field-deleted.event.ts
@@ -15,7 +15,10 @@ export type IFieldDeletedEventPayload = z.infer<typeof fieldDeletedEventPayload>
 export class FieldDeletedEvent extends BaseEvent<IFieldDeletedEventPayload, typeof EVT_FIELD_DELETED> {
   name = EVT_FIELD_DELETED
 
-  constructor(public readonly payload: IFieldDeletedEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: IFieldDeletedEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/table/src/events/field-updated.event.ts b/packages/table/src/events/field-updated.event.ts
index ca4329208..fe58db757 100644
--- a/packages/table/src/events/field-updated.event.ts
+++ b/packages/table/src/events/field-updated.event.ts
@@ -16,7 +16,10 @@ export type IFieldUpdatedEventPayload = z.infer<typeof fieldUpdatedEventPayload>
 export class FieldUpdatedEvent extends BaseEvent<IFieldUpdatedEventPayload, typeof EVT_FIELD_UPDATED> {
   name = EVT_FIELD_UPDATED
 
-  constructor(public readonly payload: IFieldUpdatedEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: IFieldUpdatedEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/table/src/events/set-table-form.event.ts b/packages/table/src/events/set-table-form.event.ts
index d101c0397..09ba19d5c 100644
--- a/packages/table/src/events/set-table-form.event.ts
+++ b/packages/table/src/events/set-table-form.event.ts
@@ -16,7 +16,10 @@ export type ISetTableFormEventPayload = z.infer<typeof setTableFormEventPayload>
 export class SetTableFormEvent extends BaseEvent<ISetTableFormEventPayload, typeof EVT_SET_TABLE_VIEW> {
   name = EVT_SET_TABLE_VIEW
 
-  constructor(public readonly payload: ISetTableFormEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: ISetTableFormEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/table/src/events/set-table-rls.event.ts b/packages/table/src/events/set-table-rls.event.ts
index 49da73eee..d8d964522 100644
--- a/packages/table/src/events/set-table-rls.event.ts
+++ b/packages/table/src/events/set-table-rls.event.ts
@@ -16,7 +16,10 @@ export type ISetTableRLSEventPayload = z.infer<typeof setTableRLSEventPayload>
 export class SetTableRLSEvent extends BaseEvent<ISetTableRLSEventPayload, typeof EVT_SET_TABLE_RLS> {
   name = EVT_SET_TABLE_RLS
 
-  constructor(public readonly payload: ISetTableRLSEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: ISetTableRLSEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/table/src/events/set-view-aggregate.event.ts b/packages/table/src/events/set-view-aggregate.event.ts
index c2ac62606..c1c00708f 100644
--- a/packages/table/src/events/set-view-aggregate.event.ts
+++ b/packages/table/src/events/set-view-aggregate.event.ts
@@ -17,7 +17,10 @@ export type ISetViewAggregateEventPayload = z.infer<typeof setViewAggregateEvent
 export class SetViewAggregateEvent extends BaseEvent<ISetViewAggregateEventPayload, typeof EVT_SET_VIEW_COLOR> {
   name = EVT_SET_VIEW_COLOR
 
-  constructor(public readonly payload: ISetViewAggregateEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: ISetViewAggregateEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/table/src/events/set-view-color.event.ts b/packages/table/src/events/set-view-color.event.ts
index c43569771..9168fb1ff 100644
--- a/packages/table/src/events/set-view-color.event.ts
+++ b/packages/table/src/events/set-view-color.event.ts
@@ -18,7 +18,10 @@ export type ISetViewColorEventPayload = z.infer<typeof setViewColorEventPayload>
 export class SetViewColorEvent extends BaseEvent<ISetViewColorEventPayload, typeof EVT_SET_VIEW_COLOR> {
   name = EVT_SET_VIEW_COLOR
 
-  constructor(public readonly payload: ISetViewColorEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: ISetViewColorEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/table/src/events/set-view-fields.event.ts b/packages/table/src/events/set-view-fields.event.ts
index f3f80f3d5..41f8e7344 100644
--- a/packages/table/src/events/set-view-fields.event.ts
+++ b/packages/table/src/events/set-view-fields.event.ts
@@ -18,7 +18,10 @@ export type ISetViewFieldsEventPayload = z.infer<typeof setViewFieldsEventPayloa
 export class SetViewFieldsEvent extends BaseEvent<ISetViewFieldsEventPayload, typeof EVT_SET_VIEW_FIELDS> {
   name = EVT_SET_VIEW_FIELDS
 
-  constructor(public readonly payload: ISetViewFieldsEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: ISetViewFieldsEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/table/src/events/set-view-filter.event.ts b/packages/table/src/events/set-view-filter.event.ts
index b05a1d327..47842e6e5 100644
--- a/packages/table/src/events/set-view-filter.event.ts
+++ b/packages/table/src/events/set-view-filter.event.ts
@@ -17,7 +17,10 @@ export type ISetViewFilterEventPayload = z.infer<typeof setViewFilterEventPayloa
 export class SetViewFilterEvent extends BaseEvent<ISetViewFilterEventPayload, typeof EVT_SET_VIEW_FILTER> {
   name = EVT_SET_VIEW_FILTER
 
-  constructor(public readonly payload: ISetViewFilterEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: ISetViewFilterEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/table/src/events/set-view-option.event.ts b/packages/table/src/events/set-view-option.event.ts
index 9a6dd4f4f..0f8ca9266 100644
--- a/packages/table/src/events/set-view-option.event.ts
+++ b/packages/table/src/events/set-view-option.event.ts
@@ -17,7 +17,10 @@ export type ISetViewOptionEventPayload = z.infer<typeof setViewOptionEventPayloa
 export class SetViewOptionEvent extends BaseEvent<ISetViewOptionEventPayload, typeof EVT_SET_VIEW_OPTION> {
   name = EVT_SET_VIEW_OPTION
 
-  constructor(public readonly payload: ISetViewOptionEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: ISetViewOptionEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/table/src/events/set-view-sort.event.ts b/packages/table/src/events/set-view-sort.event.ts
index 72f291a0a..ddcdb9884 100644
--- a/packages/table/src/events/set-view-sort.event.ts
+++ b/packages/table/src/events/set-view-sort.event.ts
@@ -17,7 +17,10 @@ export type ISetViewSortEventPayload = z.infer<typeof setViewSortEventPayload>
 export class SetViewSortEvent extends BaseEvent<ISetViewSortEventPayload, typeof EVT_SET_VIEW_SORT> {
   name = EVT_SET_VIEW_SORT
 
-  constructor(public readonly payload: ISetViewSortEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: ISetViewSortEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/table/src/events/table-created.event.ts b/packages/table/src/events/table-created.event.ts
index d615de79d..42276d481 100644
--- a/packages/table/src/events/table-created.event.ts
+++ b/packages/table/src/events/table-created.event.ts
@@ -13,7 +13,10 @@ export type ITableCreatedEventPayload = z.infer<typeof tableCreatedEventPayload>
 export class TableCreatedEvent extends BaseEvent<ITableCreatedEventPayload, typeof EVT_TABLE_CREATED> {
   name = EVT_TABLE_CREATED
 
-  constructor(public readonly payload: ITableCreatedEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: ITableCreatedEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/table/src/events/view-created.event.ts b/packages/table/src/events/view-created.event.ts
index 76d0958db..bf74e537c 100644
--- a/packages/table/src/events/view-created.event.ts
+++ b/packages/table/src/events/view-created.event.ts
@@ -15,7 +15,10 @@ export type IViewCreatedEventPayload = z.infer<typeof viewCreatedEventPayload>
 export class ViewCreatedEvent extends BaseEvent<IViewCreatedEventPayload, typeof EVT_VIEW_CREATED> {
   name = EVT_VIEW_CREATED
 
-  constructor(public readonly payload: IViewCreatedEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: IViewCreatedEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/table/src/events/view-deleted.event.ts b/packages/table/src/events/view-deleted.event.ts
index 90ed17e26..eaaf24312 100644
--- a/packages/table/src/events/view-deleted.event.ts
+++ b/packages/table/src/events/view-deleted.event.ts
@@ -15,7 +15,10 @@ export type IViewDeletedEventPayload = z.infer<typeof viewDeletedEventPayload>
 export class ViewDeletedEvent extends BaseEvent<IViewDeletedEventPayload, typeof EVT_VIEW_DELETED> {
   name = EVT_VIEW_DELETED
 
-  constructor(public readonly payload: IViewDeletedEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: IViewDeletedEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/table/src/events/view-updated.event.ts b/packages/table/src/events/view-updated.event.ts
index 79fa8cf25..6049cef52 100644
--- a/packages/table/src/events/view-updated.event.ts
+++ b/packages/table/src/events/view-updated.event.ts
@@ -16,7 +16,10 @@ export type IViewUpdatedEventPayload = z.infer<typeof viewUpdatedEventPayload>
 export class ViewUpdatedEvent extends BaseEvent<IViewUpdatedEventPayload, typeof EVT_VIEW_UPDATED> {
   name = EVT_VIEW_UPDATED
 
-  constructor(public readonly payload: IViewUpdatedEventPayload) {
-    super(payload, undefined)
+  constructor(
+    public readonly payload: IViewUpdatedEventPayload,
+    spaceId: string,
+  ) {
+    super(payload, undefined, spaceId)
   }
 }
diff --git a/packages/table/src/methods/create-field.method.ts b/packages/table/src/methods/create-field.method.ts
index ead56a37e..72397d6fa 100644
--- a/packages/table/src/methods/create-field.method.ts
+++ b/packages/table/src/methods/create-field.method.ts
@@ -21,12 +21,15 @@ export function $createFieldSpec(this: TableDo, field: Field): Option<TableComos
 
   applyRules(new FieldNameShouldBeUnique(this.schema), new FieldIdShouldBeUnique(this.schema))
 
-  const event = new FieldCreatedEvent({
-    tableId: this.id.value,
-    field: createFieldSpec.field.toJSON(),
-    views: this.views.toJSON(),
-    forms: formAddFieldSpec?.forms.toJSON(),
-  })
+  const event = new FieldCreatedEvent(
+    {
+      tableId: this.id.value,
+      field: createFieldSpec.field.toJSON(),
+      views: this.views.toJSON(),
+      forms: formAddFieldSpec?.forms.toJSON(),
+    },
+    this.spaceId,
+  )
   this.addDomainEvent(event)
 
   return Some(spec)
diff --git a/packages/table/src/methods/create-view.method.ts b/packages/table/src/methods/create-view.method.ts
index 87f1e6c01..1032eb980 100644
--- a/packages/table/src/methods/create-view.method.ts
+++ b/packages/table/src/methods/create-view.method.ts
@@ -18,10 +18,13 @@ export function createViewMethod(
   const names = this.views.views.map((v) => v.name.value)
   applyRules(new ViewNameShouldBeUnique(names))
 
-  const event = new ViewCreatedEvent({
-    tableId: this.id.value,
-    view: view.toJSON(),
-  })
+  const event = new ViewCreatedEvent(
+    {
+      tableId: this.id.value,
+      view: view.toJSON(),
+    },
+    this.spaceId,
+  )
   this.addDomainEvent(event)
 
   return { spec: Some(spec), view }
diff --git a/packages/table/src/methods/delete-field.method.ts b/packages/table/src/methods/delete-field.method.ts
index 337fe1394..20201e91c 100644
--- a/packages/table/src/methods/delete-field.method.ts
+++ b/packages/table/src/methods/delete-field.method.ts
@@ -23,10 +23,13 @@ export function deleteFieldMethod(this: TableDo, dto: IDeleteFieldDTO): [Field,
 
   spec.mutate(this)
 
-  const event = new FieldDeletedEvent({
-    tableId: this.id.value,
-    field: field.toJSON(),
-  })
+  const event = new FieldDeletedEvent(
+    {
+      tableId: this.id.value,
+      field: field.toJSON(),
+    },
+    this.spaceId,
+  )
   this.addDomainEvent(event)
 
   return [field, Some(spec)]
diff --git a/packages/table/src/methods/delete-view.method.ts b/packages/table/src/methods/delete-view.method.ts
index 546392eb2..e5d0c5ba2 100644
--- a/packages/table/src/methods/delete-view.method.ts
+++ b/packages/table/src/methods/delete-view.method.ts
@@ -15,10 +15,13 @@ export function deleteViewMethod(this: TableDo, dto: IDeleteViewDTO): Option<Tab
   if (spec.isSome()) {
     spec.unwrap().mutate(this)
 
-    const event = new ViewDeletedEvent({
-      tableId: this.id.value,
-      viewId: view.id.value,
-    })
+    const event = new ViewDeletedEvent(
+      {
+        tableId: this.id.value,
+        viewId: view.id.value,
+      },
+      this.spaceId,
+    )
     this.addDomainEvent(event)
   }
 
diff --git a/packages/table/src/methods/duplicate-view.method.ts b/packages/table/src/methods/duplicate-view.method.ts
index 40169fe84..8264b1592 100644
--- a/packages/table/src/methods/duplicate-view.method.ts
+++ b/packages/table/src/methods/duplicate-view.method.ts
@@ -19,10 +19,13 @@ export function duplicateViewMethod(
   if (spec.isSome()) {
     spec.unwrap().mutate(this)
 
-    const event = new ViewCreatedEvent({
-      tableId: this.id.value,
-      view: view.toJSON(),
-    })
+    const event = new ViewCreatedEvent(
+      {
+        tableId: this.id.value,
+        view: view.toJSON(),
+      },
+      this.spaceId,
+    )
     this.addDomainEvent(event)
   }
 
diff --git a/packages/table/src/methods/set-table-form.method.ts b/packages/table/src/methods/set-table-form.method.ts
index b100b2523..7b43c4aae 100644
--- a/packages/table/src/methods/set-table-form.method.ts
+++ b/packages/table/src/methods/set-table-form.method.ts
@@ -10,11 +10,14 @@ export function setTableForm(this: TableDo, dto: ISetTableFormDTO): Option<Table
   if (!spec) return None
   spec.mutate(this)
 
-  const event = new SetTableFormEvent({
-    tableId: this.id.value,
-    previous: spec.previous ?? null,
-    form: spec.form.toJSON(),
-  })
+  const event = new SetTableFormEvent(
+    {
+      tableId: this.id.value,
+      previous: spec.previous ?? null,
+      form: spec.form.toJSON(),
+    },
+    this.spaceId,
+  )
   this.addDomainEvent(event)
 
   return Some(spec)
diff --git a/packages/table/src/methods/set-view-aggregate.method.ts b/packages/table/src/methods/set-view-aggregate.method.ts
index b297d409e..11c48eef5 100644
--- a/packages/table/src/methods/set-view-aggregate.method.ts
+++ b/packages/table/src/methods/set-view-aggregate.method.ts
@@ -1,7 +1,6 @@
 import type { Option } from "@undb/domain"
 import type { ISetViewAggregateDTO } from "../dto"
 import { SetViewAggregateEvent } from "../events"
-import { ViewIdVo } from "../modules"
 import type { TableComositeSpecification } from "../specifications"
 import type { TableDo } from "../table.do"
 
@@ -12,12 +11,15 @@ export function setViewAggregate(this: TableDo, dto: ISetViewAggregateDTO): Opti
   if (spec.isSome()) {
     spec.unwrap().mutate(this)
 
-    const event = new SetViewAggregateEvent({
-      tableId: this.id.value,
-      viewId: view.id.value,
-      previous: spec.unwrap().previous.into(null) ?? null,
-      aggregate: view.aggregate.into(null)?.value ?? null,
-    })
+    const event = new SetViewAggregateEvent(
+      {
+        tableId: this.id.value,
+        viewId: view.id.value,
+        previous: spec.unwrap().previous.into(null) ?? null,
+        aggregate: view.aggregate.into(null)?.value ?? null,
+      },
+      this.spaceId,
+    )
     this.addDomainEvent(event)
   }
 
diff --git a/packages/table/src/methods/set-view-color.method.ts b/packages/table/src/methods/set-view-color.method.ts
index 8d80acbe7..aff0db324 100644
--- a/packages/table/src/methods/set-view-color.method.ts
+++ b/packages/table/src/methods/set-view-color.method.ts
@@ -1,7 +1,6 @@
 import type { Option } from "@undb/domain"
 import type { ISetViewColorDTO } from "../dto"
 import { SetViewColorEvent } from "../events"
-import { ViewIdVo } from "../modules"
 import type { TableComositeSpecification } from "../specifications"
 import type { TableDo } from "../table.do"
 
@@ -12,12 +11,15 @@ export function setViewColor(this: TableDo, dto: ISetViewColorDTO): Option<Table
   if (spec.isSome()) {
     spec.unwrap().mutate(this)
 
-    const event = new SetViewColorEvent({
-      tableId: this.id.value,
-      viewId: view.id.value,
-      previous: spec.unwrap().prefiousColor.into(null) ?? null,
-      color: view.color.into(null)?.toJSON() ?? null,
-    })
+    const event = new SetViewColorEvent(
+      {
+        tableId: this.id.value,
+        viewId: view.id.value,
+        previous: spec.unwrap().prefiousColor.into(null) ?? null,
+        color: view.color.into(null)?.toJSON() ?? null,
+      },
+      this.spaceId,
+    )
     this.addDomainEvent(event)
   }
 
diff --git a/packages/table/src/methods/set-view-fields.method.ts b/packages/table/src/methods/set-view-fields.method.ts
index c02da04fa..2beee2b28 100644
--- a/packages/table/src/methods/set-view-fields.method.ts
+++ b/packages/table/src/methods/set-view-fields.method.ts
@@ -1,7 +1,6 @@
 import type { Option } from "@undb/domain"
 import type { ISetViewFieldsDTO } from "../dto"
 import { SetViewFieldsEvent } from "../events"
-import { ViewIdVo } from "../modules"
 import type { TableComositeSpecification } from "../specifications"
 import type { TableDo } from "../table.do"
 
@@ -12,12 +11,15 @@ export function setViewFields(this: TableDo, dto: ISetViewFieldsDTO): Option<Tab
   if (spec.isSome()) {
     spec.unwrap().mutate(this)
 
-    const event = new SetViewFieldsEvent({
-      tableId: this.id.value,
-      viewId: view.id.value,
-      previous: spec.unwrap().previous.into(null) ?? null,
-      fields: view.fields.into(null)?.toJSON() ?? null,
-    })
+    const event = new SetViewFieldsEvent(
+      {
+        tableId: this.id.value,
+        viewId: view.id.value,
+        previous: spec.unwrap().previous.into(null) ?? null,
+        fields: view.fields.into(null)?.toJSON() ?? null,
+      },
+      this.spaceId,
+    )
     this.addDomainEvent(event)
   }
 
diff --git a/packages/table/src/methods/set-view-filter.method.ts b/packages/table/src/methods/set-view-filter.method.ts
index d32aec78a..39df1c617 100644
--- a/packages/table/src/methods/set-view-filter.method.ts
+++ b/packages/table/src/methods/set-view-filter.method.ts
@@ -11,12 +11,15 @@ export function setViewFilter(this: TableDo, dto: ISetViewFilterDTO): Option<Tab
   if (spec.isSome()) {
     spec.unwrap().mutate(this)
 
-    const event = new SetViewFilterEvent({
-      tableId: this.id.value,
-      viewId: view.id.value,
-      previous: spec.unwrap().prefiousFilter.into(null) ?? null,
-      filter: view.filter.into(null)?.toJSON() ?? null,
-    })
+    const event = new SetViewFilterEvent(
+      {
+        tableId: this.id.value,
+        viewId: view.id.value,
+        previous: spec.unwrap().prefiousFilter.into(null) ?? null,
+        filter: view.filter.into(null)?.toJSON() ?? null,
+      },
+      this.spaceId,
+    )
     this.addDomainEvent(event)
   }
 
diff --git a/packages/table/src/methods/set-view-option.method.ts b/packages/table/src/methods/set-view-option.method.ts
index e37305ab0..d13a5161c 100644
--- a/packages/table/src/methods/set-view-option.method.ts
+++ b/packages/table/src/methods/set-view-option.method.ts
@@ -1,7 +1,6 @@
 import type { Option } from "@undb/domain"
 import type { ISetViewOptionDTO } from "../dto"
 import { SetViewOptionEvent } from "../events"
-import { ViewIdVo } from "../modules"
 import type { TableComositeSpecification } from "../specifications"
 import type { TableDo } from "../table.do"
 
@@ -12,12 +11,15 @@ export function setViewOption(this: TableDo, dto: ISetViewOptionDTO): Option<Tab
   if (spec.isSome()) {
     spec.unwrap().mutate(this)
 
-    const event = new SetViewOptionEvent({
-      tableId: this.id.value,
-      viewId: view.id.value,
-      previous: spec.unwrap().previous.into(null) ?? null,
-      option: view.option.into(null)?.toJSON() ?? null,
-    })
+    const event = new SetViewOptionEvent(
+      {
+        tableId: this.id.value,
+        viewId: view.id.value,
+        previous: spec.unwrap().previous.into(null) ?? null,
+        option: view.option.into(null)?.toJSON() ?? null,
+      },
+      this.spaceId,
+    )
     this.addDomainEvent(event)
   }
 
diff --git a/packages/table/src/methods/set-view-sort.method.ts b/packages/table/src/methods/set-view-sort.method.ts
index 36818ff91..7f1f8da17 100644
--- a/packages/table/src/methods/set-view-sort.method.ts
+++ b/packages/table/src/methods/set-view-sort.method.ts
@@ -1,7 +1,6 @@
 import { applyRules, type Option } from "@undb/domain"
 import type { ISetViewSortDTO } from "../dto"
 import { SetViewSortEvent } from "../events"
-import { ViewIdVo } from "../modules"
 import { ViewSortShouldBeSortable } from "../rules/view-sort-should-be-sortable.rule"
 import { ViewSortShouldNotDuplicated } from "../rules/view-sort-should-not-duplicated.rule"
 import type { TableComositeSpecification } from "../specifications"
@@ -19,12 +18,15 @@ export function setViewSort(this: TableDo, dto: ISetViewSortDTO): Option<TableCo
   if (spec.isSome()) {
     spec.unwrap().mutate(this)
 
-    const event = new SetViewSortEvent({
-      tableId: this.id.value,
-      viewId: view.id.value,
-      previous: spec.unwrap().previous.into(null) ?? null,
-      sort: view.sort.into(null)?.toJSON() ?? null,
-    })
+    const event = new SetViewSortEvent(
+      {
+        tableId: this.id.value,
+        viewId: view.id.value,
+        previous: spec.unwrap().previous.into(null) ?? null,
+        sort: view.sort.into(null)?.toJSON() ?? null,
+      },
+      this.spaceId,
+    )
     this.addDomainEvent(event)
   }
 
diff --git a/packages/table/src/methods/update-field.method.ts b/packages/table/src/methods/update-field.method.ts
index 03b6bd030..a9d73ecc9 100644
--- a/packages/table/src/methods/update-field.method.ts
+++ b/packages/table/src/methods/update-field.method.ts
@@ -13,11 +13,14 @@ export function updateFieldMethod(this: TableDo, dto: IUpdateFieldDTO): Option<T
 
   applyRules(new FieldNameShouldBeUnique(this.schema), new FieldIdShouldBeUnique(this.schema))
 
-  const event = new FieldUpdatedEvent({
-    tableId: this.id.value,
-    field: spec.field.toJSON(),
-    previous: spec.previous.toJSON(),
-  })
+  const event = new FieldUpdatedEvent(
+    {
+      tableId: this.id.value,
+      field: spec.field.toJSON(),
+      previous: spec.previous.toJSON(),
+    },
+    this.spaceId,
+  )
   this.addDomainEvent(event)
 
   return Some(spec)
diff --git a/packages/table/src/methods/update-view.method.ts b/packages/table/src/methods/update-view.method.ts
index 03e0d9252..2a1627879 100644
--- a/packages/table/src/methods/update-view.method.ts
+++ b/packages/table/src/methods/update-view.method.ts
@@ -15,11 +15,14 @@ export function updateView(this: TableDo, dto: IUpdateViewDTO): Option<TableComo
     const names = this.views.views.map((v) => v.name.value)
     applyRules(new ViewNameShouldBeUnique(names))
 
-    const event = new ViewUpdatedEvent({
-      tableId: this.id.value,
-      previous: spec.unwrap().previous.toJSON() ?? null,
-      view: view?.toJSON() ?? null,
-    })
+    const event = new ViewUpdatedEvent(
+      {
+        tableId: this.id.value,
+        previous: spec.unwrap().previous.toJSON() ?? null,
+        view: view?.toJSON() ?? null,
+      },
+      this.spaceId,
+    )
     this.addDomainEvent(event)
   }