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 21:37: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/project/repository/eventsourcing/model/oidc_config.go
+++ b/internal/project/repository/eventsourcing/model/oidc_config.go
@@ -8,7 +8,6 @@ import (

 	"github.com/zitadel/zitadel/internal/crypto"
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore"
 	es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models"
 	"github.com/zitadel/zitadel/internal/repository/project"
 )
@@ -75,7 +74,7 @@ func (key *ClientKey) AppendEvents(events ...*es_models.Event) error {

 func (key *ClientKey) AppendEvent(event *es_models.Event) (err error) {
 	key.ObjectRoot.AppendEvent(event)
-	switch eventstore.EventType(event.Type) {
+	switch event.Type() {
 	case project.ApplicationKeyAddedEventType:
 		err = json.Unmarshal(event.Data, key)
 		if err != nil {
--- a/internal/project/repository/eventsourcing/model/project.go
+++ b/internal/project/repository/eventsourcing/model/project.go
@@ -1,8 +1,6 @@
 package model

 import (
-	"encoding/json"
-
 	"github.com/zitadel/logging"

 	"github.com/zitadel/zitadel/internal/eventstore"
@@ -41,7 +39,7 @@ func ProjectToModel(project *Project) *model.Project {
 	}
 }

-func ProjectFromEvents(project *Project, events ...*es_models.Event) (*Project, error) {
+func ProjectFromEvents(project *Project, events ...eventstore.Event) (*Project, error) {
 	if project == nil {
 		project = &Project{}
 	}
@@ -49,7 +47,7 @@ func ProjectFromEvents(project *Project, events ...*es_models.Event) (*Project,
 	return project, project.AppendEvents(events...)
 }

-func (p *Project) AppendEvents(events ...*es_models.Event) error {
+func (p *Project) AppendEvents(events ...eventstore.Event) error {
 	for _, event := range events {
 		if err := p.AppendEvent(event); err != nil {
 			return err
@@ -58,10 +56,10 @@ func (p *Project) AppendEvents(events ...*es_models.Event) error {
 	return nil
 }

-func (p *Project) AppendEvent(event *es_models.Event) error {
+func (p *Project) AppendEvent(event eventstore.Event) error {
 	p.ObjectRoot.AppendEvent(event)

-	switch eventstore.EventType(event.Type) {
+	switch event.Type() {
 	case project.ProjectAddedType, project.ProjectChangedType:
 		return p.AppendAddProjectEvent(event)
 	case project.ProjectDeactivatedType:
@@ -78,7 +76,7 @@ func (p *Project) AppendEvent(event *es_models.Event) error {
 	return nil
 }

-func (p *Project) AppendAddProjectEvent(event *es_models.Event) error {
+func (p *Project) AppendAddProjectEvent(event eventstore.Event) error {
 	p.SetData(event)
 	p.State = int32(model.ProjectStateActive)
 	return nil
@@ -99,18 +97,18 @@ func (p *Project) appendRemovedEvent() error {
 	return nil
 }

-func (p *Project) appendOIDCConfig(event *es_models.Event) error {
+func (p *Project) appendOIDCConfig(event eventstore.Event) error {
 	appEvent := new(oidcApp)
-	if err := json.Unmarshal(event.Data, appEvent); err != nil {
+	if err := event.Unmarshal(p); err != nil {
 		return err
 	}
 	p.OIDCApplications = append(p.OIDCApplications, appEvent)
 	return nil
 }

-func (p *Project) appendApplicationRemoved(event *es_models.Event) error {
+func (p *Project) appendApplicationRemoved(event eventstore.Event) error {
 	appEvent := new(oidcApp)
-	if err := json.Unmarshal(event.Data, appEvent); err != nil {
+	if err := event.Unmarshal(appEvent); err != nil {
 		return err
 	}
 	for i := len(p.OIDCApplications) - 1; i >= 0; i-- {
@@ -124,8 +122,8 @@ func (p *Project) appendApplicationRemoved(event *es_models.Event) error {
 	return nil
 }

-func (p *Project) SetData(event *es_models.Event) error {
-	if err := json.Unmarshal(event.Data, p); err != nil {
+func (p *Project) SetData(event eventstore.Event) error {
+	if err := event.Unmarshal(p); err != nil {
 		logging.Log("EVEN-lo9sr").WithError(err).Error("could not unmarshal event data")
 		return err
 	}
--- a/internal/project/repository/eventsourcing/model/project_test.go
+++ b/internal/project/repository/eventsourcing/model/project_test.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"testing"

+	"github.com/zitadel/zitadel/internal/eventstore"
 	es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models"
 	"github.com/zitadel/zitadel/internal/project/model"
 	"github.com/zitadel/zitadel/internal/repository/project"
@@ -11,7 +12,7 @@ import (

 func TestProjectFromEvents(t *testing.T) {
 	type args struct {
-		event   []*es_models.Event
+		event   []eventstore.Event
 		project *Project
 	}
 	tests := []struct {
@@ -22,8 +23,8 @@ func TestProjectFromEvents(t *testing.T) {
 		{
 			name: "project from events, ok",
 			args: args{
-				event: []*es_models.Event{
-					{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ProjectAddedType)},
+				event: []eventstore.Event{
+					&es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ProjectAddedType},
 				},
 				project: &Project{Name: "ProjectName"},
 			},
@@ -32,8 +33,8 @@ func TestProjectFromEvents(t *testing.T) {
 		{
 			name: "project from events, nil project",
 			args: args{
-				event: []*es_models.Event{
-					{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ProjectAddedType)},
+				event: []eventstore.Event{
+					&es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ProjectAddedType},
 				},
 				project: nil,
 			},
@@ -44,7 +45,7 @@ func TestProjectFromEvents(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			if tt.args.project != nil {
 				data, _ := json.Marshal(tt.args.project)
-				tt.args.event[0].Data = data
+				tt.args.event[0].(*es_models.Event).Data = data
 			}
 			result, _ := ProjectFromEvents(tt.args.project, tt.args.event...)
 			if result.Name != tt.result.Name {
@@ -67,7 +68,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append added event",
 			args: args{
-				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ProjectAddedType)},
+				event:   &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ProjectAddedType},
 				project: &Project{Name: "ProjectName"},
 			},
 			result: &Project{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, State: int32(model.ProjectStateActive), Name: "ProjectName"},
@@ -75,7 +76,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append change event",
 			args: args{
-				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ProjectChangedType)},
+				event:   &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ProjectChangedType},
 				project: &Project{Name: "ProjectName"},
 			},
 			result: &Project{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, State: int32(model.ProjectStateActive), Name: "ProjectName"},
@@ -83,14 +84,14 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append deactivate event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ProjectDeactivatedType)},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ProjectDeactivatedType},
 			},
 			result: &Project{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, State: int32(model.ProjectStateInactive)},
 		},
 		{
 			name: "append reactivate event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ProjectReactivatedType)},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ProjectReactivatedType},
 			},
 			result: &Project{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, State: int32(model.ProjectStateActive)},
 		},
--- a/internal/project/repository/view/model/application.go
+++ b/internal/project/repository/view/model/application.go
@@ -10,7 +10,6 @@ import (
 	"github.com/zitadel/zitadel/internal/database"
 	"github.com/zitadel/zitadel/internal/domain"
 	caos_errs "github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/eventstore/v1/models"
 	"github.com/zitadel/zitadel/internal/project/model"
 	"github.com/zitadel/zitadel/internal/repository/project"
@@ -37,25 +36,25 @@ type ApplicationView struct {
 	HasProjectCheck        bool                          `json:"hasProjectCheck" gorm:"column:has_project_check"`
 	PrivateLabelingSetting domain.PrivateLabelingSetting `json:"privateLabelingSetting" gorm:"column:private_labeling_setting"`

-	IsOIDC                     bool                                        `json:"-" gorm:"column:is_oidc"`
-	OIDCVersion                int32                                       `json:"oidcVersion" gorm:"column:oidc_version"`
-	OIDCClientID               string                                      `json:"clientId" gorm:"column:oidc_client_id"`
-	OIDCRedirectUris           database.StringArray                        `json:"redirectUris" gorm:"column:oidc_redirect_uris"`
-	OIDCResponseTypes          database.EnumArray[domain.OIDCResponseType] `json:"responseTypes" gorm:"column:oidc_response_types"`
-	OIDCGrantTypes             database.EnumArray[domain.OIDCGrantType]    `json:"grantTypes" gorm:"column:oidc_grant_types"`
-	OIDCApplicationType        int32                                       `json:"applicationType" gorm:"column:oidc_application_type"`
-	OIDCAuthMethodType         int32                                       `json:"authMethodType" gorm:"column:oidc_auth_method_type"`
-	OIDCPostLogoutRedirectUris database.StringArray                        `json:"postLogoutRedirectUris" gorm:"column:oidc_post_logout_redirect_uris"`
-	NoneCompliant              bool                                        `json:"-" gorm:"column:none_compliant"`
-	ComplianceProblems         database.StringArray                        `json:"-" gorm:"column:compliance_problems"`
-	DevMode                    bool                                        `json:"devMode" gorm:"column:dev_mode"`
-	OriginAllowList            database.StringArray                        `json:"-" gorm:"column:origin_allow_list"`
-	AdditionalOrigins          database.StringArray                        `json:"additionalOrigins" gorm:"column:additional_origins"`
-	AccessTokenType            int32                                       `json:"accessTokenType" gorm:"column:access_token_type"`
-	AccessTokenRoleAssertion   bool                                        `json:"accessTokenRoleAssertion" gorm:"column:access_token_role_assertion"`
-	IDTokenRoleAssertion       bool                                        `json:"idTokenRoleAssertion" gorm:"column:id_token_role_assertion"`
-	IDTokenUserinfoAssertion   bool                                        `json:"idTokenUserinfoAssertion" gorm:"column:id_token_userinfo_assertion"`
-	ClockSkew                  time.Duration                               `json:"clockSkew" gorm:"column:clock_skew"`
+	IsOIDC                     bool                                    `json:"-" gorm:"column:is_oidc"`
+	OIDCVersion                int32                                   `json:"oidcVersion" gorm:"column:oidc_version"`
+	OIDCClientID               string                                  `json:"clientId" gorm:"column:oidc_client_id"`
+	OIDCRedirectUris           database.TextArray[string]              `json:"redirectUris" gorm:"column:oidc_redirect_uris"`
+	OIDCResponseTypes          database.Array[domain.OIDCResponseType] `json:"responseTypes" gorm:"column:oidc_response_types"`
+	OIDCGrantTypes             database.Array[domain.OIDCGrantType]    `json:"grantTypes" gorm:"column:oidc_grant_types"`
+	OIDCApplicationType        int32                                   `json:"applicationType" gorm:"column:oidc_application_type"`
+	OIDCAuthMethodType         int32                                   `json:"authMethodType" gorm:"column:oidc_auth_method_type"`
+	OIDCPostLogoutRedirectUris database.TextArray[string]              `json:"postLogoutRedirectUris" gorm:"column:oidc_post_logout_redirect_uris"`
+	NoneCompliant              bool                                    `json:"-" gorm:"column:none_compliant"`
+	ComplianceProblems         database.TextArray[string]              `json:"-" gorm:"column:compliance_problems"`
+	DevMode                    bool                                    `json:"devMode" gorm:"column:dev_mode"`
+	OriginAllowList            database.TextArray[string]              `json:"-" gorm:"column:origin_allow_list"`
+	AdditionalOrigins          database.TextArray[string]              `json:"additionalOrigins" gorm:"column:additional_origins"`
+	AccessTokenType            int32                                   `json:"accessTokenType" gorm:"column:access_token_type"`
+	AccessTokenRoleAssertion   bool                                    `json:"accessTokenRoleAssertion" gorm:"column:access_token_role_assertion"`
+	IDTokenRoleAssertion       bool                                    `json:"idTokenRoleAssertion" gorm:"column:id_token_role_assertion"`
+	IDTokenUserinfoAssertion   bool                                    `json:"idTokenUserinfoAssertion" gorm:"column:id_token_userinfo_assertion"`
+	ClockSkew                  time.Duration                           `json:"clockSkew" gorm:"column:clock_skew"`

 	IsSAML      bool   `json:"-" gorm:"column:is_saml"`
 	Metadata    []byte `json:"metadata" gorm:"column:metadata"`
@@ -82,7 +81,7 @@ func OIDCGrantTypesToModel(granttypes []domain.OIDCGrantType) []model.OIDCGrantT

 func (a *ApplicationView) AppendEventIfMyApp(event *models.Event) (err error) {
 	view := new(ApplicationView)
-	switch eventstore.EventType(event.Type) {
+	switch event.Type() {
 	case project.ApplicationAddedType:
 		err = view.SetData(event)
 		if err != nil {
@@ -120,9 +119,9 @@ func (a *ApplicationView) AppendEventIfMyApp(event *models.Event) (err error) {
 }

 func (a *ApplicationView) AppendEvent(event *models.Event) (err error) {
-	a.Sequence = event.Sequence
+	a.Sequence = event.Seq
 	a.ChangeDate = event.CreationDate
-	switch eventstore.EventType(event.Type) {
+	switch event.Type() {
 	case project.ApplicationAddedType:
 		a.setRootData(event)
 		a.CreationDate = event.CreationDate
@@ -180,7 +179,7 @@ func (a *ApplicationView) SetData(event *models.Event) error {
 }

 func (a *ApplicationView) setOriginAllowList() error {
-	allowList := make(database.StringArray, 0)
+	allowList := make(database.TextArray[string], 0)
 	for _, redirect := range a.OIDCRedirectUris {
 		origin, err := http_util.GetOriginFromURLString(redirect)
 		if err != nil {
--- a/internal/project/repository/view/model/application_test.go
+++ b/internal/project/repository/view/model/application_test.go
@@ -33,7 +33,7 @@ func TestApplicationAppendEvent(t *testing.T) {
 		{
 			name: "append added app event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ApplicationAddedType), Data: mockAppData(&es_model.Application{Name: "AppName"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ApplicationAddedType, Data: mockAppData(&es_model.Application{Name: "AppName"})},
 				app:   &ApplicationView{},
 			},
 			result: &ApplicationView{ProjectID: "AggregateID", Name: "AppName", State: int32(model.AppStateActive)},
@@ -41,7 +41,7 @@ func TestApplicationAppendEvent(t *testing.T) {
 		{
 			name: "append changed app event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ApplicationChangedType), Data: mockAppData(&es_model.Application{Name: "AppNameChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ApplicationChangedType, Data: mockAppData(&es_model.Application{Name: "AppNameChanged"})},
 				app:   &ApplicationView{ProjectID: "AggregateID", Name: "AppName", State: int32(model.AppStateActive)},
 			},
 			result: &ApplicationView{ProjectID: "AggregateID", Name: "AppNameChanged", State: int32(model.AppStateActive)},
@@ -49,7 +49,7 @@ func TestApplicationAppendEvent(t *testing.T) {
 		{
 			name: "append deactivate app event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ApplicationDeactivatedType)},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ApplicationDeactivatedType},
 				app:   &ApplicationView{ProjectID: "AggregateID", Name: "AppName", State: int32(model.AppStateActive)},
 			},
 			result: &ApplicationView{ProjectID: "AggregateID", Name: "AppName", State: int32(model.AppStateInactive)},
@@ -57,7 +57,7 @@ func TestApplicationAppendEvent(t *testing.T) {
 		{
 			name: "append reactivate app event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ApplicationReactivatedType)},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ApplicationReactivatedType},
 				app:   &ApplicationView{ProjectID: "AggregateID", Name: "AppName", State: int32(model.AppStateInactive)},
 			},
 			result: &ApplicationView{ProjectID: "AggregateID", Name: "AppName", State: int32(model.AppStateActive)},
@@ -65,7 +65,7 @@ func TestApplicationAppendEvent(t *testing.T) {
 		{
 			name: "append added oidc config event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.OIDCConfigAddedType), Data: mockOIDCConfigData(&es_model.OIDCConfig{ClientID: "clientID"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.OIDCConfigAddedType, Data: mockOIDCConfigData(&es_model.OIDCConfig{ClientID: "clientID"})},
 				app:   &ApplicationView{ProjectID: "AggregateID", Name: "AppName", State: int32(model.AppStateActive)},
 			},
 			result: &ApplicationView{ProjectID: "AggregateID", Name: "AppName", IsOIDC: true, OIDCClientID: "clientID", State: int32(model.AppStateActive)},
@@ -73,7 +73,7 @@ func TestApplicationAppendEvent(t *testing.T) {
 		{
 			name: "append changed oidc config event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.OIDCConfigAddedType), Data: mockOIDCConfigData(&es_model.OIDCConfig{ClientID: "clientIDChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.OIDCConfigAddedType, Data: mockOIDCConfigData(&es_model.OIDCConfig{ClientID: "clientIDChanged"})},
 				app:   &ApplicationView{ProjectID: "AggregateID", Name: "AppName", OIDCClientID: "clientID", State: int32(model.AppStateActive)},
 			},
 			result: &ApplicationView{ProjectID: "AggregateID", Name: "AppName", IsOIDC: true, OIDCClientID: "clientIDChanged", State: int32(model.AppStateActive)},
--- a/internal/project/repository/view/model/project.go
+++ b/internal/project/repository/view/model/project.go
@@ -8,7 +8,6 @@ import (

 	"github.com/zitadel/zitadel/internal/domain"
 	caos_errs "github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/eventstore/v1/models"
 	"github.com/zitadel/zitadel/internal/project/model"
 	"github.com/zitadel/zitadel/internal/repository/project"
@@ -36,8 +35,8 @@ type ProjectView struct {

 func (p *ProjectView) AppendEvent(event *models.Event) (err error) {
 	p.ChangeDate = event.CreationDate
-	p.Sequence = event.Sequence
-	switch eventstore.EventType(event.Type) {
+	p.Sequence = event.Seq
+	switch event.Type() {
 	case project.ProjectAddedType:
 		p.State = int32(model.ProjectStateActive)
 		p.CreationDate = event.CreationDate
@@ -70,11 +69,7 @@ func (p *ProjectView) setData(event *models.Event) error {

 func (p *ProjectView) setProjectData(event *models.Event) error {
 	project := new(ProjectView)
-	err := project.SetData(event)
-	if err != nil {
-		return err
-	}
-	return nil
+	return project.SetData(event)
 }

 func (p *ProjectView) SetData(event *models.Event) error {
--- a/internal/project/repository/view/model/project_grant.go
+++ b/internal/project/repository/view/model/project_grant.go
@@ -8,7 +8,6 @@ import (

 	"github.com/zitadel/zitadel/internal/database"
 	caos_errs "github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/eventstore/v1/models"
 	"github.com/zitadel/zitadel/internal/project/model"
 	"github.com/zitadel/zitadel/internal/repository/project"
@@ -24,18 +23,18 @@ const (
 )

 type ProjectGrantView struct {
-	GrantID           string               `json:"-" gorm:"column:grant_id;primary_key"`
-	ProjectID         string               `json:"-" gorm:"column:project_id"`
-	OrgID             string               `json:"-" gorm:"column:org_id"`
-	Name              string               `json:"name" gorm:"column:project_name"`
-	CreationDate      time.Time            `json:"-" gorm:"column:creation_date"`
-	ChangeDate        time.Time            `json:"-" gorm:"column:change_date"`
-	State             int32                `json:"-" gorm:"column:project_state"`
-	ResourceOwner     string               `json:"-" gorm:"column:resource_owner"`
-	ResourceOwnerName string               `json:"-" gorm:"column:resource_owner_name"`
-	OrgName           string               `json:"-" gorm:"column:org_name"`
-	Sequence          uint64               `json:"-" gorm:"column:sequence"`
-	GrantedRoleKeys   database.StringArray `json:"-" gorm:"column:granted_role_keys"`
+	GrantID           string                     `json:"-" gorm:"column:grant_id;primary_key"`
+	ProjectID         string                     `json:"-" gorm:"column:project_id"`
+	OrgID             string                     `json:"-" gorm:"column:org_id"`
+	Name              string                     `json:"name" gorm:"column:project_name"`
+	CreationDate      time.Time                  `json:"-" gorm:"column:creation_date"`
+	ChangeDate        time.Time                  `json:"-" gorm:"column:change_date"`
+	State             int32                      `json:"-" gorm:"column:project_state"`
+	ResourceOwner     string                     `json:"-" gorm:"column:resource_owner"`
+	ResourceOwnerName string                     `json:"-" gorm:"column:resource_owner_name"`
+	OrgName           string                     `json:"-" gorm:"column:org_name"`
+	Sequence          uint64                     `json:"-" gorm:"column:sequence"`
+	GrantedRoleKeys   database.TextArray[string] `json:"-" gorm:"column:granted_role_keys"`
 }

 type ProjectGrant struct {
@@ -47,8 +46,8 @@ type ProjectGrant struct {

 func (p *ProjectGrantView) AppendEvent(event *models.Event) (err error) {
 	p.ChangeDate = event.CreationDate
-	p.Sequence = event.Sequence
-	switch eventstore.EventType(event.Type) {
+	p.Sequence = event.Seq
+	switch event.Type() {
 	case project.GrantAddedType:
 		p.State = int32(model.ProjectStateActive)
 		p.CreationDate = event.CreationDate
--- a/internal/project/repository/view/model/project_grant_member.go
+++ b/internal/project/repository/view/model/project_grant_member.go
@@ -8,7 +8,6 @@ import (

 	"github.com/zitadel/zitadel/internal/database"
 	caos_errs "github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/eventstore/v1/models"
 	"github.com/zitadel/zitadel/internal/repository/project"
 )
@@ -24,28 +23,28 @@ const (
 )

 type ProjectGrantMemberView struct {
-	UserID             string               `json:"userId" gorm:"column:user_id;primary_key"`
-	GrantID            string               `json:"grantId" gorm:"column:grant_id;primary_key"`
-	ProjectID          string               `json:"-" gorm:"column:project_id"`
-	UserName           string               `json:"-" gorm:"column:user_name"`
-	Email              string               `json:"-" gorm:"column:email_address"`
-	FirstName          string               `json:"-" gorm:"column:first_name"`
-	LastName           string               `json:"-" gorm:"column:last_name"`
-	DisplayName        string               `json:"-" gorm:"column:display_name"`
-	Roles              database.StringArray `json:"roles" gorm:"column:roles"`
-	Sequence           uint64               `json:"-" gorm:"column:sequence"`
-	PreferredLoginName string               `json:"-" gorm:"column:preferred_login_name"`
-	AvatarKey          string               `json:"-" gorm:"column:avatar_key"`
-	UserResourceOwner  string               `json:"-" gorm:"column:user_resource_owner"`
+	UserID             string                     `json:"userId" gorm:"column:user_id;primary_key"`
+	GrantID            string                     `json:"grantId" gorm:"column:grant_id;primary_key"`
+	ProjectID          string                     `json:"-" gorm:"column:project_id"`
+	UserName           string                     `json:"-" gorm:"column:user_name"`
+	Email              string                     `json:"-" gorm:"column:email_address"`
+	FirstName          string                     `json:"-" gorm:"column:first_name"`
+	LastName           string                     `json:"-" gorm:"column:last_name"`
+	DisplayName        string                     `json:"-" gorm:"column:display_name"`
+	Roles              database.TextArray[string] `json:"roles" gorm:"column:roles"`
+	Sequence           uint64                     `json:"-" gorm:"column:sequence"`
+	PreferredLoginName string                     `json:"-" gorm:"column:preferred_login_name"`
+	AvatarKey          string                     `json:"-" gorm:"column:avatar_key"`
+	UserResourceOwner  string                     `json:"-" gorm:"column:user_resource_owner"`

 	CreationDate time.Time `json:"-" gorm:"column:creation_date"`
 	ChangeDate   time.Time `json:"-" gorm:"column:change_date"`
 }

 func (r *ProjectGrantMemberView) AppendEvent(event *models.Event) (err error) {
-	r.Sequence = event.Sequence
+	r.Sequence = event.Seq
 	r.ChangeDate = event.CreationDate
-	switch eventstore.EventType(event.Type) {
+	switch event.Type() {
 	case project.GrantMemberAddedType:
 		r.setRootData(event)
 		r.CreationDate = event.CreationDate
--- a/internal/project/repository/view/model/project_grant_member_test.go
+++ b/internal/project/repository/view/model/project_grant_member_test.go
@@ -28,7 +28,7 @@ func TestGrantedProjectMemberAppendEvent(t *testing.T) {
 		{
 			name: "append added member event",
 			args: args{
-				event:  &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.GrantMemberAddedType), ResourceOwner: "OrgID", Data: mockProjectGrantMemberData(&es_model.ProjectGrantMember{GrantID: "ProjectGrantID", UserID: "UserID", Roles: []string{"Role"}})},
+				event:  &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.GrantMemberAddedType, ResourceOwner: "OrgID", Data: mockProjectGrantMemberData(&es_model.ProjectGrantMember{GrantID: "ProjectGrantID", UserID: "UserID", Roles: []string{"Role"}})},
 				member: &ProjectGrantMemberView{},
 			},
 			result: &ProjectGrantMemberView{ProjectID: "AggregateID", UserID: "UserID", GrantID: "ProjectGrantID", Roles: []string{"Role"}},
@@ -36,7 +36,7 @@ func TestGrantedProjectMemberAppendEvent(t *testing.T) {
 		{
 			name: "append changed member event",
 			args: args{
-				event:  &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.GrantMemberAddedType), ResourceOwner: "OrgID", Data: mockProjectGrantMemberData(&es_model.ProjectGrantMember{GrantID: "ProjectGrantID", Roles: []string{"RoleChanged"}})},
+				event:  &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.GrantMemberAddedType, ResourceOwner: "OrgID", Data: mockProjectGrantMemberData(&es_model.ProjectGrantMember{GrantID: "ProjectGrantID", Roles: []string{"RoleChanged"}})},
 				member: &ProjectGrantMemberView{ProjectID: "AggregateID", UserID: "UserID", GrantID: "ProjectGrantID", Roles: []string{"Role"}},
 			},
 			result: &ProjectGrantMemberView{ProjectID: "AggregateID", UserID: "UserID", GrantID: "ProjectGrantID", Roles: []string{"RoleChanged"}},
--- a/internal/project/repository/view/model/project_grant_test.go
+++ b/internal/project/repository/view/model/project_grant_test.go
@@ -34,7 +34,7 @@ func TestProjectGrantAppendEvent(t *testing.T) {
 		{
 			name: "append added project grant event",
 			args: args{
-				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.GrantAddedType), ResourceOwner: "GrantedOrgID", Data: mockProjectGrantData(&es_model.ProjectGrant{GrantID: "ProjectGrantID", GrantedOrgID: "GrantedOrgID", RoleKeys: []string{"Role"}})},
+				event:   &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.GrantAddedType, ResourceOwner: "GrantedOrgID", Data: mockProjectGrantData(&es_model.ProjectGrant{GrantID: "ProjectGrantID", GrantedOrgID: "GrantedOrgID", RoleKeys: []string{"Role"}})},
 				project: &ProjectGrantView{},
 			},
 			result: &ProjectGrantView{ProjectID: "AggregateID", ResourceOwner: "GrantedOrgID", OrgID: "GrantedOrgID", State: int32(model.ProjectStateActive), GrantedRoleKeys: []string{"Role"}},
@@ -42,7 +42,7 @@ func TestProjectGrantAppendEvent(t *testing.T) {
 		{
 			name: "append change project grant event",
 			args: args{
-				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.GrantChangedType), ResourceOwner: "GrantedOrgID", Data: mockProjectGrantData(&es_model.ProjectGrant{GrantID: "ProjectGrantID", RoleKeys: []string{"RoleChanged"}})},
+				event:   &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.GrantChangedType, ResourceOwner: "GrantedOrgID", Data: mockProjectGrantData(&es_model.ProjectGrant{GrantID: "ProjectGrantID", RoleKeys: []string{"RoleChanged"}})},
 				project: &ProjectGrantView{ProjectID: "AggregateID", ResourceOwner: "GrantedOrgID", OrgID: "GrantedOrgID", State: int32(model.ProjectStateActive), GrantedRoleKeys: []string{"Role"}},
 			},
 			result: &ProjectGrantView{ProjectID: "AggregateID", ResourceOwner: "GrantedOrgID", OrgID: "GrantedOrgID", State: int32(model.ProjectStateActive), GrantedRoleKeys: []string{"RoleChanged"}},
@@ -50,7 +50,7 @@ func TestProjectGrantAppendEvent(t *testing.T) {
 		{
 			name: "append deactivate project grant event",
 			args: args{
-				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.GrantDeactivatedType), ResourceOwner: "GrantedOrgID", Data: mockProjectGrantData(&es_model.ProjectGrant{GrantID: "ProjectGrantID"})},
+				event:   &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.GrantDeactivatedType, ResourceOwner: "GrantedOrgID", Data: mockProjectGrantData(&es_model.ProjectGrant{GrantID: "ProjectGrantID"})},
 				project: &ProjectGrantView{ProjectID: "AggregateID", ResourceOwner: "GrantedOrgID", OrgID: "GrantedOrgID", State: int32(model.ProjectStateActive), GrantedRoleKeys: []string{"Role"}},
 			},
 			result: &ProjectGrantView{ProjectID: "AggregateID", ResourceOwner: "GrantedOrgID", OrgID: "GrantedOrgID", State: int32(model.ProjectStateInactive), GrantedRoleKeys: []string{"Role"}},
@@ -58,7 +58,7 @@ func TestProjectGrantAppendEvent(t *testing.T) {
 		{
 			name: "append reactivate project grant event",
 			args: args{
-				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.GrantReactivatedType), ResourceOwner: "GrantedOrgID", Data: mockProjectGrantData(&es_model.ProjectGrant{GrantID: "ProjectGrantID"})},
+				event:   &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.GrantReactivatedType, ResourceOwner: "GrantedOrgID", Data: mockProjectGrantData(&es_model.ProjectGrant{GrantID: "ProjectGrantID"})},
 				project: &ProjectGrantView{ProjectID: "AggregateID", ResourceOwner: "GrantedOrgID", OrgID: "GrantedOrgID", State: int32(model.ProjectStateInactive), GrantedRoleKeys: []string{"Role"}},
 			},
 			result: &ProjectGrantView{ProjectID: "AggregateID", ResourceOwner: "GrantedOrgID", OrgID: "GrantedOrgID", State: int32(model.ProjectStateActive), GrantedRoleKeys: []string{"Role"}},
--- a/internal/project/repository/view/model/project_member.go
+++ b/internal/project/repository/view/model/project_member.go
@@ -8,7 +8,6 @@ import (

 	"github.com/zitadel/zitadel/internal/database"
 	caos_errs "github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/eventstore/v1/models"
 	"github.com/zitadel/zitadel/internal/repository/project"
 )
@@ -23,27 +22,27 @@ const (
 )

 type ProjectMemberView struct {
-	UserID             string               `json:"userId" gorm:"column:user_id;primary_key"`
-	ProjectID          string               `json:"-" gorm:"column:project_id;primary_key"`
-	UserName           string               `json:"-" gorm:"column:user_name"`
-	Email              string               `json:"-" gorm:"column:email_address"`
-	FirstName          string               `json:"-" gorm:"column:first_name"`
-	LastName           string               `json:"-" gorm:"column:last_name"`
-	DisplayName        string               `json:"-" gorm:"column:display_name"`
-	Roles              database.StringArray `json:"roles" gorm:"column:roles"`
-	Sequence           uint64               `json:"-" gorm:"column:sequence"`
-	PreferredLoginName string               `json:"-" gorm:"column:preferred_login_name"`
-	AvatarKey          string               `json:"-" gorm:"column:avatar_key"`
-	UserResourceOwner  string               `json:"-" gorm:"column:user_resource_owner"`
+	UserID             string                     `json:"userId" gorm:"column:user_id;primary_key"`
+	ProjectID          string                     `json:"-" gorm:"column:project_id;primary_key"`
+	UserName           string                     `json:"-" gorm:"column:user_name"`
+	Email              string                     `json:"-" gorm:"column:email_address"`
+	FirstName          string                     `json:"-" gorm:"column:first_name"`
+	LastName           string                     `json:"-" gorm:"column:last_name"`
+	DisplayName        string                     `json:"-" gorm:"column:display_name"`
+	Roles              database.TextArray[string] `json:"roles" gorm:"column:roles"`
+	Sequence           uint64                     `json:"-" gorm:"column:sequence"`
+	PreferredLoginName string                     `json:"-" gorm:"column:preferred_login_name"`
+	AvatarKey          string                     `json:"-" gorm:"column:avatar_key"`
+	UserResourceOwner  string                     `json:"-" gorm:"column:user_resource_owner"`

 	CreationDate time.Time `json:"-" gorm:"column:creation_date"`
 	ChangeDate   time.Time `json:"-" gorm:"column:change_date"`
 }

 func (r *ProjectMemberView) AppendEvent(event *models.Event) (err error) {
-	r.Sequence = event.Sequence
+	r.Sequence = event.Seq
 	r.ChangeDate = event.CreationDate
-	switch eventstore.EventType(event.Type) {
+	switch event.Type() {
 	case project.MemberAddedType:
 		r.setRootData(event)
 		r.CreationDate = event.CreationDate
--- a/internal/project/repository/view/model/project_member_test.go
+++ b/internal/project/repository/view/model/project_member_test.go
@@ -28,7 +28,7 @@ func TestProjectMemberAppendEvent(t *testing.T) {
 		{
 			name: "append added member event",
 			args: args{
-				event:  &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.MemberAddedType), ResourceOwner: "OrgID", Data: mockProjectMemberData(&es_model.ProjectMember{UserID: "UserID", Roles: []string{"Role"}})},
+				event:  &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.MemberAddedType, ResourceOwner: "OrgID", Data: mockProjectMemberData(&es_model.ProjectMember{UserID: "UserID", Roles: []string{"Role"}})},
 				member: &ProjectMemberView{},
 			},
 			result: &ProjectMemberView{ProjectID: "AggregateID", UserID: "UserID", Roles: []string{"Role"}},
@@ -36,7 +36,7 @@ func TestProjectMemberAppendEvent(t *testing.T) {
 		{
 			name: "append changed member event",
 			args: args{
-				event:  &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.MemberAddedType), ResourceOwner: "OrgID", Data: mockProjectMemberData(&es_model.ProjectMember{UserID: "UserID", Roles: []string{"RoleChanged"}})},
+				event:  &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.MemberAddedType, ResourceOwner: "OrgID", Data: mockProjectMemberData(&es_model.ProjectMember{UserID: "UserID", Roles: []string{"RoleChanged"}})},
 				member: &ProjectMemberView{ProjectID: "AggregateID", UserID: "UserID", Roles: []string{"Role"}},
 			},
 			result: &ProjectMemberView{ProjectID: "AggregateID", UserID: "UserID", Roles: []string{"RoleChanged"}},
--- a/internal/project/repository/view/model/project_test.go
+++ b/internal/project/repository/view/model/project_test.go
@@ -22,7 +22,7 @@ func TestProjectAppendEvent(t *testing.T) {
 		{
 			name: "append added project event",
 			args: args{
-				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ProjectAddedType), ResourceOwner: "GrantedOrgID", Data: mockProjectData(&es_model.Project{Name: "ProjectName"})},
+				event:   &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ProjectAddedType, ResourceOwner: "GrantedOrgID", Data: mockProjectData(&es_model.Project{Name: "ProjectName"})},
 				project: &ProjectView{},
 			},
 			result: &ProjectView{ProjectID: "AggregateID", ResourceOwner: "GrantedOrgID", Name: "ProjectName", State: int32(model.ProjectStateActive)},
@@ -30,7 +30,7 @@ func TestProjectAppendEvent(t *testing.T) {
 		{
 			name: "append change project event",
 			args: args{
-				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ProjectChangedType), ResourceOwner: "GrantedOrgID", Data: mockProjectData(&es_model.Project{Name: "ProjectNameChanged"})},
+				event:   &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ProjectChangedType, ResourceOwner: "GrantedOrgID", Data: mockProjectData(&es_model.Project{Name: "ProjectNameChanged"})},
 				project: &ProjectView{ProjectID: "AggregateID", ResourceOwner: "GrantedOrgID", Name: "ProjectName", State: int32(model.ProjectStateActive)},
 			},
 			result: &ProjectView{ProjectID: "AggregateID", ResourceOwner: "GrantedOrgID", Name: "ProjectNameChanged", State: int32(model.ProjectStateActive)},
@@ -38,7 +38,7 @@ func TestProjectAppendEvent(t *testing.T) {
 		{
 			name: "append project deactivate event",
 			args: args{
-				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ProjectDeactivatedType), ResourceOwner: "GrantedOrgID"},
+				event:   &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ProjectDeactivatedType, ResourceOwner: "GrantedOrgID"},
 				project: &ProjectView{ProjectID: "AggregateID", ResourceOwner: "GrantedOrgID", Name: "ProjectName", State: int32(model.ProjectStateActive)},
 			},
 			result: &ProjectView{ProjectID: "AggregateID", ResourceOwner: "GrantedOrgID", Name: "ProjectName", State: int32(model.ProjectStateInactive)},
@@ -46,7 +46,7 @@ func TestProjectAppendEvent(t *testing.T) {
 		{
 			name: "append project reactivate event",
 			args: args{
-				event:   &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(project.ProjectReactivatedType), ResourceOwner: "GrantedOrgID"},
+				event:   &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: project.ProjectReactivatedType, ResourceOwner: "GrantedOrgID"},
 				project: &ProjectView{ProjectID: "AggregateID", ResourceOwner: "GrantedOrgID", Name: "ProjectName", State: int32(model.ProjectStateInactive)},
 			},
 			result: &ProjectView{ProjectID: "AggregateID", ResourceOwner: "GrantedOrgID", Name: "ProjectName", State: int32(model.ProjectStateActive)},
--- a/internal/project/repository/view/query.go
+++ b/internal/project/repository/view/query.go
@@ -2,28 +2,29 @@ package view

 import (
 	"github.com/zitadel/zitadel/internal/errors"
-	es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models"
+	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/repository/project"
 )

-func ProjectByIDQuery(id, instanceID string, latestSequence uint64) (*es_models.SearchQuery, error) {
+func ProjectByIDQuery(id, instanceID string, latestSequence uint64) (*eventstore.SearchQueryBuilder, error) {
 	if id == "" {
 		return nil, errors.ThrowPreconditionFailed(nil, "EVENT-dke74", "Errors.Project.ProjectIDMissing")
 	}
-	return es_models.NewSearchQuery().
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		InstanceID(instanceID).
+		AwaitOpenTransactions().
+		SequenceGreater(latestSequence).
 		AddQuery().
-		AggregateIDFilter(id).
-		AggregateTypeFilter(project.AggregateType).
-		LatestSequenceFilter(latestSequence).
-		InstanceIDFilter(instanceID).
-		EventTypesFilter(
-			es_models.EventType(project.ProjectAddedType),
-			es_models.EventType(project.ProjectChangedType),
-			es_models.EventType(project.ProjectDeactivatedType),
-			es_models.EventType(project.ProjectReactivatedType),
-			es_models.EventType(project.ProjectRemovedType),
-			es_models.EventType(project.OIDCConfigAddedType),
-			es_models.EventType(project.ApplicationRemovedType),
+		AggregateTypes(project.AggregateType).
+		AggregateIDs(id).
+		EventTypes(
+			project.ProjectAddedType,
+			project.ProjectChangedType,
+			project.ProjectDeactivatedType,
+			project.ProjectReactivatedType,
+			project.ProjectRemovedType,
+			project.OIDCConfigAddedType,
+			project.ApplicationRemovedType,
 		).
-		SearchQuery(), nil
+		Builder(), nil
 }