fix: commandside queries (#1313)

* fix: move user by id to query side * fix: move get passwordless to query side # Conflicts: # internal/user/repository/eventsourcing/eventstore.go * fix: move get passwordless to query side * remove user eventstore * remove unused models * org changes * org changes * fix: move org queries to query side * fix: remove org eventstore * fix: remove org eventstore * fix: remove org eventstore * remove project from es v1 * project cleanup * project cleanup * fix: remove org eventstore * fix: remove iam eventstore Co-authored-by: Livio Amstutz <livio.a@gmail.com>
2025-08-12 11:27:33 +00:00 · 2021-02-22 14:08:47 +01:00
parent 2ba56595b1
commit 428ef4acdb
106 changed files with 2301 additions and 2799 deletions
--- a/internal/auth/repository/eventsourcing/eventstore/application.go
+++ b/internal/auth/repository/eventsourcing/eventstore/application.go
@@ -5,16 +5,14 @@ import (

 	"github.com/caos/zitadel/internal/auth/repository/eventsourcing/view"
 	"github.com/caos/zitadel/internal/project/model"
-	proj_event "github.com/caos/zitadel/internal/project/repository/eventsourcing"
 	proj_view_model "github.com/caos/zitadel/internal/project/repository/view/model"
 	"github.com/caos/zitadel/internal/telemetry/tracing"
 	"github.com/caos/zitadel/internal/v2/command"
 )

 type ApplicationRepo struct {
-	Commands      *command.CommandSide
-	View          *view.View
-	ProjectEvents *proj_event.ProjectEventstore
+	Commands *command.CommandSide
+	View     *view.View
 }

 func (a *ApplicationRepo) ApplicationByClientID(ctx context.Context, clientID string) (*model.ApplicationView, error) {
--- a/internal/auth/repository/eventsourcing/eventstore/auth_request.go
+++ b/internal/auth/repository/eventsourcing/eventstore/auth_request.go
@@ -20,12 +20,10 @@ import (
 	iam_view_model "github.com/caos/zitadel/internal/iam/repository/view/model"
 	"github.com/caos/zitadel/internal/id"
 	org_model "github.com/caos/zitadel/internal/org/model"
-	org_event "github.com/caos/zitadel/internal/org/repository/eventsourcing"
 	org_view_model "github.com/caos/zitadel/internal/org/repository/view/model"
 	project_view_model "github.com/caos/zitadel/internal/project/repository/view/model"
 	"github.com/caos/zitadel/internal/telemetry/tracing"
 	user_model "github.com/caos/zitadel/internal/user/model"
-	user_event "github.com/caos/zitadel/internal/user/repository/eventsourcing"
 	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 	user_view_model "github.com/caos/zitadel/internal/user/repository/view/model"
 	grant_view_model "github.com/caos/zitadel/internal/usergrant/repository/view/model"
@@ -33,8 +31,6 @@ import (

 type AuthRequestRepo struct {
 	Command      *command.CommandSide
-	UserEvents   *user_event.UserEventstore
-	OrgEvents    *org_event.OrgEventstore
 	AuthRequests cache.AuthRequestCache
 	View         *view.View

@@ -93,9 +89,6 @@ type userGrantProvider interface {
 }

 func (repo *AuthRequestRepo) Health(ctx context.Context) error {
-	if err := repo.UserEvents.Health(ctx); err != nil {
-		return err
-	}
 	return repo.AuthRequests.Health(ctx)
 }

--- a/internal/auth/repository/eventsourcing/eventstore/auth_request_test.go
+++ b/internal/auth/repository/eventsourcing/eventstore/auth_request_test.go
@@ -21,7 +21,6 @@ import (
 	org_view_model "github.com/caos/zitadel/internal/org/repository/view/model"
 	proj_view_model "github.com/caos/zitadel/internal/project/repository/view/model"
 	user_model "github.com/caos/zitadel/internal/user/model"
-	user_event "github.com/caos/zitadel/internal/user/repository/eventsourcing"
 	user_es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 	user_view_model "github.com/caos/zitadel/internal/user/repository/view/model"
 	grant_view_model "github.com/caos/zitadel/internal/usergrant/repository/view/model"
@@ -198,7 +197,6 @@ func (m *mockUserGrants) UserGrantsByProjectAndUserID(s string, s2 string) ([]*g

 func TestAuthRequestRepo_nextSteps(t *testing.T) {
 	type fields struct {
-		UserEvents                 *user_event.UserEventstore
 		AuthRequests               *cache.AuthRequestCache
 		View                       *view.View
 		userSessionViewProvider    userSessionViewProvider
@@ -958,7 +956,6 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			repo := &AuthRequestRepo{
-				UserEvents:                 tt.fields.UserEvents,
 				AuthRequests:               tt.fields.AuthRequests,
 				View:                       tt.fields.View,
 				UserSessionViewProvider:    tt.fields.userSessionViewProvider,
--- a/internal/auth/repository/eventsourcing/eventstore/org.go
+++ b/internal/auth/repository/eventsourcing/eventstore/org.go
@@ -14,9 +14,7 @@ import (

 	auth_view "github.com/caos/zitadel/internal/auth/repository/eventsourcing/view"
 	org_model "github.com/caos/zitadel/internal/org/model"
-	org_es "github.com/caos/zitadel/internal/org/repository/eventsourcing"
 	"github.com/caos/zitadel/internal/org/repository/view/model"
-	usr_es "github.com/caos/zitadel/internal/user/repository/eventsourcing"
 )

 const (
@@ -24,9 +22,7 @@ const (
 )

 type OrgRepository struct {
-	SearchLimit    uint64
-	OrgEventstore  *org_es.OrgEventstore
-	UserEventstore *usr_es.UserEventstore
+	SearchLimit uint64

 	View           *auth_view.View
 	SystemDefaults systemdefaults.SystemDefaults
--- a/internal/auth/repository/eventsourcing/eventstore/project.go
+++ b/internal/auth/repository/eventsourcing/eventstore/project.go
@@ -3,13 +3,11 @@ package eventstore
 import (
 	"github.com/caos/zitadel/internal/auth/repository/eventsourcing/view"
 	"github.com/caos/zitadel/internal/project/model"
-	proj_event "github.com/caos/zitadel/internal/project/repository/eventsourcing"
 	proj_view_model "github.com/caos/zitadel/internal/project/repository/view/model"
 )

 type ProjectRepo struct {
-	View          *view.View
-	ProjectEvents *proj_event.ProjectEventstore
+	View *view.View
 }

 func (a *ApplicationRepo) ProjectRolesByProjectID(projectID string) ([]*model.ProjectRoleView, error) {
--- a/internal/auth/repository/eventsourcing/eventstore/register.go
+++ b/internal/auth/repository/eventsourcing/eventstore/register.go
@@ -1,36 +0,0 @@
-package eventstore
-
-import (
-	auth_model "github.com/caos/zitadel/internal/auth/model"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
-	usr_es "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
-)
-
-type Register struct {
-	*model.Org
-	*usr_es.User
-}
-
-func (r *Register) AppendEvents(events ...*es_models.Event) error {
-	for _, event := range events {
-		var err error
-		switch event.AggregateType {
-		case model.OrgAggregate:
-			err = r.Org.AppendEvent(event)
-		case usr_es.UserAggregate:
-			err = r.User.AppendEvent(event)
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func RegisterToModel(register *Register) *auth_model.RegisterOrg {
-	return &auth_model.RegisterOrg{
-		Org:  model.OrgToModel(register.Org),
-		User: usr_es.UserToModel(register.User),
-	}
-}
--- a/internal/auth/repository/eventsourcing/eventstore/token.go
+++ b/internal/auth/repository/eventsourcing/eventstore/token.go
@@ -4,21 +4,22 @@ import (
 	"context"
 	"time"

+	"github.com/caos/zitadel/internal/eventstore"
+	"github.com/caos/zitadel/internal/eventstore/models"
+	usr_view "github.com/caos/zitadel/internal/user/repository/view"
+
 	"github.com/caos/logging"

 	"github.com/caos/zitadel/internal/auth/repository/eventsourcing/view"
 	"github.com/caos/zitadel/internal/errors"
-	proj_event "github.com/caos/zitadel/internal/project/repository/eventsourcing"
 	"github.com/caos/zitadel/internal/telemetry/tracing"
 	usr_model "github.com/caos/zitadel/internal/user/model"
-	user_event "github.com/caos/zitadel/internal/user/repository/eventsourcing"
 	"github.com/caos/zitadel/internal/user/repository/view/model"
 )

 type TokenRepo struct {
-	UserEvents    *user_event.UserEventstore
-	ProjectEvents *proj_event.ProjectEventstore
-	View          *view.View
+	Eventstore eventstore.Eventstore
+	View       *view.View
 }

 func (repo *TokenRepo) IsTokenValid(ctx context.Context, userID, tokenID string) (bool, error) {
@@ -43,7 +44,7 @@ func (repo *TokenRepo) TokenByID(ctx context.Context, userID, tokenID string) (*
 		token.UserID = userID
 	}

-	events, esErr := repo.UserEvents.UserEventsByID(ctx, userID, token.Sequence)
+	events, esErr := repo.getUserEvents(ctx, userID, token.Sequence)
 	if errors.IsNotFound(viewErr) && len(events) == 0 {
 		return nil, errors.ThrowNotFound(nil, "EVENT-4T90g", "Errors.Token.NotFound")
 	}
@@ -65,11 +66,10 @@ func (repo *TokenRepo) TokenByID(ctx context.Context, userID, tokenID string) (*
 	return model.TokenViewToModel(token), nil
 }

-func AppendAudIfNotExisting(aud string, existingAud []string) []string {
-	for _, a := range existingAud {
-		if a == aud {
-			return existingAud
-		}
+func (r *TokenRepo) getUserEvents(ctx context.Context, userID string, sequence uint64) ([]*models.Event, error) {
+	query, err := usr_view.UserByIDQuery(userID, sequence)
+	if err != nil {
+		return nil, err
 	}
-	return append(existingAud, aud)
+	return r.Eventstore.FilterEvents(ctx, query)
 }
--- a/internal/auth/repository/eventsourcing/eventstore/user.go
+++ b/internal/auth/repository/eventsourcing/eventstore/user.go
@@ -2,6 +2,8 @@ package eventstore

 import (
 	"context"
+	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/golang/protobuf/ptypes"

 	"github.com/caos/zitadel/internal/config/systemdefaults"
 	key_model "github.com/caos/zitadel/internal/key/model"
@@ -12,25 +14,23 @@ import (
 	"github.com/caos/zitadel/internal/auth/repository/eventsourcing/view"
 	"github.com/caos/zitadel/internal/errors"
 	"github.com/caos/zitadel/internal/eventstore"
+	"github.com/caos/zitadel/internal/eventstore/models"
 	key_view_model "github.com/caos/zitadel/internal/key/repository/view/model"
-	org_event "github.com/caos/zitadel/internal/org/repository/eventsourcing"
 	"github.com/caos/zitadel/internal/telemetry/tracing"
 	"github.com/caos/zitadel/internal/user/model"
-	user_event "github.com/caos/zitadel/internal/user/repository/eventsourcing"
+	usr_view "github.com/caos/zitadel/internal/user/repository/view"
 	usr_view_model "github.com/caos/zitadel/internal/user/repository/view/model"
 )

 type UserRepo struct {
 	SearchLimit    uint64
 	Eventstore     eventstore.Eventstore
-	UserEvents     *user_event.UserEventstore
-	OrgEvents      *org_event.OrgEventstore
 	View           *view.View
 	SystemDefaults systemdefaults.SystemDefaults
 }

 func (repo *UserRepo) Health(ctx context.Context) error {
-	return repo.UserEvents.Health(ctx)
+	return repo.Eventstore.Health(ctx)
 }

 func (repo *UserRepo) MyUser(ctx context.Context) (*model.UserView, error) {
@@ -118,12 +118,15 @@ func (repo *UserRepo) MyUserMFAs(ctx context.Context) ([]*model.MultiFactor, err
 	return mfas, nil
 }

-func (repo *UserRepo) GetPasswordless(ctx context.Context, userID string) ([]*model.WebAuthNToken, error) {
-	return repo.UserEvents.GetPasswordless(ctx, userID)
-}
-
-func (repo *UserRepo) GetMyPasswordless(ctx context.Context) ([]*model.WebAuthNToken, error) {
-	return repo.UserEvents.GetPasswordless(ctx, authz.GetCtxData(ctx).UserID)
+func (repo *UserRepo) GetMyPasswordless(ctx context.Context) ([]*model.WebAuthNView, error) {
+	user, err := repo.UserByID(ctx, authz.GetCtxData(ctx).UserID)
+	if err != nil {
+		return nil, err
+	}
+	if user.HumanView == nil {
+		return nil, errors.ThrowPreconditionFailed(nil, "USER-9kF98", "Errors.User.NotHuman")
+	}
+	return user.HumanView.PasswordlessTokens, nil
 }

 func (repo *UserRepo) UserSessionUserIDsByAgentID(ctx context.Context, agentID string) ([]string, error) {
@@ -143,7 +146,7 @@ func (repo *UserRepo) UserByID(ctx context.Context, id string) (*model.UserView,
 	if err != nil {
 		return nil, err
 	}
-	events, err := repo.UserEvents.UserEventsByID(ctx, id, user.Sequence)
+	events, err := repo.getUserEvents(ctx, id, user.Sequence)
 	if err != nil {
 		logging.Log("EVENT-PSoc3").WithError(err).WithField("traceID", tracing.TraceIDFromCtx(ctx)).Debug("error retrieving new events")
 		return usr_view_model.UserToModel(user), nil
@@ -160,12 +163,16 @@ func (repo *UserRepo) UserByID(ctx context.Context, id string) (*model.UserView,
 	return usr_view_model.UserToModel(&userCopy), nil
 }

+func (repo *UserRepo) UserEventsByID(ctx context.Context, id string, sequence uint64) ([]*es_models.Event, error) {
+	return repo.getUserEvents(ctx, id, sequence)
+}
+
 func (repo *UserRepo) UserByLoginName(ctx context.Context, loginname string) (*model.UserView, error) {
 	user, err := repo.View.UserByLoginName(loginname)
 	if err != nil {
 		return nil, err
 	}
-	events, err := repo.UserEvents.UserEventsByID(ctx, user.ID, user.Sequence)
+	events, err := repo.getUserEvents(ctx, user.ID, user.Sequence)
 	if err != nil {
 		logging.Log("EVENT-PSoc3").WithError(err).WithField("traceID", tracing.TraceIDFromCtx(ctx)).Debug("error retrieving new events")
 		return usr_view_model.UserToModel(user), nil
@@ -182,19 +189,19 @@ func (repo *UserRepo) UserByLoginName(ctx context.Context, loginname string) (*m
 	return usr_view_model.UserToModel(&userCopy), nil
 }
 func (repo *UserRepo) MyUserChanges(ctx context.Context, lastSequence uint64, limit uint64, sortAscending bool) (*model.UserChanges, error) {
-	changes, err := repo.UserEvents.UserChanges(ctx, authz.GetCtxData(ctx).UserID, lastSequence, limit, sortAscending)
+	changes, err := repo.getUserChanges(ctx, authz.GetCtxData(ctx).UserID, lastSequence, limit, sortAscending)
 	if err != nil {
 		return nil, err
 	}
 	for _, change := range changes.Changes {
 		change.ModifierName = change.ModifierID
-		user, _ := repo.UserEvents.UserByID(ctx, change.ModifierID)
+		user, _ := repo.UserByID(ctx, change.ModifierID)
 		if user != nil {
-			if user.Human != nil {
+			if user.HumanView != nil {
 				change.ModifierName = user.DisplayName
 			}
-			if user.Machine != nil {
-				change.ModifierName = user.Machine.Name
+			if user.MachineView != nil {
+				change.ModifierName = user.MachineView.Name
 			}
 		}
 	}
@@ -208,3 +215,55 @@ func (repo *UserRepo) MachineKeyByID(ctx context.Context, keyID string) (*key_mo
 	}
 	return key_view_model.AuthNKeyToModel(key), nil
 }
+
+func (r *UserRepo) getUserChanges(ctx context.Context, userID string, lastSequence uint64, limit uint64, sortAscending bool) (*model.UserChanges, error) {
+	query := usr_view.ChangesQuery(userID, lastSequence, limit, sortAscending)
+
+	events, err := r.Eventstore.FilterEvents(ctx, query)
+	if err != nil {
+		logging.Log("EVENT-g9HCv").WithError(err).Warn("eventstore unavailable")
+		return nil, errors.ThrowInternal(err, "EVENT-htuG9", "Errors.Internal")
+	}
+	if len(events) == 0 {
+		return nil, errors.ThrowNotFound(nil, "EVENT-6cAxe", "Errors.User.NoChanges")
+	}
+
+	result := make([]*model.UserChange, len(events))
+
+	for i, event := range events {
+		creationDate, err := ptypes.TimestampProto(event.CreationDate)
+		logging.Log("EVENT-8GTGS").OnError(err).Debug("unable to parse timestamp")
+		change := &model.UserChange{
+			ChangeDate: creationDate,
+			EventType:  event.Type.String(),
+			ModifierID: event.EditorUser,
+			Sequence:   event.Sequence,
+		}
+
+		//TODO: now all types should be unmarshalled, e.g. password
+		// if len(event.Data) != 0 {
+		// 	user := new(model.User)
+		// 	err := json.Unmarshal(event.Data, user)
+		// 	logging.Log("EVENT-Rkg7X").OnError(err).Debug("unable to unmarshal data")
+		// 	change.Data = user
+		// }
+
+		result[i] = change
+		if lastSequence < event.Sequence {
+			lastSequence = event.Sequence
+		}
+	}
+
+	return &model.UserChanges{
+		Changes:      result,
+		LastSequence: lastSequence,
+	}, nil
+}
+
+func (r *UserRepo) getUserEvents(ctx context.Context, userID string, sequence uint64) ([]*models.Event, error) {
+	query, err := usr_view.UserByIDQuery(userID, sequence)
+	if err != nil {
+		return nil, err
+	}
+	return r.Eventstore.FilterEvents(ctx, query)
+}