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.

internal/user/repository/eventsourcing/model/auth_request.go

@@ -1,13 +1,12 @@
 package model
 
 import (
-	"encoding/json"
 	"net"
 
 	"github.com/zitadel/logging"
 
 	caos_errs "github.com/zitadel/zitadel/internal/errors"
-	es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models"
+	"github.com/zitadel/zitadel/internal/eventstore"
 )
 
 type AuthRequest struct {
@@ -23,8 +22,8 @@ type BrowserInfo struct {
 	RemoteIP       net.IP `json:"remoteIP,omitempty"`
 }
 
-func (a *AuthRequest) SetData(event *es_models.Event) error {
-	if err := json.Unmarshal(event.Data, a); err != nil {
+func (a *AuthRequest) SetData(event eventstore.Event) error {
+	if err := event.Unmarshal(a); err != nil {
 		logging.Log("EVEN-T5df6").WithError(err).Error("could not unmarshal event data")
 		return caos_errs.ThrowInternal(err, "MODEL-yGmhh", "could not unmarshal event")
 	}

internal/user/repository/eventsourcing/model/otp.go

@@ -1,12 +1,11 @@
 package model
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/logging"
 
 	"github.com/zitadel/zitadel/internal/crypto"
 	caos_errs "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/user/model"
 )
@@ -22,7 +21,7 @@ type OTPVerified struct {
 	UserAgentID string `json:"userAgentID,omitempty"`
 }
 
-func (u *Human) appendOTPAddedEvent(event *es_models.Event) error {
+func (u *Human) appendOTPAddedEvent(event eventstore.Event) error {
 	u.OTP = &OTP{
 		State: int32(model.MFAStateNotReady),
 	}
@@ -37,17 +36,17 @@ func (u *Human) appendOTPRemovedEvent() {
 	u.OTP = nil
 }
 
-func (o *OTP) setData(event *es_models.Event) error {
+func (o *OTP) setData(event eventstore.Event) error {
 	o.ObjectRoot.AppendEvent(event)
-	if err := json.Unmarshal(event.Data, o); err != nil {
+	if err := event.Unmarshal(o); err != nil {
 		logging.Log("EVEN-d9soe").WithError(err).Error("could not unmarshal event data")
 		return caos_errs.ThrowInternal(err, "MODEL-lo023", "could not unmarshal event")
 	}
 	return nil
 }
 
-func (o *OTPVerified) SetData(event *es_models.Event) error {
-	if err := json.Unmarshal(event.Data, o); err != nil {
+func (o *OTPVerified) SetData(event eventstore.Event) error {
+	if err := event.Unmarshal(o); err != nil {
 		logging.Log("EVEN-BF421").WithError(err).Error("could not unmarshal event data")
 		return caos_errs.ThrowInternal(err, "MODEL-GB6hj", "could not unmarshal event")
 	}

internal/user/repository/eventsourcing/model/password.go

@@ -1,13 +1,13 @@
 package model
 
 import (
-	"encoding/json"
 	"time"
 
 	"github.com/zitadel/logging"
 
 	"github.com/zitadel/zitadel/internal/crypto"
 	caos_errs "github.com/zitadel/zitadel/internal/errors"
+	"github.com/zitadel/zitadel/internal/eventstore"
 	es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models"
 )
 
@@ -32,42 +32,42 @@ type PasswordChange struct {
 	UserAgentID string `json:"userAgentID,omitempty"`
 }
 
-func (u *Human) appendUserPasswordChangedEvent(event *es_models.Event) error {
+func (u *Human) appendUserPasswordChangedEvent(event eventstore.Event) error {
 	u.Password = new(Password)
 	err := u.Password.setData(event)
 	if err != nil {
 		return err
 	}
-	u.Password.ObjectRoot.CreationDate = event.CreationDate
+	u.Password.ObjectRoot.CreationDate = event.CreatedAt()
 	return nil
 }
 
-func (u *Human) appendPasswordSetRequestedEvent(event *es_models.Event) error {
+func (u *Human) appendPasswordSetRequestedEvent(event eventstore.Event) error {
 	u.PasswordCode = new(PasswordCode)
 	return u.PasswordCode.SetData(event)
 }
 
-func (pw *Password) setData(event *es_models.Event) error {
+func (pw *Password) setData(event eventstore.Event) error {
 	pw.ObjectRoot.AppendEvent(event)
-	if err := json.Unmarshal(event.Data, pw); err != nil {
+	if err := event.Unmarshal(pw); err != nil {
 		logging.Log("EVEN-dks93").WithError(err).Error("could not unmarshal event data")
 		return caos_errs.ThrowInternal(err, "MODEL-sl9xlo2rsw", "could not unmarshal event")
 	}
 	return nil
 }
 
-func (c *PasswordCode) SetData(event *es_models.Event) error {
+func (c *PasswordCode) SetData(event eventstore.Event) error {
 	c.ObjectRoot.AppendEvent(event)
-	c.CreationDate = event.CreationDate
-	if err := json.Unmarshal(event.Data, c); err != nil {
+	c.CreationDate = event.CreatedAt()
+	if err := event.Unmarshal(c); err != nil {
 		logging.Log("EVEN-lo0y2").WithError(err).Error("could not unmarshal event data")
 		return caos_errs.ThrowInternal(err, "MODEL-q21dr", "could not unmarshal event")
 	}
 	return nil
 }
 
-func (pw *PasswordChange) SetData(event *es_models.Event) error {
-	if err := json.Unmarshal(event.Data, pw); err != nil {
+func (pw *PasswordChange) SetData(event eventstore.Event) error {
+	if err := event.Unmarshal(pw); err != nil {
 		logging.Log("EVEN-ADs31").WithError(err).Error("could not unmarshal event data")
 		return caos_errs.ThrowInternal(err, "MODEL-BDd32", "could not unmarshal event")
 	}

internal/user/repository/eventsourcing/model/token.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"
 	es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models"
 	user_repo "github.com/zitadel/zitadel/internal/repository/user"
 )
@@ -16,13 +15,13 @@ import (
 type Token struct {
 	es_models.ObjectRoot
 
-	TokenID           string               `json:"tokenId" gorm:"column:token_id"`
-	ApplicationID     string               `json:"applicationId" gorm:"column:application_id"`
-	UserAgentID       string               `json:"userAgentId" gorm:"column:user_agent_id"`
-	Audience          database.StringArray `json:"audience" gorm:"column:audience"`
-	Scopes            database.StringArray `json:"scopes" gorm:"column:scopes"`
-	Expiration        time.Time            `json:"expiration" gorm:"column:expiration"`
-	PreferredLanguage string               `json:"preferredLanguage" gorm:"column:preferred_language"`
+	TokenID           string                     `json:"tokenId" gorm:"column:token_id"`
+	ApplicationID     string                     `json:"applicationId" gorm:"column:application_id"`
+	UserAgentID       string                     `json:"userAgentId" gorm:"column:user_agent_id"`
+	Audience          database.TextArray[string] `json:"audience" gorm:"column:audience"`
+	Scopes            database.TextArray[string] `json:"scopes" gorm:"column:scopes"`
+	Expiration        time.Time                  `json:"expiration" gorm:"column:expiration"`
+	PreferredLanguage string                     `json:"preferredLanguage" gorm:"column:preferred_language"`
 }
 
 func (t *Token) AppendEvents(events ...*es_models.Event) error {
@@ -36,8 +35,7 @@ func (t *Token) AppendEvents(events ...*es_models.Event) error {
 }
 
 func (t *Token) AppendEvent(event *es_models.Event) error {
-	switch eventstore.EventType(event.Type) {
-	case user_repo.UserTokenAddedType:
+	if event.Typ == user_repo.UserTokenAddedType {
 		err := t.setData(event)
 		if err != nil {
 			return err

internal/user/repository/eventsourcing/model/user.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/zitadel/zitadel/internal/errors"
 	caos_errs "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/user"
 	"github.com/zitadel/zitadel/internal/user/model"
@@ -40,7 +39,7 @@ func (u *User) AppendEvents(events ...*es_models.Event) error {
 func (u *User) AppendEvent(event *es_models.Event) error {
 	u.ObjectRoot.AppendEvent(event)
 
-	switch eventstore.EventType(event.Type) {
+	switch event.Type() {
 	case user.UserV1AddedType,
 		user.HumanAddedType,
 		user.MachineAddedEventType,
@@ -72,11 +71,11 @@ func (u *User) AppendEvent(event *es_models.Event) error {
 		u.Machine.user = u
 		return u.Machine.AppendEvent(event)
 	}
-	if strings.HasPrefix(string(event.Type), "user.human") || event.AggregateVersion == "v1" {
+	if strings.HasPrefix(string(event.Typ), "user.human") || event.AggregateVersion == "v1" {
 		u.Human = &Human{user: u}
 		return u.Human.AppendEvent(event)
 	}
-	if strings.HasPrefix(string(event.Type), "user.machine") {
+	if strings.HasPrefix(string(event.Typ), "user.machine") {
 		u.Machine = &Machine{user: u}
 		return u.Machine.AppendEvent(event)
 	}

internal/user/repository/eventsourcing/model/user_human.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/zitadel/zitadel/internal/crypto"
 	caos_errs "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/user"
 	"github.com/zitadel/zitadel/internal/user/model"
@@ -50,7 +49,7 @@ func (p *Human) AppendEvents(events ...*es_models.Event) error {
 }
 
 func (h *Human) AppendEvent(event *es_models.Event) (err error) {
-	switch eventstore.EventType(event.Type) {
+	switch event.Type() {
 	case user.UserV1AddedType,
 		user.UserV1RegisteredType,
 		user.UserV1ProfileChangedType,

internal/user/repository/eventsourcing/model/user_machine.go

@@ -7,7 +7,6 @@ import (
 	"github.com/zitadel/logging"
 
 	"github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore"
 	es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models"
 	user_repo "github.com/zitadel/zitadel/internal/repository/user"
 )
@@ -29,7 +28,7 @@ func (sa *Machine) AppendEvents(events ...*es_models.Event) error {
 }
 
 func (sa *Machine) AppendEvent(event *es_models.Event) (err error) {
-	switch eventstore.EventType(event.Type) {
+	switch event.Type() {
 	case user_repo.MachineAddedEventType, user_repo.MachineChangedEventType:
 		err = sa.setData(event)
 	}
@@ -66,7 +65,7 @@ func (key *MachineKey) AppendEvents(events ...*es_models.Event) error {
 
 func (key *MachineKey) AppendEvent(event *es_models.Event) (err error) {
 	key.ObjectRoot.AppendEvent(event)
-	switch eventstore.EventType(event.Type) {
+	switch event.Type() {
 	case user_repo.MachineKeyAddedEventType:
 		err = json.Unmarshal(event.Data, key)
 		if err != nil {

internal/user/repository/eventsourcing/model/web_auth_n.go

@@ -1,11 +1,10 @@
 package model
 
 import (
-	"encoding/json"
-
 	"github.com/zitadel/logging"
 
 	caos_errs "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/user/model"
 )
@@ -62,21 +61,21 @@ func GetWebauthn(webauthnTokens []*WebAuthNToken, id string) (int, *WebAuthNToke
 	return -1, nil
 }
 
-func (w *WebAuthNVerify) SetData(event *es_models.Event) error {
-	if err := json.Unmarshal(event.Data, w); err != nil {
+func (w *WebAuthNVerify) SetData(event eventstore.Event) error {
+	if err := event.Unmarshal(w); err != nil {
 		logging.Log("EVEN-G342rf").WithError(err).Error("could not unmarshal event data")
 		return caos_errs.ThrowInternal(err, "MODEL-B6641", "could not unmarshal event")
 	}
 	return nil
 }
 
-func (u *Human) appendU2FAddedEvent(event *es_models.Event) error {
+func (u *Human) appendU2FAddedEvent(event eventstore.Event) error {
 	webauthn := new(WebAuthNToken)
 	err := webauthn.setData(event)
 	if err != nil {
 		return err
 	}
-	webauthn.ObjectRoot.CreationDate = event.CreationDate
+	webauthn.ObjectRoot.CreationDate = event.CreatedAt()
 	webauthn.State = int32(model.MFAStateNotReady)
 	for i, token := range u.U2FTokens {
 		if token.State == int32(model.MFAStateNotReady) {
@@ -88,7 +87,7 @@ func (u *Human) appendU2FAddedEvent(event *es_models.Event) error {
 	return nil
 }
 
-func (u *Human) appendU2FVerifiedEvent(event *es_models.Event) error {
+func (u *Human) appendU2FVerifiedEvent(event eventstore.Event) error {
 	webauthn := new(WebAuthNToken)
 	err := webauthn.setData(event)
 	if err != nil {
@@ -105,7 +104,7 @@ func (u *Human) appendU2FVerifiedEvent(event *es_models.Event) error {
 	return caos_errs.ThrowPreconditionFailed(nil, "MODEL-4hu9s", "Errors.Users.MFA.U2F.NotExisting")
 }
 
-func (u *Human) appendU2FChangeSignCountEvent(event *es_models.Event) error {
+func (u *Human) appendU2FChangeSignCountEvent(event eventstore.Event) error {
 	webauthn := new(WebAuthNToken)
 	err := webauthn.setData(event)
 	if err != nil {
@@ -118,7 +117,7 @@ func (u *Human) appendU2FChangeSignCountEvent(event *es_models.Event) error {
 	return caos_errs.ThrowPreconditionFailed(nil, "MODEL-5Ms8h", "Errors.Users.MFA.U2F.NotExisting")
 }
 
-func (u *Human) appendU2FRemovedEvent(event *es_models.Event) error {
+func (u *Human) appendU2FRemovedEvent(event eventstore.Event) error {
 	webauthn := new(WebAuthNToken)
 	err := webauthn.setData(event)
 	if err != nil {
@@ -135,13 +134,13 @@ func (u *Human) appendU2FRemovedEvent(event *es_models.Event) error {
 	return nil
 }
 
-func (u *Human) appendPasswordlessAddedEvent(event *es_models.Event) error {
+func (u *Human) appendPasswordlessAddedEvent(event eventstore.Event) error {
 	webauthn := new(WebAuthNToken)
 	err := webauthn.setData(event)
 	if err != nil {
 		return err
 	}
-	webauthn.ObjectRoot.CreationDate = event.CreationDate
+	webauthn.ObjectRoot.CreationDate = event.CreatedAt()
 	webauthn.State = int32(model.MFAStateNotReady)
 	for i, token := range u.PasswordlessTokens {
 		if token.State == int32(model.MFAStateNotReady) {
@@ -153,7 +152,7 @@ func (u *Human) appendPasswordlessAddedEvent(event *es_models.Event) error {
 	return nil
 }
 
-func (u *Human) appendPasswordlessVerifiedEvent(event *es_models.Event) error {
+func (u *Human) appendPasswordlessVerifiedEvent(event eventstore.Event) error {
 	webauthn := new(WebAuthNToken)
 	err := webauthn.setData(event)
 	if err != nil {
@@ -170,7 +169,7 @@ func (u *Human) appendPasswordlessVerifiedEvent(event *es_models.Event) error {
 	return caos_errs.ThrowPreconditionFailed(nil, "MODEL-mKns8", "Errors.Users.MFA.Passwordless.NotExisting")
 }
 
-func (u *Human) appendPasswordlessChangeSignCountEvent(event *es_models.Event) error {
+func (u *Human) appendPasswordlessChangeSignCountEvent(event eventstore.Event) error {
 	webauthn := new(WebAuthNToken)
 	err := webauthn.setData(event)
 	if err != nil {
@@ -186,7 +185,7 @@ func (u *Human) appendPasswordlessChangeSignCountEvent(event *es_models.Event) e
 	return caos_errs.ThrowPreconditionFailed(nil, "MODEL-2Mv9s", "Errors.Users.MFA.Passwordless.NotExisting")
 }
 
-func (u *Human) appendPasswordlessRemovedEvent(event *es_models.Event) error {
+func (u *Human) appendPasswordlessRemovedEvent(event eventstore.Event) error {
 	webauthn := new(WebAuthNToken)
 	err := webauthn.setData(event)
 	if err != nil {
@@ -203,23 +202,23 @@ func (u *Human) appendPasswordlessRemovedEvent(event *es_models.Event) error {
 	return nil
 }
 
-func (w *WebAuthNToken) setData(event *es_models.Event) error {
+func (w *WebAuthNToken) setData(event eventstore.Event) error {
 	w.ObjectRoot.AppendEvent(event)
-	if err := json.Unmarshal(event.Data, w); err != nil {
+	if err := event.Unmarshal(w); err != nil {
 		logging.Log("EVEN-4M9is").WithError(err).Error("could not unmarshal event data")
 		return caos_errs.ThrowInternal(err, "MODEL-lo023", "could not unmarshal event")
 	}
 	return nil
 }
 
-func (u *Human) appendU2FLoginEvent(event *es_models.Event) error {
+func (u *Human) appendU2FLoginEvent(event eventstore.Event) error {
 	webauthn := new(WebAuthNLogin)
 	webauthn.ObjectRoot.AppendEvent(event)
 	err := webauthn.setData(event)
 	if err != nil {
 		return err
 	}
-	webauthn.ObjectRoot.CreationDate = event.CreationDate
+	webauthn.ObjectRoot.CreationDate = event.CreatedAt()
 	for i, token := range u.U2FLogins {
 		if token.AuthRequest.ID == webauthn.AuthRequest.ID {
 			u.U2FLogins[i] = webauthn
@@ -230,14 +229,14 @@ func (u *Human) appendU2FLoginEvent(event *es_models.Event) error {
 	return nil
 }
 
-func (u *Human) appendPasswordlessLoginEvent(event *es_models.Event) error {
+func (u *Human) appendPasswordlessLoginEvent(event eventstore.Event) error {
 	webauthn := new(WebAuthNLogin)
 	webauthn.ObjectRoot.AppendEvent(event)
 	err := webauthn.setData(event)
 	if err != nil {
 		return err
 	}
-	webauthn.ObjectRoot.CreationDate = event.CreationDate
+	webauthn.ObjectRoot.CreationDate = event.CreatedAt()
 	for i, token := range u.PasswordlessLogins {
 		if token.AuthRequest.ID == webauthn.AuthRequest.ID {
 			u.PasswordlessLogins[i] = webauthn
@@ -248,9 +247,9 @@ func (u *Human) appendPasswordlessLoginEvent(event *es_models.Event) error {
 	return nil
 }
 
-func (w *WebAuthNLogin) setData(event *es_models.Event) error {
+func (w *WebAuthNLogin) setData(event eventstore.Event) error {
 	w.ObjectRoot.AppendEvent(event)
-	if err := json.Unmarshal(event.Data, w); err != nil {
+	if err := event.Unmarshal(w); err != nil {
 		logging.Log("EVEN-hmSlo").WithError(err).Error("could not unmarshal event data")
 		return caos_errs.ThrowInternal(err, "MODEL-lo023", "could not unmarshal event")
 	}

internal/user/repository/view/model/external_idps.go

@@ -7,7 +7,6 @@ import (
 	"github.com/zitadel/logging"
 
 	caos_errs "github.com/zitadel/zitadel/internal/errors"
-	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/eventstore/v1/models"
 	user_repo "github.com/zitadel/zitadel/internal/repository/user"
 )
@@ -35,10 +34,9 @@ type ExternalIDPView struct {
 }
 
 func (i *ExternalIDPView) AppendEvent(event *models.Event) (err error) {
-	i.Sequence = event.Sequence
+	i.Sequence = event.Seq
 	i.ChangeDate = event.CreationDate
-	switch eventstore.EventType(event.Type) {
-	case user_repo.UserIDPLinkAddedType:
+	if event.Typ == user_repo.UserIDPLinkAddedType {
 		i.setRootData(event)
 		i.CreationDate = event.CreationDate
 		err = i.SetData(event)

internal/user/repository/view/model/notify_user.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"
 	org_model "github.com/zitadel/zitadel/internal/org/model"
 	"github.com/zitadel/zitadel/internal/repository/user"
@@ -22,27 +21,27 @@ const (
 )
 
 type NotifyUser struct {
-	ID                 string               `json:"-" gorm:"column:id;primary_key"`
-	CreationDate       time.Time            `json:"-" gorm:"column:creation_date"`
-	ChangeDate         time.Time            `json:"-" gorm:"column:change_date"`
-	ResourceOwner      string               `json:"-" gorm:"column:resource_owner"`
-	UserName           string               `json:"userName" gorm:"column:user_name"`
-	LoginNames         database.StringArray `json:"-" gorm:"column:login_names"`
-	PreferredLoginName string               `json:"-" gorm:"column:preferred_login_name"`
-	FirstName          string               `json:"firstName" gorm:"column:first_name"`
-	LastName           string               `json:"lastName" gorm:"column:last_name"`
-	NickName           string               `json:"nickName" gorm:"column:nick_name"`
-	DisplayName        string               `json:"displayName" gorm:"column:display_name"`
-	PreferredLanguage  string               `json:"preferredLanguage" gorm:"column:preferred_language"`
-	Gender             int32                `json:"gender" gorm:"column:gender"`
-	LastEmail          string               `json:"email" gorm:"column:last_email"`
-	VerifiedEmail      string               `json:"-" gorm:"column:verified_email"`
-	LastPhone          string               `json:"phone" gorm:"column:last_phone"`
-	VerifiedPhone      string               `json:"-" gorm:"column:verified_phone"`
-	PasswordSet        bool                 `json:"-" gorm:"column:password_set"`
-	Sequence           uint64               `json:"-" gorm:"column:sequence"`
-	State              int32                `json:"-" gorm:"-"`
-	InstanceID         string               `json:"instanceID" gorm:"column:instance_id;primary_key"`
+	ID                 string                     `json:"-" gorm:"column:id;primary_key"`
+	CreationDate       time.Time                  `json:"-" gorm:"column:creation_date"`
+	ChangeDate         time.Time                  `json:"-" gorm:"column:change_date"`
+	ResourceOwner      string                     `json:"-" gorm:"column:resource_owner"`
+	UserName           string                     `json:"userName" gorm:"column:user_name"`
+	LoginNames         database.TextArray[string] `json:"-" gorm:"column:login_names"`
+	PreferredLoginName string                     `json:"-" gorm:"column:preferred_login_name"`
+	FirstName          string                     `json:"firstName" gorm:"column:first_name"`
+	LastName           string                     `json:"lastName" gorm:"column:last_name"`
+	NickName           string                     `json:"nickName" gorm:"column:nick_name"`
+	DisplayName        string                     `json:"displayName" gorm:"column:display_name"`
+	PreferredLanguage  string                     `json:"preferredLanguage" gorm:"column:preferred_language"`
+	Gender             int32                      `json:"gender" gorm:"column:gender"`
+	LastEmail          string                     `json:"email" gorm:"column:last_email"`
+	VerifiedEmail      string                     `json:"-" gorm:"column:verified_email"`
+	LastPhone          string                     `json:"phone" gorm:"column:last_phone"`
+	VerifiedPhone      string                     `json:"-" gorm:"column:verified_phone"`
+	PasswordSet        bool                       `json:"-" gorm:"column:password_set"`
+	Sequence           uint64                     `json:"-" gorm:"column:sequence"`
+	State              int32                      `json:"-" gorm:"-"`
+	InstanceID         string                     `json:"instanceID" gorm:"column:instance_id;primary_key"`
 }
 
 func (u *NotifyUser) GenerateLoginName(domain string, appendDomain bool) string {
@@ -67,8 +66,8 @@ func (u *NotifyUser) SetLoginNames(userLoginMustBeDomain bool, domains []*org_mo
 
 func (u *NotifyUser) AppendEvent(event *models.Event) (err error) {
 	u.ChangeDate = event.CreationDate
-	u.Sequence = event.Sequence
-	switch eventstore.EventType(event.Type) {
+	u.Sequence = event.Seq
+	switch event.Type() {
 	case user.UserV1AddedType,
 		user.UserV1RegisteredType,
 		user.HumanRegisteredType,

internal/user/repository/view/model/notify_user_test.go

@@ -21,7 +21,7 @@ func TestNotifyUserAppendEvent(t *testing.T) {
 		{
 			name: "append added user event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1AddedType), ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(nil))},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1AddedType, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(nil))},
 				user:  &NotifyUser{},
 			},
 			result: &NotifyUser{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", FirstName: "FirstName", LastName: "LastName", LastEmail: "Email", LastPhone: "Phone"},
@@ -29,7 +29,7 @@ func TestNotifyUserAppendEvent(t *testing.T) {
 		{
 			name: "append added human event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.HumanAddedType), ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(nil))},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.HumanAddedType, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(nil))},
 				user:  &NotifyUser{},
 			},
 			result: &NotifyUser{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", FirstName: "FirstName", LastName: "LastName", LastEmail: "Email", LastPhone: "Phone"},
@@ -37,7 +37,7 @@ func TestNotifyUserAppendEvent(t *testing.T) {
 		{
 			name: "append change user profile event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1ProfileChangedType), ResourceOwner: "GrantedOrgID", Data: mockProfileData(&es_model.Profile{FirstName: "FirstNameChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1ProfileChangedType, ResourceOwner: "GrantedOrgID", Data: mockProfileData(&es_model.Profile{FirstName: "FirstNameChanged"})},
 				user:  &NotifyUser{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", FirstName: "FirstName", LastName: "LastName", LastEmail: "Email", LastPhone: "Phone"},
 			},
 			result: &NotifyUser{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", FirstName: "FirstNameChanged", LastName: "LastName", LastEmail: "Email", LastPhone: "Phone"},
@@ -45,7 +45,7 @@ func TestNotifyUserAppendEvent(t *testing.T) {
 		{
 			name: "append change user email event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1EmailChangedType), ResourceOwner: "GrantedOrgID", Data: mockEmailData(&es_model.Email{EmailAddress: "EmailChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1EmailChangedType, ResourceOwner: "GrantedOrgID", Data: mockEmailData(&es_model.Email{EmailAddress: "EmailChanged"})},
 				user:  &NotifyUser{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", FirstName: "FirstName", LastName: "LastName", LastEmail: "Email", LastPhone: "Phone"},
 			},
 			result: &NotifyUser{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", FirstName: "FirstName", LastName: "LastName", LastEmail: "EmailChanged", LastPhone: "Phone"},
@@ -53,7 +53,7 @@ func TestNotifyUserAppendEvent(t *testing.T) {
 		{
 			name: "append change user email event, existing email",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1EmailChangedType), ResourceOwner: "GrantedOrgID", Data: mockEmailData(&es_model.Email{EmailAddress: "EmailChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1EmailChangedType, ResourceOwner: "GrantedOrgID", Data: mockEmailData(&es_model.Email{EmailAddress: "EmailChanged"})},
 				user:  &NotifyUser{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", FirstName: "FirstName", LastName: "LastName", LastEmail: "Email", VerifiedEmail: "Email", LastPhone: "Phone"},
 			},
 			result: &NotifyUser{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", FirstName: "FirstName", LastName: "LastName", LastEmail: "EmailChanged", VerifiedEmail: "Email", LastPhone: "Phone"},
@@ -61,7 +61,7 @@ func TestNotifyUserAppendEvent(t *testing.T) {
 		{
 			name: "append verify user email event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1EmailVerifiedType), ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1EmailVerifiedType, ResourceOwner: "GrantedOrgID"},
 				user:  &NotifyUser{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", FirstName: "FirstName", LastName: "LastName", LastEmail: "Email", LastPhone: "Phone"},
 			},
 			result: &NotifyUser{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", FirstName: "FirstName", LastName: "LastName", LastEmail: "Email", VerifiedEmail: "Email", LastPhone: "Phone"},
@@ -69,7 +69,7 @@ func TestNotifyUserAppendEvent(t *testing.T) {
 		{
 			name: "append change user phone event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1PhoneChangedType), ResourceOwner: "GrantedOrgID", Data: mockPhoneData(&es_model.Phone{PhoneNumber: "PhoneChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1PhoneChangedType, ResourceOwner: "GrantedOrgID", Data: mockPhoneData(&es_model.Phone{PhoneNumber: "PhoneChanged"})},
 				user:  &NotifyUser{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", FirstName: "FirstName", LastName: "LastName", LastEmail: "Email", LastPhone: "Phone"},
 			},
 			result: &NotifyUser{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", FirstName: "FirstName", LastName: "LastName", LastEmail: "Email", LastPhone: "PhoneChanged"},
@@ -77,7 +77,7 @@ func TestNotifyUserAppendEvent(t *testing.T) {
 		{
 			name: "append change user phone event, existing phone",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1PhoneChangedType), ResourceOwner: "GrantedOrgID", Data: mockPhoneData(&es_model.Phone{PhoneNumber: "PhoneChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1PhoneChangedType, ResourceOwner: "GrantedOrgID", Data: mockPhoneData(&es_model.Phone{PhoneNumber: "PhoneChanged"})},
 				user:  &NotifyUser{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", FirstName: "FirstName", LastName: "LastName", LastEmail: "Email", LastPhone: "Phone", VerifiedPhone: "Phone"},
 			},
 			result: &NotifyUser{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", FirstName: "FirstName", LastName: "LastName", LastEmail: "Email", LastPhone: "PhoneChanged", VerifiedPhone: "Phone"},
@@ -85,7 +85,7 @@ func TestNotifyUserAppendEvent(t *testing.T) {
 		{
 			name: "append verify user phone event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1PhoneVerifiedType), ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1PhoneVerifiedType, ResourceOwner: "GrantedOrgID"},
 				user:  &NotifyUser{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", FirstName: "FirstName", LastName: "LastName", LastEmail: "Email", LastPhone: "Phone"},
 			},
 			result: &NotifyUser{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", FirstName: "FirstName", LastName: "LastName", LastEmail: "Email", LastPhone: "Phone", VerifiedPhone: "Phone"},

internal/user/repository/view/model/refresh_token.go

@@ -1,7 +1,6 @@
 package model
 
 import (
-	"encoding/json"
 	"time"
 
 	"github.com/zitadel/logging"
@@ -9,7 +8,6 @@ import (
 	"github.com/zitadel/zitadel/internal/database"
 	caos_errs "github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models"
 	user_repo "github.com/zitadel/zitadel/internal/repository/user"
 	usr_model "github.com/zitadel/zitadel/internal/user/model"
 )
@@ -25,22 +23,22 @@ const (
 )
 
 type RefreshTokenView struct {
-	ID                    string               `json:"tokenId" gorm:"column:id;primary_key"`
-	CreationDate          time.Time            `json:"-" gorm:"column:creation_date"`
-	ChangeDate            time.Time            `json:"-" gorm:"column:change_date"`
-	ResourceOwner         string               `json:"-" gorm:"column:resource_owner"`
-	Token                 string               `json:"-" gorm:"column:token"`
-	UserID                string               `json:"-" gorm:"column:user_id"`
-	ClientID              string               `json:"clientID" gorm:"column:client_id"`
-	UserAgentID           string               `json:"userAgentId" gorm:"column:user_agent_id"`
-	Audience              database.StringArray `json:"audience" gorm:"column:audience"`
-	Scopes                database.StringArray `json:"scopes" gorm:"column:scopes"`
-	AuthMethodsReferences database.StringArray `json:"authMethodsReference" gorm:"column:amr"`
-	AuthTime              time.Time            `json:"authTime" gorm:"column:auth_time"`
-	IdleExpiration        time.Time            `json:"-" gorm:"column:idle_expiration"`
-	Expiration            time.Time            `json:"-" gorm:"column:expiration"`
-	Sequence              uint64               `json:"-" gorm:"column:sequence"`
-	InstanceID            string               `json:"instanceID" gorm:"column:instance_id;primary_key"`
+	ID                    string                     `json:"tokenId" gorm:"column:id;primary_key"`
+	CreationDate          time.Time                  `json:"-" gorm:"column:creation_date"`
+	ChangeDate            time.Time                  `json:"-" gorm:"column:change_date"`
+	ResourceOwner         string                     `json:"-" gorm:"column:resource_owner"`
+	Token                 string                     `json:"-" gorm:"column:token"`
+	UserID                string                     `json:"-" gorm:"column:user_id"`
+	ClientID              string                     `json:"clientID" gorm:"column:client_id"`
+	UserAgentID           string                     `json:"userAgentId" gorm:"column:user_agent_id"`
+	Audience              database.TextArray[string] `json:"audience" gorm:"column:audience"`
+	Scopes                database.TextArray[string] `json:"scopes" gorm:"column:scopes"`
+	AuthMethodsReferences database.TextArray[string] `json:"authMethodsReference" gorm:"column:amr"`
+	AuthTime              time.Time                  `json:"authTime" gorm:"column:auth_time"`
+	IdleExpiration        time.Time                  `json:"-" gorm:"column:idle_expiration"`
+	Expiration            time.Time                  `json:"-" gorm:"column:expiration"`
+	Sequence              uint64                     `json:"-" gorm:"column:sequence"`
+	InstanceID            string                     `json:"instanceID" gorm:"column:instance_id;primary_key"`
 }
 
 func RefreshTokenViewsToModel(tokens []*RefreshTokenView) []*usr_model.RefreshTokenView {
@@ -71,9 +69,9 @@ func RefreshTokenViewToModel(token *RefreshTokenView) *usr_model.RefreshTokenVie
 	}
 }
 
-func (t *RefreshTokenView) AppendEventIfMyRefreshToken(event *es_models.Event) (err error) {
+func (t *RefreshTokenView) AppendEventIfMyRefreshToken(event eventstore.Event) (err error) {
 	view := new(RefreshTokenView)
-	switch eventstore.EventType(event.Type) {
+	switch event.Type() {
 	case user_repo.HumanRefreshTokenAddedType:
 		view.setRootData(event)
 		err = view.appendAddedEvent(event)
@@ -100,10 +98,10 @@ func (t *RefreshTokenView) AppendEventIfMyRefreshToken(event *es_models.Event) (
 	return nil
 }
 
-func (t *RefreshTokenView) AppendEvent(event *es_models.Event) error {
-	t.ChangeDate = event.CreationDate
-	t.Sequence = event.Sequence
-	switch eventstore.EventType(event.Type) {
+func (t *RefreshTokenView) AppendEvent(event eventstore.Event) error {
+	t.ChangeDate = event.CreatedAt()
+	t.Sequence = event.Sequence()
+	switch event.Type() {
 	case user_repo.HumanRefreshTokenAddedType:
 		t.setRootData(event)
 		return t.appendAddedEvent(event)
@@ -114,55 +112,55 @@ func (t *RefreshTokenView) AppendEvent(event *es_models.Event) error {
 	return nil
 }
 
-func (t *RefreshTokenView) setRootData(event *es_models.Event) {
-	t.UserID = event.AggregateID
-	t.ResourceOwner = event.ResourceOwner
-	t.InstanceID = event.InstanceID
+func (t *RefreshTokenView) setRootData(event eventstore.Event) {
+	t.UserID = event.Aggregate().ID
+	t.ResourceOwner = event.Aggregate().ResourceOwner
+	t.InstanceID = event.Aggregate().InstanceID
 }
 
-func (t *RefreshTokenView) appendAddedEvent(event *es_models.Event) error {
+func (t *RefreshTokenView) appendAddedEvent(event eventstore.Event) error {
 	e := new(user_repo.HumanRefreshTokenAddedEvent)
-	if err := json.Unmarshal(event.Data, e); err != nil {
+	if err := event.Unmarshal(e); err != nil {
 		logging.Log("EVEN-Dbb31").WithError(err).Error("could not unmarshal event data")
 		return caos_errs.ThrowInternal(err, "MODEL-Bbr42", "could not unmarshal event")
 	}
 	t.ID = e.TokenID
-	t.CreationDate = event.CreationDate
+	t.CreationDate = event.CreatedAt()
 	t.AuthMethodsReferences = e.AuthMethodsReferences
 	t.AuthTime = e.AuthTime
 	t.Audience = e.Audience
 	t.ClientID = e.ClientID
-	t.Expiration = event.CreationDate.Add(e.Expiration)
-	t.IdleExpiration = event.CreationDate.Add(e.IdleExpiration)
+	t.Expiration = event.CreatedAt().Add(e.Expiration)
+	t.IdleExpiration = event.CreatedAt().Add(e.IdleExpiration)
 	t.Scopes = e.Scopes
 	t.Token = e.TokenID
 	t.UserAgentID = e.UserAgentID
 	return nil
 }
 
-func (t *RefreshTokenView) appendRenewedEvent(event *es_models.Event) error {
+func (t *RefreshTokenView) appendRenewedEvent(event eventstore.Event) error {
 	e := new(user_repo.HumanRefreshTokenRenewedEvent)
-	if err := json.Unmarshal(event.Data, e); err != nil {
+	if err := event.Unmarshal(e); err != nil {
 		logging.Log("EVEN-Vbbn2").WithError(err).Error("could not unmarshal event data")
 		return caos_errs.ThrowInternal(err, "MODEL-Bbrn4", "could not unmarshal event")
 	}
 	t.ID = e.TokenID
-	t.IdleExpiration = event.CreationDate.Add(e.IdleExpiration)
+	t.IdleExpiration = event.CreatedAt().Add(e.IdleExpiration)
 	t.Token = e.RefreshToken
 	return nil
 }
 
-func (t *RefreshTokenView) appendRemovedEvent(event *es_models.Event) {
-	t.Expiration = event.CreationDate
+func (t *RefreshTokenView) appendRemovedEvent(event eventstore.Event) {
+	t.Expiration = event.CreatedAt()
 }
 
-func (t *RefreshTokenView) GetRelevantEventTypes() []es_models.EventType {
-	return []es_models.EventType{
-		es_models.EventType(user_repo.HumanRefreshTokenAddedType),
-		es_models.EventType(user_repo.HumanRefreshTokenRenewedType),
-		es_models.EventType(user_repo.HumanRefreshTokenRemovedType),
-		es_models.EventType(user_repo.UserRemovedType),
-		es_models.EventType(user_repo.UserDeactivatedType),
-		es_models.EventType(user_repo.UserLockedType),
+func (t *RefreshTokenView) GetRelevantEventTypes() []eventstore.EventType {
+	return []eventstore.EventType{
+		user_repo.HumanRefreshTokenAddedType,
+		user_repo.HumanRefreshTokenRenewedType,
+		user_repo.HumanRefreshTokenRemovedType,
+		user_repo.UserRemovedType,
+		user_repo.UserDeactivatedType,
+		user_repo.UserLockedType,
 	}
 }

internal/user/repository/view/model/token.go

@@ -1,7 +1,6 @@
 package model
 
 import (
-	"encoding/json"
 	"time"
 
 	"github.com/zitadel/logging"
@@ -9,7 +8,6 @@ import (
 	"github.com/zitadel/zitadel/internal/database"
 	caos_errs "github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models"
 	user_repo "github.com/zitadel/zitadel/internal/repository/user"
 	usr_model "github.com/zitadel/zitadel/internal/user/model"
 )
@@ -26,22 +24,22 @@ const (
 )
 
 type TokenView struct {
-	ID                string               `json:"tokenId" gorm:"column:id;primary_key"`
-	CreationDate      time.Time            `json:"-" gorm:"column:creation_date"`
-	ChangeDate        time.Time            `json:"-" gorm:"column:change_date"`
-	ResourceOwner     string               `json:"-" gorm:"column:resource_owner"`
-	UserID            string               `json:"-" gorm:"column:user_id"`
-	ApplicationID     string               `json:"applicationId" gorm:"column:application_id"`
-	UserAgentID       string               `json:"userAgentId" gorm:"column:user_agent_id"`
-	Audience          database.StringArray `json:"audience" gorm:"column:audience"`
-	Scopes            database.StringArray `json:"scopes" gorm:"column:scopes"`
-	Expiration        time.Time            `json:"expiration" gorm:"column:expiration"`
-	Sequence          uint64               `json:"-" gorm:"column:sequence"`
-	PreferredLanguage string               `json:"preferredLanguage" gorm:"column:preferred_language"`
-	RefreshTokenID    string               `json:"refreshTokenID,omitempty" gorm:"refresh_token_id"`
-	IsPAT             bool                 `json:"-" gorm:"is_pat"`
-	Deactivated       bool                 `json:"-" gorm:"-"`
-	InstanceID        string               `json:"instanceID" gorm:"column:instance_id;primary_key"`
+	ID                string                     `json:"tokenId" gorm:"column:id;primary_key"`
+	CreationDate      time.Time                  `json:"-" gorm:"column:creation_date"`
+	ChangeDate        time.Time                  `json:"-" gorm:"column:change_date"`
+	ResourceOwner     string                     `json:"-" gorm:"column:resource_owner"`
+	UserID            string                     `json:"-" gorm:"column:user_id"`
+	ApplicationID     string                     `json:"applicationId" gorm:"column:application_id"`
+	UserAgentID       string                     `json:"userAgentId" gorm:"column:user_agent_id"`
+	Audience          database.TextArray[string] `json:"audience" gorm:"column:audience"`
+	Scopes            database.TextArray[string] `json:"scopes" gorm:"column:scopes"`
+	Expiration        time.Time                  `json:"expiration" gorm:"column:expiration"`
+	Sequence          uint64                     `json:"-" gorm:"column:sequence"`
+	PreferredLanguage string                     `json:"preferredLanguage" gorm:"column:preferred_language"`
+	RefreshTokenID    string                     `json:"refreshTokenID,omitempty" gorm:"refresh_token_id"`
+	IsPAT             bool                       `json:"-" gorm:"is_pat"`
+	Deactivated       bool                       `json:"-" gorm:"-"`
+	InstanceID        string                     `json:"instanceID" gorm:"column:instance_id;primary_key"`
 }
 
 func TokenViewToModel(token *TokenView) *usr_model.TokenView {
@@ -63,9 +61,9 @@ func TokenViewToModel(token *TokenView) *usr_model.TokenView {
 	}
 }
 
-func (t *TokenView) AppendEventIfMyToken(event *es_models.Event) (err error) {
+func (t *TokenView) AppendEventIfMyToken(event eventstore.Event) (err error) {
 	view := new(TokenView)
-	switch eventstore.EventType(event.Type) {
+	switch event.Type() {
 	case user_repo.UserTokenAddedType,
 		user_repo.PersonalAccessTokenAddedType:
 		view.setRootData(event)
@@ -91,7 +89,7 @@ func (t *TokenView) AppendEventIfMyToken(event *es_models.Event) (err error) {
 		return nil
 	case user_repo.UserUnlockedType,
 		user_repo.UserReactivatedType:
-		if t.ID != "" && event.CreationDate.Before(t.CreationDate) {
+		if t.ID != "" && event.CreatedAt().Before(t.CreationDate) {
 			t.Deactivated = false
 		}
 		return nil
@@ -109,10 +107,10 @@ func (t *TokenView) AppendEventIfMyToken(event *es_models.Event) (err error) {
 	return nil
 }
 
-func (t *TokenView) AppendEvent(event *es_models.Event) error {
-	t.ChangeDate = event.CreationDate
-	t.Sequence = event.Sequence
-	switch eventstore.EventType(event.Type) {
+func (t *TokenView) AppendEvent(event eventstore.Event) error {
+	t.ChangeDate = event.CreatedAt()
+	t.Sequence = event.Sequence()
+	switch event.Type() {
 	case user_repo.UserTokenAddedType,
 		user_repo.PersonalAccessTokenAddedType:
 		t.setRootData(event)
@@ -120,36 +118,36 @@ func (t *TokenView) AppendEvent(event *es_models.Event) error {
 		if err != nil {
 			return err
 		}
-		t.CreationDate = event.CreationDate
-		t.IsPAT = eventstore.EventType(event.Type) == user_repo.PersonalAccessTokenAddedType
+		t.CreationDate = event.CreatedAt()
+		t.IsPAT = event.Type() == user_repo.PersonalAccessTokenAddedType
 	}
 	return nil
 }
 
-func (t *TokenView) setRootData(event *es_models.Event) {
-	t.UserID = event.AggregateID
-	t.ResourceOwner = event.ResourceOwner
-	t.InstanceID = event.InstanceID
+func (t *TokenView) setRootData(event eventstore.Event) {
+	t.UserID = event.Aggregate().ID
+	t.ResourceOwner = event.Aggregate().ResourceOwner
+	t.InstanceID = event.Aggregate().InstanceID
 }
 
-func (t *TokenView) setData(event *es_models.Event) error {
-	if err := json.Unmarshal(event.Data, t); err != nil {
+func (t *TokenView) setData(event eventstore.Event) error {
+	if err := event.Unmarshal(t); err != nil {
 		logging.Log("EVEN-3Gm9s").WithError(err).Error("could not unmarshal event data")
 		return caos_errs.ThrowInternal(err, "MODEL-5Gms9", "could not unmarshal event")
 	}
 	return nil
 }
 
-func agentIDFromSession(event *es_models.Event) (string, error) {
+func agentIDFromSession(event eventstore.Event) (string, error) {
 	session := make(map[string]interface{})
-	if err := json.Unmarshal(event.Data, &session); err != nil {
+	if err := event.Unmarshal(&session); err != nil {
 		logging.Log("EVEN-Ghgt3").WithError(err).Error("could not unmarshal event data")
 		return "", caos_errs.ThrowInternal(nil, "MODEL-GBf32", "could not unmarshal data")
 	}
 	return session["userAgentID"].(string), nil
 }
 
-func (t *TokenView) appendTokenRemoved(event *es_models.Event) error {
+func (t *TokenView) appendTokenRemoved(event eventstore.Event) error {
 	token, err := eventToMap(event)
 	if err != nil {
 		return err
@@ -160,7 +158,7 @@ func (t *TokenView) appendTokenRemoved(event *es_models.Event) error {
 	return nil
 }
 
-func (t *TokenView) appendRefreshTokenRemoved(event *es_models.Event) error {
+func (t *TokenView) appendRefreshTokenRemoved(event eventstore.Event) error {
 	refreshToken, err := eventToMap(event)
 	if err != nil {
 		return err
@@ -171,7 +169,7 @@ func (t *TokenView) appendRefreshTokenRemoved(event *es_models.Event) error {
 	return nil
 }
 
-func (t *TokenView) appendPATRemoved(event *es_models.Event) error {
+func (t *TokenView) appendPATRemoved(event eventstore.Event) error {
 	pat, err := eventToMap(event)
 	if err != nil {
 		return err
@@ -182,26 +180,26 @@ func (t *TokenView) appendPATRemoved(event *es_models.Event) error {
 	return nil
 }
 
-func (t *TokenView) GetRelevantEventTypes() []es_models.EventType {
-	return []es_models.EventType{
-		es_models.EventType(user_repo.UserTokenAddedType),
-		es_models.EventType(user_repo.PersonalAccessTokenAddedType),
-		es_models.EventType(user_repo.UserTokenRemovedType),
-		es_models.EventType(user_repo.HumanRefreshTokenRemovedType),
-		es_models.EventType(user_repo.UserV1SignedOutType),
-		es_models.EventType(user_repo.HumanSignedOutType),
-		es_models.EventType(user_repo.UserRemovedType),
-		es_models.EventType(user_repo.UserDeactivatedType),
-		es_models.EventType(user_repo.UserLockedType),
-		es_models.EventType(user_repo.UserLockedType),
-		es_models.EventType(user_repo.UserReactivatedType),
-		es_models.EventType(user_repo.PersonalAccessTokenRemovedType),
+func (t *TokenView) GetRelevantEventTypes() []eventstore.EventType {
+	return []eventstore.EventType{
+		user_repo.UserTokenAddedType,
+		user_repo.PersonalAccessTokenAddedType,
+		user_repo.UserTokenRemovedType,
+		user_repo.HumanRefreshTokenRemovedType,
+		user_repo.UserV1SignedOutType,
+		user_repo.HumanSignedOutType,
+		user_repo.UserRemovedType,
+		user_repo.UserDeactivatedType,
+		user_repo.UserLockedType,
+		user_repo.UserLockedType,
+		user_repo.UserReactivatedType,
+		user_repo.PersonalAccessTokenRemovedType,
 	}
 }
 
-func eventToMap(event *es_models.Event) (map[string]interface{}, error) {
+func eventToMap(event eventstore.Event) (map[string]interface{}, error) {
 	m := make(map[string]interface{})
-	if err := json.Unmarshal(event.Data, &m); err != nil {
+	if err := event.Unmarshal(&m); err != nil {
 		logging.Log("EVEN-Dbffe").WithError(err).Error("could not unmarshal event data")
 		return nil, caos_errs.ThrowInternal(nil, "MODEL-SDAfw", "could not unmarshal data")
 	}

internal/user/repository/view/model/user.go

@@ -11,7 +11,6 @@ import (
 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/errors"
 	"github.com/zitadel/zitadel/internal/eventstore"
-	"github.com/zitadel/zitadel/internal/eventstore/v1/models"
 	org_model "github.com/zitadel/zitadel/internal/org/model"
 	"github.com/zitadel/zitadel/internal/repository/user"
 	"github.com/zitadel/zitadel/internal/user/model"
@@ -43,18 +42,18 @@ const (
 )
 
 type UserView struct {
-	ID                 string               `json:"-" gorm:"column:id;primary_key"`
-	CreationDate       time.Time            `json:"-" gorm:"column:creation_date"`
-	ChangeDate         time.Time            `json:"-" gorm:"column:change_date"`
-	ResourceOwner      string               `json:"-" gorm:"column:resource_owner"`
-	State              int32                `json:"-" gorm:"column:user_state"`
-	LastLogin          time.Time            `json:"-" gorm:"column:last_login"`
-	LoginNames         database.StringArray `json:"-" gorm:"column:login_names"`
-	PreferredLoginName string               `json:"-" gorm:"column:preferred_login_name"`
-	Sequence           uint64               `json:"-" gorm:"column:sequence"`
-	Type               userType             `json:"-" gorm:"column:user_type"`
-	UserName           string               `json:"userName" gorm:"column:user_name"`
-	InstanceID         string               `json:"instanceID" gorm:"column:instance_id;primary_key"`
+	ID                 string                     `json:"-" gorm:"column:id;primary_key"`
+	CreationDate       time.Time                  `json:"-" gorm:"column:creation_date"`
+	ChangeDate         time.Time                  `json:"-" gorm:"column:change_date"`
+	ResourceOwner      string                     `json:"-" gorm:"column:resource_owner"`
+	State              int32                      `json:"-" gorm:"column:user_state"`
+	LastLogin          time.Time                  `json:"-" gorm:"column:last_login"`
+	LoginNames         database.TextArray[string] `json:"-" gorm:"column:login_names"`
+	PreferredLoginName string                     `json:"-" gorm:"column:preferred_login_name"`
+	Sequence           uint64                     `json:"-" gorm:"column:sequence"`
+	Type               userType                   `json:"-" gorm:"column:user_type"`
+	UserName           string                     `json:"userName" gorm:"column:user_name"`
+	InstanceID         string                     `json:"instanceID" gorm:"column:instance_id;primary_key"`
 	*MachineView
 	*HumanView
 }
@@ -236,12 +235,12 @@ func (u *UserView) SetLoginNames(userLoginMustBeDomain bool, domains []*org_mode
 	}
 }
 
-func (u *UserView) AppendEvent(event *models.Event) (err error) {
-	u.ChangeDate = event.CreationDate
-	u.Sequence = event.Sequence
-	switch eventstore.EventType(event.Type) {
+func (u *UserView) AppendEvent(event eventstore.Event) (err error) {
+	u.ChangeDate = event.CreatedAt()
+	u.Sequence = event.Sequence()
+	switch event.Type() {
 	case user.MachineAddedEventType:
-		u.CreationDate = event.CreationDate
+		u.CreationDate = event.CreatedAt()
 		u.setRootData(event)
 		u.Type = userTypeMachine
 		err = u.setData(event)
@@ -252,7 +251,7 @@ func (u *UserView) AppendEvent(event *models.Event) (err error) {
 		user.UserV1RegisteredType,
 		user.HumanRegisteredType,
 		user.HumanAddedType:
-		u.CreationDate = event.CreationDate
+		u.CreationDate = event.CreatedAt()
 		u.setRootData(event)
 		u.Type = userTypeHuman
 		err = u.setData(event)
@@ -317,14 +316,14 @@ func (u *UserView) AppendEvent(event *models.Event) (err error) {
 	case user.UserV1MFAOTPAddedType,
 		user.HumanMFAOTPAddedType:
 		if u.HumanView == nil {
-			logging.WithFields("sequence", event.Sequence, "instance", event.InstanceID).Warn("event is ignored because human not exists")
+			logging.WithFields("event_sequence", event.Sequence, "aggregate_id", event.Aggregate().ID, "instance", event.Aggregate().InstanceID).Warn("event is ignored because human not exists")
 			return errors.ThrowInvalidArgument(nil, "MODEL-p2BXx", "event ignored: human not exists")
 		}
 		u.OTPState = int32(model.MFAStateNotReady)
 	case user.UserV1MFAOTPVerifiedType,
 		user.HumanMFAOTPVerifiedType:
 		if u.HumanView == nil {
-			logging.WithFields("sequence", event.Sequence, "instance", event.InstanceID).Warn("event is ignored because human not exists")
+			logging.WithFields("event_sequence", event.Sequence, "aggregate_id", event.Aggregate().ID, "instance", event.Aggregate().InstanceID).Warn("event is ignored because human not exists")
 			return errors.ThrowInvalidArgument(nil, "MODEL-o6Lcq", "event ignored: human not exists")
 		}
 		u.OTPState = int32(model.MFAStateReady)
@@ -354,7 +353,7 @@ func (u *UserView) AppendEvent(event *models.Event) (err error) {
 		err = u.removeU2FToken(event)
 	case user.UserV1MFAInitSkippedType,
 		user.HumanMFAInitSkippedType:
-		u.MFAInitSkipped = event.CreationDate
+		u.MFAInitSkipped = event.CreatedAt()
 	case user.UserV1InitialCodeAddedType,
 		user.HumanInitialCodeAddedType:
 		u.InitRequired = true
@@ -367,6 +366,10 @@ func (u *UserView) AppendEvent(event *models.Event) (err error) {
 		u.AvatarKey = ""
 	case user.HumanPasswordlessInitCodeAddedType,
 		user.HumanPasswordlessInitCodeRequestedType:
+		if u.HumanView == nil {
+			logging.WithFields("event_sequence", event.Sequence, "aggregate_id", event.Aggregate().ID, "instance", event.Aggregate().InstanceID).Warn("event is ignored because human not exists")
+			return errors.ThrowInvalidArgument(nil, "MODEL-MbyC0", "event ignored: human not exists")
+		}
 		if !u.PasswordSet {
 			u.PasswordlessInitRequired = true
 			u.PasswordInitRequired = false
@@ -376,34 +379,34 @@ func (u *UserView) AppendEvent(event *models.Event) (err error) {
 	return err
 }
 
-func (u *UserView) setRootData(event *models.Event) {
-	u.ID = event.AggregateID
-	u.ResourceOwner = event.ResourceOwner
-	u.InstanceID = event.InstanceID
+func (u *UserView) setRootData(event eventstore.Event) {
+	u.ID = event.Aggregate().ID
+	u.ResourceOwner = event.Aggregate().ResourceOwner
+	u.InstanceID = event.Aggregate().InstanceID
 }
 
-func (u *UserView) setData(event *models.Event) error {
-	if err := json.Unmarshal(event.Data, u); err != nil {
+func (u *UserView) setData(event eventstore.Event) error {
+	if err := event.Unmarshal(u); err != nil {
 		logging.Log("MODEL-lso9e").WithError(err).Error("could not unmarshal event data")
 		return errors.ThrowInternal(nil, "MODEL-8iows", "could not unmarshal data")
 	}
 	return nil
 }
 
-func (u *UserView) setPasswordData(event *models.Event) error {
+func (u *UserView) setPasswordData(event eventstore.Event) error {
 	password := new(es_model.Password)
-	if err := json.Unmarshal(event.Data, password); err != nil {
+	if err := event.Unmarshal(password); err != nil {
 		logging.Log("MODEL-sdw4r").WithError(err).Error("could not unmarshal event data")
 		return errors.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data")
 	}
 	u.PasswordSet = password.Secret != nil || password.EncodedHash != ""
 	u.PasswordInitRequired = !u.PasswordSet
 	u.PasswordChangeRequired = password.ChangeRequired
-	u.PasswordChanged = event.CreationDate
+	u.PasswordChanged = event.CreatedAt()
 	return nil
 }
 
-func (u *UserView) addPasswordlessToken(event *models.Event) error {
+func (u *UserView) addPasswordlessToken(event eventstore.Event) error {
 	token, err := webAuthNViewFromEvent(event)
 	if err != nil {
 		return err
@@ -419,7 +422,7 @@ func (u *UserView) addPasswordlessToken(event *models.Event) error {
 	return nil
 }
 
-func (u *UserView) updatePasswordlessToken(event *models.Event) error {
+func (u *UserView) updatePasswordlessToken(event eventstore.Event) error {
 	token, err := webAuthNViewFromEvent(event)
 	if err != nil {
 		return err
@@ -434,7 +437,7 @@ func (u *UserView) updatePasswordlessToken(event *models.Event) error {
 	return nil
 }
 
-func (u *UserView) removePasswordlessToken(event *models.Event) error {
+func (u *UserView) removePasswordlessToken(event eventstore.Event) error {
 	token, err := webAuthNViewFromEvent(event)
 	if err != nil {
 		return err
@@ -450,7 +453,7 @@ func (u *UserView) removePasswordlessToken(event *models.Event) error {
 	return nil
 }
 
-func (u *UserView) addU2FToken(event *models.Event) error {
+func (u *UserView) addU2FToken(event eventstore.Event) error {
 	token, err := webAuthNViewFromEvent(event)
 	if err != nil {
 		return err
@@ -466,7 +469,7 @@ func (u *UserView) addU2FToken(event *models.Event) error {
 	return nil
 }
 
-func (u *UserView) updateU2FToken(event *models.Event) error {
+func (u *UserView) updateU2FToken(event eventstore.Event) error {
 	token, err := webAuthNViewFromEvent(event)
 	if err != nil {
 		return err
@@ -481,7 +484,7 @@ func (u *UserView) updateU2FToken(event *models.Event) error {
 	return nil
 }
 
-func (u *UserView) removeU2FToken(event *models.Event) error {
+func (u *UserView) removeU2FToken(event eventstore.Event) error {
 	token, err := webAuthNViewFromEvent(event)
 	if err != nil {
 		return err
@@ -496,9 +499,9 @@ func (u *UserView) removeU2FToken(event *models.Event) error {
 	return nil
 }
 
-func webAuthNViewFromEvent(event *models.Event) (*WebAuthNView, error) {
+func webAuthNViewFromEvent(event eventstore.Event) (*WebAuthNView, error) {
 	token := new(WebAuthNView)
-	err := json.Unmarshal(event.Data, token)
+	err := event.Unmarshal(token)
 	if err != nil {
 		return nil, errors.ThrowInternal(err, "MODEL-FSaq1", "could not unmarshal data")
 	}
@@ -552,62 +555,62 @@ func (u *UserView) SetEmptyUserType() {
 	}
 }
 
-func (u *UserView) EventTypes() []models.EventType {
-	return []models.EventType{
-		models.EventType(user.MachineAddedEventType),
-		models.EventType(user.UserV1AddedType),
-		models.EventType(user.UserV1RegisteredType),
-		models.EventType(user.HumanRegisteredType),
-		models.EventType(user.HumanAddedType),
-		models.EventType(user.UserRemovedType),
-		models.EventType(user.UserV1PasswordChangedType),
-		models.EventType(user.HumanPasswordChangedType),
-		models.EventType(user.HumanPasswordlessTokenAddedType),
-		models.EventType(user.HumanPasswordlessTokenVerifiedType),
-		models.EventType(user.HumanPasswordlessTokenRemovedType),
-		models.EventType(user.UserV1ProfileChangedType),
-		models.EventType(user.HumanProfileChangedType),
-		models.EventType(user.UserV1AddressChangedType),
-		models.EventType(user.HumanAddressChangedType),
-		models.EventType(user.MachineChangedEventType),
-		models.EventType(user.UserDomainClaimedType),
-		models.EventType(user.UserUserNameChangedType),
-		models.EventType(user.UserV1EmailChangedType),
-		models.EventType(user.HumanEmailChangedType),
-		models.EventType(user.UserV1EmailVerifiedType),
-		models.EventType(user.HumanEmailVerifiedType),
-		models.EventType(user.UserV1PhoneChangedType),
-		models.EventType(user.HumanPhoneChangedType),
-		models.EventType(user.UserV1PhoneVerifiedType),
-		models.EventType(user.HumanPhoneVerifiedType),
-		models.EventType(user.UserV1PhoneRemovedType),
-		models.EventType(user.HumanPhoneRemovedType),
-		models.EventType(user.UserDeactivatedType),
-		models.EventType(user.UserReactivatedType),
-		models.EventType(user.UserUnlockedType),
-		models.EventType(user.UserLockedType),
-		models.EventType(user.UserV1MFAOTPAddedType),
-		models.EventType(user.HumanMFAOTPAddedType),
-		models.EventType(user.UserV1MFAOTPVerifiedType),
-		models.EventType(user.HumanMFAOTPVerifiedType),
-		models.EventType(user.UserV1MFAOTPRemovedType),
-		models.EventType(user.HumanMFAOTPRemovedType),
-		models.EventType(user.HumanOTPSMSAddedType),
-		models.EventType(user.HumanOTPSMSRemovedType),
-		models.EventType(user.HumanOTPEmailAddedType),
-		models.EventType(user.HumanOTPEmailRemovedType),
-		models.EventType(user.HumanU2FTokenAddedType),
-		models.EventType(user.HumanU2FTokenVerifiedType),
-		models.EventType(user.HumanU2FTokenRemovedType),
-		models.EventType(user.UserV1MFAInitSkippedType),
-		models.EventType(user.HumanMFAInitSkippedType),
-		models.EventType(user.UserV1InitialCodeAddedType),
-		models.EventType(user.HumanInitialCodeAddedType),
-		models.EventType(user.UserV1InitializedCheckSucceededType),
-		models.EventType(user.HumanInitializedCheckSucceededType),
-		models.EventType(user.HumanAvatarAddedType),
-		models.EventType(user.HumanAvatarRemovedType),
-		models.EventType(user.HumanPasswordlessInitCodeAddedType),
-		models.EventType(user.HumanPasswordlessInitCodeRequestedType),
+func (u *UserView) EventTypes() []eventstore.EventType {
+	return []eventstore.EventType{
+		user.MachineAddedEventType,
+		user.UserV1AddedType,
+		user.UserV1RegisteredType,
+		user.HumanRegisteredType,
+		user.HumanAddedType,
+		user.UserRemovedType,
+		user.UserV1PasswordChangedType,
+		user.HumanPasswordChangedType,
+		user.HumanPasswordlessTokenAddedType,
+		user.HumanPasswordlessTokenVerifiedType,
+		user.HumanPasswordlessTokenRemovedType,
+		user.UserV1ProfileChangedType,
+		user.HumanProfileChangedType,
+		user.UserV1AddressChangedType,
+		user.HumanAddressChangedType,
+		user.MachineChangedEventType,
+		user.UserDomainClaimedType,
+		user.UserUserNameChangedType,
+		user.UserV1EmailChangedType,
+		user.HumanEmailChangedType,
+		user.UserV1EmailVerifiedType,
+		user.HumanEmailVerifiedType,
+		user.UserV1PhoneChangedType,
+		user.HumanPhoneChangedType,
+		user.UserV1PhoneVerifiedType,
+		user.HumanPhoneVerifiedType,
+		user.UserV1PhoneRemovedType,
+		user.HumanPhoneRemovedType,
+		user.UserDeactivatedType,
+		user.UserReactivatedType,
+		user.UserUnlockedType,
+		user.UserLockedType,
+		user.UserV1MFAOTPAddedType,
+		user.HumanMFAOTPAddedType,
+		user.UserV1MFAOTPVerifiedType,
+		user.HumanMFAOTPVerifiedType,
+		user.UserV1MFAOTPRemovedType,
+		user.HumanMFAOTPRemovedType,
+		user.HumanOTPSMSAddedType,
+		user.HumanOTPSMSRemovedType,
+		user.HumanOTPEmailAddedType,
+		user.HumanOTPEmailRemovedType,
+		user.HumanU2FTokenAddedType,
+		user.HumanU2FTokenVerifiedType,
+		user.HumanU2FTokenRemovedType,
+		user.UserV1MFAInitSkippedType,
+		user.HumanMFAInitSkippedType,
+		user.UserV1InitialCodeAddedType,
+		user.HumanInitialCodeAddedType,
+		user.UserV1InitializedCheckSucceededType,
+		user.HumanInitializedCheckSucceededType,
+		user.HumanAvatarAddedType,
+		user.HumanAvatarRemovedType,
+		user.HumanPasswordlessInitCodeAddedType,
+		user.HumanPasswordlessInitCodeRequestedType,
 	}
 }

internal/user/repository/view/model/user_membership.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"
 	iam_es_model "github.com/zitadel/zitadel/internal/iam/repository/eventsourcing/model"
 	org_es_model "github.com/zitadel/zitadel/internal/org/repository/eventsourcing/model"
@@ -34,21 +33,21 @@ type UserMembershipView struct {
 	AggregateID string `json:"-" gorm:"column:aggregate_id;primary_key"`
 	ObjectID    string `json:"-" gorm:"column:object_id;primary_key"`
 
-	Roles             database.StringArray `json:"-" gorm:"column:roles"`
-	DisplayName       string               `json:"-" gorm:"column:display_name"`
-	CreationDate      time.Time            `json:"-" gorm:"column:creation_date"`
-	ChangeDate        time.Time            `json:"-" gorm:"column:change_date"`
-	ResourceOwner     string               `json:"-" gorm:"column:resource_owner"`
-	ResourceOwnerName string               `json:"-" gorm:"column:resource_owner_name"`
-	Sequence          uint64               `json:"-" gorm:"column:sequence"`
-	InstanceID        string               `json:"instanceID" gorm:"column:instance_id;primary_key"`
+	Roles             database.TextArray[string] `json:"-" gorm:"column:roles"`
+	DisplayName       string                     `json:"-" gorm:"column:display_name"`
+	CreationDate      time.Time                  `json:"-" gorm:"column:creation_date"`
+	ChangeDate        time.Time                  `json:"-" gorm:"column:change_date"`
+	ResourceOwner     string                     `json:"-" gorm:"column:resource_owner"`
+	ResourceOwnerName string                     `json:"-" gorm:"column:resource_owner_name"`
+	Sequence          uint64                     `json:"-" gorm:"column:sequence"`
+	InstanceID        string                     `json:"instanceID" gorm:"column:instance_id;primary_key"`
 }
 
 func (u *UserMembershipView) AppendEvent(event *models.Event) (err error) {
 	u.ChangeDate = event.CreationDate
-	u.Sequence = event.Sequence
+	u.Sequence = event.Seq
 
-	switch eventstore.EventType(event.Type) {
+	switch event.Type() {
 	case instance.MemberAddedEventType:
 		u.setRootData(event, model.MemberTypeIam)
 		err = u.setIamMemberData(event)

internal/user/repository/view/model/user_session.go

@@ -1,7 +1,6 @@
 package model
 
 import (
-	"encoding/json"
 	"time"
 
 	"github.com/zitadel/logging"
@@ -9,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/repository/user"
 	"github.com/zitadel/zitadel/internal/user/model"
 	es_model "github.com/zitadel/zitadel/internal/user/repository/eventsourcing/model"
@@ -47,9 +45,9 @@ type UserSessionView struct {
 	InstanceID                   string    `json:"instanceID" gorm:"column:instance_id;primary_key"`
 }
 
-func UserSessionFromEvent(event *models.Event) (*UserSessionView, error) {
+func UserSessionFromEvent(event eventstore.Event) (*UserSessionView, error) {
 	v := new(UserSessionView)
-	if err := json.Unmarshal(event.Data, v); err != nil {
+	if err := event.Unmarshal(v); err != nil {
 		logging.Log("EVEN-lso9e").WithError(err).Error("could not unmarshal event data")
 		return nil, caos_errs.ThrowInternal(nil, "MODEL-sd325", "could not unmarshal data")
 	}
@@ -88,13 +86,13 @@ func UserSessionsToModel(userSessions []*UserSessionView) []*model.UserSessionVi
 	return result
 }
 
-func (v *UserSessionView) AppendEvent(event *models.Event) error {
-	v.Sequence = event.Sequence
-	v.ChangeDate = event.CreationDate
-	switch eventstore.EventType(event.Type) {
+func (v *UserSessionView) AppendEvent(event eventstore.Event) error {
+	v.Sequence = event.Sequence()
+	v.ChangeDate = event.CreatedAt()
+	switch event.Type() {
 	case user.UserV1PasswordCheckSucceededType,
 		user.HumanPasswordCheckSucceededType:
-		v.PasswordVerification = event.CreationDate
+		v.PasswordVerification = event.CreatedAt()
 		v.State = int32(domain.UserSessionStateActive)
 	case user.UserIDPLoginCheckSucceededType:
 		data := new(es_model.AuthRequest)
@@ -102,12 +100,12 @@ func (v *UserSessionView) AppendEvent(event *models.Event) error {
 		if err != nil {
 			return err
 		}
-		v.ExternalLoginVerification = event.CreationDate
+		v.ExternalLoginVerification = event.CreatedAt()
 		v.SelectedIDPConfigID = data.SelectedIDPConfigID
 		v.State = int32(domain.UserSessionStateActive)
 	case user.HumanPasswordlessTokenCheckSucceededType:
-		v.PasswordlessVerification = event.CreationDate
-		v.MultiFactorVerification = event.CreationDate
+		v.PasswordlessVerification = event.CreatedAt()
+		v.MultiFactorVerification = event.CreatedAt()
 		v.MultiFactorVerificationType = int32(domain.MFATypeU2FUserVerification)
 		v.State = int32(domain.UserSessionStateActive)
 	case user.HumanPasswordlessTokenCheckFailedType,
@@ -134,11 +132,11 @@ func (v *UserSessionView) AppendEvent(event *models.Event) error {
 			return err
 		}
 		if v.UserAgentID == data.UserAgentID {
-			v.setSecondFactorVerification(event.CreationDate, domain.MFATypeTOTP)
+			v.setSecondFactorVerification(event.CreatedAt(), domain.MFATypeTOTP)
 		}
 	case user.UserV1MFAOTPCheckSucceededType,
 		user.HumanMFAOTPCheckSucceededType:
-		v.setSecondFactorVerification(event.CreationDate, domain.MFATypeTOTP)
+		v.setSecondFactorVerification(event.CreatedAt(), domain.MFATypeTOTP)
 	case user.HumanOTPSMSCheckSucceededType:
 		data := new(es_model.OTPVerified)
 		err := data.SetData(event)
@@ -146,7 +144,7 @@ func (v *UserSessionView) AppendEvent(event *models.Event) error {
 			return err
 		}
 		if v.UserAgentID == data.UserAgentID {
-			v.setSecondFactorVerification(event.CreationDate, domain.MFATypeOTPSMS)
+			v.setSecondFactorVerification(event.CreatedAt(), domain.MFATypeOTPSMS)
 		}
 	case user.HumanOTPEmailCheckSucceededType:
 		data := new(es_model.OTPVerified)
@@ -155,7 +153,7 @@ func (v *UserSessionView) AppendEvent(event *models.Event) error {
 			return err
 		}
 		if v.UserAgentID == data.UserAgentID {
-			v.setSecondFactorVerification(event.CreationDate, domain.MFATypeOTPEmail)
+			v.setSecondFactorVerification(event.CreatedAt(), domain.MFATypeOTPEmail)
 		}
 	case user.UserV1MFAOTPCheckFailedType,
 		user.UserV1MFAOTPRemovedType,
@@ -173,10 +171,10 @@ func (v *UserSessionView) AppendEvent(event *models.Event) error {
 			return err
 		}
 		if v.UserAgentID == data.UserAgentID {
-			v.setSecondFactorVerification(event.CreationDate, domain.MFATypeU2F)
+			v.setSecondFactorVerification(event.CreatedAt(), domain.MFATypeU2F)
 		}
 	case user.HumanU2FTokenCheckSucceededType:
-		v.setSecondFactorVerification(event.CreationDate, domain.MFATypeU2F)
+		v.setSecondFactorVerification(event.CreatedAt(), domain.MFATypeU2F)
 	case user.UserV1SignedOutType,
 		user.HumanSignedOutType,
 		user.UserLockedType,
@@ -210,49 +208,49 @@ func (v *UserSessionView) setSecondFactorVerification(verificationTime time.Time
 	v.State = int32(domain.UserSessionStateActive)
 }
 
-func avatarKeyFromEvent(event *models.Event) (string, error) {
+func avatarKeyFromEvent(event eventstore.Event) (string, error) {
 	data := make(map[string]string)
-	if err := json.Unmarshal(event.Data, &data); err != nil {
+	if err := event.Unmarshal(&data); err != nil {
 		logging.Log("EVEN-Sfew2").WithError(err).Error("could not unmarshal event data")
 		return "", caos_errs.ThrowInternal(err, "MODEL-SFw2q", "could not unmarshal event")
 	}
 	return data["storeKey"], nil
 }
 
-func (v *UserSessionView) EventTypes() []models.EventType {
-	return []models.EventType{
-		models.EventType(user.UserV1PasswordCheckSucceededType),
-		models.EventType(user.HumanPasswordCheckSucceededType),
-		models.EventType(user.UserIDPLoginCheckSucceededType),
-		models.EventType(user.HumanPasswordlessTokenCheckSucceededType),
-		models.EventType(user.HumanPasswordlessTokenCheckFailedType),
-		models.EventType(user.HumanPasswordlessTokenRemovedType),
-		models.EventType(user.UserV1PasswordCheckFailedType),
-		models.EventType(user.HumanPasswordCheckFailedType),
-		models.EventType(user.UserV1PasswordChangedType),
-		models.EventType(user.HumanPasswordChangedType),
-		models.EventType(user.HumanMFAOTPVerifiedType),
-		models.EventType(user.UserV1MFAOTPCheckSucceededType),
-		models.EventType(user.HumanMFAOTPCheckSucceededType),
-		models.EventType(user.UserV1MFAOTPCheckFailedType),
-		models.EventType(user.UserV1MFAOTPRemovedType),
-		models.EventType(user.HumanMFAOTPCheckFailedType),
-		models.EventType(user.HumanMFAOTPRemovedType),
-		models.EventType(user.HumanOTPSMSCheckSucceededType),
-		models.EventType(user.HumanOTPSMSCheckFailedType),
-		models.EventType(user.HumanOTPEmailCheckSucceededType),
-		models.EventType(user.HumanOTPEmailCheckFailedType),
-		models.EventType(user.HumanU2FTokenCheckFailedType),
-		models.EventType(user.HumanU2FTokenRemovedType),
-		models.EventType(user.HumanU2FTokenVerifiedType),
-		models.EventType(user.HumanU2FTokenCheckSucceededType),
-		models.EventType(user.UserV1SignedOutType),
-		models.EventType(user.HumanSignedOutType),
-		models.EventType(user.UserLockedType),
-		models.EventType(user.UserDeactivatedType),
-		models.EventType(user.UserIDPLinkRemovedType),
-		models.EventType(user.UserIDPLinkCascadeRemovedType),
-		models.EventType(user.HumanAvatarAddedType),
-		models.EventType(user.HumanAvatarRemovedType),
+func (v *UserSessionView) EventTypes() []eventstore.EventType {
+	return []eventstore.EventType{
+		user.UserV1PasswordCheckSucceededType,
+		user.HumanPasswordCheckSucceededType,
+		user.UserIDPLoginCheckSucceededType,
+		user.HumanPasswordlessTokenCheckSucceededType,
+		user.HumanPasswordlessTokenCheckFailedType,
+		user.HumanPasswordlessTokenRemovedType,
+		user.UserV1PasswordCheckFailedType,
+		user.HumanPasswordCheckFailedType,
+		user.UserV1PasswordChangedType,
+		user.HumanPasswordChangedType,
+		user.HumanMFAOTPVerifiedType,
+		user.UserV1MFAOTPCheckSucceededType,
+		user.HumanMFAOTPCheckSucceededType,
+		user.UserV1MFAOTPCheckFailedType,
+		user.UserV1MFAOTPRemovedType,
+		user.HumanMFAOTPCheckFailedType,
+		user.HumanMFAOTPRemovedType,
+		user.HumanOTPSMSCheckSucceededType,
+		user.HumanOTPSMSCheckFailedType,
+		user.HumanOTPEmailCheckSucceededType,
+		user.HumanOTPEmailCheckFailedType,
+		user.HumanU2FTokenCheckFailedType,
+		user.HumanU2FTokenRemovedType,
+		user.HumanU2FTokenVerifiedType,
+		user.HumanU2FTokenCheckSucceededType,
+		user.UserV1SignedOutType,
+		user.HumanSignedOutType,
+		user.UserLockedType,
+		user.UserDeactivatedType,
+		user.UserIDPLinkRemovedType,
+		user.UserIDPLinkCascadeRemovedType,
+		user.HumanAvatarAddedType,
+		user.HumanAvatarRemovedType,
 	}
 }

internal/user/repository/view/model/user_session_test.go

@@ -30,7 +30,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append user password check succeeded event",
 			args: args{
-				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.UserV1PasswordCheckSucceededType)},
+				event:    &es_models.Event{CreationDate: now(), Typ: user.UserV1PasswordCheckSucceededType},
 				userView: &UserSessionView{},
 			},
 			result: &UserSessionView{ChangeDate: now(), PasswordVerification: now()},
@@ -38,7 +38,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append human password check succeeded event",
 			args: args{
-				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.HumanPasswordCheckSucceededType)},
+				event:    &es_models.Event{CreationDate: now(), Typ: user.HumanPasswordCheckSucceededType},
 				userView: &UserSessionView{},
 			},
 			result: &UserSessionView{ChangeDate: now(), PasswordVerification: now()},
@@ -46,7 +46,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append user password check failed event",
 			args: args{
-				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.UserV1PasswordCheckFailedType)},
+				event:    &es_models.Event{CreationDate: now(), Typ: user.UserV1PasswordCheckFailedType},
 				userView: &UserSessionView{PasswordVerification: now()},
 			},
 			result: &UserSessionView{ChangeDate: now(), PasswordVerification: time.Time{}},
@@ -54,7 +54,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append human password check failed event",
 			args: args{
-				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.HumanPasswordCheckFailedType)},
+				event:    &es_models.Event{CreationDate: now(), Typ: user.HumanPasswordCheckFailedType},
 				userView: &UserSessionView{PasswordVerification: now()},
 			},
 			result: &UserSessionView{ChangeDate: now(), PasswordVerification: time.Time{}},
@@ -64,7 +64,7 @@ func TestAppendEvent(t *testing.T) {
 			args: args{
 				event: &es_models.Event{
 					CreationDate: now(),
-					Type:         es_models.EventType(user.UserV1PasswordChangedType),
+					Typ:          user.UserV1PasswordChangedType,
 					Data: func() []byte {
 						d, _ := json.Marshal(&es_model.Password{
 							Secret: &crypto.CryptoValue{Crypted: []byte("test")},
@@ -81,7 +81,7 @@ func TestAppendEvent(t *testing.T) {
 			args: args{
 				event: &es_models.Event{
 					CreationDate: now(),
-					Type:         es_models.EventType(user.HumanPasswordChangedType),
+					Typ:          user.HumanPasswordChangedType,
 					Data: func() []byte {
 						d, _ := json.Marshal(&es_model.PasswordChange{
 							Password: es_model.Password{
@@ -100,7 +100,7 @@ func TestAppendEvent(t *testing.T) {
 			args: args{
 				event: &es_models.Event{
 					CreationDate: now(),
-					Type:         es_models.EventType(user.HumanPasswordChangedType),
+					Typ:          user.HumanPasswordChangedType,
 					Data: func() []byte {
 						d, _ := json.Marshal(&es_model.PasswordChange{
 							Password: es_model.Password{
@@ -120,7 +120,7 @@ func TestAppendEvent(t *testing.T) {
 			args: args{
 				event: &es_models.Event{
 					CreationDate: now(),
-					Type:         es_models.EventType(user.HumanMFAOTPVerifiedType),
+					Typ:          user.HumanMFAOTPVerifiedType,
 					Data:         nil,
 				},
 				userView: &UserSessionView{UserAgentID: "id"},
@@ -132,7 +132,7 @@ func TestAppendEvent(t *testing.T) {
 			args: args{
 				event: &es_models.Event{
 					CreationDate: now(),
-					Type:         es_models.EventType(user.HumanMFAOTPVerifiedType),
+					Typ:          user.HumanMFAOTPVerifiedType,
 					Data: func() []byte {
 						d, _ := json.Marshal(&es_model.OTPVerified{
 							UserAgentID: "id",
@@ -147,7 +147,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append user otp check succeeded event",
 			args: args{
-				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.UserV1MFAOTPCheckSucceededType)},
+				event:    &es_models.Event{CreationDate: now(), Typ: user.UserV1MFAOTPCheckSucceededType},
 				userView: &UserSessionView{},
 			},
 			result: &UserSessionView{ChangeDate: now(), SecondFactorVerification: now()},
@@ -155,7 +155,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append human otp check succeeded event",
 			args: args{
-				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.HumanMFAOTPCheckSucceededType)},
+				event:    &es_models.Event{CreationDate: now(), Typ: user.HumanMFAOTPCheckSucceededType},
 				userView: &UserSessionView{},
 			},
 			result: &UserSessionView{ChangeDate: now(), SecondFactorVerification: now()},
@@ -163,7 +163,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append user otp check failed event",
 			args: args{
-				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.UserV1MFAOTPCheckFailedType)},
+				event:    &es_models.Event{CreationDate: now(), Typ: user.UserV1MFAOTPCheckFailedType},
 				userView: &UserSessionView{SecondFactorVerification: now()},
 			},
 			result: &UserSessionView{ChangeDate: now(), SecondFactorVerification: time.Time{}},
@@ -171,7 +171,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append human otp check failed event",
 			args: args{
-				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.HumanMFAOTPCheckFailedType)},
+				event:    &es_models.Event{CreationDate: now(), Typ: user.HumanMFAOTPCheckFailedType},
 				userView: &UserSessionView{SecondFactorVerification: now()},
 			},
 			result: &UserSessionView{ChangeDate: now(), SecondFactorVerification: time.Time{}},
@@ -179,7 +179,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append user otp removed event",
 			args: args{
-				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.UserV1MFAOTPRemovedType)},
+				event:    &es_models.Event{CreationDate: now(), Typ: user.UserV1MFAOTPRemovedType},
 				userView: &UserSessionView{SecondFactorVerification: now()},
 			},
 			result: &UserSessionView{ChangeDate: now(), SecondFactorVerification: time.Time{}},
@@ -187,7 +187,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append human otp removed event",
 			args: args{
-				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.HumanMFAOTPRemovedType)},
+				event:    &es_models.Event{CreationDate: now(), Typ: user.HumanMFAOTPRemovedType},
 				userView: &UserSessionView{SecondFactorVerification: now()},
 			},
 			result: &UserSessionView{ChangeDate: now(), SecondFactorVerification: time.Time{}},
@@ -195,7 +195,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append user signed out event",
 			args: args{
-				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.UserV1SignedOutType)},
+				event:    &es_models.Event{CreationDate: now(), Typ: user.UserV1SignedOutType},
 				userView: &UserSessionView{PasswordVerification: now(), SecondFactorVerification: now()},
 			},
 			result: &UserSessionView{ChangeDate: now(), PasswordVerification: time.Time{}, SecondFactorVerification: time.Time{}, State: 1},
@@ -203,7 +203,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append human signed out event",
 			args: args{
-				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.HumanSignedOutType)},
+				event:    &es_models.Event{CreationDate: now(), Typ: user.HumanSignedOutType},
 				userView: &UserSessionView{PasswordVerification: now(), SecondFactorVerification: now()},
 			},
 			result: &UserSessionView{ChangeDate: now(), PasswordVerification: time.Time{}, SecondFactorVerification: time.Time{}, State: 1},

internal/user/repository/view/model/user_test.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/zitadel/zitadel/internal/crypto"
+	"github.com/zitadel/zitadel/internal/eventstore"
 	es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models"
 	"github.com/zitadel/zitadel/internal/repository/user"
 	"github.com/zitadel/zitadel/internal/user/model"
@@ -76,7 +77,7 @@ func getFullMachine() *es_model.User {
 
 func TestUserAppendEvent(t *testing.T) {
 	type args struct {
-		event *es_models.Event
+		event eventstore.Event
 		user  *UserView
 	}
 	tests := []struct {
@@ -87,7 +88,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append added user event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1AddedType), ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(nil))},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1AddedType, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(nil))},
 				user:  &UserView{},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateInitial)},
@@ -95,7 +96,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append added human event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.HumanAddedType), ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(nil))},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.HumanAddedType, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(nil))},
 				user:  &UserView{},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateInitial)},
@@ -103,7 +104,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append added machine event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.MachineAddedEventType), ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullMachine())},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.MachineAddedEventType, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullMachine())},
 				user:  &UserView{},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", MachineView: &MachineView{Description: "Description", Name: "Machine"}, State: int32(model.UserStateActive)},
@@ -111,7 +112,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append added user with password event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1AddedType), ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(&es_model.Password{Secret: &crypto.CryptoValue{}}))},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1AddedType, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(&es_model.Password{Secret: &crypto.CryptoValue{}}))},
 				user:  &UserView{},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country", PasswordSet: true}, State: int32(model.UserStateInitial)},
@@ -119,7 +120,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append added human with password event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.HumanAddedType), ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(&es_model.Password{Secret: &crypto.CryptoValue{}}))},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.HumanAddedType, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(&es_model.Password{Secret: &crypto.CryptoValue{}}))},
 				user:  &UserView{},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country", PasswordSet: true}, State: int32(model.UserStateInitial)},
@@ -127,7 +128,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append added user with password but change required event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1AddedType), ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(&es_model.Password{ChangeRequired: true, Secret: &crypto.CryptoValue{}}))},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1AddedType, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(&es_model.Password{ChangeRequired: true, Secret: &crypto.CryptoValue{}}))},
 				user:  &UserView{},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country", PasswordSet: true, PasswordChangeRequired: true}, State: int32(model.UserStateInitial)},
@@ -135,7 +136,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append added human with password but change required event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.HumanAddedType), ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(&es_model.Password{ChangeRequired: true, Secret: &crypto.CryptoValue{}}))},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.HumanAddedType, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(&es_model.Password{ChangeRequired: true, Secret: &crypto.CryptoValue{}}))},
 				user:  &UserView{},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country", PasswordSet: true, PasswordChangeRequired: true}, State: int32(model.UserStateInitial)},
@@ -143,7 +144,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append password change event on user",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1PasswordChangedType), ResourceOwner: "GrantedOrgID", Data: mockPasswordData(&es_model.Password{Secret: &crypto.CryptoValue{}})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1PasswordChangedType, ResourceOwner: "GrantedOrgID", Data: mockPasswordData(&es_model.Password{Secret: &crypto.CryptoValue{}})},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "Country", PasswordSet: true}, State: int32(model.UserStateActive)},
@@ -151,7 +152,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append password change event on human",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.HumanPasswordChangedType), ResourceOwner: "GrantedOrgID", Data: mockPasswordData(&es_model.Password{Secret: &crypto.CryptoValue{}})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.HumanPasswordChangedType, ResourceOwner: "GrantedOrgID", Data: mockPasswordData(&es_model.Password{Secret: &crypto.CryptoValue{}})},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "Country", PasswordSet: true}, State: int32(model.UserStateActive)},
@@ -159,7 +160,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append password change with change required event on user",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1PasswordChangedType), ResourceOwner: "GrantedOrgID", Data: mockPasswordData(&es_model.Password{ChangeRequired: true, Secret: &crypto.CryptoValue{}})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1PasswordChangedType, ResourceOwner: "GrantedOrgID", Data: mockPasswordData(&es_model.Password{ChangeRequired: true, Secret: &crypto.CryptoValue{}})},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "Country", PasswordSet: true, PasswordChangeRequired: true}, State: int32(model.UserStateActive)},
@@ -167,7 +168,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append password change with change required event on human",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.HumanPasswordChangedType), ResourceOwner: "GrantedOrgID", Data: mockPasswordData(&es_model.Password{ChangeRequired: true, Secret: &crypto.CryptoValue{}})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.HumanPasswordChangedType, ResourceOwner: "GrantedOrgID", Data: mockPasswordData(&es_model.Password{ChangeRequired: true, Secret: &crypto.CryptoValue{}})},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "Country", PasswordSet: true, PasswordChangeRequired: true}, State: int32(model.UserStateActive)},
@@ -175,7 +176,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append change user profile event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1ProfileChangedType), ResourceOwner: "GrantedOrgID", Data: mockProfileData(&es_model.Profile{FirstName: "FirstNameChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1ProfileChangedType, ResourceOwner: "GrantedOrgID", Data: mockProfileData(&es_model.Profile{FirstName: "FirstNameChanged"})},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateInitial)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstNameChanged", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateInitial)},
@@ -183,7 +184,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append change human profile event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.HumanProfileChangedType), ResourceOwner: "GrantedOrgID", Data: mockProfileData(&es_model.Profile{FirstName: "FirstNameChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.HumanProfileChangedType, ResourceOwner: "GrantedOrgID", Data: mockProfileData(&es_model.Profile{FirstName: "FirstNameChanged"})},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateInitial)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstNameChanged", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateInitial)},
@@ -191,7 +192,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append change user email event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1EmailChangedType), ResourceOwner: "GrantedOrgID", Data: mockEmailData(&es_model.Email{EmailAddress: "EmailChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1EmailChangedType, ResourceOwner: "GrantedOrgID", Data: mockEmailData(&es_model.Email{EmailAddress: "EmailChanged"})},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "EmailChanged", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
@@ -199,7 +200,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append change human email event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.HumanEmailChangedType), ResourceOwner: "GrantedOrgID", Data: mockEmailData(&es_model.Email{EmailAddress: "EmailChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.HumanEmailChangedType, ResourceOwner: "GrantedOrgID", Data: mockEmailData(&es_model.Email{EmailAddress: "EmailChanged"})},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "EmailChanged", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
@@ -207,7 +208,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append verify user email event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1EmailVerifiedType), ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1EmailVerifiedType, ResourceOwner: "GrantedOrgID"},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateInitial)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
@@ -215,7 +216,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append verify human email event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.HumanEmailVerifiedType), ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.HumanEmailVerifiedType, ResourceOwner: "GrantedOrgID"},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateInitial)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
@@ -223,7 +224,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append change user phone event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1PhoneChangedType), ResourceOwner: "GrantedOrgID", Data: mockPhoneData(&es_model.Phone{PhoneNumber: "PhoneChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1PhoneChangedType, ResourceOwner: "GrantedOrgID", Data: mockPhoneData(&es_model.Phone{PhoneNumber: "PhoneChanged"})},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "PhoneChanged", Country: "Country"}, State: int32(model.UserStateActive)},
@@ -231,7 +232,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append change human phone event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.HumanPhoneChangedType), ResourceOwner: "GrantedOrgID", Data: mockPhoneData(&es_model.Phone{PhoneNumber: "PhoneChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.HumanPhoneChangedType, ResourceOwner: "GrantedOrgID", Data: mockPhoneData(&es_model.Phone{PhoneNumber: "PhoneChanged"})},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "PhoneChanged", Country: "Country"}, State: int32(model.UserStateActive)},
@@ -239,7 +240,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append verify user phone event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1PhoneVerifiedType), ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1PhoneVerifiedType, ResourceOwner: "GrantedOrgID"},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", IsPhoneVerified: true, Country: "Country"}, State: int32(model.UserStateActive)},
@@ -247,7 +248,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append verify human phone event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.HumanPhoneVerifiedType), ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.HumanPhoneVerifiedType, ResourceOwner: "GrantedOrgID"},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", IsPhoneVerified: true, Country: "Country"}, State: int32(model.UserStateActive)},
@@ -255,7 +256,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append change user address event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1AddressChangedType), ResourceOwner: "GrantedOrgID", Data: mockAddressData(&es_model.Address{Country: "CountryChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1AddressChangedType, ResourceOwner: "GrantedOrgID", Data: mockAddressData(&es_model.Address{Country: "CountryChanged"})},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "CountryChanged"}, State: int32(model.UserStateActive)},
@@ -263,7 +264,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append change human address event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.HumanAddressChangedType), ResourceOwner: "GrantedOrgID", Data: mockAddressData(&es_model.Address{Country: "CountryChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.HumanAddressChangedType, ResourceOwner: "GrantedOrgID", Data: mockAddressData(&es_model.Address{Country: "CountryChanged"})},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", IsEmailVerified: true, Phone: "Phone", Country: "CountryChanged"}, State: int32(model.UserStateActive)},
@@ -271,7 +272,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append user deactivate event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserDeactivatedType), ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserDeactivatedType, ResourceOwner: "GrantedOrgID"},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateInactive)},
@@ -279,7 +280,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append user reactivate event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserReactivatedType), ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserReactivatedType, ResourceOwner: "GrantedOrgID"},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateInactive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
@@ -287,7 +288,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append user lock event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserLockedType), ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserLockedType, ResourceOwner: "GrantedOrgID"},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateLocked)},
@@ -295,7 +296,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append user unlock event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserUnlockedType), ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserUnlockedType, ResourceOwner: "GrantedOrgID"},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateLocked)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
@@ -303,7 +304,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append user add otp event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1MFAOTPAddedType), ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1MFAOTPAddedType, ResourceOwner: "GrantedOrgID"},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country", OTPState: int32(model.MFAStateNotReady)}, State: int32(model.UserStateActive)},
@@ -311,7 +312,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append human add otp event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.HumanMFAOTPAddedType), ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.HumanMFAOTPAddedType, ResourceOwner: "GrantedOrgID"},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country", OTPState: int32(model.MFAStateNotReady)}, State: int32(model.UserStateActive)},
@@ -319,7 +320,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append user verify otp event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1MFAOTPVerifiedType), ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1MFAOTPVerifiedType, ResourceOwner: "GrantedOrgID"},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country", OTPState: int32(model.MFAStateNotReady)}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country", OTPState: int32(model.MFAStateReady)}, State: int32(model.UserStateActive)},
@@ -327,7 +328,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append human verify otp event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.HumanMFAOTPVerifiedType), ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.HumanMFAOTPVerifiedType, ResourceOwner: "GrantedOrgID"},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country", OTPState: int32(model.MFAStateNotReady)}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country", OTPState: int32(model.MFAStateReady)}, State: int32(model.UserStateActive)},
@@ -335,7 +336,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append user remove otp event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.UserV1MFAOTPRemovedType), ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.UserV1MFAOTPRemovedType, ResourceOwner: "GrantedOrgID"},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country", OTPState: int32(model.MFAStateReady)}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country", OTPState: int32(model.MFAStateUnspecified)}, State: int32(model.UserStateActive)},
@@ -343,7 +344,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append human remove otp event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(user.HumanMFAOTPRemovedType), ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Seq: 1, Typ: user.HumanMFAOTPRemovedType, ResourceOwner: "GrantedOrgID"},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country", OTPState: int32(model.MFAStateReady)}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country", OTPState: int32(model.MFAStateUnspecified)}, State: int32(model.UserStateActive)},
@@ -351,7 +352,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append user mfa init skipped event",
 			args: args{
-				event: &es_models.Event{Sequence: 1, CreationDate: time.Now().UTC(), Type: es_models.EventType(user.UserV1MFAInitSkippedType), AggregateID: "AggregateID", ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{Seq: 1, CreationDate: time.Now().UTC(), Typ: user.UserV1MFAInitSkippedType, AggregateID: "AggregateID", ResourceOwner: "GrantedOrgID"},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country", MFAInitSkipped: time.Now().UTC()}, State: int32(model.UserStateActive)},
@@ -359,7 +360,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append human mfa init skipped event",
 			args: args{
-				event: &es_models.Event{Sequence: 1, CreationDate: time.Now().UTC(), Type: es_models.EventType(user.HumanMFAInitSkippedType), AggregateID: "AggregateID", ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{Seq: 1, CreationDate: time.Now().UTC(), Typ: user.HumanMFAInitSkippedType, AggregateID: "AggregateID", ResourceOwner: "GrantedOrgID"},
 				user:  &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country"}, State: int32(model.UserStateActive)},
 			},
 			result: &UserView{ID: "AggregateID", ResourceOwner: "GrantedOrgID", UserName: "UserName", HumanView: &HumanView{FirstName: "FirstName", LastName: "LastName", Email: "Email", Phone: "Phone", Country: "Country", MFAInitSkipped: time.Now().UTC()}, State: int32(model.UserStateActive)},

internal/user/repository/view/query.go

@@ -2,20 +2,21 @@ 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/user"
 )
 
-func UserByIDQuery(id, instanceID string, latestSequence uint64, eventTypes []es_models.EventType) (*es_models.SearchQuery, error) {
+func UserByIDQuery(id, instanceID string, sequence uint64, eventTypes []eventstore.EventType) (*eventstore.SearchQueryBuilder, error) {
 	if id == "" {
 		return nil, errors.ThrowPreconditionFailed(nil, "EVENT-d8isw", "Errors.User.UserIDMissing")
 	}
-	return es_models.NewSearchQuery().
+	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
+		AwaitOpenTransactions().
+		InstanceID(instanceID).
+		SequenceGreater(sequence).
 		AddQuery().
-		AggregateTypeFilter(user.AggregateType).
-		AggregateIDFilter(id).
-		EventTypesFilter(eventTypes...).
-		LatestSequenceFilter(latestSequence).
-		InstanceIDFilter(instanceID).
-		SearchQuery(), nil
+		AggregateTypes(user.AggregateType).
+		AggregateIDs(id).
+		EventTypes(eventTypes...).
+		Builder(), nil
 }

internal/user/repository/view/user_view.go

@@ -144,76 +144,6 @@ func UsersByOrgID(db *gorm.DB, table, orgID, instanceID string) ([]*model.UserVi
 	return users, err
 }
 
-func UserIDsByDomain(db *gorm.DB, table, orgDomain, instanceID string) ([]string, error) {
-	type id struct {
-		Id string
-	}
-	ids := make([]id, 0)
-	orgIDQuery := &usr_model.UserSearchQuery{
-		Key:    usr_model.UserSearchKeyUserName,
-		Method: domain.SearchMethodEndsWithIgnoreCase,
-		Value:  "%" + orgDomain,
-	}
-	instanceIDQuery := &usr_model.UserSearchQuery{
-		Key:    usr_model.UserSearchKeyInstanceID,
-		Method: domain.SearchMethodEquals,
-		Value:  instanceID,
-	}
-	ownerRemovedQuery := &usr_model.UserSearchQuery{
-		Key:    usr_model.UserSearchOwnerRemoved,
-		Method: domain.SearchMethodEquals,
-		Value:  false,
-	}
-	query := repository.PrepareSearchQuery(table, model.UserSearchRequest{
-		Queries: []*usr_model.UserSearchQuery{orgIDQuery, instanceIDQuery, ownerRemovedQuery},
-	})
-	_, err := query(db, &ids)
-	if err != nil {
-		return nil, err
-	}
-	users := make([]string, len(ids))
-	for i, id := range ids {
-		users[i] = id.Id
-	}
-	return users, err
-}
-
-func SearchUsers(db *gorm.DB, table string, req *usr_model.UserSearchRequest) ([]*model.UserView, uint64, error) {
-	users := make([]*model.UserView, 0)
-	query := repository.PrepareSearchQuery(table, model.UserSearchRequest{Limit: req.Limit, Offset: req.Offset, Queries: req.Queries})
-	count, err := query(db, &users)
-	if err != nil {
-		return nil, 0, err
-	}
-	return users, count, nil
-}
-
-func GetGlobalUserByLoginName(db *gorm.DB, table, loginName, instanceID string) (*model.UserView, error) {
-	user := new(model.UserView)
-	query := repository.PrepareGetByQuery(table,
-		&model.UserSearchQuery{Key: usr_model.UserSearchKeyLoginNames, Value: loginName, Method: domain.SearchMethodListContains},
-		&model.UserSearchQuery{Key: usr_model.UserSearchKeyInstanceID, Value: instanceID, Method: domain.SearchMethodEquals},
-		&model.UserSearchQuery{Key: usr_model.UserSearchOwnerRemoved, Value: false, Method: domain.SearchMethodEquals},
-	)
-	err := query(db, user)
-	if caos_errs.IsNotFound(err) {
-		return nil, caos_errs.ThrowNotFound(nil, "VIEW-8uWer", "Errors.User.NotFound")
-	}
-	user.SetEmptyUserType()
-	return user, err
-}
-
-func UserMFAs(db *gorm.DB, table, userID, instanceID string) ([]*usr_model.MultiFactor, error) {
-	user, err := UserByID(db, table, userID, instanceID)
-	if err != nil {
-		return nil, err
-	}
-	if user.OTPState == int32(usr_model.MFAStateUnspecified) {
-		return []*usr_model.MultiFactor{}, nil
-	}
-	return []*usr_model.MultiFactor{{Type: usr_model.MFATypeOTP, State: usr_model.MFAState(user.OTPState)}}, nil
-}
-
 func PutUsers(db *gorm.DB, table string, users ...*model.UserView) error {
 	save := repository.PrepareBulkSave(table)
 	u := make([]interface{}, len(users))