TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-10-15 06:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

append events without return value

Browse Source
This commit is contained in:
adlerhurst
2020-11-25 14:12:44 +01:00
parent f8028f07d0
commit f6cdcee77a
27 changed files with 73 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

3
internal/v2/repository/iam/policy_label.go
View File

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

3
internal/v2/repository/iam/policy_login.go
View File

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

3
internal/v2/repository/iam/policy_org_iam.go
View File

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

3
internal/v2/repository/iam/policy_password_age.go
View File

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

3
internal/v2/repository/iam/policy_password_complexity.go
View File

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

3
internal/v2/repository/iam/policy_password_lockout.go
View File

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

15
internal/v2/repository/iam/read_model.go
View File

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