fix: move v2 pkgs (#1331)

* fix: move eventstore pkgs

* fix: move eventstore pkgs

* fix: remove v2 view

* fix: remove v2 view

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

@@ -5,7 +5,7 @@ import (
 
 	"github.com/caos/logging"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/user/model"
 )
 

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

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 func TestAddressChanges(t *testing.T) {

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

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"github.com/caos/logging"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"net"
 
 	"github.com/caos/zitadel/internal/auth_request/model"

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

@@ -7,7 +7,7 @@ import (
 	"github.com/caos/logging"
 	"github.com/caos/zitadel/internal/crypto"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/user/model"
 )
 

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

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 func TestEmailChanges(t *testing.T) {

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

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"github.com/caos/logging"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/user/model"
 )
 

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

@@ -2,7 +2,7 @@ package model
 
 import (
 	"encoding/json"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"testing"
 )
 

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

@@ -6,7 +6,7 @@ import (
 
 	"github.com/caos/zitadel/internal/crypto"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/user/model"
 )
 

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

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/caos/zitadel/internal/crypto"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/user/model"
 )
 

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

@@ -7,7 +7,7 @@ import (
 	"github.com/caos/logging"
 	"github.com/caos/zitadel/internal/crypto"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/user/model"
 )
 

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

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 func TestAppendUserPasswordChangedEvent(t *testing.T) {

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

@@ -7,7 +7,7 @@ import (
 	"github.com/caos/logging"
 	"github.com/caos/zitadel/internal/crypto"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/user/model"
 )
 

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

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 func TestPhoneChanges(t *testing.T) {

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

@@ -5,7 +5,7 @@ import (
 
 	"golang.org/x/text/language"
 
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/user/model"
 )
 

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

@@ -6,7 +6,7 @@ import (
 
 	"github.com/caos/logging"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/user/model"
 )
 

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

@@ -1,6 +1,6 @@
 package model
 
-import "github.com/caos/zitadel/internal/eventstore/models"
+import "github.com/caos/zitadel/internal/eventstore/v1/models"
 
 //aggregates
 const (

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

@@ -7,7 +7,7 @@ import (
 	"github.com/caos/logging"
 	"github.com/caos/zitadel/internal/errors"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/user/model"
 )
 

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

@@ -7,7 +7,7 @@ import (
 	"github.com/caos/logging"
 	"github.com/caos/zitadel/internal/crypto"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/user/model"
 )
 

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

@@ -6,8 +6,7 @@ import (
 
 	"github.com/caos/logging"
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 type Machine struct {
@@ -17,7 +16,7 @@ type Machine struct {
 	Description string `json:"description,omitempty"`
 }
 
-func (sa *Machine) AppendEvents(events ...*models.Event) error {
+func (sa *Machine) AppendEvents(events ...*es_models.Event) error {
 	for _, event := range events {
 		if err := sa.AppendEvent(event); err != nil {
 			return err
@@ -26,7 +25,7 @@ func (sa *Machine) AppendEvents(events ...*models.Event) error {
 	return nil
 }
 
-func (sa *Machine) AppendEvent(event *models.Event) (err error) {
+func (sa *Machine) AppendEvent(event *es_models.Event) (err error) {
 	switch event.Type {
 	case MachineAdded, MachineChanged:
 		err = sa.setData(event)
@@ -35,7 +34,7 @@ func (sa *Machine) AppendEvent(event *models.Event) (err error) {
 	return err
 }
 
-func (sa *Machine) setData(event *models.Event) error {
+func (sa *Machine) setData(event *es_models.Event) error {
 	if err := json.Unmarshal(event.Data, sa); err != nil {
 		logging.Log("EVEN-8ujgd").WithError(err).Error("could not unmarshal event data")
 		return errors.ThrowInternal(err, "MODEL-GwjY9", "could not unmarshal event")

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

@@ -6,7 +6,7 @@ import (
 	"github.com/caos/logging"
 
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/user/model"
 )
 

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

@@ -5,7 +5,7 @@ import (
 	"github.com/caos/zitadel/pkg/grpc/auth"
 	"testing"
 
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 func TestAppendMFAU2FAddedEvent(t *testing.T) {

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

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"github.com/caos/logging"
 	caos_errs "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/user/model"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 	"time"

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

@@ -7,7 +7,7 @@ import (
 
 	"github.com/caos/logging"
 	caos_errs "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/user/model"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"

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

@@ -3,7 +3,7 @@ package model
 import (
 	"testing"
 
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 )
 

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

@@ -7,8 +7,7 @@ import (
 	"github.com/caos/logging"
 
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	usr_model "github.com/caos/zitadel/internal/user/model"
 	usr_es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 
@@ -74,7 +73,7 @@ func TokenViewToModel(token *TokenView) *usr_model.TokenView {
 	}
 }
 
-func (t *TokenView) AppendEventIfMyToken(event *models.Event) (err error) {
+func (t *TokenView) AppendEventIfMyToken(event *es_models.Event) (err error) {
 	view := new(TokenView)
 	switch event.Type {
 	case usr_es_model.UserTokenAdded:
@@ -115,7 +114,7 @@ func (t *TokenView) AppendEvent(event *es_models.Event) error {
 	return nil
 }
 
-func (t *TokenView) setRootData(event *models.Event) {
+func (t *TokenView) setRootData(event *es_models.Event) {
 	t.UserID = event.AggregateID
 	t.ResourceOwner = event.ResourceOwner
 }

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

@@ -10,7 +10,7 @@ import (
 
 	req_model "github.com/caos/zitadel/internal/auth_request/model"
 	caos_errs "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"
 	org_model "github.com/caos/zitadel/internal/org/model"
 	"github.com/caos/zitadel/internal/user/model"

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

@@ -8,7 +8,7 @@ import (
 	"github.com/lib/pq"
 
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	org_es_model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
 	proj_es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"

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

@@ -8,7 +8,7 @@ import (
 
 	req_model "github.com/caos/zitadel/internal/auth_request/model"
 	caos_errs "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/user/model"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 )

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

@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/caos/zitadel/internal/crypto"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 )
 

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

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/caos/zitadel/internal/crypto"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/user/model"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 )

internal/user/repository/view/query.go

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