fix: move v2 pkgs (#1331)

* fix: move eventstore pkgs

* fix: move eventstore pkgs

* fix: remove v2 view

* fix: remove v2 view

internal/management/repository/eventsourcing/eventstore/iam.go

@@ -2,7 +2,7 @@ package eventstore
 
 import (
 	"context"
-	"github.com/caos/zitadel/internal/v2/query"
+	"github.com/caos/zitadel/internal/query"
 
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 )

internal/management/repository/eventsourcing/eventstore/org.go

@@ -3,13 +3,13 @@ package eventstore
 import (
 	"context"
 	"encoding/json"
-	"github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/domain"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	iam_view "github.com/caos/zitadel/internal/iam/repository/view"
 	org_view "github.com/caos/zitadel/internal/org/repository/view"
 	usr_model "github.com/caos/zitadel/internal/user/model"
 	"github.com/caos/zitadel/internal/user/repository/view"
-	"github.com/caos/zitadel/internal/v2/domain"
 	"github.com/golang/protobuf/ptypes"
 	"strings"
 
@@ -35,7 +35,7 @@ const (
 
 type OrgRepository struct {
 	SearchLimit    uint64
-	Eventstore     eventstore.Eventstore
+	Eventstore     v1.Eventstore
 	View           *mgmt_view.View
 	Roles          []string
 	SystemDefaults systemdefaults.SystemDefaults

internal/management/repository/eventsourcing/eventstore/project.go

@@ -3,11 +3,12 @@ package eventstore
 import (
 	"context"
 	"encoding/json"
-	es_sdk "github.com/caos/zitadel/internal/eventstore/sdk"
+	"github.com/caos/zitadel/internal/domain"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+	es_sdk "github.com/caos/zitadel/internal/eventstore/v1/sdk"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_view "github.com/caos/zitadel/internal/iam/repository/view"
-	"github.com/caos/zitadel/internal/v2/domain"
 	"strings"
 
 	"github.com/caos/logging"
@@ -16,8 +17,7 @@ import (
 
 	"github.com/caos/zitadel/internal/api/authz"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	es_int "github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	key_model "github.com/caos/zitadel/internal/key/model"
 	key_view_model "github.com/caos/zitadel/internal/key/repository/view/model"
 	"github.com/caos/zitadel/internal/management/repository/eventsourcing/view"
@@ -31,7 +31,7 @@ import (
 )
 
 type ProjectRepo struct {
-	es_int.Eventstore
+	v1.Eventstore
 	SearchLimit uint64
 	View        *view.View
 	Roles       []string

internal/management/repository/eventsourcing/eventstore/user.go

@@ -2,7 +2,8 @@ package eventstore
 
 import (
 	"context"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	usr_view "github.com/caos/zitadel/internal/user/repository/view"
 	"github.com/golang/protobuf/ptypes"
 
@@ -12,7 +13,6 @@ import (
 	"github.com/caos/zitadel/internal/config/systemdefaults"
 	"github.com/caos/zitadel/internal/errors"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	es_int "github.com/caos/zitadel/internal/eventstore"
 	key_model "github.com/caos/zitadel/internal/key/model"
 	key_view_model "github.com/caos/zitadel/internal/key/repository/view/model"
 	"github.com/caos/zitadel/internal/management/repository/eventsourcing/view"
@@ -23,7 +23,7 @@ import (
 )
 
 type UserRepo struct {
-	es_int.Eventstore
+	v1.Eventstore
 	SearchLimit    uint64
 	View           *view.View
 	SystemDefaults systemdefaults.SystemDefaults

internal/management/repository/eventsourcing/handler/application.go

@@ -2,15 +2,15 @@ package handler
 
 import (
 	"context"
+	"github.com/caos/zitadel/internal/eventstore/v1"
 
 	"github.com/caos/logging"
 
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	es_sdk "github.com/caos/zitadel/internal/eventstore/sdk"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	es_sdk "github.com/caos/zitadel/internal/eventstore/v1/sdk"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	proj_model "github.com/caos/zitadel/internal/project/model"
 	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 	proj_view "github.com/caos/zitadel/internal/project/repository/view"
@@ -23,7 +23,7 @@ const (
 
 type Application struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newApplication(

internal/management/repository/eventsourcing/handler/authn_keys.go

@@ -1,14 +1,14 @@
 package handler
 
 import (
+	"github.com/caos/zitadel/internal/eventstore/v1"
 	"time"
 
 	"github.com/caos/logging"
 
-	"github.com/caos/zitadel/internal/eventstore"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	key_model "github.com/caos/zitadel/internal/key/repository/view/model"
 	proj_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 	user_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
@@ -20,7 +20,7 @@ const (
 
 type AuthNKeys struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newAuthNKeys(handler handler) *AuthNKeys {

internal/management/repository/eventsourcing/handler/handler.go

@@ -1,12 +1,12 @@
 package handler
 
 import (
+	"github.com/caos/zitadel/internal/eventstore/v1"
 	"time"
 
 	"github.com/caos/zitadel/internal/config/systemdefaults"
 	"github.com/caos/zitadel/internal/config/types"
-	"github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
 	"github.com/caos/zitadel/internal/management/repository/eventsourcing/view"
 )
 
@@ -22,14 +22,14 @@ type handler struct {
 	cycleDuration       time.Duration
 	errorCountUntilSkip uint64
 
-	es eventstore.Eventstore
+	es v1.Eventstore
 }
 
-func (h *handler) Eventstore() eventstore.Eventstore {
+func (h *handler) Eventstore() v1.Eventstore {
 	return h.es
 }
 
-func Register(configs Configs, bulkLimit, errorCount uint64, view *view.View, es eventstore.Eventstore, defaults systemdefaults.SystemDefaults) []query.Handler {
+func Register(configs Configs, bulkLimit, errorCount uint64, view *view.View, es v1.Eventstore, defaults systemdefaults.SystemDefaults) []query.Handler {
 	return []query.Handler{
 		newProject(
 			handler{view, bulkLimit, configs.cycleDuration("Project"), errorCount, es}),

internal/management/repository/eventsourcing/handler/idp_config.go

@@ -2,11 +2,11 @@ package handler
 
 import (
 	"github.com/caos/logging"
+	"github.com/caos/zitadel/internal/eventstore/v1"
 
-	"github.com/caos/zitadel/internal/eventstore"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_view_model "github.com/caos/zitadel/internal/iam/repository/view/model"
@@ -19,7 +19,7 @@ const (
 
 type IDPConfig struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newIDPConfig(handler handler) *IDPConfig {

internal/management/repository/eventsourcing/handler/idp_providers.go

@@ -4,12 +4,13 @@ import (
 	"context"
 	"github.com/caos/logging"
 	"github.com/caos/zitadel/internal/config/systemdefaults"
+	"github.com/caos/zitadel/internal/domain"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	es_sdk "github.com/caos/zitadel/internal/eventstore/sdk"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	es_sdk "github.com/caos/zitadel/internal/eventstore/v1/sdk"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 	"github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_view "github.com/caos/zitadel/internal/iam/repository/view"
@@ -17,7 +18,6 @@ import (
 	org_model "github.com/caos/zitadel/internal/org/model"
 	org_es_model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
 	"github.com/caos/zitadel/internal/org/repository/view"
-	"github.com/caos/zitadel/internal/v2/domain"
 )
 
 const (
@@ -27,7 +27,7 @@ const (
 type IDPProvider struct {
 	handler
 	systemDefaults systemdefaults.SystemDefaults
-	subscription   *eventstore.Subscription
+	subscription   *v1.Subscription
 }
 
 func newIDPProvider(

internal/management/repository/eventsourcing/handler/label_policy.go

@@ -2,11 +2,10 @@ package handler
 
 import (
 	"github.com/caos/logging"
-	"github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_model "github.com/caos/zitadel/internal/iam/repository/view/model"
 	"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
@@ -18,7 +17,7 @@ const (
 
 type LabelPolicy struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newLabelPolicy(handler handler) *LabelPolicy {
@@ -44,8 +43,8 @@ func (m *LabelPolicy) ViewModel() string {
 	return labelPolicyTable
 }
 
-func (_ *LabelPolicy) AggregateTypes() []models.AggregateType {
-	return []models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
+func (_ *LabelPolicy) AggregateTypes() []es_models.AggregateType {
+	return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
 }
 
 func (m *LabelPolicy) CurrentSequence() (uint64, error) {
@@ -56,7 +55,7 @@ func (m *LabelPolicy) CurrentSequence() (uint64, error) {
 	return sequence.CurrentSequence, nil
 }
 
-func (m *LabelPolicy) EventQuery() (*models.SearchQuery, error) {
+func (m *LabelPolicy) EventQuery() (*es_models.SearchQuery, error) {
 	sequence, err := m.view.GetLatestLabelPolicySequence()
 	if err != nil {
 		return nil, err
@@ -66,7 +65,7 @@ func (m *LabelPolicy) EventQuery() (*models.SearchQuery, error) {
 		LatestSequenceFilter(sequence.CurrentSequence), nil
 }
 
-func (m *LabelPolicy) Reduce(event *models.Event) (err error) {
+func (m *LabelPolicy) Reduce(event *es_models.Event) (err error) {
 	switch event.AggregateType {
 	case model.OrgAggregate, iam_es_model.IAMAggregate:
 		err = m.processLabelPolicy(event)
@@ -74,7 +73,7 @@ func (m *LabelPolicy) Reduce(event *models.Event) (err error) {
 	return err
 }
 
-func (m *LabelPolicy) processLabelPolicy(event *models.Event) (err error) {
+func (m *LabelPolicy) processLabelPolicy(event *es_models.Event) (err error) {
 	policy := new(iam_model.LabelPolicyView)
 	switch event.Type {
 	case iam_es_model.LabelPolicyAdded, model.LabelPolicyAdded:
@@ -94,7 +93,7 @@ func (m *LabelPolicy) processLabelPolicy(event *models.Event) (err error) {
 	return m.view.PutLabelPolicy(policy, event)
 }
 
-func (m *LabelPolicy) OnError(event *models.Event, err error) error {
+func (m *LabelPolicy) OnError(event *es_models.Event, err error) error {
 	logging.LogWithFields("SPOOL-4Djo9", "id", event.AggregateID).WithError(err).Warn("something went wrong in label policy handler")
 	return spooler.HandleError(event, err, m.view.GetLatestLabelPolicyFailedEvent, m.view.ProcessedLabelPolicyFailedEvent, m.view.ProcessedLabelPolicySequence, m.errorCountUntilSkip)
 }

internal/management/repository/eventsourcing/handler/login_policy.go

@@ -3,17 +3,16 @@ package handler
 import (
 	"context"
 	"github.com/caos/logging"
+	"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/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	"github.com/caos/zitadel/internal/iam/repository/eventsourcing"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_model "github.com/caos/zitadel/internal/iam/repository/view/model"
 	"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
-	"github.com/caos/zitadel/internal/v2/domain"
 )
 
 const (
@@ -22,7 +21,7 @@ const (
 
 type LoginPolicy struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newLoginPolicy(handler handler) *LoginPolicy {
@@ -48,8 +47,8 @@ func (m *LoginPolicy) ViewModel() string {
 	return loginPolicyTable
 }
 
-func (_ *LoginPolicy) AggregateTypes() []models.AggregateType {
-	return []models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
+func (_ *LoginPolicy) AggregateTypes() []es_models.AggregateType {
+	return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
 }
 
 func (m *LoginPolicy) CurrentSequence() (uint64, error) {
@@ -60,7 +59,7 @@ func (m *LoginPolicy) CurrentSequence() (uint64, error) {
 	return sequence.CurrentSequence, nil
 }
 
-func (m *LoginPolicy) EventQuery() (*models.SearchQuery, error) {
+func (m *LoginPolicy) EventQuery() (*es_models.SearchQuery, error) {
 	sequence, err := m.view.GetLatestLoginPolicySequence()
 	if err != nil {
 		return nil, err
@@ -70,7 +69,7 @@ func (m *LoginPolicy) EventQuery() (*models.SearchQuery, error) {
 		LatestSequenceFilter(sequence.CurrentSequence), nil
 }
 
-func (m *LoginPolicy) Reduce(event *models.Event) (err error) {
+func (m *LoginPolicy) Reduce(event *es_models.Event) (err error) {
 	switch event.AggregateType {
 	case model.OrgAggregate, iam_es_model.IAMAggregate:
 		err = m.processLoginPolicy(event)
@@ -78,7 +77,7 @@ func (m *LoginPolicy) Reduce(event *models.Event) (err error) {
 	return err
 }
 
-func (m *LoginPolicy) processLoginPolicy(event *models.Event) (err error) {
+func (m *LoginPolicy) processLoginPolicy(event *es_models.Event) (err error) {
 	policy := new(iam_model.LoginPolicyView)
 	switch event.Type {
 	case model.OrgAdded:
@@ -132,7 +131,7 @@ func (m *LoginPolicy) processLoginPolicy(event *models.Event) (err error) {
 	return m.view.PutLoginPolicy(policy, event)
 }
 
-func (m *LoginPolicy) OnError(event *models.Event, err error) error {
+func (m *LoginPolicy) OnError(event *es_models.Event, err error) error {
 	logging.LogWithFields("SPOOL-4Djo9", "id", event.AggregateID).WithError(err).Warn("something went wrong in login policy handler")
 	return spooler.HandleError(event, err, m.view.GetLatestLoginPolicyFailedEvent, m.view.ProcessedLoginPolicyFailedEvent, m.view.ProcessedLoginPolicySequence, m.errorCountUntilSkip)
 }
@@ -162,7 +161,7 @@ func (p *LoginPolicy) getDefaultLoginPolicy() (*iam_model.LoginPolicyView, error
 	return &policyCopy, nil
 }
 
-func (p *LoginPolicy) getIAMEvents(sequence uint64) ([]*models.Event, error) {
+func (p *LoginPolicy) getIAMEvents(sequence uint64) ([]*es_models.Event, error) {
 	query, err := eventsourcing.IAMByIDQuery(domain.IAMID, sequence)
 	if err != nil {
 		return nil, err

internal/management/repository/eventsourcing/handler/mail_template.go

@@ -2,20 +2,19 @@ package handler
 
 import (
 	"github.com/caos/logging"
-	"github.com/caos/zitadel/internal/eventstore"
+	"github.com/caos/zitadel/internal/eventstore/v1"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	iam_model "github.com/caos/zitadel/internal/iam/repository/view/model"
 	"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
 )
 
 type MailTemplate struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newMailTemplate(handler handler) *MailTemplate {
@@ -57,7 +56,7 @@ func (p *MailTemplate) CurrentSequence() (uint64, error) {
 	return sequence.CurrentSequence, nil
 }
 
-func (m *MailTemplate) EventQuery() (*models.SearchQuery, error) {
+func (m *MailTemplate) EventQuery() (*es_models.SearchQuery, error) {
 	sequence, err := m.view.GetLatestMailTemplateSequence()
 	if err != nil {
 		return nil, err
@@ -67,7 +66,7 @@ func (m *MailTemplate) EventQuery() (*models.SearchQuery, error) {
 		LatestSequenceFilter(sequence.CurrentSequence), nil
 }
 
-func (m *MailTemplate) Reduce(event *models.Event) (err error) {
+func (m *MailTemplate) Reduce(event *es_models.Event) (err error) {
 	switch event.AggregateType {
 	case model.OrgAggregate, iam_es_model.IAMAggregate:
 		err = m.processMailTemplate(event)
@@ -75,7 +74,7 @@ func (m *MailTemplate) Reduce(event *models.Event) (err error) {
 	return err
 }
 
-func (m *MailTemplate) processMailTemplate(event *models.Event) (err error) {
+func (m *MailTemplate) processMailTemplate(event *es_models.Event) (err error) {
 	template := new(iam_model.MailTemplateView)
 	switch event.Type {
 	case iam_es_model.MailTemplateAdded, model.MailTemplateAdded:
@@ -97,7 +96,7 @@ func (m *MailTemplate) processMailTemplate(event *models.Event) (err error) {
 	return m.view.PutMailTemplate(template, event)
 }
 
-func (m *MailTemplate) OnError(event *models.Event, err error) error {
+func (m *MailTemplate) OnError(event *es_models.Event, err error) error {
 	logging.LogWithFields("SPOOL-4Djo9", "id", event.AggregateID).WithError(err).Warn("something went wrong in label template handler")
 	return spooler.HandleError(event, err, m.view.GetLatestMailTemplateFailedEvent, m.view.ProcessedMailTemplateFailedEvent, m.view.ProcessedMailTemplateSequence, m.errorCountUntilSkip)
 }

internal/management/repository/eventsourcing/handler/mail_text.go

@@ -2,20 +2,19 @@ package handler
 
 import (
 	"github.com/caos/logging"
-	"github.com/caos/zitadel/internal/eventstore"
+	"github.com/caos/zitadel/internal/eventstore/v1"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	iam_model "github.com/caos/zitadel/internal/iam/repository/view/model"
 	"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
 )
 
 type MailText struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newMailText(handler handler) *MailText {
@@ -57,7 +56,7 @@ func (p *MailText) CurrentSequence() (uint64, error) {
 	return sequence.CurrentSequence, nil
 }
 
-func (m *MailText) EventQuery() (*models.SearchQuery, error) {
+func (m *MailText) EventQuery() (*es_models.SearchQuery, error) {
 	sequence, err := m.view.GetLatestMailTextSequence()
 	if err != nil {
 		return nil, err
@@ -67,7 +66,7 @@ func (m *MailText) EventQuery() (*models.SearchQuery, error) {
 		LatestSequenceFilter(sequence.CurrentSequence), nil
 }
 
-func (m *MailText) Reduce(event *models.Event) (err error) {
+func (m *MailText) Reduce(event *es_models.Event) (err error) {
 	switch event.AggregateType {
 	case model.OrgAggregate, iam_es_model.IAMAggregate:
 		err = m.processMailText(event)
@@ -75,7 +74,7 @@ func (m *MailText) Reduce(event *models.Event) (err error) {
 	return err
 }
 
-func (m *MailText) processMailText(event *models.Event) (err error) {
+func (m *MailText) processMailText(event *es_models.Event) (err error) {
 	text := new(iam_model.MailTextView)
 	switch event.Type {
 	case iam_es_model.MailTextAdded, model.MailTextAdded:
@@ -103,7 +102,7 @@ func (m *MailText) processMailText(event *models.Event) (err error) {
 	return m.view.PutMailText(text, event)
 }
 
-func (m *MailText) OnError(event *models.Event, err error) error {
+func (m *MailText) OnError(event *es_models.Event, err error) error {
 	logging.LogWithFields("SPOOL-4Djo9", "id", event.AggregateID).WithError(err).Warn("something went wrong in label text handler")
 	return spooler.HandleError(event, err, m.view.GetLatestMailTextFailedEvent, m.view.ProcessedMailTextFailedEvent, m.view.ProcessedMailTextSequence, m.errorCountUntilSkip)
 }

internal/management/repository/eventsourcing/handler/org.go

@@ -2,12 +2,12 @@ package handler
 
 import (
 	"github.com/caos/logging"
+	"github.com/caos/zitadel/internal/eventstore/v1"
 	"github.com/caos/zitadel/internal/org/repository/view"
 
-	"github.com/caos/zitadel/internal/eventstore"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
 	org_model "github.com/caos/zitadel/internal/org/repository/view/model"
 )
@@ -18,7 +18,7 @@ const (
 
 type Org struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newOrg(handler handler) *Org {

internal/management/repository/eventsourcing/handler/org_domain.go

@@ -2,11 +2,10 @@ package handler
 
 import (
 	"github.com/caos/logging"
-	"github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
 	org_model "github.com/caos/zitadel/internal/org/repository/view/model"
 )
@@ -17,7 +16,7 @@ const (
 
 type OrgDomain struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newOrgDomain(handler handler) *OrgDomain {
@@ -55,7 +54,7 @@ func (p *OrgDomain) CurrentSequence() (uint64, error) {
 	return sequence.CurrentSequence, nil
 }
 
-func (d *OrgDomain) EventQuery() (*models.SearchQuery, error) {
+func (d *OrgDomain) EventQuery() (*es_models.SearchQuery, error) {
 	sequence, err := d.view.GetLatestOrgDomainSequence()
 	if err != nil {
 		return nil, err
@@ -65,7 +64,7 @@ func (d *OrgDomain) EventQuery() (*models.SearchQuery, error) {
 		LatestSequenceFilter(sequence.CurrentSequence), nil
 }
 
-func (d *OrgDomain) Reduce(event *models.Event) (err error) {
+func (d *OrgDomain) Reduce(event *es_models.Event) (err error) {
 	switch event.AggregateType {
 	case model.OrgAggregate:
 		err = d.processOrgDomain(event)
@@ -73,7 +72,7 @@ func (d *OrgDomain) Reduce(event *models.Event) (err error) {
 	return err
 }
 
-func (d *OrgDomain) processOrgDomain(event *models.Event) (err error) {
+func (d *OrgDomain) processOrgDomain(event *es_models.Event) (err error) {
 	domain := new(org_model.OrgDomainView)
 	switch event.Type {
 	case model.OrgDomainAdded:
@@ -125,7 +124,7 @@ func (d *OrgDomain) processOrgDomain(event *models.Event) (err error) {
 	return d.view.PutOrgDomain(domain, event)
 }
 
-func (d *OrgDomain) OnError(event *models.Event, err error) error {
+func (d *OrgDomain) OnError(event *es_models.Event, err error) error {
 	logging.LogWithFields("SPOOL-us4sj", "id", event.AggregateID).WithError(err).Warn("something went wrong in orgdomain handler")
 	return spooler.HandleError(event, err, d.view.GetLatestOrgDomainFailedEvent, d.view.ProcessedOrgDomainFailedEvent, d.view.ProcessedOrgDomainSequence, d.errorCountUntilSkip)
 }

internal/management/repository/eventsourcing/handler/org_iam_policy.go

@@ -2,11 +2,10 @@ package handler
 
 import (
 	"github.com/caos/logging"
-	"github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_model "github.com/caos/zitadel/internal/iam/repository/view/model"
 	"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
@@ -18,7 +17,7 @@ const (
 
 type OrgIAMPolicy struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newOrgIAMPolicy(handler handler) *OrgIAMPolicy {
@@ -56,7 +55,7 @@ func (p *OrgIAMPolicy) CurrentSequence() (uint64, error) {
 	return sequence.CurrentSequence, nil
 }
 
-func (m *OrgIAMPolicy) EventQuery() (*models.SearchQuery, error) {
+func (m *OrgIAMPolicy) EventQuery() (*es_models.SearchQuery, error) {
 	sequence, err := m.view.GetLatestOrgIAMPolicySequence()
 	if err != nil {
 		return nil, err
@@ -66,7 +65,7 @@ func (m *OrgIAMPolicy) EventQuery() (*models.SearchQuery, error) {
 		LatestSequenceFilter(sequence.CurrentSequence), nil
 }
 
-func (m *OrgIAMPolicy) Reduce(event *models.Event) (err error) {
+func (m *OrgIAMPolicy) Reduce(event *es_models.Event) (err error) {
 	switch event.AggregateType {
 	case model.OrgAggregate, iam_es_model.IAMAggregate:
 		err = m.processOrgIAMPolicy(event)
@@ -74,7 +73,7 @@ func (m *OrgIAMPolicy) Reduce(event *models.Event) (err error) {
 	return err
 }
 
-func (m *OrgIAMPolicy) processOrgIAMPolicy(event *models.Event) (err error) {
+func (m *OrgIAMPolicy) processOrgIAMPolicy(event *es_models.Event) (err error) {
 	policy := new(iam_model.OrgIAMPolicyView)
 	switch event.Type {
 	case iam_es_model.OrgIAMPolicyAdded, model.OrgIAMPolicyAdded:
@@ -96,7 +95,7 @@ func (m *OrgIAMPolicy) processOrgIAMPolicy(event *models.Event) (err error) {
 	return m.view.PutOrgIAMPolicy(policy, event)
 }
 
-func (m *OrgIAMPolicy) OnError(event *models.Event, err error) error {
+func (m *OrgIAMPolicy) OnError(event *es_models.Event, err error) error {
 	logging.LogWithFields("SPOOL-3Gf9s", "id", event.AggregateID).WithError(err).Warn("something went wrong in orgIAM policy handler")
 	return spooler.HandleError(event, err, m.view.GetLatestOrgIAMPolicyFailedEvent, m.view.ProcessedOrgIAMPolicyFailedEvent, m.view.ProcessedOrgIAMPolicySequence, m.errorCountUntilSkip)
 }

internal/management/repository/eventsourcing/handler/org_member.go

@@ -3,14 +3,13 @@ package handler
 import (
 	"context"
 	caos_errs "github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore/v1"
 	"github.com/caos/zitadel/internal/user/repository/view"
 
 	"github.com/caos/logging"
-	"github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
 	org_model "github.com/caos/zitadel/internal/org/repository/view/model"
 	usr_model "github.com/caos/zitadel/internal/user/model"
@@ -24,7 +23,7 @@ const (
 
 type OrgMember struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newOrgMember(
@@ -64,7 +63,7 @@ func (p *OrgMember) CurrentSequence() (uint64, error) {
 	return sequence.CurrentSequence, nil
 }
 
-func (m *OrgMember) EventQuery() (*models.SearchQuery, error) {
+func (m *OrgMember) EventQuery() (*es_models.SearchQuery, error) {
 	sequence, err := m.view.GetLatestOrgMemberSequence()
 	if err != nil {
 		return nil, err
@@ -74,7 +73,7 @@ func (m *OrgMember) EventQuery() (*models.SearchQuery, error) {
 		LatestSequenceFilter(sequence.CurrentSequence), nil
 }
 
-func (m *OrgMember) Reduce(event *models.Event) (err error) {
+func (m *OrgMember) Reduce(event *es_models.Event) (err error) {
 	switch event.AggregateType {
 	case model.OrgAggregate:
 		err = m.processOrgMember(event)
@@ -84,7 +83,7 @@ func (m *OrgMember) Reduce(event *models.Event) (err error) {
 	return err
 }
 
-func (m *OrgMember) processOrgMember(event *models.Event) (err error) {
+func (m *OrgMember) processOrgMember(event *es_models.Event) (err error) {
 	member := new(org_model.OrgMemberView)
 	switch event.Type {
 	case model.OrgMemberAdded:
@@ -118,7 +117,7 @@ func (m *OrgMember) processOrgMember(event *models.Event) (err error) {
 	return m.view.PutOrgMember(member, event)
 }
 
-func (m *OrgMember) processUser(event *models.Event) (err error) {
+func (m *OrgMember) processUser(event *es_models.Event) (err error) {
 	switch event.Type {
 	case usr_es_model.UserProfileChanged,
 		usr_es_model.UserEmailChanged,
@@ -168,7 +167,7 @@ func (m *OrgMember) fillUserData(member *org_model.OrgMemberView, user *usr_view
 		member.DisplayName = user.MachineView.Name
 	}
 }
-func (m *OrgMember) OnError(event *models.Event, err error) error {
+func (m *OrgMember) OnError(event *es_models.Event, err error) error {
 	logging.LogWithFields("SPOOL-u73es", "id", event.AggregateID).WithError(err).Warn("something went wrong in orgmember handler")
 	return spooler.HandleError(event, err, m.view.GetLatestOrgMemberFailedEvent, m.view.ProcessedOrgMemberFailedEvent, m.view.ProcessedOrgMemberSequence, m.errorCountUntilSkip)
 }
@@ -201,7 +200,7 @@ func (u *OrgMember) getUserByID(userID string) (*usr_view_model.UserView, error)
 	return &userCopy, nil
 }
 
-func (u *OrgMember) getUserEvents(userID string, sequence uint64) ([]*models.Event, error) {
+func (u *OrgMember) getUserEvents(userID string, sequence uint64) ([]*es_models.Event, error) {
 	query, err := view.UserByIDQuery(userID, sequence)
 	if err != nil {
 		return nil, err

internal/management/repository/eventsourcing/handler/password_age_policy.go

@@ -2,11 +2,10 @@ package handler
 
 import (
 	"github.com/caos/logging"
-	"github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_model "github.com/caos/zitadel/internal/iam/repository/view/model"
 	"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
@@ -18,7 +17,7 @@ const (
 
 type PasswordAgePolicy struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newPasswordAgePolicy(handler handler) *PasswordAgePolicy {
@@ -56,7 +55,7 @@ func (o *PasswordAgePolicy) CurrentSequence() (uint64, error) {
 	return sequence.CurrentSequence, nil
 }
 
-func (p *PasswordAgePolicy) EventQuery() (*models.SearchQuery, error) {
+func (p *PasswordAgePolicy) EventQuery() (*es_models.SearchQuery, error) {
 	sequence, err := p.view.GetLatestPasswordAgePolicySequence()
 	if err != nil {
 		return nil, err
@@ -66,7 +65,7 @@ func (p *PasswordAgePolicy) EventQuery() (*models.SearchQuery, error) {
 		LatestSequenceFilter(sequence.CurrentSequence), nil
 }
 
-func (m *PasswordAgePolicy) Reduce(event *models.Event) (err error) {
+func (m *PasswordAgePolicy) Reduce(event *es_models.Event) (err error) {
 	switch event.AggregateType {
 	case model.OrgAggregate, iam_es_model.IAMAggregate:
 		err = m.processPasswordAgePolicy(event)
@@ -74,7 +73,7 @@ func (m *PasswordAgePolicy) Reduce(event *models.Event) (err error) {
 	return err
 }
 
-func (m *PasswordAgePolicy) processPasswordAgePolicy(event *models.Event) (err error) {
+func (m *PasswordAgePolicy) processPasswordAgePolicy(event *es_models.Event) (err error) {
 	policy := new(iam_model.PasswordAgePolicyView)
 	switch event.Type {
 	case iam_es_model.PasswordAgePolicyAdded, model.PasswordAgePolicyAdded:
@@ -96,7 +95,7 @@ func (m *PasswordAgePolicy) processPasswordAgePolicy(event *models.Event) (err e
 	return m.view.PutPasswordAgePolicy(policy, event)
 }
 
-func (m *PasswordAgePolicy) OnError(event *models.Event, err error) error {
+func (m *PasswordAgePolicy) OnError(event *es_models.Event, err error) error {
 	logging.LogWithFields("SPOOL-Bs89f", "id", event.AggregateID).WithError(err).Warn("something went wrong in passwordAge policy handler")
 	return spooler.HandleError(event, err, m.view.GetLatestPasswordAgePolicyFailedEvent, m.view.ProcessedPasswordAgePolicyFailedEvent, m.view.ProcessedPasswordAgePolicySequence, m.errorCountUntilSkip)
 }

internal/management/repository/eventsourcing/handler/password_complexity_policy.go

@@ -2,11 +2,10 @@ package handler
 
 import (
 	"github.com/caos/logging"
-	"github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_model "github.com/caos/zitadel/internal/iam/repository/view/model"
 	"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
@@ -18,7 +17,7 @@ const (
 
 type PasswordComplexityPolicy struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newPasswordComplexityPolicy(handler handler) *PasswordComplexityPolicy {
@@ -56,7 +55,7 @@ func (p *PasswordComplexityPolicy) CurrentSequence() (uint64, error) {
 	return sequence.CurrentSequence, nil
 }
 
-func (p *PasswordComplexityPolicy) EventQuery() (*models.SearchQuery, error) {
+func (p *PasswordComplexityPolicy) EventQuery() (*es_models.SearchQuery, error) {
 	sequence, err := p.view.GetLatestPasswordComplexityPolicySequence()
 	if err != nil {
 		return nil, err
@@ -66,7 +65,7 @@ func (p *PasswordComplexityPolicy) EventQuery() (*models.SearchQuery, error) {
 		LatestSequenceFilter(sequence.CurrentSequence), nil
 }
 
-func (p *PasswordComplexityPolicy) Reduce(event *models.Event) (err error) {
+func (p *PasswordComplexityPolicy) Reduce(event *es_models.Event) (err error) {
 	switch event.AggregateType {
 	case model.OrgAggregate, iam_es_model.IAMAggregate:
 		err = p.processPasswordComplexityPolicy(event)
@@ -74,7 +73,7 @@ func (p *PasswordComplexityPolicy) Reduce(event *models.Event) (err error) {
 	return err
 }
 
-func (p *PasswordComplexityPolicy) processPasswordComplexityPolicy(event *models.Event) (err error) {
+func (p *PasswordComplexityPolicy) processPasswordComplexityPolicy(event *es_models.Event) (err error) {
 	policy := new(iam_model.PasswordComplexityPolicyView)
 	switch event.Type {
 	case iam_es_model.PasswordComplexityPolicyAdded, model.PasswordComplexityPolicyAdded:
@@ -96,7 +95,7 @@ func (p *PasswordComplexityPolicy) processPasswordComplexityPolicy(event *models
 	return p.view.PutPasswordComplexityPolicy(policy, event)
 }
 
-func (p *PasswordComplexityPolicy) OnError(event *models.Event, err error) error {
+func (p *PasswordComplexityPolicy) OnError(event *es_models.Event, err error) error {
 	logging.LogWithFields("SPOOL-4Djo9", "id", event.AggregateID).WithError(err).Warn("something went wrong in passwordComplexity policy handler")
 	return spooler.HandleError(event, err, p.view.GetLatestPasswordComplexityPolicyFailedEvent, p.view.ProcessedPasswordComplexityPolicyFailedEvent, p.view.ProcessedPasswordComplexityPolicySequence, p.errorCountUntilSkip)
 }

internal/management/repository/eventsourcing/handler/password_lockout_policy.go

@@ -2,13 +2,12 @@ package handler
 
 import (
 	"github.com/caos/logging"
-	"github.com/caos/zitadel/internal/eventstore"
+	"github.com/caos/zitadel/internal/eventstore/v1"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	iam_model "github.com/caos/zitadel/internal/iam/repository/view/model"
 	"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
 )
@@ -19,7 +18,7 @@ const (
 
 type PasswordLockoutPolicy struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newPasswordLockoutPolicy(handler handler) *PasswordLockoutPolicy {
@@ -57,7 +56,7 @@ func (p *PasswordLockoutPolicy) CurrentSequence() (uint64, error) {
 	return sequence.CurrentSequence, nil
 }
 
-func (p *PasswordLockoutPolicy) EventQuery() (*models.SearchQuery, error) {
+func (p *PasswordLockoutPolicy) EventQuery() (*es_models.SearchQuery, error) {
 	sequence, err := p.view.GetLatestPasswordLockoutPolicySequence()
 	if err != nil {
 		return nil, err
@@ -67,7 +66,7 @@ func (p *PasswordLockoutPolicy) EventQuery() (*models.SearchQuery, error) {
 		LatestSequenceFilter(sequence.CurrentSequence), nil
 }
 
-func (p *PasswordLockoutPolicy) Reduce(event *models.Event) (err error) {
+func (p *PasswordLockoutPolicy) Reduce(event *es_models.Event) (err error) {
 	switch event.AggregateType {
 	case model.OrgAggregate, iam_es_model.IAMAggregate:
 		err = p.processPasswordLockoutPolicy(event)
@@ -75,7 +74,7 @@ func (p *PasswordLockoutPolicy) Reduce(event *models.Event) (err error) {
 	return err
 }
 
-func (p *PasswordLockoutPolicy) processPasswordLockoutPolicy(event *models.Event) (err error) {
+func (p *PasswordLockoutPolicy) processPasswordLockoutPolicy(event *es_models.Event) (err error) {
 	policy := new(iam_model.PasswordLockoutPolicyView)
 	switch event.Type {
 	case iam_es_model.PasswordLockoutPolicyAdded, model.PasswordLockoutPolicyAdded:
@@ -97,7 +96,7 @@ func (p *PasswordLockoutPolicy) processPasswordLockoutPolicy(event *models.Event
 	return p.view.PutPasswordLockoutPolicy(policy, event)
 }
 
-func (p *PasswordLockoutPolicy) OnError(event *models.Event, err error) error {
+func (p *PasswordLockoutPolicy) OnError(event *es_models.Event, err error) error {
 	logging.LogWithFields("SPOOL-Bms8f", "id", event.AggregateID).WithError(err).Warn("something went wrong in passwordLockout policy handler")
 	return spooler.HandleError(event, err, p.view.GetLatestPasswordLockoutPolicyFailedEvent, p.view.ProcessedPasswordLockoutPolicyFailedEvent, p.view.ProcessedPasswordLockoutPolicySequence, p.errorCountUntilSkip)
 }

internal/management/repository/eventsourcing/handler/project.go

@@ -2,11 +2,11 @@ package handler
 
 import (
 	"github.com/caos/logging"
+	"github.com/caos/zitadel/internal/eventstore/v1"
 
-	"github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 	proj_view "github.com/caos/zitadel/internal/project/repository/view"
 	view_model "github.com/caos/zitadel/internal/project/repository/view/model"
@@ -18,7 +18,7 @@ const (
 
 type Project struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newProject(handler handler) *Project {

internal/management/repository/eventsourcing/handler/project_grant.go

@@ -2,15 +2,15 @@ package handler
 
 import (
 	"context"
+	"github.com/caos/zitadel/internal/eventstore/v1"
 
 	"github.com/caos/logging"
 
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	es_sdk "github.com/caos/zitadel/internal/eventstore/sdk"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	es_sdk "github.com/caos/zitadel/internal/eventstore/v1/sdk"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	org_model "github.com/caos/zitadel/internal/org/model"
 	org_es_model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
 	"github.com/caos/zitadel/internal/org/repository/view"
@@ -26,7 +26,7 @@ const (
 
 type ProjectGrant struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newProjectGrant(

internal/management/repository/eventsourcing/handler/project_grant_member.go

@@ -3,16 +3,15 @@ package handler
 import (
 	"context"
 	caos_errs "github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore/v1"
 	"github.com/caos/zitadel/internal/user/repository/view"
 	usr_view_model "github.com/caos/zitadel/internal/user/repository/view/model"
 
 	"github.com/caos/logging"
 
-	"github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	proj_es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 	view_model "github.com/caos/zitadel/internal/project/repository/view/model"
 	usr_model "github.com/caos/zitadel/internal/user/model"
@@ -25,7 +24,7 @@ const (
 
 type ProjectGrantMember struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newProjectGrantMember(
@@ -65,7 +64,7 @@ func (p *ProjectGrantMember) CurrentSequence() (uint64, error) {
 	return sequence.CurrentSequence, nil
 }
 
-func (p *ProjectGrantMember) EventQuery() (*models.SearchQuery, error) {
+func (p *ProjectGrantMember) EventQuery() (*es_models.SearchQuery, error) {
 	sequence, err := p.view.GetLatestProjectGrantMemberSequence()
 	if err != nil {
 		return nil, err
@@ -75,7 +74,7 @@ func (p *ProjectGrantMember) EventQuery() (*models.SearchQuery, error) {
 		LatestSequenceFilter(sequence.CurrentSequence), nil
 }
 
-func (p *ProjectGrantMember) Reduce(event *models.Event) (err error) {
+func (p *ProjectGrantMember) Reduce(event *es_models.Event) (err error) {
 	switch event.AggregateType {
 	case proj_es_model.ProjectAggregate:
 		err = p.processProjectGrantMember(event)
@@ -85,7 +84,7 @@ func (p *ProjectGrantMember) Reduce(event *models.Event) (err error) {
 	return err
 }
 
-func (p *ProjectGrantMember) processProjectGrantMember(event *models.Event) (err error) {
+func (p *ProjectGrantMember) processProjectGrantMember(event *es_models.Event) (err error) {
 	member := new(view_model.ProjectGrantMemberView)
 	switch event.Type {
 	case proj_es_model.ProjectGrantMemberAdded:
@@ -125,7 +124,7 @@ func (p *ProjectGrantMember) processProjectGrantMember(event *models.Event) (err
 	return p.view.PutProjectGrantMember(member, event)
 }
 
-func (p *ProjectGrantMember) processUser(event *models.Event) (err error) {
+func (p *ProjectGrantMember) processUser(event *es_models.Event) (err error) {
 	switch event.Type {
 	case usr_es_model.UserProfileChanged,
 		usr_es_model.UserEmailChanged,
@@ -174,7 +173,7 @@ func (p *ProjectGrantMember) fillUserData(member *view_model.ProjectGrantMemberV
 	}
 }
 
-func (p *ProjectGrantMember) OnError(event *models.Event, err error) error {
+func (p *ProjectGrantMember) OnError(event *es_models.Event, err error) error {
 	logging.LogWithFields("SPOOL-kls93", "id", event.AggregateID).WithError(err).Warn("something went wrong in projectmember handler")
 	return spooler.HandleError(event, err, p.view.GetLatestProjectGrantMemberFailedEvent, p.view.ProcessedProjectGrantMemberFailedEvent, p.view.ProcessedProjectGrantMemberSequence, p.errorCountUntilSkip)
 }
@@ -207,7 +206,7 @@ func (u *ProjectGrantMember) getUserByID(userID string) (*usr_view_model.UserVie
 	return &userCopy, nil
 }
 
-func (u *ProjectGrantMember) getUserEvents(userID string, sequence uint64) ([]*models.Event, error) {
+func (u *ProjectGrantMember) getUserEvents(userID string, sequence uint64) ([]*es_models.Event, error) {
 	query, err := view.UserByIDQuery(userID, sequence)
 	if err != nil {
 		return nil, err

internal/management/repository/eventsourcing/handler/project_member.go

@@ -3,15 +3,14 @@ package handler
 import (
 	"context"
 	caos_errs "github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore/v1"
 	"github.com/caos/zitadel/internal/user/repository/view"
 
 	"github.com/caos/logging"
 
-	"github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	proj_es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 	view_model "github.com/caos/zitadel/internal/project/repository/view/model"
 	usr_model "github.com/caos/zitadel/internal/user/model"
@@ -25,7 +24,7 @@ const (
 
 type ProjectMember struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newProjectMember(
@@ -53,8 +52,8 @@ func (p *ProjectMember) ViewModel() string {
 	return projectMemberTable
 }
 
-func (_ *ProjectMember) AggregateTypes() []models.AggregateType {
-	return []models.AggregateType{proj_es_model.ProjectAggregate, usr_es_model.UserAggregate}
+func (_ *ProjectMember) AggregateTypes() []es_models.AggregateType {
+	return []es_models.AggregateType{proj_es_model.ProjectAggregate, usr_es_model.UserAggregate}
 }
 
 func (p *ProjectMember) CurrentSequence() (uint64, error) {
@@ -65,7 +64,7 @@ func (p *ProjectMember) CurrentSequence() (uint64, error) {
 	return sequence.CurrentSequence, nil
 }
 
-func (p *ProjectMember) EventQuery() (*models.SearchQuery, error) {
+func (p *ProjectMember) EventQuery() (*es_models.SearchQuery, error) {
 	sequence, err := p.view.GetLatestProjectMemberSequence()
 	if err != nil {
 		return nil, err
@@ -75,7 +74,7 @@ func (p *ProjectMember) EventQuery() (*models.SearchQuery, error) {
 		LatestSequenceFilter(sequence.CurrentSequence), nil
 }
 
-func (p *ProjectMember) Reduce(event *models.Event) (err error) {
+func (p *ProjectMember) Reduce(event *es_models.Event) (err error) {
 	switch event.AggregateType {
 	case proj_es_model.ProjectAggregate:
 		err = p.processProjectMember(event)
@@ -85,7 +84,7 @@ func (p *ProjectMember) Reduce(event *models.Event) (err error) {
 	return err
 }
 
-func (p *ProjectMember) processProjectMember(event *models.Event) (err error) {
+func (p *ProjectMember) processProjectMember(event *es_models.Event) (err error) {
 	member := new(view_model.ProjectMemberView)
 	switch event.Type {
 	case proj_es_model.ProjectMemberAdded:
@@ -121,7 +120,7 @@ func (p *ProjectMember) processProjectMember(event *models.Event) (err error) {
 	return p.view.PutProjectMember(member, event)
 }
 
-func (p *ProjectMember) processUser(event *models.Event) (err error) {
+func (p *ProjectMember) processUser(event *es_models.Event) (err error) {
 	switch event.Type {
 	case usr_es_model.UserProfileChanged,
 		usr_es_model.UserEmailChanged,
@@ -170,7 +169,7 @@ func (p *ProjectMember) fillUserData(member *view_model.ProjectMemberView, user
 		member.DisplayName = user.MachineView.Name
 	}
 }
-func (p *ProjectMember) OnError(event *models.Event, err error) error {
+func (p *ProjectMember) OnError(event *es_models.Event, err error) error {
 	logging.LogWithFields("SPOOL-u73es", "id", event.AggregateID).WithError(err).Warn("something went wrong in projectmember handler")
 	return spooler.HandleError(event, err, p.view.GetLatestProjectMemberFailedEvent, p.view.ProcessedProjectMemberFailedEvent, p.view.ProcessedProjectMemberSequence, p.errorCountUntilSkip)
 }
@@ -203,7 +202,7 @@ func (u *ProjectMember) getUserByID(userID string) (*usr_view_model.UserView, er
 	return &userCopy, nil
 }
 
-func (u *ProjectMember) getUserEvents(userID string, sequence uint64) ([]*models.Event, error) {
+func (u *ProjectMember) getUserEvents(userID string, sequence uint64) ([]*es_models.Event, error) {
 	query, err := view.UserByIDQuery(userID, sequence)
 	if err != nil {
 		return nil, err

internal/management/repository/eventsourcing/handler/project_role.go

@@ -2,11 +2,11 @@ package handler
 
 import (
 	"github.com/caos/logging"
+	"github.com/caos/zitadel/internal/eventstore/v1"
 
-	"github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 	proj_view "github.com/caos/zitadel/internal/project/repository/view"
 	view_model "github.com/caos/zitadel/internal/project/repository/view/model"
@@ -18,7 +18,7 @@ const (
 
 type ProjectRole struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newProjectRole(

internal/management/repository/eventsourcing/handler/user.go

@@ -3,13 +3,13 @@ package handler
 import (
 	"context"
 	"github.com/caos/logging"
+	"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/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	es_sdk "github.com/caos/zitadel/internal/eventstore/sdk"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	es_sdk "github.com/caos/zitadel/internal/eventstore/v1/sdk"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 	"github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_view "github.com/caos/zitadel/internal/iam/repository/view"
@@ -18,7 +18,6 @@ import (
 	"github.com/caos/zitadel/internal/org/repository/view"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 	view_model "github.com/caos/zitadel/internal/user/repository/view/model"
-	"github.com/caos/zitadel/internal/v2/domain"
 )
 
 const (
@@ -28,7 +27,7 @@ const (
 type User struct {
 	handler
 	iamID        string
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newUser(
@@ -70,7 +69,7 @@ func (u *User) CurrentSequence() (uint64, error) {
 	return sequence.CurrentSequence, nil
 }
 
-func (u *User) EventQuery() (*models.SearchQuery, error) {
+func (u *User) EventQuery() (*es_models.SearchQuery, error) {
 	sequence, err := u.view.GetLatestUserSequence()
 	if err != nil {
 		return nil, err
@@ -80,7 +79,7 @@ func (u *User) EventQuery() (*models.SearchQuery, error) {
 		LatestSequenceFilter(sequence.CurrentSequence), nil
 }
 
-func (u *User) Reduce(event *models.Event) (err error) {
+func (u *User) Reduce(event *es_models.Event) (err error) {
 	switch event.AggregateType {
 	case es_model.UserAggregate:
 		return u.ProcessUser(event)
@@ -91,7 +90,7 @@ func (u *User) Reduce(event *models.Event) (err error) {
 	}
 }
 
-func (u *User) ProcessUser(event *models.Event) (err error) {
+func (u *User) ProcessUser(event *es_models.Event) (err error) {
 	user := new(view_model.UserView)
 	switch event.Type {
 	case es_model.UserAdded,
@@ -162,7 +161,7 @@ func (u *User) ProcessUser(event *models.Event) (err error) {
 	return u.view.PutUser(user, event)
 }
 
-func (u *User) ProcessOrg(event *models.Event) (err error) {
+func (u *User) ProcessOrg(event *es_models.Event) (err error) {
 	switch event.Type {
 	case org_es_model.OrgDomainVerified,
 		org_es_model.OrgDomainRemoved,
@@ -177,7 +176,7 @@ func (u *User) ProcessOrg(event *models.Event) (err error) {
 	}
 }
 
-func (u *User) fillLoginNamesOnOrgUsers(event *models.Event) error {
+func (u *User) fillLoginNamesOnOrgUsers(event *es_models.Event) error {
 	org, err := u.getOrgByID(context.Background(), event.ResourceOwner)
 	if err != nil {
 		return err
@@ -199,7 +198,7 @@ func (u *User) fillLoginNamesOnOrgUsers(event *models.Event) error {
 	return u.view.PutUsers(users, event)
 }
 
-func (u *User) fillPreferredLoginNamesOnOrgUsers(event *models.Event) error {
+func (u *User) fillPreferredLoginNamesOnOrgUsers(event *es_models.Event) error {
 	org, err := u.getOrgByID(context.Background(), event.ResourceOwner)
 	if err != nil {
 		return err
@@ -241,7 +240,7 @@ func (u *User) fillLoginNames(user *view_model.UserView) (err error) {
 	return nil
 }
 
-func (u *User) OnError(event *models.Event, err error) error {
+func (u *User) OnError(event *es_models.Event, err error) error {
 	logging.LogWithFields("SPOOL-is8wa", "id", event.AggregateID).WithError(err).Warn("something went wrong in user handler")
 	return spooler.HandleError(event, err, u.view.GetLatestUserFailedEvent, u.view.ProcessedUserFailedEvent, u.view.ProcessedUserSequence, u.errorCountUntilSkip)
 }
@@ -257,7 +256,7 @@ func (u *User) getOrgByID(ctx context.Context, orgID string) (*org_model.Org, er
 	}
 
 	esOrg := &org_es_model.Org{
-		ObjectRoot: models.ObjectRoot{
+		ObjectRoot: es_models.ObjectRoot{
 			AggregateID: orgID,
 		},
 	}
@@ -278,7 +277,7 @@ func (u *User) getIAMByID(ctx context.Context) (*iam_model.IAM, error) {
 		return nil, err
 	}
 	iam := &model.IAM{
-		ObjectRoot: models.ObjectRoot{
+		ObjectRoot: es_models.ObjectRoot{
 			AggregateID: domain.IAMID,
 		},
 	}

internal/management/repository/eventsourcing/handler/user_external_idps.go

@@ -2,20 +2,20 @@ package handler
 
 import (
 	"context"
-	es_sdk "github.com/caos/zitadel/internal/eventstore/sdk"
+	"github.com/caos/zitadel/internal/domain"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+	es_sdk "github.com/caos/zitadel/internal/eventstore/v1/sdk"
 	iam_view "github.com/caos/zitadel/internal/iam/repository/view"
 	org_model "github.com/caos/zitadel/internal/org/model"
 	"github.com/caos/zitadel/internal/org/repository/view"
-	"github.com/caos/zitadel/internal/v2/domain"
 
 	"github.com/caos/logging"
 
 	"github.com/caos/zitadel/internal/config/systemdefaults"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_view_model "github.com/caos/zitadel/internal/iam/repository/view/model"
@@ -31,7 +31,7 @@ const (
 type ExternalIDP struct {
 	handler
 	systemDefaults systemdefaults.SystemDefaults
-	subscription   *eventstore.Subscription
+	subscription   *v1.Subscription
 }
 
 func newExternalIDP(

internal/management/repository/eventsourcing/handler/user_grant.go

@@ -2,23 +2,22 @@ package handler
 
 import (
 	"context"
+	"github.com/caos/zitadel/internal/eventstore/v1"
 
 	"github.com/caos/logging"
 	"k8s.io/apimachinery/pkg/api/errors"
 
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	es_sdk "github.com/caos/zitadel/internal/eventstore/sdk"
+	es_sdk "github.com/caos/zitadel/internal/eventstore/v1/sdk"
 	org_es_model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
 	org_view "github.com/caos/zitadel/internal/org/repository/view"
 	proj_view "github.com/caos/zitadel/internal/project/repository/view"
 	"github.com/caos/zitadel/internal/user/repository/view"
 	usr_view_model "github.com/caos/zitadel/internal/user/repository/view/model"
 
-	"github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	org_model "github.com/caos/zitadel/internal/org/model"
 	proj_model "github.com/caos/zitadel/internal/project/model"
 	proj_es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
@@ -34,7 +33,7 @@ const (
 
 type UserGrant struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newUserGrant(
@@ -256,7 +255,7 @@ func (u *UserGrant) getUserByID(userID string) (*usr_view_model.UserView, error)
 	return &userCopy, nil
 }
 
-func (u *UserGrant) getUserEvents(userID string, sequence uint64) ([]*models.Event, error) {
+func (u *UserGrant) getUserEvents(userID string, sequence uint64) ([]*es_models.Event, error) {
 	query, err := view.UserByIDQuery(userID, sequence)
 	if err != nil {
 		return nil, err
@@ -272,7 +271,7 @@ func (u *UserGrant) getOrgByID(ctx context.Context, orgID string) (*org_model.Or
 	}
 
 	esOrg := &org_es_model.Org{
-		ObjectRoot: models.ObjectRoot{
+		ObjectRoot: es_models.ObjectRoot{
 			AggregateID: orgID,
 		},
 	}
@@ -293,7 +292,7 @@ func (u *UserGrant) getProjectByID(ctx context.Context, projID string) (*proj_mo
 		return nil, err
 	}
 	esProject := &proj_es_model.Project{
-		ObjectRoot: models.ObjectRoot{
+		ObjectRoot: es_models.ObjectRoot{
 			AggregateID: projID,
 		},
 	}

internal/management/repository/eventsourcing/handler/user_membership.go

@@ -2,21 +2,21 @@ package handler
 
 import (
 	"context"
+	"github.com/caos/zitadel/internal/eventstore/v1"
 
 	"k8s.io/apimachinery/pkg/api/errors"
 
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	es_sdk "github.com/caos/zitadel/internal/eventstore/sdk"
+	es_sdk "github.com/caos/zitadel/internal/eventstore/v1/sdk"
 	org_view "github.com/caos/zitadel/internal/org/repository/view"
 	proj_model "github.com/caos/zitadel/internal/project/model"
 	proj_view "github.com/caos/zitadel/internal/project/repository/view"
 
 	"github.com/caos/logging"
 
-	"github.com/caos/zitadel/internal/eventstore"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/eventstore/query"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/query"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	org_model "github.com/caos/zitadel/internal/org/model"
 	org_es_model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
@@ -32,7 +32,7 @@ const (
 
 type UserMembership struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newUserMembership(

internal/management/repository/eventsourcing/repository.go

@@ -1,12 +1,12 @@
 package eventsourcing
 
 import (
-	"github.com/caos/zitadel/internal/v2/query"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+	"github.com/caos/zitadel/internal/query"
 
 	sd "github.com/caos/zitadel/internal/config/systemdefaults"
 	"github.com/caos/zitadel/internal/config/types"
-	es_int "github.com/caos/zitadel/internal/eventstore"
-	es_spol "github.com/caos/zitadel/internal/eventstore/spooler"
+	es_spol "github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	"github.com/caos/zitadel/internal/management/repository/eventsourcing/eventstore"
 	"github.com/caos/zitadel/internal/management/repository/eventsourcing/spooler"
 	mgmt_view "github.com/caos/zitadel/internal/management/repository/eventsourcing/view"
@@ -15,7 +15,7 @@ import (
 type Config struct {
 	SearchLimit uint64
 	Domain      string
-	Eventstore  es_int.Config
+	Eventstore  v1.Config
 	View        types.SQL
 	Spooler     spooler.SpoolerConfig
 }
@@ -32,7 +32,7 @@ type EsRepository struct {
 
 func Start(conf Config, systemDefaults sd.SystemDefaults, roles []string) (*EsRepository, error) {
 
-	es, err := es_int.Start(conf.Eventstore)
+	es, err := v1.Start(conf.Eventstore)
 	if err != nil {
 		return nil, err
 	}

internal/management/repository/eventsourcing/spooler/lock.go

@@ -2,7 +2,7 @@ package spooler
 
 import (
 	"database/sql"
-	es_locker "github.com/caos/zitadel/internal/eventstore/locker"
+	es_locker "github.com/caos/zitadel/internal/eventstore/v1/locker"
 	"time"
 )
 

internal/management/repository/eventsourcing/spooler/spooler.go

@@ -3,9 +3,9 @@ package spooler
 import (
 	"database/sql"
 	"github.com/caos/zitadel/internal/config/systemdefaults"
+	"github.com/caos/zitadel/internal/eventstore/v1"
 
-	"github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 	"github.com/caos/zitadel/internal/management/repository/eventsourcing/handler"
 	"github.com/caos/zitadel/internal/management/repository/eventsourcing/view"
 )
@@ -17,7 +17,7 @@ type SpoolerConfig struct {
 	Handlers              handler.Configs
 }
 
-func StartSpooler(c SpoolerConfig, es eventstore.Eventstore, view *view.View, sql *sql.DB, defaults systemdefaults.SystemDefaults) *spooler.Spooler {
+func StartSpooler(c SpoolerConfig, es v1.Eventstore, view *view.View, sql *sql.DB, defaults systemdefaults.SystemDefaults) *spooler.Spooler {
 	spoolerConfig := spooler.Config{
 		Eventstore:        es,
 		Locker:            &locker{dbClient: sql},

internal/management/repository/eventsourcing/view/application.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	proj_model "github.com/caos/zitadel/internal/project/model"
 	"github.com/caos/zitadel/internal/project/repository/view"
 	"github.com/caos/zitadel/internal/project/repository/view/model"

internal/management/repository/eventsourcing/view/authn_keys.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	key_model "github.com/caos/zitadel/internal/key/model"
 	"github.com/caos/zitadel/internal/key/repository/view"
 	"github.com/caos/zitadel/internal/key/repository/view/model"

internal/management/repository/eventsourcing/view/external_idps.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	usr_model "github.com/caos/zitadel/internal/user/model"
 	"github.com/caos/zitadel/internal/user/repository/view"
 	"github.com/caos/zitadel/internal/user/repository/view/model"

internal/management/repository/eventsourcing/view/idp_configs.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 	"github.com/caos/zitadel/internal/iam/repository/view"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/view/model"

internal/management/repository/eventsourcing/view/idp_providers.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 	"github.com/caos/zitadel/internal/iam/repository/view"
 	"github.com/caos/zitadel/internal/iam/repository/view/model"

internal/management/repository/eventsourcing/view/label_policies.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/repository/view"
 	"github.com/caos/zitadel/internal/iam/repository/view/model"
 	global_view "github.com/caos/zitadel/internal/view/repository"

internal/management/repository/eventsourcing/view/login_policies.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/repository/view"
 	"github.com/caos/zitadel/internal/iam/repository/view/model"
 	global_view "github.com/caos/zitadel/internal/view/repository"

internal/management/repository/eventsourcing/view/mail_templates.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/repository/view"
 	"github.com/caos/zitadel/internal/iam/repository/view/model"
 	global_view "github.com/caos/zitadel/internal/view/repository"

internal/management/repository/eventsourcing/view/mail_texts.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/repository/view"
 	"github.com/caos/zitadel/internal/iam/repository/view/model"
 	global_view "github.com/caos/zitadel/internal/view/repository"

internal/management/repository/eventsourcing/view/org.go

@@ -1,7 +1,7 @@
 package view
 
 import (
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	org_view "github.com/caos/zitadel/internal/org/repository/view"
 	"github.com/caos/zitadel/internal/org/repository/view/model"
 	"github.com/caos/zitadel/internal/view/repository"

internal/management/repository/eventsourcing/view/org_domain.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	org_model "github.com/caos/zitadel/internal/org/model"
 	"github.com/caos/zitadel/internal/org/repository/view"
 	"github.com/caos/zitadel/internal/org/repository/view/model"

internal/management/repository/eventsourcing/view/org_iam_policy.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/repository/view"
 	"github.com/caos/zitadel/internal/iam/repository/view/model"
 	global_view "github.com/caos/zitadel/internal/view/repository"

internal/management/repository/eventsourcing/view/org_member.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	org_model "github.com/caos/zitadel/internal/org/model"
 	"github.com/caos/zitadel/internal/org/repository/view"
 	"github.com/caos/zitadel/internal/org/repository/view/model"

internal/management/repository/eventsourcing/view/password_age_policy.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/repository/view"
 	"github.com/caos/zitadel/internal/iam/repository/view/model"
 	global_view "github.com/caos/zitadel/internal/view/repository"

internal/management/repository/eventsourcing/view/password_complexity_policy.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/repository/view"
 	"github.com/caos/zitadel/internal/iam/repository/view/model"
 	global_view "github.com/caos/zitadel/internal/view/repository"

internal/management/repository/eventsourcing/view/password_lockout_policy.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/repository/view"
 	"github.com/caos/zitadel/internal/iam/repository/view/model"
 	global_view "github.com/caos/zitadel/internal/view/repository"

internal/management/repository/eventsourcing/view/project.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	proj_model "github.com/caos/zitadel/internal/project/model"
 	"github.com/caos/zitadel/internal/project/repository/view"
 	"github.com/caos/zitadel/internal/project/repository/view/model"

internal/management/repository/eventsourcing/view/project_grant.go

@@ -1,7 +1,7 @@
 package view
 
 import (
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	proj_model "github.com/caos/zitadel/internal/project/model"
 	"github.com/caos/zitadel/internal/project/repository/view"
 	"github.com/caos/zitadel/internal/project/repository/view/model"

internal/management/repository/eventsourcing/view/project_grant_member.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	proj_model "github.com/caos/zitadel/internal/project/model"
 	"github.com/caos/zitadel/internal/project/repository/view"
 	"github.com/caos/zitadel/internal/project/repository/view/model"

internal/management/repository/eventsourcing/view/project_member.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	proj_model "github.com/caos/zitadel/internal/project/model"
 	"github.com/caos/zitadel/internal/project/repository/view"
 	"github.com/caos/zitadel/internal/project/repository/view/model"

internal/management/repository/eventsourcing/view/project_role.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	proj_model "github.com/caos/zitadel/internal/project/model"
 	"github.com/caos/zitadel/internal/project/repository/view"
 	"github.com/caos/zitadel/internal/project/repository/view/model"

internal/management/repository/eventsourcing/view/sequence.go

@@ -3,7 +3,7 @@ package view
 import (
 	"time"
 
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/view/repository"
 )
 

internal/management/repository/eventsourcing/view/user.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	usr_model "github.com/caos/zitadel/internal/user/model"
 	"github.com/caos/zitadel/internal/user/repository/view"
 	"github.com/caos/zitadel/internal/user/repository/view/model"

internal/management/repository/eventsourcing/view/user_grant.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	grant_model "github.com/caos/zitadel/internal/usergrant/model"
 	"github.com/caos/zitadel/internal/usergrant/repository/view"
 	"github.com/caos/zitadel/internal/usergrant/repository/view/model"

internal/management/repository/eventsourcing/view/user_membership.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	usr_model "github.com/caos/zitadel/internal/user/model"
 	"github.com/caos/zitadel/internal/user/repository/view"
 	"github.com/caos/zitadel/internal/user/repository/view/model"