TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 00:57:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(eventstore): rename EventPusher to Command, EventReader to Event, PushEvents to Push and FilterEvents to Filter (#2907)

Browse Source
This commit is contained in:
Silvan
2022-01-03 09:19:07 +01:00
committed by GitHub
parent 9a374f9c5c
commit 09be70949f
339 changed files with 1436 additions and 1346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/query/projection/action.go
View File

@@ -69,7 +69,7 @@ func (p *ActionProjection) reducers() []handler.AggregateReducer {
}
}
func (p *ActionProjection) reduceActionAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ActionProjection) reduceActionAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*action.AddedEvent)
if !ok {
logging.LogWithFields("HANDL-Sgg31", "seq", event.Sequence, "expectedType", action.AddedEventType).Error("wrong event type")
@@ -92,7 +92,7 @@ func (p *ActionProjection) reduceActionAdded(event eventstore.EventReader) (*han
), nil
}
func (p *ActionProjection) reduceActionChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ActionProjection) reduceActionChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*action.ChangedEvent)
if !ok {
logging.LogWithFields("HANDL-Dg2th", "seq", event.Sequence, "expected", action.ChangedEventType).Error("wrong event type")
@@ -123,7 +123,7 @@ func (p *ActionProjection) reduceActionChanged(event eventstore.EventReader) (*h
), nil
}
func (p *ActionProjection) reduceActionDeactivated(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ActionProjection) reduceActionDeactivated(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*action.DeactivatedEvent)
if !ok {
logging.LogWithFields("HANDL-Fhhjd", "seq", event.Sequence, "expectedType", action.DeactivatedEventType).Error("wrong event type")
@@ -142,7 +142,7 @@ func (p *ActionProjection) reduceActionDeactivated(event eventstore.EventReader)
), nil
}
func (p *ActionProjection) reduceActionReactivated(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ActionProjection) reduceActionReactivated(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*action.ReactivatedEvent)
if !ok {
logging.LogWithFields("HANDL-Fg4r3", "seq", event.Sequence, "expectedType", action.ReactivatedEventType).Error("wrong event type")
@@ -161,7 +161,7 @@ func (p *ActionProjection) reduceActionReactivated(event eventstore.EventReader)
), nil
}
func (p *ActionProjection) reduceActionRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ActionProjection) reduceActionRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*action.RemovedEvent)
if !ok {
logging.LogWithFields("HANDL-Dgwh2", "seq", event.Sequence, "expectedType", action.RemovedEventType).Error("wrong event type")

4
internal/query/projection/action_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestActionProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

24
internal/query/projection/app.go
View File

@@ -126,7 +126,7 @@ const (
AppOIDCConfigColumnAdditionalOrigins = "additional_origins"
)
func (p *AppProjection) reduceAppAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *AppProjection) reduceAppAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.ApplicationAddedEvent)
if !ok {
logging.LogWithFields("HANDL-OzK4m", "seq", event.Sequence(), "expectedType", project.ApplicationAddedType).Error("wrong event type")
@@ -147,7 +147,7 @@ func (p *AppProjection) reduceAppAdded(event eventstore.EventReader) (*handler.S
), nil
}
func (p *AppProjection) reduceAppChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *AppProjection) reduceAppChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.ApplicationChangedEvent)
if !ok {
logging.LogWithFields("HANDL-4Fjh2", "seq", event.Sequence(), "expectedType", project.ApplicationChangedType).Error("wrong event type")
@@ -169,7 +169,7 @@ func (p *AppProjection) reduceAppChanged(event eventstore.EventReader) (*handler
), nil
}
func (p *AppProjection) reduceAppDeactivated(event eventstore.EventReader) (*handler.Statement, error) {
func (p *AppProjection) reduceAppDeactivated(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.ApplicationDeactivatedEvent)
if !ok {
logging.LogWithFields("HANDL-hZ9to", "seq", event.Sequence(), "expectedType", project.ApplicationDeactivatedType).Error("wrong event type")
@@ -188,7 +188,7 @@ func (p *AppProjection) reduceAppDeactivated(event eventstore.EventReader) (*han
), nil
}
func (p *AppProjection) reduceAppReactivated(event eventstore.EventReader) (*handler.Statement, error) {
func (p *AppProjection) reduceAppReactivated(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.ApplicationReactivatedEvent)
if !ok {
logging.LogWithFields("HANDL-AbK3B", "seq", event.Sequence(), "expectedType", project.ApplicationReactivatedType).Error("wrong event type")
@@ -207,7 +207,7 @@ func (p *AppProjection) reduceAppReactivated(event eventstore.EventReader) (*han
), nil
}
func (p *AppProjection) reduceAppRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *AppProjection) reduceAppRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.ApplicationRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-tdRId", "seq", event.Sequence(), "expectedType", project.ApplicationRemovedType).Error("wrong event type")
@@ -221,7 +221,7 @@ func (p *AppProjection) reduceAppRemoved(event eventstore.EventReader) (*handler
), nil
}
func (p *AppProjection) reduceProjectRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *AppProjection) reduceProjectRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.ProjectRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-ZxQnj", "seq", event.Sequence(), "expectedType", project.ProjectRemovedType).Error("wrong event type")
@@ -235,7 +235,7 @@ func (p *AppProjection) reduceProjectRemoved(event eventstore.EventReader) (*han
), nil
}
func (p *AppProjection) reduceAPIConfigAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *AppProjection) reduceAPIConfigAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.APIConfigAddedEvent)
if !ok {
logging.LogWithFields("HANDL-tdRId", "seq", event.Sequence(), "expectedType", project.APIConfigAddedType).Error("wrong event type")
@@ -264,7 +264,7 @@ func (p *AppProjection) reduceAPIConfigAdded(event eventstore.EventReader) (*han
), nil
}
func (p *AppProjection) reduceAPIConfigChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *AppProjection) reduceAPIConfigChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.APIConfigChangedEvent)
if !ok {
logging.LogWithFields("HANDL-C6b4f", "seq", event.Sequence(), "expectedType", project.APIConfigChangedType).Error("wrong event type")
@@ -301,7 +301,7 @@ func (p *AppProjection) reduceAPIConfigChanged(event eventstore.EventReader) (*h
), nil
}
func (p *AppProjection) reduceAPIConfigSecretChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *AppProjection) reduceAPIConfigSecretChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.APIConfigSecretChangedEvent)
if !ok {
logging.LogWithFields("HANDL-dssSI", "seq", event.Sequence(), "expectedType", project.APIConfigSecretChangedType).Error("wrong event type")
@@ -330,7 +330,7 @@ func (p *AppProjection) reduceAPIConfigSecretChanged(event eventstore.EventReade
), nil
}
func (p *AppProjection) reduceOIDCConfigAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *AppProjection) reduceOIDCConfigAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.OIDCConfigAddedEvent)
if !ok {
logging.LogWithFields("HANDL-nlDQv", "seq", event.Sequence(), "expectedType", project.OIDCConfigAddedType).Error("wrong event type")
@@ -372,7 +372,7 @@ func (p *AppProjection) reduceOIDCConfigAdded(event eventstore.EventReader) (*ha
), nil
}
func (p *AppProjection) reduceOIDCConfigChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *AppProjection) reduceOIDCConfigChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.OIDCConfigChangedEvent)
if !ok {
logging.LogWithFields("HANDL-nlDQv", "seq", event.Sequence(), "expectedType", project.OIDCConfigChangedType).Error("wrong event type")
@@ -448,7 +448,7 @@ func (p *AppProjection) reduceOIDCConfigChanged(event eventstore.EventReader) (*
), nil
}
func (p *AppProjection) reduceOIDCConfigSecretChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *AppProjection) reduceOIDCConfigSecretChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.OIDCConfigSecretChangedEvent)
if !ok {
logging.LogWithFields("HANDL-nlDQv", "seq", event.Sequence(), "expectedType", project.OIDCConfigSecretChangedType).Error("wrong event type")

4
internal/query/projection/app_test.go
View File

@@ -15,12 +15,12 @@ import (
func TestAppProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

6
internal/query/projection/authn_key.go
View File

@@ -93,7 +93,7 @@ func (p *AuthNKeyProjection) reducers() []handler.AggregateReducer {
}
}
func (p *AuthNKeyProjection) reduceAuthNKeyAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *AuthNKeyProjection) reduceAuthNKeyAdded(event eventstore.Event) (*handler.Statement, error) {
var authNKeyEvent struct {
eventstore.BaseEvent
keyID string
@@ -143,7 +143,7 @@ func (p *AuthNKeyProjection) reduceAuthNKeyAdded(event eventstore.EventReader) (
), nil
}
func (p *AuthNKeyProjection) reduceAuthNKeyEnabledChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *AuthNKeyProjection) reduceAuthNKeyEnabledChanged(event eventstore.Event) (*handler.Statement, error) {
var appID string
var enabled bool
switch e := event.(type) {
@@ -170,7 +170,7 @@ func (p *AuthNKeyProjection) reduceAuthNKeyEnabledChanged(event eventstore.Event
), nil
}
func (p *AuthNKeyProjection) reduceAuthNKeyRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *AuthNKeyProjection) reduceAuthNKeyRemoved(event eventstore.Event) (*handler.Statement, error) {
var condition handler.Condition
switch e := event.(type) {
case *project.ApplicationKeyRemovedEvent:

4
internal/query/projection/authn_key_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestAuthNKeyProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

6
internal/query/projection/custom_text.go
View File

@@ -79,7 +79,7 @@ func (p *CustomTextProjection) reducers() []handler.AggregateReducer {
}
}
func (p *CustomTextProjection) reduceSet(event eventstore.EventReader) (*handler.Statement, error) {
func (p *CustomTextProjection) reduceSet(event eventstore.Event) (*handler.Statement, error) {
var customTextEvent policy.CustomTextSetEvent
var isDefault bool
switch e := event.(type) {
@@ -108,7 +108,7 @@ func (p *CustomTextProjection) reduceSet(event eventstore.EventReader) (*handler
}), nil
}
func (p *CustomTextProjection) reduceRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *CustomTextProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) {
var customTextEvent policy.CustomTextRemovedEvent
switch e := event.(type) {
case *org.CustomTextRemovedEvent:
@@ -129,7 +129,7 @@ func (p *CustomTextProjection) reduceRemoved(event eventstore.EventReader) (*han
}), nil
}
func (p *CustomTextProjection) reduceTemplateRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *CustomTextProjection) reduceTemplateRemoved(event eventstore.Event) (*handler.Statement, error) {
var customTextEvent policy.CustomTextTemplateRemovedEvent
switch e := event.(type) {
case *org.CustomTextTemplateRemovedEvent:

4
internal/query/projection/custom_text_test.go
View File

@@ -13,12 +13,12 @@ import (
func TestCustomTextProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

6
internal/query/projection/event_test.go
View File

@@ -31,12 +31,12 @@ func testEvent(
}
}
func baseEvent(*testing.T) eventstore.EventReader {
func baseEvent(*testing.T) eventstore.Event {
return &eventstore.BaseEvent{}
}
func getEvent(event *repository.Event, mapper func(*repository.Event) (eventstore.EventReader, error)) func(t *testing.T) eventstore.EventReader {
return func(t *testing.T) eventstore.EventReader {
func getEvent(event *repository.Event, mapper func(*repository.Event) (eventstore.Event, error)) func(t *testing.T) eventstore.Event {
return func(t *testing.T) eventstore.Event {
e, err := mapper(event)
if err != nil {
t.Fatalf("mapper failed: %v", err)

4
internal/query/projection/feature.go
View File

@@ -85,7 +85,7 @@ const (
FeatureActionsCol = "actions"
)
func (p *FeatureProjection) reduceFeatureSet(event eventstore.EventReader) (*handler.Statement, error) {
func (p *FeatureProjection) reduceFeatureSet(event eventstore.Event) (*handler.Statement, error) {
var featureEvent features.FeaturesSetEvent
var isDefault bool
switch e := event.(type) {
@@ -180,7 +180,7 @@ func (p *FeatureProjection) reduceFeatureSet(event eventstore.EventReader) (*han
cols), nil
}
func (p *FeatureProjection) reduceFeatureRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *FeatureProjection) reduceFeatureRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.FeaturesRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-fN903", "seq", event.Sequence(), "expectedType", org.FeaturesRemovedEventType).Error("wrong event type")

4
internal/query/projection/feature_test.go
View File

@@ -15,12 +15,12 @@ import (
func TestFeatureProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

6
internal/query/projection/flow.go
View File

@@ -51,13 +51,13 @@ func (p *FlowProjection) reducers() []handler.AggregateReducer {
}
}
func (p *FlowProjection) reduceTriggerActionsSetEventType(event eventstore.EventReader) (*handler.Statement, error) {
func (p *FlowProjection) reduceTriggerActionsSetEventType(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.TriggerActionsSetEvent)
if !ok {
logging.LogWithFields("HANDL-zWCk3", "seq", event.Sequence, "expectedType", org.TriggerActionsSetEventType).Error("was not an trigger actions set event")
return nil, errors.ThrowInvalidArgument(nil, "HANDL-uYq4r", "reduce.wrong.event.type")
}
stmts := make([]func(reader eventstore.EventReader) crdb.Exec, len(e.ActionIDs)+1)
stmts := make([]func(reader eventstore.Event) crdb.Exec, len(e.ActionIDs)+1)
stmts[0] = crdb.AddDeleteStatement(
[]handler.Condition{
handler.NewCond(FlowTypeCol, e.FlowType),
@@ -78,7 +78,7 @@ func (p *FlowProjection) reduceTriggerActionsSetEventType(event eventstore.Event
return crdb.NewMultiStatement(e, stmts...), nil
}
func (p *FlowProjection) reduceFlowClearedEventType(event eventstore.EventReader) (*handler.Statement, error) {
func (p *FlowProjection) reduceFlowClearedEventType(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.FlowClearedEvent)
if !ok {
logging.LogWithFields("HANDL-zWCk3", "seq", event.Sequence, "expectedType", org.FlowClearedEventType).Error("was not a flow cleared event")

12
internal/query/projection/flow/flow.go
View File

@@ -77,13 +77,13 @@ const (
actionScriptCol = "script"
)
func (p *FlowProjection) reduceTriggerActionsSetEventType(event eventstore.EventReader) (*handler.Statement, error) {
func (p *FlowProjection) reduceTriggerActionsSetEventType(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.TriggerActionsSetEvent)
if !ok {
logging.LogWithFields("HANDL-zWCk3", "seq", event.Sequence, "expectedType", action.AddedEventType).Error("was not an trigger actions set event")
return nil, errors.ThrowInvalidArgument(nil, "HANDL-uYq4r", "reduce.wrong.event.type")
}
stmts := make([]func(reader eventstore.EventReader) crdb.Exec, len(e.ActionIDs)+1)
stmts := make([]func(reader eventstore.Event) crdb.Exec, len(e.ActionIDs)+1)
stmts[0] = crdb.AddDeleteStatement(
[]handler.Condition{
handler.NewCond(flowTypeCol, e.FlowType),
@@ -106,7 +106,7 @@ func (p *FlowProjection) reduceTriggerActionsSetEventType(event eventstore.Event
return crdb.NewMultiStatement(e, stmts...), nil
}
func (p *FlowProjection) reduceFlowClearedEventType(event eventstore.EventReader) (*handler.Statement, error) {
func (p *FlowProjection) reduceFlowClearedEventType(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.FlowClearedEvent)
if !ok {
logging.LogWithFields("HANDL-zWCk3", "seq", event.Sequence, "expectedType", action.AddedEventType).Error("was not an trigger actions set event")
@@ -121,7 +121,7 @@ func (p *FlowProjection) reduceFlowClearedEventType(event eventstore.EventReader
), nil
}
func (p *FlowProjection) reduceFlowActionAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *FlowProjection) reduceFlowActionAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*action.AddedEvent)
if !ok {
logging.LogWithFields("HANDL-zWCk3", "seq", event.Sequence, "expectedType", action.AddedEventType).Error("was not an flow action added event")
@@ -142,7 +142,7 @@ func (p *FlowProjection) reduceFlowActionAdded(event eventstore.EventReader) (*h
), nil
}
func (p *FlowProjection) reduceFlowActionChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *FlowProjection) reduceFlowActionChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*action.ChangedEvent)
if !ok {
logging.LogWithFields("HANDL-q4oq8", "seq", event.Sequence, "expected", action.ChangedEventType).Error("wrong event type")
@@ -168,7 +168,7 @@ func (p *FlowProjection) reduceFlowActionChanged(event eventstore.EventReader) (
), nil
}
func (p *FlowProjection) reduceFlowActionRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *FlowProjection) reduceFlowActionRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*action.RemovedEvent)
if !ok {
logging.LogWithFields("HANDL-79OhB", "seq", event.Sequence, "expectedType", action.RemovedEventType).Error("wrong event type")

4
internal/query/projection/flow_test.go
View File

@@ -13,12 +13,12 @@ import (
func TestFlowProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

10
internal/query/projection/iam_member.go
View File

@@ -70,7 +70,7 @@ const (
IAMMemberIAMIDCol = "iam_id"
)
func (p *IAMMemberProjection) reduceAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IAMMemberProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*iam.MemberAddedEvent)
if !ok {
logging.LogWithFields("HANDL-c8SBb", "seq", event.Sequence(), "expectedType", iam.MemberAddedEventType).Error("wrong event type")
@@ -79,7 +79,7 @@ func (p *IAMMemberProjection) reduceAdded(event eventstore.EventReader) (*handle
return reduceMemberAdded(e.MemberAddedEvent, withMemberCol(IAMMemberIAMIDCol, e.Aggregate().ID))
}
func (p *IAMMemberProjection) reduceChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IAMMemberProjection) reduceChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*iam.MemberChangedEvent)
if !ok {
logging.LogWithFields("HANDL-QsjwO", "seq", event.Sequence(), "expected", iam.MemberChangedEventType).Error("wrong event type")
@@ -88,7 +88,7 @@ func (p *IAMMemberProjection) reduceChanged(event eventstore.EventReader) (*hand
return reduceMemberChanged(e.MemberChangedEvent)
}
func (p *IAMMemberProjection) reduceCascadeRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IAMMemberProjection) reduceCascadeRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*iam.MemberCascadeRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-mOncs", "seq", event.Sequence(), "expected", iam.MemberCascadeRemovedEventType).Error("wrong event type")
@@ -97,7 +97,7 @@ func (p *IAMMemberProjection) reduceCascadeRemoved(event eventstore.EventReader)
return reduceMemberCascadeRemoved(e.MemberCascadeRemovedEvent)
}
func (p *IAMMemberProjection) reduceRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IAMMemberProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*iam.MemberRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-lW1Zv", "seq", event.Sequence(), "expected", iam.MemberRemovedEventType).Error("wrong event type")
@@ -106,7 +106,7 @@ func (p *IAMMemberProjection) reduceRemoved(event eventstore.EventReader) (*hand
return reduceMemberRemoved(e, withMemberCond(MemberUserIDCol, e.UserID))
}
func (p *IAMMemberProjection) reduceUserRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IAMMemberProjection) reduceUserRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.UserRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-rBuvT", "seq", event.Sequence(), "expected", user.UserRemovedType).Error("wrong event type")

4
internal/query/projection/iam_member_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestIAMMemberProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

18
internal/query/projection/idp.go
View File

@@ -153,7 +153,7 @@ const (
JWTConfigEndpointCol = "endpoint"
)
func (p *IDPProjection) reduceIDPAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPProjection) reduceIDPAdded(event eventstore.Event) (*handler.Statement, error) {
var idpEvent idpconfig.IDPConfigAddedEvent
var idpOwnerType domain.IdentityProviderType
switch e := event.(type) {
@@ -185,7 +185,7 @@ func (p *IDPProjection) reduceIDPAdded(event eventstore.EventReader) (*handler.S
), nil
}
func (p *IDPProjection) reduceIDPChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPProjection) reduceIDPChanged(event eventstore.Event) (*handler.Statement, error) {
var idpEvent idpconfig.IDPConfigChangedEvent
switch e := event.(type) {
case *org.IDPConfigChangedEvent:
@@ -225,7 +225,7 @@ func (p *IDPProjection) reduceIDPChanged(event eventstore.EventReader) (*handler
), nil
}
func (p *IDPProjection) reduceIDPDeactivated(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPProjection) reduceIDPDeactivated(event eventstore.Event) (*handler.Statement, error) {
var idpEvent idpconfig.IDPConfigDeactivatedEvent
switch e := event.(type) {
case *org.IDPConfigDeactivatedEvent:
@@ -250,7 +250,7 @@ func (p *IDPProjection) reduceIDPDeactivated(event eventstore.EventReader) (*han
), nil
}
func (p *IDPProjection) reduceIDPReactivated(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPProjection) reduceIDPReactivated(event eventstore.Event) (*handler.Statement, error) {
var idpEvent idpconfig.IDPConfigReactivatedEvent
switch e := event.(type) {
case *org.IDPConfigReactivatedEvent:
@@ -275,7 +275,7 @@ func (p *IDPProjection) reduceIDPReactivated(event eventstore.EventReader) (*han
), nil
}
func (p *IDPProjection) reduceIDPRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPProjection) reduceIDPRemoved(event eventstore.Event) (*handler.Statement, error) {
var idpEvent idpconfig.IDPConfigRemovedEvent
switch e := event.(type) {
case *org.IDPConfigRemovedEvent:
@@ -295,7 +295,7 @@ func (p *IDPProjection) reduceIDPRemoved(event eventstore.EventReader) (*handler
), nil
}
func (p *IDPProjection) reduceOIDCConfigAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPProjection) reduceOIDCConfigAdded(event eventstore.Event) (*handler.Statement, error) {
var idpEvent idpconfig.OIDCConfigAddedEvent
switch e := event.(type) {
case *org.IDPOIDCConfigAddedEvent:
@@ -335,7 +335,7 @@ func (p *IDPProjection) reduceOIDCConfigAdded(event eventstore.EventReader) (*ha
), nil
}
func (p *IDPProjection) reduceOIDCConfigChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPProjection) reduceOIDCConfigChanged(event eventstore.Event) (*handler.Statement, error) {
var idpEvent idpconfig.OIDCConfigChangedEvent
switch e := event.(type) {
case *org.IDPOIDCConfigChangedEvent:
@@ -398,7 +398,7 @@ func (p *IDPProjection) reduceOIDCConfigChanged(event eventstore.EventReader) (*
), nil
}
func (p *IDPProjection) reduceJWTConfigAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPProjection) reduceJWTConfigAdded(event eventstore.Event) (*handler.Statement, error) {
var idpEvent idpconfig.JWTConfigAddedEvent
switch e := event.(type) {
case *org.IDPJWTConfigAddedEvent:
@@ -435,7 +435,7 @@ func (p *IDPProjection) reduceJWTConfigAdded(event eventstore.EventReader) (*han
), nil
}
func (p *IDPProjection) reduceJWTConfigChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPProjection) reduceJWTConfigChanged(event eventstore.Event) (*handler.Statement, error) {
var idpEvent idpconfig.JWTConfigChangedEvent
switch e := event.(type) {
case *org.IDPJWTConfigChangedEvent:

10
internal/query/projection/idp_login_policy_link.go
View File

@@ -91,7 +91,7 @@ const (
IDPLoginPolicyLinkProviderTypeCol = "provider_type"
)
func (p *IDPLoginPolicyLinkProjection) reduceAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPLoginPolicyLinkProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) {
var (
idp policy.IdentityProviderAddedEvent
providerType domain.IdentityProviderType
@@ -122,7 +122,7 @@ func (p *IDPLoginPolicyLinkProjection) reduceAdded(event eventstore.EventReader)
), nil
}
func (p *IDPLoginPolicyLinkProjection) reduceRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPLoginPolicyLinkProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) {
var idp policy.IdentityProviderRemovedEvent
switch e := event.(type) {
@@ -143,7 +143,7 @@ func (p *IDPLoginPolicyLinkProjection) reduceRemoved(event eventstore.EventReade
), nil
}
func (p *IDPLoginPolicyLinkProjection) reduceCascadeRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPLoginPolicyLinkProjection) reduceCascadeRemoved(event eventstore.Event) (*handler.Statement, error) {
var idp policy.IdentityProviderCascadeRemovedEvent
switch e := event.(type) {
@@ -164,7 +164,7 @@ func (p *IDPLoginPolicyLinkProjection) reduceCascadeRemoved(event eventstore.Eve
), nil
}
func (p *IDPLoginPolicyLinkProjection) reduceIDPConfigRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPLoginPolicyLinkProjection) reduceIDPConfigRemoved(event eventstore.Event) (*handler.Statement, error) {
var idpID string
switch e := event.(type) {
@@ -185,7 +185,7 @@ func (p *IDPLoginPolicyLinkProjection) reduceIDPConfigRemoved(event eventstore.E
), nil
}
func (p *IDPLoginPolicyLinkProjection) reduceOrgRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPLoginPolicyLinkProjection) reduceOrgRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.OrgRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-WTYC1", "seq", event.Sequence(), "expectedType", org.OrgRemovedEventType).Error("wrong event type")

4
internal/query/projection/idp_login_policy_link_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestIDPLoginPolicyLinkProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

4
internal/query/projection/idp_test.go
View File

@@ -15,12 +15,12 @@ import (
func TestIDPProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

12
internal/query/projection/idp_user_link.go
View File

@@ -85,7 +85,7 @@ const (
IDPUserLinkDisplayNameCol = "display_name"
)
func (p *IDPUserLinkProjection) reduceAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPUserLinkProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.UserIDPLinkAddedEvent)
if !ok {
logging.LogWithFields("HANDL-v2qC3", "seq", event.Sequence(), "expectedType", user.UserIDPLinkAddedType).Error("wrong event type")
@@ -106,7 +106,7 @@ func (p *IDPUserLinkProjection) reduceAdded(event eventstore.EventReader) (*hand
), nil
}
func (p *IDPUserLinkProjection) reduceRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPUserLinkProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.UserIDPLinkRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-zX5m9", "seq", event.Sequence(), "expectedType", user.UserIDPLinkRemovedType).Error("wrong event type")
@@ -122,7 +122,7 @@ func (p *IDPUserLinkProjection) reduceRemoved(event eventstore.EventReader) (*ha
), nil
}
func (p *IDPUserLinkProjection) reduceCascadeRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPUserLinkProjection) reduceCascadeRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.UserIDPLinkCascadeRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-I0s2H", "seq", event.Sequence(), "expectedType", user.UserIDPLinkCascadeRemovedType).Error("wrong event type")
@@ -138,7 +138,7 @@ func (p *IDPUserLinkProjection) reduceCascadeRemoved(event eventstore.EventReade
), nil
}
func (p *IDPUserLinkProjection) reduceOrgRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPUserLinkProjection) reduceOrgRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.OrgRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-zX5m9", "seq", event.Sequence(), "expectedType", org.OrgRemovedEventType).Error("wrong event type")
@@ -152,7 +152,7 @@ func (p *IDPUserLinkProjection) reduceOrgRemoved(event eventstore.EventReader) (
), nil
}
func (p *IDPUserLinkProjection) reduceUserRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPUserLinkProjection) reduceUserRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.UserRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-yM6u6", "seq", event.Sequence(), "expectedType", user.UserRemovedType).Error("wrong event type")
@@ -166,7 +166,7 @@ func (p *IDPUserLinkProjection) reduceUserRemoved(event eventstore.EventReader)
), nil
}
func (p *IDPUserLinkProjection) reduceIDPConfigRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *IDPUserLinkProjection) reduceIDPConfigRemoved(event eventstore.Event) (*handler.Statement, error) {
var idpID string
switch e := event.(type) {

4
internal/query/projection/idp_user_link_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestIDPUserLinkProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

4
internal/query/projection/key.go
View File

@@ -72,7 +72,7 @@ const (
KeyPublicColumnKey = "key"
)
func (p *KeyProjection) reduceKeyPairAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *KeyProjection) reduceKeyPairAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*keypair.AddedEvent)
if !ok {
logging.LogWithFields("HANDL-GEdg3", "seq", event.Sequence(), "expectedType", keypair.AddedEventType).Error("wrong event type")
@@ -81,7 +81,7 @@ func (p *KeyProjection) reduceKeyPairAdded(event eventstore.EventReader) (*handl
if e.PrivateKey.Expiry.Before(time.Now()) && e.PublicKey.Expiry.Before(time.Now()) {
return crdb.NewNoOpStatement(e), nil
}
creates := []func(eventstore.EventReader) crdb.Exec{
creates := []func(eventstore.Event) crdb.Exec{
crdb.AddCreateStatement(
[]handler.Column{
handler.NewCol(KeyColumnID, e.Aggregate().ID),

4
internal/query/projection/key_test.go
View File

@@ -17,12 +17,12 @@ import (
func TestKeyProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

22
internal/query/projection/label_policy.go
View File

@@ -161,7 +161,7 @@ func (p *LabelPolicyProjection) reducers() []handler.AggregateReducer {
}
}
func (p *LabelPolicyProjection) reduceAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LabelPolicyProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.LabelPolicyAddedEvent
var isDefault bool
switch e := event.(type) {
@@ -199,7 +199,7 @@ func (p *LabelPolicyProjection) reduceAdded(event eventstore.EventReader) (*hand
}), nil
}
func (p *LabelPolicyProjection) reduceChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LabelPolicyProjection) reduceChanged(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.LabelPolicyChangedEvent
switch e := event.(type) {
case *org.LabelPolicyChangedEvent:
@@ -256,7 +256,7 @@ func (p *LabelPolicyProjection) reduceChanged(event eventstore.EventReader) (*ha
}), nil
}
func (p *LabelPolicyProjection) reduceRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LabelPolicyProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) {
policyEvent, ok := event.(*org.LabelPolicyRemovedEvent)
if !ok {
logging.LogWithFields("PROJE-izDbs", "seq", event.Sequence(), "expectedType", org.LabelPolicyRemovedEventType).Error("was not an event")
@@ -269,7 +269,7 @@ func (p *LabelPolicyProjection) reduceRemoved(event eventstore.EventReader) (*ha
}), nil
}
func (p *LabelPolicyProjection) reduceActivated(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LabelPolicyProjection) reduceActivated(event eventstore.Event) (*handler.Statement, error) {
switch event.(type) {
case *org.LabelPolicyActivatedEvent, *iam.LabelPolicyActivatedEvent:
// everything ok
@@ -310,7 +310,7 @@ func (p *LabelPolicyProjection) reduceActivated(event eventstore.EventReader) (*
}), nil
}
func (p *LabelPolicyProjection) reduceLogoAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LabelPolicyProjection) reduceLogoAdded(event eventstore.Event) (*handler.Statement, error) {
var storeKey handler.Column
switch e := event.(type) {
case *org.LabelPolicyLogoAddedEvent:
@@ -339,7 +339,7 @@ func (p *LabelPolicyProjection) reduceLogoAdded(event eventstore.EventReader) (*
}), nil
}
func (p *LabelPolicyProjection) reduceLogoRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LabelPolicyProjection) reduceLogoRemoved(event eventstore.Event) (*handler.Statement, error) {
var col string
switch event.(type) {
case *org.LabelPolicyLogoRemovedEvent:
@@ -368,7 +368,7 @@ func (p *LabelPolicyProjection) reduceLogoRemoved(event eventstore.EventReader)
}), nil
}
func (p *LabelPolicyProjection) reduceIconAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LabelPolicyProjection) reduceIconAdded(event eventstore.Event) (*handler.Statement, error) {
var storeKey handler.Column
switch e := event.(type) {
case *org.LabelPolicyIconAddedEvent:
@@ -397,7 +397,7 @@ func (p *LabelPolicyProjection) reduceIconAdded(event eventstore.EventReader) (*
}), nil
}
func (p *LabelPolicyProjection) reduceIconRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LabelPolicyProjection) reduceIconRemoved(event eventstore.Event) (*handler.Statement, error) {
var col string
switch event.(type) {
case *org.LabelPolicyIconRemovedEvent:
@@ -426,7 +426,7 @@ func (p *LabelPolicyProjection) reduceIconRemoved(event eventstore.EventReader)
}), nil
}
func (p *LabelPolicyProjection) reduceFontAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LabelPolicyProjection) reduceFontAdded(event eventstore.Event) (*handler.Statement, error) {
var storeKey handler.Column
switch e := event.(type) {
case *org.LabelPolicyFontAddedEvent:
@@ -451,7 +451,7 @@ func (p *LabelPolicyProjection) reduceFontAdded(event eventstore.EventReader) (*
}), nil
}
func (p *LabelPolicyProjection) reduceFontRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LabelPolicyProjection) reduceFontRemoved(event eventstore.Event) (*handler.Statement, error) {
var col string
switch event.(type) {
case *org.LabelPolicyFontRemovedEvent:
@@ -476,7 +476,7 @@ func (p *LabelPolicyProjection) reduceFontRemoved(event eventstore.EventReader)
}), nil
}
func (p *LabelPolicyProjection) reduceAssetsRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LabelPolicyProjection) reduceAssetsRemoved(event eventstore.Event) (*handler.Statement, error) {
switch event.(type) {
case *org.LabelPolicyAssetsRemovedEvent, *iam.LabelPolicyAssetsRemovedEvent:
//ok

4
internal/query/projection/label_policy_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestLabelPolicyProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

6
internal/query/projection/lockout_policy.go
View File

@@ -75,7 +75,7 @@ func (p *LockoutPolicyProjection) reducers() []handler.AggregateReducer {
}
}
func (p *LockoutPolicyProjection) reduceAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LockoutPolicyProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.LockoutPolicyAddedEvent
var isDefault bool
switch e := event.(type) {
@@ -104,7 +104,7 @@ func (p *LockoutPolicyProjection) reduceAdded(event eventstore.EventReader) (*ha
}), nil
}
func (p *LockoutPolicyProjection) reduceChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LockoutPolicyProjection) reduceChanged(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.LockoutPolicyChangedEvent
switch e := event.(type) {
case *org.LockoutPolicyChangedEvent:
@@ -133,7 +133,7 @@ func (p *LockoutPolicyProjection) reduceChanged(event eventstore.EventReader) (*
}), nil
}
func (p *LockoutPolicyProjection) reduceRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LockoutPolicyProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) {
policyEvent, ok := event.(*org.LockoutPolicyRemovedEvent)
if !ok {
logging.LogWithFields("PROJE-U5cys", "seq", event.Sequence(), "expectedType", org.LockoutPolicyRemovedEventType).Error("wrong event type")

4
internal/query/projection/lockout_policy_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestLockoutPolicyProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

20
internal/query/projection/login_name.go
View File

@@ -139,7 +139,7 @@ const (
LoginNamePoliciesResourceOwnerCol = "resource_owner"
)
func (p *LoginNameProjection) reduceUserCreated(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LoginNameProjection) reduceUserCreated(event eventstore.Event) (*handler.Statement, error) {
var userName string
switch e := event.(type) {
@@ -165,7 +165,7 @@ func (p *LoginNameProjection) reduceUserCreated(event eventstore.EventReader) (*
), nil
}
func (p *LoginNameProjection) reduceUserRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LoginNameProjection) reduceUserRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.UserRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-8XEdC", "seq", event.Sequence(), "expectedType", user.UserRemovedType).Error("wrong event type")
@@ -181,7 +181,7 @@ func (p *LoginNameProjection) reduceUserRemoved(event eventstore.EventReader) (*
), nil
}
func (p *LoginNameProjection) reduceUserNameChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LoginNameProjection) reduceUserNameChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.UsernameChangedEvent)
if !ok {
logging.LogWithFields("HANDL-UGo7U", "seq", event.Sequence(), "expectedType", user.UserUserNameChangedType).Error("wrong event type")
@@ -200,7 +200,7 @@ func (p *LoginNameProjection) reduceUserNameChanged(event eventstore.EventReader
), nil
}
func (p *LoginNameProjection) reduceUserDomainClaimed(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LoginNameProjection) reduceUserDomainClaimed(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.DomainClaimedEvent)
if !ok {
logging.LogWithFields("HANDL-zIbyU", "seq", event.Sequence(), "expectedType", user.UserDomainClaimedType).Error("wrong event type")
@@ -219,7 +219,7 @@ func (p *LoginNameProjection) reduceUserDomainClaimed(event eventstore.EventRead
), nil
}
func (p *LoginNameProjection) reduceOrgIAMPolicyAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LoginNameProjection) reduceOrgIAMPolicyAdded(event eventstore.Event) (*handler.Statement, error) {
var (
policyEvent *policy.OrgIAMPolicyAddedEvent
isDefault bool
@@ -248,7 +248,7 @@ func (p *LoginNameProjection) reduceOrgIAMPolicyAdded(event eventstore.EventRead
), nil
}
func (p *LoginNameProjection) reduceOrgIAMPolicyChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LoginNameProjection) reduceOrgIAMPolicyChanged(event eventstore.Event) (*handler.Statement, error) {
var policyEvent *policy.OrgIAMPolicyChangedEvent
switch e := event.(type) {
@@ -277,7 +277,7 @@ func (p *LoginNameProjection) reduceOrgIAMPolicyChanged(event eventstore.EventRe
), nil
}
func (p *LoginNameProjection) reduceOrgIAMPolicyRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LoginNameProjection) reduceOrgIAMPolicyRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.OrgIAMPolicyRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-1ZFHL", "seq", event.Sequence(), "expectedType", org.OrgIAMPolicyRemovedEventType).Error("wrong event type")
@@ -293,7 +293,7 @@ func (p *LoginNameProjection) reduceOrgIAMPolicyRemoved(event eventstore.EventRe
), nil
}
func (p *LoginNameProjection) reduceDomainVerified(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LoginNameProjection) reduceDomainVerified(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.DomainVerifiedEvent)
if !ok {
logging.LogWithFields("HANDL-Rr7Tq", "seq", event.Sequence(), "expectedType", org.OrgDomainVerifiedEventType).Error("wrong event type")
@@ -310,7 +310,7 @@ func (p *LoginNameProjection) reduceDomainVerified(event eventstore.EventReader)
), nil
}
func (p *LoginNameProjection) reducePrimaryDomainSet(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LoginNameProjection) reducePrimaryDomainSet(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.DomainPrimarySetEvent)
if !ok {
logging.LogWithFields("HANDL-0L5tW", "seq", event.Sequence(), "expectedType", org.OrgDomainPrimarySetEventType).Error("wrong event type")
@@ -342,7 +342,7 @@ func (p *LoginNameProjection) reducePrimaryDomainSet(event eventstore.EventReade
), nil
}
func (p *LoginNameProjection) reduceDomainRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LoginNameProjection) reduceDomainRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.DomainRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-reP2u", "seq", event.Sequence(), "expectedType", org.OrgDomainRemovedEventType).Error("wrong event type")

