TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 21:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

write model

Browse Source
This commit is contained in:
adlerhurst
2020-11-23 11:36:58 +01:00
parent 20f4fa56c5
commit 4aadd290f4
14 changed files with 151 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/v2/business/iam/converter.go
View File

@@ -115,7 +115,3 @@ func readModelToMember(readModel *member.ReadModel) *model.IAMMember {
UserID: readModel.UserID,
}
}
func writeModelFromMember(member *model.IAMMember) *member.WriteModel {
return &member.WriteModel{}
}

27
internal/v2/business/iam/member.go
View File

@@ -43,38 +43,37 @@ func (r *Repository) AddIAMMember(ctx context.Context, member *iam_model.IAMMemb
return readModelToMember(addedMember), nil
}
//ChangeIAMMember updates an existing member
//TODO: refactor to ChangeMember
func (r *Repository) ChangeIAMMember(ctx context.Context, member *iam_model.IAMMember) (*iam_model.IAMMember, error) {
if !member.IsValid() {
return nil, caos_errs.ThrowPreconditionFailed(nil, "IAM-LiaZi", "Errors.IAM.MemberInvalid")
}
iam, err := r.iamByID(ctx, member.AggregateID)
if err != nil {
return nil, err
}
existingMember, err := r.memberWriteModelByID(ctx, member.AggregateID, member.UserID)
if err != nil {
return nil, err
}
iamAgg := iam_repo.AggregateFromReadModel(iam).
PushMemberChanged(ctx, existingMember, nil)
changedMember := *existingMember
changedMember.Roles = member.Roles
events, err := r.eventstore.PushAggregates(ctx, iamAgg)
iam := iam_repo.AggregateFromWriteModel(&existingMember.WriteModel.WriteModel).
PushMemberChanged(ctx, existingMember, &changedMember)
events, err := r.eventstore.PushAggregates(ctx, iam)
if err != nil {
return nil, err
}
if err = iam.AppendAndReduce(events...); err != nil {
if err = existingMember.AppendEvents(events...); err != nil {
return nil, err
}
if err = existingMember.Reduce(); err != nil {
return nil, err
}
_, addedMember := iam.Members.MemberByUserID(member.UserID)
if member == nil {
return nil, errors.ThrowInternal(nil, "IAM-E5nTQ", "member not saved")
}
return readModelToMember(addedMember), nil
return nil, nil
}
func (r *Repository) RemoveIAMMember(ctx context.Context, member *iam_model.IAMMember) error {

41
internal/v2/business/iam/repository.go
View File

@@ -8,7 +8,6 @@ import (
iam_model "github.com/caos/zitadel/internal/iam/model"
"github.com/caos/zitadel/internal/tracing"
iam_repo "github.com/caos/zitadel/internal/v2/repository/iam"
"github.com/caos/zitadel/internal/v2/repository/member"
)
type Repository struct {
@@ -53,47 +52,15 @@ func (r *Repository) memberWriteModelByID(ctx context.Context, iamID, userID str
ctx, span := tracing.NewSpan(ctx)
defer func() { span.EndWithError(err) }()
query := eventstore.NewSearchQueryFactory(eventstore.ColumnsEvent, iam_repo.AggregateType).AggregateIDs(iamID)
writeModel := new(memberWriteModel)
err = r.eventstore.FilterToReducer(ctx, query, writeModel)
writeModel := iam_repo.PrepareMemberWriteModel(iamID, userID)
err = r.eventstore.FilterToQueryReducer(ctx, writeModel)
if err != nil {
return nil, err
}
if writeModel.isDeleted {
if writeModel.IsRemoved {
return nil, errors.ThrowNotFound(nil, "IAM-D8JxR", "Errors.NotFound")
}
return &writeModel.MemberWriteModel, nil
}
type memberWriteModel struct {
iam_repo.MemberWriteModel
userID string
isDeleted bool
}
func (wm *memberWriteModel) AppendEvents(events ...eventstore.EventReader) error {
for _, event := range events {
switch e := event.(type) {
case *member.AddedEvent:
if e.UserID == wm.userID {
wm.isDeleted = false
wm.MemberWriteModel.AppendEvents(event)
}
case *member.ChangedEvent:
if e.UserID == wm.userID {
wm.MemberWriteModel.AppendEvents(event)
}
case *member.RemovedEvent:
if e.UserID == wm.userID {
wm.isDeleted = true
wm.MemberWriteModel = iam_repo.MemberWriteModel{}
}
}
}
return nil
return writeModel, nil
}

8
internal/v2/repository/iam/aggregate.go
View File

@@ -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),

28
internal/v2/repository/iam/member.go
View File

@@ -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(

4
internal/v2/repository/iam/members.go
View File

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

2
internal/v2/repository/member/event_changed.go
View File

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

51
internal/v2/repository/member/write_model.go
View File

@@ -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)
}