feat(eventstore): increase parallel write capabilities (#5940)

This implementation increases parallel write capabilities of the eventstore. Please have a look at the technical advisories: [05](https://zitadel.com/docs/support/advisory/a10005) and [06](https://zitadel.com/docs/support/advisory/a10006). The implementation of eventstore.push is rewritten and stored events are migrated to a new table `eventstore.events2`. If you are using cockroach: make sure that the database user of ZITADEL has `VIEWACTIVITY` grant. This is used to query events.
2025-08-11 19:17:32 +00:00 · 2023-10-19 12:19:10 +02:00
parent 259faba3f0
commit b5564572bc
791 changed files with 30326 additions and 43202 deletions
--- a/internal/repository/policy/custom_text.go
+++ b/internal/repository/policy/custom_text.go
@@ -1,13 +1,10 @@
 package policy

 import (
-	"encoding/json"
-
 	"golang.org/x/text/language"

 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )

 const (
@@ -26,11 +23,11 @@ type CustomTextSetEvent struct {
 	Text     string       `json:"text,omitempty"`
 }

-func (e *CustomTextSetEvent) Data() interface{} {
+func (e *CustomTextSetEvent) Payload() interface{} {
 	return e
 }

-func (e *CustomTextSetEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *CustomTextSetEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -50,12 +47,12 @@ func NewCustomTextSetEvent(
 	}
 }

-func CustomTextSetEventMapper(event *repository.Event) (eventstore.Event, error) {
+func CustomTextSetEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &CustomTextSetEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "TEXT-28dwe", "unable to unmarshal custom text")
 	}
@@ -71,11 +68,11 @@ type CustomTextRemovedEvent struct {
 	Language language.Tag `json:"language,omitempty"`
 }

-func (e *CustomTextRemovedEvent) Data() interface{} {
+func (e *CustomTextRemovedEvent) Payload() interface{} {
 	return e
 }

-func (e *CustomTextRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *CustomTextRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -88,12 +85,12 @@ func NewCustomTextRemovedEvent(base *eventstore.BaseEvent, template, key string,
 	}
 }

-func CustomTextRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func CustomTextRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &CustomTextRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "TEXT-28sMf", "unable to unmarshal custom text removed")
 	}
@@ -108,11 +105,11 @@ type CustomTextTemplateRemovedEvent struct {
 	Language language.Tag `json:"language,omitempty"`
 }

-func (e *CustomTextTemplateRemovedEvent) Data() interface{} {
+func (e *CustomTextTemplateRemovedEvent) Payload() interface{} {
 	return e
 }

-func (e *CustomTextTemplateRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *CustomTextTemplateRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -124,12 +121,12 @@ func NewCustomTextTemplateRemovedEvent(base *eventstore.BaseEvent, template stri
 	}
 }

-func CustomTextTemplateRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func CustomTextTemplateRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &CustomTextTemplateRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "TEXT-mKKRs", "unable to unmarshal custom text message removed")
 	}
--- a/internal/repository/policy/label.go
+++ b/internal/repository/policy/label.go
@@ -1,11 +1,8 @@
 package policy

 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 	"github.com/zitadel/zitadel/internal/repository/asset"
 )

@@ -48,11 +45,11 @@ type LabelPolicyAddedEvent struct {
 	DisableWatermark    bool   `json:"disableMsgPopup,omitempty"`
 }

-func (e *LabelPolicyAddedEvent) Data() interface{} {
+func (e *LabelPolicyAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *LabelPolicyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -87,12 +84,12 @@ func NewLabelPolicyAddedEvent(
 	}
 }

-func LabelPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &LabelPolicyAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-puqv4", "unable to unmarshal label policy")
 	}
@@ -116,11 +113,11 @@ type LabelPolicyChangedEvent struct {
 	DisableWatermark    *bool   `json:"disableWatermark,omitempty"`
 }

-func (e *LabelPolicyChangedEvent) Data() interface{} {
+func (e *LabelPolicyChangedEvent) Payload() interface{} {
 	return e
 }

-func (e *LabelPolicyChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -208,12 +205,12 @@ func ChangeDisableWatermark(disableWatermark bool) func(*LabelPolicyChangedEvent
 	}
 }

-func LabelPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &LabelPolicyChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-qhfFb", "unable to unmarshal label policy")
 	}
@@ -225,11 +222,11 @@ type LabelPolicyActivatedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }

-func (e *LabelPolicyActivatedEvent) Data() interface{} {
+func (e *LabelPolicyActivatedEvent) Payload() interface{} {
 	return e
 }

-func (e *LabelPolicyActivatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyActivatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -239,7 +236,7 @@ func NewLabelPolicyActivatedEvent(base *eventstore.BaseEvent) *LabelPolicyActiva
 	}
 }