4
internal/query/projection/login_name_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestLoginNameProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

14
internal/query/projection/login_policy.go
View File

@@ -113,7 +113,7 @@ const (
LoginPolicyHidePWResetCol = "hide_password_reset"
)
func (p *LoginPolicyProjection) reduceLoginPolicyAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LoginPolicyProjection) reduceLoginPolicyAdded(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.LoginPolicyAddedEvent
var isDefault bool
switch e := event.(type) {
@@ -143,7 +143,7 @@ func (p *LoginPolicyProjection) reduceLoginPolicyAdded(event eventstore.EventRea
}), nil
}
func (p *LoginPolicyProjection) reduceLoginPolicyChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LoginPolicyProjection) reduceLoginPolicyChanged(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.LoginPolicyChangedEvent
switch e := event.(type) {
case *iam.LoginPolicyChangedEvent:
@@ -186,7 +186,7 @@ func (p *LoginPolicyProjection) reduceLoginPolicyChanged(event eventstore.EventR
), nil
}
func (p *LoginPolicyProjection) reduceMFAAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LoginPolicyProjection) reduceMFAAdded(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.MultiFactorAddedEvent
switch e := event.(type) {
case *iam.LoginPolicyMultiFactorAddedEvent:
@@ -211,7 +211,7 @@ func (p *LoginPolicyProjection) reduceMFAAdded(event eventstore.EventReader) (*h
), nil
}
func (p *LoginPolicyProjection) reduceMFARemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LoginPolicyProjection) reduceMFARemoved(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.MultiFactorRemovedEvent
switch e := event.(type) {
case *iam.LoginPolicyMultiFactorRemovedEvent:
@@ -236,7 +236,7 @@ func (p *LoginPolicyProjection) reduceMFARemoved(event eventstore.EventReader) (
), nil
}
func (p *LoginPolicyProjection) reduceLoginPolicyRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LoginPolicyProjection) reduceLoginPolicyRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.LoginPolicyRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-gF5q6", "seq", event.Sequence(), "expectedType", org.LoginPolicyRemovedEventType).Error("wrong event type")
@@ -250,7 +250,7 @@ func (p *LoginPolicyProjection) reduceLoginPolicyRemoved(event eventstore.EventR
), nil
}
func (p *LoginPolicyProjection) reduce2FAAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LoginPolicyProjection) reduce2FAAdded(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.SecondFactorAddedEvent
switch e := event.(type) {
case *iam.LoginPolicySecondFactorAddedEvent:
@@ -275,7 +275,7 @@ func (p *LoginPolicyProjection) reduce2FAAdded(event eventstore.EventReader) (*h
), nil
}
func (p *LoginPolicyProjection) reduce2FARemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *LoginPolicyProjection) reduce2FARemoved(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.SecondFactorRemovedEvent
switch e := event.(type) {
case *iam.LoginPolicySecondFactorRemovedEvent:

4
internal/query/projection/login_policy_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestLoginPolicyProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

6
internal/query/projection/mail_template.go
View File

@@ -73,7 +73,7 @@ func (p *MailTemplateProjection) reducers() []handler.AggregateReducer {
}
}
func (p *MailTemplateProjection) reduceAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *MailTemplateProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) {
var templateEvent policy.MailTemplateAddedEvent
var isDefault bool
switch e := event.(type) {
@@ -100,7 +100,7 @@ func (p *MailTemplateProjection) reduceAdded(event eventstore.EventReader) (*han
}), nil
}
func (p *MailTemplateProjection) reduceChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *MailTemplateProjection) reduceChanged(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.MailTemplateChangedEvent
switch e := event.(type) {
case *org.MailTemplateChangedEvent:
@@ -126,7 +126,7 @@ func (p *MailTemplateProjection) reduceChanged(event eventstore.EventReader) (*h
}), nil
}
func (p *MailTemplateProjection) reduceRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *MailTemplateProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) {
policyEvent, ok := event.(*org.MailTemplateRemovedEvent)
if !ok {
logging.LogWithFields("PROJE-2m0fp", "seq", event.Sequence(), "expectedType", org.MailTemplateRemovedEventType).Error("wrong event type")

4
internal/query/projection/mail_template_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestMailTemplateProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

2
internal/query/projection/member.go
View File

@@ -87,7 +87,7 @@ func reduceMemberCascadeRemoved(e member.MemberCascadeRemovedEvent, opts ...redu
return crdb.NewDeleteStatement(&e, config.conds), nil
}
func reduceMemberRemoved(e eventstore.EventReader, opts ...reduceMemberOpt) (*handler.Statement, error) {
func reduceMemberRemoved(e eventstore.Event, opts ...reduceMemberOpt) (*handler.Statement, error) {
config := reduceMemberConfig{
conds: []handler.Condition{},
}

4
internal/query/projection/message_text_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestMessageTextProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

6
internal/query/projection/message_texts.go
View File

@@ -85,7 +85,7 @@ func (p *MessageTextProjection) reducers() []handler.AggregateReducer {
}
}
func (p *MessageTextProjection) reduceAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *MessageTextProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) {
var templateEvent policy.CustomTextSetEvent
switch e := event.(type) {
case *org.CustomTextSetEvent:
@@ -135,7 +135,7 @@ func (p *MessageTextProjection) reduceAdded(event eventstore.EventReader) (*hand
cols), nil
}
func (p *MessageTextProjection) reduceRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *MessageTextProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) {
var templateEvent policy.CustomTextRemovedEvent
switch e := event.(type) {
case *org.CustomTextRemovedEvent:
@@ -185,7 +185,7 @@ func (p *MessageTextProjection) reduceRemoved(event eventstore.EventReader) (*ha
), nil
}
func (p *MessageTextProjection) reduceTemplateRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *MessageTextProjection) reduceTemplateRemoved(event eventstore.Event) (*handler.Statement, error) {
var templateEvent policy.CustomTextTemplateRemovedEvent
switch e := event.(type) {
case *org.CustomTextTemplateRemovedEvent:

10
internal/query/projection/org.go
View File

@@ -72,7 +72,7 @@ const (
OrgColumnDomain = "primary_domain"
)
func (p *OrgProjection) reduceOrgAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgProjection) reduceOrgAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.OrgAddedEvent)
if !ok {
logging.LogWithFields("HANDL-zWCk3", "seq", event.Sequence(), "expectedType", org.OrgAddedEventType).Error("wrong event type")
@@ -92,7 +92,7 @@ func (p *OrgProjection) reduceOrgAdded(event eventstore.EventReader) (*handler.S
), nil
}
func (p *OrgProjection) reduceOrgChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgProjection) reduceOrgChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.OrgChangedEvent)
if !ok {
logging.LogWithFields("HANDL-q4oq8", "seq", event.Sequence(), "expected", org.OrgChangedEventType).Error("wrong event type")
@@ -114,7 +114,7 @@ func (p *OrgProjection) reduceOrgChanged(event eventstore.EventReader) (*handler
), nil
}
func (p *OrgProjection) reduceOrgDeactivated(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgProjection) reduceOrgDeactivated(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.OrgDeactivatedEvent)
if !ok {
logging.LogWithFields("HANDL-1gwdc", "seq", event.Sequence(), "expectedType", org.OrgDeactivatedEventType).Error("wrong event type")
@@ -133,7 +133,7 @@ func (p *OrgProjection) reduceOrgDeactivated(event eventstore.EventReader) (*han
), nil
}
func (p *OrgProjection) reduceOrgReactivated(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgProjection) reduceOrgReactivated(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.OrgReactivatedEvent)
if !ok {
logging.LogWithFields("HANDL-Vjwiy", "seq", event.Sequence(), "expectedType", org.OrgReactivatedEventType).Error("wrong event type")
@@ -152,7 +152,7 @@ func (p *OrgProjection) reduceOrgReactivated(event eventstore.EventReader) (*han
), nil
}
func (p *OrgProjection) reducePrimaryDomainSet(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgProjection) reducePrimaryDomainSet(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.DomainPrimarySetEvent)
if !ok {
logging.LogWithFields("HANDL-79OhB", "seq", event.Sequence(), "expectedType", org.OrgDomainPrimarySetEventType).Error("wrong event type")

24
internal/query/projection/org/owner/projection.go
View File

@@ -110,7 +110,7 @@ func (p *OrgOwnerProjection) reducers() []handler.AggregateReducer {
}
}
func (p *OrgOwnerProjection) reduceMemberAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgOwnerProjection) reduceMemberAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.MemberAddedEvent)
if !ok {
logging.LogWithFields("PROJE-kL530", "seq", event.Sequence, "expected", org.MemberAddedEventType).Error("wrong event type")
@@ -129,7 +129,7 @@ func (p *OrgOwnerProjection) reduceMemberAdded(event eventstore.EventReader) (*h
return stmt, nil
}
func (p *OrgOwnerProjection) reduceMemberChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgOwnerProjection) reduceMemberChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.MemberChangedEvent)
if !ok {
logging.LogWithFields("PROJE-kL530", "seq", event.Sequence, "expected", org.MemberAddedEventType).Error("wrong event type")
@@ -148,7 +148,7 @@ func (p *OrgOwnerProjection) reduceMemberChanged(event eventstore.EventReader) (
return stmt, nil
}
func (p *OrgOwnerProjection) reduceMemberRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgOwnerProjection) reduceMemberRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.MemberRemovedEvent)
if !ok {
logging.LogWithFields("PROJE-boIbP", "seq", event.Sequence, "expected", org.MemberRemovedEventType).Error("wrong event type")
@@ -158,7 +158,7 @@ func (p *OrgOwnerProjection) reduceMemberRemoved(event eventstore.EventReader) (
return p.deleteOwner(e, e.Aggregate().ID, e.UserID), nil
}
func (p *OrgOwnerProjection) reduceHumanEmailChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgOwnerProjection) reduceHumanEmailChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.HumanEmailChangedEvent)
if !ok {
logging.LogWithFields("PROJE-IHFwh", "seq", event.Sequence, "expected", user.HumanEmailChangedType).Error("wrong event type")
@@ -177,7 +177,7 @@ func (p *OrgOwnerProjection) reduceHumanEmailChanged(event eventstore.EventReade
), nil
}
func (p *OrgOwnerProjection) reduceHumanProfileChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgOwnerProjection) reduceHumanProfileChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.HumanProfileChangedEvent)
if !ok {
logging.LogWithFields("PROJE-WqgUS", "seq", event.Sequence, "expected", user.HumanProfileChangedType).Error("wrong event type")
@@ -212,7 +212,7 @@ func (p *OrgOwnerProjection) reduceHumanProfileChanged(event eventstore.EventRea
), nil
}
func (p *OrgOwnerProjection) reduceOrgAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgOwnerProjection) reduceOrgAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.OrgAddedEvent)
if !ok {
logging.LogWithFields("PROJE-wbOrL", "seq", event.Sequence, "expected", org.OrgAddedEventType).Error("wrong event type")
@@ -229,7 +229,7 @@ func (p *OrgOwnerProjection) reduceOrgAdded(event eventstore.EventReader) (*hand
), nil
}
func (p *OrgOwnerProjection) reduceOrgChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgOwnerProjection) reduceOrgChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.OrgChangedEvent)
if !ok {
logging.LogWithFields("PROJE-piy2b", "seq", event.Sequence, "expected", org.OrgChangedEventType).Error("wrong event type")
@@ -255,7 +255,7 @@ func (p *OrgOwnerProjection) reduceOrgChanged(event eventstore.EventReader) (*ha
), nil
}
func (p *OrgOwnerProjection) reduceOrgRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgOwnerProjection) reduceOrgRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.OrgRemovedEvent)
if !ok {
logging.LogWithFields("PROJE-F1mHQ", "seq", event.Sequence, "expected", org.OrgRemovedEventType).Error("wrong event type")
@@ -289,7 +289,7 @@ func isOrgOwner(roles []string) bool {
return false
}
func (p *OrgOwnerProjection) deleteOwner(event eventstore.EventReader, orgID, ownerID string) *handler.Statement {
func (p *OrgOwnerProjection) deleteOwner(event eventstore.Event, orgID, ownerID string) *handler.Statement {
return crdb.NewDeleteStatement(
event,
[]handler.Condition{
@@ -300,8 +300,8 @@ func (p *OrgOwnerProjection) deleteOwner(event eventstore.EventReader, orgID, ow
)
}
func (p *OrgOwnerProjection) addOwner(event eventstore.EventReader, orgID, userID string) (*handler.Statement, error) {
events, err := p.Eventstore.FilterEvents(context.Background(),
func (p *OrgOwnerProjection) addOwner(event eventstore.Event, orgID, userID string) (*handler.Statement, error) {
events, err := p.Eventstore.Filter(context.Background(),
eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
AddQuery().
AggregateTypes(user.AggregateType).
@@ -355,7 +355,7 @@ func (p *OrgOwnerProjection) addOwner(event eventstore.EventReader, orgID, userI
), nil
}
func (p *OrgOwnerProjection) reduce(owner *OrgOwner, events []eventstore.EventReader) {
func (p *OrgOwnerProjection) reduce(owner *OrgOwner, events []eventstore.Event) {
for _, event := range events {
switch e := event.(type) {
case *user.HumanAddedEvent:

10
internal/query/projection/org_domain.go
View File

@@ -70,7 +70,7 @@ const (
OrgDomainValidationTypeCol = "validation_type"
)
func (p *OrgDomainProjection) reduceDomainAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgDomainProjection) reduceDomainAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.DomainAddedEvent)
if !ok {
logging.LogWithFields("PROJE-6fXKf", "seq", event.Sequence(), "expectedType", org.OrgDomainAddedEventType, "gottenType", fmt.Sprintf("%T", event)).Error("unexpected event type")
@@ -91,7 +91,7 @@ func (p *OrgDomainProjection) reduceDomainAdded(event eventstore.EventReader) (*
), nil
}
func (p *OrgDomainProjection) reduceDomainVerificationAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgDomainProjection) reduceDomainVerificationAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.DomainVerificationAddedEvent)
if !ok {
logging.LogWithFields("PROJE-2gGSs", "seq", event.Sequence(), "expectedType", org.OrgDomainVerificationAddedEventType, "gottenType", fmt.Sprintf("%T", event)).Error("unexpected event type")
@@ -111,7 +111,7 @@ func (p *OrgDomainProjection) reduceDomainVerificationAdded(event eventstore.Eve
), nil
}
func (p *OrgDomainProjection) reduceDomainVerified(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgDomainProjection) reduceDomainVerified(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.DomainVerifiedEvent)
if !ok {
logging.LogWithFields("PROJE-aeGCA", "seq", event.Sequence(), "expectedType", org.OrgDomainVerifiedEventType, "gottenType", fmt.Sprintf("%T", event)).Error("unexpected event type")
@@ -131,7 +131,7 @@ func (p *OrgDomainProjection) reduceDomainVerified(event eventstore.EventReader)
), nil
}
func (p *OrgDomainProjection) reducePrimaryDomainSet(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgDomainProjection) reducePrimaryDomainSet(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.DomainPrimarySetEvent)
if !ok {
logging.LogWithFields("PROJE-6YjHo", "seq", event.Sequence(), "expectedType", org.OrgDomainPrimarySetEventType, "gottenType", fmt.Sprintf("%T", event)).Error("unexpected event type")
@@ -164,7 +164,7 @@ func (p *OrgDomainProjection) reducePrimaryDomainSet(event eventstore.EventReade
), nil
}
func (p *OrgDomainProjection) reduceDomainRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgDomainProjection) reduceDomainRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.DomainRemovedEvent)
if !ok {
logging.LogWithFields("PROJE-dDnps", "seq", event.Sequence(), "expectedType", org.OrgDomainRemovedEventType, "gottenType", fmt.Sprintf("%T", event)).Error("unexpected event type")

4
internal/query/projection/org_domain_test.go
View File

@@ -13,12 +13,12 @@ import (
func TestOrgDomainProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

6
internal/query/projection/org_iam_policy.go
View File

@@ -74,7 +74,7 @@ func (p *OrgIAMPolicyProjection) reducers() []handler.AggregateReducer {
}
}
func (p *OrgIAMPolicyProjection) reduceAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgIAMPolicyProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.OrgIAMPolicyAddedEvent
var isDefault bool
switch e := event.(type) {
@@ -102,7 +102,7 @@ func (p *OrgIAMPolicyProjection) reduceAdded(event eventstore.EventReader) (*han
}), nil
}
func (p *OrgIAMPolicyProjection) reduceChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgIAMPolicyProjection) reduceChanged(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.OrgIAMPolicyChangedEvent
switch e := event.(type) {
case *org.OrgIAMPolicyChangedEvent:
@@ -128,7 +128,7 @@ func (p *OrgIAMPolicyProjection) reduceChanged(event eventstore.EventReader) (*h
}), nil
}
func (p *OrgIAMPolicyProjection) reduceRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgIAMPolicyProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) {
policyEvent, ok := event.(*org.OrgIAMPolicyRemovedEvent)
if !ok {
logging.LogWithFields("PROJE-ovQya", "seq", event.Sequence(), "expectedType", org.OrgIAMPolicyRemovedEventType).Error("wrong event type")

4
internal/query/projection/org_iam_policy_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestOrgIAMPolicyProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

12
internal/query/projection/org_member.go
View File

@@ -79,7 +79,7 @@ const (
OrgMemberOrgIDCol = "org_id"
)
func (p *OrgMemberProjection) reduceAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgMemberProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.MemberAddedEvent)
if !ok {
logging.LogWithFields("HANDL-BoKBr", "seq", event.Sequence(), "expectedType", org.MemberAddedEventType).Error("wrong event type")
@@ -88,7 +88,7 @@ func (p *OrgMemberProjection) reduceAdded(event eventstore.EventReader) (*handle
return reduceMemberAdded(e.MemberAddedEvent, withMemberCol(OrgMemberOrgIDCol, e.Aggregate().ID))
}
func (p *OrgMemberProjection) reduceChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgMemberProjection) reduceChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.MemberChangedEvent)
if !ok {
logging.LogWithFields("HANDL-bfqNl", "seq", event.Sequence(), "expected", org.MemberChangedEventType).Error("wrong event type")
@@ -97,7 +97,7 @@ func (p *OrgMemberProjection) reduceChanged(event eventstore.EventReader) (*hand
return reduceMemberChanged(e.MemberChangedEvent, withMemberCond(OrgMemberOrgIDCol, e.Aggregate().ID))
}
func (p *OrgMemberProjection) reduceCascadeRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgMemberProjection) reduceCascadeRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.MemberCascadeRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-zgb6w", "seq", event.Sequence(), "expected", org.MemberCascadeRemovedEventType).Error("wrong event type")
@@ -106,7 +106,7 @@ func (p *OrgMemberProjection) reduceCascadeRemoved(event eventstore.EventReader)
return reduceMemberCascadeRemoved(e.MemberCascadeRemovedEvent, withMemberCond(OrgMemberOrgIDCol, e.Aggregate().ID))
}
func (p *OrgMemberProjection) reduceRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgMemberProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*org.MemberRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-KPyxE", "seq", event.Sequence(), "expected", org.MemberRemovedEventType).Error("wrong event type")
@@ -118,7 +118,7 @@ func (p *OrgMemberProjection) reduceRemoved(event eventstore.EventReader) (*hand
)
}
func (p *OrgMemberProjection) reduceUserRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgMemberProjection) reduceUserRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.UserRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-f5pgn", "seq", event.Sequence(), "expected", user.UserRemovedType).Error("wrong event type")
@@ -127,7 +127,7 @@ func (p *OrgMemberProjection) reduceUserRemoved(event eventstore.EventReader) (*
return reduceMemberRemoved(e, withMemberCond(MemberUserIDCol, e.Aggregate().ID))
}
func (p *OrgMemberProjection) reduceOrgRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *OrgMemberProjection) reduceOrgRemoved(event eventstore.Event) (*handler.Statement, error) {
//TODO: as soon as org deletion is implemented:
// Case: The user has resource owner A and an org has resource owner B
// if org B deleted it works

4
internal/query/projection/org_member_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestOrgMemberProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

4
internal/query/projection/org_test.go
View File

@@ -13,12 +13,12 @@ import (
func TestOrgProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

6
internal/query/projection/password_age_policy.go
View File

@@ -65,7 +65,7 @@ func (p *PasswordAgeProjection) reducers() []handler.AggregateReducer {
}
}
func (p *PasswordAgeProjection) reduceAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *PasswordAgeProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.PasswordAgePolicyAddedEvent
var isDefault bool
switch e := event.(type) {
@@ -94,7 +94,7 @@ func (p *PasswordAgeProjection) reduceAdded(event eventstore.EventReader) (*hand
}), nil
}
func (p *PasswordAgeProjection) reduceChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *PasswordAgeProjection) reduceChanged(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.PasswordAgePolicyChangedEvent
switch e := event.(type) {
case *org.PasswordAgePolicyChangedEvent:
@@ -123,7 +123,7 @@ func (p *PasswordAgeProjection) reduceChanged(event eventstore.EventReader) (*ha
}), nil
}
func (p *PasswordAgeProjection) reduceRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *PasswordAgeProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) {
policyEvent, ok := event.(*org.PasswordAgePolicyRemovedEvent)
if !ok {
logging.LogWithFields("PROJE-iwqfN", "seq", event.Sequence(), "expectedType", org.PasswordAgePolicyRemovedEventType).Error("wrong event type")

4
internal/query/projection/password_age_policy_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestPasswordAgeProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

6
internal/query/projection/password_complexity_policy.go
View File

@@ -65,7 +65,7 @@ func (p *PasswordComplexityProjection) reducers() []handler.AggregateReducer {
}
}
func (p *PasswordComplexityProjection) reduceAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *PasswordComplexityProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.PasswordComplexityPolicyAddedEvent
var isDefault bool
switch e := event.(type) {
@@ -97,7 +97,7 @@ func (p *PasswordComplexityProjection) reduceAdded(event eventstore.EventReader)
}), nil
}
func (p *PasswordComplexityProjection) reduceChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *PasswordComplexityProjection) reduceChanged(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.PasswordComplexityPolicyChangedEvent
switch e := event.(type) {
case *org.PasswordComplexityPolicyChangedEvent:
@@ -135,7 +135,7 @@ func (p *PasswordComplexityProjection) reduceChanged(event eventstore.EventReade
}), nil
}
func (p *PasswordComplexityProjection) reduceRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *PasswordComplexityProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) {
policyEvent, ok := event.(*org.PasswordComplexityPolicyRemovedEvent)
if !ok {
logging.LogWithFields("PROJE-ibd0c", "seq", event.Sequence(), "expectedType", org.PasswordComplexityPolicyRemovedEventType).Error("wrong event type")

4
internal/query/projection/password_complexity_policy_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestPasswordComplexityProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

6
internal/query/projection/privacy_policy.go
View File

@@ -75,7 +75,7 @@ func (p *PrivacyPolicyProjection) reducers() []handler.AggregateReducer {
}
}
func (p *PrivacyPolicyProjection) reduceAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *PrivacyPolicyProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.PrivacyPolicyAddedEvent
var isDefault bool
switch e := event.(type) {
@@ -104,7 +104,7 @@ func (p *PrivacyPolicyProjection) reduceAdded(event eventstore.EventReader) (*ha
}), nil
}
func (p *PrivacyPolicyProjection) reduceChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *PrivacyPolicyProjection) reduceChanged(event eventstore.Event) (*handler.Statement, error) {
var policyEvent policy.PrivacyPolicyChangedEvent
switch e := event.(type) {
case *org.PrivacyPolicyChangedEvent:
@@ -133,7 +133,7 @@ func (p *PrivacyPolicyProjection) reduceChanged(event eventstore.EventReader) (*
}), nil
}
func (p *PrivacyPolicyProjection) reduceRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *PrivacyPolicyProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) {
policyEvent, ok := event.(*org.PrivacyPolicyRemovedEvent)
if !ok {
logging.LogWithFields("PROJE-hN5Ip", "seq", event.Sequence(), "expectedType", org.PrivacyPolicyRemovedEventType).Error("wrong event type")

4
internal/query/projection/privacy_policy_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestPrivacyPolicyProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

10
internal/query/projection/project.go
View File

@@ -73,7 +73,7 @@ const (
ProjectColumnSequence = "sequence"
)
func (p *ProjectProjection) reduceProjectAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectProjection) reduceProjectAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.ProjectAddedEvent)
if !ok {
logging.LogWithFields("HANDL-MFOsd", "seq", event.Sequence(), "expectedType", project.ProjectAddedType).Error("wrong event type")
@@ -98,7 +98,7 @@ func (p *ProjectProjection) reduceProjectAdded(event eventstore.EventReader) (*h
), nil
}
func (p *ProjectProjection) reduceProjectChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectProjection) reduceProjectChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.ProjectChangeEvent)
if !ok {
logging.LogWithFields("HANDL-dk2iF", "seq", event.Sequence(), "expected", project.ProjectChangedType).Error("wrong event type")
@@ -135,7 +135,7 @@ func (p *ProjectProjection) reduceProjectChanged(event eventstore.EventReader) (
), nil
}
func (p *ProjectProjection) reduceProjectDeactivated(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectProjection) reduceProjectDeactivated(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.ProjectDeactivatedEvent)
if !ok {
logging.LogWithFields("HANDL-8Nf2s", "seq", event.Sequence(), "expectedType", project.ProjectDeactivatedType).Error("wrong event type")
@@ -154,7 +154,7 @@ func (p *ProjectProjection) reduceProjectDeactivated(event eventstore.EventReade
), nil
}
func (p *ProjectProjection) reduceProjectReactivated(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectProjection) reduceProjectReactivated(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.ProjectReactivatedEvent)
if !ok {
logging.LogWithFields("HANDL-sm99f", "seq", event.Sequence(), "expectedType", project.ProjectReactivatedType).Error("wrong event type")
@@ -173,7 +173,7 @@ func (p *ProjectProjection) reduceProjectReactivated(event eventstore.EventReade
), nil
}
func (p *ProjectProjection) reduceProjectRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectProjection) reduceProjectRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.ProjectRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-mL0sf", "seq", event.Sequence(), "expectedType", project.ProjectRemovedType).Error("wrong event type")

