fix: change to repository event types and removed unused code (#3386)

* fix: change to repository event types and removed unused code * some fixes * remove unused code
2025-08-12 01:37:31 +00:00 · 2022-03-31 11:36:26 +02:00
parent 55af4a18a2
commit 87560157c1
170 changed files with 999 additions and 9581 deletions
--- a/internal/user/repository/view/external_idp_view.go
+++ b/internal/user/repository/view/external_idp_view.go
@@ -70,68 +70,6 @@ func ExternalIDPsByIDPConfigID(db *gorm.DB, table, idpConfigID string) ([]*model
 	return externalIDPs, err
 }

-func ExternalIDPsByIDPConfigIDAndResourceOwner(db *gorm.DB, table, idpConfigID, resourceOwner string) ([]*model.ExternalIDPView, error) {
-	externalIDPs := make([]*model.ExternalIDPView, 0)
-	idpConfigIDQuery := &usr_model.ExternalIDPSearchQuery{
-		Key:    usr_model.ExternalIDPSearchKeyIdpConfigID,
-		Method: domain.SearchMethodEquals,
-		Value:  idpConfigID,
-	}
-	orgIDQuery := &usr_model.ExternalIDPSearchQuery{
-		Key:    usr_model.ExternalIDPSearchKeyResourceOwner,
-		Method: domain.SearchMethodEquals,
-		Value:  resourceOwner,
-	}
-	query := repository.PrepareSearchQuery(table, model.ExternalIDPSearchRequest{
-		Queries: []*usr_model.ExternalIDPSearchQuery{orgIDQuery, idpConfigIDQuery},
-	})
-	_, err := query(db, &externalIDPs)
-	return externalIDPs, err
-}
-
-func ExternalIDPsByIDPConfigIDAndResourceOwners(db *gorm.DB, table, idpConfigID string, resourceOwners []string) ([]*model.ExternalIDPView, error) {
-	externalIDPs := make([]*model.ExternalIDPView, 0)
-	idpConfigIDQuery := &usr_model.ExternalIDPSearchQuery{
-		Key:    usr_model.ExternalIDPSearchKeyIdpConfigID,
-		Method: domain.SearchMethodEquals,
-		Value:  idpConfigID,
-	}
-	orgIDQuery := &usr_model.ExternalIDPSearchQuery{
-		Key:    usr_model.ExternalIDPSearchKeyResourceOwner,
-		Method: domain.SearchMethodIsOneOf,
-		Value:  resourceOwners,
-	}
-	query := repository.PrepareSearchQuery(table, model.ExternalIDPSearchRequest{
-		Queries: []*usr_model.ExternalIDPSearchQuery{orgIDQuery, idpConfigIDQuery},
-	})
-	_, err := query(db, &externalIDPs)
-	return externalIDPs, err
-}
-
-func ExternalIDPsByUserID(db *gorm.DB, table, userID string) ([]*model.ExternalIDPView, error) {
-	externalIDPs := make([]*model.ExternalIDPView, 0)
-	orgIDQuery := &usr_model.ExternalIDPSearchQuery{
-		Key:    usr_model.ExternalIDPSearchKeyUserID,
-		Method: domain.SearchMethodEquals,
-		Value:  userID,
-	}
-	query := repository.PrepareSearchQuery(table, model.ExternalIDPSearchRequest{
-		Queries: []*usr_model.ExternalIDPSearchQuery{orgIDQuery},
-	})
-	_, err := query(db, &externalIDPs)
-	return externalIDPs, err
-}
-
-func SearchExternalIDPs(db *gorm.DB, table string, req *usr_model.ExternalIDPSearchRequest) ([]*model.ExternalIDPView, uint64, error) {
-	externalIDPs := make([]*model.ExternalIDPView, 0)
-	query := repository.PrepareSearchQuery(table, model.ExternalIDPSearchRequest{Limit: req.Limit, Offset: req.Offset, Queries: req.Queries})
-	count, err := query(db, &externalIDPs)
-	if err != nil {
-		return nil, 0, err
-	}
-	return externalIDPs, count, nil
-}
-
 func PutExternalIDPs(db *gorm.DB, table string, externalIDPs ...*model.ExternalIDPView) error {
 	save := repository.PrepareBulkSave(table)
 	u := make([]interface{}, len(externalIDPs))
--- a/internal/user/repository/view/model/external_idps.go
+++ b/internal/user/repository/view/model/external_idps.go
@@ -7,9 +7,9 @@ import (
 	"github.com/caos/logging"

 	caos_errs "github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore"
 	"github.com/caos/zitadel/internal/eventstore/v1/models"
-	"github.com/caos/zitadel/internal/user/model"
-	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
+	user_repo "github.com/caos/zitadel/internal/repository/user"
 )

 const (
@@ -32,47 +32,11 @@ type ExternalIDPView struct {
 	InstanceID      string    `json:"instanceID" gorm:"column:instance_id"`
 }

-func ExternalIDPViewFromModel(externalIDP *model.ExternalIDPView) *ExternalIDPView {
-	return &ExternalIDPView{
-		UserID:          externalIDP.UserID,
-		IDPConfigID:     externalIDP.IDPConfigID,
-		ExternalUserID:  externalIDP.ExternalUserID,
-		IDPName:         externalIDP.IDPName,
-		UserDisplayName: externalIDP.UserDisplayName,
-		Sequence:        externalIDP.Sequence,
-		CreationDate:    externalIDP.CreationDate,
-		ChangeDate:      externalIDP.ChangeDate,
-		ResourceOwner:   externalIDP.ResourceOwner,
-	}
-}
-
-func ExternalIDPViewToModel(externalIDP *ExternalIDPView) *model.ExternalIDPView {
-	return &model.ExternalIDPView{
-		UserID:          externalIDP.UserID,
-		IDPConfigID:     externalIDP.IDPConfigID,
-		ExternalUserID:  externalIDP.ExternalUserID,
-		IDPName:         externalIDP.IDPName,
-		UserDisplayName: externalIDP.UserDisplayName,
-		Sequence:        externalIDP.Sequence,
-		CreationDate:    externalIDP.CreationDate,
-		ChangeDate:      externalIDP.ChangeDate,
-		ResourceOwner:   externalIDP.ResourceOwner,
-	}
-}
-
-func ExternalIDPViewsToModel(externalIDPs []*ExternalIDPView) []*model.ExternalIDPView {
-	result := make([]*model.ExternalIDPView, len(externalIDPs))
-	for i, r := range externalIDPs {
-		result[i] = ExternalIDPViewToModel(r)
-	}
-	return result
-}
-
 func (i *ExternalIDPView) AppendEvent(event *models.Event) (err error) {
 	i.Sequence = event.Sequence
 	i.ChangeDate = event.CreationDate
-	switch event.Type {
-	case es_model.HumanExternalIDPAdded:
+	switch eventstore.EventType(event.Type) {
+	case user_repo.UserIDPLinkAddedType:
 		i.setRootData(event)
 		i.CreationDate = event.CreationDate
 		err = i.SetData(event)
--- a/internal/user/repository/view/model/notify_user.go
+++ b/internal/user/repository/view/model/notify_user.go
@@ -8,9 +8,10 @@ import (
 	"github.com/lib/pq"

 	caos_errs "github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore"
 	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	org_model "github.com/caos/zitadel/internal/org/model"
-	"github.com/caos/zitadel/internal/user/model"
+	"github.com/caos/zitadel/internal/repository/user"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 )

@@ -43,54 +44,6 @@ type NotifyUser struct {
 	InstanceID         string         `json:"instanceID" gorm:"column:instance_id"`
 }

-func NotifyUserFromModel(user *model.NotifyUser) *NotifyUser {
-	return &NotifyUser{
-		ID:                 user.ID,
-		ChangeDate:         user.ChangeDate,
-		CreationDate:       user.CreationDate,
-		ResourceOwner:      user.ResourceOwner,
-		UserName:           user.UserName,
-		LoginNames:         user.LoginNames,
-		PreferredLoginName: user.PreferredLoginName,
-		FirstName:          user.FirstName,
-		LastName:           user.LastName,
-		NickName:           user.NickName,
-		DisplayName:        user.DisplayName,
-		PreferredLanguage:  user.PreferredLanguage,
-		Gender:             int32(user.Gender),
-		LastEmail:          user.LastEmail,
-		VerifiedEmail:      user.VerifiedEmail,
-		LastPhone:          user.LastPhone,
-		VerifiedPhone:      user.VerifiedPhone,
-		PasswordSet:        user.PasswordSet,
-		Sequence:           user.Sequence,
-	}
-}
-
-func NotifyUserToModel(user *NotifyUser) *model.NotifyUser {
-	return &model.NotifyUser{
-		ID:                 user.ID,
-		ChangeDate:         user.ChangeDate,
-		CreationDate:       user.CreationDate,
-		ResourceOwner:      user.ResourceOwner,
-		UserName:           user.UserName,
-		LoginNames:         user.LoginNames,
-		PreferredLoginName: user.PreferredLoginName,
-		FirstName:          user.FirstName,
-		LastName:           user.LastName,
-		NickName:           user.NickName,
-		DisplayName:        user.DisplayName,
-		PreferredLanguage:  user.PreferredLanguage,
-		Gender:             model.Gender(user.Gender),
-		LastEmail:          user.LastEmail,
-		VerifiedEmail:      user.VerifiedEmail,
-		LastPhone:          user.LastPhone,
-		VerifiedPhone:      user.VerifiedPhone,
-		PasswordSet:        user.PasswordSet,
-		Sequence:           user.Sequence,
-	}
-}
-
 func (u *NotifyUser) GenerateLoginName(domain string, appendDomain bool) string {
 	if !appendDomain {
 		return u.UserName
@@ -114,12 +67,12 @@ 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 event.Type {
-	case es_model.UserAdded,
-		es_model.UserRegistered,
-		es_model.HumanRegistered,
-		es_model.HumanAdded,
-		es_model.MachineAdded:
+	switch eventstore.EventType(event.Type) {
+	case user.UserV1AddedType,
+		user.UserV1RegisteredType,
+		user.HumanRegisteredType,
+		user.HumanAddedType,
+		user.MachineAddedEventType:
 		u.CreationDate = event.CreationDate
 		u.setRootData(event)
 		err = u.setData(event)
@@ -127,28 +80,28 @@ func (u *NotifyUser) AppendEvent(event *models.Event) (err error) {
 			return err
 		}
 		err = u.setPasswordData(event)
-	case es_model.UserProfileChanged,
-		es_model.UserEmailChanged,
-		es_model.UserPhoneChanged,
-		es_model.HumanProfileChanged,
-		es_model.HumanEmailChanged,
-		es_model.HumanPhoneChanged,
-		es_model.UserUserNameChanged:
+	case user.UserV1ProfileChangedType,
+		user.UserV1EmailChangedType,
+		user.UserV1PhoneChangedType,
+		user.HumanProfileChangedType,
+		user.HumanEmailChangedType,
+		user.HumanPhoneChangedType,
+		user.UserUserNameChangedType:
 		err = u.setData(event)
-	case es_model.UserEmailVerified,
-		es_model.HumanEmailVerified:
+	case user.UserV1EmailVerifiedType,
+		user.HumanEmailVerifiedType:
 		u.VerifiedEmail = u.LastEmail
-	case es_model.UserPhoneRemoved,
-		es_model.HumanPhoneRemoved:
+	case user.UserV1PhoneRemovedType,
+		user.HumanPhoneRemovedType:
 		u.VerifiedPhone = ""
 		u.LastPhone = ""
-	case es_model.UserPhoneVerified,
-		es_model.HumanPhoneVerified:
+	case user.UserV1PhoneVerifiedType,
+		user.HumanPhoneVerifiedType:
 		u.VerifiedPhone = u.LastPhone
-	case es_model.UserPasswordChanged,
-		es_model.HumanPasswordChanged:
+	case user.UserV1PasswordChangedType,
+		user.HumanPasswordChangedType:
 		err = u.setPasswordData(event)
-	case es_model.UserRemoved:
+	case user.UserRemovedType:
 		u.State = int32(UserStateDeleted)
 	}
 	return err
--- a/internal/user/repository/view/model/notify_user_test.go
+++ b/internal/user/repository/view/model/notify_user_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"

 	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/repository/user"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 )

@@ -20,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_model.UserAdded, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(nil))},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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"},
@@ -28,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_model.HumanAdded, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(nil))},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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"},
@@ -36,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_model.UserProfileChanged, ResourceOwner: "GrantedOrgID", Data: mockProfileData(&es_model.Profile{FirstName: "FirstNameChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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"},
@@ -44,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_model.UserEmailChanged, ResourceOwner: "GrantedOrgID", Data: mockEmailData(&es_model.Email{EmailAddress: "EmailChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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"},
@@ -52,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_model.UserEmailChanged, ResourceOwner: "GrantedOrgID", Data: mockEmailData(&es_model.Email{EmailAddress: "EmailChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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"},
@@ -60,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_model.UserEmailVerified, ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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"},
@@ -68,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_model.UserPhoneChanged, ResourceOwner: "GrantedOrgID", Data: mockPhoneData(&es_model.Phone{PhoneNumber: "PhoneChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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"},
@@ -76,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_model.UserPhoneChanged, ResourceOwner: "GrantedOrgID", Data: mockPhoneData(&es_model.Phone{PhoneNumber: "PhoneChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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"},
@@ -84,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_model.UserPhoneVerified, ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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"},
--- a/internal/user/repository/view/model/token.go
+++ b/internal/user/repository/view/model/token.go
@@ -5,14 +5,13 @@ import (
 	"time"

 	"github.com/caos/logging"
+	"github.com/lib/pq"

 	caos_errs "github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore"
 	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	user_repo "github.com/caos/zitadel/internal/repository/user"
 	usr_model "github.com/caos/zitadel/internal/user/model"
-	usr_es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
-
-	"github.com/lib/pq"
 )

 const (
@@ -66,16 +65,16 @@ func TokenViewToModel(token *TokenView) *usr_model.TokenView {

 func (t *TokenView) AppendEventIfMyToken(event *es_models.Event) (err error) {
 	view := new(TokenView)
-	switch event.Type {
-	case usr_es_model.UserTokenAdded:
+	switch eventstore.EventType(event.Type) {
+	case user_repo.UserTokenAddedType:
 		view.setRootData(event)
 		err = view.setData(event)
-	case es_models.EventType(user_repo.UserTokenRemovedType):
+	case user_repo.UserTokenRemovedType:
 		return t.appendTokenRemoved(event)
-	case es_models.EventType(user_repo.HumanRefreshTokenRemovedType):
+	case user_repo.HumanRefreshTokenRemovedType:
 		return t.appendRefreshTokenRemoved(event)
-	case usr_es_model.SignedOut,
-		usr_es_model.HumanSignedOut:
+	case user_repo.UserV1SignedOutType,
+		user_repo.HumanSignedOutType:
 		id, err := agentIDFromSession(event)
 		if err != nil {
 			return err
@@ -84,13 +83,13 @@ func (t *TokenView) AppendEventIfMyToken(event *es_models.Event) (err error) {
 			t.Deactivated = true
 		}
 		return nil
-	case usr_es_model.UserRemoved,
-		usr_es_model.UserDeactivated,
-		usr_es_model.UserLocked:
+	case user_repo.UserRemovedType,
+		user_repo.UserDeactivatedType,
+		user_repo.UserLockedType:
 		t.Deactivated = true
 		return nil
-	case usr_es_model.UserUnlocked,
-		usr_es_model.UserReactivated:
+	case user_repo.UserUnlockedType,
+		user_repo.UserReactivatedType:
 		if t.ID != "" && event.CreationDate.Before(t.CreationDate) {
 			t.Deactivated = false
 		}
@@ -110,16 +109,16 @@ func (t *TokenView) AppendEventIfMyToken(event *es_models.Event) (err error) {
 func (t *TokenView) AppendEvent(event *es_models.Event) error {
 	t.ChangeDate = event.CreationDate
 	t.Sequence = event.Sequence
-	switch event.Type {
-	case usr_es_model.UserTokenAdded,
-		es_models.EventType(user_repo.PersonalAccessTokenAddedType):
+	switch eventstore.EventType(event.Type) {
+	case user_repo.UserTokenAddedType,
+		user_repo.PersonalAccessTokenAddedType:
 		t.setRootData(event)
 		err := t.setData(event)
 		if err != nil {
 			return err
 		}
 		t.CreationDate = event.CreationDate
-		t.IsPAT = event.Type == es_models.EventType(user_repo.PersonalAccessTokenAddedType)
+		t.IsPAT = eventstore.EventType(event.Type) == user_repo.PersonalAccessTokenAddedType
 	}
 	return nil
 }
--- a/internal/user/repository/view/model/user.go
+++ b/internal/user/repository/view/model/user.go
@@ -8,12 +8,12 @@ import (
 	"github.com/caos/logging"
 	"github.com/lib/pq"

-	req_model "github.com/caos/zitadel/internal/auth_request/model"
 	"github.com/caos/zitadel/internal/domain"
 	caos_errs "github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore"
 	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	org_model "github.com/caos/zitadel/internal/org/model"
-	user_repo "github.com/caos/zitadel/internal/repository/user"
+	"github.com/caos/zitadel/internal/repository/user"
 	"github.com/caos/zitadel/internal/user/model"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 )
@@ -178,7 +178,7 @@ func UserToModel(user *UserView, prefixAvatarURL string) *model.UserView {
 			Region:                   user.Region,
 			StreetAddress:            user.StreetAddress,
 			OTPState:                 model.MFAState(user.OTPState),
-			MFAMaxSetUp:              req_model.MFALevel(user.MFAMaxSetUp),
+			MFAMaxSetUp:              domain.MFALevel(user.MFAMaxSetUp),
 			MFAInitSkipped:           user.MFAInitSkipped,
 			InitRequired:             user.InitRequired,
 			PasswordlessInitRequired: user.PasswordlessInitRequired,
@@ -244,8 +244,8 @@ 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 event.Type {
-	case es_model.MachineAdded:
+	switch eventstore.EventType(event.Type) {
+	case user.MachineAddedEventType:
 		u.CreationDate = event.CreationDate
 		u.setRootData(event)
 		u.Type = userTypeMachine
@@ -253,10 +253,10 @@ func (u *UserView) AppendEvent(event *models.Event) (err error) {
 		if err != nil {
 			return err
 		}
-	case es_model.UserAdded,
-		es_model.UserRegistered,
-		es_model.HumanRegistered,
-		es_model.HumanAdded:
+	case user.UserV1AddedType,
+		user.UserV1RegisteredType,
+		user.HumanRegisteredType,
+		user.HumanAddedType:
 		u.CreationDate = event.CreationDate
 		u.setRootData(event)
 		u.Type = userTypeHuman
@@ -265,93 +265,93 @@ func (u *UserView) AppendEvent(event *models.Event) (err error) {
 			return err
 		}
 		err = u.setPasswordData(event)
-	case es_model.UserRemoved:
+	case user.UserRemovedType:
 		u.State = int32(model.UserStateDeleted)
-	case es_model.UserPasswordChanged,
-		es_model.HumanPasswordChanged:
+	case user.UserV1PasswordChangedType,
+		user.HumanPasswordChangedType:
 		err = u.setPasswordData(event)
-	case es_model.HumanPasswordlessTokenAdded:
+	case user.HumanPasswordlessTokenAddedType:
 		err = u.addPasswordlessToken(event)
-	case es_model.HumanPasswordlessTokenVerified:
+	case user.HumanPasswordlessTokenVerifiedType:
 		err = u.updatePasswordlessToken(event)
-	case es_model.HumanPasswordlessTokenRemoved:
+	case user.HumanPasswordlessTokenRemovedType:
 		err = u.removePasswordlessToken(event)
-	case es_model.UserProfileChanged,
-		es_model.HumanProfileChanged,
-		es_model.UserAddressChanged,
-		es_model.HumanAddressChanged,
-		es_model.MachineChanged:
+	case user.UserV1ProfileChangedType,
+		user.HumanProfileChangedType,
+		user.UserV1AddressChangedType,
+		user.HumanAddressChangedType,
+		user.MachineChangedEventType:
 		err = u.setData(event)
-	case es_model.DomainClaimed:
+	case user.UserDomainClaimedType:
 		if u.HumanView != nil {
 			u.HumanView.UsernameChangeRequired = true
 		}
 		err = u.setData(event)
-	case es_model.UserUserNameChanged:
+	case user.UserUserNameChangedType:
 		if u.HumanView != nil {
 			u.HumanView.UsernameChangeRequired = false
 		}
 		err = u.setData(event)
-	case es_model.UserEmailChanged,
-		es_model.HumanEmailChanged:
+	case user.UserV1EmailChangedType,
+		user.HumanEmailChangedType:
 		u.IsEmailVerified = false
 		err = u.setData(event)
-	case es_model.UserEmailVerified,
-		es_model.HumanEmailVerified:
+	case user.UserV1EmailVerifiedType,
+		user.HumanEmailVerifiedType:
 		u.IsEmailVerified = true
-	case es_model.UserPhoneChanged,
-		es_model.HumanPhoneChanged:
+	case user.UserV1PhoneChangedType,
+		user.HumanPhoneChangedType:
 		u.IsPhoneVerified = false
 		err = u.setData(event)
-	case es_model.UserPhoneVerified,
-		es_model.HumanPhoneVerified:
+	case user.UserV1PhoneVerifiedType,
+		user.HumanPhoneVerifiedType:
 		u.IsPhoneVerified = true
-	case es_model.UserPhoneRemoved,
-		es_model.HumanPhoneRemoved:
+	case user.UserV1PhoneRemovedType,
+		user.HumanPhoneRemovedType:
 		u.Phone = ""
 		u.IsPhoneVerified = false
-	case es_model.UserDeactivated:
+	case user.UserDeactivatedType:
 		u.State = int32(model.UserStateInactive)
-	case es_model.UserReactivated,
-		es_model.UserUnlocked:
+	case user.UserReactivatedType,
+		user.UserUnlockedType:
 		u.State = int32(model.UserStateActive)
-	case es_model.UserLocked:
+	case user.UserLockedType:
 		u.State = int32(model.UserStateLocked)
-	case es_model.MFAOTPAdded,
-		es_model.HumanMFAOTPAdded:
+	case user.UserV1MFAOTPAddedType,
+		user.HumanMFAOTPAddedType:
 		u.OTPState = int32(model.MFAStateNotReady)
-	case es_model.MFAOTPVerified,
-		es_model.HumanMFAOTPVerified:
+	case user.UserV1MFAOTPVerifiedType,
+		user.HumanMFAOTPVerifiedType:
 		u.OTPState = int32(model.MFAStateReady)
 		u.MFAInitSkipped = time.Time{}
-	case es_model.MFAOTPRemoved,
-		es_model.HumanMFAOTPRemoved:
+	case user.UserV1MFAOTPRemovedType,
+		user.HumanMFAOTPRemovedType:
 		u.OTPState = int32(model.MFAStateUnspecified)
-	case es_model.HumanMFAU2FTokenAdded:
+	case user.HumanU2FTokenAddedType:
 		err = u.addU2FToken(event)
-	case es_model.HumanMFAU2FTokenVerified:
+	case user.HumanU2FTokenVerifiedType:
 		err = u.updateU2FToken(event)
 		if err != nil {
 			return err
 		}
 		u.MFAInitSkipped = time.Time{}
-	case es_model.HumanMFAU2FTokenRemoved:
+	case user.HumanU2FTokenRemovedType:
 		err = u.removeU2FToken(event)
-	case es_model.MFAInitSkipped,
-		es_model.HumanMFAInitSkipped:
+	case user.UserV1MFAInitSkippedType,
+		user.HumanMFAInitSkippedType:
 		u.MFAInitSkipped = event.CreationDate
-	case es_model.InitializedUserCodeAdded,
-		es_model.InitializedHumanCodeAdded:
+	case user.UserV1InitialCodeAddedType,
+		user.HumanInitialCodeAddedType:
 		u.InitRequired = true
-	case es_model.InitializedUserCheckSucceeded,
-		es_model.InitializedHumanCheckSucceeded:
+	case user.UserV1InitializedCheckSucceededType,
+		user.HumanInitializedCheckSucceededType:
 		u.InitRequired = false
-	case es_model.HumanAvatarAdded:
+	case user.HumanAvatarAddedType:
 		err = u.setData(event)
-	case es_model.HumanAvatarRemoved:
+	case user.HumanAvatarRemovedType:
 		u.AvatarKey = ""
-	case models.EventType(user_repo.HumanPasswordlessInitCodeAddedType),
-		models.EventType(user_repo.HumanPasswordlessInitCodeRequestedType):
+	case user.HumanPasswordlessInitCodeAddedType,
+		user.HumanPasswordlessInitCodeRequestedType:
 		if !u.PasswordSet {
 			u.PasswordlessInitRequired = true
 			u.PasswordInitRequired = false
@@ -510,22 +510,22 @@ func (u *UserView) ComputeObject() {
 func (u *UserView) ComputeMFAMaxSetUp() {
 	for _, token := range u.PasswordlessTokens {
 		if token.State == int32(model.MFAStateReady) {
-			u.MFAMaxSetUp = int32(req_model.MFALevelMultiFactor)
+			u.MFAMaxSetUp = int32(domain.MFALevelMultiFactor)
 			u.PasswordlessInitRequired = false
 			return
 		}
 	}
 	for _, token := range u.U2FTokens {
 		if token.State == int32(model.MFAStateReady) {
-			u.MFAMaxSetUp = int32(req_model.MFALevelSecondFactor)
+			u.MFAMaxSetUp = int32(domain.MFALevelSecondFactor)
 			return
 		}
 	}
 	if u.OTPState == int32(model.MFAStateReady) {
-		u.MFAMaxSetUp = int32(req_model.MFALevelSecondFactor)
+		u.MFAMaxSetUp = int32(domain.MFALevelSecondFactor)
 		return
 	}
-	u.MFAMaxSetUp = int32(req_model.MFALevelNotSetUp)
+	u.MFAMaxSetUp = int32(domain.MFALevelNotSetUp)
 }

 func (u *UserView) SetEmptyUserType() {
--- a/internal/user/repository/view/model/user_membership.go
+++ b/internal/user/repository/view/model/user_membership.go
@@ -8,10 +8,14 @@ import (
 	"github.com/lib/pq"

 	caos_errs "github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore"
 	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	org_es_model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
 	proj_es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
+	"github.com/caos/zitadel/internal/repository/instance"
+	"github.com/caos/zitadel/internal/repository/org"
+	"github.com/caos/zitadel/internal/repository/project"
 	"github.com/caos/zitadel/internal/user/model"
 )

@@ -40,62 +44,38 @@ type UserMembershipView struct {
 	InstanceID        string         `json:"instanceID" gorm:"column:instance_id"`
 }

-func UserMembershipToModel(membership *UserMembershipView) *model.UserMembershipView {
-	return &model.UserMembershipView{
-		UserID:            membership.UserID,
-		MemberType:        model.MemberType(membership.MemberType),
-		AggregateID:       membership.AggregateID,
-		ObjectID:          membership.ObjectID,
-		Roles:             membership.Roles,
-		DisplayName:       membership.DisplayName,
-		ChangeDate:        membership.ChangeDate,
-		CreationDate:      membership.CreationDate,
-		ResourceOwner:     membership.ResourceOwner,
-		ResourceOwnerName: membership.ResourceOwnerName,
-		Sequence:          membership.Sequence,
-	}
-}
-
-func UserMembershipsToModel(memberships []*UserMembershipView) []*model.UserMembershipView {
-	result := make([]*model.UserMembershipView, len(memberships))
-	for i, m := range memberships {
-		result[i] = UserMembershipToModel(m)
-	}
-	return result
-}
-
 func (u *UserMembershipView) AppendEvent(event *models.Event) (err error) {
 	u.ChangeDate = event.CreationDate
 	u.Sequence = event.Sequence

-	switch event.Type {
-	case iam_es_model.IAMMemberAdded:
+	switch eventstore.EventType(event.Type) {
+	case instance.MemberAddedEventType:
 		u.setRootData(event, model.MemberTypeIam)
 		err = u.setIamMemberData(event)
-	case iam_es_model.IAMMemberChanged,
-		iam_es_model.IAMMemberRemoved,
-		iam_es_model.IAMMemberCascadeRemoved:
+	case instance.MemberChangedEventType,
+		instance.MemberRemovedEventType,
+		instance.MemberCascadeRemovedEventType:
 		err = u.setIamMemberData(event)
-	case org_es_model.OrgMemberAdded:
+	case org.MemberAddedEventType:
 		u.setRootData(event, model.MemberTypeOrganisation)
 		err = u.setOrgMemberData(event)
-	case org_es_model.OrgMemberChanged,
-		org_es_model.OrgMemberRemoved,
-		org_es_model.OrgMemberCascadeRemoved:
+	case org.MemberChangedEventType,
+		org.MemberRemovedEventType,
+		org.MemberCascadeRemovedEventType:
 		err = u.setOrgMemberData(event)
-	case proj_es_model.ProjectMemberAdded:
+	case project.MemberAddedType:
 		u.setRootData(event, model.MemberTypeProject)
 		err = u.setProjectMemberData(event)
-	case proj_es_model.ProjectMemberChanged,
-		proj_es_model.ProjectMemberRemoved,
-		proj_es_model.ProjectMemberCascadeRemoved:
+	case project.MemberChangedType,
+		project.MemberRemovedType,
+		project.MemberCascadeRemovedType:
 		err = u.setProjectMemberData(event)
-	case proj_es_model.ProjectGrantMemberAdded:
+	case project.GrantMemberAddedType:
 		u.setRootData(event, model.MemberTypeProjectGrant)
 		err = u.setProjectGrantMemberData(event)
-	case proj_es_model.ProjectGrantMemberChanged,
-		proj_es_model.ProjectGrantMemberRemoved,
-		proj_es_model.ProjectGrantMemberCascadeRemoved:
+	case project.GrantMemberChangedType,
+		project.GrantMemberRemovedType,
+		project.GrantMemberCascadeRemovedType:
 		err = u.setProjectGrantMemberData(event)
 	}
 	return err
@@ -113,7 +93,7 @@ func (u *UserMembershipView) setRootData(event *models.Event, memberType model.M
 func (u *UserMembershipView) setIamMemberData(event *models.Event) error {
 	member := new(iam_es_model.IAMMember)
 	if err := json.Unmarshal(event.Data, member); err != nil {
-		logging.Log("MODEL-Ec9sf").WithError(err).Error("could not unmarshal event data")
+		logging.New().WithError(err).Error("could not unmarshal event data")
 		return caos_errs.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data")
 	}
 	u.UserID = member.UserID
@@ -124,7 +104,7 @@ func (u *UserMembershipView) setIamMemberData(event *models.Event) error {
 func (u *UserMembershipView) setOrgMemberData(event *models.Event) error {
 	member := new(org_es_model.OrgMember)
 	if err := json.Unmarshal(event.Data, member); err != nil {
-		logging.Log("MODEL-Lps0e").WithError(err).Error("could not unmarshal event data")
+		logging.New().WithError(err).Error("could not unmarshal event data")
 		return caos_errs.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data")
 	}
 	u.UserID = member.UserID
@@ -135,7 +115,7 @@ func (u *UserMembershipView) setOrgMemberData(event *models.Event) error {
 func (u *UserMembershipView) setProjectMemberData(event *models.Event) error {
 	member := new(proj_es_model.ProjectMember)
 	if err := json.Unmarshal(event.Data, member); err != nil {
-		logging.Log("MODEL-Esu8k").WithError(err).Error("could not unmarshal event data")
+		logging.New().WithError(err).Error("could not unmarshal event data")
 		return caos_errs.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data")
 	}
 	u.UserID = member.UserID
@@ -146,7 +126,7 @@ func (u *UserMembershipView) setProjectMemberData(event *models.Event) error {
 func (u *UserMembershipView) setProjectGrantMemberData(event *models.Event) error {
 	member := new(proj_es_model.ProjectGrantMember)
 	if err := json.Unmarshal(event.Data, member); err != nil {
-		logging.Log("MODEL-MCn8s").WithError(err).Error("could not unmarshal event data")
+		logging.New().WithError(err).Error("could not unmarshal event data")
 		return caos_errs.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data")
 	}
 	u.UserID = member.UserID
--- a/internal/user/repository/view/model/user_session.go
+++ b/internal/user/repository/view/model/user_session.go
@@ -6,10 +6,11 @@ import (

 	"github.com/caos/logging"

-	req_model "github.com/caos/zitadel/internal/auth_request/model"
 	"github.com/caos/zitadel/internal/domain"
 	caos_errs "github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore"
 	"github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/repository/user"
 	"github.com/caos/zitadel/internal/user/model"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 )
@@ -58,7 +59,7 @@ func UserSessionToModel(userSession *UserSessionView, prefixAvatarURL string) *m
 		ChangeDate:                   userSession.ChangeDate,
 		CreationDate:                 userSession.CreationDate,
 		ResourceOwner:                userSession.ResourceOwner,
-		State:                        req_model.UserSessionState(userSession.State),
+		State:                        domain.UserSessionState(userSession.State),
 		UserAgentID:                  userSession.UserAgentID,
 		UserID:                       userSession.UserID,
 		UserName:                     userSession.UserName,
@@ -71,9 +72,9 @@ func UserSessionToModel(userSession *UserSessionView, prefixAvatarURL string) *m
 		PasswordlessVerification:     userSession.PasswordlessVerification,
 		ExternalLoginVerification:    userSession.ExternalLoginVerification,
 		SecondFactorVerification:     userSession.SecondFactorVerification,
-		SecondFactorVerificationType: req_model.MFAType(userSession.SecondFactorVerificationType),
+		SecondFactorVerificationType: domain.MFAType(userSession.SecondFactorVerificationType),
 		MultiFactorVerification:      userSession.MultiFactorVerification,
-		MultiFactorVerificationType:  req_model.MFAType(userSession.MultiFactorVerificationType),
+		MultiFactorVerificationType:  domain.MFAType(userSession.MultiFactorVerificationType),
 		Sequence:                     userSession.Sequence,
 	}
 }
@@ -89,12 +90,12 @@ func UserSessionsToModel(userSessions []*UserSessionView, prefixAvatarURL string
 func (v *UserSessionView) AppendEvent(event *models.Event) error {
 	v.Sequence = event.Sequence
 	v.ChangeDate = event.CreationDate
-	switch event.Type {
-	case es_model.UserPasswordCheckSucceeded,
-		es_model.HumanPasswordCheckSucceeded:
+	switch eventstore.EventType(event.Type) {
+	case user.UserV1PasswordCheckSucceededType,
+		user.HumanPasswordCheckSucceededType:
 		v.PasswordVerification = event.CreationDate
-		v.State = int32(req_model.UserSessionStateActive)
-	case es_model.HumanExternalLoginCheckSucceeded:
+		v.State = int32(domain.UserSessionStateActive)
+	case user.UserIDPLoginCheckSucceededType:
 		data := new(es_model.AuthRequest)
 		err := data.SetData(event)
 		if err != nil {
@@ -102,21 +103,21 @@ func (v *UserSessionView) AppendEvent(event *models.Event) error {
 		}
 		v.ExternalLoginVerification = event.CreationDate
 		v.SelectedIDPConfigID = data.SelectedIDPConfigID
-		v.State = int32(req_model.UserSessionStateActive)
-	case es_model.HumanPasswordlessTokenCheckSucceeded:
+		v.State = int32(domain.UserSessionStateActive)
+	case user.HumanPasswordlessTokenCheckSucceededType:
 		v.PasswordlessVerification = event.CreationDate
 		v.MultiFactorVerification = event.CreationDate
-		v.MultiFactorVerificationType = int32(req_model.MFATypeU2FUserVerification)
-		v.State = int32(req_model.UserSessionStateActive)
-	case es_model.HumanPasswordlessTokenCheckFailed,
-		es_model.HumanPasswordlessTokenRemoved:
+		v.MultiFactorVerificationType = int32(domain.MFATypeU2FUserVerification)
+		v.State = int32(domain.UserSessionStateActive)
+	case user.HumanPasswordlessTokenCheckFailedType,
+		user.HumanPasswordlessTokenRemovedType:
 		v.PasswordlessVerification = time.Time{}
 		v.MultiFactorVerification = time.Time{}
-	case es_model.UserPasswordCheckFailed,
-		es_model.HumanPasswordCheckFailed:
+	case user.UserV1PasswordCheckFailedType,
+		user.HumanPasswordCheckFailedType:
 		v.PasswordVerification = time.Time{}
-	case es_model.UserPasswordChanged,
-		es_model.HumanPasswordChanged:
+	case user.UserV1PasswordChangedType,
+		user.HumanPasswordChangedType:
 		data := new(es_model.PasswordChange)
 		err := data.SetData(event)
 		if err != nil {
@@ -125,57 +126,57 @@ func (v *UserSessionView) AppendEvent(event *models.Event) error {
 		if v.UserAgentID != data.UserAgentID {
 			v.PasswordVerification = time.Time{}
 		}
-	case es_model.HumanMFAOTPVerified:
+	case user.HumanMFAOTPVerifiedType:
 		data := new(es_model.OTPVerified)
 		err := data.SetData(event)
 		if err != nil {
 			return err
 		}
 		if v.UserAgentID == data.UserAgentID {
-			v.setSecondFactorVerification(event.CreationDate, req_model.MFATypeOTP)
+			v.setSecondFactorVerification(event.CreationDate, domain.MFATypeOTP)
 		}
-	case es_model.MFAOTPCheckSucceeded,
-		es_model.HumanMFAOTPCheckSucceeded:
-		v.setSecondFactorVerification(event.CreationDate, req_model.MFATypeOTP)
-	case es_model.MFAOTPCheckFailed,
-		es_model.MFAOTPRemoved,
-		es_model.HumanMFAOTPCheckFailed,
-		es_model.HumanMFAOTPRemoved,
-		es_model.HumanMFAU2FTokenCheckFailed,
-		es_model.HumanMFAU2FTokenRemoved:
+	case user.UserV1MFAOTPCheckSucceededType,
+		user.HumanMFAOTPCheckSucceededType:
+		v.setSecondFactorVerification(event.CreationDate, domain.MFATypeOTP)
+	case user.UserV1MFAOTPCheckFailedType,
+		user.UserV1MFAOTPRemovedType,
+		user.HumanMFAOTPCheckFailedType,
+		user.HumanMFAOTPRemovedType,
+		user.HumanU2FTokenCheckFailedType,
+		user.HumanU2FTokenRemovedType:
 		v.SecondFactorVerification = time.Time{}
-	case es_model.HumanMFAU2FTokenVerified:
+	case user.HumanU2FTokenVerifiedType:
 		data := new(es_model.WebAuthNVerify)
 		err := data.SetData(event)
 		if err != nil {
 			return err
 		}
 		if v.UserAgentID == data.UserAgentID {
-			v.setSecondFactorVerification(event.CreationDate, req_model.MFATypeU2F)
+			v.setSecondFactorVerification(event.CreationDate, domain.MFATypeU2F)
 		}
-	case es_model.HumanMFAU2FTokenCheckSucceeded:
-		v.setSecondFactorVerification(event.CreationDate, req_model.MFATypeU2F)
-	case es_model.SignedOut,
-		es_model.HumanSignedOut,
-		es_model.UserLocked,
-		es_model.UserDeactivated:
+	case user.HumanU2FTokenCheckSucceededType:
+		v.setSecondFactorVerification(event.CreationDate, domain.MFATypeU2F)
+	case user.UserV1SignedOutType,
+		user.HumanSignedOutType,
+		user.UserLockedType,
+		user.UserDeactivatedType:
 		v.PasswordlessVerification = time.Time{}
 		v.PasswordVerification = time.Time{}
 		v.SecondFactorVerification = time.Time{}
-		v.SecondFactorVerificationType = int32(req_model.MFALevelNotSetUp)
+		v.SecondFactorVerificationType = int32(domain.MFALevelNotSetUp)
 		v.MultiFactorVerification = time.Time{}
-		v.MultiFactorVerificationType = int32(req_model.MFALevelNotSetUp)
+		v.MultiFactorVerificationType = int32(domain.MFALevelNotSetUp)
 		v.ExternalLoginVerification = time.Time{}
-		v.State = int32(req_model.UserSessionStateTerminated)
-	case es_model.HumanExternalIDPRemoved, es_model.HumanExternalIDPCascadeRemoved:
+		v.State = int32(domain.UserSessionStateTerminated)
+	case user.UserIDPLinkRemovedType, user.UserIDPLinkCascadeRemovedType:
 		v.ExternalLoginVerification = time.Time{}
 		v.SelectedIDPConfigID = ""
 	}
 	return nil
 }

-func (v *UserSessionView) setSecondFactorVerification(verificationTime time.Time, mfaType req_model.MFAType) {
+func (v *UserSessionView) setSecondFactorVerification(verificationTime time.Time, mfaType domain.MFAType) {
 	v.SecondFactorVerification = verificationTime
 	v.SecondFactorVerificationType = int32(mfaType)
-	v.State = int32(req_model.UserSessionStateActive)
+	v.State = int32(domain.UserSessionStateActive)
 }
--- a/internal/user/repository/view/model/user_session_test.go
+++ b/internal/user/repository/view/model/user_session_test.go
@@ -9,6 +9,7 @@ import (

 	"github.com/caos/zitadel/internal/crypto"
 	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/repository/user"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 )

@@ -29,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_model.UserPasswordCheckSucceeded},
+				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.UserV1PasswordCheckSucceededType)},
 				userView: &UserSessionView{},
 			},
 			result: &UserSessionView{ChangeDate: now(), PasswordVerification: now()},
@@ -37,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_model.HumanPasswordCheckSucceeded},
+				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.HumanPasswordCheckSucceededType)},
 				userView: &UserSessionView{},
 			},
 			result: &UserSessionView{ChangeDate: now(), PasswordVerification: now()},
@@ -45,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_model.UserPasswordCheckFailed},
+				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.UserV1PasswordCheckFailedType)},
 				userView: &UserSessionView{PasswordVerification: now()},
 			},
 			result: &UserSessionView{ChangeDate: now(), PasswordVerification: time.Time{}},
@@ -53,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_model.HumanPasswordCheckFailed},
+				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.HumanPasswordCheckFailedType)},
 				userView: &UserSessionView{PasswordVerification: now()},
 			},
 			result: &UserSessionView{ChangeDate: now(), PasswordVerification: time.Time{}},
@@ -63,7 +64,7 @@ func TestAppendEvent(t *testing.T) {
 			args: args{
 				event: &es_models.Event{
 					CreationDate: now(),
-					Type:         es_model.UserPasswordChanged,
+					Type:         es_models.EventType(user.UserV1PasswordChangedType),
 					Data: func() []byte {
 						d, _ := json.Marshal(&es_model.Password{
 							Secret: &crypto.CryptoValue{Crypted: []byte("test")},
@@ -80,7 +81,7 @@ func TestAppendEvent(t *testing.T) {
 			args: args{
 				event: &es_models.Event{
 					CreationDate: now(),
-					Type:         es_model.HumanPasswordChanged,
+					Type:         es_models.EventType(user.HumanPasswordChangedType),
 					Data: func() []byte {
 						d, _ := json.Marshal(&es_model.PasswordChange{
 							Password: es_model.Password{
@@ -99,7 +100,7 @@ func TestAppendEvent(t *testing.T) {
 			args: args{
 				event: &es_models.Event{
 					CreationDate: now(),
-					Type:         es_model.HumanPasswordChanged,
+					Type:         es_models.EventType(user.HumanPasswordChangedType),
 					Data: func() []byte {
 						d, _ := json.Marshal(&es_model.PasswordChange{
 							Password: es_model.Password{
@@ -119,7 +120,7 @@ func TestAppendEvent(t *testing.T) {
 			args: args{
 				event: &es_models.Event{
 					CreationDate: now(),
-					Type:         es_model.HumanMFAOTPVerified,
+					Type:         es_models.EventType(user.HumanMFAOTPVerifiedType),
 					Data:         nil,
 				},
 				userView: &UserSessionView{UserAgentID: "id"},
@@ -131,7 +132,7 @@ func TestAppendEvent(t *testing.T) {
 			args: args{
 				event: &es_models.Event{
 					CreationDate: now(),
-					Type:         es_model.HumanMFAOTPVerified,
+					Type:         es_models.EventType(user.HumanMFAOTPVerifiedType),
 					Data: func() []byte {
 						d, _ := json.Marshal(&es_model.OTPVerified{
 							UserAgentID: "id",
@@ -146,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_model.MFAOTPCheckSucceeded},
+				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.UserV1MFAOTPCheckSucceededType)},
 				userView: &UserSessionView{},
 			},
 			result: &UserSessionView{ChangeDate: now(), SecondFactorVerification: now()},
@@ -154,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_model.HumanMFAOTPCheckSucceeded},
+				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.HumanMFAOTPCheckSucceededType)},
 				userView: &UserSessionView{},
 			},
 			result: &UserSessionView{ChangeDate: now(), SecondFactorVerification: now()},
@@ -162,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_model.MFAOTPCheckFailed},
+				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.UserV1MFAOTPCheckFailedType)},
 				userView: &UserSessionView{SecondFactorVerification: now()},
 			},
 			result: &UserSessionView{ChangeDate: now(), SecondFactorVerification: time.Time{}},
@@ -170,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_model.HumanMFAOTPCheckFailed},
+				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.HumanMFAOTPCheckFailedType)},
 				userView: &UserSessionView{SecondFactorVerification: now()},
 			},
 			result: &UserSessionView{ChangeDate: now(), SecondFactorVerification: time.Time{}},
@@ -178,7 +179,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append user otp removed event",
 			args: args{
-				event:    &es_models.Event{CreationDate: now(), Type: es_model.MFAOTPRemoved},
+				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.UserV1MFAOTPRemovedType)},
 				userView: &UserSessionView{SecondFactorVerification: now()},
 			},
 			result: &UserSessionView{ChangeDate: now(), SecondFactorVerification: time.Time{}},
@@ -186,7 +187,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append human otp removed event",
 			args: args{
-				event:    &es_models.Event{CreationDate: now(), Type: es_model.HumanMFAOTPRemoved},
+				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.HumanMFAOTPRemovedType)},
 				userView: &UserSessionView{SecondFactorVerification: now()},
 			},
 			result: &UserSessionView{ChangeDate: now(), SecondFactorVerification: time.Time{}},
@@ -194,7 +195,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append user signed out event",
 			args: args{
-				event:    &es_models.Event{CreationDate: now(), Type: es_model.SignedOut},
+				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.UserV1SignedOutType)},
 				userView: &UserSessionView{PasswordVerification: now(), SecondFactorVerification: now()},
 			},
 			result: &UserSessionView{ChangeDate: now(), PasswordVerification: time.Time{}, SecondFactorVerification: time.Time{}, State: 1},
@@ -202,7 +203,7 @@ func TestAppendEvent(t *testing.T) {
 		{
 			name: "append human signed out event",
 			args: args{
-				event:    &es_models.Event{CreationDate: now(), Type: es_model.HumanSignedOut},
+				event:    &es_models.Event{CreationDate: now(), Type: es_models.EventType(user.HumanSignedOutType)},
 				userView: &UserSessionView{PasswordVerification: now(), SecondFactorVerification: now()},
 			},
 			result: &UserSessionView{ChangeDate: now(), PasswordVerification: time.Time{}, SecondFactorVerification: time.Time{}, State: 1},
--- a/internal/user/repository/view/model/user_test.go
+++ b/internal/user/repository/view/model/user_test.go
@@ -7,6 +7,7 @@ import (

 	"github.com/caos/zitadel/internal/crypto"
 	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/repository/user"
 	"github.com/caos/zitadel/internal/user/model"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 )
@@ -86,7 +87,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append added user event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.UserAdded, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(nil))},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -94,7 +95,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append added human event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.HumanAdded, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(nil))},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -102,7 +103,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append added machine event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.MachineAdded, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullMachine())},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -110,7 +111,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_model.UserAdded, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(&es_model.Password{Secret: &crypto.CryptoValue{}}))},
+				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{}}))},
 				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)},
@@ -118,7 +119,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_model.HumanAdded, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(&es_model.Password{Secret: &crypto.CryptoValue{}}))},
+				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{}}))},
 				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)},
@@ -126,7 +127,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_model.UserAdded, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(&es_model.Password{ChangeRequired: true, Secret: &crypto.CryptoValue{}}))},
+				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{}}))},
 				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)},
@@ -134,7 +135,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_model.HumanAdded, ResourceOwner: "GrantedOrgID", Data: mockUserData(getFullHuman(&es_model.Password{ChangeRequired: true, Secret: &crypto.CryptoValue{}}))},
+				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{}}))},
 				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)},
