fix: move v2 pkgs (#1331)

* fix: move eventstore pkgs

* fix: move eventstore pkgs

* fix: remove v2 view

* fix: remove v2 view

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

@@ -2,11 +2,11 @@ package eventstore
 
 import (
 	"context"
-	"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"
 	"github.com/caos/zitadel/internal/user/repository/view/model"
-	"github.com/caos/zitadel/internal/v2/domain"
 	"strings"
 
 	caos_errs "github.com/caos/zitadel/internal/errors"
@@ -21,7 +21,7 @@ import (
 )
 
 type IAMRepository struct {
-	Eventstore     eventstore.Eventstore
+	Eventstore     v1.Eventstore
 	SearchLimit    uint64
 	View           *admin_view.View
 	SystemDefaults systemdefaults.SystemDefaults

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

@@ -3,8 +3,9 @@ package eventstore
 import (
 	"context"
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_sdk "github.com/caos/zitadel/internal/eventstore/sdk"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
+	es_sdk "github.com/caos/zitadel/internal/eventstore/v1/sdk"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 	org_es_model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
 	"github.com/caos/zitadel/internal/org/repository/view"
@@ -13,14 +14,13 @@ import (
 	"github.com/caos/logging"
 	admin_view "github.com/caos/zitadel/internal/admin/repository/eventsourcing/view"
 	"github.com/caos/zitadel/internal/config/systemdefaults"
-	"github.com/caos/zitadel/internal/eventstore"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/view/model"
 	org_model "github.com/caos/zitadel/internal/org/model"
 	"github.com/caos/zitadel/internal/org/repository/view/model"
 )
 
 type OrgRepo struct {
-	Eventstore eventstore.Eventstore
+	Eventstore v1.Eventstore
 
 	View *admin_view.View
 

internal/admin/repository/eventsourcing/handler/handler.go

@@ -1,13 +1,13 @@
 package handler
 
 import (
+	"github.com/caos/zitadel/internal/eventstore/v1"
 	"time"
 
 	"github.com/caos/zitadel/internal/admin/repository/eventsourcing/view"
 	"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"
 )
 
 type Configs map[string]*Config
@@ -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{
 		newOrg(
 			handler{view, bulkLimit, configs.cycleDuration("Org"), errorCount, es}),

internal/admin/repository/eventsourcing/handler/iam_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"
 	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"
 	"github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_model "github.com/caos/zitadel/internal/iam/repository/view/model"
 	usr_model "github.com/caos/zitadel/internal/user/model"
@@ -24,7 +23,7 @@ const (
 
 type IAMMember struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newIAMMember(handler handler) *IAMMember {
@@ -199,7 +198,7 @@ func (m *IAMMember) getUserByID(userID string) (*view_model.UserView, error) {
 	return &userCopy, nil
 }
 
-func (m *IAMMember) getUserEvents(userID string, sequence uint64) ([]*models.Event, error) {
+func (m *IAMMember) getUserEvents(userID string, sequence uint64) ([]*es_models.Event, error) {
 	query, err := view.UserByIDQuery(userID, sequence)
 	if err != nil {
 		return nil, err

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

@@ -2,10 +2,10 @@ package handler
 
 import (
 	"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"
+	"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_model "github.com/caos/zitadel/internal/iam/model"
 	"github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_view_model "github.com/caos/zitadel/internal/iam/repository/view/model"
@@ -17,7 +17,7 @@ const (
 
 type IDPConfig struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newIDPConfig(handler handler) *IDPConfig {

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

@@ -2,19 +2,19 @@ package handler
 
 import (
 	"context"
+	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/errors"
-	es_sdk "github.com/caos/zitadel/internal/eventstore/sdk"
+	"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"
-	"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"
 	"github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_view_model "github.com/caos/zitadel/internal/iam/repository/view/model"
@@ -28,7 +28,7 @@ const (
 type IDPProvider struct {
 	handler
 	systemDefaults systemdefaults.SystemDefaults
-	subscription   *eventstore.Subscription
+	subscription   *v1.Subscription
 }
 
 func newIDPProvider(

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

@@ -2,10 +2,10 @@ package handler
 
 import (
 	"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"
+	"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/model"
 	iam_model "github.com/caos/zitadel/internal/iam/repository/view/model"
 )
@@ -16,7 +16,7 @@ const (
 
 type LabelPolicy struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newLabelPolicy(handler handler) *LabelPolicy {

internal/admin/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"
 	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,11 +47,11 @@ func (p *LoginPolicy) ViewModel() string {
 	return loginPolicyTable
 }
 
-func (p *LoginPolicy) AggregateTypes() []models.AggregateType {
-	return []models.AggregateType{iam_es_model.IAMAggregate, model.OrgAggregate}
+func (p *LoginPolicy) AggregateTypes() []es_models.AggregateType {
+	return []es_models.AggregateType{iam_es_model.IAMAggregate, model.OrgAggregate}
 }
 
-func (p *LoginPolicy) EventQuery() (*models.SearchQuery, error) {
+func (p *LoginPolicy) EventQuery() (*es_models.SearchQuery, error) {
 	sequence, err := p.view.GetLatestLoginPolicySequence()
 	if err != nil {
 		return nil, err
@@ -70,7 +69,7 @@ func (p *LoginPolicy) CurrentSequence() (uint64, error) {
 	return sequence.CurrentSequence, nil
 }
 
-func (p *LoginPolicy) Reduce(event *models.Event) (err error) {
+func (p *LoginPolicy) Reduce(event *es_models.Event) (err error) {
 	switch event.AggregateType {
 	case model.OrgAggregate, iam_es_model.IAMAggregate:
 		err = p.processLoginPolicy(event)
@@ -78,7 +77,7 @@ func (p *LoginPolicy) Reduce(event *models.Event) (err error) {
 	return err
 }
 
-func (p *LoginPolicy) processLoginPolicy(event *models.Event) (err error) {
+func (p *LoginPolicy) processLoginPolicy(event *es_models.Event) (err error) {
 	policy := new(iam_model.LoginPolicyView)
 	switch event.Type {
 	case model.OrgAdded:
@@ -132,7 +131,7 @@ func (p *LoginPolicy) processLoginPolicy(event *models.Event) (err error) {
 	return p.view.PutLoginPolicy(policy, event)
 }
 
-func (p *LoginPolicy) OnError(event *models.Event, err error) error {
+func (p *LoginPolicy) OnError(event *es_models.Event, err error) error {
 	logging.LogWithFields("SPOOL-Wj8sf", "id", event.AggregateID).WithError(err).Warn("something went wrong in login policy handler")
 	return spooler.HandleError(event, err, p.view.GetLatestLoginPolicyFailedEvent, p.view.ProcessedLoginPolicyFailedEvent, p.view.ProcessedLoginPolicySequence, p.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/admin/repository/eventsourcing/handler/mail_template.go

@@ -2,12 +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"
-	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/iam/repository/eventsourcing/model"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_model "github.com/caos/zitadel/internal/iam/repository/view/model"
@@ -15,7 +14,7 @@ import (
 
 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.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 model.MailTemplateAdded:
@@ -95,7 +94,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-Wj8sf", "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/admin/repository/eventsourcing/handler/mail_text.go

@@ -2,12 +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"
-	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/iam/repository/eventsourcing/model"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_model "github.com/caos/zitadel/internal/iam/repository/view/model"
@@ -15,7 +14,7 @@ import (
 
 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.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) {
 	mailText := new(iam_model.MailTextView)
 	switch event.Type {
 	case model.MailTextAdded:
@@ -99,7 +98,7 @@ func (m *MailText) processMailText(event *models.Event) (err error) {
 	return m.view.PutMailText(mailText, event)
 }
 
-func (m *MailText) OnError(event *models.Event, err error) error {
+func (m *MailText) OnError(event *es_models.Event, err error) error {
 	logging.LogWithFields("HANDL-5jk84", "id", event.AggregateID).WithError(err).Warn("something went wrong in label mailText handler")
 	return spooler.HandleError(event, err, m.view.GetLatestMailTextFailedEvent, m.view.ProcessedMailTextFailedEvent, m.view.ProcessedMailTextSequence, m.errorCountUntilSkip)
 }

internal/admin/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/admin/repository/eventsourcing/handler/org_iam_policy.go

@@ -2,10 +2,10 @@ package handler
 
 import (
 	"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"
+	"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"
@@ -17,7 +17,7 @@ const (
 
 type OrgIAMPolicy struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newOrgIAMPolicy(handler handler) *OrgIAMPolicy {

internal/admin/repository/eventsourcing/handler/password_age_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 PasswordAgePolicy struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newPasswordAgePolicy(handler handler) *PasswordAgePolicy {
@@ -45,8 +44,8 @@ func (p *PasswordAgePolicy) ViewModel() string {
 	return passwordAgePolicyTable
 }
 
-func (p *PasswordAgePolicy) AggregateTypes() []models.AggregateType {
-	return []models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
+func (p *PasswordAgePolicy) AggregateTypes() []es_models.AggregateType {
+	return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
 }
 
 func (p *PasswordAgePolicy) CurrentSequence() (uint64, error) {
@@ -57,7 +56,7 @@ func (p *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
@@ -67,7 +66,7 @@ func (p *PasswordAgePolicy) EventQuery() (*models.SearchQuery, error) {
 		LatestSequenceFilter(sequence.CurrentSequence), nil
 }
 
-func (p *PasswordAgePolicy) Reduce(event *models.Event) (err error) {
+func (p *PasswordAgePolicy) Reduce(event *es_models.Event) (err error) {
 	switch event.AggregateType {
 	case model.OrgAggregate, iam_es_model.IAMAggregate:
 		err = p.processPasswordAgePolicy(event)
@@ -75,7 +74,7 @@ func (p *PasswordAgePolicy) Reduce(event *models.Event) (err error) {
 	return err
 }
 
-func (p *PasswordAgePolicy) processPasswordAgePolicy(event *models.Event) (err error) {
+func (p *PasswordAgePolicy) processPasswordAgePolicy(event *es_models.Event) (err error) {
 	policy := new(iam_model.PasswordAgePolicyView)
 	switch event.Type {
 	case iam_es_model.PasswordAgePolicyAdded, model.PasswordAgePolicyAdded:
@@ -97,7 +96,7 @@ func (p *PasswordAgePolicy) processPasswordAgePolicy(event *models.Event) (err e
 	return p.view.PutPasswordAgePolicy(policy, event)
 }
 
-func (p *PasswordAgePolicy) OnError(event *models.Event, err error) error {
+func (p *PasswordAgePolicy) OnError(event *es_models.Event, err error) error {
 	logging.LogWithFields("SPOOL-nD8sie", "id", event.AggregateID).WithError(err).Warn("something went wrong in passwordAge policy handler")
 	return spooler.HandleError(event, err, p.view.GetLatestPasswordAgePolicyFailedEvent, p.view.ProcessedPasswordAgePolicyFailedEvent, p.view.ProcessedPasswordAgePolicySequence, p.errorCountUntilSkip)
 }

internal/admin/repository/eventsourcing/handler/password_complexity_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 PasswordComplexityPolicy struct {
 	handler
-	subscription *eventstore.Subscription
+	subscription *v1.Subscription
 }
 
 func newPasswordComplexityPolicy(handler handler) *PasswordComplexityPolicy {
@@ -45,8 +44,8 @@ func (p *PasswordComplexityPolicy) ViewModel() string {
 	return passwordComplexityPolicyTable
 }
 
-func (p *PasswordComplexityPolicy) AggregateTypes() []models.AggregateType {
-	return []models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
+func (p *PasswordComplexityPolicy) AggregateTypes() []es_models.AggregateType {
+	return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
 }
 
 func (p *PasswordComplexityPolicy) CurrentSequence() (uint64, error) {
@@ -57,7 +56,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
@@ -67,7 +66,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)
@@ -75,7 +74,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:
@@ -97,7 +96,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-Wm8fs", "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/admin/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 {
@@ -45,8 +44,8 @@ func (p *PasswordLockoutPolicy) ViewModel() string {
 	return passwordLockoutPolicyTable
 }
 
-func (p *PasswordLockoutPolicy) AggregateTypes() []models.AggregateType {
-	return []models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
+func (p *PasswordLockoutPolicy) AggregateTypes() []es_models.AggregateType {
+	return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
 }
 
 func (p *PasswordLockoutPolicy) CurrentSequence() (uint64, error) {
@@ -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-nD8sie", "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/admin/repository/eventsourcing/handler/user.go

@@ -3,22 +3,21 @@ package handler
 import (
 	"context"
 	"github.com/caos/zitadel/internal/config/systemdefaults"
+	"github.com/caos/zitadel/internal/domain"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	es_sdk "github.com/caos/zitadel/internal/eventstore/sdk"
+	"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"
 	"github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_view "github.com/caos/zitadel/internal/iam/repository/view"
 	"github.com/caos/zitadel/internal/org/repository/view"
-	"github.com/caos/zitadel/internal/v2/domain"
 	"k8s.io/apimachinery/pkg/api/errors"
 
 	"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"
 	org_model "github.com/caos/zitadel/internal/org/model"
 	org_es_model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
@@ -31,9 +30,9 @@ const (
 
 type User struct {
 	handler
-	eventstore     eventstore.Eventstore
+	eventstore     v1.Eventstore
 	systemDefaults systemdefaults.SystemDefaults
-	subscription   *eventstore.Subscription
+	subscription   *v1.Subscription
 }
 
 func newUser(
@@ -63,8 +62,8 @@ func (u *User) ViewModel() string {
 	return userTable
 }
 
-func (u *User) AggregateTypes() []models.AggregateType {
-	return []models.AggregateType{es_model.UserAggregate, org_es_model.OrgAggregate}
+func (u *User) AggregateTypes() []es_models.AggregateType {
+	return []es_models.AggregateType{es_model.UserAggregate, org_es_model.OrgAggregate}
 }
 
 func (u *User) CurrentSequence() (uint64, error) {
@@ -75,7 +74,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
@@ -85,7 +84,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)
@@ -96,7 +95,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,
@@ -167,7 +166,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,
@@ -182,7 +181,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
@@ -204,7 +203,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
@@ -247,7 +246,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-vLmwQ", "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)
 }
@@ -263,7 +262,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,
 		},
 	}
@@ -284,7 +283,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/admin/repository/eventsourcing/handler/user_external_idps.go

@@ -4,13 +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"
-	"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"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_view "github.com/caos/zitadel/internal/iam/repository/view"
@@ -20,7 +20,6 @@ import (
 	"github.com/caos/zitadel/internal/org/repository/view"
 	"github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 	usr_view_model "github.com/caos/zitadel/internal/user/repository/view/model"
-	"github.com/caos/zitadel/internal/v2/domain"
 )
 
 const (
@@ -30,7 +29,7 @@ const (
 type ExternalIDP struct {
 	handler
 	systemDefaults systemdefaults.SystemDefaults
-	subscription   *eventstore.Subscription
+	subscription   *v1.Subscription
 }
 
 func newExternalIDP(
@@ -60,8 +59,8 @@ func (i *ExternalIDP) ViewModel() string {
 	return externalIDPTable
 }
 
-func (i *ExternalIDP) AggregateTypes() []models.AggregateType {
-	return []models.AggregateType{model.UserAggregate, iam_es_model.IAMAggregate, org_es_model.OrgAggregate}
+func (i *ExternalIDP) AggregateTypes() []es_models.AggregateType {
+	return []es_models.AggregateType{model.UserAggregate, iam_es_model.IAMAggregate, org_es_model.OrgAggregate}
 }
 
 func (i *ExternalIDP) CurrentSequence() (uint64, error) {
@@ -72,7 +71,7 @@ func (i *ExternalIDP) CurrentSequence() (uint64, error) {
 	return sequence.CurrentSequence, nil
 }
 
-func (i *ExternalIDP) EventQuery() (*models.SearchQuery, error) {
+func (i *ExternalIDP) EventQuery() (*es_models.SearchQuery, error) {
 	sequence, err := i.view.GetLatestExternalIDPSequence()
 	if err != nil {
 		return nil, err
@@ -82,7 +81,7 @@ func (i *ExternalIDP) EventQuery() (*models.SearchQuery, error) {
 		LatestSequenceFilter(sequence.CurrentSequence), nil
 }
 
-func (i *ExternalIDP) Reduce(event *models.Event) (err error) {
+func (i *ExternalIDP) Reduce(event *es_models.Event) (err error) {
 	switch event.AggregateType {
 	case model.UserAggregate:
 		err = i.processUser(event)
@@ -92,7 +91,7 @@ func (i *ExternalIDP) Reduce(event *models.Event) (err error) {
 	return err
 }
 
-func (i *ExternalIDP) processUser(event *models.Event) (err error) {
+func (i *ExternalIDP) processUser(event *es_models.Event) (err error) {
 	externalIDP := new(usr_view_model.ExternalIDPView)
 	switch event.Type {
 	case model.HumanExternalIDPAdded:
@@ -118,7 +117,7 @@ func (i *ExternalIDP) processUser(event *models.Event) (err error) {
 	return i.view.PutExternalIDP(externalIDP, event)
 }
 
-func (i *ExternalIDP) processIdpConfig(event *models.Event) (err error) {
+func (i *ExternalIDP) processIdpConfig(event *es_models.Event) (err error) {
 	switch event.Type {
 	case iam_es_model.IDPConfigChanged, org_es_model.IDPConfigChanged:
 		configView := new(iam_view_model.IDPConfigView)
@@ -165,7 +164,7 @@ func (i *ExternalIDP) fillConfigData(externalIDP *usr_view_model.ExternalIDPView
 	externalIDP.IDPName = config.Name
 }
 
-func (i *ExternalIDP) OnError(event *models.Event, err error) error {
+func (i *ExternalIDP) OnError(event *es_models.Event, err error) error {
 	logging.LogWithFields("SPOOL-4Rsu8", "id", event.AggregateID).WithError(err).Warn("something went wrong in idp provider handler")
 	return spooler.HandleError(event, err, i.view.GetLatestExternalIDPFailedEvent, i.view.ProcessedExternalIDPFailedEvent, i.view.ProcessedExternalIDPSequence, i.errorCountUntilSkip)
 }
@@ -192,7 +191,7 @@ func (i *ExternalIDP) getOrgByID(ctx context.Context, orgID string) (*org_model.
 	}
 
 	esOrg := &org_es_model.Org{
-		ObjectRoot: models.ObjectRoot{
+		ObjectRoot: es_models.ObjectRoot{
 			AggregateID: orgID,
 		},
 	}

internal/admin/repository/eventsourcing/repository.go

@@ -7,13 +7,13 @@ import (
 	admin_view "github.com/caos/zitadel/internal/admin/repository/eventsourcing/view"
 	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"
+	"github.com/caos/zitadel/internal/eventstore/v1"
+	es_spol "github.com/caos/zitadel/internal/eventstore/v1/spooler"
 )
 
 type Config struct {
 	SearchLimit uint64
-	Eventstore  es_int.Config
+	Eventstore  v1.Config
 	View        types.SQL
 	Spooler     spooler.SpoolerConfig
 	Domain      string
@@ -27,7 +27,7 @@ type EsRepository struct {
 }
 
 func Start(ctx context.Context, 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/admin/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/admin/repository/eventsourcing/spooler/spooler.go

@@ -3,11 +3,11 @@ package spooler
 import (
 	"database/sql"
 	"github.com/caos/zitadel/internal/config/systemdefaults"
+	"github.com/caos/zitadel/internal/eventstore/v1"
 
 	"github.com/caos/zitadel/internal/admin/repository/eventsourcing/handler"
 	"github.com/caos/zitadel/internal/admin/repository/eventsourcing/view"
-	"github.com/caos/zitadel/internal/eventstore"
-	"github.com/caos/zitadel/internal/eventstore/spooler"
+	"github.com/caos/zitadel/internal/eventstore/v1/spooler"
 )
 
 type SpoolerConfig struct {
@@ -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/admin/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/admin/repository/eventsourcing/view/iam_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"
 	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/admin/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"
 	"github.com/caos/zitadel/internal/iam/repository/view/model"

internal/admin/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/admin/repository/eventsourcing/view/label_policies.go

@@ -1,7 +1,7 @@
 package view
 
 import (
-	"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/admin/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/admin/repository/eventsourcing/view/mail_templates.go

@@ -1,7 +1,7 @@
 package view
 
 import (
-	"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/admin/repository/eventsourcing/view/mail_texts.go

@@ -1,7 +1,7 @@
 package view
 
 import (
-	"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/admin/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_model "github.com/caos/zitadel/internal/org/model"
 	org_view "github.com/caos/zitadel/internal/org/repository/view"
 	"github.com/caos/zitadel/internal/org/repository/view/model"

internal/admin/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/admin/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/admin/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/admin/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/admin/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/admin/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"