14
internal/query/projection/project_grant.go
View File

@@ -78,7 +78,7 @@ const (
ProjectGrantColumnCreator = "creator_id"
)
func (p *ProjectGrantProjection) reduceProjectGrantAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectGrantProjection) reduceProjectGrantAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.GrantAddedEvent)
if !ok {
logging.LogWithFields("HANDL-Mi4g9", "seq", event.Sequence(), "expectedType", project.GrantAddedType).Error("wrong event type")
@@ -101,7 +101,7 @@ func (p *ProjectGrantProjection) reduceProjectGrantAdded(event eventstore.EventR
), nil
}
func (p *ProjectGrantProjection) reduceProjectGrantChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectGrantProjection) reduceProjectGrantChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.GrantChangedEvent)
if !ok {
logging.LogWithFields("HANDL-M00fH", "seq", event.Sequence(), "expectedType", project.GrantChangedType).Error("wrong event type")
@@ -121,7 +121,7 @@ func (p *ProjectGrantProjection) reduceProjectGrantChanged(event eventstore.Even
), nil
}
func (p *ProjectGrantProjection) reduceProjectGrantCascadeChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectGrantProjection) reduceProjectGrantCascadeChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.GrantCascadeChangedEvent)
if !ok {
logging.LogWithFields("HANDL-K0fwR", "seq", event.Sequence(), "expectedType", project.GrantCascadeChangedType).Error("wrong event type")
@@ -141,7 +141,7 @@ func (p *ProjectGrantProjection) reduceProjectGrantCascadeChanged(event eventsto
), nil
}
func (p *ProjectGrantProjection) reduceProjectGrantDeactivated(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectGrantProjection) reduceProjectGrantDeactivated(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.GrantDeactivateEvent)
if !ok {
logging.LogWithFields("HANDL-Ple9f", "seq", event.Sequence(), "expectedType", project.GrantDeactivatedType).Error("wrong event type")
@@ -161,7 +161,7 @@ func (p *ProjectGrantProjection) reduceProjectGrantDeactivated(event eventstore.
), nil
}
func (p *ProjectGrantProjection) reduceProjectGrantReactivated(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectGrantProjection) reduceProjectGrantReactivated(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.GrantReactivatedEvent)
if !ok {
logging.LogWithFields("HANDL-Ip0hr", "seq", event.Sequence(), "expectedType", project.GrantReactivatedType).Error("wrong event type")
@@ -181,7 +181,7 @@ func (p *ProjectGrantProjection) reduceProjectGrantReactivated(event eventstore.
), nil
}
func (p *ProjectGrantProjection) reduceProjectGrantRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectGrantProjection) reduceProjectGrantRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.GrantRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-M0pfs", "seq", event.Sequence(), "expectedType", project.GrantRemovedType).Error("wrong event type")
@@ -196,7 +196,7 @@ func (p *ProjectGrantProjection) reduceProjectGrantRemoved(event eventstore.Even
), nil
}
func (p *ProjectGrantProjection) reduceProjectRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectGrantProjection) reduceProjectRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.ProjectRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-Ms0fe", "seq", event.Sequence(), "expectedType", project.ProjectRemovedType).Error("wrong event type")

