fix: move v2 pkgs (#1331)

* fix: move eventstore pkgs

* fix: move eventstore pkgs

* fix: remove v2 view

* fix: remove v2 view

internal/project/model/api_config.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/caos/zitadel/internal/crypto"
 	"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/id"
 )
 

internal/project/model/application.go

@@ -3,7 +3,7 @@ package model
 import (
 	"github.com/golang/protobuf/ptypes/timestamp"
 
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 type Application struct {

internal/project/model/application_test.go

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

internal/project/model/oidc_config.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/caos/zitadel/internal/crypto"
 	"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/id"
 	key_model "github.com/caos/zitadel/internal/key/model"
 )

internal/project/model/project.go

@@ -3,7 +3,7 @@ package model
 import (
 	"github.com/golang/protobuf/ptypes/timestamp"
 
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 type Project struct {

internal/project/model/project_grant.go

@@ -1,7 +1,7 @@
 package model
 
 import (
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 type ProjectGrant struct {

internal/project/model/project_grant_member.go

@@ -1,6 +1,6 @@
 package model
 
-import es_models "github.com/caos/zitadel/internal/eventstore/models"
+import es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 
 type ProjectGrantMember struct {
 	es_models.ObjectRoot

internal/project/model/project_member.go

@@ -1,6 +1,6 @@
 package model
 
-import es_models "github.com/caos/zitadel/internal/eventstore/models"
+import es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 
 type ProjectMember struct {
 	es_models.ObjectRoot

internal/project/model/project_role.go

@@ -1,6 +1,6 @@
 package model
 
-import es_models "github.com/caos/zitadel/internal/eventstore/models"
+import es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 
 type ProjectRole struct {
 	es_models.ObjectRoot

internal/project/repository/eventsourcing/cache.go

@@ -4,7 +4,7 @@ import (
 	"github.com/caos/logging"
 	"github.com/caos/zitadel/internal/cache"
 	"github.com/caos/zitadel/internal/cache/config"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 )
 

internal/project/repository/eventsourcing/model/api_config.go

@@ -6,7 +6,7 @@ import (
 	"github.com/caos/logging"
 
 	"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/project/model"
 )
 

internal/project/repository/eventsourcing/model/application.go

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

internal/project/repository/eventsourcing/model/application_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"
 	"github.com/caos/zitadel/internal/project/model"
 )
 

internal/project/repository/eventsourcing/model/oidc_config.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/caos/zitadel/internal/crypto"
 	"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"
 	key_model "github.com/caos/zitadel/internal/key/model"
 	"github.com/caos/zitadel/internal/project/model"
 )

internal/project/repository/eventsourcing/model/oidc_config_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 TestOIDCConfigChanges(t *testing.T) {

internal/project/repository/eventsourcing/model/project.go

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

internal/project/repository/eventsourcing/model/project_grant.go

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

internal/project/repository/eventsourcing/model/project_grant_member.go

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

internal/project/repository/eventsourcing/model/project_grant_member_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/project/repository/eventsourcing/model/project_grant_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"
 	"github.com/caos/zitadel/internal/project/model"
 	"testing"
 )

internal/project/repository/eventsourcing/model/project_member.go

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

internal/project/repository/eventsourcing/model/project_member_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/project/repository/eventsourcing/model/project_role.go

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

internal/project/repository/eventsourcing/model/project_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"
 	"github.com/caos/zitadel/internal/project/model"
 )
 

internal/project/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"
 
 const (
 	ProjectAggregate models.AggregateType = "project"

internal/project/repository/eventsourcing/project.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/caos/zitadel/internal/crypto"
 	"github.com/caos/zitadel/internal/errors"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	es_sdk "github.com/caos/zitadel/internal/eventstore/sdk"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
+	es_sdk "github.com/caos/zitadel/internal/eventstore/v1/sdk"
 	"github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 )
 

internal/project/repository/view/model/application.go

@@ -9,7 +9,7 @@ import (
 
 	http_util "github.com/caos/zitadel/internal/api/http"
 	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/project/model"
 	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 )

internal/project/repository/view/model/application_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"
 	"github.com/caos/zitadel/internal/project/model"
 	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 	"testing"

internal/project/repository/view/model/project.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"
 	"github.com/caos/zitadel/internal/project/model"
 	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 )

internal/project/repository/view/model/project_grant.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/project/model"
 	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 	"github.com/lib/pq"

internal/project/repository/view/model/project_grant_member.go

@@ -6,7 +6,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"
 	"github.com/caos/zitadel/internal/project/model"
 	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 	"github.com/lib/pq"

internal/project/repository/view/model/project_grant_member_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"
 	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 	"github.com/lib/pq"
 	"reflect"

internal/project/repository/view/model/project_grant_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"
 	"github.com/caos/zitadel/internal/project/model"
 	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 	"github.com/lib/pq"

internal/project/repository/view/model/project_member.go

@@ -6,7 +6,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"
 	"github.com/caos/zitadel/internal/project/model"
 	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 	"github.com/lib/pq"

internal/project/repository/view/model/project_member_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"
 	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 	"github.com/lib/pq"
 	"reflect"

internal/project/repository/view/model/project_role.go

@@ -6,7 +6,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"
 	"github.com/caos/zitadel/internal/project/model"
 	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 )

internal/project/repository/view/model/project_role_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"
 	es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
 	"testing"
 )

internal/project/repository/view/model/project_test.go

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

internal/project/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/project/repository/eventsourcing/model"
 )