-func LabelPolicyActivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyActivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &LabelPolicyActivatedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
@@ -249,11 +246,11 @@ type LabelPolicyRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }

-func (e *LabelPolicyRemovedEvent) Data() interface{} {
+func (e *LabelPolicyRemovedEvent) Payload() interface{} {
 	return e
 }

-func (e *LabelPolicyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -263,7 +260,7 @@ func NewLabelPolicyRemovedEvent(base *eventstore.BaseEvent) *LabelPolicyRemovedE
 	}
 }

-func LabelPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &LabelPolicyRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
@@ -273,11 +270,11 @@ type LabelPolicyLogoAddedEvent struct {
 	asset.AddedEvent
 }

-func (e *LabelPolicyLogoAddedEvent) Data() interface{} {
+func (e *LabelPolicyLogoAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *LabelPolicyLogoAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyLogoAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -287,7 +284,7 @@ func NewLabelPolicyLogoAddedEvent(base *eventstore.BaseEvent, storageKey string)
 	}
 }

-func LabelPolicyLogoAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyLogoAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.AddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -300,11 +297,11 @@ type LabelPolicyLogoRemovedEvent struct {
 	asset.RemovedEvent
 }

-func (e *LabelPolicyLogoRemovedEvent) Data() interface{} {
+func (e *LabelPolicyLogoRemovedEvent) Payload() interface{} {
 	return e
 }

-func (e *LabelPolicyLogoRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyLogoRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -314,7 +311,7 @@ func NewLabelPolicyLogoRemovedEvent(base *eventstore.BaseEvent, storageKey strin
 	}
 }

-func LabelPolicyLogoRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyLogoRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.RemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -327,11 +324,11 @@ type LabelPolicyIconAddedEvent struct {
 	asset.AddedEvent
 }

-func (e *LabelPolicyIconAddedEvent) Data() interface{} {
+func (e *LabelPolicyIconAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *LabelPolicyIconAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyIconAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -341,7 +338,7 @@ func NewLabelPolicyIconAddedEvent(base *eventstore.BaseEvent, storageKey string)
 	}
 }

-func LabelPolicyIconAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyIconAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.AddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -354,11 +351,11 @@ type LabelPolicyIconRemovedEvent struct {
 	asset.RemovedEvent
 }

-func (e *LabelPolicyIconRemovedEvent) Data() interface{} {
+func (e *LabelPolicyIconRemovedEvent) Payload() interface{} {
 	return e
 }

-func (e *LabelPolicyIconRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyIconRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -368,7 +365,7 @@ func NewLabelPolicyIconRemovedEvent(base *eventstore.BaseEvent, storageKey strin
 	}
 }

-func LabelPolicyIconRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyIconRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.RemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -381,11 +378,11 @@ type LabelPolicyLogoDarkAddedEvent struct {
 	asset.AddedEvent
 }

-func (e *LabelPolicyLogoDarkAddedEvent) Data() interface{} {
+func (e *LabelPolicyLogoDarkAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *LabelPolicyLogoDarkAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyLogoDarkAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -395,7 +392,7 @@ func NewLabelPolicyLogoDarkAddedEvent(base *eventstore.BaseEvent, storageKey str
 	}
 }

-func LabelPolicyLogoDarkAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyLogoDarkAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.AddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -408,11 +405,11 @@ type LabelPolicyLogoDarkRemovedEvent struct {
 	asset.RemovedEvent
 }

-func (e *LabelPolicyLogoDarkRemovedEvent) Data() interface{} {
+func (e *LabelPolicyLogoDarkRemovedEvent) Payload() interface{} {
 	return e
 }

-func (e *LabelPolicyLogoDarkRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyLogoDarkRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -422,7 +419,7 @@ func NewLabelPolicyLogoDarkRemovedEvent(base *eventstore.BaseEvent, storageKey s
 	}
 }

-func LabelPolicyLogoDarkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyLogoDarkRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.RemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -435,11 +432,11 @@ type LabelPolicyIconDarkAddedEvent struct {
 	asset.AddedEvent
 }

-func (e *LabelPolicyIconDarkAddedEvent) Data() interface{} {
+func (e *LabelPolicyIconDarkAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *LabelPolicyIconDarkAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyIconDarkAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -449,7 +446,7 @@ func NewLabelPolicyIconDarkAddedEvent(base *eventstore.BaseEvent, storageKey str
 	}
 }

-func LabelPolicyIconDarkAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyIconDarkAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.AddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -462,11 +459,11 @@ type LabelPolicyIconDarkRemovedEvent struct {
 	asset.RemovedEvent
 }

-func (e *LabelPolicyIconDarkRemovedEvent) Data() interface{} {
+func (e *LabelPolicyIconDarkRemovedEvent) Payload() interface{} {
 	return e
 }

-func (e *LabelPolicyIconDarkRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyIconDarkRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -476,7 +473,7 @@ func NewLabelPolicyIconDarkRemovedEvent(base *eventstore.BaseEvent, storageKey s
 	}
 }

-func LabelPolicyIconDarkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyIconDarkRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.RemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -489,11 +486,11 @@ type LabelPolicyFontAddedEvent struct {
 	asset.AddedEvent
 }

-func (e *LabelPolicyFontAddedEvent) Data() interface{} {
+func (e *LabelPolicyFontAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *LabelPolicyFontAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyFontAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -503,7 +500,7 @@ func NewLabelPolicyFontAddedEvent(base *eventstore.BaseEvent, storageKey string)
 	}
 }

-func LabelPolicyFontAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyFontAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.AddedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -516,11 +513,11 @@ type LabelPolicyFontRemovedEvent struct {
 	asset.RemovedEvent
 }

-func (e *LabelPolicyFontRemovedEvent) Data() interface{} {
+func (e *LabelPolicyFontRemovedEvent) Payload() interface{} {
 	return e
 }

-func (e *LabelPolicyFontRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyFontRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -530,7 +527,7 @@ func NewLabelPolicyFontRemovedEvent(base *eventstore.BaseEvent, storageKey strin
 	}
 }

-func LabelPolicyFontRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyFontRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e, err := asset.RemovedEventMapper(event)
 	if err != nil {
 		return nil, err
@@ -543,11 +540,11 @@ type LabelPolicyAssetsRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }

-func (e *LabelPolicyAssetsRemovedEvent) Data() interface{} {
+func (e *LabelPolicyAssetsRemovedEvent) Payload() interface{} {
 	return nil
 }

-func (e *LabelPolicyAssetsRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LabelPolicyAssetsRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -557,7 +554,7 @@ func NewLabelPolicyAssetsRemovedEvent(base *eventstore.BaseEvent) *LabelPolicyAs
 	}
 }

-func LabelPolicyAssetsRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LabelPolicyAssetsRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &LabelPolicyAssetsRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
--- a/internal/repository/policy/login.go
+++ b/internal/repository/policy/login.go
@@ -1,13 +1,11 @@
 package policy

 import (
-	"encoding/json"
 	"time"

 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )

 const (
@@ -39,11 +37,11 @@ type LoginPolicyAddedEvent struct {
 	MultiFactorCheckLifetime   time.Duration           `json:"multiFactorCheckLifetime,omitempty"`
 }

-func (e *LoginPolicyAddedEvent) Data() interface{} {
+func (e *LoginPolicyAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *LoginPolicyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LoginPolicyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -89,12 +87,12 @@ func NewLoginPolicyAddedEvent(
 	}
 }

-func LoginPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LoginPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &LoginPolicyAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-nWndT", "unable to unmarshal policy")
 	}
@@ -124,11 +122,11 @@ type LoginPolicyChangedEvent struct {
 	MultiFactorCheckLifetime   *time.Duration           `json:"multiFactorCheckLifetime,omitempty"`
 }

-func (e *LoginPolicyChangedEvent) Data() interface{} {
+func (e *LoginPolicyChangedEvent) Payload() interface{} {
 	return e
 }

-func (e *LoginPolicyChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LoginPolicyChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -252,12 +250,12 @@ func ChangeDisableLoginWithPhone(DisableLoginWithPhone bool) func(*LoginPolicyCh
 	}
 }

-func LoginPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LoginPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &LoginPolicyChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-ehssl", "unable to unmarshal policy")
 	}
@@ -269,11 +267,11 @@ type LoginPolicyRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }

-func (e *LoginPolicyRemovedEvent) Data() interface{} {
+func (e *LoginPolicyRemovedEvent) Payload() interface{} {
 	return nil
 }

-func (e *LoginPolicyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LoginPolicyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -283,7 +281,7 @@ func NewLoginPolicyRemovedEvent(base *eventstore.BaseEvent) *LoginPolicyRemovedE
 	}
 }

-func LoginPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LoginPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &LoginPolicyRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
--- a/internal/repository/policy/mail_template.go
+++ b/internal/repository/policy/mail_template.go
@@ -1,11 +1,8 @@
 package policy

 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )

 const (
@@ -22,11 +19,11 @@ type MailTemplateAddedEvent struct {
 	Template []byte `json:"template,omitempty"`
 }

-func (e *MailTemplateAddedEvent) Data() interface{} {
+func (e *MailTemplateAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *MailTemplateAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *MailTemplateAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -40,12 +37,12 @@ func NewMailTemplateAddedEvent(
 	}
 }

-func MailTemplateAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTemplateAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &MailTemplateAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-5m9if", "unable to unmarshal mail template")
 	}
@@ -59,11 +56,11 @@ type MailTemplateChangedEvent struct {
 	Template *[]byte `json:"template,omitempty"`
 }

-func (e *MailTemplateChangedEvent) Data() interface{} {
+func (e *MailTemplateChangedEvent) Payload() interface{} {
 	return e
 }

-func (e *MailTemplateChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *MailTemplateChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -91,12 +88,12 @@ func ChangeTemplate(template []byte) func(*MailTemplateChangedEvent) {
 	}
 }

-func MailTemplateChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTemplateChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &MailTemplateChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-3uu8K", "unable to unmarshal mail template policy")
 	}
@@ -108,11 +105,11 @@ type MailTemplateRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }

-func (e *MailTemplateRemovedEvent) Data() interface{} {
+func (e *MailTemplateRemovedEvent) Payload() interface{} {
 	return nil
 }

-func (e *MailTemplateRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *MailTemplateRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -122,7 +119,7 @@ func NewMailTemplateRemovedEvent(base *eventstore.BaseEvent) *MailTemplateRemove
 	}
 }

-func MailTemplateRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTemplateRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &MailTemplateRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
--- a/internal/repository/policy/mail_text.go
+++ b/internal/repository/policy/mail_text.go
@@ -1,12 +1,10 @@
 package policy

 import (
-	"encoding/json"
 	"fmt"

 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )

 const (
@@ -17,15 +15,15 @@ const (
 	MailTextPolicyRemovedEventType = mailTextPolicyPrefix + "removed"
 )

-func NewAddMailTextUniqueConstraint(aggregateID, mailTextType, langugage string) *eventstore.EventUniqueConstraint {
+func NewAddMailTextUniqueConstraint(aggregateID, mailTextType, langugage string) *eventstore.UniqueConstraint {
 	return eventstore.NewAddEventUniqueConstraint(
 		UniqueMailText,
 		fmt.Sprintf("%v:%v:%v", aggregateID, mailTextType, langugage),
 		"Errors.Org.AlreadyExists")
 }

-func NewRemoveMailTextUniqueConstraint(aggregateID, mailTextType, langugage string) *eventstore.EventUniqueConstraint {
-	return eventstore.NewRemoveEventUniqueConstraint(
+func NewRemoveMailTextUniqueConstraint(aggregateID, mailTextType, langugage string) *eventstore.UniqueConstraint {
+	return eventstore.NewRemoveUniqueConstraint(
 		UniqueMailText,
 		fmt.Sprintf("%v:%v:%v", aggregateID, mailTextType, langugage))
 }
@@ -43,12 +41,12 @@ type MailTextAddedEvent struct {
 	ButtonText   string `json:"buttonText,omitempty"`
 }

-func (e *MailTextAddedEvent) Data() interface{} {
+func (e *MailTextAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *MailTextAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewAddMailTextUniqueConstraint(e.Aggregate().ResourceOwner, e.MailTextType, e.Language)}
+func (e *MailTextAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewAddMailTextUniqueConstraint(e.Aggregate().ResourceOwner, e.MailTextType, e.Language)}
 }

 func NewMailTextAddedEvent(
@@ -75,12 +73,12 @@ func NewMailTextAddedEvent(
 	}
 }

-func MailTextAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTextAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &MailTextAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-5m9if", "unable to unmarshal mail text policy")
 	}
@@ -101,11 +99,11 @@ type MailTextChangedEvent struct {
 	ButtonText   *string `json:"buttonText,omitempty"`
 }

-func (e *MailTextChangedEvent) Data() interface{} {
+func (e *MailTextChangedEvent) Payload() interface{} {
 	return e
 }

-func (e *MailTextChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *MailTextChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -167,12 +165,12 @@ func ChangeButtonText(buttonText string) func(*MailTextChangedEvent) {
 	}
 }

-func MailTextChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTextChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &MailTextChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-bn88u", "unable to unmarshal mail text policy")
 	}
@@ -187,12 +185,12 @@ type MailTextRemovedEvent struct {
 	Language     string `json:"language,omitempty"`
 }

-func (e *MailTextRemovedEvent) Data() interface{} {
+func (e *MailTextRemovedEvent) Payload() interface{} {
 	return nil
 }

-func (e *MailTextRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
-	return []*eventstore.EventUniqueConstraint{NewRemoveMailTextUniqueConstraint(e.Aggregate().ResourceOwner, e.MailTextType, e.Language)}
+func (e *MailTextRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
+	return []*eventstore.UniqueConstraint{NewRemoveMailTextUniqueConstraint(e.Aggregate().ResourceOwner, e.MailTextType, e.Language)}
 }

 func NewMailTextRemovedEvent(base *eventstore.BaseEvent, mailTextType, language string) *MailTextRemovedEvent {
@@ -203,7 +201,7 @@ func NewMailTextRemovedEvent(base *eventstore.BaseEvent, mailTextType, language
 	}
 }

-func MailTextRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MailTextRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &MailTextRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
--- a/internal/repository/policy/policy_domain.go
+++ b/internal/repository/policy/policy_domain.go
@@ -1,12 +1,8 @@
 package policy

 import (
-	"encoding/json"
-
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 )

 const (
@@ -23,11 +19,11 @@ type DomainPolicyAddedEvent struct {
 	SMTPSenderAddressMatchesInstanceDomain bool `json:"smtpSenderAddressMatchesInstanceDomain,omitempty"`
 }

-func (e *DomainPolicyAddedEvent) Data() interface{} {
+func (e *DomainPolicyAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *DomainPolicyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *DomainPolicyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -46,12 +42,12 @@ func NewDomainPolicyAddedEvent(
 	}
 }

-func DomainPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &DomainPolicyAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-TvSmA", "unable to unmarshal policy")
 	}
@@ -67,11 +63,11 @@ type DomainPolicyChangedEvent struct {
 	SMTPSenderAddressMatchesInstanceDomain *bool `json:"smtpSenderAddressMatchesInstanceDomain,omitempty"`
 }

-func (e *DomainPolicyChangedEvent) Data() interface{} {
+func (e *DomainPolicyChangedEvent) Payload() interface{} {
 	return e
 }

-func (e *DomainPolicyChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *DomainPolicyChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -111,12 +107,12 @@ func ChangeSMTPSenderAddressMatchesInstanceDomain(smtpSenderAddressMatchesInstan
 	}
 }

-func DomainPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &DomainPolicyChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-0Pl9d", "unable to unmarshal policy")
 	}
@@ -128,11 +124,11 @@ type DomainPolicyRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }

-func (e *DomainPolicyRemovedEvent) Data() interface{} {
+func (e *DomainPolicyRemovedEvent) Payload() interface{} {
 	return nil
 }

-func (e *DomainPolicyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *DomainPolicyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -142,7 +138,7 @@ func NewDomainPolicyRemovedEvent(base *eventstore.BaseEvent) *DomainPolicyRemove
 	}
 }

-func DomainPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &DomainPolicyRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
--- a/internal/repository/policy/policy_login_factors.go
+++ b/internal/repository/policy/policy_login_factors.go
@@ -1,12 +1,9 @@
 package policy

 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )

 const (
@@ -35,12 +32,12 @@ func NewSecondFactorAddedEvent(
 	}
 }

-func SecondFactorAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SecondFactorAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &SecondFactorAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-Lp0dE", "unable to unmarshal policy")
 	}
@@ -48,11 +45,11 @@ func SecondFactorAddedEventMapper(event *repository.Event) (eventstore.Event, er
 	return e, nil
 }

-func (e *SecondFactorAddedEvent) Data() interface{} {
+func (e *SecondFactorAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *SecondFactorAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SecondFactorAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -71,12 +68,12 @@ func NewSecondFactorRemovedEvent(
 	}
 }

-func SecondFactorRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func SecondFactorRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &SecondFactorRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-5M9gd", "unable to unmarshal policy")
 	}
@@ -84,11 +81,11 @@ func SecondFactorRemovedEventMapper(event *repository.Event) (eventstore.Event,
 	return e, nil
 }

-func (e *SecondFactorRemovedEvent) Data() interface{} {
+func (e *SecondFactorRemovedEvent) Payload() interface{} {
 	return e
 }

-func (e *SecondFactorRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *SecondFactorRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -108,12 +105,12 @@ func NewMultiFactorAddedEvent(
 	}
 }

-func MultiFactorAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MultiFactorAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &MultiFactorAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-5Ms90", "unable to unmarshal policy")
 	}
@@ -121,11 +118,11 @@ func MultiFactorAddedEventMapper(event *repository.Event) (eventstore.Event, err
 	return e, nil
 }

-func (e *MultiFactorAddedEvent) Data() interface{} {
+func (e *MultiFactorAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *MultiFactorAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *MultiFactorAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -144,12 +141,12 @@ func NewMultiFactorRemovedEvent(
 	}
 }

-func MultiFactorRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func MultiFactorRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &MultiFactorRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-1N8sd", "unable to unmarshal policy")
 	}
@@ -157,10 +154,10 @@ func MultiFactorRemovedEventMapper(event *repository.Event) (eventstore.Event, e
 	return e, nil
 }

-func (e *MultiFactorRemovedEvent) Data() interface{} {
+func (e *MultiFactorRemovedEvent) Payload() interface{} {
 	return e
 }

-func (e *MultiFactorRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *MultiFactorRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }
--- a/internal/repository/policy/policy_login_identity_provider.go
+++ b/internal/repository/policy/policy_login_identity_provider.go
@@ -1,12 +1,9 @@
 package policy

 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )

 const (
@@ -23,11 +20,11 @@ type IdentityProviderAddedEvent struct {
 	IDPProviderType domain.IdentityProviderType `json:"idpProviderType,omitempty"`
 }

-func (e *IdentityProviderAddedEvent) Data() interface{} {
+func (e *IdentityProviderAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *IdentityProviderAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *IdentityProviderAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -44,12 +41,12 @@ func NewIdentityProviderAddedEvent(
 	}
 }

-func IdentityProviderAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IdentityProviderAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &IdentityProviderAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "PROVI-bfNnp", "Errors.Internal")
 	}
@@ -63,11 +60,11 @@ type IdentityProviderRemovedEvent struct {
 	IDPConfigID string `json:"idpConfigId"`
 }

-func (e *IdentityProviderRemovedEvent) Data() interface{} {
+func (e *IdentityProviderRemovedEvent) Payload() interface{} {
 	return e
 }

-func (e *IdentityProviderRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *IdentityProviderRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -81,12 +78,12 @@ func NewIdentityProviderRemovedEvent(
 	}
 }

-func IdentityProviderRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IdentityProviderRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &IdentityProviderRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "PROVI-6H0KQ", "Errors.Internal")
 	}
@@ -100,11 +97,11 @@ type IdentityProviderCascadeRemovedEvent struct {
 	IDPConfigID string `json:"idpConfigId"`
 }

-func (e *IdentityProviderCascadeRemovedEvent) Data() interface{} {
+func (e *IdentityProviderCascadeRemovedEvent) Payload() interface{} {
 	return e
 }

-func (e *IdentityProviderCascadeRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *IdentityProviderCascadeRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -118,12 +115,12 @@ func NewIdentityProviderCascadeRemovedEvent(
 	}
 }

-func IdentityProviderCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func IdentityProviderCascadeRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &IdentityProviderCascadeRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "PROVI-7M9fs", "Errors.Internal")
 	}
--- a/internal/repository/policy/policy_notification.go
+++ b/internal/repository/policy/policy_notification.go
@@ -1,11 +1,8 @@
 package policy

 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )

 const (
@@ -20,11 +17,11 @@ type NotificationPolicyAddedEvent struct {
 	PasswordChange bool `json:"passwordChange,omitempty"`
 }

-func (e *NotificationPolicyAddedEvent) Data() interface{} {
+func (e *NotificationPolicyAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *NotificationPolicyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *NotificationPolicyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -38,12 +35,12 @@ func NewNotificationPolicyAddedEvent(
 	}
 }

-func NotificationPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func NotificationPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &NotificationPolicyAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-0sp2nios", "unable to unmarshal policy")
 	}
@@ -57,11 +54,11 @@ type NotificationPolicyChangedEvent struct {
 	PasswordChange *bool `json:"passwordChange,omitempty"`
 }

-func (e *NotificationPolicyChangedEvent) Data() interface{} {
+func (e *NotificationPolicyChangedEvent) Payload() interface{} {
 	return e
 }

-func (e *NotificationPolicyChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *NotificationPolicyChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -89,12 +86,12 @@ func ChangePasswordChange(passwordChange bool) func(*NotificationPolicyChangedEv
 	}
 }

-func NotificationPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func NotificationPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &NotificationPolicyChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-09s2oss", "unable to unmarshal policy")
 	}
@@ -106,11 +103,11 @@ type NotificationPolicyRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }

-func (e *NotificationPolicyRemovedEvent) Data() interface{} {
+func (e *NotificationPolicyRemovedEvent) Payload() interface{} {
 	return nil
 }

-func (e *NotificationPolicyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *NotificationPolicyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -120,7 +117,7 @@ func NewNotificationPolicyRemovedEvent(base *eventstore.BaseEvent) *Notification
 	}
 }

-func NotificationPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func NotificationPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &NotificationPolicyRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
--- a/internal/repository/policy/policy_password_age.go
+++ b/internal/repository/policy/policy_password_age.go
@@ -1,11 +1,8 @@
 package policy

 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )

 const (
@@ -21,11 +18,11 @@ type PasswordAgePolicyAddedEvent struct {
 	MaxAgeDays     uint64 `json:"maxAgeDays,omitempty"`
 }

-func (e *PasswordAgePolicyAddedEvent) Data() interface{} {
+func (e *PasswordAgePolicyAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *PasswordAgePolicyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PasswordAgePolicyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -42,12 +39,12 @@ func NewPasswordAgePolicyAddedEvent(
 	}
 }

-func PasswordAgePolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordAgePolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &PasswordAgePolicyAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-T3mGp", "unable to unmarshal policy")
 	}
@@ -62,11 +59,11 @@ type PasswordAgePolicyChangedEvent struct {
 	MaxAgeDays     *uint64 `json:"maxAgeDays,omitempty"`
 }

-func (e *PasswordAgePolicyChangedEvent) Data() interface{} {
+func (e *PasswordAgePolicyChangedEvent) Payload() interface{} {
 	return e
 }

-func (e *PasswordAgePolicyChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PasswordAgePolicyChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -100,12 +97,12 @@ func ChangeMaxAgeDays(maxAgeDays uint64) func(*PasswordAgePolicyChangedEvent) {
 	}
 }

-func PasswordAgePolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordAgePolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &PasswordAgePolicyChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-PqaVq", "unable to unmarshal policy")
 	}
@@ -117,11 +114,11 @@ type PasswordAgePolicyRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }

-func (e *PasswordAgePolicyRemovedEvent) Data() interface{} {
+func (e *PasswordAgePolicyRemovedEvent) Payload() interface{} {
 	return nil
 }

-func (e *PasswordAgePolicyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PasswordAgePolicyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -131,7 +128,7 @@ func NewPasswordAgePolicyRemovedEvent(base *eventstore.BaseEvent) *PasswordAgePo
 	}
 }

-func PasswordAgePolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordAgePolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &PasswordAgePolicyRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
--- a/internal/repository/policy/policy_password_complexity.go
+++ b/internal/repository/policy/policy_password_complexity.go
@@ -1,12 +1,8 @@
 package policy

 import (
-	"encoding/json"
-
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 )

 const (
@@ -25,11 +21,11 @@ type PasswordComplexityPolicyAddedEvent struct {
 	HasSymbol    bool   `json:"hasSymbol,omitempty"`
 }

-func (e *PasswordComplexityPolicyAddedEvent) Data() interface{} {
+func (e *PasswordComplexityPolicyAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *PasswordComplexityPolicyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PasswordComplexityPolicyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -51,12 +47,12 @@ func NewPasswordComplexityPolicyAddedEvent(
 	}
 }

-func PasswordComplexityPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordComplexityPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &PasswordComplexityPolicyAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-wYxlM", "unable to unmarshal policy")
 	}
@@ -74,11 +70,11 @@ type PasswordComplexityPolicyChangedEvent struct {
 	HasSymbol    *bool   `json:"hasSymbol,omitempty"`
 }

-func (e *PasswordComplexityPolicyChangedEvent) Data() interface{} {
+func (e *PasswordComplexityPolicyChangedEvent) Payload() interface{} {
 	return e
 }

-func (e *PasswordComplexityPolicyChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PasswordComplexityPolicyChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -130,12 +126,12 @@ func ChangeHasSymbol(hasSymbol bool) func(*PasswordComplexityPolicyChangedEvent)
 	}
 }

-func PasswordComplexityPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordComplexityPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &PasswordComplexityPolicyChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-zBGB0", "unable to unmarshal policy")
 	}
@@ -147,11 +143,11 @@ type PasswordComplexityPolicyRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }

-func (e *PasswordComplexityPolicyRemovedEvent) Data() interface{} {
+func (e *PasswordComplexityPolicyRemovedEvent) Payload() interface{} {
 	return nil
 }

-func (e *PasswordComplexityPolicyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PasswordComplexityPolicyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -161,7 +157,7 @@ func NewPasswordComplexityPolicyRemovedEvent(base *eventstore.BaseEvent) *Passwo
 	}
 }

-func PasswordComplexityPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PasswordComplexityPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &PasswordComplexityPolicyRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
--- a/internal/repository/policy/policy_password_lockout.go
+++ b/internal/repository/policy/policy_password_lockout.go
@@ -1,12 +1,8 @@
 package policy

 import (
-	"encoding/json"
-
-	"github.com/zitadel/zitadel/internal/eventstore"
-
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
+	"github.com/zitadel/zitadel/internal/eventstore"
 )

 const (
@@ -22,11 +18,11 @@ type LockoutPolicyAddedEvent struct {
 	ShowLockOutFailures bool   `json:"showLockOutFailures,omitempty"`
 }

-func (e *LockoutPolicyAddedEvent) Data() interface{} {
+func (e *LockoutPolicyAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *LockoutPolicyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LockoutPolicyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -43,12 +39,12 @@ func NewLockoutPolicyAddedEvent(
 	}
 }

-func LockoutPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LockoutPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &LockoutPolicyAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-8XiVd", "unable to unmarshal policy")
 	}
@@ -63,11 +59,11 @@ type LockoutPolicyChangedEvent struct {
 	ShowLockOutFailures *bool   `json:"showLockOutFailures,omitempty"`
 }

-func (e *LockoutPolicyChangedEvent) Data() interface{} {
+func (e *LockoutPolicyChangedEvent) Payload() interface{} {
 	return e
 }

-func (e *LockoutPolicyChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LockoutPolicyChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -101,12 +97,12 @@ func ChangeShowLockOutFailures(showLockOutFailures bool) func(*LockoutPolicyChan
 	}
 }

-func LockoutPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LockoutPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &LockoutPolicyChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-lWGRc", "unable to unmarshal policy")
 	}
@@ -118,11 +114,11 @@ type LockoutPolicyRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }

-func (e *LockoutPolicyRemovedEvent) Data() interface{} {
+func (e *LockoutPolicyRemovedEvent) Payload() interface{} {
 	return nil
 }

-func (e *LockoutPolicyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *LockoutPolicyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -132,7 +128,7 @@ func NewLockoutPolicyRemovedEvent(base *eventstore.BaseEvent) *LockoutPolicyRemo
 	}
 }

-func LockoutPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func LockoutPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &LockoutPolicyRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil
--- a/internal/repository/policy/policy_privacy.go
+++ b/internal/repository/policy/policy_privacy.go
@@ -1,12 +1,9 @@
 package policy

 import (
-	"encoding/json"
-
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/repository"
 )

 const (
@@ -24,11 +21,11 @@ type PrivacyPolicyAddedEvent struct {
 	SupportEmail domain.EmailAddress `json:"supportEmail,omitempty"`
 }

-func (e *PrivacyPolicyAddedEvent) Data() interface{} {
+func (e *PrivacyPolicyAddedEvent) Payload() interface{} {
 	return e
 }

-func (e *PrivacyPolicyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PrivacyPolicyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -48,11 +45,11 @@ func NewPrivacyPolicyAddedEvent(
 	}
 }

-func PrivacyPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PrivacyPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &PrivacyPolicyAddedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}
-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-2k0fs", "unable to unmarshal policy")
 	}
@@ -69,11 +66,11 @@ type PrivacyPolicyChangedEvent struct {
 	SupportEmail *domain.EmailAddress `json:"supportEmail,omitempty"`
 }

-func (e *PrivacyPolicyChangedEvent) Data() interface{} {
+func (e *PrivacyPolicyChangedEvent) Payload() interface{} {
 	return e
 }

-func (e *PrivacyPolicyChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PrivacyPolicyChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -119,12 +116,12 @@ func ChangeSupportEmail(supportEmail domain.EmailAddress) func(*PrivacyPolicyCha
 	}
 }

-func PrivacyPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PrivacyPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	e := &PrivacyPolicyChangedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}

-	err := json.Unmarshal(event.Data, e)
+	err := event.Unmarshal(e)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "POLIC-22nf9", "unable to unmarshal policy")
 	}
@@ -136,11 +133,11 @@ type PrivacyPolicyRemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 }

-func (e *PrivacyPolicyRemovedEvent) Data() interface{} {
+func (e *PrivacyPolicyRemovedEvent) Payload() interface{} {
 	return nil
 }

-func (e *PrivacyPolicyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
+func (e *PrivacyPolicyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 	return nil
 }

@@ -150,7 +147,7 @@ func NewPrivacyPolicyRemovedEvent(base *eventstore.BaseEvent) *PrivacyPolicyRemo
 	}
 }

-func PrivacyPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func PrivacyPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
 	return &PrivacyPolicyRemovedEvent{
 		BaseEvent: *eventstore.BaseEventFromRepo(event),
 	}, nil