From f6cdcee77a494c9ad93142dd236bf6dc35cd1e8b Mon Sep 17 00:00:00 2001 From: adlerhurst Date: Wed, 25 Nov 2020 14:12:44 +0100 Subject: [PATCH] append events without return value --- internal/eventstore/v2/eventstore.go | 11 +++----- internal/eventstore/v2/write_model.go | 4 +++ internal/v2/business/iam/member.go | 4 ++- internal/v2/business/iam/repository.go | 8 +++--- internal/v2/repository/iam/aggregate.go | 16 ++++++++---- internal/v2/repository/iam/member.go | 25 +++++++++---------- internal/v2/repository/iam/members.go | 3 +-- internal/v2/repository/iam/policy_label.go | 3 +-- internal/v2/repository/iam/policy_login.go | 3 +-- internal/v2/repository/iam/policy_org_iam.go | 3 +-- .../v2/repository/iam/policy_password_age.go | 3 +-- .../iam/policy_password_complexity.go | 3 +-- .../repository/iam/policy_password_lockout.go | 3 +-- internal/v2/repository/iam/read_model.go | 15 +++++++++-- internal/v2/repository/idp/config.go | 4 +-- internal/v2/repository/idp/oidc/config.go | 4 +-- .../v2/repository/member/event_changed.go | 5 +--- internal/v2/repository/member/write_model.go | 2 +- internal/v2/repository/members/read_models.go | 5 ++-- internal/v2/repository/org/member.go | 6 ++--- internal/v2/repository/org/policy_label.go | 3 +-- internal/v2/repository/org/policy_login.go | 3 +-- internal/v2/repository/org/policy_org_iam.go | 3 +-- .../v2/repository/org/policy_password_age.go | 3 +-- .../org/policy_password_complexity.go | 3 +-- .../repository/org/policy_password_lockout.go | 3 +-- internal/v2/view/iam.go | 3 +-- 27 files changed, 73 insertions(+), 78 deletions(-) diff --git a/internal/eventstore/v2/eventstore.go b/internal/eventstore/v2/eventstore.go index 43328cb53..077a01764 100644 --- a/internal/eventstore/v2/eventstore.go +++ b/internal/eventstore/v2/eventstore.go @@ -142,7 +142,7 @@ type reducer interface { // it only appends the newly added events Reduce() error //AppendEvents appends the passed events to an internal list of events - AppendEvents(...EventReader) error + AppendEvents(...EventReader) } //FilterToReducer filters the events based on the search query, appends all events to the reducer and calls it's reduce function @@ -151,9 +151,8 @@ func (es *Eventstore) FilterToReducer(ctx context.Context, searchQuery *SearchQu if err != nil { return err } - if err = r.AppendEvents(events...); err != nil { - return err - } + + r.AppendEvents(events...) return r.Reduce() } @@ -180,9 +179,7 @@ func (es *Eventstore) FilterToQueryReducer(ctx context.Context, r queryReducer) if err != nil { return err } - if err = r.AppendEvents(events...); err != nil { - return err - } + r.AppendEvents(events...) return r.Reduce() } diff --git a/internal/eventstore/v2/write_model.go b/internal/eventstore/v2/write_model.go index 7c03eed2c..e79958f00 100644 --- a/internal/eventstore/v2/write_model.go +++ b/internal/eventstore/v2/write_model.go @@ -1,5 +1,7 @@ package eventstore +import "time" + func NewWriteModel() *WriteModel { return &WriteModel{ Events: []EventReader{}, @@ -14,6 +16,7 @@ type WriteModel struct { ProcessedSequence uint64 `json:"-"` Events []EventReader `json:"-"` ResourceOwner string `json:"-"` + ChangeDate time.Time `json:"-"` } //AppendEvents adds all the events to the read model. @@ -38,6 +41,7 @@ func (wm *WriteModel) Reduce() error { } wm.ProcessedSequence = wm.Events[len(wm.Events)-1].Sequence() + wm.ChangeDate = wm.Events[len(wm.Events)-1].CreationDate() // all events processed and not needed anymore wm.Events = nil diff --git a/internal/v2/business/iam/member.go b/internal/v2/business/iam/member.go index e316c30dc..2fd93373d 100644 --- a/internal/v2/business/iam/member.go +++ b/internal/v2/business/iam/member.go @@ -60,11 +60,13 @@ func (r *Repository) ChangeIAMMember(ctx context.Context, member *iam_model.IAMM iam := iam_repo.AggregateFromWriteModel(&existingMember.WriteModel.WriteModel). PushMemberChangedFromExisting(ctx, existingMember, member.Roles...) - _, err = r.eventstore.PushAggregates(ctx, iam) + events, err := r.eventstore.PushAggregates(ctx, iam) if err != nil { return nil, err } + existingMember.AppendEvents(events...) + updatedMember, err := r.MemberByID(ctx, member.AggregateID, member.UserID) if err != nil { return nil, err diff --git a/internal/v2/business/iam/repository.go b/internal/v2/business/iam/repository.go index a21dd9bfc..1bf5e9afe 100644 --- a/internal/v2/business/iam/repository.go +++ b/internal/v2/business/iam/repository.go @@ -37,10 +37,8 @@ func (r *Repository) iamByID(ctx context.Context, id string) (_ *iam_repo.ReadMo ctx, span := tracing.NewSpan(ctx) defer func() { span.EndWithError(err) }() - query := eventstore.NewSearchQueryFactory(eventstore.ColumnsEvent, iam_repo.AggregateType).AggregateIDs(id) - - readModel := new(iam_repo.ReadModel) - err = r.eventstore.FilterToReducer(ctx, query, readModel) + readModel := iam_repo.NewReadModel(id) + err = r.eventstore.FilterToQueryReducer(ctx, readModel) if err != nil { return nil, err } @@ -52,7 +50,7 @@ func (r *Repository) memberWriteModelByID(ctx context.Context, iamID, userID str ctx, span := tracing.NewSpan(ctx) defer func() { span.EndWithError(err) }() - writeModel := iam_repo.PrepareMemberWriteModel(iamID, userID) + writeModel := iam_repo.NewMemberReadModel(iamID, userID) err = r.eventstore.FilterToQueryReducer(ctx, writeModel) if err != nil { return nil, err diff --git a/internal/v2/repository/iam/aggregate.go b/internal/v2/repository/iam/aggregate.go index fc7fd590a..c07395b50 100644 --- a/internal/v2/repository/iam/aggregate.go +++ b/internal/v2/repository/iam/aggregate.go @@ -18,8 +18,8 @@ const ( type Aggregate struct { eventstore.Aggregate - SetUpStarted Step - SetUpDone Step + // SetUpStarted Step + // SetUpDone Step } func NewAggregate( @@ -47,9 +47,15 @@ func AggregateFromWriteModel(wm *eventstore.WriteModel) *Aggregate { func AggregateFromReadModel(rm *ReadModel) *Aggregate { return &Aggregate{ - Aggregate: *eventstore.NewAggregate(rm.AggregateID, AggregateType, rm.ResourceOwner, AggregateVersion, rm.ProcessedSequence), - SetUpDone: rm.SetUpDone, - SetUpStarted: rm.SetUpStarted, + Aggregate: *eventstore.NewAggregate( + rm.AggregateID, + AggregateType, + rm.ResourceOwner, + AggregateVersion, + rm.ProcessedSequence, + ), + // SetUpDone: rm.SetUpDone, + // SetUpStarted: rm.SetUpStarted, } } diff --git a/internal/v2/repository/iam/member.go b/internal/v2/repository/iam/member.go index 1014f2488..ee2fc9f8c 100644 --- a/internal/v2/repository/iam/member.go +++ b/internal/v2/repository/iam/member.go @@ -17,7 +17,7 @@ type MemberReadModel struct { member.ReadModel } -func (rm *MemberReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *MemberReadModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *MemberAddedEvent: @@ -28,20 +28,19 @@ func (rm *MemberReadModel) AppendEvents(events ...eventstore.EventReader) (err e rm.ReadModel.AppendEvents(e) } } - return nil } type MemberWriteModel struct { member.WriteModel } -func PrepareMemberWriteModel(iamID, userID string) *MemberWriteModel { +func NewMemberReadModel(iamID, userID string) *MemberWriteModel { return &MemberWriteModel{ - WriteModel: *member.PrepareWriteModel(userID, AggregateType, iamID), + WriteModel: *member.NewWriteModel(userID, AggregateType, iamID), } } -func (wm *MemberWriteModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (wm *MemberWriteModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *MemberAddedEvent: @@ -54,20 +53,12 @@ func (wm *MemberWriteModel) AppendEvents(events ...eventstore.EventReader) (err wm.WriteModel.AppendEvents(e) } } - return nil } type MemberAddedEvent struct { member.AddedEvent } -type MemberChangedEvent struct { - member.ChangedEvent -} -type MemberRemovedEvent struct { - member.RemovedEvent -} - func NewMemberAddedEvent( ctx context.Context, userID string, @@ -86,6 +77,10 @@ func NewMemberAddedEvent( } } +type MemberChangedEvent struct { + member.ChangedEvent +} + func MemberChangedEventFromExisting( ctx context.Context, current *MemberWriteModel, @@ -127,6 +122,10 @@ func NewMemberChangedEvent( } } +type MemberRemovedEvent struct { + member.RemovedEvent +} + func NewMemberRemovedEvent( ctx context.Context, userID string, diff --git a/internal/v2/repository/iam/members.go b/internal/v2/repository/iam/members.go index fe9d6c6e0..21212ce7c 100644 --- a/internal/v2/repository/iam/members.go +++ b/internal/v2/repository/iam/members.go @@ -10,7 +10,7 @@ type MembersReadModel struct { members.ReadModel } -func (rm *MembersReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *MembersReadModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *MemberAddedEvent: @@ -23,5 +23,4 @@ func (rm *MembersReadModel) AppendEvents(events ...eventstore.EventReader) (err rm.ReadModel.AppendEvents(e) } } - return nil } diff --git a/internal/v2/repository/iam/policy_label.go b/internal/v2/repository/iam/policy_label.go index 42ae7c4fb..b4124f475 100644 --- a/internal/v2/repository/iam/policy_label.go +++ b/internal/v2/repository/iam/policy_label.go @@ -12,7 +12,7 @@ var ( type LabelPolicyReadModel struct{ policy.LabelPolicyReadModel } -func (rm *LabelPolicyReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *LabelPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *LabelPolicyAddedEvent: @@ -23,7 +23,6 @@ func (rm *LabelPolicyReadModel) AppendEvents(events ...eventstore.EventReader) ( rm.ReadModel.AppendEvents(e) } } - return nil } type LabelPolicyAddedEvent struct { diff --git a/internal/v2/repository/iam/policy_login.go b/internal/v2/repository/iam/policy_login.go index bfbcdb188..bf1ef6a40 100644 --- a/internal/v2/repository/iam/policy_login.go +++ b/internal/v2/repository/iam/policy_login.go @@ -12,7 +12,7 @@ var ( type LoginPolicyReadModel struct{ policy.LoginPolicyReadModel } -func (rm *LoginPolicyReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *LoginPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *LoginPolicyAddedEvent: @@ -23,7 +23,6 @@ func (rm *LoginPolicyReadModel) AppendEvents(events ...eventstore.EventReader) ( rm.ReadModel.AppendEvents(e) } } - return nil } type LoginPolicyAddedEvent struct { diff --git a/internal/v2/repository/iam/policy_org_iam.go b/internal/v2/repository/iam/policy_org_iam.go index 2db0950eb..40dbd03d2 100644 --- a/internal/v2/repository/iam/policy_org_iam.go +++ b/internal/v2/repository/iam/policy_org_iam.go @@ -11,7 +11,7 @@ var ( type OrgIAMPolicyReadModel struct{ policy.OrgIAMPolicyReadModel } -func (rm *OrgIAMPolicyReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *OrgIAMPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *OrgIAMPolicyAddedEvent: @@ -20,7 +20,6 @@ func (rm *OrgIAMPolicyReadModel) AppendEvents(events ...eventstore.EventReader) rm.ReadModel.AppendEvents(e) } } - return nil } type OrgIAMPolicyAddedEvent struct { diff --git a/internal/v2/repository/iam/policy_password_age.go b/internal/v2/repository/iam/policy_password_age.go index 03d9ecab8..2ca7e0119 100644 --- a/internal/v2/repository/iam/policy_password_age.go +++ b/internal/v2/repository/iam/policy_password_age.go @@ -14,7 +14,7 @@ type PasswordAgePolicyReadModel struct { policy.PasswordAgePolicyReadModel } -func (rm *PasswordAgePolicyReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *PasswordAgePolicyReadModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *PasswordAgePolicyAddedEvent: @@ -25,7 +25,6 @@ func (rm *PasswordAgePolicyReadModel) AppendEvents(events ...eventstore.EventRea rm.ReadModel.AppendEvents(e) } } - return nil } type PasswordAgePolicyAddedEvent struct { diff --git a/internal/v2/repository/iam/policy_password_complexity.go b/internal/v2/repository/iam/policy_password_complexity.go index ef8e9a936..e3f3142a8 100644 --- a/internal/v2/repository/iam/policy_password_complexity.go +++ b/internal/v2/repository/iam/policy_password_complexity.go @@ -14,7 +14,7 @@ type PasswordComplexityPolicyReadModel struct { policy.PasswordComplexityPolicyReadModel } -func (rm *PasswordComplexityPolicyReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *PasswordComplexityPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *PasswordComplexityPolicyAddedEvent: @@ -25,7 +25,6 @@ func (rm *PasswordComplexityPolicyReadModel) AppendEvents(events ...eventstore.E rm.ReadModel.AppendEvents(e) } } - return nil } type PasswordComplexityPolicyAddedEvent struct { diff --git a/internal/v2/repository/iam/policy_password_lockout.go b/internal/v2/repository/iam/policy_password_lockout.go index 17339e7d6..1aeadb285 100644 --- a/internal/v2/repository/iam/policy_password_lockout.go +++ b/internal/v2/repository/iam/policy_password_lockout.go @@ -14,7 +14,7 @@ type PasswordLockoutPolicyReadModel struct { policy.PasswordLockoutPolicyReadModel } -func (rm *PasswordLockoutPolicyReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *PasswordLockoutPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *PasswordLockoutPolicyAddedEvent: @@ -25,7 +25,6 @@ func (rm *PasswordLockoutPolicyReadModel) AppendEvents(events ...eventstore.Even rm.ReadModel.AppendEvents(e) } } - return nil } type PasswordLockoutPolicyAddedEvent struct { diff --git a/internal/v2/repository/iam/read_model.go b/internal/v2/repository/iam/read_model.go index 66170822c..823ef9aac 100644 --- a/internal/v2/repository/iam/read_model.go +++ b/internal/v2/repository/iam/read_model.go @@ -25,7 +25,15 @@ type ReadModel struct { DefaultPasswordLockoutPolicy PasswordLockoutPolicyReadModel } -func (rm *ReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func NewReadModel(id string) *ReadModel { + return &ReadModel{ + ReadModel: eventstore.ReadModel{ + AggregateID: id, + }, + } +} + +func (rm *ReadModel) AppendEvents(events ...eventstore.EventReader) { rm.ReadModel.AppendEvents(events...) for _, event := range events { switch event.(type) { @@ -45,7 +53,6 @@ func (rm *ReadModel) AppendEvents(events ...eventstore.EventReader) (err error) rm.DefaultPasswordLockoutPolicy.AppendEvents(event) } } - return err } func (rm *ReadModel) Reduce() (err error) { @@ -87,3 +94,7 @@ func (rm *ReadModel) AppendAndReduce(events ...eventstore.EventReader) error { } return rm.Reduce() } + +func (rm *ReadModel) Query() *eventstore.SearchQueryFactory { + return eventstore.NewSearchQueryFactory(eventstore.ColumnsEvent, AggregateType).AggregateIDs(rm.AggregateID) +} diff --git a/internal/v2/repository/idp/config.go b/internal/v2/repository/idp/config.go index 372bd5b86..8683ff17f 100644 --- a/internal/v2/repository/idp/config.go +++ b/internal/v2/repository/idp/config.go @@ -27,10 +27,8 @@ type ConfigReadModel struct { OIDCConfig *oidc.ConfigReadModel } -func (rm *ConfigReadModel) AppendEvents(events ...eventstore.EventReader) error { +func (rm *ConfigReadModel) AppendEvents(events ...eventstore.EventReader) { rm.ReadModel.AppendEvents(events...) - - return nil } func (rm *ConfigReadModel) Reduce() error { diff --git a/internal/v2/repository/idp/oidc/config.go b/internal/v2/repository/idp/oidc/config.go index e8755c51c..1bcd2e944 100644 --- a/internal/v2/repository/idp/oidc/config.go +++ b/internal/v2/repository/idp/oidc/config.go @@ -18,8 +18,8 @@ type ConfigReadModel struct { UsernameMapping MappingField } -func (rm *ConfigReadModel) AppendEvents(events ...eventstore.EventReader) error { - return nil +func (rm *ConfigReadModel) AppendEvents(events ...eventstore.EventReader) { + rm.ReadModel.AppendEvents(events...) } func (rm *ConfigReadModel) Reduce() error { diff --git a/internal/v2/repository/member/event_changed.go b/internal/v2/repository/member/event_changed.go index cbf2295e2..443ffb904 100644 --- a/internal/v2/repository/member/event_changed.go +++ b/internal/v2/repository/member/event_changed.go @@ -37,10 +37,7 @@ func ChangeEventFromExisting( roles ...string, ) (*ChangedEvent, error) { - change := &ChangedEvent{ - BaseEvent: *base, - UserID: current.UserID, - } + change := NewChangedEvent(base, current.userID) sort.Strings(current.Roles) sort.Strings(roles) diff --git a/internal/v2/repository/member/write_model.go b/internal/v2/repository/member/write_model.go index cabdc3ab3..341ba92ca 100644 --- a/internal/v2/repository/member/write_model.go +++ b/internal/v2/repository/member/write_model.go @@ -17,7 +17,7 @@ type WriteModel struct { aggregateID string } -func PrepareWriteModel( +func NewWriteModel( userID string, aggregateType eventstore.AggregateType, aggregateID string, diff --git a/internal/v2/repository/members/read_models.go b/internal/v2/repository/members/read_models.go index 90f3cc2c4..c51dd0a9f 100644 --- a/internal/v2/repository/members/read_models.go +++ b/internal/v2/repository/members/read_models.go @@ -27,7 +27,7 @@ func (rm *ReadModel) MemberByUserID(id string) (idx int, member *member.ReadMode return -1, nil } -func (rm *ReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *ReadModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *member.AddedEvent: @@ -40,14 +40,13 @@ func (rm *ReadModel) AppendEvents(events ...eventstore.EventReader) (err error) case *member.RemovedEvent: idx, _ := rm.MemberByUserID(e.UserID) if idx < 0 { - return nil + continue } 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 *ReadModel) Reduce() (err error) { diff --git a/internal/v2/repository/org/member.go b/internal/v2/repository/org/member.go index 0eaf44cc8..a2017275c 100644 --- a/internal/v2/repository/org/member.go +++ b/internal/v2/repository/org/member.go @@ -35,7 +35,7 @@ type MembersReadModel struct { members.ReadModel } -func (rm *MembersReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *MembersReadModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *MemberAddedEvent: @@ -46,12 +46,11 @@ func (rm *MembersReadModel) AppendEvents(events ...eventstore.EventReader) (err rm.ReadModel.AppendEvents(&e.RemovedEvent) } } - return nil } type MemberReadModel member.ReadModel -func (rm *MemberReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *MemberReadModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *MemberAddedEvent: @@ -60,7 +59,6 @@ func (rm *MemberReadModel) AppendEvents(events ...eventstore.EventReader) (err e rm.ReadModel.AppendEvents(&e.ChangedEvent) } } - return nil } type MemberAddedEvent struct { diff --git a/internal/v2/repository/org/policy_label.go b/internal/v2/repository/org/policy_label.go index b751c346f..2f8b8affc 100644 --- a/internal/v2/repository/org/policy_label.go +++ b/internal/v2/repository/org/policy_label.go @@ -12,7 +12,7 @@ var ( type LabelPolicyReadModel struct{ policy.LabelPolicyReadModel } -func (rm *LabelPolicyReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *LabelPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *LabelPolicyAddedEvent: @@ -23,7 +23,6 @@ func (rm *LabelPolicyReadModel) AppendEvents(events ...eventstore.EventReader) ( rm.ReadModel.AppendEvents(e) } } - return nil } type LabelPolicyAddedEvent struct { diff --git a/internal/v2/repository/org/policy_login.go b/internal/v2/repository/org/policy_login.go index fb3b00764..fc6e54dbf 100644 --- a/internal/v2/repository/org/policy_login.go +++ b/internal/v2/repository/org/policy_login.go @@ -12,7 +12,7 @@ var ( type LoginPolicyReadModel struct{ policy.LoginPolicyReadModel } -func (rm *LoginPolicyReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *LoginPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *LoginPolicyAddedEvent: @@ -23,7 +23,6 @@ func (rm *LoginPolicyReadModel) AppendEvents(events ...eventstore.EventReader) ( rm.ReadModel.AppendEvents(e) } } - return nil } type LoginPolicyAddedEvent struct { diff --git a/internal/v2/repository/org/policy_org_iam.go b/internal/v2/repository/org/policy_org_iam.go index 7dae966ec..74bed756e 100644 --- a/internal/v2/repository/org/policy_org_iam.go +++ b/internal/v2/repository/org/policy_org_iam.go @@ -11,7 +11,7 @@ var ( type OrgIAMPolicyReadModel struct{ policy.OrgIAMPolicyReadModel } -func (rm *OrgIAMPolicyReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *OrgIAMPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *OrgIAMPolicyAddedEvent: @@ -20,7 +20,6 @@ func (rm *OrgIAMPolicyReadModel) AppendEvents(events ...eventstore.EventReader) rm.ReadModel.AppendEvents(e) } } - return nil } type OrgIAMPolicyAddedEvent struct { diff --git a/internal/v2/repository/org/policy_password_age.go b/internal/v2/repository/org/policy_password_age.go index c6c80d215..2650aae1c 100644 --- a/internal/v2/repository/org/policy_password_age.go +++ b/internal/v2/repository/org/policy_password_age.go @@ -14,7 +14,7 @@ type PasswordAgePolicyReadModel struct { policy.PasswordAgePolicyReadModel } -func (rm *PasswordAgePolicyReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *PasswordAgePolicyReadModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *PasswordAgePolicyAddedEvent: @@ -25,7 +25,6 @@ func (rm *PasswordAgePolicyReadModel) AppendEvents(events ...eventstore.EventRea rm.ReadModel.AppendEvents(e) } } - return nil } type PasswordAgePolicyAddedEvent struct { diff --git a/internal/v2/repository/org/policy_password_complexity.go b/internal/v2/repository/org/policy_password_complexity.go index b3358cb45..7fc7ad191 100644 --- a/internal/v2/repository/org/policy_password_complexity.go +++ b/internal/v2/repository/org/policy_password_complexity.go @@ -14,7 +14,7 @@ type PasswordComplexityPolicyReadModel struct { policy.PasswordComplexityPolicyReadModel } -func (rm *PasswordComplexityPolicyReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *PasswordComplexityPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *PasswordComplexityPolicyAddedEvent: @@ -25,7 +25,6 @@ func (rm *PasswordComplexityPolicyReadModel) AppendEvents(events ...eventstore.E rm.ReadModel.AppendEvents(e) } } - return nil } type PasswordComplexityPolicyAddedEvent struct { diff --git a/internal/v2/repository/org/policy_password_lockout.go b/internal/v2/repository/org/policy_password_lockout.go index fcfd7f363..8a434b3a4 100644 --- a/internal/v2/repository/org/policy_password_lockout.go +++ b/internal/v2/repository/org/policy_password_lockout.go @@ -14,7 +14,7 @@ type PasswordLockoutPolicyReadModel struct { policy.PasswordLockoutPolicyReadModel } -func (rm *PasswordLockoutPolicyReadModel) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *PasswordLockoutPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { for _, event := range events { switch e := event.(type) { case *PasswordLockoutPolicyAddedEvent: @@ -25,7 +25,6 @@ func (rm *PasswordLockoutPolicyReadModel) AppendEvents(events ...eventstore.Even rm.ReadModel.AppendEvents(e) } } - return nil } type PasswordLockoutPolicyAddedEvent struct { diff --git a/internal/v2/view/iam.go b/internal/v2/view/iam.go index 3e7d8560e..fa3e05470 100644 --- a/internal/v2/view/iam.go +++ b/internal/v2/view/iam.go @@ -17,9 +17,8 @@ type IAM struct { // TODO: how to implement queries? } -func (rm *IAM) AppendEvents(events ...eventstore.EventReader) (err error) { +func (rm *IAM) AppendEvents(events ...eventstore.EventReader) { rm.ReadModel.AppendEvents(events...) - return err } //Reduce implements eventstore.ReadModel