16
internal/query/projection/project_grant_member.go
View File

@@ -100,7 +100,7 @@ const (
ProjectGrantMemberGrantIDCol = "grant_id"
)
func (p *ProjectGrantMemberProjection) reduceAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectGrantMemberProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.GrantMemberAddedEvent)
if !ok {
logging.LogWithFields("HANDL-csr8B", "seq", event.Sequence(), "expectedType", project.GrantMemberAddedType).Error("wrong event type")
@@ -113,7 +113,7 @@ func (p *ProjectGrantMemberProjection) reduceAdded(event eventstore.EventReader)
)
}
func (p *ProjectGrantMemberProjection) reduceChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectGrantMemberProjection) reduceChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.GrantMemberChangedEvent)
if !ok {
logging.LogWithFields("HANDL-ZubbI", "seq", event.Sequence(), "expectedType", project.GrantMemberChangedType).Error("wrong event type")
@@ -126,7 +126,7 @@ func (p *ProjectGrantMemberProjection) reduceChanged(event eventstore.EventReade
)
}
func (p *ProjectGrantMemberProjection) reduceCascadeRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectGrantMemberProjection) reduceCascadeRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.GrantMemberCascadeRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-azx7K", "seq", event.Sequence(), "expectedType", project.GrantMemberCascadeRemovedType).Error("wrong event type")
@@ -139,7 +139,7 @@ func (p *ProjectGrantMemberProjection) reduceCascadeRemoved(event eventstore.Eve
)
}
func (p *ProjectGrantMemberProjection) reduceRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectGrantMemberProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.GrantMemberRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-6Z4dH", "seq", event.Sequence(), "expectedType", project.GrantMemberRemovedType).Error("wrong event type")
@@ -152,7 +152,7 @@ func (p *ProjectGrantMemberProjection) reduceRemoved(event eventstore.EventReade
)
}
func (p *ProjectGrantMemberProjection) reduceUserRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectGrantMemberProjection) reduceUserRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.UserRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-UVMmT", "seq", event.Sequence(), "expected", user.UserRemovedType).Error("wrong event type")
@@ -161,7 +161,7 @@ func (p *ProjectGrantMemberProjection) reduceUserRemoved(event eventstore.EventR
return reduceMemberRemoved(e, withMemberCond(MemberUserIDCol, e.Aggregate().ID))
}
func (p *ProjectGrantMemberProjection) reduceOrgRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectGrantMemberProjection) reduceOrgRemoved(event eventstore.Event) (*handler.Statement, error) {
//TODO: as soon as org deletion is implemented:
// Case: The user has resource owner A and project has resource owner B
// if org B deleted it works
@@ -174,7 +174,7 @@ func (p *ProjectGrantMemberProjection) reduceOrgRemoved(event eventstore.EventRe
return reduceMemberRemoved(e, withMemberCond(MemberResourceOwner, e.Aggregate().ID))
}
func (p *ProjectGrantMemberProjection) reduceProjectRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectGrantMemberProjection) reduceProjectRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.ProjectRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-sGmCA", "seq", event.Sequence(), "expected", project.ProjectRemovedType).Error("wrong event type")
@@ -183,7 +183,7 @@ func (p *ProjectGrantMemberProjection) reduceProjectRemoved(event eventstore.Eve
return reduceMemberRemoved(e, withMemberCond(ProjectGrantMemberProjectIDCol, e.Aggregate().ID))
}
func (p *ProjectGrantMemberProjection) reduceProjectGrantRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectGrantMemberProjection) reduceProjectGrantRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.GrantRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-sHabO", "seq", event.Sequence(), "expected", project.GrantRemovedType).Error("wrong event type")

