event data search query

internal/v2/repository/iam/aggregate.go

@@ -3,7 +3,6 @@ package iam
 import (
 	"context"
 
-	"github.com/caos/logging"
 	"github.com/caos/zitadel/internal/eventstore/v2"
 )
 
@@ -59,13 +58,16 @@ func (a *Aggregate) PushMemberAdded(ctx context.Context, userID string, roles ..
 	return a
 }
 
-func (a *Aggregate) PushMemberChanged(ctx context.Context, current, changed *MemberWriteModel) *Aggregate {
-	e, err := NewMemberChangedEvent(ctx, current, changed)
+func (a *Aggregate) PushMemberChanged(ctx context.Context, changed *MemberWriteModel) *Aggregate {
+	a.Aggregate = *a.PushEvents(NewMemberChangedEvent(ctx, changed.UserID, changed.Roles...))
+	return a
+}
+
+func (a *Aggregate) PushMemberChangedFromExisting(ctx context.Context, current *MemberWriteModel, roles ...string) *Aggregate {
+	e, err := MemberChangedEventFromExisting(ctx, current, roles...)
 	if err != nil {
-		logging.Log("IAM-KH21C").OnError(err).Warn("unable to push member changed")
 		return a
 	}
-
 	a.Aggregate = *a.PushEvents(e)
 	return a
 }

internal/v2/repository/iam/member.go

@@ -86,19 +86,19 @@ func NewMemberAddedEvent(
 	}
 }
 
-func NewMemberChangedEvent(
+func MemberChangedEventFromExisting(
 	ctx context.Context,
-	current,
-	changed *MemberWriteModel,
+	current *MemberWriteModel,
+	roles ...string,
 ) (*MemberChangedEvent, error) {
 
-	m, err := member.NewChangedEvent(
+	m, err := member.ChangeEventFromExisting(
 		eventstore.NewBaseEventForPush(
 			ctx,
 			MemberChangedEventType,
 		),
 		&current.WriteModel,
-		&changed.WriteModel,
+		roles...,
 	)
 	if err != nil {
 		return nil, err
@@ -109,6 +109,24 @@ func NewMemberChangedEvent(
 	}, nil
 }
 
+func NewMemberChangedEvent(
+	ctx context.Context,
+	userID string,
+	roles ...string,
+) *MemberChangedEvent {
+
+	return &MemberChangedEvent{
+		ChangedEvent: *member.NewChangedEvent(
+			eventstore.NewBaseEventForPush(
+				ctx,
+				MemberChangedEventType,
+			),
+			userID,
+			roles...,
+		),
+	}
+}
+
 func NewMemberRemovedEvent(
 	ctx context.Context,
 	userID string,

internal/v2/repository/member/event_changed.go

@@ -31,25 +31,21 @@ func (e *ChangedEvent) Data() interface{} {
 	return e
 }
 
-func NewChangedEvent(
+func ChangeEventFromExisting(
 	base *eventstore.BaseEvent,
-	current,
-	changed *WriteModel,
+	current *WriteModel,
+	roles ...string,
 ) (*ChangedEvent, error) {
 
 	change := &ChangedEvent{
 		BaseEvent: *base,
-	}
-
-	if current.UserID != changed.UserID {
-		change.UserID = changed.UserID
-		change.hasChanged = true
+		UserID:    current.UserID,
 	}
 
 	sort.Strings(current.Roles)
-	sort.Strings(changed.Roles)
-	if !reflect.DeepEqual(current.Roles, changed.Roles) {
-		change.Roles = changed.Roles
+	sort.Strings(roles)
+	if !reflect.DeepEqual(current.Roles, roles) {
+		change.Roles = roles
 		change.hasChanged = true
 	}
 
@@ -58,7 +54,19 @@ func NewChangedEvent(
 	}
 
 	return change, nil
+}
 
+func NewChangedEvent(
+	base *eventstore.BaseEvent,
+	userID string,
+	roles ...string,
+) *ChangedEvent {
+
+	return &ChangedEvent{
+		BaseEvent: *base,
+		UserID:    userID,
+		Roles:     roles,
+	}
 }
 
 func ChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) {

internal/v2/repository/member/write_model.go

@@ -48,6 +48,9 @@ func (wm *WriteModel) Reduce() error {
 			wm.UserID = e.UserID
 			wm.Roles = e.Roles
 		case *RemovedEvent:
+			if e.UserID != wm.userID {
+				continue
+			}
 			wm.Roles = nil
 			wm.IsRemoved = true
 		}

internal/v2/repository/org/member.go

@@ -92,28 +92,47 @@ func NewMemberAddedEvent(
 	}
 }
 
-func NewMemberChangedEvent(
+func MemberChangedEventFromExisting(
 	ctx context.Context,
-	current,
-	changed *MemberWriteModel,
+	current *MemberWriteModel,
+	roles ...string,
 ) (*MemberChangedEvent, error) {
 
-	event, err := member.NewChangedEvent(
+	m, err := member.ChangeEventFromExisting(
 		eventstore.NewBaseEventForPush(
 			ctx,
 			MemberChangedEventType,
 		),
 		&current.WriteModel,
-		&changed.WriteModel,
+		roles...,
 	)
 	if err != nil {
 		return nil, err
 	}
+
 	return &MemberChangedEvent{
-		ChangedEvent: *event,
+		ChangedEvent: *m,
 	}, nil
 }
 
+func NewMemberChangedEvent(
+	ctx context.Context,
+	userID string,
+	roles ...string,
+) *MemberChangedEvent {
+
+	return &MemberChangedEvent{
+		ChangedEvent: *member.NewChangedEvent(
+			eventstore.NewBaseEventForPush(
+				ctx,
+				MemberChangedEventType,
+			),
+			userID,
+			roles...,
+		),
+	}
+}
+
 func NewMemberRemovedEvent(
 	ctx context.Context,
 	userID string,