write model

internal/v2/repository/iam/aggregate.go

@@ -21,8 +21,6 @@ type Aggregate struct {
 
 	SetUpStarted Step
 	SetUpDone    Step
-
-	Members MembersAggregate
 }
 
 func NewAggregate(
@@ -42,6 +40,12 @@ func NewAggregate(
 	}
 }
 
+func AggregateFromWriteModel(wm *eventstore.WriteModel) *Aggregate {
+	return &Aggregate{
+		Aggregate: *eventstore.AggregateFromWriteModel(wm, AggregateType, AggregateVersion),
+	}
+}
+
 func AggregateFromReadModel(rm *ReadModel) *Aggregate {
 	return &Aggregate{
 		Aggregate:    *eventstore.NewAggregate(rm.AggregateID, AggregateType, rm.ResourceOwner, AggregateVersion, rm.ProcessedSequence),

internal/v2/repository/iam/member.go

@@ -31,6 +31,32 @@ func (rm *MemberReadModel) AppendEvents(events ...eventstore.EventReader) (err e
 	return nil
 }
 
+type MemberWriteModel struct {
+	member.WriteModel
+}
+
+func PrepareMemberWriteModel(iamID, userID string) *MemberWriteModel {
+	return &MemberWriteModel{
+		WriteModel: *member.PrepareWriteModel(userID, AggregateType, iamID),
+	}
+}
+
+func (wm *MemberWriteModel) AppendEvents(events ...eventstore.EventReader) (err error) {
+	for _, event := range events {
+		switch e := event.(type) {
+		case *MemberAddedEvent:
+			wm.WriteModel.AppendEvents(&e.AddedEvent)
+		case *MemberChangedEvent:
+			wm.WriteModel.AppendEvents(&e.ChangedEvent)
+		case *MemberRemovedEvent:
+			wm.WriteModel.AppendEvents(&e.RemovedEvent)
+		default:
+			wm.WriteModel.AppendEvents(e)
+		}
+	}
+	return nil
+}
+
 type MemberAddedEvent struct {
 	member.AddedEvent
 }
@@ -63,7 +89,7 @@ func NewMemberAddedEvent(
 func NewMemberChangedEvent(
 	ctx context.Context,
 	current,
-	changed *MemberAggregate,
+	changed *MemberWriteModel,
 ) (*MemberChangedEvent, error) {
 
 	m, err := member.NewChangedEvent(

internal/v2/repository/iam/members.go

@@ -6,10 +6,6 @@ import (
 	"github.com/caos/zitadel/internal/v2/repository/members"
 )
 
-type MembersAggregate struct {
-	members.Aggregate
-}
-
 type MembersReadModel struct {
 	members.ReadModel
 }

internal/v2/repository/member/event_changed.go

@@ -34,7 +34,7 @@ func (e *ChangedEvent) Data() interface{} {
 func NewChangedEvent(
 	base *eventstore.BaseEvent,
 	current,
-	changed *Aggregate,
+	changed *WriteModel,
 ) (*ChangedEvent, error) {
 
 	change := &ChangedEvent{

internal/v2/repository/member/write_model.go

@@ -8,21 +8,54 @@ import "github.com/caos/zitadel/internal/eventstore/v2"
 type WriteModel struct {
 	eventstore.WriteModel
 
-	UserID string
-	Roles  []string
+	UserID    string
+	Roles     []string
+	IsRemoved bool
+
+	userID        string
+	aggregateType eventstore.AggregateType
+	aggregateID   string
+}
+
+func PrepareWriteModel(
+	userID string,
+	aggregateType eventstore.AggregateType,
+	aggregateID string,
+) *WriteModel {
+
+	return &WriteModel{
+		WriteModel:    *eventstore.NewWriteModel(),
+		userID:        userID,
+		aggregateType: aggregateType,
+		aggregateID:   aggregateID,
+	}
 }
 
 //Reduce extends eventstore.ReadModel
-func (rm *WriteModel) Reduce() error {
-	for _, event := range rm.Events {
+func (wm *WriteModel) Reduce() error {
+	for _, event := range wm.Events {
 		switch e := event.(type) {
 		case *AddedEvent:
-			rm.UserID = e.UserID
-			rm.Roles = e.Roles
+			if e.UserID != wm.userID {
+				continue
+			}
+			wm.UserID = e.UserID
+			wm.Roles = e.Roles
 		case *ChangedEvent:
-			rm.UserID = e.UserID
-			rm.Roles = e.Roles
+			if e.UserID != wm.userID {
+				continue
+			}
+			wm.UserID = e.UserID
+			wm.Roles = e.Roles
+		case *RemovedEvent:
+			wm.Roles = nil
+			wm.IsRemoved = true
 		}
 	}
-	return rm.ReadModel.Reduce()
+	return wm.WriteModel.Reduce()
+}
+
+func (wm *WriteModel) Query() *eventstore.SearchQueryFactory {
+	return eventstore.NewSearchQueryFactory(eventstore.ColumnsEvent, wm.aggregateType).
+		AggregateIDs(wm.aggregateID)
 }