4
internal/query/projection/project_grant_member_test.go
View File

@@ -15,12 +15,12 @@ import (
func TestProjectGrantMemberProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

4
internal/query/projection/project_grant_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestProjectGrantProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

14
internal/query/projection/project_member.go
View File

@@ -90,7 +90,7 @@ const (
ProjectMemberProjectIDCol = "project_id"
)
func (p *ProjectMemberProjection) reduceAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectMemberProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.MemberAddedEvent)
if !ok {
logging.LogWithFields("HANDL-3FRys", "seq", event.Sequence(), "expectedType", project.MemberAddedType).Error("wrong event type")
@@ -102,7 +102,7 @@ func (p *ProjectMemberProjection) reduceAdded(event eventstore.EventReader) (*ha
)
}
func (p *ProjectMemberProjection) reduceChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectMemberProjection) reduceChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.MemberChangedEvent)
if !ok {
logging.LogWithFields("HANDL-9hgMR", "seq", event.Sequence(), "expectedType", project.MemberChangedType).Error("wrong event type")
@@ -114,7 +114,7 @@ func (p *ProjectMemberProjection) reduceChanged(event eventstore.EventReader) (*
)
}
func (p *ProjectMemberProjection) reduceCascadeRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectMemberProjection) reduceCascadeRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.MemberCascadeRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-2kyYa", "seq", event.Sequence(), "expectedType", project.MemberCascadeRemovedType).Error("wrong event type")
@@ -126,7 +126,7 @@ func (p *ProjectMemberProjection) reduceCascadeRemoved(event eventstore.EventRea
)
}
func (p *ProjectMemberProjection) reduceRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectMemberProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.MemberRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-X0yvM", "seq", event.Sequence(), "expectedType", project.MemberRemovedType).Error("wrong event type")
@@ -138,7 +138,7 @@ func (p *ProjectMemberProjection) reduceRemoved(event eventstore.EventReader) (*
)
}
func (p *ProjectMemberProjection) reduceUserRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectMemberProjection) reduceUserRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.UserRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-g8eWd", "seq", event.Sequence(), "expected", user.UserRemovedType).Error("wrong event type")
@@ -147,7 +147,7 @@ func (p *ProjectMemberProjection) reduceUserRemoved(event eventstore.EventReader
return reduceMemberRemoved(e, withMemberCond(MemberUserIDCol, e.Aggregate().ID))
}
func (p *ProjectMemberProjection) reduceOrgRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectMemberProjection) reduceOrgRemoved(event eventstore.Event) (*handler.Statement, error) {
//TODO: as soon as org deletion is implemented:
// Case: The user has resource owner A and project has resource owner B
// if org B deleted it works
@@ -160,7 +160,7 @@ func (p *ProjectMemberProjection) reduceOrgRemoved(event eventstore.EventReader)
return reduceMemberRemoved(e, withMemberCond(MemberResourceOwner, e.Aggregate().ID))
}
func (p *ProjectMemberProjection) reduceProjectRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectMemberProjection) reduceProjectRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.ProjectRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-q7H8D", "seq", event.Sequence(), "expected", project.ProjectRemovedType).Error("wrong event type")