@@ -142,7 +143,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_model.UserPasswordChanged, ResourceOwner: "GrantedOrgID", Data: mockPasswordData(&es_model.Password{Secret: &crypto.CryptoValue{}})},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -150,7 +151,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_model.HumanPasswordChanged, ResourceOwner: "GrantedOrgID", Data: mockPasswordData(&es_model.Password{Secret: &crypto.CryptoValue{}})},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -158,7 +159,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_model.UserPasswordChanged, ResourceOwner: "GrantedOrgID", Data: mockPasswordData(&es_model.Password{ChangeRequired: true, Secret: &crypto.CryptoValue{}})},
+				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{}})},
 				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)},
@@ -166,7 +167,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_model.HumanPasswordChanged, ResourceOwner: "GrantedOrgID", Data: mockPasswordData(&es_model.Password{ChangeRequired: true, Secret: &crypto.CryptoValue{}})},
+				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{}})},
 				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)},
@@ -174,7 +175,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append change user profile event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.UserProfileChanged, ResourceOwner: "GrantedOrgID", Data: mockProfileData(&es_model.Profile{FirstName: "FirstNameChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -182,7 +183,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append change human profile event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.HumanProfileChanged, ResourceOwner: "GrantedOrgID", Data: mockProfileData(&es_model.Profile{FirstName: "FirstNameChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -190,7 +191,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append change user email event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.UserEmailChanged, ResourceOwner: "GrantedOrgID", Data: mockEmailData(&es_model.Email{EmailAddress: "EmailChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -198,7 +199,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append change human email event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.HumanEmailChanged, ResourceOwner: "GrantedOrgID", Data: mockEmailData(&es_model.Email{EmailAddress: "EmailChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -206,7 +207,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append verify user email event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.UserEmailVerified, ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -214,7 +215,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append verify human email event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.HumanEmailVerified, ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -222,7 +223,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append change user phone event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.UserPhoneChanged, ResourceOwner: "GrantedOrgID", Data: mockPhoneData(&es_model.Phone{PhoneNumber: "PhoneChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -230,7 +231,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append change human phone event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.HumanPhoneChanged, ResourceOwner: "GrantedOrgID", Data: mockPhoneData(&es_model.Phone{PhoneNumber: "PhoneChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -238,7 +239,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append verify user phone event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.UserPhoneVerified, ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -246,7 +247,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append verify human phone event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.HumanPhoneVerified, ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -254,7 +255,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append change user address event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.UserAddressChanged, ResourceOwner: "GrantedOrgID", Data: mockAddressData(&es_model.Address{Country: "CountryChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -262,7 +263,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append change human address event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.HumanAddressChanged, ResourceOwner: "GrantedOrgID", Data: mockAddressData(&es_model.Address{Country: "CountryChanged"})},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -270,7 +271,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append user deactivate event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.UserDeactivated, ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -278,7 +279,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append user reactivate event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.UserReactivated, ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -286,7 +287,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append user lock event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.UserLocked, ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -294,7 +295,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append user unlock event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.UserUnlocked, ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -302,7 +303,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append user add otp event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.MFAOTPAdded, ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -310,7 +311,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append human add otp event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.HumanMFAOTPAdded, ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -318,7 +319,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append user verify otp event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.MFAOTPVerified, ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -326,7 +327,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append human verify otp event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.HumanMFAOTPVerified, ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -334,7 +335,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append user remove otp event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.MFAOTPRemoved, ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -342,7 +343,7 @@ func TestUserAppendEvent(t *testing.T) {
 		{
 			name: "append human remove otp event",
 			args: args{
-				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_model.HumanMFAOTPRemoved, ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: es_models.EventType(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)},
@@ -350,7 +351,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_model.MFAInitSkipped, AggregateID: "AggregateID", ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{Sequence: 1, CreationDate: time.Now().UTC(), Type: es_models.EventType(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)},
@@ -358,7 +359,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_model.HumanMFAInitSkipped, AggregateID: "AggregateID", ResourceOwner: "GrantedOrgID"},
+				event: &es_models.Event{Sequence: 1, CreationDate: time.Now().UTC(), Type: es_models.EventType(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)},
--- a/internal/user/repository/view/query.go
+++ b/internal/user/repository/view/query.go
@@ -1,11 +1,9 @@
 package view

 import (
-	"time"
-
 	"github.com/caos/zitadel/internal/errors"
 	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
-	"github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
+	"github.com/caos/zitadel/internal/repository/user"
 )

 func UserByIDQuery(id string, latestSequence uint64) (*es_models.SearchQuery, error) {
@@ -18,22 +16,6 @@ func UserByIDQuery(id string, latestSequence uint64) (*es_models.SearchQuery, er

 func UserQuery(latestSequence uint64) *es_models.SearchQuery {
 	return es_models.NewSearchQuery().
-		AggregateTypeFilter(model.UserAggregate).
+		AggregateTypeFilter(user.AggregateType).
 		LatestSequenceFilter(latestSequence)
 }
-
-func ChangesQuery(userID string, latestSequence, limit uint64, sortAscending bool, retention time.Duration) *es_models.SearchQuery {
-	query := es_models.NewSearchQuery().
-		AggregateTypeFilter(model.UserAggregate)
-	if !sortAscending {
-		query.OrderDesc()
-	}
-	if retention > 0 {
-		query.CreationDateNewerFilter(time.Now().Add(-retention))
-	}
-
-	query.LatestSequenceFilter(latestSequence).
-		AggregateIDFilter(userID).
-		SetLimit(limit)
-	return query
-}
--- a/internal/user/repository/view/user_session_view.go
+++ b/internal/user/repository/view/user_session_view.go
@@ -3,7 +3,6 @@ package view
 import (
 	"github.com/jinzhu/gorm"

-	auth_model "github.com/caos/zitadel/internal/auth_request/model"
 	"github.com/caos/zitadel/internal/domain"
 	caos_errs "github.com/caos/zitadel/internal/errors"
 	usr_model "github.com/caos/zitadel/internal/user/model"
@@ -63,7 +62,7 @@ func ActiveUserSessions(db *gorm.DB, table string) (uint64, error) {
 	activeQuery := &usr_model.UserSessionSearchQuery{
 		Key:    usr_model.UserSessionSearchKeyState,
 		Method: domain.SearchMethodEquals,
-		Value:  auth_model.UserSessionStateActive,
+		Value:  domain.UserSessionStateActive,
 	}
 	query := repository.PrepareSearchQuery(table, model.UserSessionSearchRequest{
 		Queries: []*usr_model.UserSessionSearchQuery{activeQuery},
--- a/internal/user/repository/view/user_view.go
+++ b/internal/user/repository/view/user_view.go
@@ -22,27 +22,6 @@ func UserByID(db *gorm.DB, table, userID string) (*model.UserView, error) {
 	return user, err
 }

-func UserByIDAndResourceOwner(db *gorm.DB, table, userID, resourceOwner string) (*model.UserView, error) {
-	user := new(model.UserView)
-	userIDQuery := &model.UserSearchQuery{
-		Key:    usr_model.UserSearchKeyUserID,
-		Method: domain.SearchMethodEquals,
-		Value:  userID,
-	}
-	resourceOwnerQuery := &model.UserSearchQuery{
-		Key:    usr_model.UserSearchKeyResourceOwner,
-		Method: domain.SearchMethodEquals,
-		Value:  resourceOwner,
-	}
-	query := repository.PrepareGetByQuery(table, userIDQuery, resourceOwnerQuery)
-	err := query(db, user)
-	if caos_errs.IsNotFound(err) {
-		return nil, caos_errs.ThrowNotFound(nil, "VIEW-fb93Fs", "Errors.User.NotFound")
-	}
-	user.SetEmptyUserType()
-	return user, err
-}
-
 func UserByUserName(db *gorm.DB, table, userName string) (*model.UserView, error) {
 	user := new(model.UserView)
 	query := repository.PrepareGetByKey(table, model.UserSearchKey(usr_model.UserSearchKeyUserName), userName)
@@ -150,71 +129,6 @@ func GetGlobalUserByLoginName(db *gorm.DB, table, loginName string) (*model.User
 	return user, err
 }

-func IsUserUnique(db *gorm.DB, table, userName, email, orgID string) (bool, error) {
-	user := new(model.UserView)
-
-	emailUnique := email == ""
-	userNameUnique := userName == ""
-	if email != "" {
-		query := repository.PrepareGetByQuery(table, uniqueEmailQuery(userName, orgID)...)
-		err := query(db, user)
-		if err != nil && !caos_errs.IsNotFound(err) {
-			return false, err
-		}
-		if caos_errs.IsNotFound(err) {
-			emailUnique = true
-		}
-	}
-	if userName != "" {
-		query := repository.PrepareGetByQuery(table, uniqueUsernameQuery(userName, orgID)...)
-		err := query(db, user)
-		if err != nil && !caos_errs.IsNotFound(err) {
-			return false, err
-		}
-		if caos_errs.IsNotFound(err) {
-			userNameUnique = true
-		}
-	}
-
-	return emailUnique && userNameUnique, nil
-}
-
-func uniqueEmailQuery(email, orgID string) []repository.SearchQuery {
-	queries := []repository.SearchQuery{
-		&model.UserSearchQuery{
-			Key:    usr_model.UserSearchKeyEmail,
-			Method: domain.SearchMethodEquals,
-			Value:  email,
-		},
-	}
-	if orgID == "" {
-		return queries
-	}
-	return append(queries, &model.UserSearchQuery{
-		Key:    usr_model.UserSearchKeyResourceOwner,
-		Method: domain.SearchMethodEquals,
-		Value:  orgID,
-	})
-
-}
-func uniqueUsernameQuery(userName, orgID string) []repository.SearchQuery {
-	queries := []repository.SearchQuery{
-		&model.UserSearchQuery{
-			Key:    usr_model.UserSearchKeyUserName,
-			Method: domain.SearchMethodEquals,
-			Value:  userName,
-		},
-	}
-	if orgID == "" {
-		return queries
-	}
-	return append(queries, &model.UserSearchQuery{
-		Key:    usr_model.UserSearchKeyResourceOwner,
-		Method: domain.SearchMethodEquals,
-		Value:  orgID,
-	})
-}
-
 func UserMFAs(db *gorm.DB, table, userID string) ([]*usr_model.MultiFactor, error) {
 	user, err := UserByID(db, table, userID)
 	if err != nil {