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

event data search query

Browse Source
This commit is contained in:
adlerhurst
2020-11-23 19:31:12 +01:00
parent 6431fd2ec5
commit f8028f07d0
11 changed files with 148 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,6 +108,16 @@ func readModelToObjectRoot(readModel eventstore.ReadModel) models.ObjectRoot {
}
}
func writeModelToObjectRoot(readModel eventstore.WriteModel) models.ObjectRoot {
return models.ObjectRoot{
AggregateID: readModel.AggregateID,
// ChangeDate: readModel.ChangeDate,
// CreationDate: readModel.CreationDate,
ResourceOwner: readModel.ResourceOwner,
Sequence: readModel.ProcessedSequence,
}
}
func readModelToMember(readModel *member.ReadModel) *model.IAMMember {
return &model.IAMMember{
ObjectRoot: readModelToObjectRoot(readModel.ReadModel),
@@ -115,3 +125,11 @@ func readModelToMember(readModel *member.ReadModel) *model.IAMMember {
UserID: readModel.UserID,
}
}
func writeModelToMember(writeModel *iam.MemberWriteModel) *model.IAMMember {
return &model.IAMMember{
ObjectRoot: writeModelToObjectRoot(writeModel.WriteModel.WriteModel),
Roles: writeModel.Roles,
UserID: writeModel.UserID,
}
}

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

@@ -5,7 +5,9 @@ import (
"github.com/caos/zitadel/internal/errors"
caos_errs "github.com/caos/zitadel/internal/errors"
"github.com/caos/zitadel/internal/eventstore/v2"
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"
)
@@ -55,25 +57,20 @@ func (r *Repository) ChangeIAMMember(ctx context.Context, member *iam_model.IAMM
return nil, err
}
changedMember := *existingMember
changedMember.Roles = member.Roles
iam := iam_repo.AggregateFromWriteModel(&existingMember.WriteModel.WriteModel).
PushMemberChanged(ctx, existingMember, &changedMember)
PushMemberChangedFromExisting(ctx, existingMember, member.Roles...)
events, err := r.eventstore.PushAggregates(ctx, iam)
_, err = r.eventstore.PushAggregates(ctx, iam)
if err != nil {
return nil, err
}
if err = existingMember.AppendEvents(events...); err != nil {
return nil, err
}
if err = existingMember.Reduce(); err != nil {
updatedMember, err := r.MemberByID(ctx, member.AggregateID, member.UserID)
if err != nil {
return nil, err
}
return nil, nil
return readModelToMember(&updatedMember.ReadModel), nil
}
func (r *Repository) RemoveIAMMember(ctx context.Context, member *iam_model.IAMMember) error {
@@ -97,3 +94,22 @@ func (r *Repository) RemoveIAMMember(ctx context.Context, member *iam_model.IAMM
return iam.AppendAndReduce(events...)
}
func (r *Repository) MemberByID(ctx context.Context, iamID, userID string) (member *iam_repo.MemberReadModel, err error) {
ctx, span := tracing.NewSpan(ctx)
defer func() { span.EndWithError(err) }()
query := eventstore.NewSearchQueryFactory(eventstore.ColumnsEvent, iam_repo.AggregateType).
AggregateIDs(iamID).
EventData(map[string]interface{}{
"userId": userID,
})
member = new(iam_repo.MemberReadModel)
err = r.eventstore.FilterToReducer(ctx, query, member)
if err != nil {
return nil, err
}
return member, nil
}

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

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

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

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

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

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

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

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

31
internal/v2/repository/org/member.go
View File

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