member

internal/v2/repository/member/event_added.go

@@ -1,39 +1,37 @@
 package member
 
 import (
-	"context"
-
 	"github.com/caos/zitadel/internal/eventstore/v2"
 )
 
-type MemberAddedEvent struct {
+const (
+	AddedEventType = "member.added"
+)
+
+type AddedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 
 	Roles  []string `json:"roles"`
 	UserID string   `json:"userId"`
 }
 
-func (e *MemberAddedEvent) CheckPrevious() bool {
+func (e *AddedEvent) CheckPrevious() bool {
 	return true
 }
 
-func (e *MemberAddedEvent) Data() interface{} {
+func (e *AddedEvent) Data() interface{} {
 	return e
 }
 
 func NewMemberAddedEvent(
-	ctx context.Context,
-	eventType eventstore.EventType,
+	base *eventstore.BaseEvent,
 	userID string,
 	roles ...string,
-) *MemberAddedEvent {
+) *AddedEvent {
 
-	return &MemberAddedEvent{
-		BaseEvent: *eventstore.NewBaseEventForPush(
-			ctx,
-			eventType,
-		),
-		Roles:  roles,
-		UserID: userID,
+	return &AddedEvent{
+		BaseEvent: *base,
+		Roles:     roles,
+		UserID:    userID,
 	}
 }

internal/v2/repository/member/event_changed.go

@@ -1,39 +1,37 @@
 package member
 
 import (
-	"context"
-
 	"github.com/caos/zitadel/internal/eventstore/v2"
 )
 
-type MemberChangedEvent struct {
+const (
+	ChangedEventType = "member.changed"
+)
+
+type ChangedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 
 	Roles  []string `json:"roles"`
 	UserID string   `json:"userId"`
 }
 
-func (e *MemberChangedEvent) CheckPrevious() bool {
+func (e *ChangedEvent) CheckPrevious() bool {
 	return true
 }
 
-func (e *MemberChangedEvent) Data() interface{} {
+func (e *ChangedEvent) Data() interface{} {
 	return e
 }
 
 func NewMemberChangedEvent(
-	ctx context.Context,
-	eventType eventstore.EventType,
+	base *eventstore.BaseEvent,
 	userID string,
 	roles ...string,
-) *MemberChangedEvent {
+) *ChangedEvent {
 
-	return &MemberChangedEvent{
-		BaseEvent: *eventstore.NewBaseEventForPush(
-			ctx,
-			eventType,
-		),
-		Roles:  roles,
-		UserID: userID,
+	return &ChangedEvent{
+		BaseEvent: *base,
+		Roles:     roles,
+		UserID:    userID,
 	}
 }

internal/v2/repository/member/event_removed.go

@@ -1,36 +1,34 @@
 package member
 
 import (
-	"context"
-
 	"github.com/caos/zitadel/internal/eventstore/v2"
 )
 
-type MemberRemovedEvent struct {
+const (
+	RemovedEventType = "member.removed"
+)
+
+type RemovedEvent struct {
 	eventstore.BaseEvent `json:"-"`
 
 	UserID string `json:"userId"`
 }
 
-func (e *MemberRemovedEvent) CheckPrevious() bool {
+func (e *RemovedEvent) CheckPrevious() bool {
 	return true
 }
 
-func (e *MemberRemovedEvent) Data() interface{} {
+func (e *RemovedEvent) Data() interface{} {
 	return e
 }
 
 func NewMemberRemovedEvent(
-	ctx context.Context,
-	eventType eventstore.EventType,
+	base *eventstore.BaseEvent,
 	userID string,
-) *MemberRemovedEvent {
+) *RemovedEvent {
 
-	return &MemberRemovedEvent{
-		BaseEvent: *eventstore.NewBaseEventForPush(
-			ctx,
-			eventType,
-		),
-		UserID: userID,
+	return &RemovedEvent{
+		BaseEvent: *base,
+		UserID:    userID,
 	}
 }

internal/v2/repository/member/read_model.go

@@ -0,0 +1,30 @@
+package member
+
+import "github.com/caos/zitadel/internal/eventstore/v2"
+
+type ReadModel struct {
+	eventstore.ReadModel
+
+	UserID string
+	Roles  []string
+}
+
+func NewMemberReadModel(userID string) *ReadModel {
+	return &ReadModel{
+		ReadModel: *eventstore.NewReadModel(),
+	}
+}
+
+func (rm *ReadModel) Reduce() error {
+	for _, event := range rm.Events {
+		switch e := event.(type) {
+		case *AddedEvent:
+			rm.UserID = e.UserID
+			rm.Roles = e.Roles
+		case *ChangedEvent:
+			rm.UserID = e.UserID
+			rm.Roles = e.Roles
+		}
+	}
+	return rm.ReadModel.Reduce()
+}

internal/v2/repository/member/read_models.go

@@ -1,84 +0,0 @@
-package member
-
-import "github.com/caos/zitadel/internal/eventstore/v2"
-
-type MemberReadModel struct {
-	eventstore.ReadModel
-
-	UserID string
-	Roles  []string
-}
-
-func NewMemberReadModel(userID string) *MemberReadModel {
-	return &MemberReadModel{
-		ReadModel: *eventstore.NewReadModel(),
-	}
-}
-
-func (rm *MemberReadModel) Reduce() error {
-	for _, event := range rm.Events {
-		switch e := event.(type) {
-		case *MemberAddedEvent:
-			rm.UserID = e.UserID
-			rm.Roles = e.Roles
-		case *MemberChangedEvent:
-			rm.UserID = e.UserID
-			rm.Roles = e.Roles
-		}
-	}
-	return rm.ReadModel.Reduce()
-}
-
-type MembersReadModel struct {
-	eventstore.ReadModel
-	Members []*MemberReadModel
-}
-
-func NewMembersReadModel() *MembersReadModel {
-	return &MembersReadModel{
-		ReadModel: *eventstore.NewReadModel(),
-		Members:   []*MemberReadModel{},
-	}
-}
-
-func (rm *MembersReadModel) MemberByUserID(id string) (idx int, member *MemberReadModel) {
-	for idx, member = range rm.Members {
-		if member.UserID == id {
-			return idx, member
-		}
-	}
-	return -1, nil
-}
-
-func (rm *MembersReadModel) AppendEvents(events ...eventstore.EventReader) (err error) {
-	for _, event := range events {
-		switch e := event.(type) {
-		case *MemberAddedEvent:
-			member := NewMemberReadModel(e.UserID)
-			rm.Members = append(rm.Members, member)
-			member.AppendEvents(e)
-		case *MemberChangedEvent:
-			_, member := rm.MemberByUserID(e.UserID)
-			member.AppendEvents(e)
-		case *MemberRemovedEvent:
-			idx, _ := rm.MemberByUserID(e.UserID)
-			if idx < 0 {
-				return nil
-			}
-			copy(rm.Members[idx:], rm.Members[idx+1:])
-			rm.Members[len(rm.Members)-1] = nil
-			rm.Members = rm.Members[:len(rm.Members)-1]
-		}
-	}
-	return err
-}
-
-func (rm *MembersReadModel) Reduce() (err error) {
-	for _, member := range rm.Members {
-		err = member.Reduce()
-		if err != nil {
-			return err
-		}
-	}
-	return rm.ReadModel.Reduce()
-}