4
internal/query/projection/project_member_test.go
View File

@@ -15,12 +15,12 @@ import (
func TestProjectMemberProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

8
internal/query/projection/project_role.go
View File

@@ -63,7 +63,7 @@ const (
ProjectRoleColumnCreator = "creator_id"
)
func (p *ProjectRoleProjection) reduceProjectRoleAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectRoleProjection) reduceProjectRoleAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.RoleAddedEvent)
if !ok {
logging.LogWithFields("HANDL-Fmre5", "seq", event.Sequence(), "expectedType", project.RoleAddedType).Error("wrong event type")
@@ -85,7 +85,7 @@ func (p *ProjectRoleProjection) reduceProjectRoleAdded(event eventstore.EventRea
), nil
}
func (p *ProjectRoleProjection) reduceProjectRoleChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectRoleProjection) reduceProjectRoleChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.RoleChangedEvent)
if !ok {
logging.LogWithFields("HANDL-M0fwg", "seq", event.Sequence(), "expectedType", project.GrantChangedType).Error("wrong event type")
@@ -113,7 +113,7 @@ func (p *ProjectRoleProjection) reduceProjectRoleChanged(event eventstore.EventR
), nil
}
func (p *ProjectRoleProjection) reduceProjectRoleRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectRoleProjection) reduceProjectRoleRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.RoleRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-MlokF", "seq", event.Sequence(), "expectedType", project.GrantRemovedType).Error("wrong event type")
@@ -128,7 +128,7 @@ func (p *ProjectRoleProjection) reduceProjectRoleRemoved(event eventstore.EventR
), nil
}
func (p *ProjectRoleProjection) reduceProjectRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *ProjectRoleProjection) reduceProjectRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*project.ProjectRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-hm90R", "seq", event.Sequence(), "expectedType", project.ProjectRemovedType).Error("wrong event type")

4
internal/query/projection/project_role_test.go
View File

@@ -12,12 +12,12 @@ import (
func TestProjectRoleProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

4
internal/query/projection/project_test.go
View File

@@ -13,12 +13,12 @@ import (
func TestProjectProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{

36
internal/query/projection/user.go
View File

@@ -186,7 +186,7 @@ func (p *UserProjection) reducers() []handler.AggregateReducer {
}
}
func (p *UserProjection) reduceHumanAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceHumanAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.HumanAddedEvent)
if !ok {
logging.LogWithFields("HANDL-Cw9BX", "seq", event.Sequence(), "expectedType", user.HumanAddedType).Error("wrong event type")
@@ -222,7 +222,7 @@ func (p *UserProjection) reduceHumanAdded(event eventstore.EventReader) (*handle
), nil
}
func (p *UserProjection) reduceHumanRegistered(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceHumanRegistered(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.HumanRegisteredEvent)
if !ok {
logging.LogWithFields("HANDL-qoZyC", "seq", event.Sequence(), "expectedType", user.HumanRegisteredType).Error("wrong event type")
@@ -258,7 +258,7 @@ func (p *UserProjection) reduceHumanRegistered(event eventstore.EventReader) (*h
), nil
}
func (p *UserProjection) reduceUserLocked(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceUserLocked(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.UserLockedEvent)
if !ok {
logging.LogWithFields("HANDL-c6irw", "seq", event.Sequence(), "expectedType", user.UserLockedType).Error("wrong event type")
@@ -278,7 +278,7 @@ func (p *UserProjection) reduceUserLocked(event eventstore.EventReader) (*handle
), nil
}
func (p *UserProjection) reduceUserUnlocked(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceUserUnlocked(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.UserUnlockedEvent)
if !ok {
logging.LogWithFields("HANDL-eyHv5", "seq", event.Sequence(), "expectedType", user.UserUnlockedType).Error("wrong event type")
@@ -298,7 +298,7 @@ func (p *UserProjection) reduceUserUnlocked(event eventstore.EventReader) (*hand
), nil
}
func (p *UserProjection) reduceUserDeactivated(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceUserDeactivated(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.UserDeactivatedEvent)
if !ok {
logging.LogWithFields("HANDL-EqbaJ", "seq", event.Sequence(), "expectedType", user.UserDeactivatedType).Error("wrong event type")
@@ -318,7 +318,7 @@ func (p *UserProjection) reduceUserDeactivated(event eventstore.EventReader) (*h
), nil
}
func (p *UserProjection) reduceUserReactivated(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceUserReactivated(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.UserReactivatedEvent)
if !ok {
logging.LogWithFields("HANDL-kAaBr", "seq", event.Sequence(), "expectedType", user.UserReactivatedType).Error("wrong event type")
@@ -338,7 +338,7 @@ func (p *UserProjection) reduceUserReactivated(event eventstore.EventReader) (*h
), nil
}
func (p *UserProjection) reduceUserRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceUserRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.UserRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-n2JMe", "seq", event.Sequence(), "expectedType", user.UserRemovedType).Error("wrong event type")
@@ -353,7 +353,7 @@ func (p *UserProjection) reduceUserRemoved(event eventstore.EventReader) (*handl
), nil
}
func (p *UserProjection) reduceUserNameChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceUserNameChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.UsernameChangedEvent)
if !ok {
logging.LogWithFields("HANDL-7J5xL", "seq", event.Sequence(), "expectedType", user.UserUserNameChangedType).Error("wrong event type")
@@ -373,7 +373,7 @@ func (p *UserProjection) reduceUserNameChanged(event eventstore.EventReader) (*h
), nil
}
func (p *UserProjection) reduceHumanProfileChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceHumanProfileChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.HumanProfileChangedEvent)
if !ok {
logging.LogWithFields("HANDL-Dwfyn", "seq", event.Sequence(), "expectedType", user.HumanProfileChangedType).Error("wrong event type")
@@ -425,7 +425,7 @@ func (p *UserProjection) reduceHumanProfileChanged(event eventstore.EventReader)
), nil
}
func (p *UserProjection) reduceHumanPhoneChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceHumanPhoneChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.HumanPhoneChangedEvent)
if !ok {
logging.LogWithFields("HANDL-pnRqf", "seq", event.Sequence(), "expectedType", user.HumanPhoneChangedType).Error("wrong event type")
@@ -456,7 +456,7 @@ func (p *UserProjection) reduceHumanPhoneChanged(event eventstore.EventReader) (
), nil
}
func (p *UserProjection) reduceHumanPhoneRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceHumanPhoneRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.HumanPhoneRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-eMpOG", "seq", event.Sequence(), "expectedType", user.HumanPhoneRemovedType).Error("wrong event type")
@@ -487,7 +487,7 @@ func (p *UserProjection) reduceHumanPhoneRemoved(event eventstore.EventReader) (
), nil
}
func (p *UserProjection) reduceHumanPhoneVerified(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceHumanPhoneVerified(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.HumanPhoneVerifiedEvent)
if !ok {
logging.LogWithFields("HANDL-GhFOY", "seq", event.Sequence(), "expectedType", user.HumanPhoneVerifiedType).Error("wrong event type")
@@ -517,7 +517,7 @@ func (p *UserProjection) reduceHumanPhoneVerified(event eventstore.EventReader)
), nil
}
func (p *UserProjection) reduceHumanEmailChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceHumanEmailChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.HumanEmailChangedEvent)
if !ok {
logging.LogWithFields("HANDL-MDfHX", "seq", event.Sequence(), "expectedType", user.HumanEmailChangedType).Error("wrong event type")
@@ -548,7 +548,7 @@ func (p *UserProjection) reduceHumanEmailChanged(event eventstore.EventReader) (
), nil
}
func (p *UserProjection) reduceHumanEmailVerified(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceHumanEmailVerified(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.HumanEmailVerifiedEvent)
if !ok {
logging.LogWithFields("HANDL-FdN0b", "seq", event.Sequence(), "expectedType", user.HumanEmailVerifiedType).Error("wrong event type")
@@ -578,7 +578,7 @@ func (p *UserProjection) reduceHumanEmailVerified(event eventstore.EventReader)
), nil
}
func (p *UserProjection) reduceHumanAvatarAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceHumanAvatarAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.HumanAvatarAddedEvent)
if !ok {
logging.LogWithFields("HANDL-naQue", "seq", event.Sequence(), "expectedType", user.HumanAvatarAddedType).Error("wrong event type")
@@ -608,7 +608,7 @@ func (p *UserProjection) reduceHumanAvatarAdded(event eventstore.EventReader) (*
), nil
}
func (p *UserProjection) reduceHumanAvatarRemoved(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceHumanAvatarRemoved(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.HumanAvatarRemovedEvent)
if !ok {
logging.LogWithFields("HANDL-c6zoV", "seq", event.Sequence(), "expectedType", user.HumanAvatarRemovedType).Error("wrong event type")
@@ -638,7 +638,7 @@ func (p *UserProjection) reduceHumanAvatarRemoved(event eventstore.EventReader)
), nil
}
func (p *UserProjection) reduceMachineAdded(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceMachineAdded(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.MachineAddedEvent)
if !ok {
logging.LogWithFields("HANDL-8xr78", "seq", event.Sequence(), "expectedType", user.MachineAddedEventType).Error("wrong event type")
@@ -669,7 +669,7 @@ func (p *UserProjection) reduceMachineAdded(event eventstore.EventReader) (*hand
), nil
}
func (p *UserProjection) reduceMachineChanged(event eventstore.EventReader) (*handler.Statement, error) {
func (p *UserProjection) reduceMachineChanged(event eventstore.Event) (*handler.Statement, error) {
e, ok := event.(*user.MachineChangedEvent)
if !ok {
logging.LogWithFields("HANDL-uUFCy", "seq", event.Sequence(), "expectedType", user.MachineChangedEventType).Error("wrong event type")

4
internal/query/projection/user_test.go
View File

@@ -14,12 +14,12 @@ import (
func TestUserProjection_reduces(t *testing.T) {
type args struct {
event func(t *testing.T) eventstore.EventReader
event func(t *testing.T) eventstore.Event
}
tests := []struct {
name string
args args
reduce func(event eventstore.EventReader) (*handler.Statement, error)
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
{