From 09be70949f8a971eabfa2475a5e4e2dbd51a8736 Mon Sep 17 00:00:00 2001 From: Silvan Date: Mon, 3 Jan 2022 09:19:07 +0100 Subject: [PATCH] refactor(eventstore): rename EventPusher to Command, EventReader to Event, PushEvents to Push and FilterEvents to Filter (#2907) --- .../eventsourcing/eventstore/key.go | 4 +- internal/command/command.go | 4 +- internal/command/custom_login_text.go | 142 +++++++++--------- .../command/existing_label_policies_model.go | 2 +- internal/command/iam.go | 5 +- internal/command/iam_custom_login_text.go | 6 +- .../command/iam_custom_login_text_model.go | 2 +- internal/command/iam_custom_message_text.go | 6 +- .../command/iam_custom_message_text_model.go | 2 +- internal/command/iam_custom_text.go | 4 +- internal/command/iam_custom_text_model.go | 2 +- internal/command/iam_features.go | 2 +- internal/command/iam_features_model.go | 2 +- internal/command/iam_idp_config.go | 14 +- internal/command/iam_idp_config_model.go | 4 +- internal/command/iam_idp_jwt_config.go | 2 +- internal/command/iam_idp_jwt_config_model.go | 2 +- internal/command/iam_idp_oidc_config.go | 3 +- internal/command/iam_idp_oidc_config_model.go | 2 +- internal/command/iam_member.go | 10 +- internal/command/iam_member_model.go | 2 +- internal/command/iam_policy_label.go | 29 ++-- internal/command/iam_policy_label_model.go | 2 +- internal/command/iam_policy_login.go | 28 ++-- .../command/iam_policy_login_factors_model.go | 4 +- ...am_policy_login_identity_provider_model.go | 2 +- internal/command/iam_policy_login_model.go | 2 +- internal/command/iam_policy_mail_template.go | 9 +- .../command/iam_policy_mail_template_model.go | 2 +- internal/command/iam_policy_org_iam.go | 7 +- internal/command/iam_policy_org_iam_model.go | 2 +- internal/command/iam_policy_password_age.go | 7 +- .../command/iam_policy_password_age_model.go | 2 +- .../command/iam_policy_password_complexity.go | 7 +- .../iam_policy_password_complexity_model.go | 2 +- .../command/iam_policy_password_lockout.go | 7 +- .../iam_policy_password_lockout_model.go | 2 +- internal/command/iam_policy_privacy.go | 7 +- internal/command/iam_policy_privacy_model.go | 2 +- internal/command/idp_config_model.go | 2 +- internal/command/key_pair.go | 2 +- internal/command/key_pair_model.go | 2 +- internal/command/main_test.go | 6 +- internal/command/org.go | 20 +-- internal/command/org_action.go | 20 +-- internal/command/org_custom_login_text.go | 10 +- .../command/org_custom_login_text_model.go | 4 +- internal/command/org_custom_message_model.go | 4 +- internal/command/org_custom_message_text.go | 12 +- internal/command/org_domain.go | 30 ++-- internal/command/org_domain_model.go | 4 +- internal/command/org_features.go | 18 +-- internal/command/org_features_model.go | 2 +- internal/command/org_flow.go | 4 +- internal/command/org_flow_model.go | 2 +- internal/command/org_idp_config.go | 16 +- internal/command/org_idp_config_model.go | 4 +- internal/command/org_idp_jwt_config.go | 2 +- internal/command/org_idp_jwt_config_model.go | 2 +- internal/command/org_idp_oidc_config.go | 3 +- internal/command/org_idp_oidc_config_model.go | 2 +- internal/command/org_member.go | 10 +- internal/command/org_member_model.go | 2 +- internal/command/org_policy_label.go | 28 ++-- internal/command/org_policy_label_model.go | 2 +- internal/command/org_policy_lockout.go | 6 +- internal/command/org_policy_lockout_model.go | 2 +- internal/command/org_policy_login.go | 22 +-- .../command/org_policy_login_factors_model.go | 4 +- ...rg_policy_login_identity_provider_model.go | 2 +- internal/command/org_policy_login_model.go | 2 +- internal/command/org_policy_mail_template.go | 6 +- .../command/org_policy_mail_template_model.go | 2 +- internal/command/org_policy_org_iam.go | 9 +- internal/command/org_policy_org_iam_model.go | 2 +- internal/command/org_policy_password_age.go | 6 +- .../command/org_policy_password_age_model.go | 2 +- .../command/org_policy_password_complexity.go | 6 +- .../org_policy_password_complexity_model.go | 2 +- internal/command/org_policy_privacy.go | 6 +- internal/command/org_policy_privacy_model.go | 2 +- internal/command/project.go | 17 ++- internal/command/project_application.go | 9 +- internal/command/project_application_api.go | 14 +- .../command/project_application_api_model.go | 2 +- internal/command/project_application_key.go | 4 +- .../command/project_application_key_model.go | 2 +- internal/command/project_application_model.go | 2 +- internal/command/project_application_oidc.go | 14 +- .../command/project_application_oidc_model.go | 2 +- internal/command/project_grant.go | 21 +-- internal/command/project_grant_member.go | 8 +- .../command/project_grant_member_model.go | 2 +- internal/command/project_grant_model.go | 2 +- internal/command/project_member.go | 10 +- internal/command/project_member_model.go | 2 +- internal/command/project_role.go | 15 +- internal/command/project_role_model.go | 2 +- internal/command/setup.go | 7 +- internal/command/setup_step1.go | 8 +- internal/command/setup_step10.go | 4 +- internal/command/setup_step11.go | 5 +- internal/command/setup_step12.go | 4 +- internal/command/setup_step13.go | 5 +- internal/command/setup_step14.go | 4 +- internal/command/setup_step15.go | 5 +- internal/command/setup_step16.go | 5 +- internal/command/setup_step17.go | 5 +- internal/command/setup_step18.go | 5 +- internal/command/setup_step19.go | 16 +- internal/command/setup_step2.go | 4 +- internal/command/setup_step20.go | 2 +- internal/command/setup_step21.go | 4 +- internal/command/setup_step3.go | 4 +- internal/command/setup_step4.go | 2 +- internal/command/setup_step5.go | 4 +- internal/command/setup_step6.go | 4 +- internal/command/setup_step7.go | 7 +- internal/command/setup_step8.go | 7 +- internal/command/setup_step9.go | 9 +- internal/command/unique_constraints_model.go | 2 +- internal/command/user.go | 24 +-- internal/command/user_grant.go | 26 ++-- internal/command/user_human.go | 24 +-- .../command/user_human_access_token_model.go | 2 +- internal/command/user_human_address.go | 3 +- internal/command/user_human_avatar.go | 4 +- internal/command/user_human_email.go | 13 +- internal/command/user_human_init.go | 13 +- internal/command/user_human_otp.go | 10 +- internal/command/user_human_password.go | 20 +-- internal/command/user_human_phone.go | 15 +- internal/command/user_human_profile.go | 2 +- internal/command/user_human_refresh_token.go | 10 +- .../command/user_human_refresh_token_model.go | 2 +- internal/command/user_human_webauthn.go | 40 ++--- internal/command/user_human_webauthn_model.go | 12 +- internal/command/user_idp_link.go | 12 +- internal/command/user_idp_link_model.go | 2 +- internal/command/user_machine.go | 4 +- internal/command/user_machine_key.go | 4 +- internal/command/user_machine_key_model.go | 2 +- internal/command/user_membership.go | 4 +- internal/command/user_metadata.go | 24 +-- internal/command/user_metadata_model.go | 6 +- internal/eventstore/event.go | 6 +- internal/eventstore/event_base.go | 6 +- internal/eventstore/eventstore.go | 60 ++++---- internal/eventstore/eventstore_test.go | 102 ++++++------- internal/eventstore/example_test.go | 20 +-- .../eventstore/handler/crdb/handler_stmt.go | 2 +- .../handler/crdb/handler_stmt_test.go | 6 +- internal/eventstore/handler/crdb/reduce.go | 2 +- internal/eventstore/handler/crdb/statement.go | 30 ++-- .../eventstore/handler/crdb/statement_test.go | 6 +- internal/eventstore/handler/handler.go | 4 +- .../eventstore/handler/handler_projection.go | 6 +- .../handler/handler_projection_test.go | 6 +- internal/eventstore/read_model.go | 16 +- internal/eventstore/subscription.go | 12 +- internal/eventstore/write_model.go | 14 +- internal/query/iam_idp_config_model.go | 2 +- internal/query/iam_idp_configs_model.go | 2 +- internal/query/iam_member_model.go | 2 +- internal/query/iam_members_model.go | 2 +- internal/query/iam_model.go | 4 +- internal/query/iam_policy_label_model.go | 2 +- internal/query/iam_policy_login_model.go | 2 +- internal/query/iam_policy_org_iam_model.go | 2 +- .../query/iam_policy_password_age_model.go | 2 +- .../iam_policy_password_complexity_model.go | 2 +- .../iam_policy_password_lockout_model.go | 2 +- internal/query/idp_config_model.go | 2 +- internal/query/idp_configs_model.go | 2 +- internal/query/members_model.go | 2 +- internal/query/org_member_model.go | 4 +- internal/query/org_policy_label_model.go | 2 +- internal/query/org_policy_login_model.go | 2 +- internal/query/org_policy_org_iam_model.go | 2 +- .../query/org_policy_password_age_model.go | 2 +- .../org_policy_password_complexity_model.go | 2 +- .../org_policy_password_lockout_model.go | 2 +- internal/query/projection/action.go | 10 +- internal/query/projection/action_test.go | 4 +- internal/query/projection/app.go | 24 +-- internal/query/projection/app_test.go | 4 +- internal/query/projection/authn_key.go | 6 +- internal/query/projection/authn_key_test.go | 4 +- internal/query/projection/custom_text.go | 6 +- internal/query/projection/custom_text_test.go | 4 +- internal/query/projection/event_test.go | 6 +- internal/query/projection/feature.go | 4 +- internal/query/projection/feature_test.go | 4 +- internal/query/projection/flow.go | 6 +- internal/query/projection/flow/flow.go | 12 +- internal/query/projection/flow_test.go | 4 +- internal/query/projection/iam_member.go | 10 +- internal/query/projection/iam_member_test.go | 4 +- internal/query/projection/idp.go | 18 +-- .../query/projection/idp_login_policy_link.go | 10 +- .../projection/idp_login_policy_link_test.go | 4 +- internal/query/projection/idp_test.go | 4 +- internal/query/projection/idp_user_link.go | 12 +- .../query/projection/idp_user_link_test.go | 4 +- internal/query/projection/key.go | 4 +- internal/query/projection/key_test.go | 4 +- internal/query/projection/label_policy.go | 22 +-- .../query/projection/label_policy_test.go | 4 +- internal/query/projection/lockout_policy.go | 6 +- .../query/projection/lockout_policy_test.go | 4 +- internal/query/projection/login_name.go | 20 +-- internal/query/projection/login_name_test.go | 4 +- internal/query/projection/login_policy.go | 14 +- .../query/projection/login_policy_test.go | 4 +- internal/query/projection/mail_template.go | 6 +- .../query/projection/mail_template_test.go | 4 +- internal/query/projection/member.go | 2 +- .../query/projection/message_text_test.go | 4 +- internal/query/projection/message_texts.go | 6 +- internal/query/projection/org.go | 10 +- .../query/projection/org/owner/projection.go | 24 +-- internal/query/projection/org_domain.go | 10 +- internal/query/projection/org_domain_test.go | 4 +- internal/query/projection/org_iam_policy.go | 6 +- .../query/projection/org_iam_policy_test.go | 4 +- internal/query/projection/org_member.go | 12 +- internal/query/projection/org_member_test.go | 4 +- internal/query/projection/org_test.go | 4 +- .../query/projection/password_age_policy.go | 6 +- .../projection/password_age_policy_test.go | 4 +- .../projection/password_complexity_policy.go | 6 +- .../password_complexity_policy_test.go | 4 +- internal/query/projection/privacy_policy.go | 6 +- .../query/projection/privacy_policy_test.go | 4 +- internal/query/projection/project.go | 10 +- internal/query/projection/project_grant.go | 14 +- .../query/projection/project_grant_member.go | 16 +- .../projection/project_grant_member_test.go | 4 +- .../query/projection/project_grant_test.go | 4 +- internal/query/projection/project_member.go | 14 +- .../query/projection/project_member_test.go | 4 +- internal/query/projection/project_role.go | 8 +- .../query/projection/project_role_test.go | 4 +- internal/query/projection/project_test.go | 4 +- internal/query/projection/user.go | 36 ++--- internal/query/projection/user_test.go | 4 +- internal/query/user.go | 4 +- internal/query/user_model.go | 4 +- internal/repository/action/action.go | 10 +- internal/repository/asset/asset.go | 4 +- internal/repository/features/features.go | 4 +- internal/repository/flow/flow.go | 6 +- internal/repository/iam/custom_text.go | 6 +- .../repository/iam/event_iam_project_set.go | 3 +- internal/repository/iam/event_org_set.go | 3 +- internal/repository/iam/events_step.go | 2 +- internal/repository/iam/features.go | 3 +- internal/repository/iam/idp_config.go | 11 +- internal/repository/iam/idp_jwt_config.go | 4 +- internal/repository/iam/idp_oidc_config.go | 5 +- internal/repository/iam/member.go | 9 +- .../iam/migrate_unique_constraints.go | 3 +- internal/repository/iam/policy_label.go | 29 ++-- internal/repository/iam/policy_login.go | 5 +- .../repository/iam/policy_login_factors.go | 9 +- .../iam/policy_login_identity_provider.go | 7 +- .../repository/iam/policy_mail_template.go | 5 +- internal/repository/iam/policy_mail_text.go | 5 +- internal/repository/iam/policy_org_iam.go | 5 +- .../repository/iam/policy_password_age.go | 5 +- .../iam/policy_password_complexity.go | 5 +- .../repository/iam/policy_password_lockout.go | 5 +- internal/repository/iam/policy_privacy.go | 5 +- internal/repository/idpconfig/idp_config.go | 10 +- internal/repository/idpconfig/jwt_config.go | 4 +- internal/repository/idpconfig/oidc_config.go | 5 +- internal/repository/keypair/key_pair.go | 5 +- internal/repository/member/events.go | 9 +- internal/repository/metadata/metadata.go | 6 +- internal/repository/org/custom_text.go | 6 +- internal/repository/org/domain.go | 13 +- internal/repository/org/features.go | 5 +- internal/repository/org/flow.go | 6 +- internal/repository/org/idp_config.go | 11 +- internal/repository/org/idp_jwt_config.go | 4 +- internal/repository/org/idp_oidc_config.go | 5 +- internal/repository/org/member.go | 9 +- internal/repository/org/org.go | 10 +- internal/repository/org/policy_label.go | 30 ++-- internal/repository/org/policy_login.go | 7 +- .../repository/org/policy_login_factors.go | 9 +- .../org/policy_login_identity_provider.go | 7 +- .../repository/org/policy_mail_template.go | 7 +- internal/repository/org/policy_mail_text.go | 7 +- internal/repository/org/policy_org_iam.go | 7 +- .../repository/org/policy_password_age.go | 7 +- .../org/policy_password_complexity.go | 7 +- .../repository/org/policy_password_lockout.go | 7 +- internal/repository/org/policy_privacy.go | 7 +- internal/repository/policy/custom_text.go | 6 +- internal/repository/policy/label.go | 30 ++-- internal/repository/policy/login.go | 6 +- internal/repository/policy/mail_template.go | 7 +- internal/repository/policy/mail_text.go | 7 +- .../repository/policy/policy_login_factors.go | 9 +- .../policy/policy_login_identity_provider.go | 7 +- internal/repository/policy/policy_org_iam.go | 7 +- .../repository/policy/policy_password_age.go | 7 +- .../policy/policy_password_complexity.go | 7 +- .../policy/policy_password_lockout.go | 7 +- internal/repository/policy/policy_privacy.go | 7 +- internal/repository/project/api_config.go | 11 +- internal/repository/project/application.go | 11 +- internal/repository/project/grant.go | 13 +- internal/repository/project/grant_member.go | 9 +- internal/repository/project/key.go | 4 +- internal/repository/project/member.go | 9 +- internal/repository/project/oidc_config.go | 10 +- internal/repository/project/project.go | 10 +- internal/repository/project/role.go | 7 +- internal/repository/user/human.go | 17 ++- internal/repository/user/human_address.go | 3 +- internal/repository/user/human_avatar.go | 4 +- internal/repository/user/human_email.go | 13 +- .../repository/user/human_external_idp.go | 8 +- internal/repository/user/human_mfa_events.go | 3 +- internal/repository/user/human_mfa_otp.go | 10 +- .../repository/user/human_mfa_passwordless.go | 28 ++-- internal/repository/user/human_mfa_u2f.go | 18 +-- .../repository/user/human_mfa_web_auth_n.go | 14 +- internal/repository/user/human_password.go | 13 +- internal/repository/user/human_phone.go | 12 +- internal/repository/user/human_profile.go | 3 +- .../repository/user/human_refresh_token.go | 6 +- internal/repository/user/machine.go | 5 +- internal/repository/user/machine_key.go | 4 +- internal/repository/user/metadata.go | 6 +- internal/repository/user/user.go | 20 +-- internal/repository/usergrant/user_grant.go | 15 +- 339 files changed, 1436 insertions(+), 1346 deletions(-) diff --git a/internal/auth/repository/eventsourcing/eventstore/key.go b/internal/auth/repository/eventsourcing/eventstore/key.go index 26d529e919..dd34354030 100644 --- a/internal/auth/repository/eventsourcing/eventstore/key.go +++ b/internal/auth/repository/eventsourcing/eventstore/key.go @@ -170,6 +170,6 @@ func (k *KeyRepository) lockerID() string { return k.lockID } -func (k *KeyRepository) getKeyEvents(ctx context.Context, sequence uint64) ([]eventstore.EventReader, error) { - return k.Eventstore.FilterEvents(ctx, key_view.KeyPairQuery(sequence)) +func (k *KeyRepository) getKeyEvents(ctx context.Context, sequence uint64) ([]eventstore.Event, error) { + return k.Eventstore.Filter(ctx, key_view.KeyPairQuery(sequence)) } diff --git a/internal/command/command.go b/internal/command/command.go index ccb6c85fd6..8743e330af 100644 --- a/internal/command/command.go +++ b/internal/command/command.go @@ -158,9 +158,9 @@ func (c *Commands) getIAMWriteModel(ctx context.Context) (_ *IAMWriteModel, err } func AppendAndReduce(object interface { - AppendEvents(...eventstore.EventReader) + AppendEvents(...eventstore.Event) Reduce() error -}, events ...eventstore.EventReader) error { +}, events ...eventstore.Event) error { object.AppendEvents(events...) return object.Reduce() } diff --git a/internal/command/custom_login_text.go b/internal/command/custom_login_text.go index da04e03c74..9ea20b55d7 100644 --- a/internal/command/custom_login_text.go +++ b/internal/command/custom_login_text.go @@ -11,8 +11,8 @@ import ( "github.com/caos/zitadel/internal/repository/org" ) -func (c *Commands) createAllLoginTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createAllLoginTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) events = append(events, c.createSelectLoginTextEvents(ctx, agg, existingText, text, defaultText)...) events = append(events, c.createLoginTextEvents(ctx, agg, existingText, text, defaultText)...) events = append(events, c.createPasswordTextEvents(ctx, agg, existingText, text, defaultText)...) @@ -50,8 +50,8 @@ func (c *Commands) createAllLoginTextEvents(ctx context.Context, agg *eventstore return events } -func (c *Commands) createSelectLoginTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createSelectLoginTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeySelectAccountTitle, existingText.SelectAccountTitle, text.SelectAccount.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -87,8 +87,8 @@ func (c *Commands) createSelectLoginTextEvents(ctx context.Context, agg *eventst return events } -func (c *Commands) createLoginTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createLoginTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyLoginTitle, existingText.LoginTitle, text.Login.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -136,8 +136,8 @@ func (c *Commands) createLoginTextEvents(ctx context.Context, agg *eventstore.Ag return events } -func (c *Commands) createPasswordTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createPasswordTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyPasswordTitle, existingText.PasswordTitle, text.Password.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -189,8 +189,8 @@ func (c *Commands) createPasswordTextEvents(ctx context.Context, agg *eventstore return events } -func (c *Commands) createUsernameChangeTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createUsernameChangeTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyUsernameChangeTitle, existingText.UsernameChangeTitle, text.UsernameChange.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -214,8 +214,8 @@ func (c *Commands) createUsernameChangeTextEvents(ctx context.Context, agg *even return events } -func (c *Commands) createUsernameChangeDoneTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createUsernameChangeDoneTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyUsernameChangeDoneTitle, existingText.UsernameChangeDoneTitle, text.UsernameChangeDone.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -231,8 +231,8 @@ func (c *Commands) createUsernameChangeDoneTextEvents(ctx context.Context, agg * return events } -func (c *Commands) createPasswordInitTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createPasswordInitTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyInitPasswordTitle, existingText.InitPasswordTitle, text.InitPassword.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -264,8 +264,8 @@ func (c *Commands) createPasswordInitTextEvents(ctx context.Context, agg *events return events } -func (c *Commands) createPasswordInitDoneTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createPasswordInitDoneTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyInitPasswordDoneTitle, existingText.InitPasswordDoneTitle, text.InitPasswordDone.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -285,8 +285,8 @@ func (c *Commands) createPasswordInitDoneTextEvents(ctx context.Context, agg *ev return events } -func (c *Commands) createEmailVerificationTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createEmailVerificationTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyEmailVerificationTitle, existingText.EmailVerificationTitle, text.EmailVerification.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -310,8 +310,8 @@ func (c *Commands) createEmailVerificationTextEvents(ctx context.Context, agg *e return events } -func (c *Commands) createEmailVerificationDoneTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createEmailVerificationDoneTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyEmailVerificationDoneTitle, existingText.EmailVerificationDoneTitle, text.EmailVerificationDone.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -335,8 +335,8 @@ func (c *Commands) createEmailVerificationDoneTextEvents(ctx context.Context, ag return events } -func (c *Commands) createInitUserEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createInitUserEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyInitializeUserTitle, existingText.InitializeTitle, text.InitUser.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -368,8 +368,8 @@ func (c *Commands) createInitUserEvents(ctx context.Context, agg *eventstore.Agg return events } -func (c *Commands) createInitUserDoneEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createInitUserDoneEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyInitUserDoneTitle, existingText.InitializeDoneTitle, text.InitUserDone.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -389,8 +389,8 @@ func (c *Commands) createInitUserDoneEvents(ctx context.Context, agg *eventstore return events } -func (c *Commands) createInitMFAPromptEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createInitMFAPromptEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyInitMFAPromptTitle, existingText.InitMFAPromptTitle, text.InitMFAPrompt.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -418,8 +418,8 @@ func (c *Commands) createInitMFAPromptEvents(ctx context.Context, agg *eventstor return events } -func (c *Commands) createInitMFAOTPEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createInitMFAOTPEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyInitMFAOTPTitle, existingText.InitMFAOTPTitle, text.InitMFAOTP.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -451,8 +451,8 @@ func (c *Commands) createInitMFAOTPEvents(ctx context.Context, agg *eventstore.A return events } -func (c *Commands) createInitMFAU2FEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createInitMFAU2FEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyInitMFAU2FTitle, existingText.InitMFAU2FTitle, text.InitMFAU2F.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -480,8 +480,8 @@ func (c *Commands) createInitMFAU2FEvents(ctx context.Context, agg *eventstore.A return events } -func (c *Commands) createInitMFADoneEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createInitMFADoneEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyInitMFADoneTitle, existingText.InitMFADoneTitle, text.InitMFADone.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -501,8 +501,8 @@ func (c *Commands) createInitMFADoneEvents(ctx context.Context, agg *eventstore. return events } -func (c *Commands) crateMFAProviderEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) crateMFAProviderEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyMFAProvidersChooseOther, existingText.MFAProvidersChooseOther, text.MFAProvider.ChooseOther, text.Language, defaultText) if event != nil { events = append(events, event) @@ -518,8 +518,8 @@ func (c *Commands) crateMFAProviderEvents(ctx context.Context, agg *eventstore.A return events } -func (c *Commands) createVerifyMFAOTPEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createVerifyMFAOTPEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyVerifyMFAOTPTitle, existingText.VerifyMFAOTPTitle, text.VerifyMFAOTP.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -539,8 +539,8 @@ func (c *Commands) createVerifyMFAOTPEvents(ctx context.Context, agg *eventstore return events } -func (c *Commands) createVerifyMFAU2FEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createVerifyMFAU2FEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyVerifyMFAU2FTitle, existingText.VerifyMFAU2FTitle, text.VerifyMFAU2F.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -564,8 +564,8 @@ func (c *Commands) createVerifyMFAU2FEvents(ctx context.Context, agg *eventstore return events } -func (c *Commands) createPasswordlessEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createPasswordlessEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyPasswordlessTitle, existingText.PasswordlessTitle, text.Passwordless.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -593,8 +593,8 @@ func (c *Commands) createPasswordlessEvents(ctx context.Context, agg *eventstore return events } -func (c *Commands) createPasswordlessRegistrationEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createPasswordlessRegistrationEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyPasswordlessRegistrationTitle, existingText.PasswordlessRegistrationTitle, text.PasswordlessRegistration.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -622,8 +622,8 @@ func (c *Commands) createPasswordlessRegistrationEvents(ctx context.Context, agg return events } -func (c *Commands) createPasswordlessPromptEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createPasswordlessPromptEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyPasswordlessPromptTitle, existingText.PasswordlessPromptTitle, text.PasswordlessPrompt.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -651,8 +651,8 @@ func (c *Commands) createPasswordlessPromptEvents(ctx context.Context, agg *even return events } -func (c *Commands) createPasswordlessRegistrationDoneEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createPasswordlessRegistrationDoneEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyPasswordlessRegistrationDoneTitle, existingText.PasswordlessRegistrationDoneTitle, text.PasswordlessRegistrationDone.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -676,8 +676,8 @@ func (c *Commands) createPasswordlessRegistrationDoneEvents(ctx context.Context, return events } -func (c *Commands) createPasswordChangeEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createPasswordChangeEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyPasswordChangeTitle, existingText.PasswordChangeTitle, text.PasswordChange.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -709,8 +709,8 @@ func (c *Commands) createPasswordChangeEvents(ctx context.Context, agg *eventsto return events } -func (c *Commands) createPasswordChangeDoneEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createPasswordChangeDoneEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyPasswordChangeDoneTitle, existingText.PasswordChangeDoneTitle, text.PasswordChangeDone.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -726,8 +726,8 @@ func (c *Commands) createPasswordChangeDoneEvents(ctx context.Context, agg *even return events } -func (c *Commands) createPasswordResetDoneEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createPasswordResetDoneEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyPasswordResetDoneTitle, existingText.PasswordResetDoneTitle, text.PasswordResetDone.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -743,8 +743,8 @@ func (c *Commands) createPasswordResetDoneEvents(ctx context.Context, agg *event return events } -func (c *Commands) createRegistrationOptionEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createRegistrationOptionEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegistrationOptionTitle, existingText.RegistrationOptionTitle, text.RegisterOption.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -764,8 +764,8 @@ func (c *Commands) createRegistrationOptionEvents(ctx context.Context, agg *even return events } -func (c *Commands) createRegistrationUserEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createRegistrationUserEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegistrationUserTitle, existingText.RegistrationUserTitle, text.RegistrationUser.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -841,8 +841,8 @@ func (c *Commands) createRegistrationUserEvents(ctx context.Context, agg *events return events } -func (c *Commands) createExternalRegistrationUserOverviewEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createExternalRegistrationUserOverviewEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyExternalRegistrationUserOverviewTitle, existingText.ExternalRegistrationUserOverviewTitle, text.ExternalRegistrationUserOverview.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -910,8 +910,8 @@ func (c *Commands) createExternalRegistrationUserOverviewEvents(ctx context.Cont return events } -func (c *Commands) createRegistrationOrgEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createRegistrationOrgEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyRegisterOrgTitle, existingText.RegisterOrgTitle, text.RegistrationOrg.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -975,8 +975,8 @@ func (c *Commands) createRegistrationOrgEvents(ctx context.Context, agg *eventst return events } -func (c *Commands) createLinkingUserEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createLinkingUserEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyLinkingUserDoneTitle, existingText.LinkingUserDoneTitle, text.LinkingUsersDone.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -996,8 +996,8 @@ func (c *Commands) createLinkingUserEvents(ctx context.Context, agg *eventstore. return events } -func (c *Commands) createExternalUserNotFoundEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createExternalUserNotFoundEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyExternalNotFoundTitle, existingText.ExternalUserNotFoundTitle, text.ExternalNotFoundOption.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -1037,8 +1037,8 @@ func (c *Commands) createExternalUserNotFoundEvents(ctx context.Context, agg *ev return events } -func (c *Commands) createSuccessLoginEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createSuccessLoginEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeySuccessLoginTitle, existingText.SuccessLoginTitle, text.LoginSuccess.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -1058,8 +1058,8 @@ func (c *Commands) createSuccessLoginEvents(ctx context.Context, agg *eventstore return events } -func (c *Commands) createLogoutDoneEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createLogoutDoneEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyLogoutDoneTitle, existingText.LogoutDoneTitle, text.LogoutDone.Title, text.Language, defaultText) if event != nil { events = append(events, event) @@ -1075,8 +1075,8 @@ func (c *Commands) createLogoutDoneEvents(ctx context.Context, agg *eventstore.A return events } -func (c *Commands) createFooterTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.EventPusher { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) createFooterTextEvents(ctx context.Context, agg *eventstore.Aggregate, existingText *CustomLoginTextReadModel, text *domain.CustomLoginText, defaultText bool) []eventstore.Command { + events := make([]eventstore.Command, 0) event := c.createCustomLoginTextEvent(ctx, agg, domain.LoginKeyFooterTOS, existingText.FooterTOS, text.Footer.TOS, text.Language, defaultText) if event != nil { events = append(events, event) @@ -1096,7 +1096,7 @@ func (c *Commands) createFooterTextEvents(ctx context.Context, agg *eventstore.A return events } -func (c *Commands) createCustomLoginTextEvent(ctx context.Context, agg *eventstore.Aggregate, textKey, existingText, newText string, lang language.Tag, defaultText bool) eventstore.EventPusher { +func (c *Commands) createCustomLoginTextEvent(ctx context.Context, agg *eventstore.Aggregate, textKey, existingText, newText string, lang language.Tag, defaultText bool) eventstore.Command { if existingText == newText { return nil } diff --git a/internal/command/existing_label_policies_model.go b/internal/command/existing_label_policies_model.go index 000023afac..c306717f0e 100644 --- a/internal/command/existing_label_policies_model.go +++ b/internal/command/existing_label_policies_model.go @@ -18,7 +18,7 @@ func NewExistingLabelPoliciesReadModel(ctx context.Context) *ExistingLabelPolici return &ExistingLabelPoliciesReadModel{} } -func (rm *ExistingLabelPoliciesReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *ExistingLabelPoliciesReadModel) AppendEvents(events ...eventstore.Event) { rm.WriteModel.AppendEvents(events...) } diff --git a/internal/command/iam.go b/internal/command/iam.go index c0823254a3..a234647b12 100644 --- a/internal/command/iam.go +++ b/internal/command/iam.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/zitadel/internal/domain" caos_errs "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore" @@ -18,7 +19,7 @@ func (c *Commands) GetIAM(ctx context.Context) (*domain.IAM, error) { return writeModelToIAM(iamWriteModel), nil } -func (c *Commands) setGlobalOrg(ctx context.Context, iamAgg *eventstore.Aggregate, iamWriteModel *IAMWriteModel, orgID string) (eventstore.EventPusher, error) { +func (c *Commands) setGlobalOrg(ctx context.Context, iamAgg *eventstore.Aggregate, iamWriteModel *IAMWriteModel, orgID string) (eventstore.Command, error) { err := c.eventstore.FilterToQueryReducer(ctx, iamWriteModel) if err != nil { return nil, err @@ -29,7 +30,7 @@ func (c *Commands) setGlobalOrg(ctx context.Context, iamAgg *eventstore.Aggregat return iam.NewGlobalOrgSetEventEvent(ctx, iamAgg, orgID), nil } -func (c *Commands) setIAMProject(ctx context.Context, iamAgg *eventstore.Aggregate, iamWriteModel *IAMWriteModel, projectID string) (eventstore.EventPusher, error) { +func (c *Commands) setIAMProject(ctx context.Context, iamAgg *eventstore.Aggregate, iamWriteModel *IAMWriteModel, projectID string) (eventstore.Command, error) { err := c.eventstore.FilterToQueryReducer(ctx, iamWriteModel) if err != nil { return nil, err diff --git a/internal/command/iam_custom_login_text.go b/internal/command/iam_custom_login_text.go index 13292f3043..1e308b90de 100644 --- a/internal/command/iam_custom_login_text.go +++ b/internal/command/iam_custom_login_text.go @@ -17,7 +17,7 @@ func (c *Commands) SetCustomIAMLoginText(ctx context.Context, loginText *domain. if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -40,7 +40,7 @@ func (c *Commands) RemoveCustomIAMLoginTexts(ctx context.Context, lang language. return nil, caos_errs.ThrowNotFound(nil, "IAM-fru44", "Errors.CustomText.NotFound") } iamAgg := IAMAggregateFromWriteModel(&customText.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam.NewCustomTextTemplateRemovedEvent(ctx, iamAgg, domain.LoginCustomText, lang)) + pushedEvents, err := c.eventstore.Push(ctx, iam.NewCustomTextTemplateRemovedEvent(ctx, iamAgg, domain.LoginCustomText, lang)) err = AppendAndReduce(customText, pushedEvents...) if err != nil { return nil, err @@ -48,7 +48,7 @@ func (c *Commands) RemoveCustomIAMLoginTexts(ctx context.Context, lang language. return writeModelToObjectDetails(&customText.WriteModel), nil } -func (c *Commands) setCustomIAMLoginText(ctx context.Context, iamAgg *eventstore.Aggregate, text *domain.CustomLoginText) ([]eventstore.EventPusher, *IAMCustomLoginTextReadModel, error) { +func (c *Commands) setCustomIAMLoginText(ctx context.Context, iamAgg *eventstore.Aggregate, text *domain.CustomLoginText) ([]eventstore.Command, *IAMCustomLoginTextReadModel, error) { if !text.IsValid() { return nil, nil, caos_errs.ThrowInvalidArgument(nil, "IAM-kd9fs", "Errors.CustomText.Invalid") } diff --git a/internal/command/iam_custom_login_text_model.go b/internal/command/iam_custom_login_text_model.go index 7d7edee64e..558a11aa98 100644 --- a/internal/command/iam_custom_login_text_model.go +++ b/internal/command/iam_custom_login_text_model.go @@ -24,7 +24,7 @@ func NewIAMCustomLoginTextReadModel(lang language.Tag) *IAMCustomLoginTextReadMo } } -func (wm *IAMCustomLoginTextReadModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMCustomLoginTextReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.CustomTextSetEvent: diff --git a/internal/command/iam_custom_message_text.go b/internal/command/iam_custom_message_text.go index 41b3ac37be..4d19e4038f 100644 --- a/internal/command/iam_custom_message_text.go +++ b/internal/command/iam_custom_message_text.go @@ -16,7 +16,7 @@ func (c *Commands) SetDefaultMessageText(ctx context.Context, messageText *domai if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -27,7 +27,7 @@ func (c *Commands) SetDefaultMessageText(ctx context.Context, messageText *domai return writeModelToObjectDetails(&existingMessageText.WriteModel), nil } -func (c *Commands) setDefaultMessageText(ctx context.Context, iamAgg *eventstore.Aggregate, msg *domain.CustomMessageText) ([]eventstore.EventPusher, *IAMCustomMessageTextReadModel, error) { +func (c *Commands) setDefaultMessageText(ctx context.Context, iamAgg *eventstore.Aggregate, msg *domain.CustomMessageText) ([]eventstore.Command, *IAMCustomMessageTextReadModel, error) { if !msg.IsValid() { return nil, nil, caos_errs.ThrowInvalidArgument(nil, "IAM-kd9fs", "Errors.CustomMessageText.Invalid") } @@ -36,7 +36,7 @@ func (c *Commands) setDefaultMessageText(ctx context.Context, iamAgg *eventstore if err != nil { return nil, nil, err } - events := make([]eventstore.EventPusher, 0) + events := make([]eventstore.Command, 0) if existingMessageText.Greeting != msg.Greeting { if msg.Greeting != "" { events = append(events, iam.NewCustomTextSetEvent(ctx, iamAgg, msg.MessageTextType, domain.MessageGreeting, msg.Greeting, msg.Language)) diff --git a/internal/command/iam_custom_message_text_model.go b/internal/command/iam_custom_message_text_model.go index d3b8700526..12782aa2df 100644 --- a/internal/command/iam_custom_message_text_model.go +++ b/internal/command/iam_custom_message_text_model.go @@ -25,7 +25,7 @@ func NewIAMCustomMessageTextWriteModel(messageTextType string, lang language.Tag } } -func (wm *IAMCustomMessageTextReadModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMCustomMessageTextReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.CustomTextSetEvent: diff --git a/internal/command/iam_custom_text.go b/internal/command/iam_custom_text.go index 10fafb5c7a..b078fb9694 100644 --- a/internal/command/iam_custom_text.go +++ b/internal/command/iam_custom_text.go @@ -20,7 +20,7 @@ func (c *Commands) SetIAMCustomText(ctx context.Context, customText *domain.Cust return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -31,7 +31,7 @@ func (c *Commands) SetIAMCustomText(ctx context.Context, customText *domain.Cust return writeModelToCustomText(&setText.CustomTextWriteModel), nil } -func (c *Commands) setDefaultCustomText(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMCustomTextWriteModel, text *domain.CustomText) (eventstore.EventPusher, error) { +func (c *Commands) setDefaultCustomText(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMCustomTextWriteModel, text *domain.CustomText) (eventstore.Command, error) { if !text.IsValid() { return nil, caos_errs.ThrowInvalidArgument(nil, "IAM-3MN0s", "Errors.CustomText.Invalid") } diff --git a/internal/command/iam_custom_text_model.go b/internal/command/iam_custom_text_model.go index dc6a3e7906..8015a01eaf 100644 --- a/internal/command/iam_custom_text_model.go +++ b/internal/command/iam_custom_text_model.go @@ -25,7 +25,7 @@ func NewIAMCustomTextWriteModel(key string, language language.Tag) *IAMCustomTex } } -func (wm *IAMCustomTextWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMCustomTextWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.CustomTextSetEvent: diff --git a/internal/command/iam_features.go b/internal/command/iam_features.go index 4cba6b087b..25cee7fa8b 100644 --- a/internal/command/iam_features.go +++ b/internal/command/iam_features.go @@ -16,7 +16,7 @@ func (c *Commands) SetDefaultFeatures(ctx context.Context, features *domain.Feat return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, setEvent) + pushedEvents, err := c.eventstore.Push(ctx, setEvent) if err != nil { return nil, err } diff --git a/internal/command/iam_features_model.go b/internal/command/iam_features_model.go index 72a035050b..61f1dc536a 100644 --- a/internal/command/iam_features_model.go +++ b/internal/command/iam_features_model.go @@ -25,7 +25,7 @@ func NewIAMFeaturesWriteModel() *IAMFeaturesWriteModel { } } -func (wm *IAMFeaturesWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMFeaturesWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.FeaturesSetEvent: diff --git a/internal/command/iam_idp_config.go b/internal/command/iam_idp_config.go index 5e1b50e5cd..5fd35d5ad4 100644 --- a/internal/command/iam_idp_config.go +++ b/internal/command/iam_idp_config.go @@ -25,7 +25,7 @@ func (c *Commands) AddDefaultIDPConfig(ctx context.Context, config *domain.IDPCo addedConfig := NewIAMIDPConfigWriteModel(idpConfigID) iamAgg := IAMAggregateFromWriteModel(&addedConfig.WriteModel) - events := []eventstore.EventPusher{ + events := []eventstore.Command{ iam_repo.NewIDPConfigAddedEvent( ctx, iamAgg, @@ -66,7 +66,7 @@ func (c *Commands) AddDefaultIDPConfig(ctx context.Context, config *domain.IDPCo config.JWTConfig.HeaderName, )) } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -94,7 +94,7 @@ func (c *Commands) ChangeDefaultIDPConfig(ctx context.Context, config *domain.ID if !hasChanged { return nil, caos_errs.ThrowPreconditionFailed(nil, "IAM-4M9vs", "Errors.IAM.LabelPolicy.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } @@ -114,7 +114,7 @@ func (c *Commands) DeactivateDefaultIDPConfig(ctx context.Context, idpID string) return nil, caos_errs.ThrowPreconditionFailed(nil, "IAM-2n0fs", "Errors.IAM.IDPConfig.NotActive") } iamAgg := IAMAggregateFromWriteModel(&existingIDP.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewIDPConfigDeactivatedEvent(ctx, iamAgg, idpID)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewIDPConfigDeactivatedEvent(ctx, iamAgg, idpID)) if err != nil { return nil, err } @@ -134,7 +134,7 @@ func (c *Commands) ReactivateDefaultIDPConfig(ctx context.Context, idpID string) return nil, caos_errs.ThrowPreconditionFailed(nil, "IAM-5Mo0d", "Errors.IAM.IDPConfig.NotInactive") } iamAgg := IAMAggregateFromWriteModel(&existingIDP.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewIDPConfigReactivatedEvent(ctx, iamAgg, idpID)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewIDPConfigReactivatedEvent(ctx, iamAgg, idpID)) if err != nil { return nil, err } @@ -155,7 +155,7 @@ func (c *Commands) RemoveDefaultIDPConfig(ctx context.Context, idpID string, idp } iamAgg := IAMAggregateFromWriteModel(&existingIDP.WriteModel) - events := []eventstore.EventPusher{ + events := []eventstore.Command{ iam_repo.NewIDPConfigRemovedEvent(ctx, iamAgg, idpID, existingIDP.Name), } @@ -169,7 +169,7 @@ func (c *Commands) RemoveDefaultIDPConfig(ctx context.Context, idpID string, idp events = append(events, orgEvents...) } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } diff --git a/internal/command/iam_idp_config_model.go b/internal/command/iam_idp_config_model.go index 2f8994afd3..6a386fcd34 100644 --- a/internal/command/iam_idp_config_model.go +++ b/internal/command/iam_idp_config_model.go @@ -43,7 +43,7 @@ func (wm *IAMIDPConfigWriteModel) Query() *eventstore.SearchQueryBuilder { Builder() } -func (wm *IAMIDPConfigWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMIDPConfigWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.IDPConfigAddedEvent: @@ -89,7 +89,7 @@ func (wm *IAMIDPConfigWriteModel) Reduce() error { return wm.IDPConfigWriteModel.Reduce() } -func (wm *IAMIDPConfigWriteModel) AppendAndReduce(events ...eventstore.EventReader) error { +func (wm *IAMIDPConfigWriteModel) AppendAndReduce(events ...eventstore.Event) error { wm.AppendEvents(events...) return wm.Reduce() } diff --git a/internal/command/iam_idp_jwt_config.go b/internal/command/iam_idp_jwt_config.go index cafd69aae6..004bef8f8b 100644 --- a/internal/command/iam_idp_jwt_config.go +++ b/internal/command/iam_idp_jwt_config.go @@ -37,7 +37,7 @@ func (c *Commands) ChangeDefaultIDPJWTConfig(ctx context.Context, config *domain return nil, caos_errs.ThrowPreconditionFailed(nil, "IAM-3n9gg", "Errors.IAM.IDPConfig.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } diff --git a/internal/command/iam_idp_jwt_config_model.go b/internal/command/iam_idp_jwt_config_model.go index 05871eb9cc..2b202f45ac 100644 --- a/internal/command/iam_idp_jwt_config_model.go +++ b/internal/command/iam_idp_jwt_config_model.go @@ -26,7 +26,7 @@ func NewIAMIDPJWTConfigWriteModel(idpConfigID string) *IAMIDPJWTConfigWriteModel } } -func (wm *IAMIDPJWTConfigWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMIDPJWTConfigWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.IDPJWTConfigAddedEvent: diff --git a/internal/command/iam_idp_oidc_config.go b/internal/command/iam_idp_oidc_config.go index 9db8da5dbf..a6c98922e8 100644 --- a/internal/command/iam_idp_oidc_config.go +++ b/internal/command/iam_idp_oidc_config.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/zitadel/internal/domain" caos_errs "github.com/caos/zitadel/internal/errors" ) @@ -41,7 +42,7 @@ func (c *Commands) ChangeDefaultIDPOIDCConfig(ctx context.Context, config *domai return nil, caos_errs.ThrowPreconditionFailed(nil, "IAM-4M9vs", "Errors.IAM.LabelPolicy.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } diff --git a/internal/command/iam_idp_oidc_config_model.go b/internal/command/iam_idp_oidc_config_model.go index 238e98d256..1b829bce39 100644 --- a/internal/command/iam_idp_oidc_config_model.go +++ b/internal/command/iam_idp_oidc_config_model.go @@ -28,7 +28,7 @@ func NewIAMIDPOIDCConfigWriteModel(idpConfigID string) *IAMIDPOIDCConfigWriteMod } } -func (wm *IAMIDPOIDCConfigWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMIDPOIDCConfigWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.IDPOIDCConfigAddedEvent: diff --git a/internal/command/iam_member.go b/internal/command/iam_member.go index 540f4bc391..39844d7e02 100644 --- a/internal/command/iam_member.go +++ b/internal/command/iam_member.go @@ -28,7 +28,7 @@ func (c *Commands) AddIAMMember(ctx context.Context, member *domain.Member) (*do return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -39,7 +39,7 @@ func (c *Commands) AddIAMMember(ctx context.Context, member *domain.Member) (*do return memberWriteModelToMember(&addedMember.MemberWriteModel), nil } -func (c *Commands) addIAMMember(ctx context.Context, iamAgg *eventstore.Aggregate, addedMember *IAMMemberWriteModel, member *domain.Member) (eventstore.EventPusher, error) { +func (c *Commands) addIAMMember(ctx context.Context, iamAgg *eventstore.Aggregate, addedMember *IAMMemberWriteModel, member *domain.Member) (eventstore.Command, error) { if !member.IsIAMValid() { return nil, caos_errs.ThrowInvalidArgument(nil, "IAM-GR34U", "Errors.IAM.MemberInvalid") } @@ -75,7 +75,7 @@ func (c *Commands) ChangeIAMMember(ctx context.Context, member *domain.Member) ( return nil, caos_errs.ThrowPreconditionFailed(nil, "IAM-LiaZi", "Errors.IAM.Member.RolesNotChanged") } iamAgg := IAMAggregateFromWriteModel(&existingMember.MemberWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewMemberChangedEvent(ctx, iamAgg, member.UserID, member.Roles...)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewMemberChangedEvent(ctx, iamAgg, member.UserID, member.Roles...)) if err != nil { return nil, err } @@ -101,7 +101,7 @@ func (c *Commands) RemoveIAMMember(ctx context.Context, userID string) (*domain. iamAgg := IAMAggregateFromWriteModel(&memberWriteModel.MemberWriteModel.WriteModel) removeEvent := c.removeIAMMember(ctx, iamAgg, userID, false) - pushedEvents, err := c.eventstore.PushEvents(ctx, removeEvent) + pushedEvents, err := c.eventstore.Push(ctx, removeEvent) if err != nil { return nil, err } @@ -113,7 +113,7 @@ func (c *Commands) RemoveIAMMember(ctx context.Context, userID string) (*domain. return writeModelToObjectDetails(&memberWriteModel.MemberWriteModel.WriteModel), nil } -func (c *Commands) removeIAMMember(ctx context.Context, iamAgg *eventstore.Aggregate, userID string, cascade bool) eventstore.EventPusher { +func (c *Commands) removeIAMMember(ctx context.Context, iamAgg *eventstore.Aggregate, userID string, cascade bool) eventstore.Command { if cascade { return iam_repo.NewMemberCascadeRemovedEvent( ctx, diff --git a/internal/command/iam_member_model.go b/internal/command/iam_member_model.go index 3278347c99..f5fe15fc79 100644 --- a/internal/command/iam_member_model.go +++ b/internal/command/iam_member_model.go @@ -22,7 +22,7 @@ func NewIAMMemberWriteModel(userID string) *IAMMemberWriteModel { } } -func (wm *IAMMemberWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMMemberWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.MemberAddedEvent: diff --git a/internal/command/iam_policy_label.go b/internal/command/iam_policy_label.go index 6056e39c52..fe8f40c598 100644 --- a/internal/command/iam_policy_label.go +++ b/internal/command/iam_policy_label.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/zitadel/internal/domain" caos_errs "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore" @@ -17,7 +18,7 @@ func (c *Commands) AddDefaultLabelPolicy(ctx context.Context, policy *domain.Lab return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -28,7 +29,7 @@ func (c *Commands) AddDefaultLabelPolicy(ctx context.Context, policy *domain.Lab return writeModelToLabelPolicy(&addedPolicy.LabelPolicyWriteModel), nil } -func (c *Commands) addDefaultLabelPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMLabelPolicyWriteModel, policy *domain.LabelPolicy) (eventstore.EventPusher, error) { +func (c *Commands) addDefaultLabelPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMLabelPolicyWriteModel, policy *domain.LabelPolicy) (eventstore.Command, error) { if err := policy.IsValid(); err != nil { return nil, err } @@ -88,7 +89,7 @@ func (c *Commands) ChangeDefaultLabelPolicy(ctx context.Context, policy *domain. return nil, caos_errs.ThrowPreconditionFailed(nil, "IAM-4M9vs", "Errors.IAM.LabelPolicy.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } @@ -110,7 +111,7 @@ func (c *Commands) ActivateDefaultLabelPolicy(ctx context.Context) (*domain.Obje } iamAgg := IAMAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewLabelPolicyActivatedEvent(ctx, iamAgg)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewLabelPolicyActivatedEvent(ctx, iamAgg)) if err != nil { return nil, err } @@ -135,7 +136,7 @@ func (c *Commands) AddLogoDefaultLabelPolicy(ctx context.Context, storageKey str return nil, caos_errs.ThrowNotFound(nil, "IAM-Qw0pd", "Errors.IAM.LabelPolicy.NotFound") } iamAgg := IAMAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewLabelPolicyLogoAddedEvent(ctx, iamAgg, storageKey)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewLabelPolicyLogoAddedEvent(ctx, iamAgg, storageKey)) if err != nil { return nil, err } @@ -161,7 +162,7 @@ func (c *Commands) RemoveLogoDefaultLabelPolicy(ctx context.Context) (*domain.Ob return nil, err } iamAgg := IAMAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewLabelPolicyLogoRemovedEvent(ctx, iamAgg, existingPolicy.LogoKey)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewLabelPolicyLogoRemovedEvent(ctx, iamAgg, existingPolicy.LogoKey)) if err != nil { return nil, err } @@ -185,7 +186,7 @@ func (c *Commands) AddIconDefaultLabelPolicy(ctx context.Context, storageKey str return nil, caos_errs.ThrowNotFound(nil, "IAM-1yMx0", "Errors.IAM.LabelPolicy.NotFound") } iamAgg := IAMAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewLabelPolicyIconAddedEvent(ctx, iamAgg, storageKey)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewLabelPolicyIconAddedEvent(ctx, iamAgg, storageKey)) if err != nil { return nil, err } @@ -210,7 +211,7 @@ func (c *Commands) RemoveIconDefaultLabelPolicy(ctx context.Context) (*domain.Ob return nil, err } iamAgg := IAMAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewLabelPolicyIconRemovedEvent(ctx, iamAgg, existingPolicy.IconKey)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewLabelPolicyIconRemovedEvent(ctx, iamAgg, existingPolicy.IconKey)) if err != nil { return nil, err } @@ -234,7 +235,7 @@ func (c *Commands) AddLogoDarkDefaultLabelPolicy(ctx context.Context, storageKey return nil, caos_errs.ThrowNotFound(nil, "IAM-ZR9fs", "Errors.IAM.LabelPolicy.NotFound") } iamAgg := IAMAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewLabelPolicyLogoDarkAddedEvent(ctx, iamAgg, storageKey)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewLabelPolicyLogoDarkAddedEvent(ctx, iamAgg, storageKey)) if err != nil { return nil, err } @@ -259,7 +260,7 @@ func (c *Commands) RemoveLogoDarkDefaultLabelPolicy(ctx context.Context) (*domai return nil, err } iamAgg := IAMAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewLabelPolicyLogoDarkRemovedEvent(ctx, iamAgg, existingPolicy.LogoDarkKey)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewLabelPolicyLogoDarkRemovedEvent(ctx, iamAgg, existingPolicy.LogoDarkKey)) if err != nil { return nil, err } @@ -283,7 +284,7 @@ func (c *Commands) AddIconDarkDefaultLabelPolicy(ctx context.Context, storageKey return nil, caos_errs.ThrowNotFound(nil, "IAM-vMsf9", "Errors.IAM.LabelPolicy.NotFound") } iamAgg := IAMAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewLabelPolicyIconDarkAddedEvent(ctx, iamAgg, storageKey)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewLabelPolicyIconDarkAddedEvent(ctx, iamAgg, storageKey)) if err != nil { return nil, err } @@ -308,7 +309,7 @@ func (c *Commands) RemoveIconDarkDefaultLabelPolicy(ctx context.Context) (*domai return nil, err } iamAgg := IAMAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewLabelPolicyIconDarkRemovedEvent(ctx, iamAgg, existingPolicy.IconDarkKey)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewLabelPolicyIconDarkRemovedEvent(ctx, iamAgg, existingPolicy.IconDarkKey)) if err != nil { return nil, err } @@ -332,7 +333,7 @@ func (c *Commands) AddFontDefaultLabelPolicy(ctx context.Context, storageKey str return nil, caos_errs.ThrowNotFound(nil, "IAM-1N8fE", "Errors.IAM.LabelPolicy.NotFound") } iamAgg := IAMAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewLabelPolicyFontAddedEvent(ctx, iamAgg, storageKey)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewLabelPolicyFontAddedEvent(ctx, iamAgg, storageKey)) if err != nil { return nil, err } @@ -357,7 +358,7 @@ func (c *Commands) RemoveFontDefaultLabelPolicy(ctx context.Context) (*domain.Ob return nil, err } iamAgg := IAMAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewLabelPolicyFontRemovedEvent(ctx, iamAgg, existingPolicy.FontKey)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewLabelPolicyFontRemovedEvent(ctx, iamAgg, existingPolicy.FontKey)) if err != nil { return nil, err } diff --git a/internal/command/iam_policy_label_model.go b/internal/command/iam_policy_label_model.go index 1cd96d093b..eea35d01b8 100644 --- a/internal/command/iam_policy_label_model.go +++ b/internal/command/iam_policy_label_model.go @@ -24,7 +24,7 @@ func NewIAMLabelPolicyWriteModel() *IAMLabelPolicyWriteModel { } } -func (wm *IAMLabelPolicyWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMLabelPolicyWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.LabelPolicyAddedEvent: diff --git a/internal/command/iam_policy_login.go b/internal/command/iam_policy_login.go index 8ba4d7c4ed..97f0f1442b 100644 --- a/internal/command/iam_policy_login.go +++ b/internal/command/iam_policy_login.go @@ -29,7 +29,7 @@ func (c *Commands) AddDefaultLoginPolicy(ctx context.Context, policy *domain.Log if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -40,7 +40,7 @@ func (c *Commands) AddDefaultLoginPolicy(ctx context.Context, policy *domain.Log return writeModelToLoginPolicy(&addedPolicy.LoginPolicyWriteModel), nil } -func (c *Commands) addDefaultLoginPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMLoginPolicyWriteModel, policy *domain.LoginPolicy) (eventstore.EventPusher, error) { +func (c *Commands) addDefaultLoginPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMLoginPolicyWriteModel, policy *domain.LoginPolicy) (eventstore.Command, error) { err := c.eventstore.FilterToQueryReducer(ctx, addedPolicy) if err != nil { return nil, err @@ -59,7 +59,7 @@ func (c *Commands) ChangeDefaultLoginPolicy(ctx context.Context, policy *domain. if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -70,7 +70,7 @@ func (c *Commands) ChangeDefaultLoginPolicy(ctx context.Context, policy *domain. return writeModelToLoginPolicy(&existingPolicy.LoginPolicyWriteModel), nil } -func (c *Commands) changeDefaultLoginPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, existingPolicy *IAMLoginPolicyWriteModel, policy *domain.LoginPolicy) (eventstore.EventPusher, error) { +func (c *Commands) changeDefaultLoginPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, existingPolicy *IAMLoginPolicyWriteModel, policy *domain.LoginPolicy) (eventstore.Command, error) { err := c.defaultLoginPolicyWriteModelByID(ctx, existingPolicy) if err != nil { return nil, err @@ -112,7 +112,7 @@ func (c *Commands) AddIDPProviderToDefaultLoginPolicy(ctx context.Context, idpPr } iamAgg := IAMAggregateFromWriteModel(&idpModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewIdentityProviderAddedEvent(ctx, iamAgg, idpProvider.IDPConfigID)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewIdentityProviderAddedEvent(ctx, iamAgg, idpProvider.IDPConfigID)) if err != nil { return nil, err } @@ -147,7 +147,7 @@ func (c *Commands) RemoveIDPProviderFromDefaultLoginPolicy(ctx context.Context, iamAgg := IAMAggregateFromWriteModel(&idpModel.IdentityProviderWriteModel.WriteModel) events := c.removeIDPProviderFromDefaultLoginPolicy(ctx, iamAgg, idpProvider, false, cascadeExternalIDPs...) - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -158,8 +158,8 @@ func (c *Commands) RemoveIDPProviderFromDefaultLoginPolicy(ctx context.Context, return writeModelToObjectDetails(&idpModel.IdentityProviderWriteModel.WriteModel), nil } -func (c *Commands) removeIDPProviderFromDefaultLoginPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, idpProvider *domain.IDPProvider, cascade bool, cascadeExternalIDPs ...*domain.UserIDPLink) []eventstore.EventPusher { - var events []eventstore.EventPusher +func (c *Commands) removeIDPProviderFromDefaultLoginPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, idpProvider *domain.IDPProvider, cascade bool, cascadeExternalIDPs ...*domain.UserIDPLink) []eventstore.Command { + var events []eventstore.Command if cascade { events = append(events, iam_repo.NewIdentityProviderCascadeRemovedEvent(ctx, iamAgg, idpProvider.IDPConfigID)) } else { @@ -188,7 +188,7 @@ func (c *Commands) AddSecondFactorToDefaultLoginPolicy(ctx context.Context, seco return domain.SecondFactorTypeUnspecified, nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return domain.SecondFactorTypeUnspecified, nil, err } @@ -199,7 +199,7 @@ func (c *Commands) AddSecondFactorToDefaultLoginPolicy(ctx context.Context, seco return secondFactorModel.MFAType, writeModelToObjectDetails(&secondFactorModel.WriteModel), nil } -func (c *Commands) addSecondFactorToDefaultLoginPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, secondFactorModel *IAMSecondFactorWriteModel, secondFactor domain.SecondFactorType) (eventstore.EventPusher, error) { +func (c *Commands) addSecondFactorToDefaultLoginPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, secondFactorModel *IAMSecondFactorWriteModel, secondFactor domain.SecondFactorType) (eventstore.Command, error) { err := c.eventstore.FilterToQueryReducer(ctx, secondFactorModel) if err != nil { return nil, err @@ -224,7 +224,7 @@ func (c *Commands) RemoveSecondFactorFromDefaultLoginPolicy(ctx context.Context, return nil, caos_errs.ThrowNotFound(nil, "IAM-3M9od", "Errors.IAM.LoginPolicy.MFA.NotExisting") } iamAgg := IAMAggregateFromWriteModel(&secondFactorModel.SecondFactorWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewLoginPolicySecondFactorRemovedEvent(ctx, iamAgg, secondFactor)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewLoginPolicySecondFactorRemovedEvent(ctx, iamAgg, secondFactor)) if err != nil { return nil, err } @@ -246,7 +246,7 @@ func (c *Commands) AddMultiFactorToDefaultLoginPolicy(ctx context.Context, multi return domain.MultiFactorTypeUnspecified, nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return domain.MultiFactorTypeUnspecified, nil, err } @@ -257,7 +257,7 @@ func (c *Commands) AddMultiFactorToDefaultLoginPolicy(ctx context.Context, multi return multiFactorModel.MultiFactorWriteModel.MFAType, writeModelToObjectDetails(&multiFactorModel.WriteModel), nil } -func (c *Commands) addMultiFactorToDefaultLoginPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, multiFactorModel *IAMMultiFactorWriteModel, multiFactor domain.MultiFactorType) (eventstore.EventPusher, error) { +func (c *Commands) addMultiFactorToDefaultLoginPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, multiFactorModel *IAMMultiFactorWriteModel, multiFactor domain.MultiFactorType) (eventstore.Command, error) { err := c.eventstore.FilterToQueryReducer(ctx, multiFactorModel) if err != nil { return nil, err @@ -282,7 +282,7 @@ func (c *Commands) RemoveMultiFactorFromDefaultLoginPolicy(ctx context.Context, return nil, caos_errs.ThrowNotFound(nil, "IAM-3M9df", "Errors.IAM.LoginPolicy.MFA.NotExisting") } iamAgg := IAMAggregateFromWriteModel(&multiFactorModel.MultiFactorWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewLoginPolicyMultiFactorRemovedEvent(ctx, iamAgg, multiFactor)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewLoginPolicyMultiFactorRemovedEvent(ctx, iamAgg, multiFactor)) if err != nil { return nil, err } diff --git a/internal/command/iam_policy_login_factors_model.go b/internal/command/iam_policy_login_factors_model.go index c6df2b3a00..a6dfe077bf 100644 --- a/internal/command/iam_policy_login_factors_model.go +++ b/internal/command/iam_policy_login_factors_model.go @@ -22,7 +22,7 @@ func NewIAMSecondFactorWriteModel(factorType domain.SecondFactorType) *IAMSecond } } -func (wm *IAMSecondFactorWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMSecondFactorWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.LoginPolicySecondFactorAddedEvent: @@ -69,7 +69,7 @@ func NewIAMMultiFactorWriteModel(factorType domain.MultiFactorType) *IAMMultiFac } } -func (wm *IAMMultiFactorWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMMultiFactorWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.LoginPolicyMultiFactorAddedEvent: diff --git a/internal/command/iam_policy_login_identity_provider_model.go b/internal/command/iam_policy_login_identity_provider_model.go index d144883021..27c389cb90 100644 --- a/internal/command/iam_policy_login_identity_provider_model.go +++ b/internal/command/iam_policy_login_identity_provider_model.go @@ -22,7 +22,7 @@ func NewIAMIdentityProviderWriteModel(idpConfigID string) *IAMIdentityProviderWr } } -func (wm *IAMIdentityProviderWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMIdentityProviderWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.IdentityProviderAddedEvent: diff --git a/internal/command/iam_policy_login_model.go b/internal/command/iam_policy_login_model.go index a87a670431..aebb0f11a5 100644 --- a/internal/command/iam_policy_login_model.go +++ b/internal/command/iam_policy_login_model.go @@ -25,7 +25,7 @@ func NewIAMLoginPolicyWriteModel() *IAMLoginPolicyWriteModel { } } -func (wm *IAMLoginPolicyWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMLoginPolicyWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.LoginPolicyAddedEvent: diff --git a/internal/command/iam_policy_mail_template.go b/internal/command/iam_policy_mail_template.go index ae6db81e6f..a3d0465aa9 100644 --- a/internal/command/iam_policy_mail_template.go +++ b/internal/command/iam_policy_mail_template.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/zitadel/internal/domain" caos_errs "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore" @@ -17,7 +18,7 @@ func (c *Commands) AddDefaultMailTemplate(ctx context.Context, policy *domain.Ma return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -28,7 +29,7 @@ func (c *Commands) AddDefaultMailTemplate(ctx context.Context, policy *domain.Ma return writeModelToMailTemplatePolicy(&addedPolicy.MailTemplateWriteModel), nil } -func (c *Commands) addDefaultMailTemplate(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMMailTemplateWriteModel, policy *domain.MailTemplate) (eventstore.EventPusher, error) { +func (c *Commands) addDefaultMailTemplate(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMMailTemplateWriteModel, policy *domain.MailTemplate) (eventstore.Command, error) { if !policy.IsValid() { return nil, caos_errs.ThrowInvalidArgument(nil, "IAM-fm9sd", "Errors.IAM.MailTemplate.Invalid") } @@ -48,7 +49,7 @@ func (c *Commands) ChangeDefaultMailTemplate(ctx context.Context, policy *domain if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } @@ -59,7 +60,7 @@ func (c *Commands) ChangeDefaultMailTemplate(ctx context.Context, policy *domain return writeModelToMailTemplatePolicy(&existingPolicy.MailTemplateWriteModel), nil } -func (c *Commands) changeDefaultMailTemplate(ctx context.Context, policy *domain.MailTemplate) (*IAMMailTemplateWriteModel, eventstore.EventPusher, error) { +func (c *Commands) changeDefaultMailTemplate(ctx context.Context, policy *domain.MailTemplate) (*IAMMailTemplateWriteModel, eventstore.Command, error) { if !policy.IsValid() { return nil, nil, caos_errs.ThrowInvalidArgument(nil, "IAM-4m9ds", "Errors.IAM.MailTemplate.Invalid") } diff --git a/internal/command/iam_policy_mail_template_model.go b/internal/command/iam_policy_mail_template_model.go index 3f3c02b375..42862b38c1 100644 --- a/internal/command/iam_policy_mail_template_model.go +++ b/internal/command/iam_policy_mail_template_model.go @@ -26,7 +26,7 @@ func NewIAMMailTemplateWriteModel() *IAMMailTemplateWriteModel { } } -func (wm *IAMMailTemplateWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMMailTemplateWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.MailTemplateAddedEvent: diff --git a/internal/command/iam_policy_org_iam.go b/internal/command/iam_policy_org_iam.go index 40ce2b1ad1..e910c88f4f 100644 --- a/internal/command/iam_policy_org_iam.go +++ b/internal/command/iam_policy_org_iam.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/zitadel/internal/domain" caos_errs "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore" @@ -17,7 +18,7 @@ func (c *Commands) AddDefaultOrgIAMPolicy(ctx context.Context, policy *domain.Or return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -28,7 +29,7 @@ func (c *Commands) AddDefaultOrgIAMPolicy(ctx context.Context, policy *domain.Or return writeModelToOrgIAMPolicy(addedPolicy), nil } -func (c *Commands) addDefaultOrgIAMPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMOrgIAMPolicyWriteModel, policy *domain.OrgIAMPolicy) (eventstore.EventPusher, error) { +func (c *Commands) addDefaultOrgIAMPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMOrgIAMPolicyWriteModel, policy *domain.OrgIAMPolicy) (eventstore.Command, error) { err := c.eventstore.FilterToQueryReducer(ctx, addedPolicy) if err != nil { return nil, err @@ -54,7 +55,7 @@ func (c *Commands) ChangeDefaultOrgIAMPolicy(ctx context.Context, policy *domain return nil, caos_errs.ThrowPreconditionFailed(nil, "IAM-4M9vs", "Errors.IAM.LabelPolicy.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } diff --git a/internal/command/iam_policy_org_iam_model.go b/internal/command/iam_policy_org_iam_model.go index 7188c9fa32..cbff3c9cc3 100644 --- a/internal/command/iam_policy_org_iam_model.go +++ b/internal/command/iam_policy_org_iam_model.go @@ -25,7 +25,7 @@ func NewIAMOrgIAMPolicyWriteModel() *IAMOrgIAMPolicyWriteModel { } } -func (wm *IAMOrgIAMPolicyWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMOrgIAMPolicyWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.OrgIAMPolicyAddedEvent: diff --git a/internal/command/iam_policy_password_age.go b/internal/command/iam_policy_password_age.go index b2a6b5217c..cea284db29 100644 --- a/internal/command/iam_policy_password_age.go +++ b/internal/command/iam_policy_password_age.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/zitadel/internal/domain" caos_errs "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore" @@ -17,7 +18,7 @@ func (c *Commands) AddDefaultPasswordAgePolicy(ctx context.Context, policy *doma return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -28,7 +29,7 @@ func (c *Commands) AddDefaultPasswordAgePolicy(ctx context.Context, policy *doma return writeModelToPasswordAgePolicy(&addedPolicy.PasswordAgePolicyWriteModel), nil } -func (c *Commands) addDefaultPasswordAgePolicy(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMPasswordAgePolicyWriteModel, policy *domain.PasswordAgePolicy) (eventstore.EventPusher, error) { +func (c *Commands) addDefaultPasswordAgePolicy(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMPasswordAgePolicyWriteModel, policy *domain.PasswordAgePolicy) (eventstore.Command, error) { err := c.eventstore.FilterToQueryReducer(ctx, addedPolicy) if err != nil { return nil, err @@ -56,7 +57,7 @@ func (c *Commands) ChangeDefaultPasswordAgePolicy(ctx context.Context, policy *d return nil, caos_errs.ThrowPreconditionFailed(nil, "IAM-4M9vs", "Errors.IAM.LabelPolicy.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } diff --git a/internal/command/iam_policy_password_age_model.go b/internal/command/iam_policy_password_age_model.go index cd8d5acb79..0625c4f481 100644 --- a/internal/command/iam_policy_password_age_model.go +++ b/internal/command/iam_policy_password_age_model.go @@ -25,7 +25,7 @@ func NewIAMPasswordAgePolicyWriteModel() *IAMPasswordAgePolicyWriteModel { } } -func (wm *IAMPasswordAgePolicyWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMPasswordAgePolicyWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.PasswordAgePolicyAddedEvent: diff --git a/internal/command/iam_policy_password_complexity.go b/internal/command/iam_policy_password_complexity.go index f804864703..ab53d0c3cc 100644 --- a/internal/command/iam_policy_password_complexity.go +++ b/internal/command/iam_policy_password_complexity.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/zitadel/internal/domain" caos_errs "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore" @@ -31,7 +32,7 @@ func (c *Commands) AddDefaultPasswordComplexityPolicy(ctx context.Context, polic return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, events) + pushedEvents, err := c.eventstore.Push(ctx, events) if err != nil { return nil, err } @@ -42,7 +43,7 @@ func (c *Commands) AddDefaultPasswordComplexityPolicy(ctx context.Context, polic return writeModelToPasswordComplexityPolicy(&addedPolicy.PasswordComplexityPolicyWriteModel), nil } -func (c *Commands) addDefaultPasswordComplexityPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMPasswordComplexityPolicyWriteModel, policy *domain.PasswordComplexityPolicy) (eventstore.EventPusher, error) { +func (c *Commands) addDefaultPasswordComplexityPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMPasswordComplexityPolicyWriteModel, policy *domain.PasswordComplexityPolicy) (eventstore.Command, error) { if err := policy.IsValid(); err != nil { return nil, err } @@ -76,7 +77,7 @@ func (c *Commands) ChangeDefaultPasswordComplexityPolicy(ctx context.Context, po if !hasChanged { return nil, caos_errs.ThrowPreconditionFailed(nil, "IAM-4M9vs", "Errors.IAM.LabelPolicy.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } diff --git a/internal/command/iam_policy_password_complexity_model.go b/internal/command/iam_policy_password_complexity_model.go index a5fc2ab2d4..e9554e596e 100644 --- a/internal/command/iam_policy_password_complexity_model.go +++ b/internal/command/iam_policy_password_complexity_model.go @@ -25,7 +25,7 @@ func NewIAMPasswordComplexityPolicyWriteModel() *IAMPasswordComplexityPolicyWrit } } -func (wm *IAMPasswordComplexityPolicyWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMPasswordComplexityPolicyWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.PasswordComplexityPolicyAddedEvent: diff --git a/internal/command/iam_policy_password_lockout.go b/internal/command/iam_policy_password_lockout.go index cf469b8cf3..ea5b7edc6b 100644 --- a/internal/command/iam_policy_password_lockout.go +++ b/internal/command/iam_policy_password_lockout.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/zitadel/internal/domain" caos_errs "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore" @@ -16,7 +17,7 @@ func (c *Commands) AddDefaultLockoutPolicy(ctx context.Context, policy *domain.L if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -28,7 +29,7 @@ func (c *Commands) AddDefaultLockoutPolicy(ctx context.Context, policy *domain.L return writeModelToLockoutPolicy(&addedPolicy.LockoutPolicyWriteModel), nil } -func (c *Commands) addDefaultLockoutPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMLockoutPolicyWriteModel, policy *domain.LockoutPolicy) (eventstore.EventPusher, error) { +func (c *Commands) addDefaultLockoutPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMLockoutPolicyWriteModel, policy *domain.LockoutPolicy) (eventstore.Command, error) { err := c.eventstore.FilterToQueryReducer(ctx, addedPolicy) if err != nil { return nil, err @@ -55,7 +56,7 @@ func (c *Commands) ChangeDefaultLockoutPolicy(ctx context.Context, policy *domai return nil, caos_errs.ThrowPreconditionFailed(nil, "IAM-4M9vs", "Errors.IAM.LockoutPolicy.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } diff --git a/internal/command/iam_policy_password_lockout_model.go b/internal/command/iam_policy_password_lockout_model.go index 6c560d77e7..9573e7b403 100644 --- a/internal/command/iam_policy_password_lockout_model.go +++ b/internal/command/iam_policy_password_lockout_model.go @@ -25,7 +25,7 @@ func NewIAMLockoutPolicyWriteModel() *IAMLockoutPolicyWriteModel { } } -func (wm *IAMLockoutPolicyWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMLockoutPolicyWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.LockoutPolicyAddedEvent: diff --git a/internal/command/iam_policy_privacy.go b/internal/command/iam_policy_privacy.go index 3b3eb19cc0..290662a3b1 100644 --- a/internal/command/iam_policy_privacy.go +++ b/internal/command/iam_policy_privacy.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/zitadel/internal/domain" caos_errs "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore" @@ -31,7 +32,7 @@ func (c *Commands) AddDefaultPrivacyPolicy(ctx context.Context, policy *domain.P return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, events) + pushedEvents, err := c.eventstore.Push(ctx, events) if err != nil { return nil, err } @@ -42,7 +43,7 @@ func (c *Commands) AddDefaultPrivacyPolicy(ctx context.Context, policy *domain.P return writeModelToPrivacyPolicy(&addedPolicy.PrivacyPolicyWriteModel), nil } -func (c *Commands) addDefaultPrivacyPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMPrivacyPolicyWriteModel, policy *domain.PrivacyPolicy) (eventstore.EventPusher, error) { +func (c *Commands) addDefaultPrivacyPolicy(ctx context.Context, iamAgg *eventstore.Aggregate, addedPolicy *IAMPrivacyPolicyWriteModel, policy *domain.PrivacyPolicy) (eventstore.Command, error) { err := c.eventstore.FilterToQueryReducer(ctx, addedPolicy) if err != nil { return nil, err @@ -68,7 +69,7 @@ func (c *Commands) ChangeDefaultPrivacyPolicy(ctx context.Context, policy *domai if !hasChanged { return nil, caos_errs.ThrowPreconditionFailed(nil, "IAM-4M9vs", "Errors.IAM.LabelPolicy.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } diff --git a/internal/command/iam_policy_privacy_model.go b/internal/command/iam_policy_privacy_model.go index 06b58546a3..ba5cc80d64 100644 --- a/internal/command/iam_policy_privacy_model.go +++ b/internal/command/iam_policy_privacy_model.go @@ -25,7 +25,7 @@ func NewIAMPrivacyPolicyWriteModel() *IAMPrivacyPolicyWriteModel { } } -func (wm *IAMPrivacyPolicyWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IAMPrivacyPolicyWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.PrivacyPolicyAddedEvent: diff --git a/internal/command/idp_config_model.go b/internal/command/idp_config_model.go index c41ace1bb6..dea0c0e39b 100644 --- a/internal/command/idp_config_model.go +++ b/internal/command/idp_config_model.go @@ -17,7 +17,7 @@ type IDPConfigWriteModel struct { StylingType domain.IDPConfigStylingType } -func (rm *IDPConfigWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *IDPConfigWriteModel) AppendEvents(events ...eventstore.Event) { rm.WriteModel.AppendEvents(events...) } diff --git a/internal/command/key_pair.go b/internal/command/key_pair.go index 7f21690fb9..ec2c48ed17 100644 --- a/internal/command/key_pair.go +++ b/internal/command/key_pair.go @@ -30,7 +30,7 @@ func (c *Commands) GenerateSigningKeyPair(ctx context.Context, algorithm string) keyPairWriteModel := NewKeyPairWriteModel(keyID, domain.IAMID) keyAgg := KeyPairAggregateFromWriteModel(&keyPairWriteModel.WriteModel) - _, err = c.eventstore.PushEvents(ctx, keypair.NewAddedEvent( + _, err = c.eventstore.Push(ctx, keypair.NewAddedEvent( ctx, keyAgg, domain.KeyUsageSigning, diff --git a/internal/command/key_pair_model.go b/internal/command/key_pair_model.go index d6fafb8e91..d3abf22e8c 100644 --- a/internal/command/key_pair_model.go +++ b/internal/command/key_pair_model.go @@ -25,7 +25,7 @@ func NewKeyPairWriteModel(aggregateID, resourceOwner string) *KeyPairWriteModel } } -func (wm *KeyPairWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *KeyPairWriteModel) AppendEvents(events ...eventstore.Event) { wm.WriteModel.AppendEvents(events...) } diff --git a/internal/command/main_test.go b/internal/command/main_test.go index 4726c34909..4b0564c3e0 100644 --- a/internal/command/main_test.go +++ b/internal/command/main_test.go @@ -40,7 +40,7 @@ func eventstoreExpect(t *testing.T, expects ...expect) *eventstore.Eventstore { return es } -func eventPusherToEvents(eventsPushes ...eventstore.EventPusher) []*repository.Event { +func eventPusherToEvents(eventsPushes ...eventstore.Command) []*repository.Event { events := make([]*repository.Event, len(eventsPushes)) for i, event := range eventsPushes { data, err := eventstore.EventData(event) @@ -137,7 +137,7 @@ func expectFilterOrgMemberNotFound() expect { } } -func eventFromEventPusher(event eventstore.EventPusher) *repository.Event { +func eventFromEventPusher(event eventstore.Command) *repository.Event { data, _ := eventstore.EventData(event) return &repository.Event{ ID: "", @@ -156,7 +156,7 @@ func eventFromEventPusher(event eventstore.EventPusher) *repository.Event { } } -func eventFromEventPusherWithCreationDateNow(event eventstore.EventPusher) *repository.Event { +func eventFromEventPusherWithCreationDateNow(event eventstore.Command) *repository.Event { e := eventFromEventPusher(event) e.CreationDate = time.Now() return e diff --git a/internal/command/org.go b/internal/command/org.go index 7a4b1ff5f9..288f804a6c 100644 --- a/internal/command/org.go +++ b/internal/command/org.go @@ -44,7 +44,7 @@ func (c *Commands) SetUpOrg(ctx context.Context, organisation *domain.Org, admin if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -70,7 +70,7 @@ func (c *Commands) AddOrg(ctx context.Context, name, userID, resourceOwner strin return nil, err } events = append(events, orgMemberEvent) - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -96,7 +96,7 @@ func (c *Commands) ChangeOrg(ctx context.Context, orgID, name string) (*domain.O return nil, caos_errs.ThrowNotFound(nil, "ORG-4VSdf", "Errors.Org.NotChanged") } orgAgg := OrgAggregateFromWriteModel(&orgWriteModel.WriteModel) - events := make([]eventstore.EventPusher, 0) + events := make([]eventstore.Command, 0) events = append(events, org.NewOrgChangedEvent(ctx, orgAgg, orgWriteModel.Name, name)) changeDomainEvents, err := c.changeDefaultDomain(ctx, orgID, name) if err != nil { @@ -105,7 +105,7 @@ func (c *Commands) ChangeOrg(ctx context.Context, orgID, name string) (*domain.O if len(changeDomainEvents) > 0 { events = append(events, changeDomainEvents...) } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -128,7 +128,7 @@ func (c *Commands) DeactivateOrg(ctx context.Context, orgID string) (*domain.Obj return nil, caos_errs.ThrowPreconditionFailed(nil, "EVENT-Dbs2g", "Errors.Org.AlreadyDeactivated") } orgAgg := OrgAggregateFromWriteModel(&orgWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewOrgDeactivatedEvent(ctx, orgAgg)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewOrgDeactivatedEvent(ctx, orgAgg)) if err != nil { return nil, err } @@ -151,7 +151,7 @@ func (c *Commands) ReactivateOrg(ctx context.Context, orgID string) (*domain.Obj return nil, caos_errs.ThrowPreconditionFailed(nil, "EVENT-bfnrh", "Errors.Org.AlreadyActive") } orgAgg := OrgAggregateFromWriteModel(&orgWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewOrgReactivatedEvent(ctx, orgAgg)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewOrgReactivatedEvent(ctx, orgAgg)) if err != nil { return nil, err } @@ -170,13 +170,13 @@ func (c *Commands) setUpOrg( pwPolicy *domain.PasswordComplexityPolicy, claimedUserIDs []string, selfregistered bool, -) (orgAgg *eventstore.Aggregate, org *OrgWriteModel, human *HumanWriteModel, orgMember *OrgMemberWriteModel, events []eventstore.EventPusher, err error) { +) (orgAgg *eventstore.Aggregate, org *OrgWriteModel, human *HumanWriteModel, orgMember *OrgMemberWriteModel, events []eventstore.Command, err error) { orgAgg, orgWriteModel, addOrgEvents, err := c.addOrg(ctx, organisation, claimedUserIDs) if err != nil { return nil, nil, nil, nil, nil, err } - var userEvents []eventstore.EventPusher + var userEvents []eventstore.Command if selfregistered { userEvents, human, err = c.registerHuman(ctx, orgAgg.ID, admin, nil, loginPolicy, pwPolicy) } else { @@ -197,7 +197,7 @@ func (c *Commands) setUpOrg( return orgAgg, orgWriteModel, human, addedMember, addOrgEvents, nil } -func (c *Commands) addOrg(ctx context.Context, organisation *domain.Org, claimedUserIDs []string) (_ *eventstore.Aggregate, _ *OrgWriteModel, _ []eventstore.EventPusher, err error) { +func (c *Commands) addOrg(ctx context.Context, organisation *domain.Org, claimedUserIDs []string) (_ *eventstore.Aggregate, _ *OrgWriteModel, _ []eventstore.Command, err error) { if organisation == nil || !organisation.IsValid() { return nil, nil, nil, caos_errs.ThrowInvalidArgument(nil, "COMM-deLSk", "Errors.Org.Invalid") } @@ -210,7 +210,7 @@ func (c *Commands) addOrg(ctx context.Context, organisation *domain.Org, claimed addedOrg := NewOrgWriteModel(organisation.AggregateID) orgAgg := OrgAggregateFromWriteModel(&addedOrg.WriteModel) - events := []eventstore.EventPusher{ + events := []eventstore.Command{ org.NewOrgAddedEvent(ctx, orgAgg, organisation.Name), } for _, orgDomain := range organisation.Domains { diff --git a/internal/command/org_action.go b/internal/command/org_action.go index 886cfe28ca..b1bcb048c3 100644 --- a/internal/command/org_action.go +++ b/internal/command/org_action.go @@ -21,7 +21,7 @@ func (c *Commands) AddAction(ctx context.Context, addAction *domain.Action, reso actionModel := NewActionWriteModel(addAction.AggregateID, resourceOwner) actionAgg := ActionAggregateFromWriteModel(&actionModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, action.NewAddedEvent( + pushedEvents, err := c.eventstore.Push(ctx, action.NewAddedEvent( ctx, actionAgg, addAction.Name, @@ -63,7 +63,7 @@ func (c *Commands) ChangeAction(ctx context.Context, actionChange *domain.Action if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } @@ -90,10 +90,10 @@ func (c *Commands) DeactivateAction(ctx context.Context, actionID string, resour return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Dgj92", "Errors.Action.NotActive") } actionAgg := ActionAggregateFromWriteModel(&existingAction.WriteModel) - events := []eventstore.EventPusher{ + events := []eventstore.Command{ action.NewDeactivatedEvent(ctx, actionAgg), } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -120,10 +120,10 @@ func (c *Commands) ReactivateAction(ctx context.Context, actionID string, resour return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-J53zh", "Errors.Action.NotInactive") } actionAgg := ActionAggregateFromWriteModel(&existingAction.WriteModel) - events := []eventstore.EventPusher{ + events := []eventstore.Command{ action.NewReactivatedEvent(ctx, actionAgg), } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -147,14 +147,14 @@ func (c *Commands) DeleteAction(ctx context.Context, actionID, resourceOwner str return nil, caos_errs.ThrowNotFound(nil, "COMMAND-Dgh4h", "Errors.Action.NotFound") } actionAgg := ActionAggregateFromWriteModel(&existingAction.WriteModel) - events := []eventstore.EventPusher{ + events := []eventstore.Command{ action.NewRemovedEvent(ctx, actionAgg, existingAction.Name), } orgAgg := org.NewAggregate(resourceOwner, resourceOwner).Aggregate for _, flowType := range flowTypes { events = append(events, org.NewTriggerActionsCascadeRemovedEvent(ctx, &orgAgg, flowType, actionID)) } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -165,7 +165,7 @@ func (c *Commands) DeleteAction(ctx context.Context, actionID, resourceOwner str return writeModelToObjectDetails(&existingAction.WriteModel), nil } -func (c *Commands) removeActionsFromOrg(ctx context.Context, resourceOwner string) ([]eventstore.EventPusher, error) { +func (c *Commands) removeActionsFromOrg(ctx context.Context, resourceOwner string) ([]eventstore.Command, error) { existingActions, err := c.getActionsByOrgWriteModelByID(ctx, resourceOwner) if err != nil { return nil, err @@ -173,7 +173,7 @@ func (c *Commands) removeActionsFromOrg(ctx context.Context, resourceOwner strin if len(existingActions.Actions) == 0 { return nil, nil } - events := make([]eventstore.EventPusher, 0, len(existingActions.Actions)) + events := make([]eventstore.Command, 0, len(existingActions.Actions)) for id, name := range existingActions.Actions { actionAgg := NewActionAggregate(id, resourceOwner) events = append(events, action.NewRemovedEvent(ctx, actionAgg, name)) diff --git a/internal/command/org_custom_login_text.go b/internal/command/org_custom_login_text.go index 1b02668c71..018399dc4e 100644 --- a/internal/command/org_custom_login_text.go +++ b/internal/command/org_custom_login_text.go @@ -20,7 +20,7 @@ func (c *Commands) SetOrgLoginText(ctx context.Context, resourceOwner string, lo if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -31,7 +31,7 @@ func (c *Commands) SetOrgLoginText(ctx context.Context, resourceOwner string, lo return writeModelToObjectDetails(&existingLoginText.WriteModel), nil } -func (c *Commands) setOrgLoginText(ctx context.Context, orgAgg *eventstore.Aggregate, loginText *domain.CustomLoginText) ([]eventstore.EventPusher, *OrgCustomLoginTextReadModel, error) { +func (c *Commands) setOrgLoginText(ctx context.Context, orgAgg *eventstore.Aggregate, loginText *domain.CustomLoginText) ([]eventstore.Command, *OrgCustomLoginTextReadModel, error) { if !loginText.IsValid() { return nil, nil, caos_errs.ThrowInvalidArgument(nil, "ORG-PPo2w", "Errors.CustomText.Invalid") } @@ -59,7 +59,7 @@ func (c *Commands) RemoveOrgLoginTexts(ctx context.Context, resourceOwner string return nil, caos_errs.ThrowNotFound(nil, "Org-9ru44", "Errors.CustomText.NotFound") } orgAgg := OrgAggregateFromWriteModel(&customText.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewCustomTextTemplateRemovedEvent(ctx, orgAgg, domain.LoginCustomText, lang)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewCustomTextTemplateRemovedEvent(ctx, orgAgg, domain.LoginCustomText, lang)) err = AppendAndReduce(customText, pushedEvents...) if err != nil { return nil, err @@ -67,7 +67,7 @@ func (c *Commands) RemoveOrgLoginTexts(ctx context.Context, resourceOwner string return writeModelToObjectDetails(&customText.WriteModel), nil } -func (c *Commands) removeOrgLoginTextsIfExists(ctx context.Context, orgID string) ([]eventstore.EventPusher, error) { +func (c *Commands) removeOrgLoginTextsIfExists(ctx context.Context, orgID string) ([]eventstore.Command, error) { msgTemplates := NewOrgCustomLoginTextsReadModel(orgID) err := c.eventstore.FilterToQueryReducer(ctx, msgTemplates) if err != nil { @@ -75,7 +75,7 @@ func (c *Commands) removeOrgLoginTextsIfExists(ctx context.Context, orgID string } orgAgg := OrgAggregateFromWriteModel(&msgTemplates.WriteModel) - events := make([]eventstore.EventPusher, 0, len(msgTemplates.CustomLoginTexts)) + events := make([]eventstore.Command, 0, len(msgTemplates.CustomLoginTexts)) for _, tmpl := range msgTemplates.CustomLoginTexts { events = append(events, org.NewCustomTextTemplateRemovedEvent(ctx, orgAgg, tmpl.Template, tmpl.Language)) } diff --git a/internal/command/org_custom_login_text_model.go b/internal/command/org_custom_login_text_model.go index 15ca17af51..a726a4db86 100644 --- a/internal/command/org_custom_login_text_model.go +++ b/internal/command/org_custom_login_text_model.go @@ -24,7 +24,7 @@ func NewOrgCustomLoginTextReadModel(orgID string, lang language.Tag) *OrgCustomL } } -func (wm *OrgCustomLoginTextReadModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgCustomLoginTextReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.CustomTextSetEvent: @@ -79,7 +79,7 @@ func NewOrgCustomLoginTextsReadModel(orgID string) *OrgCustomLoginTextsReadModel } } -func (wm *OrgCustomLoginTextsReadModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgCustomLoginTextsReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.CustomTextSetEvent: diff --git a/internal/command/org_custom_message_model.go b/internal/command/org_custom_message_model.go index 86f2766ae4..fceb977711 100644 --- a/internal/command/org_custom_message_model.go +++ b/internal/command/org_custom_message_model.go @@ -25,7 +25,7 @@ func NewOrgCustomMessageTextWriteModel(orgID, messageTextType string, lang langu } } -func (wm *OrgCustomMessageTextReadModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgCustomMessageTextReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.CustomTextSetEvent: @@ -71,7 +71,7 @@ func NewOrgCustomMessageTextsWriteModel(orgID string) *OrgCustomMessageTemplates } } -func (wm *OrgCustomMessageTemplatesReadModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgCustomMessageTemplatesReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.CustomTextSetEvent: diff --git a/internal/command/org_custom_message_text.go b/internal/command/org_custom_message_text.go index ab0fdbe15a..1c70bf7277 100644 --- a/internal/command/org_custom_message_text.go +++ b/internal/command/org_custom_message_text.go @@ -20,7 +20,7 @@ func (c *Commands) SetOrgMessageText(ctx context.Context, resourceOwner string, if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -31,7 +31,7 @@ func (c *Commands) SetOrgMessageText(ctx context.Context, resourceOwner string, return writeModelToObjectDetails(&existingMessageText.WriteModel), nil } -func (c *Commands) setOrgMessageText(ctx context.Context, orgAgg *eventstore.Aggregate, message *domain.CustomMessageText) ([]eventstore.EventPusher, *OrgCustomMessageTextReadModel, error) { +func (c *Commands) setOrgMessageText(ctx context.Context, orgAgg *eventstore.Aggregate, message *domain.CustomMessageText) ([]eventstore.Command, *OrgCustomMessageTextReadModel, error) { if !message.IsValid() { return nil, nil, caos_errs.ThrowInvalidArgument(nil, "ORG-2jfsf", "Errors.CustomText.Invalid") } @@ -40,7 +40,7 @@ func (c *Commands) setOrgMessageText(ctx context.Context, orgAgg *eventstore.Agg if err != nil { return nil, nil, err } - events := make([]eventstore.EventPusher, 0) + events := make([]eventstore.Command, 0) if existingMessageText.Greeting != message.Greeting { if message.Greeting != "" { events = append(events, org.NewCustomTextSetEvent(ctx, orgAgg, message.MessageTextType, domain.MessageGreeting, message.Greeting, message.Language)) @@ -108,7 +108,7 @@ func (c *Commands) RemoveOrgMessageTexts(ctx context.Context, resourceOwner, mes return nil, caos_errs.ThrowNotFound(nil, "Org-3b8Jf", "Errors.CustomMessageText.NotFound") } orgAgg := OrgAggregateFromWriteModel(&customText.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewCustomTextTemplateRemovedEvent(ctx, orgAgg, messageTextType, lang)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewCustomTextTemplateRemovedEvent(ctx, orgAgg, messageTextType, lang)) if err != nil { return nil, err } @@ -119,7 +119,7 @@ func (c *Commands) RemoveOrgMessageTexts(ctx context.Context, resourceOwner, mes return writeModelToObjectDetails(&customText.WriteModel), nil } -func (c *Commands) removeOrgMessageTextsIfExists(ctx context.Context, orgID string) ([]eventstore.EventPusher, error) { +func (c *Commands) removeOrgMessageTextsIfExists(ctx context.Context, orgID string) ([]eventstore.Command, error) { msgTemplates := NewOrgCustomMessageTextsWriteModel(orgID) err := c.eventstore.FilterToQueryReducer(ctx, msgTemplates) if err != nil { @@ -127,7 +127,7 @@ func (c *Commands) removeOrgMessageTextsIfExists(ctx context.Context, orgID stri } orgAgg := OrgAggregateFromWriteModel(&msgTemplates.WriteModel) - events := make([]eventstore.EventPusher, 0, len(msgTemplates.CustomMessageTemplate)) + events := make([]eventstore.Command, 0, len(msgTemplates.CustomMessageTemplate)) for _, tmpl := range msgTemplates.CustomMessageTemplate { events = append(events, org.NewCustomTextTemplateRemovedEvent(ctx, orgAgg, tmpl.Template, tmpl.Language)) } diff --git a/internal/command/org_domain.go b/internal/command/org_domain.go index 9d7025b539..79f22b7125 100644 --- a/internal/command/org_domain.go +++ b/internal/command/org_domain.go @@ -23,7 +23,7 @@ func (c *Commands) AddOrgDomain(ctx context.Context, orgDomain *domain.OrgDomain if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -63,7 +63,7 @@ func (c *Commands) GenerateOrgDomainValidation(ctx context.Context, orgDomain *d orgAgg := OrgAggregateFromWriteModel(&domainWriteModel.WriteModel) - _, err = c.eventstore.PushEvents( + _, err = c.eventstore.Push( ctx, org.NewDomainVerificationAddedEvent(ctx, orgAgg, orgDomain.Domain, orgDomain.ValidationType, orgDomain.ValidationCode)) if err != nil { @@ -97,7 +97,7 @@ func (c *Commands) ValidateOrgDomain(ctx context.Context, orgDomain *domain.OrgD checkType, _ := domainWriteModel.ValidationType.CheckType() err = c.domainVerificationValidator(domainWriteModel.Domain, validationCode, validationCode, checkType) orgAgg := OrgAggregateFromWriteModel(&domainWriteModel.WriteModel) - var events []eventstore.EventPusher + var events []eventstore.Command if err == nil { events = append(events, org.NewDomainVerifiedEvent(ctx, orgAgg, orgDomain.Domain)) @@ -109,7 +109,7 @@ func (c *Commands) ValidateOrgDomain(ctx context.Context, orgDomain *domain.OrgD } events = append(events, userEvents...) } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -120,7 +120,7 @@ func (c *Commands) ValidateOrgDomain(ctx context.Context, orgDomain *domain.OrgD return writeModelToObjectDetails(&domainWriteModel.WriteModel), nil } events = append(events, org.NewDomainVerificationFailedEvent(ctx, orgAgg, orgDomain.Domain)) - _, err = c.eventstore.PushEvents(ctx, events...) + _, err = c.eventstore.Push(ctx, events...) logging.LogWithFields("ORG-dhTE", "orgID", orgAgg.ID, "domain", orgDomain.Domain).OnError(err).Error("NewDomainVerificationFailedEvent push failed") return nil, caos_errs.ThrowInvalidArgument(err, "ORG-GH3s", "Errors.Org.DomainVerificationFailed") } @@ -140,7 +140,7 @@ func (c *Commands) SetPrimaryOrgDomain(ctx context.Context, orgDomain *domain.Or return nil, caos_errs.ThrowPreconditionFailed(nil, "ORG-Ggd32", "Errors.Org.DomainNotVerified") } orgAgg := OrgAggregateFromWriteModel(&domainWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewDomainPrimarySetEvent(ctx, orgAgg, orgDomain.Domain)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewDomainPrimarySetEvent(ctx, orgAgg, orgDomain.Domain)) if err != nil { return nil, err } @@ -166,7 +166,7 @@ func (c *Commands) RemoveOrgDomain(ctx context.Context, orgDomain *domain.OrgDom return nil, caos_errs.ThrowPreconditionFailed(nil, "ORG-Sjdi3", "Errors.Org.PrimaryDomainNotDeletable") } orgAgg := OrgAggregateFromWriteModel(&domainWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewDomainRemovedEvent(ctx, orgAgg, orgDomain.Domain, domainWriteModel.Verified)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewDomainRemovedEvent(ctx, orgAgg, orgDomain.Domain, domainWriteModel.Verified)) if err != nil { return nil, err } @@ -177,7 +177,7 @@ func (c *Commands) RemoveOrgDomain(ctx context.Context, orgDomain *domain.OrgDom return writeModelToObjectDetails(&domainWriteModel.WriteModel), nil } -func (c *Commands) addOrgDomain(ctx context.Context, orgAgg *eventstore.Aggregate, addedDomain *OrgDomainWriteModel, orgDomain *domain.OrgDomain, claimedUserIDs []string) ([]eventstore.EventPusher, error) { +func (c *Commands) addOrgDomain(ctx context.Context, orgAgg *eventstore.Aggregate, addedDomain *OrgDomainWriteModel, orgDomain *domain.OrgDomain, claimedUserIDs []string) ([]eventstore.Command, error) { err := c.eventstore.FilterToQueryReducer(ctx, addedDomain) if err != nil { return nil, err @@ -186,7 +186,7 @@ func (c *Commands) addOrgDomain(ctx context.Context, orgAgg *eventstore.Aggregat return nil, caos_errs.ThrowAlreadyExists(nil, "COMMA-Bd2jj", "Errors.Org.Domain.AlreadyExists") } - events := []eventstore.EventPusher{ + events := []eventstore.Command{ org.NewDomainAddedEvent(ctx, orgAgg, orgDomain.Domain), } @@ -207,7 +207,7 @@ func (c *Commands) addOrgDomain(ctx context.Context, orgAgg *eventstore.Aggregat return events, nil } -func (c *Commands) changeDefaultDomain(ctx context.Context, orgID, newName string) ([]eventstore.EventPusher, error) { +func (c *Commands) changeDefaultDomain(ctx context.Context, orgID, newName string) ([]eventstore.Command, error) { orgDomains := NewOrgDomainsWriteModel(orgID) err := c.eventstore.FilterToQueryReducer(ctx, orgDomains) if err != nil { @@ -220,7 +220,7 @@ func (c *Commands) changeDefaultDomain(ctx context.Context, orgID, newName strin if orgDomain.State == domain.OrgDomainStateActive { if orgDomain.Domain == defaultDomain { newDefaultDomain := domain.NewIAMDomainName(newName, c.iamDomain) - events := []eventstore.EventPusher{ + events := []eventstore.Command{ org.NewDomainAddedEvent(ctx, orgAgg, newDefaultDomain), org.NewDomainVerifiedEvent(ctx, orgAgg, newDefaultDomain), } @@ -235,7 +235,7 @@ func (c *Commands) changeDefaultDomain(ctx context.Context, orgID, newName strin return nil, nil } -func (c *Commands) removeCustomDomains(ctx context.Context, orgID string) ([]eventstore.EventPusher, error) { +func (c *Commands) removeCustomDomains(ctx context.Context, orgID string) ([]eventstore.Command, error) { orgDomains := NewOrgDomainsWriteModel(orgID) err := c.eventstore.FilterToQueryReducer(ctx, orgDomains) if err != nil { @@ -245,7 +245,7 @@ func (c *Commands) removeCustomDomains(ctx context.Context, orgID string) ([]eve defaultDomain := domain.NewIAMDomainName(orgDomains.OrgName, c.iamDomain) isPrimary := defaultDomain == orgDomains.PrimaryDomain orgAgg := OrgAggregateFromWriteModel(&orgDomains.WriteModel) - events := make([]eventstore.EventPusher, 0, len(orgDomains.Domains)) + events := make([]eventstore.Command, 0, len(orgDomains.Domains)) for _, orgDomain := range orgDomains.Domains { if orgDomain.State == domain.OrgDomainStateActive { if orgDomain.Domain == defaultDomain { @@ -256,13 +256,13 @@ func (c *Commands) removeCustomDomains(ctx context.Context, orgID string) ([]eve } } if !hasDefault { - return append([]eventstore.EventPusher{ + return append([]eventstore.Command{ org.NewDomainAddedEvent(ctx, orgAgg, defaultDomain), org.NewDomainPrimarySetEvent(ctx, orgAgg, defaultDomain), }, events...), nil } if !isPrimary { - return append([]eventstore.EventPusher{org.NewDomainPrimarySetEvent(ctx, orgAgg, defaultDomain)}, events...), nil + return append([]eventstore.Command{org.NewDomainPrimarySetEvent(ctx, orgAgg, defaultDomain)}, events...), nil } return events, nil } diff --git a/internal/command/org_domain_model.go b/internal/command/org_domain_model.go index 50f9395b82..42c29a723a 100644 --- a/internal/command/org_domain_model.go +++ b/internal/command/org_domain_model.go @@ -29,7 +29,7 @@ func NewOrgDomainWriteModel(orgID string, domain string) *OrgDomainWriteModel { } } -func (wm *OrgDomainWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgDomainWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.DomainAddedEvent: @@ -185,7 +185,7 @@ func NewOrgDomainVerifiedWriteModel(domain string) *OrgDomainVerifiedWriteModel } } -func (wm *OrgDomainVerifiedWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgDomainVerifiedWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.DomainVerifiedEvent: diff --git a/internal/command/org_features.go b/internal/command/org_features.go index 0266a74bf3..eab0025547 100644 --- a/internal/command/org_features.go +++ b/internal/command/org_features.go @@ -57,7 +57,7 @@ func (c *Commands) SetOrgFeatures(ctx context.Context, resourceOwner string, fea } events = append(events, setEvent) - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -92,7 +92,7 @@ func (c *Commands) RemoveOrgFeatures(ctx context.Context, orgID string) (*domain } events = append(events, removedEvent) - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -103,7 +103,7 @@ func (c *Commands) RemoveOrgFeatures(ctx context.Context, orgID string) (*domain return writeModelToObjectDetails(&existingFeatures.WriteModel), nil } -func (c *Commands) ensureOrgSettingsToFeatures(ctx context.Context, orgID string, features *domain.Features) ([]eventstore.EventPusher, error) { +func (c *Commands) ensureOrgSettingsToFeatures(ctx context.Context, orgID string, features *domain.Features) ([]eventstore.Command, error) { events, err := c.setAllowedLoginPolicy(ctx, orgID, features) if err != nil { return nil, err @@ -189,8 +189,8 @@ func (c *Commands) ensureOrgSettingsToFeatures(ctx context.Context, orgID string return events, nil } -func (c *Commands) setAllowedLoginPolicy(ctx context.Context, orgID string, features *domain.Features) ([]eventstore.EventPusher, error) { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) setAllowedLoginPolicy(ctx context.Context, orgID string, features *domain.Features) ([]eventstore.Command, error) { + events := make([]eventstore.Command, 0) existingPolicy, err := c.orgLoginPolicyWriteModelByID(ctx, orgID) if err != nil { return nil, err @@ -238,12 +238,12 @@ func (c *Commands) setAllowedLoginPolicy(ctx context.Context, orgID string, feat return events, nil } -func (c *Commands) setDefaultAuthFactorsInCustomLoginPolicy(ctx context.Context, orgID string) ([]eventstore.EventPusher, error) { +func (c *Commands) setDefaultAuthFactorsInCustomLoginPolicy(ctx context.Context, orgID string) ([]eventstore.Command, error) { orgAuthFactors, err := c.orgLoginPolicyAuthFactorsWriteModel(ctx, orgID) if err != nil { return nil, err } - events := make([]eventstore.EventPusher, 0) + events := make([]eventstore.Command, 0) for _, factor := range domain.SecondFactorTypes() { state := orgAuthFactors.SecondFactors[factor] if state == nil || state.IAM == state.Org { @@ -296,8 +296,8 @@ func (c *Commands) setDefaultAuthFactorsInCustomLoginPolicy(ctx context.Context, return events, nil } -func (c *Commands) setAllowedLabelPolicy(ctx context.Context, orgID string, features *domain.Features) ([]eventstore.EventPusher, error) { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) setAllowedLabelPolicy(ctx context.Context, orgID string, features *domain.Features) ([]eventstore.Command, error) { + events := make([]eventstore.Command, 0) existingPolicy, err := c.orgLabelPolicyWriteModelByID(ctx, orgID) if err != nil { return nil, err diff --git a/internal/command/org_features_model.go b/internal/command/org_features_model.go index b2fa2e805b..7e8b524648 100644 --- a/internal/command/org_features_model.go +++ b/internal/command/org_features_model.go @@ -25,7 +25,7 @@ func NewOrgFeaturesWriteModel(orgID string) *OrgFeaturesWriteModel { } } -func (wm *OrgFeaturesWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgFeaturesWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.FeaturesSetEvent: diff --git a/internal/command/org_flow.go b/internal/command/org_flow.go index aa3f68b14c..939551567c 100644 --- a/internal/command/org_flow.go +++ b/internal/command/org_flow.go @@ -21,7 +21,7 @@ func (c *Commands) ClearFlow(ctx context.Context, flowType domain.FlowType, reso return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-DgGh3", "Errors.Flow.Empty") } orgAgg := OrgAggregateFromWriteModel(&existingFlow.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewFlowClearedEvent(ctx, orgAgg, flowType)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewFlowClearedEvent(ctx, orgAgg, flowType)) if err != nil { return nil, err } @@ -56,7 +56,7 @@ func (c *Commands) SetTriggerActions(ctx context.Context, flowType domain.FlowTy } } orgAgg := OrgAggregateFromWriteModel(&existingFlow.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewTriggerActionsSetEvent(ctx, orgAgg, flowType, triggerType, actionIDs)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewTriggerActionsSetEvent(ctx, orgAgg, flowType, triggerType, actionIDs)) if err != nil { return nil, err } diff --git a/internal/command/org_flow_model.go b/internal/command/org_flow_model.go index 947a6e5ac6..f2d682c9ba 100644 --- a/internal/command/org_flow_model.go +++ b/internal/command/org_flow_model.go @@ -16,7 +16,7 @@ func NewOrgFlowWriteModel(flowType domain.FlowType, resourceOwner string) *OrgFl } } -func (wm *OrgFlowWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgFlowWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.TriggerActionsSetEvent: diff --git a/internal/command/org_idp_config.go b/internal/command/org_idp_config.go index 2cf29b1db0..069c6ccbdc 100644 --- a/internal/command/org_idp_config.go +++ b/internal/command/org_idp_config.go @@ -28,7 +28,7 @@ func (c *Commands) AddIDPConfig(ctx context.Context, config *domain.IDPConfig, r addedConfig := NewOrgIDPConfigWriteModel(idpConfigID, resourceOwner) orgAgg := OrgAggregateFromWriteModel(&addedConfig.WriteModel) - events := []eventstore.EventPusher{ + events := []eventstore.Command{ org_repo.NewIDPConfigAddedEvent( ctx, orgAgg, @@ -67,7 +67,7 @@ func (c *Commands) AddIDPConfig(ctx context.Context, config *domain.IDPConfig, r config.JWTConfig.HeaderName, )) } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -102,7 +102,7 @@ func (c *Commands) ChangeIDPConfig(ctx context.Context, config *domain.IDPConfig if !hasChanged { return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-4M9vs", "Errors.Org.LabelPolicy.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } @@ -122,7 +122,7 @@ func (c *Commands) DeactivateIDPConfig(ctx context.Context, idpID, orgID string) return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-BBmd0", "Errors.Org.IDPConfig.NotActive") } orgAgg := OrgAggregateFromWriteModel(&existingIDP.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org_repo.NewIDPConfigDeactivatedEvent(ctx, orgAgg, idpID)) + pushedEvents, err := c.eventstore.Push(ctx, org_repo.NewIDPConfigDeactivatedEvent(ctx, orgAgg, idpID)) if err != nil { return nil, err } @@ -142,7 +142,7 @@ func (c *Commands) ReactivateIDPConfig(ctx context.Context, idpID, orgID string) return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-5Mo0d", "Errors.Org.IDPConfig.NotInactive") } orgAgg := OrgAggregateFromWriteModel(&existingIDP.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org_repo.NewIDPConfigReactivatedEvent(ctx, orgAgg, idpID)) + pushedEvents, err := c.eventstore.Push(ctx, org_repo.NewIDPConfigReactivatedEvent(ctx, orgAgg, idpID)) if err != nil { return nil, err } @@ -162,7 +162,7 @@ func (c *Commands) RemoveIDPConfig(ctx context.Context, idpID, orgID string, cas if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -173,13 +173,13 @@ func (c *Commands) RemoveIDPConfig(ctx context.Context, idpID, orgID string, cas return writeModelToObjectDetails(&existingIDP.IDPConfigWriteModel.WriteModel), nil } -func (c *Commands) removeIDPConfig(ctx context.Context, existingIDP *OrgIDPConfigWriteModel, cascadeRemoveProvider bool, cascadeExternalIDPs ...*domain.UserIDPLink) ([]eventstore.EventPusher, error) { +func (c *Commands) removeIDPConfig(ctx context.Context, existingIDP *OrgIDPConfigWriteModel, cascadeRemoveProvider bool, cascadeExternalIDPs ...*domain.UserIDPLink) ([]eventstore.Command, error) { if existingIDP.State == domain.IDPConfigStateRemoved || existingIDP.State == domain.IDPConfigStateUnspecified { return nil, caos_errs.ThrowNotFound(nil, "Org-Yx9vd", "Errors.Org.IDPConfig.NotExisting") } orgAgg := OrgAggregateFromWriteModel(&existingIDP.WriteModel) - events := []eventstore.EventPusher{ + events := []eventstore.Command{ org_repo.NewIDPConfigRemovedEvent(ctx, orgAgg, existingIDP.ConfigID, existingIDP.Name), } diff --git a/internal/command/org_idp_config_model.go b/internal/command/org_idp_config_model.go index 2c5599da1a..6602f7089b 100644 --- a/internal/command/org_idp_config_model.go +++ b/internal/command/org_idp_config_model.go @@ -43,7 +43,7 @@ func (wm *OrgIDPConfigWriteModel) Query() *eventstore.SearchQueryBuilder { Builder() } -func (wm *OrgIDPConfigWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgIDPConfigWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.IDPConfigAddedEvent: @@ -89,7 +89,7 @@ func (wm *OrgIDPConfigWriteModel) Reduce() error { return wm.IDPConfigWriteModel.Reduce() } -func (wm *OrgIDPConfigWriteModel) AppendAndReduce(events ...eventstore.EventReader) error { +func (wm *OrgIDPConfigWriteModel) AppendAndReduce(events ...eventstore.Event) error { wm.AppendEvents(events...) return wm.Reduce() } diff --git a/internal/command/org_idp_jwt_config.go b/internal/command/org_idp_jwt_config.go index d96e9dd8db..2ee0f66e11 100644 --- a/internal/command/org_idp_jwt_config.go +++ b/internal/command/org_idp_jwt_config.go @@ -40,7 +40,7 @@ func (c *Commands) ChangeIDPJWTConfig(ctx context.Context, config *domain.JWTIDP return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-2k9fs", "Errors.Org.IDPConfig.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } diff --git a/internal/command/org_idp_jwt_config_model.go b/internal/command/org_idp_jwt_config_model.go index 00dd75d912..b2ecb00ba4 100644 --- a/internal/command/org_idp_jwt_config_model.go +++ b/internal/command/org_idp_jwt_config_model.go @@ -25,7 +25,7 @@ func NewOrgIDPJWTConfigWriteModel(idpConfigID, orgID string) *IDPJWTConfigWriteM } } -func (wm *IDPJWTConfigWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IDPJWTConfigWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.IDPJWTConfigAddedEvent: diff --git a/internal/command/org_idp_oidc_config.go b/internal/command/org_idp_oidc_config.go index 4e15166cf0..1b30e0a7d6 100644 --- a/internal/command/org_idp_oidc_config.go +++ b/internal/command/org_idp_oidc_config.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/zitadel/internal/domain" caos_errs "github.com/caos/zitadel/internal/errors" ) @@ -44,7 +45,7 @@ func (c *Commands) ChangeIDPOIDCConfig(ctx context.Context, config *domain.OIDCI return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-4M9vs", "Errors.Org.LabelPolicy.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } diff --git a/internal/command/org_idp_oidc_config_model.go b/internal/command/org_idp_oidc_config_model.go index 87eb01e3b2..766e891099 100644 --- a/internal/command/org_idp_oidc_config_model.go +++ b/internal/command/org_idp_oidc_config_model.go @@ -28,7 +28,7 @@ func NewOrgIDPOIDCConfigWriteModel(idpConfigID, orgID string) *IDPOIDCConfigWrit } } -func (wm *IDPOIDCConfigWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *IDPOIDCConfigWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.IDPOIDCConfigAddedEvent: diff --git a/internal/command/org_member.go b/internal/command/org_member.go index 19aae80fce..6459eee4ad 100644 --- a/internal/command/org_member.go +++ b/internal/command/org_member.go @@ -27,7 +27,7 @@ func (c *Commands) AddOrgMember(ctx context.Context, member *domain.Member) (*do if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -38,7 +38,7 @@ func (c *Commands) AddOrgMember(ctx context.Context, member *domain.Member) (*do return memberWriteModelToMember(&addedMember.MemberWriteModel), nil } -func (c *Commands) addOrgMember(ctx context.Context, orgAgg *eventstore.Aggregate, addedMember *OrgMemberWriteModel, member *domain.Member) (eventstore.EventPusher, error) { +func (c *Commands) addOrgMember(ctx context.Context, orgAgg *eventstore.Aggregate, addedMember *OrgMemberWriteModel, member *domain.Member) (eventstore.Command, error) { if !member.IsValid() { return nil, caos_errs.ThrowInvalidArgument(nil, "Org-W8m4l", "Errors.Org.MemberInvalid") } @@ -74,7 +74,7 @@ func (c *Commands) ChangeOrgMember(ctx context.Context, member *domain.Member) ( return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-LiaZi", "Errors.Org.Member.RolesNotChanged") } orgAgg := OrgAggregateFromWriteModel(&existingMember.MemberWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewMemberChangedEvent(ctx, orgAgg, member.UserID, member.Roles...)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewMemberChangedEvent(ctx, orgAgg, member.UserID, member.Roles...)) err = AppendAndReduce(existingMember, pushedEvents...) if err != nil { return nil, err @@ -94,7 +94,7 @@ func (c *Commands) RemoveOrgMember(ctx context.Context, orgID, userID string) (* orgAgg := OrgAggregateFromWriteModel(&m.MemberWriteModel.WriteModel) removeEvent := c.removeOrgMember(ctx, orgAgg, userID, false) - pushedEvents, err := c.eventstore.PushEvents(ctx, removeEvent) + pushedEvents, err := c.eventstore.Push(ctx, removeEvent) if err != nil { return nil, err } @@ -105,7 +105,7 @@ func (c *Commands) RemoveOrgMember(ctx context.Context, orgID, userID string) (* return writeModelToObjectDetails(&m.WriteModel), nil } -func (c *Commands) removeOrgMember(ctx context.Context, orgAgg *eventstore.Aggregate, userID string, cascade bool) eventstore.EventPusher { +func (c *Commands) removeOrgMember(ctx context.Context, orgAgg *eventstore.Aggregate, userID string, cascade bool) eventstore.Command { if cascade { return org.NewMemberCascadeRemovedEvent( ctx, diff --git a/internal/command/org_member_model.go b/internal/command/org_member_model.go index 8c96d7aee3..602787ba2b 100644 --- a/internal/command/org_member_model.go +++ b/internal/command/org_member_model.go @@ -21,7 +21,7 @@ func NewOrgMemberWriteModel(orgID, userID string) *OrgMemberWriteModel { } } -func (wm *OrgMemberWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgMemberWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.MemberAddedEvent: diff --git a/internal/command/org_policy_label.go b/internal/command/org_policy_label.go index d38e9bc259..62c2b14bc9 100644 --- a/internal/command/org_policy_label.go +++ b/internal/command/org_policy_label.go @@ -29,7 +29,7 @@ func (c *Commands) AddLabelPolicy(ctx context.Context, resourceOwner string, pol return nil, err } orgAgg := OrgAggregateFromWriteModel(&addedPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewLabelPolicyAddedEvent( + pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyAddedEvent( ctx, orgAgg, policy.PrimaryColor, @@ -93,7 +93,7 @@ func (c *Commands) ChangeLabelPolicy(ctx context.Context, resourceOwner string, return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-4M9vs", "Errors.Org.LabelPolicy.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } @@ -139,7 +139,7 @@ func (c *Commands) ActivateLabelPolicy(ctx context.Context, orgID string) (*doma return nil, caos_errs.ThrowNotFound(nil, "ORG-34mSE", "Errors.Org.LabelPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewLabelPolicyActivatedEvent(ctx, orgAgg)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyActivatedEvent(ctx, orgAgg)) if err != nil { return nil, err } @@ -166,7 +166,7 @@ func (c *Commands) AddLogoLabelPolicy(ctx context.Context, orgID, storageKey str return nil, caos_errs.ThrowNotFound(nil, "ORG-23BMs", "Errors.Org.LabelPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewLabelPolicyLogoAddedEvent(ctx, orgAgg, storageKey)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyLogoAddedEvent(ctx, orgAgg, storageKey)) if err != nil { return nil, err } @@ -194,7 +194,7 @@ func (c *Commands) RemoveLogoLabelPolicy(ctx context.Context, orgID string) (*do return nil, err } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewLabelPolicyLogoRemovedEvent(ctx, orgAgg, existingPolicy.LogoKey)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyLogoRemovedEvent(ctx, orgAgg, existingPolicy.LogoKey)) if err != nil { return nil, err } @@ -221,7 +221,7 @@ func (c *Commands) AddIconLabelPolicy(ctx context.Context, orgID, storageKey str return nil, caos_errs.ThrowNotFound(nil, "ORG-4nq2f", "Errors.Org.LabelPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewLabelPolicyIconAddedEvent(ctx, orgAgg, storageKey)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyIconAddedEvent(ctx, orgAgg, storageKey)) if err != nil { return nil, err } @@ -250,7 +250,7 @@ func (c *Commands) RemoveIconLabelPolicy(ctx context.Context, orgID string) (*do return nil, err } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewLabelPolicyIconRemovedEvent(ctx, orgAgg, existingPolicy.IconKey)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyIconRemovedEvent(ctx, orgAgg, existingPolicy.IconKey)) if err != nil { return nil, err } @@ -277,7 +277,7 @@ func (c *Commands) AddLogoDarkLabelPolicy(ctx context.Context, orgID, storageKey return nil, caos_errs.ThrowNotFound(nil, "ORG-QSqcd", "Errors.Org.LabelPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewLabelPolicyLogoDarkAddedEvent(ctx, orgAgg, storageKey)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyLogoDarkAddedEvent(ctx, orgAgg, storageKey)) if err != nil { return nil, err } @@ -305,7 +305,7 @@ func (c *Commands) RemoveLogoDarkLabelPolicy(ctx context.Context, orgID string) return nil, err } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewLabelPolicyLogoDarkRemovedEvent(ctx, orgAgg, existingPolicy.LogoDarkKey)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyLogoDarkRemovedEvent(ctx, orgAgg, existingPolicy.LogoDarkKey)) if err != nil { return nil, err } @@ -332,7 +332,7 @@ func (c *Commands) AddIconDarkLabelPolicy(ctx context.Context, orgID, storageKey return nil, caos_errs.ThrowNotFound(nil, "ORG-4Nf8s", "Errors.Org.LabelPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewLabelPolicyIconDarkAddedEvent(ctx, orgAgg, storageKey)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyIconDarkAddedEvent(ctx, orgAgg, storageKey)) if err != nil { return nil, err } @@ -356,7 +356,7 @@ func (c *Commands) RemoveIconDarkLabelPolicy(ctx context.Context, orgID string) return nil, caos_errs.ThrowNotFound(nil, "ORG-3NFos", "Errors.Org.LabelPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewLabelPolicyIconDarkRemovedEvent(ctx, orgAgg, existingPolicy.IconDarkKey)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyIconDarkRemovedEvent(ctx, orgAgg, existingPolicy.IconDarkKey)) if err != nil { return nil, err } @@ -383,7 +383,7 @@ func (c *Commands) AddFontLabelPolicy(ctx context.Context, orgID, storageKey str return nil, caos_errs.ThrowNotFound(nil, "ORG-2M9fs", "Errors.Org.LabelPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewLabelPolicyFontAddedEvent(ctx, orgAgg, storageKey)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyFontAddedEvent(ctx, orgAgg, storageKey)) if err != nil { return nil, err } @@ -407,7 +407,7 @@ func (c *Commands) RemoveFontLabelPolicy(ctx context.Context, orgID string) (*do return nil, caos_errs.ThrowNotFound(nil, "ORG-4n9SD", "Errors.Org.LabelPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewLabelPolicyFontRemovedEvent(ctx, orgAgg, existingPolicy.FontKey)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyFontRemovedEvent(ctx, orgAgg, existingPolicy.FontKey)) if err != nil { return nil, err } @@ -427,7 +427,7 @@ func (c *Commands) RemoveLabelPolicy(ctx context.Context, orgID string) (*domain if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, removeEvent) + pushedEvents, err := c.eventstore.Push(ctx, removeEvent) if err != nil { return nil, err } diff --git a/internal/command/org_policy_label_model.go b/internal/command/org_policy_label_model.go index b3405179c2..5d088bfbf0 100644 --- a/internal/command/org_policy_label_model.go +++ b/internal/command/org_policy_label_model.go @@ -24,7 +24,7 @@ func NewOrgLabelPolicyWriteModel(orgID string) *OrgLabelPolicyWriteModel { } } -func (wm *OrgLabelPolicyWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgLabelPolicyWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.LabelPolicyAddedEvent: diff --git a/internal/command/org_policy_lockout.go b/internal/command/org_policy_lockout.go index e38cb36f51..b4ac0dd50c 100644 --- a/internal/command/org_policy_lockout.go +++ b/internal/command/org_policy_lockout.go @@ -21,7 +21,7 @@ func (c *Commands) AddLockoutPolicy(ctx context.Context, resourceOwner string, p } orgAgg := OrgAggregateFromWriteModel(&addedPolicy.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewLockoutPolicyAddedEvent(ctx, orgAgg, policy.MaxPasswordAttempts, policy.ShowLockOutFailures)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewLockoutPolicyAddedEvent(ctx, orgAgg, policy.MaxPasswordAttempts, policy.ShowLockOutFailures)) if err != nil { return nil, err } @@ -50,7 +50,7 @@ func (c *Commands) ChangeLockoutPolicy(ctx context.Context, resourceOwner string return nil, caos_errs.ThrowPreconditionFailed(nil, "ORG-4M9vs", "Errors.Org.LockoutPolicy.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } @@ -74,7 +74,7 @@ func (c *Commands) RemoveLockoutPolicy(ctx context.Context, orgID string) (*doma } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewLockoutPolicyRemovedEvent(ctx, orgAgg)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewLockoutPolicyRemovedEvent(ctx, orgAgg)) if err != nil { return nil, err } diff --git a/internal/command/org_policy_lockout_model.go b/internal/command/org_policy_lockout_model.go index b01fbacdaa..bdb84a57ba 100644 --- a/internal/command/org_policy_lockout_model.go +++ b/internal/command/org_policy_lockout_model.go @@ -24,7 +24,7 @@ func NewOrgLockoutPolicyWriteModel(orgID string) *OrgLockoutPolicyWriteModel { } } -func (wm *OrgLockoutPolicyWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgLockoutPolicyWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.LockoutPolicyAddedEvent: diff --git a/internal/command/org_policy_login.go b/internal/command/org_policy_login.go index d3a293d58e..02dd6edd71 100644 --- a/internal/command/org_policy_login.go +++ b/internal/command/org_policy_login.go @@ -32,7 +32,7 @@ func (c *Commands) AddLoginPolicy(ctx context.Context, resourceOwner string, pol } orgAgg := OrgAggregateFromWriteModel(&addedPolicy.WriteModel) - pushedEvents, err := c.eventstore.PushEvents( + pushedEvents, err := c.eventstore.Push( ctx, org.NewLoginPolicyAddedEvent( ctx, @@ -106,7 +106,7 @@ func (c *Commands) ChangeLoginPolicy(ctx context.Context, resourceOwner string, return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-5M9vdd", "Errors.Org.LoginPolicy.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } @@ -157,7 +157,7 @@ func (c *Commands) RemoveLoginPolicy(ctx context.Context, orgID string) (*domain return nil, caos_errs.ThrowNotFound(nil, "Org-GHB37", "Errors.Org.LoginPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LoginPolicyWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewLoginPolicyRemovedEvent(ctx, orgAgg)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewLoginPolicyRemovedEvent(ctx, orgAgg)) if err != nil { return nil, err } @@ -201,7 +201,7 @@ func (c *Commands) AddIDPProviderToLoginPolicy(ctx context.Context, resourceOwne } orgAgg := OrgAggregateFromWriteModel(&idpModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewIdentityProviderAddedEvent(ctx, orgAgg, idpProvider.IDPConfigID, idpProvider.Type)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewIdentityProviderAddedEvent(ctx, orgAgg, idpProvider.IDPConfigID, idpProvider.Type)) if err != nil { return nil, err } @@ -239,7 +239,7 @@ func (c *Commands) RemoveIDPProviderFromLoginPolicy(ctx context.Context, resourc orgAgg := OrgAggregateFromWriteModel(&idpModel.IdentityProviderWriteModel.WriteModel) events := c.removeIDPProviderFromLoginPolicy(ctx, orgAgg, idpProvider.IDPConfigID, false, cascadeExternalIDPs...) - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -250,8 +250,8 @@ func (c *Commands) RemoveIDPProviderFromLoginPolicy(ctx context.Context, resourc return writeModelToObjectDetails(&idpModel.WriteModel), nil } -func (c *Commands) removeIDPProviderFromLoginPolicy(ctx context.Context, orgAgg *eventstore.Aggregate, idpConfigID string, cascade bool, cascadeExternalIDPs ...*domain.UserIDPLink) []eventstore.EventPusher { - var events []eventstore.EventPusher +func (c *Commands) removeIDPProviderFromLoginPolicy(ctx context.Context, orgAgg *eventstore.Aggregate, idpConfigID string, cascade bool, cascadeExternalIDPs ...*domain.UserIDPLink) []eventstore.Command { + var events []eventstore.Command if cascade { events = append(events, org.NewIdentityProviderCascadeRemovedEvent(ctx, orgAgg, idpConfigID)) } else { @@ -282,7 +282,7 @@ func (c *Commands) AddSecondFactorToLoginPolicy(ctx context.Context, secondFacto return domain.SecondFactorTypeUnspecified, nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, addedEvent) + pushedEvents, err := c.eventstore.Push(ctx, addedEvent) if err != nil { return domain.SecondFactorTypeUnspecified, nil, err } @@ -321,7 +321,7 @@ func (c *Commands) RemoveSecondFactorFromLoginPolicy(ctx context.Context, second return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, removedEvent) + pushedEvents, err := c.eventstore.Push(ctx, removedEvent) if err != nil { return nil, err } @@ -357,7 +357,7 @@ func (c *Commands) AddMultiFactorToLoginPolicy(ctx context.Context, multiFactor return domain.MultiFactorTypeUnspecified, nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, addedEvent) + pushedEvents, err := c.eventstore.Push(ctx, addedEvent) if err != nil { return domain.MultiFactorTypeUnspecified, nil, err } @@ -394,7 +394,7 @@ func (c *Commands) RemoveMultiFactorFromLoginPolicy(ctx context.Context, multiFa return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, removedEvent) + pushedEvents, err := c.eventstore.Push(ctx, removedEvent) if err != nil { return nil, err } diff --git a/internal/command/org_policy_login_factors_model.go b/internal/command/org_policy_login_factors_model.go index 65bcad6fdb..fc0f596316 100644 --- a/internal/command/org_policy_login_factors_model.go +++ b/internal/command/org_policy_login_factors_model.go @@ -23,7 +23,7 @@ func NewOrgSecondFactorWriteModel(orgID string, factorType domain.SecondFactorTy } } -func (wm *OrgSecondFactorWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgSecondFactorWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.LoginPolicySecondFactorAddedEvent: @@ -73,7 +73,7 @@ func NewOrgMultiFactorWriteModel(orgID string, factorType domain.MultiFactorType } } -func (wm *OrgMultiFactorWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgMultiFactorWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.LoginPolicyMultiFactorAddedEvent: diff --git a/internal/command/org_policy_login_identity_provider_model.go b/internal/command/org_policy_login_identity_provider_model.go index 8b74daf3e8..5963342aae 100644 --- a/internal/command/org_policy_login_identity_provider_model.go +++ b/internal/command/org_policy_login_identity_provider_model.go @@ -21,7 +21,7 @@ func NewOrgIdentityProviderWriteModel(orgID, idpConfigID string) *OrgIdentityPro } } -func (wm *OrgIdentityProviderWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgIdentityProviderWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.IdentityProviderAddedEvent: diff --git a/internal/command/org_policy_login_model.go b/internal/command/org_policy_login_model.go index bc2574e9e4..12b8734829 100644 --- a/internal/command/org_policy_login_model.go +++ b/internal/command/org_policy_login_model.go @@ -25,7 +25,7 @@ func NewOrgLoginPolicyWriteModel(orgID string) *OrgLoginPolicyWriteModel { } } -func (wm *OrgLoginPolicyWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgLoginPolicyWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.LoginPolicyAddedEvent: diff --git a/internal/command/org_policy_mail_template.go b/internal/command/org_policy_mail_template.go index d5585f8381..6cfe1d2ff0 100644 --- a/internal/command/org_policy_mail_template.go +++ b/internal/command/org_policy_mail_template.go @@ -25,7 +25,7 @@ func (c *Commands) AddMailTemplate(ctx context.Context, resourceOwner string, po } orgAgg := OrgAggregateFromWriteModel(&addedPolicy.MailTemplateWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewMailTemplateAddedEvent(ctx, orgAgg, policy.Template)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewMailTemplateAddedEvent(ctx, orgAgg, policy.Template)) if err != nil { return nil, err } @@ -58,7 +58,7 @@ func (c *Commands) ChangeMailTemplate(ctx context.Context, resourceOwner string, return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-4M9vs", "Errors.Org.MailTemplate.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } @@ -83,6 +83,6 @@ func (c *Commands) RemoveMailTemplate(ctx context.Context, orgID string) error { } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.WriteModel) - _, err = c.eventstore.PushEvents(ctx, org.NewMailTemplateRemovedEvent(ctx, orgAgg)) + _, err = c.eventstore.Push(ctx, org.NewMailTemplateRemovedEvent(ctx, orgAgg)) return err } diff --git a/internal/command/org_policy_mail_template_model.go b/internal/command/org_policy_mail_template_model.go index c1236ed802..3c4d45b408 100644 --- a/internal/command/org_policy_mail_template_model.go +++ b/internal/command/org_policy_mail_template_model.go @@ -25,7 +25,7 @@ func NewOrgMailTemplateWriteModel(orgID string) *OrgMailTemplateWriteModel { } } -func (wm *OrgMailTemplateWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgMailTemplateWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.MailTemplateAddedEvent: diff --git a/internal/command/org_policy_org_iam.go b/internal/command/org_policy_org_iam.go index b092aa0f56..e327c0467a 100644 --- a/internal/command/org_policy_org_iam.go +++ b/internal/command/org_policy_org_iam.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/zitadel/internal/domain" caos_errs "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore" @@ -19,7 +20,7 @@ func (c *Commands) AddOrgIAMPolicy(ctx context.Context, resourceOwner string, po if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -30,7 +31,7 @@ func (c *Commands) AddOrgIAMPolicy(ctx context.Context, resourceOwner string, po return orgWriteModelToOrgIAMPolicy(addedPolicy), nil } -func (c *Commands) addOrgIAMPolicy(ctx context.Context, orgAgg *eventstore.Aggregate, addedPolicy *ORGOrgIAMPolicyWriteModel, policy *domain.OrgIAMPolicy) (eventstore.EventPusher, error) { +func (c *Commands) addOrgIAMPolicy(ctx context.Context, orgAgg *eventstore.Aggregate, addedPolicy *ORGOrgIAMPolicyWriteModel, policy *domain.OrgIAMPolicy) (eventstore.Command, error) { err := c.eventstore.FilterToQueryReducer(ctx, addedPolicy) if err != nil { return nil, err @@ -59,7 +60,7 @@ func (c *Commands) ChangeOrgIAMPolicy(ctx context.Context, resourceOwner string, return nil, caos_errs.ThrowPreconditionFailed(nil, "ORG-3M9ds", "Errors.Org.LabelPolicy.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } @@ -83,7 +84,7 @@ func (c *Commands) RemoveOrgIAMPolicy(ctx context.Context, orgID string) error { } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.PolicyOrgIAMWriteModel.WriteModel) - _, err = c.eventstore.PushEvents(ctx, org.NewOrgIAMPolicyRemovedEvent(ctx, orgAgg)) + _, err = c.eventstore.Push(ctx, org.NewOrgIAMPolicyRemovedEvent(ctx, orgAgg)) return err } diff --git a/internal/command/org_policy_org_iam_model.go b/internal/command/org_policy_org_iam_model.go index fb23959522..92ec66b62d 100644 --- a/internal/command/org_policy_org_iam_model.go +++ b/internal/command/org_policy_org_iam_model.go @@ -24,7 +24,7 @@ func NewORGOrgIAMPolicyWriteModel(orgID string) *ORGOrgIAMPolicyWriteModel { } } -func (wm *ORGOrgIAMPolicyWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *ORGOrgIAMPolicyWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.OrgIAMPolicyAddedEvent: diff --git a/internal/command/org_policy_password_age.go b/internal/command/org_policy_password_age.go index 045fa35522..2406f7fbd7 100644 --- a/internal/command/org_policy_password_age.go +++ b/internal/command/org_policy_password_age.go @@ -22,7 +22,7 @@ func (c *Commands) AddPasswordAgePolicy(ctx context.Context, resourceOwner strin } orgAgg := OrgAggregateFromWriteModel(&addedPolicy.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewPasswordAgePolicyAddedEvent(ctx, orgAgg, policy.ExpireWarnDays, policy.MaxAgeDays)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewPasswordAgePolicyAddedEvent(ctx, orgAgg, policy.ExpireWarnDays, policy.MaxAgeDays)) if err != nil { return nil, err } @@ -52,7 +52,7 @@ func (c *Commands) ChangePasswordAgePolicy(ctx context.Context, resourceOwner st return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-dsgjR", "Errors.ORg.LabelPolicy.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } @@ -76,7 +76,7 @@ func (c *Commands) RemovePasswordAgePolicy(ctx context.Context, orgID string) (* return nil, caos_errs.ThrowNotFound(nil, "ORG-Dgs1g", "Errors.Org.PasswordAgePolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, org.NewPasswordAgePolicyRemovedEvent(ctx, orgAgg)) + pushedEvents, err := c.eventstore.Push(ctx, org.NewPasswordAgePolicyRemovedEvent(ctx, orgAgg)) if err != nil { return nil, err } diff --git a/internal/command/org_policy_password_age_model.go b/internal/command/org_policy_password_age_model.go index 9845264f56..1b99c7a399 100644 --- a/internal/command/org_policy_password_age_model.go +++ b/internal/command/org_policy_password_age_model.go @@ -24,7 +24,7 @@ func NewOrgPasswordAgePolicyWriteModel(orgID string) *OrgPasswordAgePolicyWriteM } } -func (wm *OrgPasswordAgePolicyWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgPasswordAgePolicyWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.PasswordAgePolicyAddedEvent: diff --git a/internal/command/org_policy_password_complexity.go b/internal/command/org_policy_password_complexity.go index 910d3cfa6f..d61dc827c8 100644 --- a/internal/command/org_policy_password_complexity.go +++ b/internal/command/org_policy_password_complexity.go @@ -45,7 +45,7 @@ func (c *Commands) AddPasswordComplexityPolicy(ctx context.Context, resourceOwne } orgAgg := OrgAggregateFromWriteModel(&addedPolicy.WriteModel) - pushedEvents, err := c.eventstore.PushEvents( + pushedEvents, err := c.eventstore.Push( ctx, org.NewPasswordComplexityPolicyAddedEvent( ctx, @@ -88,7 +88,7 @@ func (c *Commands) ChangePasswordComplexityPolicy(ctx context.Context, resourceO return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-DAs21", "Errors.Org.PasswordComplexityPolicy.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } @@ -108,7 +108,7 @@ func (c *Commands) RemovePasswordComplexityPolicy(ctx context.Context, orgID str if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } diff --git a/internal/command/org_policy_password_complexity_model.go b/internal/command/org_policy_password_complexity_model.go index 5ef01e6b02..3e06cabf1b 100644 --- a/internal/command/org_policy_password_complexity_model.go +++ b/internal/command/org_policy_password_complexity_model.go @@ -24,7 +24,7 @@ func NewOrgPasswordComplexityPolicyWriteModel(orgID string) *OrgPasswordComplexi } } -func (wm *OrgPasswordComplexityPolicyWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgPasswordComplexityPolicyWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.PasswordComplexityPolicyAddedEvent: diff --git a/internal/command/org_policy_privacy.go b/internal/command/org_policy_privacy.go index bfa75d2c00..9c45e2cc37 100644 --- a/internal/command/org_policy_privacy.go +++ b/internal/command/org_policy_privacy.go @@ -42,7 +42,7 @@ func (c *Commands) AddPrivacyPolicy(ctx context.Context, resourceOwner string, p } orgAgg := OrgAggregateFromWriteModel(&addedPolicy.WriteModel) - pushedEvents, err := c.eventstore.PushEvents( + pushedEvents, err := c.eventstore.Push( ctx, org.NewPrivacyPolicyAddedEvent( ctx, @@ -79,7 +79,7 @@ func (c *Commands) ChangePrivacyPolicy(ctx context.Context, resourceOwner string return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-4N9fs", "Errors.Org.PrivacyPolicy.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } @@ -99,7 +99,7 @@ func (c *Commands) RemovePrivacyPolicy(ctx context.Context, orgID string) (*doma if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } diff --git a/internal/command/org_policy_privacy_model.go b/internal/command/org_policy_privacy_model.go index 46db23229e..171b48f75a 100644 --- a/internal/command/org_policy_privacy_model.go +++ b/internal/command/org_policy_privacy_model.go @@ -24,7 +24,7 @@ func NewOrgPrivacyPolicyWriteModel(orgID string) *OrgPrivacyPolicyWriteModel { } } -func (wm *OrgPrivacyPolicyWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OrgPrivacyPolicyWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.PrivacyPolicyAddedEvent: diff --git a/internal/command/project.go b/internal/command/project.go index 91283a9d34..461895c24f 100644 --- a/internal/command/project.go +++ b/internal/command/project.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/logging" "github.com/caos/zitadel/internal/domain" caos_errs "github.com/caos/zitadel/internal/errors" @@ -14,7 +15,7 @@ func (c *Commands) AddProject(ctx context.Context, project *domain.Project, reso if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -25,7 +26,7 @@ func (c *Commands) AddProject(ctx context.Context, project *domain.Project, reso return projectWriteModelToProject(addedProject), nil } -func (c *Commands) addProject(ctx context.Context, projectAdd *domain.Project, resourceOwner, ownerUserID string) (_ []eventstore.EventPusher, _ *ProjectWriteModel, err error) { +func (c *Commands) addProject(ctx context.Context, projectAdd *domain.Project, resourceOwner, ownerUserID string) (_ []eventstore.Command, _ *ProjectWriteModel, err error) { if !projectAdd.IsValid() { return nil, nil, caos_errs.ThrowInvalidArgument(nil, "PROJECT-IOVCC", "Errors.Project.Invalid") } @@ -44,7 +45,7 @@ func (c *Commands) addProject(ctx context.Context, projectAdd *domain.Project, r if iam.GlobalOrgID == resourceOwner { projectRole = domain.RoleProjectOwnerGlobal } - events := []eventstore.EventPusher{ + events := []eventstore.Command{ project.NewProjectAddedEvent( ctx, projectAgg, @@ -108,7 +109,7 @@ func (c *Commands) ChangeProject(ctx context.Context, projectChange *domain.Proj if !hasChanged { return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-2M0fs", "Errors.NoChangesFound") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } @@ -136,7 +137,7 @@ func (c *Commands) DeactivateProject(ctx context.Context, projectID string, reso } projectAgg := ProjectAggregateFromWriteModel(&existingProject.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, project.NewProjectDeactivatedEvent(ctx, projectAgg)) + pushedEvents, err := c.eventstore.Push(ctx, project.NewProjectDeactivatedEvent(ctx, projectAgg)) if err != nil { return nil, err } @@ -164,7 +165,7 @@ func (c *Commands) ReactivateProject(ctx context.Context, projectID string, reso } projectAgg := ProjectAggregateFromWriteModel(&existingProject.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, project.NewProjectReactivatedEvent(ctx, projectAgg)) + pushedEvents, err := c.eventstore.Push(ctx, project.NewProjectReactivatedEvent(ctx, projectAgg)) if err != nil { return nil, err } @@ -188,7 +189,7 @@ func (c *Commands) RemoveProject(ctx context.Context, projectID, resourceOwner s return nil, caos_errs.ThrowNotFound(nil, "COMMAND-3M9sd", "Errors.Project.NotFound") } projectAgg := ProjectAggregateFromWriteModel(&existingProject.WriteModel) - events := []eventstore.EventPusher{ + events := []eventstore.Command{ project.NewProjectRemovedEvent(ctx, projectAgg, existingProject.Name), } @@ -201,7 +202,7 @@ func (c *Commands) RemoveProject(ctx context.Context, projectID, resourceOwner s events = append(events, event) } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } diff --git a/internal/command/project_application.go b/internal/command/project_application.go index 957596efae..80532f0109 100644 --- a/internal/command/project_application.go +++ b/internal/command/project_application.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/zitadel/internal/domain" caos_errs "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/repository/project" @@ -23,7 +24,7 @@ func (c *Commands) ChangeApplication(ctx context.Context, projectID string, appC return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-2m8vx", "Errors.NoChangesFound") } projectAgg := ProjectAggregateFromWriteModel(&existingApp.WriteModel) - pushedEvents, err := c.eventstore.PushEvents( + pushedEvents, err := c.eventstore.Push( ctx, project.NewApplicationChangedEvent(ctx, projectAgg, appChange.GetAppID(), existingApp.Name, appChange.GetApplicationName())) if err != nil { @@ -52,7 +53,7 @@ func (c *Commands) DeactivateApplication(ctx context.Context, projectID, appID, return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-dsh35", "Errors.Project.App.NotActive") } projectAgg := ProjectAggregateFromWriteModel(&existingApp.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, project.NewApplicationDeactivatedEvent(ctx, projectAgg, appID)) + pushedEvents, err := c.eventstore.Push(ctx, project.NewApplicationDeactivatedEvent(ctx, projectAgg, appID)) if err != nil { return nil, err } @@ -80,7 +81,7 @@ func (c *Commands) ReactivateApplication(ctx context.Context, projectID, appID, } projectAgg := ProjectAggregateFromWriteModel(&existingApp.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, project.NewApplicationReactivatedEvent(ctx, projectAgg, appID)) + pushedEvents, err := c.eventstore.Push(ctx, project.NewApplicationReactivatedEvent(ctx, projectAgg, appID)) if err != nil { return nil, err } @@ -105,7 +106,7 @@ func (c *Commands) RemoveApplication(ctx context.Context, projectID, appID, reso } projectAgg := ProjectAggregateFromWriteModel(&existingApp.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, project.NewApplicationRemovedEvent(ctx, projectAgg, appID, existingApp.Name)) + pushedEvents, err := c.eventstore.Push(ctx, project.NewApplicationRemovedEvent(ctx, projectAgg, appID, existingApp.Name)) if err != nil { return nil, err } diff --git a/internal/command/project_application_api.go b/internal/command/project_application_api.go index f4b55c19c1..4006f1bce7 100644 --- a/internal/command/project_application_api.go +++ b/internal/command/project_application_api.go @@ -28,7 +28,7 @@ func (c *Commands) AddAPIApplication(ctx context.Context, application *domain.AP return nil, err } addedApplication.AppID = application.AppID - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -41,7 +41,7 @@ func (c *Commands) AddAPIApplication(ctx context.Context, application *domain.AP return result, nil } -func (c *Commands) addAPIApplication(ctx context.Context, projectAgg *eventstore.Aggregate, proj *domain.Project, apiAppApp *domain.APIApp, resourceOwner string) (events []eventstore.EventPusher, stringPW string, err error) { +func (c *Commands) addAPIApplication(ctx context.Context, projectAgg *eventstore.Aggregate, proj *domain.Project, apiAppApp *domain.APIApp, resourceOwner string) (events []eventstore.Command, stringPW string, err error) { if !apiAppApp.IsValid() { return nil, "", caos_errs.ThrowInvalidArgument(nil, "PROJECT-Bff2g", "Errors.Application.Invalid") } @@ -50,7 +50,7 @@ func (c *Commands) addAPIApplication(ctx context.Context, projectAgg *eventstore return nil, "", err } - events = []eventstore.EventPusher{ + events = []eventstore.Command{ project.NewApplicationAddedEvent(ctx, projectAgg, apiAppApp.AppID, apiAppApp.AppName), } @@ -101,7 +101,7 @@ func (c *Commands) ChangeAPIApplication(ctx context.Context, apiApp *domain.APIA return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-1m88i", "Errors.NoChangesFound") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } @@ -135,7 +135,7 @@ func (c *Commands) ChangeAPIApplicationSecret(ctx context.Context, projectID, ap projectAgg := ProjectAggregateFromWriteModel(&existingAPI.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, project.NewAPIConfigSecretChangedEvent(ctx, projectAgg, appID, cryptoSecret)) + pushedEvents, err := c.eventstore.Push(ctx, project.NewAPIConfigSecretChangedEvent(ctx, projectAgg, appID, cryptoSecret)) if err != nil { return nil, err } @@ -172,10 +172,10 @@ func (c *Commands) VerifyAPIClientSecret(ctx context.Context, projectID, appID, err = crypto.CompareHash(app.ClientSecret, []byte(secret), c.userPasswordAlg) spanPasswordComparison.EndWithError(err) if err == nil { - _, err = c.eventstore.PushEvents(ctx, project.NewAPIConfigSecretCheckSucceededEvent(ctx, projectAgg, app.AppID)) + _, err = c.eventstore.Push(ctx, project.NewAPIConfigSecretCheckSucceededEvent(ctx, projectAgg, app.AppID)) return err } - _, err = c.eventstore.PushEvents(ctx, project.NewAPIConfigSecretCheckFailedEvent(ctx, projectAgg, app.AppID)) + _, err = c.eventstore.Push(ctx, project.NewAPIConfigSecretCheckFailedEvent(ctx, projectAgg, app.AppID)) logging.Log("COMMAND-g3f12").OnError(err).Error("could not push event APIClientSecretCheckFailed") return caos_errs.ThrowInvalidArgument(nil, "COMMAND-SADfg", "Errors.Project.App.ClientSecretInvalid") } diff --git a/internal/command/project_application_api_model.go b/internal/command/project_application_api_model.go index 1fe355fe03..8b227b38e9 100644 --- a/internal/command/project_application_api_model.go +++ b/internal/command/project_application_api_model.go @@ -41,7 +41,7 @@ func NewAPIApplicationWriteModel(projectID, resourceOwner string) *APIApplicatio }, } } -func (wm *APIApplicationWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *APIApplicationWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *project.ApplicationAddedEvent: diff --git a/internal/command/project_application_key.go b/internal/command/project_application_key.go index 911791eb8e..c556f09142 100644 --- a/internal/command/project_application_key.go +++ b/internal/command/project_application_key.go @@ -43,7 +43,7 @@ func (c *Commands) AddApplicationKey(ctx context.Context, key *domain.Applicatio } key.ClientID = keyWriteModel.ClientID - pushedEvents, err := c.eventstore.PushEvents(ctx, + pushedEvents, err := c.eventstore.Push(ctx, project.NewApplicationKeyAddedEvent( ctx, ProjectAggregateFromWriteModel(&keyWriteModel.WriteModel), @@ -75,7 +75,7 @@ func (c *Commands) RemoveApplicationKey(ctx context.Context, projectID, applicat return nil, errors.ThrowNotFound(nil, "COMMAND-4m77G", "Errors.Application.Key.NotFound") } - pushedEvents, err := c.eventstore.PushEvents(ctx, project.NewApplicationKeyRemovedEvent(ctx, ProjectAggregateFromWriteModel(&keyWriteModel.WriteModel), keyID)) + pushedEvents, err := c.eventstore.Push(ctx, project.NewApplicationKeyRemovedEvent(ctx, ProjectAggregateFromWriteModel(&keyWriteModel.WriteModel), keyID)) if err != nil { return nil, err } diff --git a/internal/command/project_application_key_model.go b/internal/command/project_application_key_model.go index 7c5bf705f8..38159397cf 100644 --- a/internal/command/project_application_key_model.go +++ b/internal/command/project_application_key_model.go @@ -33,7 +33,7 @@ func NewApplicationKeyWriteModel(projectID, appID, keyID, resourceOwner string) } } -func (wm *ApplicationKeyWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *ApplicationKeyWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *project.ApplicationRemovedEvent: diff --git a/internal/command/project_application_model.go b/internal/command/project_application_model.go index 2efae00111..504ebc3c50 100644 --- a/internal/command/project_application_model.go +++ b/internal/command/project_application_model.go @@ -32,7 +32,7 @@ func NewApplicationWriteModel(projectID, resourceOwner string) *ApplicationWrite }, } } -func (wm *ApplicationWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *ApplicationWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *project.ApplicationAddedEvent: diff --git a/internal/command/project_application_oidc.go b/internal/command/project_application_oidc.go index 65a403143b..e26cd7d7df 100644 --- a/internal/command/project_application_oidc.go +++ b/internal/command/project_application_oidc.go @@ -28,7 +28,7 @@ func (c *Commands) AddOIDCApplication(ctx context.Context, application *domain.O return nil, err } addedApplication.AppID = application.AppID - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -42,7 +42,7 @@ func (c *Commands) AddOIDCApplication(ctx context.Context, application *domain.O return result, nil } -func (c *Commands) addOIDCApplication(ctx context.Context, projectAgg *eventstore.Aggregate, proj *domain.Project, oidcApp *domain.OIDCApp, resourceOwner string) (events []eventstore.EventPusher, stringPW string, err error) { +func (c *Commands) addOIDCApplication(ctx context.Context, projectAgg *eventstore.Aggregate, proj *domain.Project, oidcApp *domain.OIDCApp, resourceOwner string) (events []eventstore.Command, stringPW string, err error) { if oidcApp.AppName == "" || !oidcApp.IsValid() { return nil, "", caos_errs.ThrowInvalidArgument(nil, "PROJECT-1n8df", "Errors.Application.Invalid") } @@ -51,7 +51,7 @@ func (c *Commands) addOIDCApplication(ctx context.Context, projectAgg *eventstor return nil, "", err } - events = []eventstore.EventPusher{ + events = []eventstore.Command{ project.NewApplicationAddedEvent(ctx, projectAgg, oidcApp.AppID, oidcApp.AppName), } @@ -128,7 +128,7 @@ func (c *Commands) ChangeOIDCApplication(ctx context.Context, oidc *domain.OIDCA return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-1m88i", "Errors.NoChangesFound") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } @@ -164,7 +164,7 @@ func (c *Commands) ChangeOIDCApplicationSecret(ctx context.Context, projectID, a projectAgg := ProjectAggregateFromWriteModel(&existingOIDC.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, project.NewOIDCConfigSecretChangedEvent(ctx, projectAgg, appID, cryptoSecret)) + pushedEvents, err := c.eventstore.Push(ctx, project.NewOIDCConfigSecretChangedEvent(ctx, projectAgg, appID, cryptoSecret)) if err != nil { return nil, err } @@ -201,10 +201,10 @@ func (c *Commands) VerifyOIDCClientSecret(ctx context.Context, projectID, appID, err = crypto.CompareHash(app.ClientSecret, []byte(secret), c.userPasswordAlg) spanPasswordComparison.EndWithError(err) if err == nil { - _, err = c.eventstore.PushEvents(ctx, project.NewOIDCConfigSecretCheckSucceededEvent(ctx, projectAgg, app.AppID)) + _, err = c.eventstore.Push(ctx, project.NewOIDCConfigSecretCheckSucceededEvent(ctx, projectAgg, app.AppID)) return err } - _, err = c.eventstore.PushEvents(ctx, project.NewOIDCConfigSecretCheckFailedEvent(ctx, projectAgg, app.AppID)) + _, err = c.eventstore.Push(ctx, project.NewOIDCConfigSecretCheckFailedEvent(ctx, projectAgg, app.AppID)) logging.Log("COMMAND-ADfhz").OnError(err).Error("could not push event OIDCClientSecretCheckFailed") return caos_errs.ThrowInvalidArgument(nil, "COMMAND-Bz542", "Errors.Project.App.ClientSecretInvalid") } diff --git a/internal/command/project_application_oidc_model.go b/internal/command/project_application_oidc_model.go index 0c5bf4d030..f55ecc35a5 100644 --- a/internal/command/project_application_oidc_model.go +++ b/internal/command/project_application_oidc_model.go @@ -56,7 +56,7 @@ func NewOIDCApplicationWriteModel(projectID, resourceOwner string) *OIDCApplicat }, } } -func (wm *OIDCApplicationWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *OIDCApplicationWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *project.ApplicationAddedEvent: diff --git a/internal/command/project_grant.go b/internal/command/project_grant.go index eb9b0c2a9c..edabdd1163 100644 --- a/internal/command/project_grant.go +++ b/internal/command/project_grant.go @@ -2,13 +2,14 @@ package command import ( "context" + "reflect" + "github.com/caos/logging" "github.com/caos/zitadel/internal/domain" caos_errs "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/repository/project" "github.com/caos/zitadel/internal/telemetry/tracing" - "reflect" ) func (c *Commands) AddProjectGrant(ctx context.Context, grant *domain.ProjectGrant, resourceOwner string) (_ *domain.ProjectGrant, err error) { @@ -25,7 +26,7 @@ func (c *Commands) AddProjectGrant(ctx context.Context, grant *domain.ProjectGra } addedGrant := NewProjectGrantWriteModel(grant.GrantID, grant.AggregateID, resourceOwner) projectAgg := ProjectAggregateFromWriteModel(&addedGrant.WriteModel) - pushedEvents, err := c.eventstore.PushEvents( + pushedEvents, err := c.eventstore.Push( ctx, project.NewGrantAddedEvent(ctx, projectAgg, grant.GrantID, grant.GrantedOrgID, grant.RoleKeys)) if err != nil { @@ -57,13 +58,13 @@ func (c *Commands) ChangeProjectGrant(ctx context.Context, grant *domain.Project return nil, caos_errs.ThrowPreconditionFailed(nil, "PROJECT-0o0pL", "Errors.NoChangesFoundc") } - events := []eventstore.EventPusher{ + events := []eventstore.Command{ project.NewGrantChangedEvent(ctx, projectAgg, grant.GrantID, grant.RoleKeys), } removedRoles := domain.GetRemovedRoles(existingGrant.RoleKeys, grant.RoleKeys) if len(removedRoles) == 0 { - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -81,7 +82,7 @@ func (c *Commands) ChangeProjectGrant(ctx context.Context, grant *domain.Project } events = append(events, event) } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -92,7 +93,7 @@ func (c *Commands) ChangeProjectGrant(ctx context.Context, grant *domain.Project return projectGrantWriteModelToProjectGrant(existingGrant), nil } -func (c *Commands) removeRoleFromProjectGrant(ctx context.Context, projectAgg *eventstore.Aggregate, projectID, projectGrantID, roleKey string, cascade bool) (_ eventstore.EventPusher, _ *ProjectGrantWriteModel, err error) { +func (c *Commands) removeRoleFromProjectGrant(ctx context.Context, projectAgg *eventstore.Aggregate, projectID, projectGrantID, roleKey string, cascade bool) (_ eventstore.Command, _ *ProjectGrantWriteModel, err error) { existingProjectGrant, err := c.projectGrantWriteModelByID(ctx, projectGrantID, projectID, "") if err != nil { return nil, nil, err @@ -139,7 +140,7 @@ func (c *Commands) DeactivateProjectGrant(ctx context.Context, projectID, grantI } projectAgg := ProjectAggregateFromWriteModel(&existingGrant.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, project.NewGrantDeactivateEvent(ctx, projectAgg, grantID)) + pushedEvents, err := c.eventstore.Push(ctx, project.NewGrantDeactivateEvent(ctx, projectAgg, grantID)) if err != nil { return nil, err } @@ -166,7 +167,7 @@ func (c *Commands) ReactivateProjectGrant(ctx context.Context, projectID, grantI return details, caos_errs.ThrowPreconditionFailed(nil, "PROJECT-47fu8", "Errors.Project.Grant.NotInactive") } projectAgg := ProjectAggregateFromWriteModel(&existingGrant.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, project.NewGrantReactivatedEvent(ctx, projectAgg, grantID)) + pushedEvents, err := c.eventstore.Push(ctx, project.NewGrantReactivatedEvent(ctx, projectAgg, grantID)) if err != nil { return nil, err } @@ -189,7 +190,7 @@ func (c *Commands) RemoveProjectGrant(ctx context.Context, projectID, grantID, r if err != nil { return details, err } - events := make([]eventstore.EventPusher, 0) + events := make([]eventstore.Command, 0) projectAgg := ProjectAggregateFromWriteModel(&existingGrant.WriteModel) events = append(events, project.NewGrantRemovedEvent(ctx, projectAgg, grantID, existingGrant.GrantedOrgID)) @@ -201,7 +202,7 @@ func (c *Commands) RemoveProjectGrant(ctx context.Context, projectID, grantID, r } events = append(events, event) } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } diff --git a/internal/command/project_grant_member.go b/internal/command/project_grant_member.go index 550238fece..69eb72c020 100644 --- a/internal/command/project_grant_member.go +++ b/internal/command/project_grant_member.go @@ -32,7 +32,7 @@ func (c *Commands) AddProjectGrantMember(ctx context.Context, member *domain.Pro return nil, caos_errs.ThrowAlreadyExists(nil, "PROJECT-16dVN", "Errors.Project.Member.AlreadyExists") } projectAgg := ProjectAggregateFromWriteModel(&addedMember.WriteModel) - pushedEvents, err := c.eventstore.PushEvents( + pushedEvents, err := c.eventstore.Push( ctx, project.NewProjectGrantMemberAddedEvent(ctx, projectAgg, member.UserID, member.GrantID, member.Roles...)) if err != nil { @@ -64,7 +64,7 @@ func (c *Commands) ChangeProjectGrantMember(ctx context.Context, member *domain. return nil, caos_errs.ThrowPreconditionFailed(nil, "PROJECT-2n8vx", "Errors.Project.Member.RolesNotChanged") } projectAgg := ProjectAggregateFromWriteModel(&existingMember.WriteModel) - pushedEvents, err := c.eventstore.PushEvents( + pushedEvents, err := c.eventstore.Push( ctx, project.NewProjectGrantMemberChangedEvent(ctx, projectAgg, member.UserID, member.GrantID, member.Roles...)) if err != nil { @@ -89,7 +89,7 @@ func (c *Commands) RemoveProjectGrantMember(ctx context.Context, projectID, user projectAgg := ProjectAggregateFromWriteModel(&m.WriteModel) removeEvent := c.removeProjectGrantMember(ctx, projectAgg, userID, grantID, false) - pushedEvents, err := c.eventstore.PushEvents(ctx, removeEvent) + pushedEvents, err := c.eventstore.Push(ctx, removeEvent) if err != nil { return nil, err } @@ -100,7 +100,7 @@ func (c *Commands) RemoveProjectGrantMember(ctx context.Context, projectID, user return writeModelToObjectDetails(&m.WriteModel), nil } -func (c *Commands) removeProjectGrantMember(ctx context.Context, projectAgg *eventstore.Aggregate, userID, grantID string, cascade bool) eventstore.EventPusher { +func (c *Commands) removeProjectGrantMember(ctx context.Context, projectAgg *eventstore.Aggregate, userID, grantID string, cascade bool) eventstore.Command { if cascade { return project.NewProjectGrantMemberCascadeRemovedEvent( ctx, diff --git a/internal/command/project_grant_member_model.go b/internal/command/project_grant_member_model.go index a53b7afdcf..129495af2e 100644 --- a/internal/command/project_grant_member_model.go +++ b/internal/command/project_grant_member_model.go @@ -26,7 +26,7 @@ func NewProjectGrantMemberWriteModel(projectID, userID, grantID string) *Project } } -func (wm *ProjectGrantMemberWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *ProjectGrantMemberWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *project.GrantMemberAddedEvent: diff --git a/internal/command/project_grant_model.go b/internal/command/project_grant_model.go index adf24c7808..033cca40dc 100644 --- a/internal/command/project_grant_model.go +++ b/internal/command/project_grant_model.go @@ -26,7 +26,7 @@ func NewProjectGrantWriteModel(grantID, projectID, resourceOwner string) *Projec } } -func (wm *ProjectGrantWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *ProjectGrantWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *project.GrantAddedEvent: diff --git a/internal/command/project_member.go b/internal/command/project_member.go index 90c48d507f..a19eddf0c3 100644 --- a/internal/command/project_member.go +++ b/internal/command/project_member.go @@ -21,7 +21,7 @@ func (c *Commands) AddProjectMember(ctx context.Context, member *domain.Member, return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -33,7 +33,7 @@ func (c *Commands) AddProjectMember(ctx context.Context, member *domain.Member, return memberWriteModelToMember(&addedMember.MemberWriteModel), nil } -func (c *Commands) addProjectMember(ctx context.Context, projectAgg *eventstore.Aggregate, addedMember *ProjectMemberWriteModel, member *domain.Member) (eventstore.EventPusher, error) { +func (c *Commands) addProjectMember(ctx context.Context, projectAgg *eventstore.Aggregate, addedMember *ProjectMemberWriteModel, member *domain.Member) (eventstore.Command, error) { if !member.IsValid() { return nil, caos_errs.ThrowInvalidArgument(nil, "PROJECT-W8m4l", "Errors.Project.Member.Invalid") } @@ -74,7 +74,7 @@ func (c *Commands) ChangeProjectMember(ctx context.Context, member *domain.Membe return nil, caos_errs.ThrowPreconditionFailed(nil, "PROJECT-LiaZi", "Errors.Project.Member.RolesNotChanged") } projectAgg := ProjectAggregateFromWriteModel(&existingMember.MemberWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, project.NewProjectMemberChangedEvent(ctx, projectAgg, member.UserID, member.Roles...)) + pushedEvents, err := c.eventstore.Push(ctx, project.NewProjectMemberChangedEvent(ctx, projectAgg, member.UserID, member.Roles...)) if err != nil { return nil, err } @@ -101,7 +101,7 @@ func (c *Commands) RemoveProjectMember(ctx context.Context, projectID, userID, r projectAgg := ProjectAggregateFromWriteModel(&m.MemberWriteModel.WriteModel) removeEvent := c.removeProjectMember(ctx, projectAgg, userID, false) - pushedEvents, err := c.eventstore.PushEvents(ctx, removeEvent) + pushedEvents, err := c.eventstore.Push(ctx, removeEvent) if err != nil { return nil, err } @@ -112,7 +112,7 @@ func (c *Commands) RemoveProjectMember(ctx context.Context, projectID, userID, r return writeModelToObjectDetails(&m.WriteModel), nil } -func (c *Commands) removeProjectMember(ctx context.Context, projectAgg *eventstore.Aggregate, userID string, cascade bool) eventstore.EventPusher { +func (c *Commands) removeProjectMember(ctx context.Context, projectAgg *eventstore.Aggregate, userID string, cascade bool) eventstore.Command { if cascade { return project.NewProjectMemberCascadeRemovedEvent( ctx, diff --git a/internal/command/project_member_model.go b/internal/command/project_member_model.go index 686e255459..975720ca7d 100644 --- a/internal/command/project_member_model.go +++ b/internal/command/project_member_model.go @@ -21,7 +21,7 @@ func NewProjectMemberWriteModel(projectID, userID, resourceOwner string) *Projec } } -func (wm *ProjectMemberWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *ProjectMemberWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *project.MemberAddedEvent: diff --git a/internal/command/project_role.go b/internal/command/project_role.go index 70baf31929..4d85efc971 100644 --- a/internal/command/project_role.go +++ b/internal/command/project_role.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/logging" "github.com/caos/zitadel/internal/domain" caos_errs "github.com/caos/zitadel/internal/errors" @@ -21,7 +22,7 @@ func (c *Commands) AddProjectRole(ctx context.Context, projectRole *domain.Proje if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -45,7 +46,7 @@ func (c *Commands) BulkAddProjectRole(ctx context.Context, projectID, resourceOw return details, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -56,8 +57,8 @@ func (c *Commands) BulkAddProjectRole(ctx context.Context, projectID, resourceOw return writeModelToObjectDetails(&roleWriteModel.WriteModel), nil } -func (c *Commands) addProjectRoles(ctx context.Context, projectAgg *eventstore.Aggregate, projectRoles ...*domain.ProjectRole) ([]eventstore.EventPusher, error) { - var events []eventstore.EventPusher +func (c *Commands) addProjectRoles(ctx context.Context, projectAgg *eventstore.Aggregate, projectRoles ...*domain.ProjectRole) ([]eventstore.Command, error) { + var events []eventstore.Command for _, projectRole := range projectRoles { projectRole.AggregateID = projectAgg.ID if !projectRole.IsValid() { @@ -102,7 +103,7 @@ func (c *Commands) ChangeProjectRole(ctx context.Context, projectRole *domain.Pr return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-5M0cs", "Errors.NoChangesFound") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changeEvent) + pushedEvents, err := c.eventstore.Push(ctx, changeEvent) if err != nil { return nil, err } @@ -125,7 +126,7 @@ func (c *Commands) RemoveProjectRole(ctx context.Context, projectID, key, resour return details, caos_errs.ThrowNotFound(nil, "COMMAND-m9vMf", "Errors.Project.Role.NotExisting") } projectAgg := ProjectAggregateFromWriteModel(&existingRole.WriteModel) - events := []eventstore.EventPusher{ + events := []eventstore.Command{ project.NewRoleRemovedEvent(ctx, projectAgg, key), } @@ -147,7 +148,7 @@ func (c *Commands) RemoveProjectRole(ctx context.Context, projectID, key, resour events = append(events, event) } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } diff --git a/internal/command/project_role_model.go b/internal/command/project_role_model.go index 7ed6231f9e..477cedad62 100644 --- a/internal/command/project_role_model.go +++ b/internal/command/project_role_model.go @@ -36,7 +36,7 @@ func NewProjectRoleWriteModel(projectID, resourceOwner string) *ProjectRoleWrite } } -func (wm *ProjectRoleWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *ProjectRoleWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *project.RoleAddedEvent: diff --git a/internal/command/setup.go b/internal/command/setup.go index 9989b713fb..12a59bb742 100644 --- a/internal/command/setup.go +++ b/internal/command/setup.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/logging" "github.com/caos/zitadel/internal/eventstore" @@ -65,7 +66,7 @@ func (c *Commands) StartSetup(ctx context.Context, step domain.Step) (*domain.IA return nil, caos_errs.ThrowPreconditionFailed(nil, "EVENT-9so34", "setup error") } aggregate := IAMAggregateFromWriteModel(&iamWriteModel.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, iam_repo.NewSetupStepStartedEvent(ctx, aggregate, step)) + pushedEvents, err := c.eventstore.Push(ctx, iam_repo.NewSetupStepStartedEvent(ctx, aggregate, step)) if err != nil { return nil, caos_errs.ThrowPreconditionFailed(nil, "EVENT-Grgh1", "Setup start failed") } @@ -77,7 +78,7 @@ func (c *Commands) StartSetup(ctx context.Context, step domain.Step) (*domain.IA return writeModelToIAM(iamWriteModel), nil } -func (c *Commands) setup(ctx context.Context, step Step, iamAggregateProvider func(*IAMWriteModel) ([]eventstore.EventPusher, error)) error { +func (c *Commands) setup(ctx context.Context, step Step, iamAggregateProvider func(*IAMWriteModel) ([]eventstore.Command, error)) error { iam, err := c.getIAMWriteModel(ctx) if err != nil && !caos_errs.IsNotFound(err) { return err @@ -92,7 +93,7 @@ func (c *Commands) setup(ctx context.Context, step Step, iamAggregateProvider fu iamAgg := IAMAggregateFromWriteModel(&iam.WriteModel) events = append(events, iam_repo.NewSetupStepDoneEvent(ctx, iamAgg, step.Step())) - _, err = c.eventstore.PushEvents(ctx, events...) + _, err = c.eventstore.Push(ctx, events...) if caos_errs.IsErrorAlreadyExists(err) { logging.LogWithFields("SETUP-4M9gsf", "step", step.Step()).WithError(err).Info("setup step already done") } diff --git a/internal/command/setup_step1.go b/internal/command/setup_step1.go index e191feafbb..78bb0a041e 100644 --- a/internal/command/setup_step1.go +++ b/internal/command/setup_step1.go @@ -92,7 +92,7 @@ type API struct { } func (c *Commands) SetupStep1(ctx context.Context, step1 *Step1) error { - var events []eventstore.EventPusher + var events []eventstore.Command iamWriteModel := NewIAMWriteModel() iamAgg := IAMAggregateFromWriteModel(&iamWriteModel.WriteModel) //create default login policy @@ -198,14 +198,14 @@ func (c *Commands) SetupStep1(ctx context.Context, step1 *Step1) error { events = append(events, iam_repo.NewSetupStepDoneEvent(ctx, iamAgg, domain.Step1)) - _, err = c.eventstore.PushEvents(ctx, events...) + _, err = c.eventstore.Push(ctx, events...) if err != nil { return caos_errs.ThrowPreconditionFailed(nil, "EVENT-Gr2hh", "Setup Step1 failed") } return nil } -func setUpOIDCApplication(ctx context.Context, r *Commands, projectWriteModel *ProjectWriteModel, project *domain.Project, oidcApp OIDCApp, resourceOwner string) ([]eventstore.EventPusher, error) { +func setUpOIDCApplication(ctx context.Context, r *Commands, projectWriteModel *ProjectWriteModel, project *domain.Project, oidcApp OIDCApp, resourceOwner string) ([]eventstore.Command, error) { app := &domain.OIDCApp{ ObjectRoot: models.ObjectRoot{ AggregateID: projectWriteModel.AggregateID, @@ -228,7 +228,7 @@ func setUpOIDCApplication(ctx context.Context, r *Commands, projectWriteModel *P return events, nil } -func setUpAPI(ctx context.Context, r *Commands, projectWriteModel *ProjectWriteModel, project *domain.Project, apiApp API, resourceOwner string) ([]eventstore.EventPusher, error) { +func setUpAPI(ctx context.Context, r *Commands, projectWriteModel *ProjectWriteModel, project *domain.Project, apiApp API, resourceOwner string) ([]eventstore.Command, error) { app := &domain.APIApp{ ObjectRoot: models.ObjectRoot{ AggregateID: projectWriteModel.AggregateID, diff --git a/internal/command/setup_step10.go b/internal/command/setup_step10.go index a1d5e6550f..b11a055a6b 100644 --- a/internal/command/setup_step10.go +++ b/internal/command/setup_step10.go @@ -22,13 +22,13 @@ func (s *Step10) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep10(ctx context.Context, step *Step10) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { iamAgg := IAMAggregateFromWriteModel(&iam.WriteModel) mailTemplateEvent, err := c.addDefaultMailTemplate(ctx, iamAgg, NewIAMMailTemplateWriteModel(), &step.DefaultMailTemplate) if err != nil { return nil, err } - events := []eventstore.EventPusher{ + events := []eventstore.Command{ mailTemplateEvent, } logging.Log("SETUP-3N9fs").Info("default mail template/text set up") diff --git a/internal/command/setup_step11.go b/internal/command/setup_step11.go index 147b043d09..a531b2a58d 100644 --- a/internal/command/setup_step11.go +++ b/internal/command/setup_step11.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/logging" "github.com/caos/zitadel/internal/domain" "github.com/caos/zitadel/internal/eventstore" @@ -21,7 +22,7 @@ func (s *Step11) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep11(ctx context.Context, step *Step11) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { iamAgg := IAMAggregateFromWriteModel(&iam.WriteModel) var uniqueContraintMigrations []*domain.UniqueConstraintMigration if step.MigrateV1EventstoreToV2 { @@ -33,7 +34,7 @@ func (c *Commands) SetupStep11(ctx context.Context, step *Step11) error { uniqueContraintMigrations = uniqueConstraints.UniqueConstraints } logging.Log("SETUP-M9fsd").Info("migrate v1 eventstore to v2") - return []eventstore.EventPusher{iam_repo.NewMigrateUniqueConstraintEvent(ctx, iamAgg, uniqueContraintMigrations)}, nil + return []eventstore.Command{iam_repo.NewMigrateUniqueConstraintEvent(ctx, iamAgg, uniqueContraintMigrations)}, nil } return c.setup(ctx, step, fn) } diff --git a/internal/command/setup_step12.go b/internal/command/setup_step12.go index da4498ec67..29cca2e4e0 100644 --- a/internal/command/setup_step12.go +++ b/internal/command/setup_step12.go @@ -31,7 +31,7 @@ func (s *Step12) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep12(ctx context.Context, step *Step12) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { featuresWriteModel := NewIAMFeaturesWriteModel() featuresEvent, err := c.setDefaultFeatures(ctx, featuresWriteModel, &domain.Features{ TierName: step.TierName, @@ -50,7 +50,7 @@ func (c *Commands) SetupStep12(ctx context.Context, step *Step12) error { if err != nil { return nil, err } - return []eventstore.EventPusher{featuresEvent}, nil + return []eventstore.Command{featuresEvent}, nil } return c.setup(ctx, step, fn) } diff --git a/internal/command/setup_step13.go b/internal/command/setup_step13.go index 5914b9493a..5a354c1398 100644 --- a/internal/command/setup_step13.go +++ b/internal/command/setup_step13.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/logging" "github.com/caos/zitadel/internal/domain" "github.com/caos/zitadel/internal/eventstore" @@ -20,13 +21,13 @@ func (s *Step13) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep13(ctx context.Context, step *Step13) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { _, mailTemplateEvent, err := c.changeDefaultMailTemplate(ctx, &step.DefaultMailTemplate) if err != nil { return nil, err } logging.Log("SETUP-4insR").Info("default mail template/text set up") - return []eventstore.EventPusher{mailTemplateEvent}, nil + return []eventstore.Command{mailTemplateEvent}, nil } return c.setup(ctx, step, fn) } diff --git a/internal/command/setup_step14.go b/internal/command/setup_step14.go index eb56b4684a..a897547cc9 100644 --- a/internal/command/setup_step14.go +++ b/internal/command/setup_step14.go @@ -24,9 +24,9 @@ func (s *Step14) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep14(ctx context.Context, step *Step14) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { iamAgg := IAMAggregateFromWriteModel(&iam.WriteModel) - var events []eventstore.EventPusher + var events []eventstore.Command if step.ActivateExistingLabelPolicies { existingPolicies := NewExistingLabelPoliciesReadModel(ctx) err := c.eventstore.FilterToQueryReducer(ctx, existingPolicies) diff --git a/internal/command/setup_step15.go b/internal/command/setup_step15.go index 9727a81f2b..d5b139cd38 100644 --- a/internal/command/setup_step15.go +++ b/internal/command/setup_step15.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/logging" "github.com/caos/zitadel/internal/domain" "github.com/caos/zitadel/internal/eventstore" @@ -20,13 +21,13 @@ func (s *Step15) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep15(ctx context.Context, step *Step15) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { _, mailTemplateEvent, err := c.changeDefaultMailTemplate(ctx, &step.DefaultMailTemplate) if err != nil { return nil, err } logging.Log("SETUP-2nfsd").Info("default mail template/text set up") - return []eventstore.EventPusher{mailTemplateEvent}, nil + return []eventstore.Command{mailTemplateEvent}, nil } return c.setup(ctx, step, fn) } diff --git a/internal/command/setup_step16.go b/internal/command/setup_step16.go index 35e1ab47be..93b5ef1939 100644 --- a/internal/command/setup_step16.go +++ b/internal/command/setup_step16.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/logging" "github.com/caos/zitadel/internal/domain" "github.com/caos/zitadel/internal/eventstore" @@ -20,9 +21,9 @@ func (s *Step16) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep16(ctx context.Context, step *Step16) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { iamAgg := IAMAggregateFromWriteModel(&iam.WriteModel) - events := make([]eventstore.EventPusher, 0) + events := make([]eventstore.Command, 0) for _, text := range step.DefaultMessageTexts { mailEvents, _, err := c.setDefaultMessageText(ctx, iamAgg, &text) diff --git a/internal/command/setup_step17.go b/internal/command/setup_step17.go index 63d3e3d9e3..5f6a6ae0c6 100644 --- a/internal/command/setup_step17.go +++ b/internal/command/setup_step17.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/logging" "github.com/caos/zitadel/internal/domain" "github.com/caos/zitadel/internal/eventstore" @@ -20,7 +21,7 @@ func (s *Step17) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep17(ctx context.Context, step *Step17) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { iamAgg := IAMAggregateFromWriteModel(&iam.WriteModel) addedPolicy := NewIAMPrivacyPolicyWriteModel() events, err := c.addDefaultPrivacyPolicy(ctx, iamAgg, addedPolicy, &step.PrivacyPolicy) @@ -29,7 +30,7 @@ func (c *Commands) SetupStep17(ctx context.Context, step *Step17) error { } logging.Log("SETUP-N9sq2").Info("default privacy policy set up") - return []eventstore.EventPusher{events}, nil + return []eventstore.Command{events}, nil } return c.setup(ctx, step, fn) } diff --git a/internal/command/setup_step18.go b/internal/command/setup_step18.go index da095993c6..379327353c 100644 --- a/internal/command/setup_step18.go +++ b/internal/command/setup_step18.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/logging" "github.com/caos/zitadel/internal/domain" "github.com/caos/zitadel/internal/eventstore" @@ -20,7 +21,7 @@ func (s *Step18) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep18(ctx context.Context, step *Step18) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { iamAgg := IAMAggregateFromWriteModel(&iam.WriteModel) addedPolicy := NewIAMLockoutPolicyWriteModel() events, err := c.addDefaultLockoutPolicy(ctx, iamAgg, addedPolicy, &step.LockoutPolicy) @@ -29,7 +30,7 @@ func (c *Commands) SetupStep18(ctx context.Context, step *Step18) error { } logging.Log("SETUP-3m99ds").Info("default lockout policy set up") - return []eventstore.EventPusher{events}, nil + return []eventstore.Command{events}, nil } return c.setup(ctx, step, fn) } diff --git a/internal/command/setup_step19.go b/internal/command/setup_step19.go index 7a1e9e6464..4469d468f4 100644 --- a/internal/command/setup_step19.go +++ b/internal/command/setup_step19.go @@ -23,8 +23,8 @@ func (s *Step19) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep19(ctx context.Context, step *Step19) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { - events := make([]eventstore.EventPusher, 0) + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { + events := make([]eventstore.Command, 0) orgs := newOrgsWithUsernameNotDomain() if err := c.eventstore.FilterToQueryReducer(ctx, orgs); err != nil { return nil, err @@ -71,7 +71,7 @@ func (c *Commands) SetupStep19(ctx context.Context, step *Step19) error { func newOrgsWithUsernameNotDomain() *orgsWithUsernameNotDomain { return &orgsWithUsernameNotDomain{ - orgEvents: make(map[string][]eventstore.EventReader), + orgEvents: make(map[string][]eventstore.Event), orgs: make(map[string]bool), } } @@ -79,11 +79,11 @@ func newOrgsWithUsernameNotDomain() *orgsWithUsernameNotDomain { type orgsWithUsernameNotDomain struct { eventstore.WriteModel - orgEvents map[string][]eventstore.EventReader + orgEvents map[string][]eventstore.Event orgs map[string]bool } -func (wm *orgsWithUsernameNotDomain) AppendEvents(events ...eventstore.EventReader) { +func (wm *orgsWithUsernameNotDomain) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.OrgAddedEvent: @@ -140,7 +140,7 @@ func newDomainClaimedUsernames(orgID string) *domainClaimedUsernames { WriteModel: eventstore.WriteModel{ ResourceOwner: orgID, }, - userEvents: make(map[string][]eventstore.EventReader), + userEvents: make(map[string][]eventstore.Event), users: make(map[string]string), } } @@ -148,11 +148,11 @@ func newDomainClaimedUsernames(orgID string) *domainClaimedUsernames { type domainClaimedUsernames struct { eventstore.WriteModel - userEvents map[string][]eventstore.EventReader + userEvents map[string][]eventstore.Event users map[string]string } -func (wm *domainClaimedUsernames) AppendEvents(events ...eventstore.EventReader) { +func (wm *domainClaimedUsernames) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *user.HumanAddedEvent: diff --git a/internal/command/setup_step2.go b/internal/command/setup_step2.go index b14189d5a3..98951c2f89 100644 --- a/internal/command/setup_step2.go +++ b/internal/command/setup_step2.go @@ -23,7 +23,7 @@ func (s *Step2) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep2(ctx context.Context, step *Step2) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { iamAgg := IAMAggregateFromWriteModel(&iam.WriteModel) event, err := c.addDefaultPasswordComplexityPolicy(ctx, iamAgg, NewIAMPasswordComplexityPolicyWriteModel(), &domain.PasswordComplexityPolicy{ MinLength: step.DefaultPasswordComplexityPolicy.MinLength, @@ -36,7 +36,7 @@ func (c *Commands) SetupStep2(ctx context.Context, step *Step2) error { return nil, err } logging.Log("SETUP-ADgd2").Info("default password complexity policy set up") - return []eventstore.EventPusher{event}, nil + return []eventstore.Command{event}, nil } return c.setup(ctx, step, fn) } diff --git a/internal/command/setup_step20.go b/internal/command/setup_step20.go index 4f7a2c9f7b..356835ffba 100644 --- a/internal/command/setup_step20.go +++ b/internal/command/setup_step20.go @@ -18,7 +18,7 @@ func (s *Step20) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep20(ctx context.Context, step *Step20) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { err := c.eventstore.Step20(ctx, iam.Events[len(iam.Events)-1].Sequence()) return nil, err } diff --git a/internal/command/setup_step21.go b/internal/command/setup_step21.go index 4617c4d942..2c772ab9dd 100644 --- a/internal/command/setup_step21.go +++ b/internal/command/setup_step21.go @@ -20,8 +20,8 @@ func (s *Step21) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep21(ctx context.Context, step *Step21) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { - events := make([]eventstore.EventPusher, 0) + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { + events := make([]eventstore.Command, 0) globalMembers := newGlobalOrgMemberWriteModel(iam.GlobalOrgID, domain.RoleOrgProjectCreator) orgAgg := OrgAggregateFromWriteModel(&globalMembers.WriteModel) if err := c.eventstore.FilterToQueryReducer(ctx, globalMembers); err != nil { diff --git a/internal/command/setup_step3.go b/internal/command/setup_step3.go index 092b5f229d..c12d9e2ad0 100644 --- a/internal/command/setup_step3.go +++ b/internal/command/setup_step3.go @@ -23,7 +23,7 @@ func (s *Step3) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep3(ctx context.Context, step *Step3) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { iamAgg := IAMAggregateFromWriteModel(&iam.WriteModel) event, err := c.addDefaultPasswordAgePolicy(ctx, iamAgg, NewIAMPasswordAgePolicyWriteModel(), &domain.PasswordAgePolicy{ MaxAgeDays: step.DefaultPasswordAgePolicy.MaxAgeDays, @@ -33,7 +33,7 @@ func (c *Commands) SetupStep3(ctx context.Context, step *Step3) error { return nil, err } logging.Log("SETUP-DBqgq").Info("default password age policy set up") - return []eventstore.EventPusher{event}, nil + return []eventstore.Command{event}, nil } return c.setup(ctx, step, fn) } diff --git a/internal/command/setup_step4.go b/internal/command/setup_step4.go index 31a2a57000..b52a09a93b 100644 --- a/internal/command/setup_step4.go +++ b/internal/command/setup_step4.go @@ -24,7 +24,7 @@ func (s *Step4) execute(ctx context.Context, commandSide *Commands) error { //SetupStep4 is no op in favour of step 18. //Password lockout policy is replaced by lockout policy func (c *Commands) SetupStep4(ctx context.Context, step *Step4) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { return nil, nil } return c.setup(ctx, step, fn) diff --git a/internal/command/setup_step5.go b/internal/command/setup_step5.go index d23ceb2a3d..99d79de046 100644 --- a/internal/command/setup_step5.go +++ b/internal/command/setup_step5.go @@ -23,7 +23,7 @@ func (s *Step5) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep5(ctx context.Context, step *Step5) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { iamAgg := IAMAggregateFromWriteModel(&iam.WriteModel) event, err := c.addDefaultOrgIAMPolicy(ctx, iamAgg, NewIAMOrgIAMPolicyWriteModel(), &domain.OrgIAMPolicy{ UserLoginMustBeDomain: step.DefaultOrgIAMPolicy.UserLoginMustBeDomain, @@ -32,7 +32,7 @@ func (c *Commands) SetupStep5(ctx context.Context, step *Step5) error { return nil, err } logging.Log("SETUP-ADgd2").Info("default org iam policy set up") - return []eventstore.EventPusher{event}, nil + return []eventstore.Command{event}, nil } return c.setup(ctx, step, fn) } diff --git a/internal/command/setup_step6.go b/internal/command/setup_step6.go index 095e304903..80ab31f779 100644 --- a/internal/command/setup_step6.go +++ b/internal/command/setup_step6.go @@ -23,14 +23,14 @@ func (s *Step6) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep6(ctx context.Context, step *Step6) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { iamAgg := IAMAggregateFromWriteModel(&iam.WriteModel) event, err := c.addDefaultLabelPolicy(ctx, iamAgg, NewIAMLabelPolicyWriteModel(), &step.DefaultLabelPolicy) if err != nil { return nil, err } logging.Log("SETUP-ADgd2").Info("default label policy set up") - return []eventstore.EventPusher{event}, nil + return []eventstore.Command{event}, nil } return c.setup(ctx, step, fn) } diff --git a/internal/command/setup_step7.go b/internal/command/setup_step7.go index 6661f0a965..16de653186 100644 --- a/internal/command/setup_step7.go +++ b/internal/command/setup_step7.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/logging" "github.com/caos/zitadel/internal/eventstore" @@ -21,18 +22,18 @@ func (s *Step7) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep7(ctx context.Context, step *Step7) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { secondFactorModel := NewIAMSecondFactorWriteModel(domain.SecondFactorTypeOTP) iamAgg := IAMAggregateFromWriteModel(&secondFactorModel.SecondFactorWriteModel.WriteModel) if !step.OTP { - return []eventstore.EventPusher{}, nil + return []eventstore.Command{}, nil } event, err := c.addSecondFactorToDefaultLoginPolicy(ctx, iamAgg, secondFactorModel, domain.SecondFactorTypeOTP) if err != nil { return nil, err } logging.Log("SETUP-Dggsg").Info("added OTP to 2FA login policy") - return []eventstore.EventPusher{event}, nil + return []eventstore.Command{event}, nil } return c.setup(ctx, step, fn) } diff --git a/internal/command/setup_step8.go b/internal/command/setup_step8.go index 4c54e3b048..1145bc1cad 100644 --- a/internal/command/setup_step8.go +++ b/internal/command/setup_step8.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/logging" "github.com/caos/zitadel/internal/eventstore" @@ -21,18 +22,18 @@ func (s *Step8) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep8(ctx context.Context, step *Step8) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { secondFactorModel := NewIAMSecondFactorWriteModel(domain.SecondFactorTypeU2F) iamAgg := IAMAggregateFromWriteModel(&secondFactorModel.SecondFactorWriteModel.WriteModel) if !step.U2F { - return []eventstore.EventPusher{}, nil + return []eventstore.Command{}, nil } event, err := c.addSecondFactorToDefaultLoginPolicy(ctx, iamAgg, secondFactorModel, domain.SecondFactorTypeU2F) if err != nil { return nil, err } logging.Log("SETUP-BDhne").Info("added U2F to 2FA login policy") - return []eventstore.EventPusher{event}, nil + return []eventstore.Command{event}, nil } return c.setup(ctx, step, fn) } diff --git a/internal/command/setup_step9.go b/internal/command/setup_step9.go index 03316a8a94..1dfd79af56 100644 --- a/internal/command/setup_step9.go +++ b/internal/command/setup_step9.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/logging" "github.com/caos/zitadel/internal/eventstore" @@ -21,11 +22,11 @@ func (s *Step9) execute(ctx context.Context, commandSide *Commands) error { } func (c *Commands) SetupStep9(ctx context.Context, step *Step9) error { - fn := func(iam *IAMWriteModel) ([]eventstore.EventPusher, error) { + fn := func(iam *IAMWriteModel) ([]eventstore.Command, error) { multiFactorModel := NewIAMMultiFactorWriteModel(domain.MultiFactorTypeU2FWithPIN) iamAgg := IAMAggregateFromWriteModel(&multiFactorModel.MultiFactorWriteModel.WriteModel) if !step.Passwordless { - return []eventstore.EventPusher{}, nil + return []eventstore.Command{}, nil } passwordlessEvent, err := setPasswordlessAllowedInPolicy(ctx, c, iamAgg) if err != nil { @@ -37,12 +38,12 @@ func (c *Commands) SetupStep9(ctx context.Context, step *Step9) error { return nil, err } logging.Log("SETUP-ADfng").Info("added passwordless to MFA login policy") - return []eventstore.EventPusher{passwordlessEvent, multifactorEvent}, nil + return []eventstore.Command{passwordlessEvent, multifactorEvent}, nil } return c.setup(ctx, step, fn) } -func setPasswordlessAllowedInPolicy(ctx context.Context, c *Commands, iamAgg *eventstore.Aggregate) (eventstore.EventPusher, error) { +func setPasswordlessAllowedInPolicy(ctx context.Context, c *Commands, iamAgg *eventstore.Aggregate) (eventstore.Command, error) { policy, err := c.getDefaultLoginPolicy(ctx) if err != nil { return nil, err diff --git a/internal/command/unique_constraints_model.go b/internal/command/unique_constraints_model.go index 6264ba7a94..d76959b3d5 100644 --- a/internal/command/unique_constraints_model.go +++ b/internal/command/unique_constraints_model.go @@ -35,7 +35,7 @@ func NewUniqueConstraintReadModel(ctx context.Context, provider commandProvider) } } -func (rm *UniqueConstraintReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *UniqueConstraintReadModel) AppendEvents(events ...eventstore.Event) { rm.WriteModel.AppendEvents(events...) } diff --git a/internal/command/user.go b/internal/command/user.go index bcb37f3dfd..4ebb9bff9a 100644 --- a/internal/command/user.go +++ b/internal/command/user.go @@ -45,7 +45,7 @@ func (c *Commands) ChangeUsername(ctx context.Context, orgID, userID, userName s } userAgg := UserAggregateFromWriteModel(&existingUser.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, + pushedEvents, err := c.eventstore.Push(ctx, user.NewUsernameChangedEvent(ctx, userAgg, existingUser.UserName, userName, orgIAMPolicy.UserLoginMustBeDomain)) if err != nil { return nil, err @@ -73,7 +73,7 @@ func (c *Commands) DeactivateUser(ctx context.Context, userID, resourceOwner str return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-5M0sf", "Errors.User.AlreadyInactive") } - pushedEvents, err := c.eventstore.PushEvents(ctx, + pushedEvents, err := c.eventstore.Push(ctx, user.NewUserDeactivatedEvent(ctx, UserAggregateFromWriteModel(&existingUser.WriteModel))) if err != nil { return nil, err @@ -101,7 +101,7 @@ func (c *Commands) ReactivateUser(ctx context.Context, userID, resourceOwner str return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-6M0sf", "Errors.User.NotInactive") } - pushedEvents, err := c.eventstore.PushEvents(ctx, + pushedEvents, err := c.eventstore.Push(ctx, user.NewUserReactivatedEvent(ctx, UserAggregateFromWriteModel(&existingUser.WriteModel))) if err != nil { return nil, err @@ -129,7 +129,7 @@ func (c *Commands) LockUser(ctx context.Context, userID, resourceOwner string) ( return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-3NN8v", "Errors.User.ShouldBeActiveOrInitial") } - pushedEvents, err := c.eventstore.PushEvents(ctx, + pushedEvents, err := c.eventstore.Push(ctx, user.NewUserLockedEvent(ctx, UserAggregateFromWriteModel(&existingUser.WriteModel))) if err != nil { return nil, err @@ -157,7 +157,7 @@ func (c *Commands) UnlockUser(ctx context.Context, userID, resourceOwner string) return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-4M0ds", "Errors.User.NotLocked") } - pushedEvents, err := c.eventstore.PushEvents(ctx, + pushedEvents, err := c.eventstore.Push(ctx, user.NewUserUnlockedEvent(ctx, UserAggregateFromWriteModel(&existingUser.WriteModel))) if err != nil { return nil, err @@ -186,7 +186,7 @@ func (c *Commands) RemoveUser(ctx context.Context, userID, resourceOwner string, if err != nil { return nil, caos_errs.ThrowPreconditionFailed(err, "COMMAND-3M9fs", "Errors.Org.OrgIAM.NotExisting") } - var events []eventstore.EventPusher + var events []eventstore.Command userAgg := UserAggregateFromWriteModel(&existingUser.WriteModel) events = append(events, user.NewUserRemovedEvent(ctx, userAgg, existingUser.UserName, existingUser.IDPLinks, orgIAMPolicy.UserLoginMustBeDomain)) @@ -207,7 +207,7 @@ func (c *Commands) RemoveUser(ctx context.Context, userID, resourceOwner string, events = append(events, membershipEvents...) } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -227,7 +227,7 @@ func (c *Commands) AddUserToken(ctx context.Context, orgID, agentID, clientID, u if err != nil { return nil, err } - _, err = c.eventstore.PushEvents(ctx, event) + _, err = c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -239,7 +239,7 @@ func (c *Commands) RevokeAccessToken(ctx context.Context, userID, orgID, tokenID if err != nil { return nil, err } - events, err := c.eventstore.PushEvents(ctx, removeEvent) + events, err := c.eventstore.Push(ctx, removeEvent) if err != nil { return nil, err } @@ -305,7 +305,7 @@ func (c *Commands) removeAccessToken(ctx context.Context, userID, orgID, tokenID return user.NewUserTokenRemovedEvent(ctx, userAgg, tokenID), refreshTokenWriteModel, nil } -func (c *Commands) userDomainClaimed(ctx context.Context, userID string) (events []eventstore.EventPusher, _ *UserWriteModel, err error) { +func (c *Commands) userDomainClaimed(ctx context.Context, userID string) (events []eventstore.Command, _ *UserWriteModel, err error) { existingUser, err := c.userWriteModelByID(ctx, userID, "") if err != nil { return nil, nil, err @@ -325,7 +325,7 @@ func (c *Commands) userDomainClaimed(ctx context.Context, userID string) (events if err != nil { return nil, nil, err } - return []eventstore.EventPusher{ + return []eventstore.Command{ user.NewDomainClaimedEvent( ctx, userAgg, @@ -347,7 +347,7 @@ func (c *Commands) UserDomainClaimedSent(ctx context.Context, orgID, userID stri return caos_errs.ThrowNotFound(nil, "COMMAND-5m9gK", "Errors.User.NotFound") } - _, err = c.eventstore.PushEvents(ctx, + _, err = c.eventstore.Push(ctx, user.NewDomainClaimedSentEvent(ctx, UserAggregateFromWriteModel(&existingUser.WriteModel))) return err } diff --git a/internal/command/user_grant.go b/internal/command/user_grant.go index 6f6cf7d8d9..6c29b3b16b 100644 --- a/internal/command/user_grant.go +++ b/internal/command/user_grant.go @@ -17,7 +17,7 @@ func (c *Commands) AddUserGrant(ctx context.Context, usergrant *domain.UserGrant if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -29,7 +29,7 @@ func (c *Commands) AddUserGrant(ctx context.Context, usergrant *domain.UserGrant return userGrantWriteModelToUserGrant(addedUserGrant), nil } -func (c *Commands) addUserGrant(ctx context.Context, userGrant *domain.UserGrant, resourceOwner string) (pusher eventstore.EventPusher, _ *UserGrantWriteModel, err error) { +func (c *Commands) addUserGrant(ctx context.Context, userGrant *domain.UserGrant, resourceOwner string) (command eventstore.Command, _ *UserGrantWriteModel, err error) { if !userGrant.IsValid() { return nil, nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-4M0fs", "Errors.UserGrant.Invalid") } @@ -44,7 +44,7 @@ func (c *Commands) addUserGrant(ctx context.Context, userGrant *domain.UserGrant addedUserGrant := NewUserGrantWriteModel(userGrant.AggregateID, resourceOwner) userGrantAgg := UserGrantAggregateFromWriteModel(&addedUserGrant.WriteModel) - pusher = usergrant.NewUserGrantAddedEvent( + command = usergrant.NewUserGrantAddedEvent( ctx, userGrantAgg, userGrant.UserID, @@ -52,7 +52,7 @@ func (c *Commands) addUserGrant(ctx context.Context, userGrant *domain.UserGrant userGrant.ProjectGrantID, userGrant.RoleKeys, ) - return pusher, addedUserGrant, nil + return command, addedUserGrant, nil } func (c *Commands) ChangeUserGrant(ctx context.Context, userGrant *domain.UserGrant, resourceOwner string) (_ *domain.UserGrant, err error) { @@ -60,7 +60,7 @@ func (c *Commands) ChangeUserGrant(ctx context.Context, userGrant *domain.UserGr if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -71,7 +71,7 @@ func (c *Commands) ChangeUserGrant(ctx context.Context, userGrant *domain.UserGr return userGrantWriteModelToUserGrant(changedUserGrant), nil } -func (c *Commands) changeUserGrant(ctx context.Context, userGrant *domain.UserGrant, resourceOwner string, cascade bool) (_ eventstore.EventPusher, _ *UserGrantWriteModel, err error) { +func (c *Commands) changeUserGrant(ctx context.Context, userGrant *domain.UserGrant, resourceOwner string, cascade bool) (_ eventstore.Command, _ *UserGrantWriteModel, err error) { if userGrant.AggregateID == "" { return nil, nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-3M0sd", "Errors.UserGrant.Invalid") } @@ -105,7 +105,7 @@ func (c *Commands) changeUserGrant(ctx context.Context, userGrant *domain.UserGr return usergrant.NewUserGrantChangedEvent(ctx, userGrantAgg, userGrant.RoleKeys), existingUserGrant, nil } -func (c *Commands) removeRoleFromUserGrant(ctx context.Context, userGrantID string, roleKeys []string, cascade bool) (_ eventstore.EventPusher, err error) { +func (c *Commands) removeRoleFromUserGrant(ctx context.Context, userGrantID string, roleKeys []string, cascade bool) (_ eventstore.Command, err error) { existingUserGrant, err := c.userGrantWriteModelByID(ctx, userGrantID, "") if err != nil { return nil, err @@ -160,7 +160,7 @@ func (c *Commands) DeactivateUserGrant(ctx context.Context, grantID, resourceOwn deactivateUserGrant := NewUserGrantWriteModel(grantID, resourceOwner) userGrantAgg := UserGrantAggregateFromWriteModel(&deactivateUserGrant.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, usergrant.NewUserGrantDeactivatedEvent(ctx, userGrantAgg)) + pushedEvents, err := c.eventstore.Push(ctx, usergrant.NewUserGrantDeactivatedEvent(ctx, userGrantAgg)) if err != nil { return nil, err } @@ -192,7 +192,7 @@ func (c *Commands) ReactivateUserGrant(ctx context.Context, grantID, resourceOwn } deactivateUserGrant := NewUserGrantWriteModel(grantID, resourceOwner) userGrantAgg := UserGrantAggregateFromWriteModel(&deactivateUserGrant.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, usergrant.NewUserGrantReactivatedEvent(ctx, userGrantAgg)) + pushedEvents, err := c.eventstore.Push(ctx, usergrant.NewUserGrantReactivatedEvent(ctx, userGrantAgg)) if err != nil { return nil, err } @@ -209,7 +209,7 @@ func (c *Commands) RemoveUserGrant(ctx context.Context, grantID, resourceOwner s return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -224,7 +224,7 @@ func (c *Commands) BulkRemoveUserGrant(ctx context.Context, grantIDs []string, r if len(grantIDs) == 0 { return caos_errs.ThrowInvalidArgument(nil, "COMMAND-5M0sd", "Errors.UserGrant.IDMissing") } - events := make([]eventstore.EventPusher, len(grantIDs)) + events := make([]eventstore.Command, len(grantIDs)) for i, grantID := range grantIDs { event, _, err := c.removeUserGrant(ctx, grantID, resourceOwner, false) if err != nil { @@ -232,11 +232,11 @@ func (c *Commands) BulkRemoveUserGrant(ctx context.Context, grantIDs []string, r } events[i] = event } - _, err = c.eventstore.PushEvents(ctx, events...) + _, err = c.eventstore.Push(ctx, events...) return err } -func (c *Commands) removeUserGrant(ctx context.Context, grantID, resourceOwner string, cascade bool) (_ eventstore.EventPusher, writeModel *UserGrantWriteModel, err error) { +func (c *Commands) removeUserGrant(ctx context.Context, grantID, resourceOwner string, cascade bool) (_ eventstore.Command, writeModel *UserGrantWriteModel, err error) { if grantID == "" { return nil, nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-J9sc5", "Errors.UserGrant.IDMissing") } diff --git a/internal/command/user_human.go b/internal/command/user_human.go index 13d8ed510e..c65d3a95c4 100644 --- a/internal/command/user_human.go +++ b/internal/command/user_human.go @@ -39,7 +39,7 @@ func (c *Commands) AddHuman(ctx context.Context, orgID string, human *domain.Hum if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -68,7 +68,7 @@ func (c *Commands) ImportHuman(ctx context.Context, orgID string, human *domain. if err != nil { return nil, nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, nil, err } @@ -88,7 +88,7 @@ func (c *Commands) ImportHuman(ctx context.Context, orgID string, human *domain. return writeModelToHuman(addedHuman), passwordlessCode, nil } -func (c *Commands) addHuman(ctx context.Context, orgID string, human *domain.Human, orgIAMPolicy *domain.OrgIAMPolicy, pwPolicy *domain.PasswordComplexityPolicy) ([]eventstore.EventPusher, *HumanWriteModel, error) { +func (c *Commands) addHuman(ctx context.Context, orgID string, human *domain.Human, orgIAMPolicy *domain.OrgIAMPolicy, pwPolicy *domain.PasswordComplexityPolicy) ([]eventstore.Command, *HumanWriteModel, error) { if orgID == "" || !human.IsValid() { return nil, nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-67Ms8", "Errors.User.Invalid") } @@ -98,7 +98,7 @@ func (c *Commands) addHuman(ctx context.Context, orgID string, human *domain.Hum return c.createHuman(ctx, orgID, human, nil, false, false, orgIAMPolicy, pwPolicy) } -func (c *Commands) importHuman(ctx context.Context, orgID string, human *domain.Human, passwordless bool, orgIAMPolicy *domain.OrgIAMPolicy, pwPolicy *domain.PasswordComplexityPolicy) (events []eventstore.EventPusher, humanWriteModel *HumanWriteModel, passwordlessCodeWriteModel *HumanPasswordlessInitCodeWriteModel, code string, err error) { +func (c *Commands) importHuman(ctx context.Context, orgID string, human *domain.Human, passwordless bool, orgIAMPolicy *domain.OrgIAMPolicy, pwPolicy *domain.PasswordComplexityPolicy) (events []eventstore.Command, humanWriteModel *HumanWriteModel, passwordlessCodeWriteModel *HumanPasswordlessInitCodeWriteModel, code string, err error) { if orgID == "" || !human.IsValid() { return nil, nil, nil, "", caos_errs.ThrowInvalidArgument(nil, "COMMAND-00p2b", "Errors.User.Invalid") } @@ -107,7 +107,7 @@ func (c *Commands) importHuman(ctx context.Context, orgID string, human *domain. return nil, nil, nil, "", err } if passwordless { - var codeEvent eventstore.EventPusher + var codeEvent eventstore.Command codeEvent, passwordlessCodeWriteModel, code, err = c.humanAddPasswordlessInitCode(ctx, human.AggregateID, orgID, true) if err != nil { return nil, nil, nil, "", err @@ -158,7 +158,7 @@ func (c *Commands) RegisterHuman(ctx context.Context, orgID string, human *domai userEvents = append(userEvents, memberEvent) } - pushedEvents, err := c.eventstore.PushEvents(ctx, userEvents...) + pushedEvents, err := c.eventstore.Push(ctx, userEvents...) if err != nil { return nil, err } @@ -170,7 +170,7 @@ func (c *Commands) RegisterHuman(ctx context.Context, orgID string, human *domai return writeModelToHuman(registeredHuman), nil } -func (c *Commands) registerHuman(ctx context.Context, orgID string, human *domain.Human, link *domain.UserIDPLink, orgIAMPolicy *domain.OrgIAMPolicy, pwPolicy *domain.PasswordComplexityPolicy) ([]eventstore.EventPusher, *HumanWriteModel, error) { +func (c *Commands) registerHuman(ctx context.Context, orgID string, human *domain.Human, link *domain.UserIDPLink, orgIAMPolicy *domain.OrgIAMPolicy, pwPolicy *domain.PasswordComplexityPolicy) ([]eventstore.Command, *HumanWriteModel, error) { if human != nil && human.Username == "" { human.Username = human.EmailAddress } @@ -183,7 +183,7 @@ func (c *Commands) registerHuman(ctx context.Context, orgID string, human *domai return c.createHuman(ctx, orgID, human, link, true, false, orgIAMPolicy, pwPolicy) } -func (c *Commands) createHuman(ctx context.Context, orgID string, human *domain.Human, link *domain.UserIDPLink, selfregister, passwordless bool, orgIAMPolicy *domain.OrgIAMPolicy, pwPolicy *domain.PasswordComplexityPolicy) ([]eventstore.EventPusher, *HumanWriteModel, error) { +func (c *Commands) createHuman(ctx context.Context, orgID string, human *domain.Human, link *domain.UserIDPLink, selfregister, passwordless bool, orgIAMPolicy *domain.OrgIAMPolicy, pwPolicy *domain.PasswordComplexityPolicy) ([]eventstore.Command, *HumanWriteModel, error) { if err := human.CheckOrgIAMPolicy(orgIAMPolicy); err != nil { return nil, nil, err } @@ -215,7 +215,7 @@ func (c *Commands) createHuman(ctx context.Context, orgID string, human *domain. addedHuman := NewHumanWriteModel(human.AggregateID, orgID) //TODO: adlerhurst maybe we could simplify the code below userAgg := UserAggregateFromWriteModel(&addedHuman.WriteModel) - var events []eventstore.EventPusher + var events []eventstore.Command if selfregister { events = append(events, createRegisterHumanEvent(ctx, userAgg, human, orgIAMPolicy.UserLoginMustBeDomain)) @@ -269,7 +269,7 @@ func (c *Commands) HumanSkipMFAInit(ctx context.Context, userID, resourceowner s return caos_errs.ThrowNotFound(nil, "COMMAND-m9cV8", "Errors.User.NotFound") } - _, err = c.eventstore.PushEvents(ctx, + _, err = c.eventstore.Push(ctx, user.NewHumanMFAInitSkippedEvent(ctx, UserAggregateFromWriteModel(&existingHuman.WriteModel))) return err } @@ -344,7 +344,7 @@ func (c *Commands) HumansSignOut(ctx context.Context, agentID string, userIDs [] if len(userIDs) == 0 { return caos_errs.ThrowInvalidArgument(nil, "COMMAND-M0od3", "Errors.User.UserIDMissing") } - events := make([]eventstore.EventPusher, 0) + events := make([]eventstore.Command, 0) for _, userID := range userIDs { existingUser, err := c.getHumanWriteModelByID(ctx, userID, "") if err != nil { @@ -361,7 +361,7 @@ func (c *Commands) HumansSignOut(ctx context.Context, agentID string, userIDs [] if len(events) == 0 { return nil } - _, err := c.eventstore.PushEvents(ctx, events...) + _, err := c.eventstore.Push(ctx, events...) return err } diff --git a/internal/command/user_human_access_token_model.go b/internal/command/user_human_access_token_model.go index d505cae36d..efa42cb819 100644 --- a/internal/command/user_human_access_token_model.go +++ b/internal/command/user_human_access_token_model.go @@ -33,7 +33,7 @@ func NewUserAccessTokenWriteModel(userID, resourceOwner, tokenID string) *UserAc } } -func (wm *UserAccessTokenWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *UserAccessTokenWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *user.UserTokenAddedEvent: diff --git a/internal/command/user_human_address.go b/internal/command/user_human_address.go index 50daa0cf70..9ee13b1253 100644 --- a/internal/command/user_human_address.go +++ b/internal/command/user_human_address.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/zitadel/internal/domain" caos_errs "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/telemetry/tracing" @@ -23,7 +24,7 @@ func (c *Commands) ChangeHumanAddress(ctx context.Context, address *domain.Addre if !hasChanged { return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-3M0cs", "Errors.User.Address.NotChanged") } - pushedEvents, err := c.eventstore.PushEvents(ctx, changedEvent) + pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } diff --git a/internal/command/user_human_avatar.go b/internal/command/user_human_avatar.go index 18458b2d73..8fcc92e56d 100644 --- a/internal/command/user_human_avatar.go +++ b/internal/command/user_human_avatar.go @@ -24,7 +24,7 @@ func (c *Commands) AddHumanAvatar(ctx context.Context, orgID, userID, storageKey return nil, caos_errs.ThrowNotFound(nil, "USER-vJ3fS", "Errors.Users.NotFound") } userAgg := UserAggregateFromWriteModel(&existingUser.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, user.NewHumanAvatarAddedEvent(ctx, userAgg, storageKey)) + pushedEvents, err := c.eventstore.Push(ctx, user.NewHumanAvatarAddedEvent(ctx, userAgg, storageKey)) if err != nil { return nil, err } @@ -51,7 +51,7 @@ func (c *Commands) RemoveHumanAvatar(ctx context.Context, orgID, userID string) return nil, err } userAgg := UserAggregateFromWriteModel(&existingUser.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, user.NewHumanAvatarRemovedEvent(ctx, userAgg, existingUser.Avatar)) + pushedEvents, err := c.eventstore.Push(ctx, user.NewHumanAvatarRemovedEvent(ctx, userAgg, existingUser.Avatar)) if err != nil { return nil, err } diff --git a/internal/command/user_human_email.go b/internal/command/user_human_email.go index 9add1ffa99..5a4863ac0b 100644 --- a/internal/command/user_human_email.go +++ b/internal/command/user_human_email.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/logging" "github.com/caos/zitadel/internal/crypto" "github.com/caos/zitadel/internal/domain" @@ -32,7 +33,7 @@ func (c *Commands) ChangeHumanEmail(ctx context.Context, email *domain.Email) (* return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-2b7fM", "Errors.User.Email.NotChanged") } - events := []eventstore.EventPusher{changedEvent} + events := []eventstore.Command{changedEvent} if email.IsEmailVerified { events = append(events, user.NewHumanEmailVerifiedEvent(ctx, userAgg)) @@ -44,7 +45,7 @@ func (c *Commands) ChangeHumanEmail(ctx context.Context, email *domain.Email) (* events = append(events, user.NewHumanEmailCodeAddedEvent(ctx, userAgg, emailCode.Code, emailCode.Expiry)) } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -74,7 +75,7 @@ func (c *Commands) VerifyHumanEmail(ctx context.Context, userID, code, resourceo userAgg := UserAggregateFromWriteModel(&existingCode.WriteModel) err = crypto.VerifyCode(existingCode.CodeCreationDate, existingCode.CodeExpiry, existingCode.Code, code, c.emailVerificationCode) if err == nil { - pushedEvents, err := c.eventstore.PushEvents(ctx, user.NewHumanEmailVerifiedEvent(ctx, userAgg)) + pushedEvents, err := c.eventstore.Push(ctx, user.NewHumanEmailVerifiedEvent(ctx, userAgg)) if err != nil { return nil, err } @@ -85,7 +86,7 @@ func (c *Commands) VerifyHumanEmail(ctx context.Context, userID, code, resourceo return writeModelToObjectDetails(&existingCode.WriteModel), nil } - _, err = c.eventstore.PushEvents(ctx, user.NewHumanEmailVerificationFailedEvent(ctx, userAgg)) + _, err = c.eventstore.Push(ctx, user.NewHumanEmailVerificationFailedEvent(ctx, userAgg)) logging.LogWithFields("COMMAND-Dg2z5", "userID", userAgg.ID).OnError(err).Error("NewHumanEmailVerificationFailedEvent push failed") return nil, caos_errs.ThrowInvalidArgument(err, "COMMAND-Gdsgs", "Errors.User.Code.Invalid") } @@ -113,7 +114,7 @@ func (c *Commands) CreateHumanEmailVerificationCode(ctx context.Context, userID, if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, user.NewHumanEmailCodeAddedEvent(ctx, userAgg, emailCode.Code, emailCode.Expiry)) + pushedEvents, err := c.eventstore.Push(ctx, user.NewHumanEmailCodeAddedEvent(ctx, userAgg, emailCode.Code, emailCode.Expiry)) if err != nil { return nil, err } @@ -136,7 +137,7 @@ func (c *Commands) HumanEmailVerificationCodeSent(ctx context.Context, orgID, us return caos_errs.ThrowNotFound(nil, "COMMAND-6n8uH", "Errors.User.Email.NotFound") } userAgg := UserAggregateFromWriteModel(&existingEmail.WriteModel) - _, err = c.eventstore.PushEvents(ctx, user.NewHumanEmailCodeSentEvent(ctx, userAgg)) + _, err = c.eventstore.Push(ctx, user.NewHumanEmailCodeSentEvent(ctx, userAgg)) return err } diff --git a/internal/command/user_human_init.go b/internal/command/user_human_init.go index 0e0128394d..f4669fde5d 100644 --- a/internal/command/user_human_init.go +++ b/internal/command/user_human_init.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/logging" "github.com/caos/zitadel/internal/crypto" "github.com/caos/zitadel/internal/domain" @@ -26,7 +27,7 @@ func (c *Commands) ResendInitialMail(ctx context.Context, userID, email, resourc if existingCode.UserState != domain.UserStateInitial { return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-2M9sd", "Errors.User.AlreadyInitialised") } - var events []eventstore.EventPusher + var events []eventstore.Command userAgg := UserAggregateFromWriteModel(&existingCode.WriteModel) if email != "" && existingCode.Email != email { changedEvent, _ := existingCode.NewChangedEvent(ctx, userAgg, email) @@ -37,7 +38,7 @@ func (c *Commands) ResendInitialMail(ctx context.Context, userID, email, resourc return nil, err } events = append(events, user.NewHumanInitialCodeAddedEvent(ctx, userAgg, initCode.Code, initCode.Expiry)) - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -67,11 +68,11 @@ func (c *Commands) HumanVerifyInitCode(ctx context.Context, userID, resourceOwne userAgg := UserAggregateFromWriteModel(&existingCode.WriteModel) err = crypto.VerifyCode(existingCode.CodeCreationDate, existingCode.CodeExpiry, existingCode.Code, code, c.initializeUserCode) if err != nil { - _, err = c.eventstore.PushEvents(ctx, user.NewHumanInitializedCheckFailedEvent(ctx, userAgg)) + _, err = c.eventstore.Push(ctx, user.NewHumanInitializedCheckFailedEvent(ctx, userAgg)) logging.LogWithFields("COMMAND-Dg2z5", "userID", userAgg.ID).OnError(err).Error("NewHumanInitializedCheckFailedEvent push failed") return caos_errs.ThrowInvalidArgument(err, "COMMAND-11v6G", "Errors.User.Code.Invalid") } - events := []eventstore.EventPusher{ + events := []eventstore.Command{ user.NewHumanInitializedCheckSucceededEvent(ctx, userAgg), } if !existingCode.IsEmailVerified { @@ -90,7 +91,7 @@ func (c *Commands) HumanVerifyInitCode(ctx context.Context, userID, resourceOwne } events = append(events, passwordEvent) } - _, err = c.eventstore.PushEvents(ctx, events...) + _, err = c.eventstore.Push(ctx, events...) return err } @@ -106,7 +107,7 @@ func (c *Commands) HumanInitCodeSent(ctx context.Context, orgID, userID string) return caos_errs.ThrowNotFound(nil, "COMMAND-556zg", "Errors.User.Code.NotFound") } userAgg := UserAggregateFromWriteModel(&existingInitCode.WriteModel) - _, err = c.eventstore.PushEvents(ctx, user.NewHumanInitialCodeSentEvent(ctx, userAgg)) + _, err = c.eventstore.Push(ctx, user.NewHumanInitialCodeSentEvent(ctx, userAgg)) return err } diff --git a/internal/command/user_human_otp.go b/internal/command/user_human_otp.go index 6e52925f9e..5eab8c9b9d 100644 --- a/internal/command/user_human_otp.go +++ b/internal/command/user_human_otp.go @@ -46,7 +46,7 @@ func (c *Commands) AddHumanOTP(ctx context.Context, userID, resourceowner string if err != nil { return nil, err } - _, err = c.eventstore.PushEvents(ctx, user.NewHumanOTPAddedEvent(ctx, userAgg, secret)) + _, err = c.eventstore.Push(ctx, user.NewHumanOTPAddedEvent(ctx, userAgg, secret)) if err != nil { return nil, err @@ -80,7 +80,7 @@ func (c *Commands) HumanCheckMFAOTPSetup(ctx context.Context, userID, code, user } userAgg := UserAggregateFromWriteModel(&existingOTP.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, user.NewHumanOTPVerifiedEvent(ctx, userAgg, userAgentID)) + pushedEvents, err := c.eventstore.Push(ctx, user.NewHumanOTPVerifiedEvent(ctx, userAgg, userAgentID)) if err != nil { return nil, err } @@ -105,10 +105,10 @@ func (c *Commands) HumanCheckMFAOTP(ctx context.Context, userID, code, resourceo userAgg := UserAggregateFromWriteModel(&existingOTP.WriteModel) err = domain.VerifyMFAOTP(code, existingOTP.Secret, c.multifactors.OTP.CryptoMFA) if err == nil { - _, err = c.eventstore.PushEvents(ctx, user.NewHumanOTPCheckSucceededEvent(ctx, userAgg, authRequestDomainToAuthRequestInfo(authRequest))) + _, err = c.eventstore.Push(ctx, user.NewHumanOTPCheckSucceededEvent(ctx, userAgg, authRequestDomainToAuthRequestInfo(authRequest))) return err } - _, pushErr := c.eventstore.PushEvents(ctx, user.NewHumanOTPCheckFailedEvent(ctx, userAgg, authRequestDomainToAuthRequestInfo(authRequest))) + _, pushErr := c.eventstore.Push(ctx, user.NewHumanOTPCheckFailedEvent(ctx, userAgg, authRequestDomainToAuthRequestInfo(authRequest))) logging.Log("COMMAND-9fj7s").OnError(pushErr).Error("error create password check failed event") return err } @@ -126,7 +126,7 @@ func (c *Commands) HumanRemoveOTP(ctx context.Context, userID, resourceOwner str return nil, caos_errs.ThrowNotFound(nil, "COMMAND-Hd9sd", "Errors.User.MFA.OTP.NotExisting") } userAgg := UserAggregateFromWriteModel(&existingOTP.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, user.NewHumanOTPRemovedEvent(ctx, userAgg)) + pushedEvents, err := c.eventstore.Push(ctx, user.NewHumanOTPRemovedEvent(ctx, userAgg)) if err != nil { return nil, err } diff --git a/internal/command/user_human_password.go b/internal/command/user_human_password.go index 0ef71a1006..5a12113f65 100644 --- a/internal/command/user_human_password.go +++ b/internal/command/user_human_password.go @@ -35,7 +35,7 @@ func (c *Commands) SetPassword(ctx context.Context, orgID, userID, passwordStrin if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, passwordEvent) + pushedEvents, err := c.eventstore.Push(ctx, passwordEvent) if err != nil { return nil, err } @@ -79,7 +79,7 @@ func (c *Commands) SetPasswordWithVerifyCode(ctx context.Context, orgID, userID, if err != nil { return err } - _, err = c.eventstore.PushEvents(ctx, passwordEvent) + _, err = c.eventstore.Push(ctx, passwordEvent) return err } @@ -113,11 +113,11 @@ func (c *Commands) ChangePassword(ctx context.Context, orgID, userID, oldPasswor } userAgg := UserAggregateFromWriteModel(&existingPassword.WriteModel) - eventPusher, err := c.changePassword(ctx, userAgentID, password, userAgg, existingPassword) + command, err := c.changePassword(ctx, userAgentID, password, userAgg, existingPassword) if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, eventPusher) + pushedEvents, err := c.eventstore.Push(ctx, command) if err != nil { return nil, err } @@ -128,7 +128,7 @@ func (c *Commands) ChangePassword(ctx context.Context, orgID, userID, oldPasswor return writeModelToObjectDetails(&existingPassword.WriteModel), nil } -func (c *Commands) changePassword(ctx context.Context, userAgentID string, password *domain.Password, userAgg *eventstore.Aggregate, existingPassword *HumanPasswordWriteModel) (event eventstore.EventPusher, err error) { +func (c *Commands) changePassword(ctx context.Context, userAgentID string, password *domain.Password, userAgg *eventstore.Aggregate, existingPassword *HumanPasswordWriteModel) (event eventstore.Command, err error) { ctx, span := tracing.NewSpan(ctx) defer func() { span.EndWithError(err) }() @@ -168,7 +168,7 @@ func (c *Commands) RequestSetPassword(ctx context.Context, userID, resourceOwner if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, user.NewHumanPasswordCodeAddedEvent(ctx, userAgg, passwordCode.Code, passwordCode.Expiry, notifyType)) + pushedEvents, err := c.eventstore.Push(ctx, user.NewHumanPasswordCodeAddedEvent(ctx, userAgg, passwordCode.Code, passwordCode.Expiry, notifyType)) if err != nil { return nil, err } @@ -192,7 +192,7 @@ func (c *Commands) PasswordCodeSent(ctx context.Context, orgID, userID string) ( return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-3n77z", "Errors.User.NotFound") } userAgg := UserAggregateFromWriteModel(&existingPassword.WriteModel) - _, err = c.eventstore.PushEvents(ctx, user.NewHumanPasswordCodeSentEvent(ctx, userAgg)) + _, err = c.eventstore.Push(ctx, user.NewHumanPasswordCodeSentEvent(ctx, userAgg)) return err } @@ -232,10 +232,10 @@ func (c *Commands) HumanCheckPassword(ctx context.Context, orgID, userID, passwo err = crypto.CompareHash(existingPassword.Secret, []byte(password), c.userPasswordAlg) spanPasswordComparison.EndWithError(err) if err == nil { - _, err = c.eventstore.PushEvents(ctx, user.NewHumanPasswordCheckSucceededEvent(ctx, userAgg, authRequestDomainToAuthRequestInfo(authRequest))) + _, err = c.eventstore.Push(ctx, user.NewHumanPasswordCheckSucceededEvent(ctx, userAgg, authRequestDomainToAuthRequestInfo(authRequest))) return err } - events := make([]eventstore.EventPusher, 0) + events := make([]eventstore.Command, 0) events = append(events, user.NewHumanPasswordCheckFailedEvent(ctx, userAgg, authRequestDomainToAuthRequestInfo(authRequest))) if lockoutPolicy != nil && lockoutPolicy.MaxPasswordAttempts > 0 { if existingPassword.PasswordCheckFailedCount+1 >= lockoutPolicy.MaxPasswordAttempts { @@ -243,7 +243,7 @@ func (c *Commands) HumanCheckPassword(ctx context.Context, orgID, userID, passwo } } - _, err = c.eventstore.PushEvents(ctx, events...) + _, err = c.eventstore.Push(ctx, events...) logging.Log("COMMAND-9fj7s").OnError(err).Error("error create password check failed event") return caos_errs.ThrowInvalidArgument(nil, "COMMAND-452ad", "Errors.User.Password.Invalid") } diff --git a/internal/command/user_human_phone.go b/internal/command/user_human_phone.go index 2ed2c8c482..abaa03742f 100644 --- a/internal/command/user_human_phone.go +++ b/internal/command/user_human_phone.go @@ -2,6 +2,7 @@ package command import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/logging" @@ -31,7 +32,7 @@ func (c *Commands) ChangeHumanPhone(ctx context.Context, phone *domain.Phone, re return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-wF94r", "Errors.User.Phone.NotChanged") } - events := []eventstore.EventPusher{changedEvent} + events := []eventstore.Command{changedEvent} if phone.IsPhoneVerified { events = append(events, user.NewHumanPhoneVerifiedEvent(ctx, userAgg)) } else { @@ -42,7 +43,7 @@ func (c *Commands) ChangeHumanPhone(ctx context.Context, phone *domain.Phone, re events = append(events, user.NewHumanPhoneCodeAddedEvent(ctx, userAgg, phoneCode.Code, phoneCode.Expiry)) } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -76,7 +77,7 @@ func (c *Commands) VerifyHumanPhone(ctx context.Context, userID, code, resourceo userAgg := UserAggregateFromWriteModel(&existingCode.WriteModel) err = crypto.VerifyCode(existingCode.CodeCreationDate, existingCode.CodeExpiry, existingCode.Code, code, c.phoneVerificationCode) if err == nil { - pushedEvents, err := c.eventstore.PushEvents(ctx, user.NewHumanPhoneVerifiedEvent(ctx, userAgg)) + pushedEvents, err := c.eventstore.Push(ctx, user.NewHumanPhoneVerifiedEvent(ctx, userAgg)) if err != nil { return nil, err } @@ -86,7 +87,7 @@ func (c *Commands) VerifyHumanPhone(ctx context.Context, userID, code, resourceo } return writeModelToObjectDetails(&existingCode.WriteModel), nil } - _, err = c.eventstore.PushEvents(ctx, user.NewHumanPhoneVerificationFailedEvent(ctx, userAgg)) + _, err = c.eventstore.Push(ctx, user.NewHumanPhoneVerificationFailedEvent(ctx, userAgg)) logging.LogWithFields("COMMAND-5M9ds", "userID", userAgg.ID).OnError(err).Error("NewHumanPhoneVerificationFailedEvent push failed") return nil, caos_errs.ThrowInvalidArgument(err, "COMMAND-sM0cs", "Errors.User.Code.Invalid") } @@ -117,7 +118,7 @@ func (c *Commands) CreateHumanPhoneVerificationCode(ctx context.Context, userID, } userAgg := UserAggregateFromWriteModel(&existingPhone.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, user.NewHumanPhoneCodeAddedEvent(ctx, userAgg, phoneCode.Code, phoneCode.Expiry)) + pushedEvents, err := c.eventstore.Push(ctx, user.NewHumanPhoneCodeAddedEvent(ctx, userAgg, phoneCode.Code, phoneCode.Expiry)) if err != nil { return nil, err } @@ -145,7 +146,7 @@ func (c *Commands) HumanPhoneVerificationCodeSent(ctx context.Context, orgID, us } userAgg := UserAggregateFromWriteModel(&existingPhone.WriteModel) - _, err = c.eventstore.PushEvents(ctx, user.NewHumanPhoneCodeSentEvent(ctx, userAgg)) + _, err = c.eventstore.Push(ctx, user.NewHumanPhoneCodeSentEvent(ctx, userAgg)) return err } @@ -166,7 +167,7 @@ func (c *Commands) RemoveHumanPhone(ctx context.Context, userID, resourceOwner s } userAgg := UserAggregateFromWriteModel(&existingPhone.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, user.NewHumanPhoneRemovedEvent(ctx, userAgg)) + pushedEvents, err := c.eventstore.Push(ctx, user.NewHumanPhoneRemovedEvent(ctx, userAgg)) if err != nil { return nil, err } diff --git a/internal/command/user_human_profile.go b/internal/command/user_human_profile.go index 67bfcffc6f..b10cb242db 100644 --- a/internal/command/user_human_profile.go +++ b/internal/command/user_human_profile.go @@ -29,7 +29,7 @@ func (c *Commands) ChangeHumanProfile(ctx context.Context, profile *domain.Profi return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-2M0fs", "Errors.User.Profile.NotChanged") } - events, err := c.eventstore.PushEvents(ctx, changedEvent) + events, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } diff --git a/internal/command/user_human_refresh_token.go b/internal/command/user_human_refresh_token.go index fbe2cdb24d..72df0ec0e6 100644 --- a/internal/command/user_human_refresh_token.go +++ b/internal/command/user_human_refresh_token.go @@ -61,7 +61,7 @@ func (c *Commands) AddNewRefreshTokenAndAccessToken( if err != nil { return nil, "", err } - _, err = c.eventstore.PushEvents(ctx, accessTokenEvent, refreshTokenEvent) + _, err = c.eventstore.Push(ctx, accessTokenEvent, refreshTokenEvent) if err != nil { return nil, "", err } @@ -89,7 +89,7 @@ func (c *Commands) RenewRefreshTokenAndAccessToken( if err != nil { return nil, "", err } - _, err = c.eventstore.PushEvents(ctx, accessTokenEvent, refreshTokenEvent) + _, err = c.eventstore.Push(ctx, accessTokenEvent, refreshTokenEvent) if err != nil { return nil, "", err } @@ -101,7 +101,7 @@ func (c *Commands) RevokeRefreshToken(ctx context.Context, userID, orgID, tokenI if err != nil { return nil, err } - events, err := c.eventstore.PushEvents(ctx, removeEvent) + events, err := c.eventstore.Push(ctx, removeEvent) if err != nil { return nil, err } @@ -116,7 +116,7 @@ func (c *Commands) RevokeRefreshTokens(ctx context.Context, userID, orgID string if len(tokenIDs) == 0 { return caos_errs.ThrowInvalidArgument(nil, "COMMAND-Gfj42", "Errors.IDMissing") } - events := make([]eventstore.EventPusher, len(tokenIDs)) + events := make([]eventstore.Command, len(tokenIDs)) for i, tokenID := range tokenIDs { event, _, err := c.removeRefreshToken(ctx, userID, orgID, tokenID) if err != nil { @@ -124,7 +124,7 @@ func (c *Commands) RevokeRefreshTokens(ctx context.Context, userID, orgID string } events[i] = event } - _, err = c.eventstore.PushEvents(ctx, events...) + _, err = c.eventstore.Push(ctx, events...) return err } diff --git a/internal/command/user_human_refresh_token_model.go b/internal/command/user_human_refresh_token_model.go index 6476aee443..011e744e3a 100644 --- a/internal/command/user_human_refresh_token_model.go +++ b/internal/command/user_human_refresh_token_model.go @@ -30,7 +30,7 @@ func NewHumanRefreshTokenWriteModel(userID, resourceOwner, tokenID string) *Huma } } -func (wm *HumanRefreshTokenWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *HumanRefreshTokenWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *user.HumanRefreshTokenAddedEvent: diff --git a/internal/command/user_human_webauthn.go b/internal/command/user_human_webauthn.go index ebb36ca938..d2d4110224 100644 --- a/internal/command/user_human_webauthn.go +++ b/internal/command/user_human_webauthn.go @@ -87,7 +87,7 @@ func (c *Commands) HumanAddU2FSetup(ctx context.Context, userID, resourceowner s return nil, err } - events, err := c.eventstore.PushEvents(ctx, usr_repo.NewHumanU2FAddedEvent(ctx, userAgg, addWebAuthN.WebauthNTokenID, webAuthN.Challenge)) + events, err := c.eventstore.Push(ctx, usr_repo.NewHumanU2FAddedEvent(ctx, userAgg, addWebAuthN.WebauthNTokenID, webAuthN.Challenge)) if err != nil { return nil, err } @@ -113,7 +113,7 @@ func (c *Commands) HumanAddPasswordlessSetup(ctx context.Context, userID, resour return nil, err } - events, err := c.eventstore.PushEvents(ctx, usr_repo.NewHumanPasswordlessAddedEvent(ctx, userAgg, addWebAuthN.WebauthNTokenID, webAuthN.Challenge)) + events, err := c.eventstore.Push(ctx, usr_repo.NewHumanPasswordlessAddedEvent(ctx, userAgg, addWebAuthN.WebauthNTokenID, webAuthN.Challenge)) if err != nil { return nil, err } @@ -184,7 +184,7 @@ func (c *Commands) HumanVerifyU2FSetup(ctx context.Context, userID, resourceowne return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, + pushedEvents, err := c.eventstore.Push(ctx, usr_repo.NewHumanU2FVerifiedEvent( ctx, userAgg, @@ -235,7 +235,7 @@ func (c *Commands) humanHumanPasswordlessSetup(ctx context.Context, userID, reso return nil, err } - events := []eventstore.EventPusher{ + events := []eventstore.Command{ usr_repo.NewHumanPasswordlessVerifiedEvent( ctx, userAgg, @@ -252,7 +252,7 @@ func (c *Commands) humanHumanPasswordlessSetup(ctx context.Context, userID, reso if codeCheckEvent != nil { events = append(events, codeCheckEvent(userAgg)) } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -297,7 +297,7 @@ func (c *Commands) HumanBeginU2FLogin(ctx context.Context, userID, resourceOwner return nil, err } - _, err = c.eventstore.PushEvents(ctx, + _, err = c.eventstore.Push(ctx, usr_repo.NewHumanU2FBeginLoginEvent( ctx, userAgg, @@ -321,7 +321,7 @@ func (c *Commands) HumanBeginPasswordlessLogin(ctx context.Context, userID, reso if err != nil { return nil, err } - _, err = c.eventstore.PushEvents(ctx, + _, err = c.eventstore.Push(ctx, usr_repo.NewHumanPasswordlessBeginLoginEvent( ctx, userAgg, @@ -373,7 +373,7 @@ func (c *Commands) HumanFinishU2FLogin(ctx context.Context, userID, resourceOwne logging.LogWithFields("EVENT-Addqd", "userID", userID, "resourceOwner", resourceOwner).WithError(err).Warn("missing userAggregate for pushing failed u2f check event") return err } - _, pushErr := c.eventstore.PushEvents(ctx, + _, pushErr := c.eventstore.Push(ctx, usr_repo.NewHumanU2FCheckFailedEvent( ctx, userAgg, @@ -384,7 +384,7 @@ func (c *Commands) HumanFinishU2FLogin(ctx context.Context, userID, resourceOwne return err } - _, err = c.eventstore.PushEvents(ctx, + _, err = c.eventstore.Push(ctx, usr_repo.NewHumanU2FCheckSucceededEvent( ctx, userAgg, @@ -418,7 +418,7 @@ func (c *Commands) HumanFinishPasswordlessLogin(ctx context.Context, userID, res logging.LogWithFields("EVENT-Dbbbw", "userID", userID, "resourceOwner", resourceOwner).WithError(err).Warn("missing userAggregate for pushing failed passwordless check event") return err } - _, pushErr := c.eventstore.PushEvents(ctx, + _, pushErr := c.eventstore.Push(ctx, usr_repo.NewHumanPasswordlessCheckFailedEvent( ctx, userAgg, @@ -429,7 +429,7 @@ func (c *Commands) HumanFinishPasswordlessLogin(ctx context.Context, userID, res return err } - _, err = c.eventstore.PushEvents(ctx, + _, err = c.eventstore.Push(ctx, usr_repo.NewHumanPasswordlessCheckSucceededEvent( ctx, userAgg, @@ -485,7 +485,7 @@ func (c *Commands) HumanRemovePasswordless(ctx context.Context, userID, webAuthN func (c *Commands) HumanAddPasswordlessInitCode(ctx context.Context, userID, resourceOwner string) (*domain.PasswordlessInitCode, error) { codeEvent, initCode, code, err := c.humanAddPasswordlessInitCode(ctx, userID, resourceOwner, true) - pushedEvents, err := c.eventstore.PushEvents(ctx, codeEvent) + pushedEvents, err := c.eventstore.Push(ctx, codeEvent) if err != nil { return nil, err } @@ -501,7 +501,7 @@ func (c *Commands) HumanSendPasswordlessInitCode(ctx context.Context, userID, re if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, codeEvent) + pushedEvents, err := c.eventstore.Push(ctx, codeEvent) if err != nil { return nil, err } @@ -512,7 +512,7 @@ func (c *Commands) HumanSendPasswordlessInitCode(ctx context.Context, userID, re return writeModelToPasswordlessInitCode(initCode, code), nil } -func (c *Commands) humanAddPasswordlessInitCode(ctx context.Context, userID, resourceOwner string, direct bool) (eventstore.EventPusher, *HumanPasswordlessInitCodeWriteModel, string, error) { +func (c *Commands) humanAddPasswordlessInitCode(ctx context.Context, userID, resourceOwner string, direct bool) (eventstore.Command, *HumanPasswordlessInitCodeWriteModel, string, error) { if userID == "" { return nil, nil, "", caos_errs.ThrowPreconditionFailed(nil, "COMMAND-GVfg3", "Errors.IDMissing") } @@ -531,11 +531,11 @@ func (c *Commands) humanAddPasswordlessInitCode(ctx context.Context, userID, res if err != nil { return nil, nil, "", err } - codeEventCreator := func(ctx context.Context, agg *eventstore.Aggregate, id string, cryptoCode *crypto.CryptoValue, exp time.Duration) eventstore.EventPusher { + codeEventCreator := func(ctx context.Context, agg *eventstore.Aggregate, id string, cryptoCode *crypto.CryptoValue, exp time.Duration) eventstore.Command { return usr_repo.NewHumanPasswordlessInitCodeAddedEvent(ctx, agg, id, cryptoCode, exp) } if !direct { - codeEventCreator = func(ctx context.Context, agg *eventstore.Aggregate, id string, cryptoCode *crypto.CryptoValue, exp time.Duration) eventstore.EventPusher { + codeEventCreator = func(ctx context.Context, agg *eventstore.Aggregate, id string, cryptoCode *crypto.CryptoValue, exp time.Duration) eventstore.Command { return usr_repo.NewHumanPasswordlessInitCodeRequestedEvent(ctx, agg, id, cryptoCode, exp) } } @@ -557,7 +557,7 @@ func (c *Commands) HumanPasswordlessInitCodeSent(ctx context.Context, userID, re return caos_errs.ThrowNotFound(nil, "COMMAND-Gdfg3", "Errors.User.Code.NotFound") } - _, err = c.eventstore.PushEvents(ctx, + _, err = c.eventstore.Push(ctx, usr_repo.NewHumanPasswordlessInitCodeSentEvent(ctx, UserAggregateFromWriteModel(&initCode.WriteModel), codeID), ) return err @@ -575,14 +575,14 @@ func (c *Commands) humanVerifyPasswordlessInitCode(ctx context.Context, userID, err = crypto.VerifyCode(initCode.ChangeDate, initCode.Expiration, initCode.CryptoCode, verificationCode, c.passwordlessInitCode) if err != nil || initCode.State != domain.PasswordlessInitCodeStateActive { userAgg := UserAggregateFromWriteModel(&initCode.WriteModel) - _, err = c.eventstore.PushEvents(ctx, usr_repo.NewHumanPasswordlessInitCodeCheckFailedEvent(ctx, userAgg, codeID)) + _, err = c.eventstore.Push(ctx, usr_repo.NewHumanPasswordlessInitCodeCheckFailedEvent(ctx, userAgg, codeID)) logging.LogWithFields("COMMAND-Gkuud", "userID", userAgg.ID).OnError(err).Error("NewHumanPasswordlessInitCodeCheckFailedEvent push failed") return caos_errs.ThrowInvalidArgument(err, "COMMAND-Dhz8i", "Errors.User.Code.Invalid") } return nil } -func (c *Commands) removeHumanWebAuthN(ctx context.Context, userID, webAuthNID, resourceOwner string, preparedEvent func(*eventstore.Aggregate) eventstore.EventPusher) (*domain.ObjectDetails, error) { +func (c *Commands) removeHumanWebAuthN(ctx context.Context, userID, webAuthNID, resourceOwner string, preparedEvent func(*eventstore.Aggregate) eventstore.Command) (*domain.ObjectDetails, error) { if userID == "" || webAuthNID == "" { return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-6M9de", "Errors.IDMissing") } @@ -596,7 +596,7 @@ func (c *Commands) removeHumanWebAuthN(ctx context.Context, userID, webAuthNID, } userAgg := UserAggregateFromWriteModel(&existingWebAuthN.WriteModel) - pushedEvents, err := c.eventstore.PushEvents(ctx, preparedEvent(userAgg)) + pushedEvents, err := c.eventstore.Push(ctx, preparedEvent(userAgg)) if err != nil { return nil, err } diff --git a/internal/command/user_human_webauthn_model.go b/internal/command/user_human_webauthn_model.go index 069fca44d9..d0ce4e86d0 100644 --- a/internal/command/user_human_webauthn_model.go +++ b/internal/command/user_human_webauthn_model.go @@ -35,7 +35,7 @@ func NewHumanWebAuthNWriteModel(userID, webAuthNTokenID, resourceOwner string) * } } -func (wm *HumanWebAuthNWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *HumanWebAuthNWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *user.HumanWebAuthNAddedEvent: @@ -160,7 +160,7 @@ func NewHumanU2FTokensReadModel(userID, resourceOwner string) *HumanU2FTokensRea } } -func (wm *HumanU2FTokensReadModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *HumanU2FTokensReadModel) AppendEvents(events ...eventstore.Event) { wm.WriteModel.AppendEvents(events...) } @@ -243,7 +243,7 @@ func NewHumanPasswordlessTokensReadModel(userID, resourceOwner string) *HumanPas } } -func (wm *HumanPasswordlessTokensReadModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *HumanPasswordlessTokensReadModel) AppendEvents(events ...eventstore.Event) { wm.WriteModel.AppendEvents(events...) } @@ -331,7 +331,7 @@ func NewHumanU2FLoginReadModel(userID, authReqID, resourceOwner string) *HumanU2 } } -func (wm *HumanU2FLoginReadModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *HumanU2FLoginReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *user.HumanU2FBeginLoginEvent: @@ -392,7 +392,7 @@ func NewHumanPasswordlessLoginReadModel(userID, authReqID, resourceOwner string) } } -func (wm *HumanPasswordlessLoginReadModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *HumanPasswordlessLoginReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *user.HumanPasswordlessBeginLoginEvent: @@ -454,7 +454,7 @@ func NewHumanPasswordlessInitCodeWriteModel(userID, codeID, resourceOwner string } } -func (wm *HumanPasswordlessInitCodeWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *HumanPasswordlessInitCodeWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *user.HumanPasswordlessInitCodeAddedEvent: diff --git a/internal/command/user_idp_link.go b/internal/command/user_idp_link.go index 698a03f265..199b025b4c 100644 --- a/internal/command/user_idp_link.go +++ b/internal/command/user_idp_link.go @@ -19,7 +19,7 @@ func (c *Commands) BulkAddedUserIDPLinks(ctx context.Context, userID, resourceOw return caos_errs.ThrowInvalidArgument(nil, "COMMAND-Ek9s", "Errors.User.ExternalIDP.MinimumExternalIDPNeeded") } - events := make([]eventstore.EventPusher, len(links)) + events := make([]eventstore.Command, len(links)) for i, link := range links { linkWriteModel := NewUserIDPLinkWriteModel(userID, link.IDPConfigID, link.ExternalUserID, resourceOwner) userAgg := UserAggregateFromWriteModel(&linkWriteModel.WriteModel) @@ -30,11 +30,11 @@ func (c *Commands) BulkAddedUserIDPLinks(ctx context.Context, userID, resourceOw } } - _, err = c.eventstore.PushEvents(ctx, events...) + _, err = c.eventstore.Push(ctx, events...) return err } -func (c *Commands) addUserIDPLink(ctx context.Context, human *eventstore.Aggregate, link *domain.UserIDPLink) (eventstore.EventPusher, error) { +func (c *Commands) addUserIDPLink(ctx context.Context, human *eventstore.Aggregate, link *domain.UserIDPLink) (eventstore.Command, error) { if link.AggregateID != "" && human.ID != link.AggregateID { return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-33M0g", "Errors.IDMissing") } @@ -56,7 +56,7 @@ func (c *Commands) RemoveUserIDPLink(ctx context.Context, link *domain.UserIDPLi if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -67,7 +67,7 @@ func (c *Commands) RemoveUserIDPLink(ctx context.Context, link *domain.UserIDPLi return writeModelToObjectDetails(&linkWriteModel.WriteModel), nil } -func (c *Commands) removeUserIDPLink(ctx context.Context, link *domain.UserIDPLink, cascade bool) (eventstore.EventPusher, *UserIDPLinkWriteModel, error) { +func (c *Commands) removeUserIDPLink(ctx context.Context, link *domain.UserIDPLink, cascade bool) (eventstore.Command, *UserIDPLinkWriteModel, error) { if !link.IsValid() || link.AggregateID == "" { return nil, nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-3M9ds", "Errors.IDMissing") } @@ -100,7 +100,7 @@ func (c *Commands) UserIDPLoginChecked(ctx context.Context, orgID, userID string } userAgg := UserAggregateFromWriteModel(&existingHuman.WriteModel) - _, err = c.eventstore.PushEvents(ctx, user.NewUserIDPCheckSucceededEvent(ctx, userAgg, authRequestDomainToAuthRequestInfo(authRequest))) + _, err = c.eventstore.Push(ctx, user.NewUserIDPCheckSucceededEvent(ctx, userAgg, authRequestDomainToAuthRequestInfo(authRequest))) return err } diff --git a/internal/command/user_idp_link_model.go b/internal/command/user_idp_link_model.go index 1449b0acb9..6f20f9d310 100644 --- a/internal/command/user_idp_link_model.go +++ b/internal/command/user_idp_link_model.go @@ -27,7 +27,7 @@ func NewUserIDPLinkWriteModel(userID, idpConfigID, externalUserID, resourceOwner } } -func (wm *UserIDPLinkWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *UserIDPLinkWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *user.UserIDPLinkAddedEvent: diff --git a/internal/command/user_machine.go b/internal/command/user_machine.go index 9804f15676..a8ef6fbcc1 100644 --- a/internal/command/user_machine.go +++ b/internal/command/user_machine.go @@ -27,7 +27,7 @@ func (c *Commands) AddMachine(ctx context.Context, orgID string, machine *domain machine.AggregateID = userID addedMachine := NewMachineWriteModel(machine.AggregateID, orgID) userAgg := UserAggregateFromWriteModel(&addedMachine.WriteModel) - events, err := c.eventstore.PushEvents(ctx, user.NewMachineAddedEvent( + events, err := c.eventstore.Push(ctx, user.NewMachineAddedEvent( ctx, userAgg, machine.Username, @@ -63,7 +63,7 @@ func (c *Commands) ChangeMachine(ctx context.Context, machine *domain.Machine) ( return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-2n8vs", "Errors.User.NotChanged") } - events, err := c.eventstore.PushEvents(ctx, changedEvent) + events, err := c.eventstore.Push(ctx, changedEvent) if err != nil { return nil, err } diff --git a/internal/command/user_machine_key.go b/internal/command/user_machine_key.go index 6586ccc418..533e5f5a59 100644 --- a/internal/command/user_machine_key.go +++ b/internal/command/user_machine_key.go @@ -32,7 +32,7 @@ func (c *Commands) AddUserMachineKey(ctx context.Context, machineKey *domain.Mac return nil, err } - events, err := c.eventstore.PushEvents(ctx, + events, err := c.eventstore.Push(ctx, user.NewMachineKeyAddedEvent( ctx, UserAggregateFromWriteModel(&keyWriteModel.WriteModel), @@ -62,7 +62,7 @@ func (c *Commands) RemoveUserMachineKey(ctx context.Context, userID, keyID, reso return nil, errors.ThrowNotFound(nil, "COMMAND-4m77G", "Errors.User.Machine.Key.NotFound") } - pushedEvents, err := c.eventstore.PushEvents(ctx, + pushedEvents, err := c.eventstore.Push(ctx, user.NewMachineKeyRemovedEvent(ctx, UserAggregateFromWriteModel(&keyWriteModel.WriteModel), keyID)) if err != nil { return nil, err diff --git a/internal/command/user_machine_key_model.go b/internal/command/user_machine_key_model.go index c71e4f26f7..bf9db32761 100644 --- a/internal/command/user_machine_key_model.go +++ b/internal/command/user_machine_key_model.go @@ -29,7 +29,7 @@ func NewMachineKeyWriteModel(userID, keyID, resourceOwner string) *MachineKeyWri } } -func (wm *MachineKeyWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *MachineKeyWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *user.MachineKeyAddedEvent: diff --git a/internal/command/user_membership.go b/internal/command/user_membership.go index 5058ce66e5..391d61d438 100644 --- a/internal/command/user_membership.go +++ b/internal/command/user_membership.go @@ -10,8 +10,8 @@ import ( "github.com/caos/zitadel/internal/repository/project" ) -func (c *Commands) removeUserMemberships(ctx context.Context, memberships []*domain.UserMembership, cascade bool) (_ []eventstore.EventPusher, err error) { - events := make([]eventstore.EventPusher, 0) +func (c *Commands) removeUserMemberships(ctx context.Context, memberships []*domain.UserMembership, cascade bool) (_ []eventstore.Command, err error) { + events := make([]eventstore.Command, 0) for _, membership := range memberships { switch membership.MemberType { case domain.MemberTypeIam: diff --git a/internal/command/user_metadata.go b/internal/command/user_metadata.go index d86b88c367..92e71814aa 100644 --- a/internal/command/user_metadata.go +++ b/internal/command/user_metadata.go @@ -20,7 +20,7 @@ func (c *Commands) SetUserMetadata(ctx context.Context, metadata *domain.Metadat if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -41,7 +41,7 @@ func (c *Commands) BulkSetUserMetadata(ctx context.Context, userID, resourceOwne return nil, err } - events := make([]eventstore.EventPusher, len(metadatas)) + events := make([]eventstore.Command, len(metadatas)) setMetadata := NewUserMetadataListWriteModel(userID, resourceOwner) userAgg := UserAggregateFromWriteModel(&setMetadata.WriteModel) for i, data := range metadatas { @@ -52,7 +52,7 @@ func (c *Commands) BulkSetUserMetadata(ctx context.Context, userID, resourceOwne events[i] = event } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -64,7 +64,7 @@ func (c *Commands) BulkSetUserMetadata(ctx context.Context, userID, resourceOwne return writeModelToObjectDetails(&setMetadata.WriteModel), nil } -func (c *Commands) setUserMetadata(ctx context.Context, userAgg *eventstore.Aggregate, metadata *domain.Metadata) (pusher eventstore.EventPusher, err error) { +func (c *Commands) setUserMetadata(ctx context.Context, userAgg *eventstore.Aggregate, metadata *domain.Metadata) (command eventstore.Command, err error) { if !metadata.IsValid() { return nil, caos_errs.ThrowInvalidArgument(nil, "META-2m00f", "Errors.Metadata.Invalid") } @@ -96,7 +96,7 @@ func (c *Commands) RemoveUserMetadata(ctx context.Context, metadataKey, userID, if err != nil { return nil, err } - pushedEvents, err := c.eventstore.PushEvents(ctx, event) + pushedEvents, err := c.eventstore.Push(ctx, event) if err != nil { return nil, err } @@ -117,7 +117,7 @@ func (c *Commands) BulkRemoveUserMetadata(ctx context.Context, userID, resourceO return nil, err } - events := make([]eventstore.EventPusher, len(metadataKeys)) + events := make([]eventstore.Command, len(metadataKeys)) removeMetadata, err := c.getUserMetadataListModelByID(ctx, userID, resourceOwner) if err != nil { return nil, err @@ -137,7 +137,7 @@ func (c *Commands) BulkRemoveUserMetadata(ctx context.Context, userID, resourceO events[i] = event } - pushedEvents, err := c.eventstore.PushEvents(ctx, events...) + pushedEvents, err := c.eventstore.Push(ctx, events...) if err != nil { return nil, err } @@ -149,7 +149,7 @@ func (c *Commands) BulkRemoveUserMetadata(ctx context.Context, userID, resourceO return writeModelToObjectDetails(&removeMetadata.WriteModel), nil } -func (c *Commands) removeUserMetadataFromOrg(ctx context.Context, resourceOwner string) ([]eventstore.EventPusher, error) { +func (c *Commands) removeUserMetadataFromOrg(ctx context.Context, resourceOwner string) ([]eventstore.Command, error) { existingUserMetadata, err := c.getUserMetadataByOrgListModelByID(ctx, resourceOwner) if err != nil { return nil, err @@ -157,7 +157,7 @@ func (c *Commands) removeUserMetadataFromOrg(ctx context.Context, resourceOwner if len(existingUserMetadata.UserMetadata) == 0 { return nil, nil } - events := make([]eventstore.EventPusher, 0) + events := make([]eventstore.Command, 0) for key, value := range existingUserMetadata.UserMetadata { if len(value) == 0 { continue @@ -167,13 +167,13 @@ func (c *Commands) removeUserMetadataFromOrg(ctx context.Context, resourceOwner return events, nil } -func (c *Commands) removeUserMetadata(ctx context.Context, userAgg *eventstore.Aggregate, metadataKey string) (pusher eventstore.EventPusher, err error) { - pusher = user.NewMetadataRemovedEvent( +func (c *Commands) removeUserMetadata(ctx context.Context, userAgg *eventstore.Aggregate, metadataKey string) (command eventstore.Command, err error) { + command = user.NewMetadataRemovedEvent( ctx, userAgg, metadataKey, ) - return pusher, nil + return command, nil } func (c *Commands) getUserMetadataModelByID(ctx context.Context, userID, resourceOwner, key string) (*UserMetadataWriteModel, error) { diff --git a/internal/command/user_metadata_model.go b/internal/command/user_metadata_model.go index a35acdb8dd..527c2aeed7 100644 --- a/internal/command/user_metadata_model.go +++ b/internal/command/user_metadata_model.go @@ -22,7 +22,7 @@ func NewUserMetadataWriteModel(userID, resourceOwner, key string) *UserMetadataW } } -func (wm *UserMetadataWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *UserMetadataWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *user.MetadataSetEvent: @@ -68,7 +68,7 @@ func NewUserMetadataListWriteModel(userID, resourceOwner string) *UserMetadataLi } } -func (wm *UserMetadataListWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *UserMetadataListWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *user.MetadataSetEvent: @@ -112,7 +112,7 @@ func NewUserMetadataByOrgListWriteModel(resourceOwner string) *UserMetadataByOrg } } -func (wm *UserMetadataByOrgListWriteModel) AppendEvents(events ...eventstore.EventReader) { +func (wm *UserMetadataByOrgListWriteModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *user.MetadataSetEvent: diff --git a/internal/eventstore/event.go b/internal/eventstore/event.go index 6ee8a6119e..34da76a254 100644 --- a/internal/eventstore/event.go +++ b/internal/eventstore/event.go @@ -4,7 +4,8 @@ import ( "time" ) -type EventPusher interface { +// Command is the intend to store an event into the eventstore +type Command interface { //Aggregate is the metadata of an aggregate Aggregate() Aggregate // EditorService is the service who wants to push the event @@ -24,7 +25,8 @@ type EventPusher interface { UniqueConstraints() []*EventUniqueConstraint } -type EventReader interface { +// Event is a stored activity +type Event interface { // EditorService is the service who pushed the event EditorService() string //EditorUser is the user who pushed the event diff --git a/internal/eventstore/event_base.go b/internal/eventstore/event_base.go index 6bd7096eba..30f727c414 100644 --- a/internal/eventstore/event_base.go +++ b/internal/eventstore/event_base.go @@ -27,17 +27,17 @@ type BaseEvent struct { Data []byte `json:"-"` } -// EditorService implements EventPusher +// EditorService implements Command func (e *BaseEvent) EditorService() string { return e.Service } -//EditorUser implements EventPusher +//EditorUser implements Command func (e *BaseEvent) EditorUser() string { return e.User } -//Type implements EventPusher +//Type implements Command func (e *BaseEvent) Type() EventType { return e.EventType } diff --git a/internal/eventstore/eventstore.go b/internal/eventstore/eventstore.go index b3197574fe..de47eda12b 100644 --- a/internal/eventstore/eventstore.go +++ b/internal/eventstore/eventstore.go @@ -19,7 +19,7 @@ type Eventstore struct { } type eventTypeInterceptors struct { - eventMapper func(*repository.Event) (EventReader, error) + eventMapper func(*repository.Event) (Event, error) } func NewEventstore(repo repository.Repository) *Eventstore { @@ -36,10 +36,10 @@ func (es *Eventstore) Health(ctx context.Context) error { return es.repo.Health(ctx) } -//PushEvents pushes the events in a single transaction +//Push pushes the events in a single transaction // an event needs at least an aggregate -func (es *Eventstore) PushEvents(ctx context.Context, pushEvents ...EventPusher) ([]EventReader, error) { - events, constraints, err := eventsToRepository(pushEvents) +func (es *Eventstore) Push(ctx context.Context, cmds ...Command) ([]Event, error) { + events, constraints, err := commandsToRepository(cmds) if err != nil { return nil, err } @@ -57,37 +57,37 @@ func (es *Eventstore) PushEvents(ctx context.Context, pushEvents ...EventPusher) return eventReaders, nil } -func eventsToRepository(pushEvents []EventPusher) (events []*repository.Event, constraints []*repository.UniqueConstraint, err error) { - events = make([]*repository.Event, len(pushEvents)) - for i, event := range pushEvents { - data, err := EventData(event) +func commandsToRepository(cmds []Command) (events []*repository.Event, constraints []*repository.UniqueConstraint, err error) { + events = make([]*repository.Event, len(cmds)) + for i, cmd := range cmds { + data, err := EventData(cmd) if err != nil { return nil, nil, err } - if event.Aggregate().ID == "" { + if cmd.Aggregate().ID == "" { return nil, nil, errors.ThrowInvalidArgument(nil, "V2-Afdfe", "aggregate id must not be empty") } - if event.Aggregate().Type == "" { + if cmd.Aggregate().Type == "" { return nil, nil, errors.ThrowInvalidArgument(nil, "V2-Dfg32", "aggregate type must not be empty") } - if event.Type() == "" { + if cmd.Type() == "" { return nil, nil, errors.ThrowInvalidArgument(nil, "V2-Drg34", "event type must not be empty") } - if event.Aggregate().Version == "" { + if cmd.Aggregate().Version == "" { return nil, nil, errors.ThrowInvalidArgument(nil, "V2-Dgfg4", "aggregate version must not be empty") } events[i] = &repository.Event{ - AggregateID: event.Aggregate().ID, - AggregateType: repository.AggregateType(event.Aggregate().Type), - ResourceOwner: event.Aggregate().ResourceOwner, - EditorService: event.EditorService(), - EditorUser: event.EditorUser(), - Type: repository.EventType(event.Type()), - Version: repository.Version(event.Aggregate().Version), + AggregateID: cmd.Aggregate().ID, + AggregateType: repository.AggregateType(cmd.Aggregate().Type), + ResourceOwner: cmd.Aggregate().ResourceOwner, + EditorService: cmd.EditorService(), + EditorUser: cmd.EditorUser(), + Type: repository.EventType(cmd.Type()), + Version: repository.Version(cmd.Aggregate().Version), Data: data, } - if len(event.UniqueConstraints()) > 0 { - constraints = append(constraints, uniqueConstraintsToRepository(event.UniqueConstraints())...) + if len(cmd.UniqueConstraints()) > 0 { + constraints = append(constraints, uniqueConstraintsToRepository(cmd.UniqueConstraints())...) } } @@ -107,9 +107,9 @@ func uniqueConstraintsToRepository(constraints []*EventUniqueConstraint) (unique return uniqueConstraints } -//FilterEvents filters the stored events based on the searchQuery +//Filter filters the stored events based on the searchQuery // and maps the events to the defined event structs -func (es *Eventstore) FilterEvents(ctx context.Context, queryFactory *SearchQueryBuilder) ([]EventReader, error) { +func (es *Eventstore) Filter(ctx context.Context, queryFactory *SearchQueryBuilder) ([]Event, error) { query, err := queryFactory.build() if err != nil { return nil, err @@ -122,8 +122,8 @@ func (es *Eventstore) FilterEvents(ctx context.Context, queryFactory *SearchQuer return es.mapEvents(events) } -func (es *Eventstore) mapEvents(events []*repository.Event) (mappedEvents []EventReader, err error) { - mappedEvents = make([]EventReader, len(events)) +func (es *Eventstore) mapEvents(events []*repository.Event) (mappedEvents []Event, err error) { + mappedEvents = make([]Event, len(events)) es.interceptorMutex.Lock() defer es.interceptorMutex.Unlock() @@ -150,12 +150,12 @@ type reducer interface { // it only appends the newly added events Reduce() error //AppendEvents appends the passed events to an internal list of events - AppendEvents(...EventReader) + AppendEvents(...Event) } //FilterToReducer filters the events based on the search query, appends all events to the reducer and calls it's reduce function func (es *Eventstore) FilterToReducer(ctx context.Context, searchQuery *SearchQueryBuilder, r reducer) error { - events, err := es.FilterEvents(ctx, searchQuery) + events, err := es.Filter(ctx, searchQuery) if err != nil { return err } @@ -183,7 +183,7 @@ type queryReducer interface { //FilterToQueryReducer filters the events based on the search query of the query function, // appends all events to the reducer and calls it's reduce function func (es *Eventstore) FilterToQueryReducer(ctx context.Context, r queryReducer) error { - events, err := es.FilterEvents(ctx, r.Query()) + events, err := es.Filter(ctx, r.Query()) if err != nil { return err } @@ -193,7 +193,7 @@ func (es *Eventstore) FilterToQueryReducer(ctx context.Context, r queryReducer) } //RegisterFilterEventMapper registers a function for mapping an eventstore event to an event -func (es *Eventstore) RegisterFilterEventMapper(eventType EventType, mapper func(*repository.Event) (EventReader, error)) *Eventstore { +func (es *Eventstore) RegisterFilterEventMapper(eventType EventType, mapper func(*repository.Event) (Event, error)) *Eventstore { if mapper == nil || eventType == "" { return es } @@ -207,7 +207,7 @@ func (es *Eventstore) RegisterFilterEventMapper(eventType EventType, mapper func return es } -func EventData(event EventPusher) ([]byte, error) { +func EventData(event Command) ([]byte, error) { switch data := event.Data().(type) { case nil: return nil, nil diff --git a/internal/eventstore/eventstore_test.go b/internal/eventstore/eventstore_test.go index 351de3b588..c2b802677f 100644 --- a/internal/eventstore/eventstore_test.go +++ b/internal/eventstore/eventstore_test.go @@ -47,7 +47,7 @@ func (e *testEvent) Assets() []*Asset { return nil } -func testFilterMapper(event *repository.Event) (EventReader, error) { +func testFilterMapper(event *repository.Event) (Event, error) { if event == nil { return newTestEvent("testID", "hodor", nil, false), nil } @@ -60,10 +60,10 @@ func Test_eventstore_RegisterFilterEventMapper(t *testing.T) { } type args struct { eventType EventType - mapper func(*repository.Event) (EventReader, error) + mapper func(*repository.Event) (Event, error) } type res struct { - event EventReader + event Event mapperCount int } @@ -134,7 +134,7 @@ func Test_eventstore_RegisterFilterEventMapper(t *testing.T) { fields: fields{ eventMapper: map[EventType]eventTypeInterceptors{ "event.type": { - eventMapper: func(*repository.Event) (EventReader, error) { + eventMapper: func(*repository.Event) (Event, error) { return nil, errors.ThrowUnimplemented(nil, "V2-1qPvn", "unimplemented") }, }, @@ -180,7 +180,7 @@ func Test_eventstore_RegisterFilterEventMapper(t *testing.T) { func Test_eventData(t *testing.T) { type args struct { - event EventPusher + event Command } type res struct { jsonText []byte @@ -343,7 +343,7 @@ func Test_eventData(t *testing.T) { func TestEventstore_aggregatesToEvents(t *testing.T) { type args struct { - events []EventPusher + events []Command } type res struct { wantErr bool @@ -357,7 +357,7 @@ func TestEventstore_aggregatesToEvents(t *testing.T) { { name: "one aggregate one event", args: args{ - events: []EventPusher{ + events: []Command{ newTestEvent( "1", "", @@ -386,7 +386,7 @@ func TestEventstore_aggregatesToEvents(t *testing.T) { { name: "one aggregate multiple events", args: args{ - events: []EventPusher{ + events: []Command{ newTestEvent( "1", "", @@ -432,7 +432,7 @@ func TestEventstore_aggregatesToEvents(t *testing.T) { { name: "invalid data", args: args{ - events: []EventPusher{ + events: []Command{ newTestEvent( "1", "", @@ -449,7 +449,7 @@ func TestEventstore_aggregatesToEvents(t *testing.T) { { name: "multiple aggregates", args: args{ - events: []EventPusher{ + events: []Command{ newTestEvent( "1", "", @@ -516,7 +516,7 @@ func TestEventstore_aggregatesToEvents(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - events, _, err := eventsToRepository(tt.args.events) + events, _, err := commandsToRepository(tt.args.events) if (err != nil) != tt.res.wantErr { t.Errorf("Eventstore.aggregatesToEvents() error = %v, wantErr %v", err, tt.res.wantErr) return @@ -584,11 +584,11 @@ func (repo *testRepo) LatestSequence(ctx context.Context, queryFactory *reposito func TestEventstore_Push(t *testing.T) { type args struct { - events []EventPusher + events []Command } type fields struct { repo *testRepo - eventMapper map[EventType]func(*repository.Event) (EventReader, error) + eventMapper map[EventType]func(*repository.Event) (Event, error) } type res struct { wantErr bool @@ -602,7 +602,7 @@ func TestEventstore_Push(t *testing.T) { { name: "one aggregate one event", args: args{ - events: []EventPusher{ + events: []Command{ newTestEvent( "1", "", @@ -628,8 +628,8 @@ func TestEventstore_Push(t *testing.T) { }, }, }, - eventMapper: map[EventType]func(*repository.Event) (EventReader, error){ - "test.event": func(e *repository.Event) (EventReader, error) { + eventMapper: map[EventType]func(*repository.Event) (Event, error){ + "test.event": func(e *repository.Event) (Event, error) { return &testEvent{}, nil }, }, @@ -638,7 +638,7 @@ func TestEventstore_Push(t *testing.T) { { name: "one aggregate multiple events", args: args{ - events: []EventPusher{ + events: []Command{ newTestEvent( "1", "", @@ -681,8 +681,8 @@ func TestEventstore_Push(t *testing.T) { }, }, }, - eventMapper: map[EventType]func(*repository.Event) (EventReader, error){ - "test.event": func(e *repository.Event) (EventReader, error) { + eventMapper: map[EventType]func(*repository.Event) (Event, error){ + "test.event": func(e *repository.Event) (Event, error) { return &testEvent{}, nil }, }, @@ -694,7 +694,7 @@ func TestEventstore_Push(t *testing.T) { { name: "multiple aggregates", args: args{ - events: []EventPusher{ + events: []Command{ newTestEvent( "1", "", @@ -758,8 +758,8 @@ func TestEventstore_Push(t *testing.T) { }, ), }, - eventMapper: map[EventType]func(*repository.Event) (EventReader, error){ - "test.event": func(e *repository.Event) (EventReader, error) { + eventMapper: map[EventType]func(*repository.Event) (Event, error){ + "test.event": func(e *repository.Event) (Event, error) { return &testEvent{}, nil }, }, @@ -771,7 +771,7 @@ func TestEventstore_Push(t *testing.T) { { name: "push fails", args: args{ - events: []EventPusher{ + events: []Command{ newTestEvent( "1", "", @@ -794,7 +794,7 @@ func TestEventstore_Push(t *testing.T) { { name: "aggreagtes to events mapping fails", args: args{ - events: []EventPusher{ + events: []Command{ newTestEvent( "1", "", @@ -830,7 +830,7 @@ func TestEventstore_Push(t *testing.T) { t.FailNow() } - _, err := es.PushEvents(context.Background(), tt.args.events...) + _, err := es.Push(context.Background(), tt.args.events...) if (err != nil) != tt.res.wantErr { t.Errorf("Eventstore.aggregatesToEvents() error = %v, wantErr %v", err, tt.res.wantErr) } @@ -844,7 +844,7 @@ func TestEventstore_FilterEvents(t *testing.T) { } type fields struct { repo *testRepo - eventMapper map[EventType]func(*repository.Event) (EventReader, error) + eventMapper map[EventType]func(*repository.Event) (Event, error) } type res struct { wantErr bool @@ -882,8 +882,8 @@ func TestEventstore_FilterEvents(t *testing.T) { events: []*repository.Event{}, t: t, }, - eventMapper: map[EventType]func(*repository.Event) (EventReader, error){ - "test.event": func(e *repository.Event) (EventReader, error) { + eventMapper: map[EventType]func(*repository.Event) (Event, error){ + "test.event": func(e *repository.Event) (Event, error) { return &testEvent{}, nil }, }, @@ -910,8 +910,8 @@ func TestEventstore_FilterEvents(t *testing.T) { t: t, err: errors.ThrowInternal(nil, "V2-RfkBa", "test err"), }, - eventMapper: map[EventType]func(*repository.Event) (EventReader, error){ - "test.event": func(e *repository.Event) (EventReader, error) { + eventMapper: map[EventType]func(*repository.Event) (Event, error){ + "test.event": func(e *repository.Event) (Event, error) { return &testEvent{}, nil }, }, @@ -943,8 +943,8 @@ func TestEventstore_FilterEvents(t *testing.T) { }, t: t, }, - eventMapper: map[EventType]func(*repository.Event) (EventReader, error){ - "test.event": func(e *repository.Event) (EventReader, error) { + eventMapper: map[EventType]func(*repository.Event) (Event, error){ + "test.event": func(e *repository.Event) (Event, error) { return &testEvent{}, nil }, }, @@ -970,7 +970,7 @@ func TestEventstore_FilterEvents(t *testing.T) { t.FailNow() } - _, err := es.FilterEvents(context.Background(), tt.args.query) + _, err := es.Filter(context.Background(), tt.args.query) if (err != nil) != tt.res.wantErr { t.Errorf("Eventstore.aggregatesToEvents() error = %v, wantErr %v", err, tt.res.wantErr) } @@ -1089,7 +1089,7 @@ func TestEventstore_LatestSequence(t *testing.T) { type testReducer struct { t *testing.T - events []EventReader + events []Event expectedLength int err error } @@ -1105,7 +1105,7 @@ func (r *testReducer) Reduce() error { return nil } -func (r *testReducer) AppendEvents(e ...EventReader) { +func (r *testReducer) AppendEvents(e ...Event) { r.events = append(r.events, e...) } @@ -1116,7 +1116,7 @@ func TestEventstore_FilterToReducer(t *testing.T) { } type fields struct { repo *testRepo - eventMapper map[EventType]func(*repository.Event) (EventReader, error) + eventMapper map[EventType]func(*repository.Event) (Event, error) } type res struct { wantErr bool @@ -1158,8 +1158,8 @@ func TestEventstore_FilterToReducer(t *testing.T) { events: []*repository.Event{}, t: t, }, - eventMapper: map[EventType]func(*repository.Event) (EventReader, error){ - "test.event": func(e *repository.Event) (EventReader, error) { + eventMapper: map[EventType]func(*repository.Event) (Event, error){ + "test.event": func(e *repository.Event) (Event, error) { return &testEvent{}, nil }, }, @@ -1190,8 +1190,8 @@ func TestEventstore_FilterToReducer(t *testing.T) { t: t, err: errors.ThrowInternal(nil, "V2-RfkBa", "test err"), }, - eventMapper: map[EventType]func(*repository.Event) (EventReader, error){ - "test.event": func(e *repository.Event) (EventReader, error) { + eventMapper: map[EventType]func(*repository.Event) (Event, error){ + "test.event": func(e *repository.Event) (Event, error) { return &testEvent{}, nil }, }, @@ -1227,8 +1227,8 @@ func TestEventstore_FilterToReducer(t *testing.T) { }, t: t, }, - eventMapper: map[EventType]func(*repository.Event) (EventReader, error){ - "test.event": func(e *repository.Event) (EventReader, error) { + eventMapper: map[EventType]func(*repository.Event) (Event, error){ + "test.event": func(e *repository.Event) (Event, error) { return &testEvent{}, nil }, }, @@ -1262,8 +1262,8 @@ func TestEventstore_FilterToReducer(t *testing.T) { }, t: t, }, - eventMapper: map[EventType]func(*repository.Event) (EventReader, error){ - "test.event": func(e *repository.Event) (EventReader, error) { + eventMapper: map[EventType]func(*repository.Event) (Event, error){ + "test.event": func(e *repository.Event) (Event, error) { return &testEvent{}, nil }, }, @@ -1338,13 +1338,13 @@ func compareEvents(t *testing.T, want, got *repository.Event) { func TestEventstore_mapEvents(t *testing.T) { type fields struct { - eventMapper map[EventType]func(*repository.Event) (EventReader, error) + eventMapper map[EventType]func(*repository.Event) (Event, error) } type args struct { events []*repository.Event } type res struct { - events []EventReader + events []Event wantErr bool } tests := []struct { @@ -1381,8 +1381,8 @@ func TestEventstore_mapEvents(t *testing.T) { }, }, fields: fields{ - eventMapper: map[EventType]func(*repository.Event) (EventReader, error){ - "test.event": func(*repository.Event) (EventReader, error) { + eventMapper: map[EventType]func(*repository.Event) (Event, error){ + "test.event": func(*repository.Event) (Event, error) { return nil, errors.ThrowInternal(nil, "V2-8FbQk", "test err") }, }, @@ -1401,14 +1401,14 @@ func TestEventstore_mapEvents(t *testing.T) { }, }, fields: fields{ - eventMapper: map[EventType]func(*repository.Event) (EventReader, error){ - "test.event": func(*repository.Event) (EventReader, error) { + eventMapper: map[EventType]func(*repository.Event) (Event, error){ + "test.event": func(*repository.Event) (Event, error) { return &testEvent{}, nil }, }, }, res: res{ - events: []EventReader{ + events: []Event{ &testEvent{}, }, wantErr: false, diff --git a/internal/eventstore/example_test.go b/internal/eventstore/example_test.go index bffe57d5e9..86583b4919 100644 --- a/internal/eventstore/example_test.go +++ b/internal/eventstore/example_test.go @@ -45,8 +45,8 @@ func NewUserAddedEvent(id string, firstName string) *UserAddedEvent { } } -func UserAddedEventMapper() (eventstore.EventType, func(*repository.Event) (eventstore.EventReader, error)) { - return "user.added", func(event *repository.Event) (eventstore.EventReader, error) { +func UserAddedEventMapper() (eventstore.EventType, func(*repository.Event) (eventstore.Event, error)) { + return "user.added", func(event *repository.Event) (eventstore.Event, error) { e := &UserAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -90,8 +90,8 @@ func NewUserFirstNameChangedEvent(id, firstName string) *UserFirstNameChangedEve } } -func UserFirstNameChangedMapper() (eventstore.EventType, func(*repository.Event) (eventstore.EventReader, error)) { - return "user.firstName.changed", func(event *repository.Event) (eventstore.EventReader, error) { +func UserFirstNameChangedMapper() (eventstore.EventType, func(*repository.Event) (eventstore.Event, error)) { + return "user.firstName.changed", func(event *repository.Event) (eventstore.Event, error) { e := &UserFirstNameChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -132,8 +132,8 @@ func NewUserPasswordCheckedEvent(id string) *UserPasswordCheckedEvent { } } -func UserPasswordCheckedMapper() (eventstore.EventType, func(*repository.Event) (eventstore.EventReader, error)) { - return "user.password.checked", func(event *repository.Event) (eventstore.EventReader, error) { +func UserPasswordCheckedMapper() (eventstore.EventType, func(*repository.Event) (eventstore.Event, error)) { + return "user.password.checked", func(event *repository.Event) (eventstore.Event, error) { return &UserPasswordCheckedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -169,8 +169,8 @@ func NewUserDeletedEvent(id string) *UserDeletedEvent { } } -func UserDeletedMapper() (eventstore.EventType, func(*repository.Event) (eventstore.EventReader, error)) { - return "user.deleted", func(event *repository.Event) (eventstore.EventReader, error) { +func UserDeletedMapper() (eventstore.EventType, func(*repository.Event) (eventstore.Event, error)) { + return "user.deleted", func(event *repository.Event) (eventstore.Event, error) { return &UserDeletedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -199,7 +199,7 @@ type UsersReadModel struct { Users []*UserReadModel } -func (rm *UsersReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *UsersReadModel) AppendEvents(events ...eventstore.Event) { rm.ReadModel.AppendEvents(events...) for _, event := range events { switch e := event.(type) { @@ -294,7 +294,7 @@ func TestUserReadModel(t *testing.T) { RegisterFilterEventMapper(UserPasswordCheckedMapper()). RegisterFilterEventMapper(UserDeletedMapper()) - events, err := es.PushEvents(context.Background(), + events, err := es.Push(context.Background(), NewUserAddedEvent("1", "hodor"), NewUserAddedEvent("2", "hodor"), NewUserPasswordCheckedEvent("2"), diff --git a/internal/eventstore/handler/crdb/handler_stmt.go b/internal/eventstore/handler/crdb/handler_stmt.go index 916424aad6..8aeb04ad0e 100644 --- a/internal/eventstore/handler/crdb/handler_stmt.go +++ b/internal/eventstore/handler/crdb/handler_stmt.go @@ -196,7 +196,7 @@ func (h *StatementHandler) fetchPreviousStmts( return nil, nil } - events, err := h.Eventstore.FilterEvents(ctx, query) + events, err := h.Eventstore.Filter(ctx, query) if err != nil { return nil, err } diff --git a/internal/eventstore/handler/crdb/handler_stmt_test.go b/internal/eventstore/handler/crdb/handler_stmt_test.go index 7d78cc9670..08bf91ad31 100644 --- a/internal/eventstore/handler/crdb/handler_stmt_test.go +++ b/internal/eventstore/handler/crdb/handler_stmt_test.go @@ -21,7 +21,7 @@ var ( errReduce = errors.New("reduce err") ) -var _ eventstore.EventReader = &testEvent{} +var _ eventstore.Event = &testEvent{} type testEvent struct { eventstore.BaseEvent @@ -1560,13 +1560,13 @@ func TestStatementHandler_updateCurrentSequence(t *testing.T) { } func testReduce() handler.Reduce { - return func(event eventstore.EventReader) (*handler.Statement, error) { + return func(event eventstore.Event) (*handler.Statement, error) { return NewNoOpStatement(event), nil } } func testReduceErr(err error) handler.Reduce { - return func(event eventstore.EventReader) (*handler.Statement, error) { + return func(event eventstore.Event) (*handler.Statement, error) { return nil, err } } diff --git a/internal/eventstore/handler/crdb/reduce.go b/internal/eventstore/handler/crdb/reduce.go index 355d89ded0..1e7b2e4daf 100644 --- a/internal/eventstore/handler/crdb/reduce.go +++ b/internal/eventstore/handler/crdb/reduce.go @@ -6,7 +6,7 @@ import ( ) //reduce implements handler.Reduce function -func (h *StatementHandler) reduce(event eventstore.EventReader) (*handler.Statement, error) { +func (h *StatementHandler) reduce(event eventstore.Event) (*handler.Statement, error) { reduce, ok := h.reduces[event.Type()] if !ok { return NewNoOpStatement(event), nil diff --git a/internal/eventstore/handler/crdb/statement.go b/internal/eventstore/handler/crdb/statement.go index 08dccd2d52..b7ad4f3f58 100644 --- a/internal/eventstore/handler/crdb/statement.go +++ b/internal/eventstore/handler/crdb/statement.go @@ -23,7 +23,7 @@ func WithTableSuffix(name string) func(*execConfig) { } } -func NewCreateStatement(event eventstore.EventReader, values []handler.Column, opts ...execOption) *handler.Statement { +func NewCreateStatement(event eventstore.Event, values []handler.Column, opts ...execOption) *handler.Statement { cols, params, args := columnsToQuery(values) columnNames := strings.Join(cols, ", ") valuesPlaceholder := strings.Join(params, ", ") @@ -48,7 +48,7 @@ func NewCreateStatement(event eventstore.EventReader, values []handler.Column, o } } -func NewUpsertStatement(event eventstore.EventReader, values []handler.Column, opts ...execOption) *handler.Statement { +func NewUpsertStatement(event eventstore.Event, values []handler.Column, opts ...execOption) *handler.Statement { cols, params, args := columnsToQuery(values) columnNames := strings.Join(cols, ", ") valuesPlaceholder := strings.Join(params, ", ") @@ -73,7 +73,7 @@ func NewUpsertStatement(event eventstore.EventReader, values []handler.Column, o } } -func NewUpdateStatement(event eventstore.EventReader, values []handler.Column, conditions []handler.Condition, opts ...execOption) *handler.Statement { +func NewUpdateStatement(event eventstore.Event, values []handler.Column, conditions []handler.Condition, opts ...execOption) *handler.Statement { cols, params, args := columnsToQuery(values) wheres, whereArgs := conditionsToWhere(conditions, len(params)) args = append(args, whereArgs...) @@ -106,7 +106,7 @@ func NewUpdateStatement(event eventstore.EventReader, values []handler.Column, c } } -func NewDeleteStatement(event eventstore.EventReader, conditions []handler.Condition, opts ...execOption) *handler.Statement { +func NewDeleteStatement(event eventstore.Event, conditions []handler.Condition, opts ...execOption) *handler.Statement { wheres, args := conditionsToWhere(conditions, 0) wheresPlaceholders := strings.Join(wheres, " AND ") @@ -131,7 +131,7 @@ func NewDeleteStatement(event eventstore.EventReader, conditions []handler.Condi } } -func NewNoOpStatement(event eventstore.EventReader) *handler.Statement { +func NewNoOpStatement(event eventstore.Event) *handler.Statement { return &handler.Statement{ AggregateType: event.Aggregate().Type, Sequence: event.Sequence(), @@ -139,7 +139,7 @@ func NewNoOpStatement(event eventstore.EventReader) *handler.Statement { } } -func NewMultiStatement(event eventstore.EventReader, opts ...func(eventstore.EventReader) Exec) *handler.Statement { +func NewMultiStatement(event eventstore.Event, opts ...func(eventstore.Event) Exec) *handler.Statement { if len(opts) == 0 { return NewNoOpStatement(event) } @@ -157,26 +157,26 @@ func NewMultiStatement(event eventstore.EventReader, opts ...func(eventstore.Eve type Exec func(ex handler.Executer, projectionName string) error -func AddCreateStatement(columns []handler.Column, opts ...execOption) func(eventstore.EventReader) Exec { - return func(event eventstore.EventReader) Exec { +func AddCreateStatement(columns []handler.Column, opts ...execOption) func(eventstore.Event) Exec { + return func(event eventstore.Event) Exec { return NewCreateStatement(event, columns, opts...).Execute } } -func AddUpsertStatement(values []handler.Column, opts ...execOption) func(eventstore.EventReader) Exec { - return func(event eventstore.EventReader) Exec { +func AddUpsertStatement(values []handler.Column, opts ...execOption) func(eventstore.Event) Exec { + return func(event eventstore.Event) Exec { return NewUpsertStatement(event, values, opts...).Execute } } -func AddUpdateStatement(values []handler.Column, conditions []handler.Condition, opts ...execOption) func(eventstore.EventReader) Exec { - return func(event eventstore.EventReader) Exec { +func AddUpdateStatement(values []handler.Column, conditions []handler.Condition, opts ...execOption) func(eventstore.Event) Exec { + return func(event eventstore.Event) Exec { return NewUpdateStatement(event, values, conditions, opts...).Execute } } -func AddDeleteStatement(conditions []handler.Condition, opts ...execOption) func(eventstore.EventReader) Exec { - return func(event eventstore.EventReader) Exec { +func AddDeleteStatement(conditions []handler.Condition, opts ...execOption) func(eventstore.Event) Exec { + return func(event eventstore.Event) Exec { return NewDeleteStatement(event, conditions, opts...).Execute } } @@ -206,7 +206,7 @@ func NewArrayRemoveCol(column string, value interface{}) handler.Column { // if the value of a col is empty the data will be copied from the selected row // if the value of a col is not empty the data will be set by the static value // conds represent the conditions for the selection subquery -func NewCopyStatement(event eventstore.EventReader, cols []handler.Column, conds []handler.Condition, opts ...execOption) *handler.Statement { +func NewCopyStatement(event eventstore.Event, cols []handler.Column, conds []handler.Condition, opts ...execOption) *handler.Statement { columnNames := make([]string, len(cols)) selectColumns := make([]string, len(cols)) argCounter := 0 diff --git a/internal/eventstore/handler/crdb/statement_test.go b/internal/eventstore/handler/crdb/statement_test.go index bac7ac951a..b956e6fea4 100644 --- a/internal/eventstore/handler/crdb/statement_test.go +++ b/internal/eventstore/handler/crdb/statement_test.go @@ -631,7 +631,7 @@ func TestNewMultiStatement(t *testing.T) { type args struct { table string event *testEvent - execs []func(eventstore.EventReader) Exec + execs []func(eventstore.Event) Exec } type want struct { @@ -671,7 +671,7 @@ func TestNewMultiStatement(t *testing.T) { sequence: 1, previousSequence: 0, }, - execs: []func(eventstore.EventReader) Exec{ + execs: []func(eventstore.Event) Exec{ AddDeleteStatement( []handler.Condition{}, ), @@ -706,7 +706,7 @@ func TestNewMultiStatement(t *testing.T) { previousSequence: 0, aggregateType: "agg", }, - execs: []func(eventstore.EventReader) Exec{ + execs: []func(eventstore.Event) Exec{ AddDeleteStatement( []handler.Condition{ { diff --git a/internal/eventstore/handler/handler.go b/internal/eventstore/handler/handler.go index 17b92a37fb..d63e6caaf1 100644 --- a/internal/eventstore/handler/handler.go +++ b/internal/eventstore/handler/handler.go @@ -10,13 +10,13 @@ type HandlerConfig struct { type Handler struct { Eventstore *eventstore.Eventstore Sub *eventstore.Subscription - EventQueue chan eventstore.EventReader + EventQueue chan eventstore.Event } func NewHandler(config HandlerConfig) Handler { return Handler{ Eventstore: config.Eventstore, - EventQueue: make(chan eventstore.EventReader, 100), + EventQueue: make(chan eventstore.Event, 100), } } diff --git a/internal/eventstore/handler/handler_projection.go b/internal/eventstore/handler/handler_projection.go index ef68444147..b7b7cee968 100644 --- a/internal/eventstore/handler/handler_projection.go +++ b/internal/eventstore/handler/handler_projection.go @@ -23,7 +23,7 @@ type Update func(context.Context, []*Statement, Reduce) (unexecutedStmts []*Stat //Reduce reduces the given event to a statement //which is used to update the projection -type Reduce func(eventstore.EventReader) (*Statement, error) +type Reduce func(eventstore.Event) (*Statement, error) //Lock is used for mutex handling if needed on the projection type Lock func(context.Context, time.Duration) <-chan error @@ -156,7 +156,7 @@ func (h *ProjectionHandler) Process( func (h *ProjectionHandler) processEvent( ctx context.Context, - event eventstore.EventReader, + event eventstore.Event, reduce Reduce, ) error { stmt, err := reduce(event) @@ -262,7 +262,7 @@ func (h *ProjectionHandler) fetchBulkStmts( return false, err } - events, err := h.Eventstore.FilterEvents(ctx, eventQuery) + events, err := h.Eventstore.Filter(ctx, eventQuery) if err != nil { logging.LogWithFields("HANDL-X8vlo", "projection", h.ProjectionName).WithError(err).Info("Unable to bulk fetch events") return false, err diff --git a/internal/eventstore/handler/handler_projection_test.go b/internal/eventstore/handler/handler_projection_test.go index 033fe2f053..ec9cbffae4 100644 --- a/internal/eventstore/handler/handler_projection_test.go +++ b/internal/eventstore/handler/handler_projection_test.go @@ -46,7 +46,7 @@ func TestProjectionHandler_processEvent(t *testing.T) { } type args struct { ctx context.Context - event eventstore.EventReader + event eventstore.Event reduce Reduce } type want struct { @@ -849,13 +849,13 @@ func testUpdate(t *testing.T, expectedStmtCount int, returnedErr error) Update { } func testReduce(stmts *Statement) Reduce { - return func(event eventstore.EventReader) (*Statement, error) { + return func(event eventstore.Event) (*Statement, error) { return stmts, nil } } func testReduceErr(err error) Reduce { - return func(event eventstore.EventReader) (*Statement, error) { + return func(event eventstore.Event) (*Statement, error) { return nil, err } } diff --git a/internal/eventstore/read_model.go b/internal/eventstore/read_model.go index 98e6385f73..81a0d25a0d 100644 --- a/internal/eventstore/read_model.go +++ b/internal/eventstore/read_model.go @@ -6,17 +6,17 @@ import "time" // It implements a basic reducer // it might be saved in a database or in memory type ReadModel struct { - AggregateID string `json:"-"` - ProcessedSequence uint64 `json:"-"` - CreationDate time.Time `json:"-"` - ChangeDate time.Time `json:"-"` - Events []EventReader `json:"-"` - ResourceOwner string `json:"-"` + AggregateID string `json:"-"` + ProcessedSequence uint64 `json:"-"` + CreationDate time.Time `json:"-"` + ChangeDate time.Time `json:"-"` + Events []Event `json:"-"` + ResourceOwner string `json:"-"` } //AppendEvents adds all the events to the read model. // The function doesn't compute the new state of the read model -func (rm *ReadModel) AppendEvents(events ...EventReader) *ReadModel { +func (rm *ReadModel) AppendEvents(events ...Event) *ReadModel { rm.Events = append(rm.Events, events...) return rm } @@ -42,6 +42,6 @@ func (rm *ReadModel) Reduce() error { rm.ProcessedSequence = rm.Events[len(rm.Events)-1].Sequence() // all events processed and not needed anymore rm.Events = nil - rm.Events = []EventReader{} + rm.Events = []Event{} return nil } diff --git a/internal/eventstore/subscription.go b/internal/eventstore/subscription.go index d1c15903bc..94e231b989 100644 --- a/internal/eventstore/subscription.go +++ b/internal/eventstore/subscription.go @@ -13,12 +13,12 @@ var ( ) type Subscription struct { - Events chan EventReader + Events chan Event types map[AggregateType][]EventType } //SubscribeAggregates subscribes for all events on the given aggregates -func SubscribeAggregates(eventQueue chan EventReader, aggregates ...AggregateType) *Subscription { +func SubscribeAggregates(eventQueue chan Event, aggregates ...AggregateType) *Subscription { types := make(map[AggregateType][]EventType, len(aggregates)) for _, aggregate := range aggregates { types[aggregate] = nil @@ -40,7 +40,7 @@ func SubscribeAggregates(eventQueue chan EventReader, aggregates ...AggregateTyp //SubscribeEventTypes subscribes for the given event types // if no event types are provided the subscription is for all events of the aggregate -func SubscribeEventTypes(eventQueue chan EventReader, types map[AggregateType][]EventType) *Subscription { +func SubscribeEventTypes(eventQueue chan Event, types map[AggregateType][]EventType) *Subscription { aggregates := make([]AggregateType, len(types)) sub := &Subscription{ Events: eventQueue, @@ -57,7 +57,7 @@ func SubscribeEventTypes(eventQueue chan EventReader, types map[AggregateType][] return sub } -func notify(events []EventReader) { +func notify(events []Event) { go v1.Notify(MapEventsToV1Events(events)) subsMutext.Lock() defer subsMutext.Unlock() @@ -106,7 +106,7 @@ func (s *Subscription) Unsubscribe() { } } -func MapEventsToV1Events(events []EventReader) []*models.Event { +func MapEventsToV1Events(events []Event) []*models.Event { v1Events := make([]*models.Event, len(events)) for i, event := range events { v1Events[i] = mapEventToV1Event(event) @@ -114,7 +114,7 @@ func MapEventsToV1Events(events []EventReader) []*models.Event { return v1Events } -func mapEventToV1Event(event EventReader) *models.Event { +func mapEventToV1Event(event Event) *models.Event { return &models.Event{ Sequence: event.Sequence(), CreationDate: event.CreationDate(), diff --git a/internal/eventstore/write_model.go b/internal/eventstore/write_model.go index 3f961c7618..7ad372fabc 100644 --- a/internal/eventstore/write_model.go +++ b/internal/eventstore/write_model.go @@ -6,16 +6,16 @@ import "time" // It implements a basic reducer // it's purpose is to reduce events to create new ones type WriteModel struct { - AggregateID string `json:"-"` - ProcessedSequence uint64 `json:"-"` - Events []EventReader `json:"-"` - ResourceOwner string `json:"-"` - ChangeDate time.Time `json:"-"` + AggregateID string `json:"-"` + ProcessedSequence uint64 `json:"-"` + Events []Event `json:"-"` + ResourceOwner string `json:"-"` + ChangeDate time.Time `json:"-"` } //AppendEvents adds all the events to the read model. // The function doesn't compute the new state of the read model -func (rm *WriteModel) AppendEvents(events ...EventReader) { +func (rm *WriteModel) AppendEvents(events ...Event) { rm.Events = append(rm.Events, events...) } @@ -38,6 +38,6 @@ func (wm *WriteModel) Reduce() error { // all events processed and not needed anymore wm.Events = nil - wm.Events = []EventReader{} + wm.Events = []Event{} return nil } diff --git a/internal/query/iam_idp_config_model.go b/internal/query/iam_idp_config_model.go index f303c5217b..9e5d96a86f 100644 --- a/internal/query/iam_idp_config_model.go +++ b/internal/query/iam_idp_config_model.go @@ -19,7 +19,7 @@ func NewIAMIDPConfigReadModel(iamID, configID string) *IAMIDPConfigReadModel { } } -func (rm *IAMIDPConfigReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *IAMIDPConfigReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.IDPConfigAddedEvent: diff --git a/internal/query/iam_idp_configs_model.go b/internal/query/iam_idp_configs_model.go index 0d6333e412..c24d77c4c0 100644 --- a/internal/query/iam_idp_configs_model.go +++ b/internal/query/iam_idp_configs_model.go @@ -9,7 +9,7 @@ type IAMIDPConfigsReadModel struct { IDPConfigsReadModel } -func (rm *IAMIDPConfigsReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *IAMIDPConfigsReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.IDPConfigAddedEvent: diff --git a/internal/query/iam_member_model.go b/internal/query/iam_member_model.go index 22aaa5d9d1..f5503a267c 100644 --- a/internal/query/iam_member_model.go +++ b/internal/query/iam_member_model.go @@ -20,7 +20,7 @@ func NewIAMMemberReadModel(iamID, userID string) *IAMMemberReadModel { } } -func (rm *IAMMemberReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *IAMMemberReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.MemberAddedEvent: diff --git a/internal/query/iam_members_model.go b/internal/query/iam_members_model.go index c13c5cf705..cd770a54c3 100644 --- a/internal/query/iam_members_model.go +++ b/internal/query/iam_members_model.go @@ -9,7 +9,7 @@ type IAMMembersReadModel struct { MembersReadModel } -func (rm *IAMMembersReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *IAMMembersReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.MemberAddedEvent: diff --git a/internal/query/iam_model.go b/internal/query/iam_model.go index eb98e7cec4..e52db76e47 100644 --- a/internal/query/iam_model.go +++ b/internal/query/iam_model.go @@ -44,7 +44,7 @@ func (rm *ReadModel) IDPByID(idpID string) *IAMIDPConfigReadModel { return &IAMIDPConfigReadModel{IDPConfigReadModel: *config} } -func (rm *ReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *ReadModel) AppendEvents(events ...eventstore.Event) { rm.ReadModel.AppendEvents(events...) for _, event := range events { switch event.(type) { @@ -122,7 +122,7 @@ func (rm *ReadModel) Reduce() (err error) { return nil } -func (rm *ReadModel) AppendAndReduce(events ...eventstore.EventReader) error { +func (rm *ReadModel) AppendAndReduce(events ...eventstore.Event) error { rm.AppendEvents(events...) return rm.Reduce() } diff --git a/internal/query/iam_policy_label_model.go b/internal/query/iam_policy_label_model.go index ece7d5b1ee..6496580aaf 100644 --- a/internal/query/iam_policy_label_model.go +++ b/internal/query/iam_policy_label_model.go @@ -8,7 +8,7 @@ import ( type IAMLabelPolicyReadModel struct{ LabelPolicyReadModel } -func (rm *IAMLabelPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *IAMLabelPolicyReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.LabelPolicyAddedEvent: diff --git a/internal/query/iam_policy_login_model.go b/internal/query/iam_policy_login_model.go index 87305ae111..bdaff15895 100644 --- a/internal/query/iam_policy_login_model.go +++ b/internal/query/iam_policy_login_model.go @@ -8,7 +8,7 @@ import ( type IAMLoginPolicyReadModel struct{ LoginPolicyReadModel } -func (rm *IAMLoginPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *IAMLoginPolicyReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.LoginPolicyAddedEvent: diff --git a/internal/query/iam_policy_org_iam_model.go b/internal/query/iam_policy_org_iam_model.go index 31083564c3..cd1fded951 100644 --- a/internal/query/iam_policy_org_iam_model.go +++ b/internal/query/iam_policy_org_iam_model.go @@ -8,7 +8,7 @@ import ( type IAMOrgIAMPolicyReadModel struct{ OrgIAMPolicyReadModel } -func (rm *IAMOrgIAMPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *IAMOrgIAMPolicyReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.OrgIAMPolicyAddedEvent: diff --git a/internal/query/iam_policy_password_age_model.go b/internal/query/iam_policy_password_age_model.go index 018604d70c..c5b8a98c80 100644 --- a/internal/query/iam_policy_password_age_model.go +++ b/internal/query/iam_policy_password_age_model.go @@ -10,7 +10,7 @@ type IAMPasswordAgePolicyReadModel struct { PasswordAgePolicyReadModel } -func (rm *IAMPasswordAgePolicyReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *IAMPasswordAgePolicyReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.PasswordAgePolicyAddedEvent: diff --git a/internal/query/iam_policy_password_complexity_model.go b/internal/query/iam_policy_password_complexity_model.go index c559c15af4..0dc0380266 100644 --- a/internal/query/iam_policy_password_complexity_model.go +++ b/internal/query/iam_policy_password_complexity_model.go @@ -10,7 +10,7 @@ type IAMPasswordComplexityPolicyReadModel struct { PasswordComplexityPolicyReadModel } -func (rm *IAMPasswordComplexityPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *IAMPasswordComplexityPolicyReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.PasswordComplexityPolicyAddedEvent: diff --git a/internal/query/iam_policy_password_lockout_model.go b/internal/query/iam_policy_password_lockout_model.go index 4e7fe2a49d..a08f54c741 100644 --- a/internal/query/iam_policy_password_lockout_model.go +++ b/internal/query/iam_policy_password_lockout_model.go @@ -10,7 +10,7 @@ type IAMLockoutPolicyReadModel struct { LockoutPolicyReadModel } -func (rm *IAMLockoutPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *IAMLockoutPolicyReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *iam.LockoutPolicyAddedEvent: diff --git a/internal/query/idp_config_model.go b/internal/query/idp_config_model.go index 0ef9c7c9d7..38cf631b41 100644 --- a/internal/query/idp_config_model.go +++ b/internal/query/idp_config_model.go @@ -26,7 +26,7 @@ func NewIDPConfigReadModel(configID string) *IDPConfigReadModel { } } -func (rm *IDPConfigReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *IDPConfigReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *idpconfig.IDPConfigAddedEvent: diff --git a/internal/query/idp_configs_model.go b/internal/query/idp_configs_model.go index 28852c1765..e712352eaa 100644 --- a/internal/query/idp_configs_model.go +++ b/internal/query/idp_configs_model.go @@ -20,7 +20,7 @@ func (rm *IDPConfigsReadModel) ConfigByID(id string) (idx int, config *IDPConfig return -1, nil } -func (rm *IDPConfigsReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *IDPConfigsReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *idpconfig.IDPConfigAddedEvent: diff --git a/internal/query/members_model.go b/internal/query/members_model.go index 78feee37c8..592bb7a359 100644 --- a/internal/query/members_model.go +++ b/internal/query/members_model.go @@ -20,7 +20,7 @@ func (rm *MembersReadModel) MemberByUserID(id string) (idx int, member *MemberRe return -1, nil } -func (rm *MembersReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *MembersReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *member.MemberAddedEvent: diff --git a/internal/query/org_member_model.go b/internal/query/org_member_model.go index b942cfe679..e06bc1eec9 100644 --- a/internal/query/org_member_model.go +++ b/internal/query/org_member_model.go @@ -9,7 +9,7 @@ type OrgMembersReadModel struct { MembersReadModel } -func (rm *OrgMembersReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *OrgMembersReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.MemberAddedEvent: @@ -26,7 +26,7 @@ func (rm *OrgMembersReadModel) AppendEvents(events ...eventstore.EventReader) { type OrgMemberReadModel MemberReadModel -func (rm *OrgMemberReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *OrgMemberReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.MemberAddedEvent: diff --git a/internal/query/org_policy_label_model.go b/internal/query/org_policy_label_model.go index 8cff25c014..27b19be80c 100644 --- a/internal/query/org_policy_label_model.go +++ b/internal/query/org_policy_label_model.go @@ -8,7 +8,7 @@ import ( type OrgLabelPolicyReadModel struct{ LabelPolicyReadModel } -func (rm *OrgLabelPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *OrgLabelPolicyReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.LabelPolicyAddedEvent: diff --git a/internal/query/org_policy_login_model.go b/internal/query/org_policy_login_model.go index 24ca70be9a..9fff9f4490 100644 --- a/internal/query/org_policy_login_model.go +++ b/internal/query/org_policy_login_model.go @@ -8,7 +8,7 @@ import ( type OrgLoginPolicyReadModel struct{ LoginPolicyReadModel } -func (rm *OrgLoginPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *OrgLoginPolicyReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.LoginPolicyAddedEvent: diff --git a/internal/query/org_policy_org_iam_model.go b/internal/query/org_policy_org_iam_model.go index b2b3da7568..5b00483d1b 100644 --- a/internal/query/org_policy_org_iam_model.go +++ b/internal/query/org_policy_org_iam_model.go @@ -8,7 +8,7 @@ import ( type OrgOrgIAMPolicyReadModel struct{ OrgIAMPolicyReadModel } -func (rm *OrgOrgIAMPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *OrgOrgIAMPolicyReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.OrgIAMPolicyAddedEvent: diff --git a/internal/query/org_policy_password_age_model.go b/internal/query/org_policy_password_age_model.go index e27fdb95b9..def930b6f2 100644 --- a/internal/query/org_policy_password_age_model.go +++ b/internal/query/org_policy_password_age_model.go @@ -10,7 +10,7 @@ type OrgPasswordAgePolicyReadModel struct { PasswordAgePolicyReadModel } -func (rm *OrgPasswordAgePolicyReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *OrgPasswordAgePolicyReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.PasswordAgePolicyAddedEvent: diff --git a/internal/query/org_policy_password_complexity_model.go b/internal/query/org_policy_password_complexity_model.go index 4c29d94f80..ff6f5329a4 100644 --- a/internal/query/org_policy_password_complexity_model.go +++ b/internal/query/org_policy_password_complexity_model.go @@ -10,7 +10,7 @@ type OrgPasswordComplexityPolicyReadModel struct { PasswordComplexityPolicyReadModel } -func (rm *OrgPasswordComplexityPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *OrgPasswordComplexityPolicyReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.PasswordComplexityPolicyAddedEvent: diff --git a/internal/query/org_policy_password_lockout_model.go b/internal/query/org_policy_password_lockout_model.go index a6cc1b1b2d..4e0d65ff4f 100644 --- a/internal/query/org_policy_password_lockout_model.go +++ b/internal/query/org_policy_password_lockout_model.go @@ -10,7 +10,7 @@ type OrgPasswordLockoutPolicyReadModel struct { LockoutPolicyReadModel } -func (rm *OrgPasswordLockoutPolicyReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *OrgPasswordLockoutPolicyReadModel) AppendEvents(events ...eventstore.Event) { for _, event := range events { switch e := event.(type) { case *org.LockoutPolicyAddedEvent: diff --git a/internal/query/projection/action.go b/internal/query/projection/action.go index 7871f67f48..8f10d59453 100644 --- a/internal/query/projection/action.go +++ b/internal/query/projection/action.go @@ -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") diff --git a/internal/query/projection/action_test.go b/internal/query/projection/action_test.go index 2c535a66dc..7fbc646982 100644 --- a/internal/query/projection/action_test.go +++ b/internal/query/projection/action_test.go @@ -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 }{ { diff --git a/internal/query/projection/app.go b/internal/query/projection/app.go index 38adbf9ad3..240632cc83 100644 --- a/internal/query/projection/app.go +++ b/internal/query/projection/app.go @@ -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") diff --git a/internal/query/projection/app_test.go b/internal/query/projection/app_test.go index 4e50daad6c..217717ab4b 100644 --- a/internal/query/projection/app_test.go +++ b/internal/query/projection/app_test.go @@ -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 }{ { diff --git a/internal/query/projection/authn_key.go b/internal/query/projection/authn_key.go index da2eb2107c..40de700852 100644 --- a/internal/query/projection/authn_key.go +++ b/internal/query/projection/authn_key.go @@ -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: diff --git a/internal/query/projection/authn_key_test.go b/internal/query/projection/authn_key_test.go index d4229127a3..24f1e84e4a 100644 --- a/internal/query/projection/authn_key_test.go +++ b/internal/query/projection/authn_key_test.go @@ -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 }{ { diff --git a/internal/query/projection/custom_text.go b/internal/query/projection/custom_text.go index 64a9e0b052..424989840e 100644 --- a/internal/query/projection/custom_text.go +++ b/internal/query/projection/custom_text.go @@ -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: diff --git a/internal/query/projection/custom_text_test.go b/internal/query/projection/custom_text_test.go index 785009d46c..73041927b8 100644 --- a/internal/query/projection/custom_text_test.go +++ b/internal/query/projection/custom_text_test.go @@ -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 }{ { diff --git a/internal/query/projection/event_test.go b/internal/query/projection/event_test.go index 034ac1342a..6dd1225ef0 100644 --- a/internal/query/projection/event_test.go +++ b/internal/query/projection/event_test.go @@ -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) diff --git a/internal/query/projection/feature.go b/internal/query/projection/feature.go index 42ffee0e15..6791fda8dc 100644 --- a/internal/query/projection/feature.go +++ b/internal/query/projection/feature.go @@ -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") diff --git a/internal/query/projection/feature_test.go b/internal/query/projection/feature_test.go index 0047a61082..f7c7507176 100644 --- a/internal/query/projection/feature_test.go +++ b/internal/query/projection/feature_test.go @@ -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 }{ { diff --git a/internal/query/projection/flow.go b/internal/query/projection/flow.go index d9190a441e..844756cd69 100644 --- a/internal/query/projection/flow.go +++ b/internal/query/projection/flow.go @@ -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") diff --git a/internal/query/projection/flow/flow.go b/internal/query/projection/flow/flow.go index 0cbae08e7b..972c5d0b44 100644 --- a/internal/query/projection/flow/flow.go +++ b/internal/query/projection/flow/flow.go @@ -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") diff --git a/internal/query/projection/flow_test.go b/internal/query/projection/flow_test.go index 562e4f2097..afd7904afc 100644 --- a/internal/query/projection/flow_test.go +++ b/internal/query/projection/flow_test.go @@ -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 }{ { diff --git a/internal/query/projection/iam_member.go b/internal/query/projection/iam_member.go index 50808ff4b0..dad4cefe36 100644 --- a/internal/query/projection/iam_member.go +++ b/internal/query/projection/iam_member.go @@ -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") diff --git a/internal/query/projection/iam_member_test.go b/internal/query/projection/iam_member_test.go index 38e8aa7919..ed68fb7ccc 100644 --- a/internal/query/projection/iam_member_test.go +++ b/internal/query/projection/iam_member_test.go @@ -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 }{ { diff --git a/internal/query/projection/idp.go b/internal/query/projection/idp.go index 7a7bdedb2f..a33c745813 100644 --- a/internal/query/projection/idp.go +++ b/internal/query/projection/idp.go @@ -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: diff --git a/internal/query/projection/idp_login_policy_link.go b/internal/query/projection/idp_login_policy_link.go index 4cfbfd0984..81cf1b9c66 100644 --- a/internal/query/projection/idp_login_policy_link.go +++ b/internal/query/projection/idp_login_policy_link.go @@ -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") diff --git a/internal/query/projection/idp_login_policy_link_test.go b/internal/query/projection/idp_login_policy_link_test.go index dafa5eeac2..2237b681b0 100644 --- a/internal/query/projection/idp_login_policy_link_test.go +++ b/internal/query/projection/idp_login_policy_link_test.go @@ -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 }{ { diff --git a/internal/query/projection/idp_test.go b/internal/query/projection/idp_test.go index b08e7172f2..eb039b6dc5 100644 --- a/internal/query/projection/idp_test.go +++ b/internal/query/projection/idp_test.go @@ -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 }{ { diff --git a/internal/query/projection/idp_user_link.go b/internal/query/projection/idp_user_link.go index 87ac22ddd7..48c4036b69 100644 --- a/internal/query/projection/idp_user_link.go +++ b/internal/query/projection/idp_user_link.go @@ -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) { diff --git a/internal/query/projection/idp_user_link_test.go b/internal/query/projection/idp_user_link_test.go index b74aeb71f0..99b081f9cb 100644 --- a/internal/query/projection/idp_user_link_test.go +++ b/internal/query/projection/idp_user_link_test.go @@ -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 }{ { diff --git a/internal/query/projection/key.go b/internal/query/projection/key.go index 46b2e5e126..308811231a 100644 --- a/internal/query/projection/key.go +++ b/internal/query/projection/key.go @@ -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), diff --git a/internal/query/projection/key_test.go b/internal/query/projection/key_test.go index 4941f9bcc6..b1f981ff8a 100644 --- a/internal/query/projection/key_test.go +++ b/internal/query/projection/key_test.go @@ -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 }{ { diff --git a/internal/query/projection/label_policy.go b/internal/query/projection/label_policy.go index 5e2223b8db..ffe0fe000a 100644 --- a/internal/query/projection/label_policy.go +++ b/internal/query/projection/label_policy.go @@ -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 diff --git a/internal/query/projection/label_policy_test.go b/internal/query/projection/label_policy_test.go index 5721bb3bc1..4fa4f145ba 100644 --- a/internal/query/projection/label_policy_test.go +++ b/internal/query/projection/label_policy_test.go @@ -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 }{ { diff --git a/internal/query/projection/lockout_policy.go b/internal/query/projection/lockout_policy.go index 9a25a86c3c..2fe9d5e392 100644 --- a/internal/query/projection/lockout_policy.go +++ b/internal/query/projection/lockout_policy.go @@ -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") diff --git a/internal/query/projection/lockout_policy_test.go b/internal/query/projection/lockout_policy_test.go index 27013e5aba..c9e015e514 100644 --- a/internal/query/projection/lockout_policy_test.go +++ b/internal/query/projection/lockout_policy_test.go @@ -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 }{ { diff --git a/internal/query/projection/login_name.go b/internal/query/projection/login_name.go index 3502919958..20a4ef2d24 100644 --- a/internal/query/projection/login_name.go +++ b/internal/query/projection/login_name.go @@ -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") diff --git a/internal/query/projection/login_name_test.go b/internal/query/projection/login_name_test.go index 7102f7dfb6..ef68eee29d 100644 --- a/internal/query/projection/login_name_test.go +++ b/internal/query/projection/login_name_test.go @@ -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 }{ { diff --git a/internal/query/projection/login_policy.go b/internal/query/projection/login_policy.go index 0c41b021e6..19acde3a64 100644 --- a/internal/query/projection/login_policy.go +++ b/internal/query/projection/login_policy.go @@ -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: diff --git a/internal/query/projection/login_policy_test.go b/internal/query/projection/login_policy_test.go index 2bf54675d7..e9ff4633a7 100644 --- a/internal/query/projection/login_policy_test.go +++ b/internal/query/projection/login_policy_test.go @@ -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 }{ { diff --git a/internal/query/projection/mail_template.go b/internal/query/projection/mail_template.go index c3be64e6a9..027769c49b 100644 --- a/internal/query/projection/mail_template.go +++ b/internal/query/projection/mail_template.go @@ -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") diff --git a/internal/query/projection/mail_template_test.go b/internal/query/projection/mail_template_test.go index 12a0a53afb..8e14c97f23 100644 --- a/internal/query/projection/mail_template_test.go +++ b/internal/query/projection/mail_template_test.go @@ -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 }{ { diff --git a/internal/query/projection/member.go b/internal/query/projection/member.go index 7273ee6d3b..c0c3961bae 100644 --- a/internal/query/projection/member.go +++ b/internal/query/projection/member.go @@ -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{}, } diff --git a/internal/query/projection/message_text_test.go b/internal/query/projection/message_text_test.go index e49d75d1d5..8476a7cef5 100644 --- a/internal/query/projection/message_text_test.go +++ b/internal/query/projection/message_text_test.go @@ -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 }{ { diff --git a/internal/query/projection/message_texts.go b/internal/query/projection/message_texts.go index 5b385ff27d..512f07bf7f 100644 --- a/internal/query/projection/message_texts.go +++ b/internal/query/projection/message_texts.go @@ -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: diff --git a/internal/query/projection/org.go b/internal/query/projection/org.go index c3f93f9a73..e13e76a653 100644 --- a/internal/query/projection/org.go +++ b/internal/query/projection/org.go @@ -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") diff --git a/internal/query/projection/org/owner/projection.go b/internal/query/projection/org/owner/projection.go index 8102689c12..6f87efbf4d 100644 --- a/internal/query/projection/org/owner/projection.go +++ b/internal/query/projection/org/owner/projection.go @@ -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: diff --git a/internal/query/projection/org_domain.go b/internal/query/projection/org_domain.go index ae17380437..5193a1b976 100644 --- a/internal/query/projection/org_domain.go +++ b/internal/query/projection/org_domain.go @@ -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") diff --git a/internal/query/projection/org_domain_test.go b/internal/query/projection/org_domain_test.go index 74f114f4d8..d4d8e4a881 100644 --- a/internal/query/projection/org_domain_test.go +++ b/internal/query/projection/org_domain_test.go @@ -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 }{ { diff --git a/internal/query/projection/org_iam_policy.go b/internal/query/projection/org_iam_policy.go index 325d264331..444c8296fc 100644 --- a/internal/query/projection/org_iam_policy.go +++ b/internal/query/projection/org_iam_policy.go @@ -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") diff --git a/internal/query/projection/org_iam_policy_test.go b/internal/query/projection/org_iam_policy_test.go index 1ca84e698c..c31838e6ee 100644 --- a/internal/query/projection/org_iam_policy_test.go +++ b/internal/query/projection/org_iam_policy_test.go @@ -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 }{ { diff --git a/internal/query/projection/org_member.go b/internal/query/projection/org_member.go index eceb40c446..a79e8e20cf 100644 --- a/internal/query/projection/org_member.go +++ b/internal/query/projection/org_member.go @@ -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 diff --git a/internal/query/projection/org_member_test.go b/internal/query/projection/org_member_test.go index a878efd049..9f0a3ed4e0 100644 --- a/internal/query/projection/org_member_test.go +++ b/internal/query/projection/org_member_test.go @@ -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 }{ { diff --git a/internal/query/projection/org_test.go b/internal/query/projection/org_test.go index 698a7ea41a..565e8b6a7b 100644 --- a/internal/query/projection/org_test.go +++ b/internal/query/projection/org_test.go @@ -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 }{ { diff --git a/internal/query/projection/password_age_policy.go b/internal/query/projection/password_age_policy.go index a558384edf..045aea9a99 100644 --- a/internal/query/projection/password_age_policy.go +++ b/internal/query/projection/password_age_policy.go @@ -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") diff --git a/internal/query/projection/password_age_policy_test.go b/internal/query/projection/password_age_policy_test.go index 9348c250e8..3ce9877a8f 100644 --- a/internal/query/projection/password_age_policy_test.go +++ b/internal/query/projection/password_age_policy_test.go @@ -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 }{ { diff --git a/internal/query/projection/password_complexity_policy.go b/internal/query/projection/password_complexity_policy.go index 89448b6935..2f26c6e027 100644 --- a/internal/query/projection/password_complexity_policy.go +++ b/internal/query/projection/password_complexity_policy.go @@ -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") diff --git a/internal/query/projection/password_complexity_policy_test.go b/internal/query/projection/password_complexity_policy_test.go index 323e372aeb..20ce330120 100644 --- a/internal/query/projection/password_complexity_policy_test.go +++ b/internal/query/projection/password_complexity_policy_test.go @@ -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 }{ { diff --git a/internal/query/projection/privacy_policy.go b/internal/query/projection/privacy_policy.go index 430174bd44..3ca35ecbcf 100644 --- a/internal/query/projection/privacy_policy.go +++ b/internal/query/projection/privacy_policy.go @@ -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") diff --git a/internal/query/projection/privacy_policy_test.go b/internal/query/projection/privacy_policy_test.go index 5922d2f782..c94fc9735a 100644 --- a/internal/query/projection/privacy_policy_test.go +++ b/internal/query/projection/privacy_policy_test.go @@ -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 }{ { diff --git a/internal/query/projection/project.go b/internal/query/projection/project.go index 1b700f4fc5..6ff50ce32f 100644 --- a/internal/query/projection/project.go +++ b/internal/query/projection/project.go @@ -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") diff --git a/internal/query/projection/project_grant.go b/internal/query/projection/project_grant.go index 9a8771e0cc..0d6aaec5af 100644 --- a/internal/query/projection/project_grant.go +++ b/internal/query/projection/project_grant.go @@ -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") diff --git a/internal/query/projection/project_grant_member.go b/internal/query/projection/project_grant_member.go index e4bd77cfed..684bacb4b0 100644 --- a/internal/query/projection/project_grant_member.go +++ b/internal/query/projection/project_grant_member.go @@ -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") diff --git a/internal/query/projection/project_grant_member_test.go b/internal/query/projection/project_grant_member_test.go index 46df25f6c5..559c09ed9d 100644 --- a/internal/query/projection/project_grant_member_test.go +++ b/internal/query/projection/project_grant_member_test.go @@ -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 }{ { diff --git a/internal/query/projection/project_grant_test.go b/internal/query/projection/project_grant_test.go index 97e20b1f36..19a3ea586c 100644 --- a/internal/query/projection/project_grant_test.go +++ b/internal/query/projection/project_grant_test.go @@ -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 }{ { diff --git a/internal/query/projection/project_member.go b/internal/query/projection/project_member.go index 38cdc3f2a7..10b8379f9a 100644 --- a/internal/query/projection/project_member.go +++ b/internal/query/projection/project_member.go @@ -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") diff --git a/internal/query/projection/project_member_test.go b/internal/query/projection/project_member_test.go index ec910d970c..5bd0941667 100644 --- a/internal/query/projection/project_member_test.go +++ b/internal/query/projection/project_member_test.go @@ -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 }{ { diff --git a/internal/query/projection/project_role.go b/internal/query/projection/project_role.go index 644be5b724..10fc21f116 100644 --- a/internal/query/projection/project_role.go +++ b/internal/query/projection/project_role.go @@ -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") diff --git a/internal/query/projection/project_role_test.go b/internal/query/projection/project_role_test.go index 716cd4165e..647f4a3fcb 100644 --- a/internal/query/projection/project_role_test.go +++ b/internal/query/projection/project_role_test.go @@ -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 }{ { diff --git a/internal/query/projection/project_test.go b/internal/query/projection/project_test.go index 1c98d0c34f..15683c102b 100644 --- a/internal/query/projection/project_test.go +++ b/internal/query/projection/project_test.go @@ -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 }{ { diff --git a/internal/query/projection/user.go b/internal/query/projection/user.go index 2da247b94b..1da5cdbc95 100644 --- a/internal/query/projection/user.go +++ b/internal/query/projection/user.go @@ -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") diff --git a/internal/query/projection/user_test.go b/internal/query/projection/user_test.go index 466acab561..2b386d1e87 100644 --- a/internal/query/projection/user_test.go +++ b/internal/query/projection/user_test.go @@ -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 }{ { diff --git a/internal/query/user.go b/internal/query/user.go index 6a14955502..c2819a642b 100644 --- a/internal/query/user.go +++ b/internal/query/user.go @@ -118,7 +118,7 @@ var ( } ) -func (q *Queries) UserEvents(ctx context.Context, orgID, userID string, sequence uint64) ([]eventstore.EventReader, error) { +func (q *Queries) UserEvents(ctx context.Context, orgID, userID string, sequence uint64) ([]eventstore.Event, error) { query := NewUserEventSearchQuery(userID, orgID, sequence) - return q.eventstore.FilterEvents(ctx, query) + return q.eventstore.Filter(ctx, query) } diff --git a/internal/query/user_model.go b/internal/query/user_model.go index d3e91f55d1..d6baeb6870 100644 --- a/internal/query/user_model.go +++ b/internal/query/user_model.go @@ -17,7 +17,7 @@ func NewUserReadModel(id string) *UserReadModel { } } -func (rm *UserReadModel) AppendEvents(events ...eventstore.EventReader) { +func (rm *UserReadModel) AppendEvents(events ...eventstore.Event) { rm.ReadModel.AppendEvents(events...) for _, event := range events { switch event.(type) { @@ -43,7 +43,7 @@ func (rm *UserReadModel) Reduce() (err error) { return nil } -func (rm *UserReadModel) AppendAndReduce(events ...eventstore.EventReader) error { +func (rm *UserReadModel) AppendAndReduce(events ...eventstore.Event) error { rm.AppendEvents(events...) return rm.Reduce() } diff --git a/internal/repository/action/action.go b/internal/repository/action/action.go index eff0c6cbd3..92716a3327 100644 --- a/internal/repository/action/action.go +++ b/internal/repository/action/action.go @@ -71,7 +71,7 @@ func NewAddedEvent( } } -func AddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func AddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &AddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -156,7 +156,7 @@ func ChangeAllowedToFail(allowedToFail bool) func(event *ChangedEvent) { } } -func ChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func ChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &ChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -191,7 +191,7 @@ func NewDeactivatedEvent(ctx context.Context, aggregate *eventstore.Aggregate) * } } -func DeactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func DeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { return &DeactivatedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -219,7 +219,7 @@ func NewReactivatedEvent(ctx context.Context, aggregate *eventstore.Aggregate) * } } -func ReactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func ReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { return &ReactivatedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -254,7 +254,7 @@ func NewRemovedEvent( } } -func RemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func RemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &RemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/asset/asset.go b/internal/repository/asset/asset.go index bc9c7655cf..f312418e62 100644 --- a/internal/repository/asset/asset.go +++ b/internal/repository/asset/asset.go @@ -38,7 +38,7 @@ func NewAddedEvent( } } -func AddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func AddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &AddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -76,7 +76,7 @@ func NewRemovedEvent( } } -func RemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func RemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &RemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/features/features.go b/internal/repository/features/features.go index 3521b49cf0..90dc60b321 100644 --- a/internal/repository/features/features.go +++ b/internal/repository/features/features.go @@ -195,7 +195,7 @@ func ChangeActions(actions bool) func(event *FeaturesSetEvent) { } } -func FeaturesSetEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func FeaturesSetEventMapper(event *repository.Event) (eventstore.Event, error) { e := &FeaturesSetEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -230,7 +230,7 @@ func NewFeaturesRemovedEvent(base *eventstore.BaseEvent) *FeaturesRemovedEvent { } } -func FeaturesRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func FeaturesRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &FeaturesRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/flow/flow.go b/internal/repository/flow/flow.go index 40bbcec49f..1293f75008 100644 --- a/internal/repository/flow/flow.go +++ b/internal/repository/flow/flow.go @@ -47,7 +47,7 @@ func NewTriggerActionsSetEvent( } } -func TriggerActionsSetEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func TriggerActionsSetEventMapper(event *repository.Event) (eventstore.Event, error) { e := &TriggerActionsSetEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -88,7 +88,7 @@ func NewTriggerActionsCascadeRemovedEvent( } } -func TriggerActionsCascadeRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func TriggerActionsCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &TriggerActionsCascadeRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -125,7 +125,7 @@ func NewFlowClearedEvent( } } -func FlowClearedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func FlowClearedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &FlowClearedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/iam/custom_text.go b/internal/repository/iam/custom_text.go index 924073f4ab..95aef7bc6b 100644 --- a/internal/repository/iam/custom_text.go +++ b/internal/repository/iam/custom_text.go @@ -38,7 +38,7 @@ func NewCustomTextSetEvent( } } -func CustomTextSetEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func CustomTextSetEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.CustomTextSetEventMapper(event) if err != nil { return nil, err @@ -67,7 +67,7 @@ func NewCustomTextRemovedEvent( } } -func CustomTextRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func CustomTextRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.CustomTextRemovedEventMapper(event) if err != nil { return nil, err @@ -95,7 +95,7 @@ func NewCustomTextTemplateRemovedEvent( } } -func CustomTextTemplateRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func CustomTextTemplateRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.CustomTextTemplateRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/iam/event_iam_project_set.go b/internal/repository/iam/event_iam_project_set.go index b975c83b3f..3810be2c4f 100644 --- a/internal/repository/iam/event_iam_project_set.go +++ b/internal/repository/iam/event_iam_project_set.go @@ -3,6 +3,7 @@ package iam import ( "context" "encoding/json" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/errors" @@ -42,7 +43,7 @@ func NewIAMProjectSetEvent( } } -func ProjectSetMapper(event *repository.Event) (eventstore.EventReader, error) { +func ProjectSetMapper(event *repository.Event) (eventstore.Event, error) { e := &ProjectSetEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/iam/event_org_set.go b/internal/repository/iam/event_org_set.go index 54887bd505..36b0bf6259 100644 --- a/internal/repository/iam/event_org_set.go +++ b/internal/repository/iam/event_org_set.go @@ -3,6 +3,7 @@ package iam import ( "context" "encoding/json" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/errors" @@ -42,7 +43,7 @@ func NewGlobalOrgSetEventEvent( } } -func GlobalOrgSetMapper(event *repository.Event) (eventstore.EventReader, error) { +func GlobalOrgSetMapper(event *repository.Event) (eventstore.Event, error) { e := &GlobalOrgSetEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/iam/events_step.go b/internal/repository/iam/events_step.go index 4705a5c762..a7c49f85d3 100644 --- a/internal/repository/iam/events_step.go +++ b/internal/repository/iam/events_step.go @@ -52,7 +52,7 @@ func (e *SetupStepEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint } } -func SetupStepMapper(event *repository.Event) (eventstore.EventReader, error) { +func SetupStepMapper(event *repository.Event) (eventstore.Event, error) { step := &SetupStepEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), Done: eventstore.EventType(event.Type) == SetupDoneEventType, diff --git a/internal/repository/iam/features.go b/internal/repository/iam/features.go index de3d19e9d8..9334ae0aad 100644 --- a/internal/repository/iam/features.go +++ b/internal/repository/iam/features.go @@ -2,6 +2,7 @@ package iam import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" "github.com/caos/zitadel/internal/repository/features" @@ -33,7 +34,7 @@ func NewFeaturesSetEvent( return &FeaturesSetEvent{FeaturesSetEvent: *changedEvent}, nil } -func FeaturesSetEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func FeaturesSetEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := features.FeaturesSetEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/iam/idp_config.go b/internal/repository/iam/idp_config.go index 6152c13ad2..a397c4909f 100644 --- a/internal/repository/iam/idp_config.go +++ b/internal/repository/iam/idp_config.go @@ -2,6 +2,7 @@ package iam import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/domain" @@ -47,7 +48,7 @@ func NewIDPConfigAddedEvent( } } -func IDPConfigAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.IDPConfigAddedEventMapper(event) if err != nil { return nil, err @@ -82,7 +83,7 @@ func NewIDPConfigChangedEvent( return &IDPConfigChangedEvent{IDPConfigChangedEvent: *changeEvent}, nil } -func IDPConfigChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.IDPConfigChangedEventMapper(event) if err != nil { return nil, err @@ -114,7 +115,7 @@ func NewIDPConfigRemovedEvent( } } -func IDPConfigRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPConfigRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.IDPConfigRemovedEventMapper(event) if err != nil { return nil, err @@ -145,7 +146,7 @@ func NewIDPConfigDeactivatedEvent( } } -func IDPConfigDeactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPConfigDeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.IDPConfigDeactivatedEventMapper(event) if err != nil { return nil, err @@ -176,7 +177,7 @@ func NewIDPConfigReactivatedEvent( } } -func IDPConfigReactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPConfigReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.IDPConfigReactivatedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/iam/idp_jwt_config.go b/internal/repository/iam/idp_jwt_config.go index 65dad0bd98..1fda3a9860 100644 --- a/internal/repository/iam/idp_jwt_config.go +++ b/internal/repository/iam/idp_jwt_config.go @@ -43,7 +43,7 @@ func NewIDPJWTConfigAddedEvent( } } -func IDPJWTConfigAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPJWTConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.JWTConfigAddedEventMapper(event) if err != nil { return nil, err @@ -76,7 +76,7 @@ func NewIDPJWTConfigChangedEvent( return &IDPJWTConfigChangedEvent{JWTConfigChangedEvent: *changeEvent}, nil } -func IDPJWTConfigChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPJWTConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.JWTConfigChangedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/iam/idp_oidc_config.go b/internal/repository/iam/idp_oidc_config.go index 02ed74cde6..ae7692cf31 100644 --- a/internal/repository/iam/idp_oidc_config.go +++ b/internal/repository/iam/idp_oidc_config.go @@ -2,6 +2,7 @@ package iam import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/crypto" @@ -53,7 +54,7 @@ func NewIDPOIDCConfigAddedEvent( } } -func IDPOIDCConfigAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPOIDCConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.OIDCConfigAddedEventMapper(event) if err != nil { return nil, err @@ -86,7 +87,7 @@ func NewIDPOIDCConfigChangedEvent( return &IDPOIDCConfigChangedEvent{OIDCConfigChangedEvent: *changeEvent}, nil } -func IDPOIDCConfigChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPOIDCConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.OIDCConfigChangedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/iam/member.go b/internal/repository/iam/member.go index b7a5d281c8..f297933992 100644 --- a/internal/repository/iam/member.go +++ b/internal/repository/iam/member.go @@ -2,6 +2,7 @@ package iam import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -39,7 +40,7 @@ func NewMemberAddedEvent( } } -func MemberAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MemberAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := member.MemberAddedEventMapper(event) if err != nil { return nil, err @@ -71,7 +72,7 @@ func NewMemberChangedEvent( } } -func MemberChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MemberChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := member.ChangedEventMapper(event) if err != nil { return nil, err @@ -101,7 +102,7 @@ func NewMemberRemovedEvent( } } -func MemberRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MemberRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := member.RemovedEventMapper(event) if err != nil { return nil, err @@ -131,7 +132,7 @@ func NewMemberCascadeRemovedEvent( } } -func MemberCascadeRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MemberCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := member.CascadeRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/iam/migrate_unique_constraints.go b/internal/repository/iam/migrate_unique_constraints.go index 08868a95d8..d5d3d59e27 100644 --- a/internal/repository/iam/migrate_unique_constraints.go +++ b/internal/repository/iam/migrate_unique_constraints.go @@ -2,6 +2,7 @@ package iam import ( "context" + "github.com/caos/zitadel/internal/domain" "github.com/caos/zitadel/internal/eventstore" @@ -51,7 +52,7 @@ func NewMigrateUniqueConstraintEvent( } } -func MigrateUniqueConstraintEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MigrateUniqueConstraintEventMapper(event *repository.Event) (eventstore.Event, error) { return &MigrateUniqueConstraintEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/iam/policy_label.go b/internal/repository/iam/policy_label.go index e6d0cf55fb..222aefd356 100644 --- a/internal/repository/iam/policy_label.go +++ b/internal/repository/iam/policy_label.go @@ -2,6 +2,7 @@ package iam import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -67,7 +68,7 @@ func NewLabelPolicyAddedEvent( } } -func LabelPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyAddedEventMapper(event) if err != nil { return nil, err @@ -98,7 +99,7 @@ func NewLabelPolicyChangedEvent( return &LabelPolicyChangedEvent{LabelPolicyChangedEvent: *changedEvent}, nil } -func LabelPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyChangedEventMapper(event) if err != nil { return nil, err @@ -125,7 +126,7 @@ func NewLabelPolicyActivatedEvent( } } -func LabelPolicyActivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyActivatedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyActivatedEventMapper(event) if err != nil { return nil, err @@ -154,7 +155,7 @@ func NewLabelPolicyLogoAddedEvent( } } -func LabelPolicyLogoAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyLogoAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyLogoAddedEventMapper(event) if err != nil { return nil, err @@ -183,7 +184,7 @@ func NewLabelPolicyLogoRemovedEvent( } } -func LabelPolicyLogoRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyLogoRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyLogoRemovedEventMapper(event) if err != nil { return nil, err @@ -212,7 +213,7 @@ func NewLabelPolicyIconAddedEvent( } } -func LabelPolicyIconAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyIconAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyIconAddedEventMapper(event) if err != nil { return nil, err @@ -241,7 +242,7 @@ func NewLabelPolicyIconRemovedEvent( } } -func LabelPolicyIconRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyIconRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyIconRemovedEventMapper(event) if err != nil { return nil, err @@ -270,7 +271,7 @@ func NewLabelPolicyLogoDarkAddedEvent( } } -func LabelPolicyLogoDarkAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyLogoDarkAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyLogoDarkAddedEventMapper(event) if err != nil { return nil, err @@ -299,7 +300,7 @@ func NewLabelPolicyLogoDarkRemovedEvent( } } -func LabelPolicyLogoDarkRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyLogoDarkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyLogoDarkRemovedEventMapper(event) if err != nil { return nil, err @@ -328,7 +329,7 @@ func NewLabelPolicyIconDarkAddedEvent( } } -func LabelPolicyIconDarkAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyIconDarkAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyIconDarkAddedEventMapper(event) if err != nil { return nil, err @@ -357,7 +358,7 @@ func NewLabelPolicyIconDarkRemovedEvent( } } -func LabelPolicyIconDarkRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyIconDarkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyIconDarkRemovedEventMapper(event) if err != nil { return nil, err @@ -386,7 +387,7 @@ func NewLabelPolicyFontAddedEvent( } } -func LabelPolicyFontAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyFontAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyFontAddedEventMapper(event) if err != nil { return nil, err @@ -415,7 +416,7 @@ func NewLabelPolicyFontRemovedEvent( } } -func LabelPolicyFontRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyFontRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyFontRemovedEventMapper(event) if err != nil { return nil, err @@ -450,7 +451,7 @@ func NewLabelPolicyAssetsRemovedEvent( } } -func LabelPolicyAssetsRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyAssetsRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyAssetsRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/iam/policy_login.go b/internal/repository/iam/policy_login.go index 1662468b8a..330edf48cc 100644 --- a/internal/repository/iam/policy_login.go +++ b/internal/repository/iam/policy_login.go @@ -2,6 +2,7 @@ package iam import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/domain" @@ -43,7 +44,7 @@ func NewLoginPolicyAddedEvent( } } -func LoginPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LoginPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LoginPolicyAddedEventMapper(event) if err != nil { return nil, err @@ -74,7 +75,7 @@ func NewLoginPolicyChangedEvent( return &LoginPolicyChangedEvent{LoginPolicyChangedEvent: *changedEvent}, nil } -func LoginPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LoginPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LoginPolicyChangedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/iam/policy_login_factors.go b/internal/repository/iam/policy_login_factors.go index 5d5ef7562c..1a15c19ce0 100644 --- a/internal/repository/iam/policy_login_factors.go +++ b/internal/repository/iam/policy_login_factors.go @@ -2,6 +2,7 @@ package iam import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/domain" @@ -36,7 +37,7 @@ func NewLoginPolicySecondFactorAddedEvent( } } -func SecondFactorAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func SecondFactorAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.SecondFactorAddedEventMapper(event) if err != nil { return nil, err @@ -67,7 +68,7 @@ func NewLoginPolicySecondFactorRemovedEvent( } } -func SecondFactorRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func SecondFactorRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.SecondFactorRemovedEventMapper(event) if err != nil { return nil, err @@ -97,7 +98,7 @@ func NewLoginPolicyMultiFactorAddedEvent( } } -func MultiFactorAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MultiFactorAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.MultiFactorAddedEventMapper(event) if err != nil { return nil, err @@ -128,7 +129,7 @@ func NewLoginPolicyMultiFactorRemovedEvent( } } -func MultiFactorRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MultiFactorRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.MultiFactorRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/iam/policy_login_identity_provider.go b/internal/repository/iam/policy_login_identity_provider.go index 766846fb0e..2fce6f32f4 100644 --- a/internal/repository/iam/policy_login_identity_provider.go +++ b/internal/repository/iam/policy_login_identity_provider.go @@ -2,6 +2,7 @@ package iam import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/domain" @@ -36,7 +37,7 @@ func NewIdentityProviderAddedEvent( } } -func IdentityProviderAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IdentityProviderAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.IdentityProviderAddedEventMapper(event) if err != nil { return nil, err @@ -66,7 +67,7 @@ func NewIdentityProviderRemovedEvent( } } -func IdentityProviderRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IdentityProviderRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.IdentityProviderRemovedEventMapper(event) if err != nil { return nil, err @@ -93,7 +94,7 @@ func NewIdentityProviderCascadeRemovedEvent( } } -func IdentityProviderCascadeRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IdentityProviderCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.IdentityProviderCascadeRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/iam/policy_mail_template.go b/internal/repository/iam/policy_mail_template.go index 4adee3e93d..b5737680e2 100644 --- a/internal/repository/iam/policy_mail_template.go +++ b/internal/repository/iam/policy_mail_template.go @@ -2,6 +2,7 @@ package iam import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" "github.com/caos/zitadel/internal/repository/policy" @@ -28,7 +29,7 @@ func NewMailTemplateAddedEvent( } } -func MailTemplateAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MailTemplateAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.MailTemplateAddedEventMapper(event) if err != nil { return nil, err @@ -56,7 +57,7 @@ func NewMailTemplateChangedEvent( return &MailTemplateChangedEvent{MailTemplateChangedEvent: *changedEvent}, nil } -func MailTemplateChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MailTemplateChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.MailTemplateChangedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/iam/policy_mail_text.go b/internal/repository/iam/policy_mail_text.go index 6dfa27b9ce..7ddcc5acdf 100644 --- a/internal/repository/iam/policy_mail_text.go +++ b/internal/repository/iam/policy_mail_text.go @@ -2,6 +2,7 @@ package iam import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" "github.com/caos/zitadel/internal/repository/policy" @@ -42,7 +43,7 @@ func NewMailTextAddedEvent( } } -func MailTextAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MailTextAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.MailTextAddedEventMapper(event) if err != nil { return nil, err @@ -74,7 +75,7 @@ func NewMailTextChangedEvent( return &MailTextChangedEvent{MailTextChangedEvent: *changedEvent}, nil } -func MailTextChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MailTextChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.MailTextChangedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/iam/policy_org_iam.go b/internal/repository/iam/policy_org_iam.go index ea3dfea732..c6ee56ef30 100644 --- a/internal/repository/iam/policy_org_iam.go +++ b/internal/repository/iam/policy_org_iam.go @@ -2,6 +2,7 @@ package iam import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -33,7 +34,7 @@ func NewOrgIAMPolicyAddedEvent( } } -func OrgIAMPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OrgIAMPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.OrgIAMPolicyAddedEventMapper(event) if err != nil { return nil, err @@ -64,7 +65,7 @@ func NewOrgIAMPolicyChangedEvent( return &OrgIAMPolicyChangedEvent{OrgIAMPolicyChangedEvent: *changedEvent}, nil } -func OrgIAMPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OrgIAMPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.OrgIAMPolicyChangedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/iam/policy_password_age.go b/internal/repository/iam/policy_password_age.go index f4a28145e2..135a1a2b4d 100644 --- a/internal/repository/iam/policy_password_age.go +++ b/internal/repository/iam/policy_password_age.go @@ -2,6 +2,7 @@ package iam import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -34,7 +35,7 @@ func NewPasswordAgePolicyAddedEvent( } } -func PasswordAgePolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PasswordAgePolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.PasswordAgePolicyAddedEventMapper(event) if err != nil { return nil, err @@ -65,7 +66,7 @@ func NewPasswordAgePolicyChangedEvent( return &PasswordAgePolicyChangedEvent{PasswordAgePolicyChangedEvent: *changedEvent}, nil } -func PasswordAgePolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PasswordAgePolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.PasswordAgePolicyChangedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/iam/policy_password_complexity.go b/internal/repository/iam/policy_password_complexity.go index cb3fdbe8c4..59591d71b0 100644 --- a/internal/repository/iam/policy_password_complexity.go +++ b/internal/repository/iam/policy_password_complexity.go @@ -2,6 +2,7 @@ package iam import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -40,7 +41,7 @@ func NewPasswordComplexityPolicyAddedEvent( } } -func PasswordComplexityPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PasswordComplexityPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.PasswordComplexityPolicyAddedEventMapper(event) if err != nil { return nil, err @@ -71,7 +72,7 @@ func NewPasswordComplexityPolicyChangedEvent( return &PasswordComplexityPolicyChangedEvent{PasswordComplexityPolicyChangedEvent: *changedEvent}, nil } -func PasswordComplexityPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PasswordComplexityPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.PasswordComplexityPolicyChangedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/iam/policy_password_lockout.go b/internal/repository/iam/policy_password_lockout.go index c1bd781dcb..5f7ea469c7 100644 --- a/internal/repository/iam/policy_password_lockout.go +++ b/internal/repository/iam/policy_password_lockout.go @@ -2,6 +2,7 @@ package iam import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -34,7 +35,7 @@ func NewLockoutPolicyAddedEvent( } } -func LockoutPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LockoutPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LockoutPolicyAddedEventMapper(event) if err != nil { return nil, err @@ -65,7 +66,7 @@ func NewLockoutPolicyChangedEvent( return &LockoutPolicyChangedEvent{LockoutPolicyChangedEvent: *changedEvent}, nil } -func LockoutPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LockoutPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LockoutPolicyChangedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/iam/policy_privacy.go b/internal/repository/iam/policy_privacy.go index 1fecf393cb..4c5fdb3882 100644 --- a/internal/repository/iam/policy_privacy.go +++ b/internal/repository/iam/policy_privacy.go @@ -2,6 +2,7 @@ package iam import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -34,7 +35,7 @@ func NewPrivacyPolicyAddedEvent( } } -func PrivacyPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PrivacyPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.PrivacyPolicyAddedEventMapper(event) if err != nil { return nil, err @@ -65,7 +66,7 @@ func NewPrivacyPolicyChangedEvent( return &PrivacyPolicyChangedEvent{PrivacyPolicyChangedEvent: *changedEvent}, nil } -func PrivacyPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PrivacyPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.PrivacyPolicyChangedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/idpconfig/idp_config.go b/internal/repository/idpconfig/idp_config.go index 9951effcb1..6ee874c85d 100644 --- a/internal/repository/idpconfig/idp_config.go +++ b/internal/repository/idpconfig/idp_config.go @@ -62,7 +62,7 @@ func (e *IDPConfigAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConst return []*eventstore.EventUniqueConstraint{NewAddIDPConfigNameUniqueConstraint(e.Name, e.Aggregate().ResourceOwner)} } -func IDPConfigAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &IDPConfigAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -139,7 +139,7 @@ func ChangeAutoRegister(autoRegister bool) func(*IDPConfigChangedEvent) { } } -func IDPConfigChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &IDPConfigChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -177,7 +177,7 @@ func (e *IDPConfigDeactivatedEvent) UniqueConstraints() []*eventstore.EventUniqu return nil } -func IDPConfigDeactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPConfigDeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &IDPConfigDeactivatedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -215,7 +215,7 @@ func (e *IDPConfigReactivatedEvent) UniqueConstraints() []*eventstore.EventUniqu return nil } -func IDPConfigReactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPConfigReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &IDPConfigReactivatedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -256,7 +256,7 @@ func (e *IDPConfigRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueCon return []*eventstore.EventUniqueConstraint{NewRemoveIDPConfigNameUniqueConstraint(e.name, e.Aggregate().ResourceOwner)} } -func IDPConfigRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPConfigRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &IDPConfigRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/idpconfig/jwt_config.go b/internal/repository/idpconfig/jwt_config.go index 1a27f693af..85e4df96b9 100644 --- a/internal/repository/idpconfig/jwt_config.go +++ b/internal/repository/idpconfig/jwt_config.go @@ -50,7 +50,7 @@ func NewJWTConfigAddedEvent( } } -func JWTConfigAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func JWTConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &JWTConfigAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -126,7 +126,7 @@ func ChangeHeaderName(headerName string) func(*JWTConfigChangedEvent) { } } -func JWTConfigChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func JWTConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &JWTConfigChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/idpconfig/oidc_config.go b/internal/repository/idpconfig/oidc_config.go index 30040906e5..51cd813e21 100644 --- a/internal/repository/idpconfig/oidc_config.go +++ b/internal/repository/idpconfig/oidc_config.go @@ -2,6 +2,7 @@ package idpconfig import ( "encoding/json" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/crypto" @@ -65,7 +66,7 @@ func NewOIDCConfigAddedEvent( } } -func OIDCConfigAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OIDCConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &OIDCConfigAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -170,7 +171,7 @@ func ChangeScopes(scopes []string) func(*OIDCConfigChangedEvent) { } } -func OIDCConfigChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OIDCConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &OIDCConfigChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/keypair/key_pair.go b/internal/repository/keypair/key_pair.go index fb825e71f9..a7dfdc8613 100644 --- a/internal/repository/keypair/key_pair.go +++ b/internal/repository/keypair/key_pair.go @@ -3,12 +3,13 @@ package keypair import ( "context" "encoding/json" + "time" + "github.com/caos/zitadel/internal/crypto" "github.com/caos/zitadel/internal/domain" "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" - "time" ) const ( @@ -66,7 +67,7 @@ func NewAddedEvent( } } -func AddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func AddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &AddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/member/events.go b/internal/repository/member/events.go index bb829afd59..30ce6002d7 100644 --- a/internal/repository/member/events.go +++ b/internal/repository/member/events.go @@ -3,6 +3,7 @@ package member import ( "encoding/json" "fmt" + "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -58,7 +59,7 @@ func NewMemberAddedEvent( } } -func MemberAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MemberAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &MemberAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -98,7 +99,7 @@ func NewMemberChangedEvent( } } -func ChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func ChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &MemberChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -136,7 +137,7 @@ func NewRemovedEvent( } } -func RemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func RemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &MemberRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -174,7 +175,7 @@ func NewCascadeRemovedEvent( } } -func CascadeRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func CascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &MemberCascadeRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/metadata/metadata.go b/internal/repository/metadata/metadata.go index c19311da60..53392ea921 100644 --- a/internal/repository/metadata/metadata.go +++ b/internal/repository/metadata/metadata.go @@ -41,7 +41,7 @@ func NewSetEvent( } } -func SetEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func SetEventMapper(event *repository.Event) (eventstore.Event, error) { e := &SetEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -79,7 +79,7 @@ func NewRemovedEvent( } } -func RemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func RemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &RemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -113,7 +113,7 @@ func NewRemovedAllEvent( } } -func RemovedAllEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func RemovedAllEventMapper(event *repository.Event) (eventstore.Event, error) { return &RemovedAllEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/org/custom_text.go b/internal/repository/org/custom_text.go index 11a7ceb104..6d9ac57d83 100644 --- a/internal/repository/org/custom_text.go +++ b/internal/repository/org/custom_text.go @@ -39,7 +39,7 @@ func NewCustomTextSetEvent( } } -func CustomTextSetEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func CustomTextSetEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.CustomTextSetEventMapper(event) if err != nil { return nil, err @@ -69,7 +69,7 @@ func NewCustomTextRemovedEvent( } } -func CustomTextRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func CustomTextRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.CustomTextRemovedEventMapper(event) if err != nil { return nil, err @@ -97,7 +97,7 @@ func NewCustomTextTemplateRemovedEvent( } } -func CustomTextTemplateRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func CustomTextTemplateRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.CustomTextTemplateRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/org/domain.go b/internal/repository/org/domain.go index 5e694116d4..e26d025ac1 100644 --- a/internal/repository/org/domain.go +++ b/internal/repository/org/domain.go @@ -3,6 +3,7 @@ package org import ( "context" "encoding/json" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/crypto" @@ -60,7 +61,7 @@ func NewDomainAddedEvent(ctx context.Context, aggregate *eventstore.Aggregate, d } } -func DomainAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func DomainAddedEventMapper(event *repository.Event) (eventstore.Event, error) { orgDomainAdded := &DomainAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -106,7 +107,7 @@ func NewDomainVerificationAddedEvent( } } -func DomainVerificationAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func DomainVerificationAddedEventMapper(event *repository.Event) (eventstore.Event, error) { orgDomainVerificationAdded := &DomainVerificationAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -143,7 +144,7 @@ func NewDomainVerificationFailedEvent(ctx context.Context, aggregate *eventstore } } -func DomainVerificationFailedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func DomainVerificationFailedEventMapper(event *repository.Event) (eventstore.Event, error) { orgDomainVerificationFailed := &DomainVerificationFailedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -180,7 +181,7 @@ func NewDomainVerifiedEvent(ctx context.Context, aggregate *eventstore.Aggregate } } -func DomainVerifiedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func DomainVerifiedEventMapper(event *repository.Event) (eventstore.Event, error) { orgDomainVerified := &DomainVerifiedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -217,7 +218,7 @@ func NewDomainPrimarySetEvent(ctx context.Context, aggregate *eventstore.Aggrega } } -func DomainPrimarySetEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func DomainPrimarySetEventMapper(event *repository.Event) (eventstore.Event, error) { orgDomainPrimarySet := &DomainPrimarySetEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -259,7 +260,7 @@ func NewDomainRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregate, } } -func DomainRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func DomainRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { orgDomainRemoved := &DomainRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/org/features.go b/internal/repository/org/features.go index 609fedab4d..59ac570a7d 100644 --- a/internal/repository/org/features.go +++ b/internal/repository/org/features.go @@ -2,6 +2,7 @@ package org import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" "github.com/caos/zitadel/internal/repository/features" @@ -34,7 +35,7 @@ func NewFeaturesSetEvent( return &FeaturesSetEvent{FeaturesSetEvent: *changedEvent}, nil } -func FeaturesSetEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func FeaturesSetEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := features.FeaturesSetEventMapper(event) if err != nil { return nil, err @@ -61,7 +62,7 @@ func NewFeaturesRemovedEvent( } } -func FeaturesRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func FeaturesRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := features.FeaturesRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/org/flow.go b/internal/repository/org/flow.go index d13e4d4bfd..cc448b2214 100644 --- a/internal/repository/org/flow.go +++ b/internal/repository/org/flow.go @@ -38,7 +38,7 @@ func NewTriggerActionsSetEvent( } } -func TriggerActionsSetEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func TriggerActionsSetEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := flow.TriggerActionsSetEventMapper(event) if err != nil { return nil, err @@ -68,7 +68,7 @@ func NewTriggerActionsCascadeRemovedEvent( } } -func TriggerActionsCascadeRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func TriggerActionsCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := flow.TriggerActionsCascadeRemovedEventMapper(event) if err != nil { return nil, err @@ -96,7 +96,7 @@ func NewFlowClearedEvent( } } -func FlowClearedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func FlowClearedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := flow.FlowClearedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/org/idp_config.go b/internal/repository/org/idp_config.go index 9b17c5eb19..ca8374aac9 100644 --- a/internal/repository/org/idp_config.go +++ b/internal/repository/org/idp_config.go @@ -2,6 +2,7 @@ package org import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/domain" @@ -47,7 +48,7 @@ func NewIDPConfigAddedEvent( } } -func IDPConfigAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.IDPConfigAddedEventMapper(event) if err != nil { return nil, err @@ -81,7 +82,7 @@ func NewIDPConfigChangedEvent( return &IDPConfigChangedEvent{IDPConfigChangedEvent: *changeEvent}, nil } -func IDPConfigChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.IDPConfigChangedEventMapper(event) if err != nil { return nil, err @@ -114,7 +115,7 @@ func NewIDPConfigRemovedEvent( } } -func IDPConfigRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPConfigRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.IDPConfigRemovedEventMapper(event) if err != nil { return nil, err @@ -145,7 +146,7 @@ func NewIDPConfigDeactivatedEvent( } } -func IDPConfigDeactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPConfigDeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.IDPConfigDeactivatedEventMapper(event) if err != nil { return nil, err @@ -176,7 +177,7 @@ func NewIDPConfigReactivatedEvent( } } -func IDPConfigReactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPConfigReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.IDPConfigReactivatedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/org/idp_jwt_config.go b/internal/repository/org/idp_jwt_config.go index 74b4714d84..b97c99ba3b 100644 --- a/internal/repository/org/idp_jwt_config.go +++ b/internal/repository/org/idp_jwt_config.go @@ -44,7 +44,7 @@ func NewIDPJWTConfigAddedEvent( } } -func IDPJWTConfigAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPJWTConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.JWTConfigAddedEventMapper(event) if err != nil { return nil, err @@ -77,7 +77,7 @@ func NewIDPJWTConfigChangedEvent( return &IDPJWTConfigChangedEvent{JWTConfigChangedEvent: *changeEvent}, nil } -func IDPJWTConfigChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPJWTConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.JWTConfigChangedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/org/idp_oidc_config.go b/internal/repository/org/idp_oidc_config.go index f5494bd078..56ca0e12bb 100644 --- a/internal/repository/org/idp_oidc_config.go +++ b/internal/repository/org/idp_oidc_config.go @@ -2,6 +2,7 @@ package org import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/crypto" @@ -53,7 +54,7 @@ func NewIDPOIDCConfigAddedEvent( } } -func IDPOIDCConfigAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPOIDCConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.OIDCConfigAddedEventMapper(event) if err != nil { return nil, err @@ -86,7 +87,7 @@ func NewIDPOIDCConfigChangedEvent( return &IDPOIDCConfigChangedEvent{OIDCConfigChangedEvent: *changeEvent}, nil } -func IDPOIDCConfigChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IDPOIDCConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := idpconfig.OIDCConfigChangedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/org/member.go b/internal/repository/org/member.go index 2ca03747bd..c2803a8d69 100644 --- a/internal/repository/org/member.go +++ b/internal/repository/org/member.go @@ -2,6 +2,7 @@ package org import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -38,7 +39,7 @@ func NewMemberAddedEvent( } } -func MemberAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MemberAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := member.MemberAddedEventMapper(event) if err != nil { return nil, err @@ -71,7 +72,7 @@ func NewMemberChangedEvent( } } -func MemberChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MemberChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := member.ChangedEventMapper(event) if err != nil { return nil, err @@ -101,7 +102,7 @@ func NewMemberRemovedEvent( } } -func MemberRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MemberRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := member.RemovedEventMapper(event) if err != nil { return nil, err @@ -131,7 +132,7 @@ func NewMemberCascadeRemovedEvent( } } -func MemberCascadeRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MemberCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := member.CascadeRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/org/org.go b/internal/repository/org/org.go index 5b61ce3f40..d713cc239b 100644 --- a/internal/repository/org/org.go +++ b/internal/repository/org/org.go @@ -56,7 +56,7 @@ func NewOrgAddedEvent(ctx context.Context, aggregate *eventstore.Aggregate, name } } -func OrgAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OrgAddedEventMapper(event *repository.Event) (eventstore.Event, error) { orgAdded := &OrgAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -98,7 +98,7 @@ func NewOrgChangedEvent(ctx context.Context, aggregate *eventstore.Aggregate, ol } } -func OrgChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OrgChangedEventMapper(event *repository.Event) (eventstore.Event, error) { orgChanged := &OrgChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -132,7 +132,7 @@ func NewOrgDeactivatedEvent(ctx context.Context, aggregate *eventstore.Aggregate } } -func OrgDeactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OrgDeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { return &OrgDeactivatedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -160,7 +160,7 @@ func NewOrgReactivatedEvent(ctx context.Context, aggregate *eventstore.Aggregate } } -func OrgReactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OrgReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { return &OrgReactivatedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -190,7 +190,7 @@ func NewOrgRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregate, na } } -func OrgRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OrgRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { orgChanged := &OrgRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/org/policy_label.go b/internal/repository/org/policy_label.go index f250b3f5da..5517a7222b 100644 --- a/internal/repository/org/policy_label.go +++ b/internal/repository/org/policy_label.go @@ -68,7 +68,7 @@ func NewLabelPolicyAddedEvent( } } -func LabelPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyAddedEventMapper(event) if err != nil { return nil, err @@ -99,7 +99,7 @@ func NewLabelPolicyChangedEvent( return &LabelPolicyChangedEvent{LabelPolicyChangedEvent: *changedEvent}, nil } -func LabelPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyChangedEventMapper(event) if err != nil { return nil, err @@ -126,7 +126,7 @@ func NewLabelPolicyRemovedEvent( } } -func LabelPolicyRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyRemovedEventMapper(event) if err != nil { return nil, err @@ -153,7 +153,7 @@ func NewLabelPolicyActivatedEvent( } } -func LabelPolicyActivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyActivatedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyActivatedEventMapper(event) if err != nil { return nil, err @@ -182,7 +182,7 @@ func NewLabelPolicyLogoAddedEvent( } } -func LabelPolicyLogoAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyLogoAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyLogoAddedEventMapper(event) if err != nil { return nil, err @@ -211,7 +211,7 @@ func NewLabelPolicyLogoRemovedEvent( } } -func LabelPolicyLogoRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyLogoRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyLogoRemovedEventMapper(event) if err != nil { return nil, err @@ -240,7 +240,7 @@ func NewLabelPolicyIconAddedEvent( } } -func LabelPolicyIconAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyIconAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyIconAddedEventMapper(event) if err != nil { return nil, err @@ -269,7 +269,7 @@ func NewLabelPolicyIconRemovedEvent( } } -func LabelPolicyIconRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyIconRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyIconRemovedEventMapper(event) if err != nil { return nil, err @@ -298,7 +298,7 @@ func NewLabelPolicyLogoDarkAddedEvent( } } -func LabelPolicyLogoDarkAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyLogoDarkAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyLogoDarkAddedEventMapper(event) if err != nil { return nil, err @@ -327,7 +327,7 @@ func NewLabelPolicyLogoDarkRemovedEvent( } } -func LabelPolicyLogoDarkRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyLogoDarkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyLogoDarkRemovedEventMapper(event) if err != nil { return nil, err @@ -356,7 +356,7 @@ func NewLabelPolicyIconDarkAddedEvent( } } -func LabelPolicyIconDarkAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyIconDarkAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyIconDarkAddedEventMapper(event) if err != nil { return nil, err @@ -385,7 +385,7 @@ func NewLabelPolicyIconDarkRemovedEvent( } } -func LabelPolicyIconDarkRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyIconDarkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyIconDarkRemovedEventMapper(event) if err != nil { return nil, err @@ -414,7 +414,7 @@ func NewLabelPolicyFontAddedEvent( } } -func LabelPolicyFontAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyFontAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyFontAddedEventMapper(event) if err != nil { return nil, err @@ -443,7 +443,7 @@ func NewLabelPolicyFontRemovedEvent( } } -func LabelPolicyFontRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyFontRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyFontRemovedEventMapper(event) if err != nil { return nil, err @@ -478,7 +478,7 @@ func NewLabelPolicyAssetsRemovedEvent( } } -func LabelPolicyAssetsRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyAssetsRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LabelPolicyAssetsRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/org/policy_login.go b/internal/repository/org/policy_login.go index f278be6a1c..9b6fa0f9ac 100644 --- a/internal/repository/org/policy_login.go +++ b/internal/repository/org/policy_login.go @@ -2,6 +2,7 @@ package org import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/domain" @@ -44,7 +45,7 @@ func NewLoginPolicyAddedEvent( } } -func LoginPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LoginPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LoginPolicyAddedEventMapper(event) if err != nil { return nil, err @@ -75,7 +76,7 @@ func NewLoginPolicyChangedEvent( return &LoginPolicyChangedEvent{LoginPolicyChangedEvent: *changedEvent}, nil } -func LoginPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LoginPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LoginPolicyChangedEventMapper(event) if err != nil { return nil, err @@ -102,7 +103,7 @@ func NewLoginPolicyRemovedEvent( } } -func LoginPolicyRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LoginPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LoginPolicyRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/org/policy_login_factors.go b/internal/repository/org/policy_login_factors.go index 49e12b7911..b76588aee9 100644 --- a/internal/repository/org/policy_login_factors.go +++ b/internal/repository/org/policy_login_factors.go @@ -2,6 +2,7 @@ package org import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/domain" @@ -36,7 +37,7 @@ func NewLoginPolicySecondFactorAddedEvent( } } -func SecondFactorAddedEventEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func SecondFactorAddedEventEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.SecondFactorAddedEventMapper(event) if err != nil { return nil, err @@ -67,7 +68,7 @@ func NewLoginPolicySecondFactorRemovedEvent( } } -func SecondFactorRemovedEventEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func SecondFactorRemovedEventEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.SecondFactorRemovedEventMapper(event) if err != nil { return nil, err @@ -97,7 +98,7 @@ func NewLoginPolicyMultiFactorAddedEvent( } } -func MultiFactorAddedEventEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MultiFactorAddedEventEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.MultiFactorAddedEventMapper(event) if err != nil { return nil, err @@ -128,7 +129,7 @@ func NewLoginPolicyMultiFactorRemovedEvent( } } -func MultiFactorRemovedEventEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MultiFactorRemovedEventEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.MultiFactorRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/org/policy_login_identity_provider.go b/internal/repository/org/policy_login_identity_provider.go index c8b4266de4..5f1b1b466b 100644 --- a/internal/repository/org/policy_login_identity_provider.go +++ b/internal/repository/org/policy_login_identity_provider.go @@ -2,6 +2,7 @@ package org import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/domain" @@ -37,7 +38,7 @@ func NewIdentityProviderAddedEvent( } } -func IdentityProviderAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IdentityProviderAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.IdentityProviderAddedEventMapper(event) if err != nil { return nil, err @@ -67,7 +68,7 @@ func NewIdentityProviderRemovedEvent( } } -func IdentityProviderRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IdentityProviderRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.IdentityProviderRemovedEventMapper(event) if err != nil { return nil, err @@ -94,7 +95,7 @@ func NewIdentityProviderCascadeRemovedEvent( } } -func IdentityProviderCascadeRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IdentityProviderCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.IdentityProviderCascadeRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/org/policy_mail_template.go b/internal/repository/org/policy_mail_template.go index 513fed3f80..c41f287d6b 100644 --- a/internal/repository/org/policy_mail_template.go +++ b/internal/repository/org/policy_mail_template.go @@ -2,6 +2,7 @@ package org import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -30,7 +31,7 @@ func NewMailTemplateAddedEvent( } } -func MailTemplateAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MailTemplateAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.MailTemplateAddedEventMapper(event) if err != nil { return nil, err @@ -58,7 +59,7 @@ func NewMailTemplateChangedEvent( return &MailTemplateChangedEvent{MailTemplateChangedEvent: *changedEvent}, nil } -func MailTemplateChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MailTemplateChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.MailTemplateChangedEventMapper(event) if err != nil { return nil, err @@ -82,7 +83,7 @@ func NewMailTemplateRemovedEvent( } } -func MailTemplateRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MailTemplateRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.MailTemplateRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/org/policy_mail_text.go b/internal/repository/org/policy_mail_text.go index 5a6ddba69c..acc45f0c82 100644 --- a/internal/repository/org/policy_mail_text.go +++ b/internal/repository/org/policy_mail_text.go @@ -2,6 +2,7 @@ package org import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -44,7 +45,7 @@ func NewMailTextAddedEvent( } } -func MailTextAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MailTextAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.MailTextAddedEventMapper(event) if err != nil { return nil, err @@ -76,7 +77,7 @@ func NewMailTextChangedEvent( return &MailTextChangedEvent{MailTextChangedEvent: *changedEvent}, nil } -func MailTextChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MailTextChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.MailTextChangedEventMapper(event) if err != nil { return nil, err @@ -104,7 +105,7 @@ func NewMailTextRemovedEvent( } } -func MailTextRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MailTextRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.MailTextRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/org/policy_org_iam.go b/internal/repository/org/policy_org_iam.go index c4df42c830..1aeccb5abd 100644 --- a/internal/repository/org/policy_org_iam.go +++ b/internal/repository/org/policy_org_iam.go @@ -2,6 +2,7 @@ package org import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -37,7 +38,7 @@ func NewOrgIAMPolicyAddedEvent( } } -func OrgIAMPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OrgIAMPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.OrgIAMPolicyAddedEventMapper(event) if err != nil { return nil, err @@ -68,7 +69,7 @@ func NewOrgIAMPolicyChangedEvent( return &OrgIAMPolicyChangedEvent{OrgIAMPolicyChangedEvent: *changedEvent}, nil } -func OrgIAMPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OrgIAMPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.OrgIAMPolicyChangedEventMapper(event) if err != nil { return nil, err @@ -95,7 +96,7 @@ func NewOrgIAMPolicyRemovedEvent( } } -func OrgIAMPolicyRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OrgIAMPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.OrgIAMPolicyRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/org/policy_password_age.go b/internal/repository/org/policy_password_age.go index a52e2b9207..98d648dae2 100644 --- a/internal/repository/org/policy_password_age.go +++ b/internal/repository/org/policy_password_age.go @@ -2,6 +2,7 @@ package org import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -35,7 +36,7 @@ func NewPasswordAgePolicyAddedEvent( } } -func PasswordAgePolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PasswordAgePolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.PasswordAgePolicyAddedEventMapper(event) if err != nil { return nil, err @@ -66,7 +67,7 @@ func NewPasswordAgePolicyChangedEvent( return &PasswordAgePolicyChangedEvent{PasswordAgePolicyChangedEvent: *changedEvent}, nil } -func PasswordAgePolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PasswordAgePolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.PasswordAgePolicyChangedEventMapper(event) if err != nil { return nil, err @@ -93,7 +94,7 @@ func NewPasswordAgePolicyRemovedEvent( } } -func PasswordAgePolicyRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PasswordAgePolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.PasswordAgePolicyRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/org/policy_password_complexity.go b/internal/repository/org/policy_password_complexity.go index 3cf26fedee..6a42e7a824 100644 --- a/internal/repository/org/policy_password_complexity.go +++ b/internal/repository/org/policy_password_complexity.go @@ -2,6 +2,7 @@ package org import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -41,7 +42,7 @@ func NewPasswordComplexityPolicyAddedEvent( } } -func PasswordComplexityPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PasswordComplexityPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.PasswordComplexityPolicyAddedEventMapper(event) if err != nil { return nil, err @@ -72,7 +73,7 @@ func NewPasswordComplexityPolicyChangedEvent( return &PasswordComplexityPolicyChangedEvent{PasswordComplexityPolicyChangedEvent: *changedEvent}, nil } -func PasswordComplexityPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PasswordComplexityPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.PasswordComplexityPolicyChangedEventMapper(event) if err != nil { return nil, err @@ -99,7 +100,7 @@ func NewPasswordComplexityPolicyRemovedEvent( } } -func PasswordComplexityPolicyRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PasswordComplexityPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.PasswordComplexityPolicyRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/org/policy_password_lockout.go b/internal/repository/org/policy_password_lockout.go index 76bc1329a6..09c906ac49 100644 --- a/internal/repository/org/policy_password_lockout.go +++ b/internal/repository/org/policy_password_lockout.go @@ -2,6 +2,7 @@ package org import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -35,7 +36,7 @@ func NewLockoutPolicyAddedEvent( } } -func LockoutPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LockoutPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LockoutPolicyAddedEventMapper(event) if err != nil { return nil, err @@ -66,7 +67,7 @@ func NewLockoutPolicyChangedEvent( return &LockoutPolicyChangedEvent{LockoutPolicyChangedEvent: *changedEvent}, nil } -func LockoutPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LockoutPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LockoutPolicyChangedEventMapper(event) if err != nil { return nil, err @@ -93,7 +94,7 @@ func NewLockoutPolicyRemovedEvent( } } -func LockoutPolicyRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LockoutPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.LockoutPolicyRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/org/policy_privacy.go b/internal/repository/org/policy_privacy.go index 133b44c07e..dfe1217a80 100644 --- a/internal/repository/org/policy_privacy.go +++ b/internal/repository/org/policy_privacy.go @@ -2,6 +2,7 @@ package org import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -35,7 +36,7 @@ func NewPrivacyPolicyAddedEvent( } } -func PrivacyPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PrivacyPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.PrivacyPolicyAddedEventMapper(event) if err != nil { return nil, err @@ -66,7 +67,7 @@ func NewPrivacyPolicyChangedEvent( return &PrivacyPolicyChangedEvent{PrivacyPolicyChangedEvent: *changedEvent}, nil } -func PrivacyPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PrivacyPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.PrivacyPolicyChangedEventMapper(event) if err != nil { return nil, err @@ -93,7 +94,7 @@ func NewPrivacyPolicyRemovedEvent( } } -func PrivacyPolicyRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PrivacyPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := policy.PrivacyPolicyRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/policy/custom_text.go b/internal/repository/policy/custom_text.go index 7ad6a5dc9c..7bfa19f8a9 100644 --- a/internal/repository/policy/custom_text.go +++ b/internal/repository/policy/custom_text.go @@ -50,7 +50,7 @@ func NewCustomTextSetEvent( } } -func CustomTextSetEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func CustomTextSetEventMapper(event *repository.Event) (eventstore.Event, error) { e := &CustomTextSetEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -88,7 +88,7 @@ func NewCustomTextRemovedEvent(base *eventstore.BaseEvent, template, key string, } } -func CustomTextRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func CustomTextRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &CustomTextRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -124,7 +124,7 @@ func NewCustomTextTemplateRemovedEvent(base *eventstore.BaseEvent, template stri } } -func CustomTextTemplateRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func CustomTextTemplateRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &CustomTextTemplateRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/policy/label.go b/internal/repository/policy/label.go index 1780686b05..e3a1b084a1 100644 --- a/internal/repository/policy/label.go +++ b/internal/repository/policy/label.go @@ -87,7 +87,7 @@ func NewLabelPolicyAddedEvent( } } -func LabelPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &LabelPolicyAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -208,7 +208,7 @@ func ChangeDisableWatermark(disableWatermark bool) func(*LabelPolicyChangedEvent } } -func LabelPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &LabelPolicyChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -239,7 +239,7 @@ func NewLabelPolicyActivatedEvent(base *eventstore.BaseEvent) *LabelPolicyActiva } } -func LabelPolicyActivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyActivatedEventMapper(event *repository.Event) (eventstore.Event, error) { return &LabelPolicyActivatedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -263,7 +263,7 @@ func NewLabelPolicyRemovedEvent(base *eventstore.BaseEvent) *LabelPolicyRemovedE } } -func LabelPolicyRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &LabelPolicyRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -287,7 +287,7 @@ func NewLabelPolicyLogoAddedEvent(base *eventstore.BaseEvent, storageKey string) } } -func LabelPolicyLogoAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyLogoAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := asset.AddedEventMapper(event) if err != nil { return nil, err @@ -314,7 +314,7 @@ func NewLabelPolicyLogoRemovedEvent(base *eventstore.BaseEvent, storageKey strin } } -func LabelPolicyLogoRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyLogoRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := asset.RemovedEventMapper(event) if err != nil { return nil, err @@ -341,7 +341,7 @@ func NewLabelPolicyIconAddedEvent(base *eventstore.BaseEvent, storageKey string) } } -func LabelPolicyIconAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyIconAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := asset.AddedEventMapper(event) if err != nil { return nil, err @@ -368,7 +368,7 @@ func NewLabelPolicyIconRemovedEvent(base *eventstore.BaseEvent, storageKey strin } } -func LabelPolicyIconRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyIconRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := asset.RemovedEventMapper(event) if err != nil { return nil, err @@ -395,7 +395,7 @@ func NewLabelPolicyLogoDarkAddedEvent(base *eventstore.BaseEvent, storageKey str } } -func LabelPolicyLogoDarkAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyLogoDarkAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := asset.AddedEventMapper(event) if err != nil { return nil, err @@ -422,7 +422,7 @@ func NewLabelPolicyLogoDarkRemovedEvent(base *eventstore.BaseEvent, storageKey s } } -func LabelPolicyLogoDarkRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyLogoDarkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := asset.RemovedEventMapper(event) if err != nil { return nil, err @@ -449,7 +449,7 @@ func NewLabelPolicyIconDarkAddedEvent(base *eventstore.BaseEvent, storageKey str } } -func LabelPolicyIconDarkAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyIconDarkAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := asset.AddedEventMapper(event) if err != nil { return nil, err @@ -476,7 +476,7 @@ func NewLabelPolicyIconDarkRemovedEvent(base *eventstore.BaseEvent, storageKey s } } -func LabelPolicyIconDarkRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyIconDarkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := asset.RemovedEventMapper(event) if err != nil { return nil, err @@ -503,7 +503,7 @@ func NewLabelPolicyFontAddedEvent(base *eventstore.BaseEvent, storageKey string) } } -func LabelPolicyFontAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyFontAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := asset.AddedEventMapper(event) if err != nil { return nil, err @@ -530,7 +530,7 @@ func NewLabelPolicyFontRemovedEvent(base *eventstore.BaseEvent, storageKey strin } } -func LabelPolicyFontRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyFontRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := asset.RemovedEventMapper(event) if err != nil { return nil, err @@ -557,7 +557,7 @@ func NewLabelPolicyAssetsRemovedEvent(base *eventstore.BaseEvent) *LabelPolicyAs } } -func LabelPolicyAssetsRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LabelPolicyAssetsRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &LabelPolicyAssetsRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/policy/login.go b/internal/repository/policy/login.go index 016a256906..d089540b18 100644 --- a/internal/repository/policy/login.go +++ b/internal/repository/policy/login.go @@ -55,7 +55,7 @@ func NewLoginPolicyAddedEvent( } } -func LoginPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LoginPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &LoginPolicyAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -141,7 +141,7 @@ func ChangeHidePasswordReset(hidePasswordReset bool) func(*LoginPolicyChangedEve } } -func LoginPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LoginPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &LoginPolicyChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -172,7 +172,7 @@ func NewLoginPolicyRemovedEvent(base *eventstore.BaseEvent) *LoginPolicyRemovedE } } -func LoginPolicyRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LoginPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &LoginPolicyRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/policy/mail_template.go b/internal/repository/policy/mail_template.go index 05f68a3f6f..19ab9c9076 100644 --- a/internal/repository/policy/mail_template.go +++ b/internal/repository/policy/mail_template.go @@ -2,6 +2,7 @@ package policy import ( "encoding/json" + "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -39,7 +40,7 @@ func NewMailTemplateAddedEvent( } } -func MailTemplateAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MailTemplateAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &MailTemplateAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -90,7 +91,7 @@ func ChangeTemplate(template []byte) func(*MailTemplateChangedEvent) { } } -func MailTemplateChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MailTemplateChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &MailTemplateChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -121,7 +122,7 @@ func NewMailTemplateRemovedEvent(base *eventstore.BaseEvent) *MailTemplateRemove } } -func MailTemplateRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MailTemplateRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &MailTemplateRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/policy/mail_text.go b/internal/repository/policy/mail_text.go index d3e5a1af75..7c2b186c4c 100644 --- a/internal/repository/policy/mail_text.go +++ b/internal/repository/policy/mail_text.go @@ -3,6 +3,7 @@ package policy import ( "encoding/json" "fmt" + "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -74,7 +75,7 @@ func NewMailTextAddedEvent( } } -func MailTextAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MailTextAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &MailTextAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -166,7 +167,7 @@ func ChangeButtonText(buttonText string) func(*MailTextChangedEvent) { } } -func MailTextChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MailTextChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &MailTextChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -202,7 +203,7 @@ func NewMailTextRemovedEvent(base *eventstore.BaseEvent, mailTextType, language } } -func MailTextRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MailTextRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &MailTextRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/policy/policy_login_factors.go b/internal/repository/policy/policy_login_factors.go index 02f4f72959..61a5498098 100644 --- a/internal/repository/policy/policy_login_factors.go +++ b/internal/repository/policy/policy_login_factors.go @@ -2,6 +2,7 @@ package policy import ( "encoding/json" + "github.com/caos/zitadel/internal/domain" "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore" @@ -34,7 +35,7 @@ func NewSecondFactorAddedEvent( } } -func SecondFactorAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func SecondFactorAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &SecondFactorAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -70,7 +71,7 @@ func NewSecondFactorRemovedEvent( } } -func SecondFactorRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func SecondFactorRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &SecondFactorRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -107,7 +108,7 @@ func NewMultiFactorAddedEvent( } } -func MultiFactorAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MultiFactorAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &MultiFactorAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -143,7 +144,7 @@ func NewMultiFactorRemovedEvent( } } -func MultiFactorRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MultiFactorRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &MultiFactorRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/policy/policy_login_identity_provider.go b/internal/repository/policy/policy_login_identity_provider.go index 2d64719944..e741130878 100644 --- a/internal/repository/policy/policy_login_identity_provider.go +++ b/internal/repository/policy/policy_login_identity_provider.go @@ -2,6 +2,7 @@ package policy import ( "encoding/json" + "github.com/caos/zitadel/internal/domain" "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore" @@ -43,7 +44,7 @@ func NewIdentityProviderAddedEvent( } } -func IdentityProviderAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IdentityProviderAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &IdentityProviderAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -80,7 +81,7 @@ func NewIdentityProviderRemovedEvent( } } -func IdentityProviderRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IdentityProviderRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &IdentityProviderRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -117,7 +118,7 @@ func NewIdentityProviderCascadeRemovedEvent( } } -func IdentityProviderCascadeRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func IdentityProviderCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &IdentityProviderCascadeRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/policy/policy_org_iam.go b/internal/repository/policy/policy_org_iam.go index f85895495f..29fd9744a7 100644 --- a/internal/repository/policy/policy_org_iam.go +++ b/internal/repository/policy/policy_org_iam.go @@ -2,6 +2,7 @@ package policy import ( "encoding/json" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/errors" @@ -39,7 +40,7 @@ func NewOrgIAMPolicyAddedEvent( } } -func OrgIAMPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OrgIAMPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &OrgIAMPolicyAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -90,7 +91,7 @@ func ChangeUserLoginMustBeDomain(userLoginMustBeDomain bool) func(*OrgIAMPolicyC } } -func OrgIAMPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OrgIAMPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &OrgIAMPolicyChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -121,7 +122,7 @@ func NewOrgIAMPolicyRemovedEvent(base *eventstore.BaseEvent) *OrgIAMPolicyRemove } } -func OrgIAMPolicyRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OrgIAMPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &OrgIAMPolicyRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/policy/policy_password_age.go b/internal/repository/policy/policy_password_age.go index dde9004a3f..25d6925166 100644 --- a/internal/repository/policy/policy_password_age.go +++ b/internal/repository/policy/policy_password_age.go @@ -2,6 +2,7 @@ package policy import ( "encoding/json" + "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -41,7 +42,7 @@ func NewPasswordAgePolicyAddedEvent( } } -func PasswordAgePolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PasswordAgePolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &PasswordAgePolicyAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -99,7 +100,7 @@ func ChangeMaxAgeDays(maxAgeDays uint64) func(*PasswordAgePolicyChangedEvent) { } } -func PasswordAgePolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PasswordAgePolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &PasswordAgePolicyChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -130,7 +131,7 @@ func NewPasswordAgePolicyRemovedEvent(base *eventstore.BaseEvent) *PasswordAgePo } } -func PasswordAgePolicyRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PasswordAgePolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &PasswordAgePolicyRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/policy/policy_password_complexity.go b/internal/repository/policy/policy_password_complexity.go index b1d65dba86..5337be1844 100644 --- a/internal/repository/policy/policy_password_complexity.go +++ b/internal/repository/policy/policy_password_complexity.go @@ -2,6 +2,7 @@ package policy import ( "encoding/json" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/errors" @@ -50,7 +51,7 @@ func NewPasswordComplexityPolicyAddedEvent( } } -func PasswordComplexityPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PasswordComplexityPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &PasswordComplexityPolicyAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -129,7 +130,7 @@ func ChangeHasSymbol(hasSymbol bool) func(*PasswordComplexityPolicyChangedEvent) } } -func PasswordComplexityPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PasswordComplexityPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &PasswordComplexityPolicyChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -160,7 +161,7 @@ func NewPasswordComplexityPolicyRemovedEvent(base *eventstore.BaseEvent) *Passwo } } -func PasswordComplexityPolicyRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PasswordComplexityPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &PasswordComplexityPolicyRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/policy/policy_password_lockout.go b/internal/repository/policy/policy_password_lockout.go index 8ff5dfaea2..0fdee370d1 100644 --- a/internal/repository/policy/policy_password_lockout.go +++ b/internal/repository/policy/policy_password_lockout.go @@ -2,6 +2,7 @@ package policy import ( "encoding/json" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/errors" @@ -42,7 +43,7 @@ func NewLockoutPolicyAddedEvent( } } -func LockoutPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LockoutPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &LockoutPolicyAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -100,7 +101,7 @@ func ChangeShowLockOutFailures(showLockOutFailures bool) func(*LockoutPolicyChan } } -func LockoutPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LockoutPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &LockoutPolicyChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -131,7 +132,7 @@ func NewLockoutPolicyRemovedEvent(base *eventstore.BaseEvent) *LockoutPolicyRemo } } -func LockoutPolicyRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func LockoutPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &LockoutPolicyRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/policy/policy_privacy.go b/internal/repository/policy/policy_privacy.go index 32b3a65267..b76150c338 100644 --- a/internal/repository/policy/policy_privacy.go +++ b/internal/repository/policy/policy_privacy.go @@ -2,6 +2,7 @@ package policy import ( "encoding/json" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/errors" @@ -41,7 +42,7 @@ func NewPrivacyPolicyAddedEvent( } } -func PrivacyPolicyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PrivacyPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &PrivacyPolicyAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -98,7 +99,7 @@ func ChangePrivacyLink(privacyLink string) func(*PrivacyPolicyChangedEvent) { } } -func PrivacyPolicyChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PrivacyPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &PrivacyPolicyChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -129,7 +130,7 @@ func NewPrivacyPolicyRemovedEvent(base *eventstore.BaseEvent) *PrivacyPolicyRemo } } -func PrivacyPolicyRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func PrivacyPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &PrivacyPolicyRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/project/api_config.go b/internal/repository/project/api_config.go index bffed7e30a..9086edbfd3 100644 --- a/internal/repository/project/api_config.go +++ b/internal/repository/project/api_config.go @@ -3,6 +3,7 @@ package project import ( "context" "encoding/json" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/crypto" @@ -57,7 +58,7 @@ func NewAPIConfigAddedEvent( } } -func APIConfigAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func APIConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &APIConfigAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -118,7 +119,7 @@ func ChangeAPIAuthMethodType(authMethodType domain.APIAuthMethodType) func(event } } -func APIConfigChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func APIConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &APIConfigChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -163,7 +164,7 @@ func NewAPIConfigSecretChangedEvent( } } -func APIConfigSecretChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func APIConfigSecretChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &APIConfigSecretChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -205,7 +206,7 @@ func NewAPIConfigSecretCheckSucceededEvent( } } -func APIConfigSecretCheckSucceededEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func APIConfigSecretCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) { e := &APIConfigSecretCheckSucceededEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -247,7 +248,7 @@ func NewAPIConfigSecretCheckFailedEvent( } } -func APIConfigSecretCheckFailedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func APIConfigSecretCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &APIConfigSecretCheckFailedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/project/application.go b/internal/repository/project/application.go index 1111feb853..a9565dc01d 100644 --- a/internal/repository/project/application.go +++ b/internal/repository/project/application.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/errors" @@ -65,7 +66,7 @@ func NewApplicationAddedEvent( } } -func ApplicationAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func ApplicationAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &ApplicationAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -116,7 +117,7 @@ func NewApplicationChangedEvent( } } -func ApplicationChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func ApplicationChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &ApplicationChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -158,7 +159,7 @@ func NewApplicationDeactivatedEvent( } } -func ApplicationDeactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func ApplicationDeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &ApplicationDeactivatedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -200,7 +201,7 @@ func NewApplicationReactivatedEvent( } } -func ApplicationReactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func ApplicationReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &ApplicationReactivatedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -245,7 +246,7 @@ func NewApplicationRemovedEvent( } } -func ApplicationRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func ApplicationRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &ApplicationRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/project/grant.go b/internal/repository/project/grant.go index 458b3cff6b..36b4d7ac18 100644 --- a/internal/repository/project/grant.go +++ b/internal/repository/project/grant.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/errors" @@ -69,7 +70,7 @@ func NewGrantAddedEvent( } } -func GrantAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func GrantAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &GrantAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -114,7 +115,7 @@ func NewGrantChangedEvent( } } -func GrantChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func GrantChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &GrantChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -159,7 +160,7 @@ func NewGrantCascadeChangedEvent( } } -func GrantCascadeChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func GrantCascadeChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &GrantCascadeChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -201,7 +202,7 @@ func NewGrantDeactivateEvent( } } -func GrantDeactivateEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func GrantDeactivateEventMapper(event *repository.Event) (eventstore.Event, error) { e := &GrantDeactivateEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -243,7 +244,7 @@ func NewGrantReactivatedEvent( } } -func GrantReactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func GrantReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &GrantReactivatedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -288,7 +289,7 @@ func NewGrantRemovedEvent( } } -func GrantRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func GrantRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &GrantRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/project/grant_member.go b/internal/repository/project/grant_member.go index b13461415e..7cd4fbbc40 100644 --- a/internal/repository/project/grant_member.go +++ b/internal/repository/project/grant_member.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/errors" @@ -68,7 +69,7 @@ func NewProjectGrantMemberAddedEvent( } } -func GrantMemberAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func GrantMemberAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &GrantMemberAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -116,7 +117,7 @@ func NewProjectGrantMemberChangedEvent( } } -func GrantMemberChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func GrantMemberChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &GrantMemberChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -161,7 +162,7 @@ func NewProjectGrantMemberRemovedEvent( } } -func GrantMemberRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func GrantMemberRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &GrantMemberRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -206,7 +207,7 @@ func NewProjectGrantMemberCascadeRemovedEvent( } } -func GrantMemberCascadeRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func GrantMemberCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &GrantMemberCascadeRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/project/key.go b/internal/repository/project/key.go index 3c2fa6a054..fcb64c94b3 100644 --- a/internal/repository/project/key.go +++ b/internal/repository/project/key.go @@ -62,7 +62,7 @@ func NewApplicationKeyAddedEvent( } } -func ApplicationKeyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func ApplicationKeyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &ApplicationKeyAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -104,7 +104,7 @@ func NewApplicationKeyRemovedEvent( } } -func ApplicationKeyRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func ApplicationKeyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { applicationKeyRemoved := &ApplicationKeyRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/project/member.go b/internal/repository/project/member.go index 8e9849e8cc..93ff49fb51 100644 --- a/internal/repository/project/member.go +++ b/internal/repository/project/member.go @@ -2,6 +2,7 @@ package project import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -38,7 +39,7 @@ func NewProjectMemberAddedEvent( } } -func MemberAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MemberAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := member.MemberAddedEventMapper(event) if err != nil { return nil, err @@ -71,7 +72,7 @@ func NewProjectMemberChangedEvent( } } -func MemberChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MemberChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := member.ChangedEventMapper(event) if err != nil { return nil, err @@ -102,7 +103,7 @@ func NewProjectMemberRemovedEvent( } } -func MemberRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MemberRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := member.RemovedEventMapper(event) if err != nil { return nil, err @@ -133,7 +134,7 @@ func NewProjectMemberCascadeRemovedEvent( } } -func MemberCascadeRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MemberCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := member.CascadeRemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/project/oidc_config.go b/internal/repository/project/oidc_config.go index acf67ddcbe..1599a4fc1a 100644 --- a/internal/repository/project/oidc_config.go +++ b/internal/repository/project/oidc_config.go @@ -97,7 +97,7 @@ func NewOIDCConfigAddedEvent( } } -func OIDCConfigAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OIDCConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &OIDCConfigAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -248,7 +248,7 @@ func ChangeAdditionalOrigins(additionalOrigins []string) func(event *OIDCConfigC } } -func OIDCConfigChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OIDCConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &OIDCConfigChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -293,7 +293,7 @@ func NewOIDCConfigSecretChangedEvent( } } -func OIDCConfigSecretChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OIDCConfigSecretChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &OIDCConfigSecretChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -335,7 +335,7 @@ func NewOIDCConfigSecretCheckSucceededEvent( } } -func OIDCConfigSecretCheckSucceededEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OIDCConfigSecretCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) { e := &OIDCConfigSecretCheckSucceededEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -377,7 +377,7 @@ func NewOIDCConfigSecretCheckFailedEvent( } } -func OIDCConfigSecretCheckFailedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func OIDCConfigSecretCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &OIDCConfigSecretCheckFailedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/project/project.go b/internal/repository/project/project.go index ae7de2f28f..90e173f4ac 100644 --- a/internal/repository/project/project.go +++ b/internal/repository/project/project.go @@ -75,7 +75,7 @@ func NewProjectAddedEvent( } } -func ProjectAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func ProjectAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &ProjectAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -168,7 +168,7 @@ func ChangePrivateLabelingSetting(ChangePrivateLabelingSetting domain.PrivateLab } } -func ProjectChangeEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func ProjectChangeEventMapper(event *repository.Event) (eventstore.Event, error) { e := &ProjectChangeEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -203,7 +203,7 @@ func NewProjectDeactivatedEvent(ctx context.Context, aggregate *eventstore.Aggre } } -func ProjectDeactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func ProjectDeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { return &ProjectDeactivatedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -231,7 +231,7 @@ func NewProjectReactivatedEvent(ctx context.Context, aggregate *eventstore.Aggre } } -func ProjectReactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func ProjectReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { return &ProjectReactivatedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -266,7 +266,7 @@ func NewProjectRemovedEvent( } } -func ProjectRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func ProjectRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &ProjectRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/project/role.go b/internal/repository/project/role.go index 0efd08c3c8..3ec97dd4a4 100644 --- a/internal/repository/project/role.go +++ b/internal/repository/project/role.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/errors" @@ -66,7 +67,7 @@ func NewRoleAddedEvent( } } -func RoleAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func RoleAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &RoleAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -137,7 +138,7 @@ func ChangeGroup(group string) func(event *RoleChangedEvent) { e.Group = &group } } -func RoleChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func RoleChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &RoleChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -178,7 +179,7 @@ func NewRoleRemovedEvent( } } -func RoleRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func RoleRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &RoleRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/user/human.go b/internal/repository/user/human.go index 67ca9a1070..4fc426ee86 100644 --- a/internal/repository/user/human.go +++ b/internal/repository/user/human.go @@ -3,9 +3,10 @@ package user import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/eventstore" "time" + "github.com/caos/zitadel/internal/eventstore" + "github.com/caos/zitadel/internal/crypto" "github.com/caos/zitadel/internal/domain" "github.com/caos/zitadel/internal/errors" @@ -119,7 +120,7 @@ func NewHumanAddedEvent( } } -func HumanAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanAddedEventMapper(event *repository.Event) (eventstore.Event, error) { humanAdded := &HumanAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -226,7 +227,7 @@ func NewHumanRegisteredEvent( } } -func HumanRegisteredEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanRegisteredEventMapper(event *repository.Event) (eventstore.Event, error) { humanRegistered := &HumanRegisteredEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -269,7 +270,7 @@ func NewHumanInitialCodeAddedEvent( } } -func HumanInitialCodeAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanInitialCodeAddedEventMapper(event *repository.Event) (eventstore.Event, error) { humanRegistered := &HumanInitialCodeAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -303,7 +304,7 @@ func NewHumanInitialCodeSentEvent(ctx context.Context, aggregate *eventstore.Agg } } -func HumanInitialCodeSentEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanInitialCodeSentEventMapper(event *repository.Event) (eventstore.Event, error) { return &HumanInitialCodeSentEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -331,7 +332,7 @@ func NewHumanInitializedCheckSucceededEvent(ctx context.Context, aggregate *even } } -func HumanInitializedCheckSucceededEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanInitializedCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) { return &HumanInitializedCheckSucceededEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -359,7 +360,7 @@ func NewHumanInitializedCheckFailedEvent(ctx context.Context, aggregate *eventst } } -func HumanInitializedCheckFailedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanInitializedCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) { return &HumanInitializedCheckFailedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -394,7 +395,7 @@ func NewHumanSignedOutEvent( } } -func HumanSignedOutEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanSignedOutEventMapper(event *repository.Event) (eventstore.Event, error) { return &HumanSignedOutEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/user/human_address.go b/internal/repository/user/human_address.go index c902f80948..32f75dd154 100644 --- a/internal/repository/user/human_address.go +++ b/internal/repository/user/human_address.go @@ -3,6 +3,7 @@ package user import ( "context" "encoding/json" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/errors" @@ -85,7 +86,7 @@ func ChangeStreetAddress(street string) func(event *HumanAddressChangedEvent) { } } -func HumanAddressChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanAddressChangedEventMapper(event *repository.Event) (eventstore.Event, error) { addressChanged := &HumanAddressChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/user/human_avatar.go b/internal/repository/user/human_avatar.go index bc50ba03e0..3caf651bc6 100644 --- a/internal/repository/user/human_avatar.go +++ b/internal/repository/user/human_avatar.go @@ -29,7 +29,7 @@ func NewHumanAvatarAddedEvent(ctx context.Context, aggregate *eventstore.Aggrega } } -func HumanAvatarAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanAvatarAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := asset.AddedEventMapper(event) if err != nil { return nil, err @@ -53,7 +53,7 @@ func NewHumanAvatarRemovedEvent(ctx context.Context, aggregate *eventstore.Aggre } } -func HumanAvatarRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanAvatarRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := asset.RemovedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/user/human_email.go b/internal/repository/user/human_email.go index 07e4955394..22aaf6d5e9 100644 --- a/internal/repository/user/human_email.go +++ b/internal/repository/user/human_email.go @@ -3,9 +3,10 @@ package user import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/eventstore" "time" + "github.com/caos/zitadel/internal/eventstore" + "github.com/caos/zitadel/internal/crypto" "github.com/caos/zitadel/internal/errors" "github.com/caos/zitadel/internal/eventstore/repository" @@ -45,7 +46,7 @@ func NewHumanEmailChangedEvent(ctx context.Context, aggregate *eventstore.Aggreg } } -func HumanEmailChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanEmailChangedEventMapper(event *repository.Event) (eventstore.Event, error) { emailChangedEvent := &HumanEmailChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -81,7 +82,7 @@ func NewHumanEmailVerifiedEvent(ctx context.Context, aggregate *eventstore.Aggre } } -func HumanEmailVerifiedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanEmailVerifiedEventMapper(event *repository.Event) (eventstore.Event, error) { emailVerified := &HumanEmailVerifiedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), IsEmailVerified: true, @@ -111,7 +112,7 @@ func NewHumanEmailVerificationFailedEvent(ctx context.Context, aggregate *events } } -func HumanEmailVerificationFailedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanEmailVerificationFailedEventMapper(event *repository.Event) (eventstore.Event, error) { return &HumanEmailVerificationFailedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -148,7 +149,7 @@ func NewHumanEmailCodeAddedEvent( } } -func HumanEmailCodeAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanEmailCodeAddedEventMapper(event *repository.Event) (eventstore.Event, error) { codeAdded := &HumanEmailCodeAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -182,7 +183,7 @@ func NewHumanEmailCodeSentEvent(ctx context.Context, aggregate *eventstore.Aggre } } -func HumanEmailCodeSentEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanEmailCodeSentEventMapper(event *repository.Event) (eventstore.Event, error) { return &HumanEmailCodeSentEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/user/human_external_idp.go b/internal/repository/user/human_external_idp.go index 4f280f7f38..884caf0bf0 100644 --- a/internal/repository/user/human_external_idp.go +++ b/internal/repository/user/human_external_idp.go @@ -70,7 +70,7 @@ func NewUserIDPLinkAddedEvent( } } -func UserIDPLinkAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserIDPLinkAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &UserIDPLinkAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -115,7 +115,7 @@ func NewUserIDPLinkRemovedEvent( } } -func UserIDPLinkRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserIDPLinkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &UserIDPLinkRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -160,7 +160,7 @@ func NewUserIDPLinkCascadeRemovedEvent( } } -func UserIDPLinkCascadeRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserIDPLinkCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &UserIDPLinkCascadeRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -200,7 +200,7 @@ func NewUserIDPCheckSucceededEvent( } } -func UserIDPCheckSucceededEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserIDPCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) { e := &UserIDPCheckSucceededEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/user/human_mfa_events.go b/internal/repository/user/human_mfa_events.go index 9728efc9db..bb902c2664 100644 --- a/internal/repository/user/human_mfa_events.go +++ b/internal/repository/user/human_mfa_events.go @@ -2,6 +2,7 @@ package user import ( "context" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/eventstore/repository" @@ -34,7 +35,7 @@ func NewHumanMFAInitSkippedEvent(ctx context.Context, aggregate *eventstore.Aggr } } -func HumanMFAInitSkippedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanMFAInitSkippedEventMapper(event *repository.Event) (eventstore.Event, error) { return &HumanMFAInitSkippedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/user/human_mfa_otp.go b/internal/repository/user/human_mfa_otp.go index 43d568b807..45f7187675 100644 --- a/internal/repository/user/human_mfa_otp.go +++ b/internal/repository/user/human_mfa_otp.go @@ -49,7 +49,7 @@ func NewHumanOTPAddedEvent( } } -func HumanOTPAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanOTPAddedEventMapper(event *repository.Event) (eventstore.Event, error) { otpAdded := &HumanOTPAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -88,7 +88,7 @@ func NewHumanOTPVerifiedEvent( } } -func HumanOTPVerifiedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanOTPVerifiedEventMapper(event *repository.Event) (eventstore.Event, error) { return &HumanOTPVerifiedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -119,7 +119,7 @@ func NewHumanOTPRemovedEvent( } } -func HumanOTPRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanOTPRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &HumanOTPRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -153,7 +153,7 @@ func NewHumanOTPCheckSucceededEvent( } } -func HumanOTPCheckSucceededEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanOTPCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) { otpAdded := &HumanOTPCheckSucceededEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -192,7 +192,7 @@ func NewHumanOTPCheckFailedEvent( } } -func HumanOTPCheckFailedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanOTPCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) { otpAdded := &HumanOTPCheckFailedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/user/human_mfa_passwordless.go b/internal/repository/user/human_mfa_passwordless.go index fa354b32f1..f5295faa0c 100644 --- a/internal/repository/user/human_mfa_passwordless.go +++ b/internal/repository/user/human_mfa_passwordless.go @@ -53,7 +53,7 @@ func NewHumanPasswordlessAddedEvent( } } -func HumanPasswordlessAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPasswordlessAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := HumanWebAuthNAddedEventMapper(event) if err != nil { return nil, err @@ -97,7 +97,7 @@ func NewHumanPasswordlessVerifiedEvent( } } -func HumanPasswordlessVerifiedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPasswordlessVerifiedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := HumanWebAuthNVerifiedEventMapper(event) if err != nil { return nil, err @@ -129,7 +129,7 @@ func NewHumanPasswordlessSignCountChangedEvent( } } -func HumanPasswordlessSignCountChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPasswordlessSignCountChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := HumanWebAuthNSignCountChangedEventMapper(event) if err != nil { return nil, err @@ -142,8 +142,8 @@ type HumanPasswordlessRemovedEvent struct { HumanWebAuthNRemovedEvent } -func PrepareHumanPasswordlessRemovedEvent(ctx context.Context, webAuthNTokenID string) func(*eventstore.Aggregate) eventstore.EventPusher { - return func(a *eventstore.Aggregate) eventstore.EventPusher { +func PrepareHumanPasswordlessRemovedEvent(ctx context.Context, webAuthNTokenID string) func(*eventstore.Aggregate) eventstore.Command { + return func(a *eventstore.Aggregate) eventstore.Command { return NewHumanPasswordlessRemovedEvent(ctx, a, webAuthNTokenID) } } @@ -165,7 +165,7 @@ func NewHumanPasswordlessRemovedEvent( } } -func HumanPasswordlessRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPasswordlessRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := HumanWebAuthNRemovedEventMapper(event) if err != nil { return nil, err @@ -199,7 +199,7 @@ func NewHumanPasswordlessBeginLoginEvent( } } -func HumanPasswordlessBeginLoginEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPasswordlessBeginLoginEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := HumanWebAuthNBeginLoginEventMapper(event) if err != nil { return nil, err @@ -228,7 +228,7 @@ func NewHumanPasswordlessCheckSucceededEvent( } } -func HumanPasswordlessCheckSucceededEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPasswordlessCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := HumanWebAuthNCheckSucceededEventMapper(event) if err != nil { return nil, err @@ -257,7 +257,7 @@ func NewHumanPasswordlessCheckFailedEvent( } } -func HumanPasswordlessCheckFailedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPasswordlessCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := HumanWebAuthNCheckFailedEventMapper(event) if err != nil { return nil, err @@ -301,7 +301,7 @@ func NewHumanPasswordlessInitCodeAddedEvent( } } -func HumanPasswordlessInitCodeAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPasswordlessInitCodeAddedEventMapper(event *repository.Event) (eventstore.Event, error) { webAuthNAdded := &HumanPasswordlessInitCodeAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -347,7 +347,7 @@ func NewHumanPasswordlessInitCodeRequestedEvent( } } -func HumanPasswordlessInitCodeRequestedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPasswordlessInitCodeRequestedEventMapper(event *repository.Event) (eventstore.Event, error) { webAuthNAdded := &HumanPasswordlessInitCodeRequestedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -387,7 +387,7 @@ func NewHumanPasswordlessInitCodeSentEvent( } } -func HumanPasswordlessInitCodeSentEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPasswordlessInitCodeSentEventMapper(event *repository.Event) (eventstore.Event, error) { webAuthNAdded := &HumanPasswordlessInitCodeSentEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -427,7 +427,7 @@ func NewHumanPasswordlessInitCodeCheckFailedEvent( } } -func HumanPasswordlessInitCodeCodeCheckFailedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPasswordlessInitCodeCodeCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) { webAuthNAdded := &HumanPasswordlessInitCodeCheckFailedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -467,7 +467,7 @@ func NewHumanPasswordlessInitCodeCheckSucceededEvent( } } -func HumanPasswordlessInitCodeCodeCheckSucceededEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPasswordlessInitCodeCodeCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) { webAuthNAdded := &HumanPasswordlessInitCodeCheckSucceededEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/user/human_mfa_u2f.go b/internal/repository/user/human_mfa_u2f.go index c69d4b772a..e42798e859 100644 --- a/internal/repository/user/human_mfa_u2f.go +++ b/internal/repository/user/human_mfa_u2f.go @@ -42,7 +42,7 @@ func NewHumanU2FAddedEvent( } } -func HumanU2FAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanU2FAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := HumanWebAuthNAddedEventMapper(event) if err != nil { return nil, err @@ -86,7 +86,7 @@ func NewHumanU2FVerifiedEvent( } } -func HumanU2FVerifiedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanU2FVerifiedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := HumanWebAuthNVerifiedEventMapper(event) if err != nil { return nil, err @@ -118,7 +118,7 @@ func NewHumanU2FSignCountChangedEvent( } } -func HumanU2FSignCountChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanU2FSignCountChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := HumanWebAuthNSignCountChangedEventMapper(event) if err != nil { return nil, err @@ -131,8 +131,8 @@ type HumanU2FRemovedEvent struct { HumanWebAuthNRemovedEvent } -func PrepareHumanU2FRemovedEvent(ctx context.Context, webAuthNTokenID string) func(*eventstore.Aggregate) eventstore.EventPusher { - return func(a *eventstore.Aggregate) eventstore.EventPusher { +func PrepareHumanU2FRemovedEvent(ctx context.Context, webAuthNTokenID string) func(*eventstore.Aggregate) eventstore.Command { + return func(a *eventstore.Aggregate) eventstore.Command { return NewHumanU2FRemovedEvent(ctx, a, webAuthNTokenID) } } @@ -154,7 +154,7 @@ func NewHumanU2FRemovedEvent( } } -func HumanU2FRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanU2FRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := HumanWebAuthNRemovedEventMapper(event) if err != nil { return nil, err @@ -183,7 +183,7 @@ func NewHumanU2FBeginLoginEvent(ctx context.Context, aggregate *eventstore.Aggre } } -func HumanU2FBeginLoginEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanU2FBeginLoginEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := HumanWebAuthNBeginLoginEventMapper(event) if err != nil { return nil, err @@ -212,7 +212,7 @@ func NewHumanU2FCheckSucceededEvent( } } -func HumanU2FCheckSucceededEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanU2FCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := HumanWebAuthNCheckSucceededEventMapper(event) if err != nil { return nil, err @@ -241,7 +241,7 @@ func NewHumanU2FCheckFailedEvent( } } -func HumanU2FCheckFailedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanU2FCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := HumanWebAuthNCheckFailedEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/user/human_mfa_web_auth_n.go b/internal/repository/user/human_mfa_web_auth_n.go index 69a9d4fe6e..e6dc9b0586 100644 --- a/internal/repository/user/human_mfa_web_auth_n.go +++ b/internal/repository/user/human_mfa_web_auth_n.go @@ -36,7 +36,7 @@ func NewHumanWebAuthNAddedEvent( } } -func HumanWebAuthNAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanWebAuthNAddedEventMapper(event *repository.Event) (eventstore.Event, error) { webAuthNAdded := &HumanWebAuthNAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -92,7 +92,7 @@ func NewHumanWebAuthNVerifiedEvent( } } -func HumanWebAuthNVerifiedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanWebAuthNVerifiedEventMapper(event *repository.Event) (eventstore.Event, error) { webauthNVerified := &HumanWebAuthNVerifiedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -130,7 +130,7 @@ func NewHumanWebAuthNSignCountChangedEvent( } } -func HumanWebAuthNSignCountChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanWebAuthNSignCountChangedEventMapper(event *repository.Event) (eventstore.Event, error) { webauthNVerified := &HumanWebAuthNSignCountChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -166,7 +166,7 @@ func NewHumanWebAuthNRemovedEvent( } } -func HumanWebAuthNRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanWebAuthNRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { webauthNVerified := &HumanWebAuthNRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -204,7 +204,7 @@ func NewHumanWebAuthNBeginLoginEvent(base *eventstore.BaseEvent, challenge strin } } -func HumanWebAuthNBeginLoginEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanWebAuthNBeginLoginEventMapper(event *repository.Event) (eventstore.Event, error) { webAuthNAdded := &HumanWebAuthNBeginLoginEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -237,7 +237,7 @@ func NewHumanWebAuthNCheckSucceededEvent( } } -func HumanWebAuthNCheckSucceededEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanWebAuthNCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) { webAuthNAdded := &HumanWebAuthNCheckSucceededEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -270,7 +270,7 @@ func NewHumanWebAuthNCheckFailedEvent( } } -func HumanWebAuthNCheckFailedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanWebAuthNCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) { webAuthNAdded := &HumanWebAuthNCheckFailedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/user/human_password.go b/internal/repository/user/human_password.go index 3c67ad0e14..99691c3342 100644 --- a/internal/repository/user/human_password.go +++ b/internal/repository/user/human_password.go @@ -3,9 +3,10 @@ package user import ( "context" "encoding/json" - "github.com/caos/zitadel/internal/eventstore" "time" + "github.com/caos/zitadel/internal/eventstore" + "github.com/caos/zitadel/internal/crypto" "github.com/caos/zitadel/internal/domain" "github.com/caos/zitadel/internal/errors" @@ -56,7 +57,7 @@ func NewHumanPasswordChangedEvent( } } -func HumanPasswordChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPasswordChangedEventMapper(event *repository.Event) (eventstore.Event, error) { humanAdded := &HumanPasswordChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -103,7 +104,7 @@ func NewHumanPasswordCodeAddedEvent( } } -func HumanPasswordCodeAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPasswordCodeAddedEventMapper(event *repository.Event) (eventstore.Event, error) { humanAdded := &HumanPasswordCodeAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -137,7 +138,7 @@ func NewHumanPasswordCodeSentEvent(ctx context.Context, aggregate *eventstore.Ag } } -func HumanPasswordCodeSentEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPasswordCodeSentEventMapper(event *repository.Event) (eventstore.Event, error) { return &HumanPasswordCodeSentEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -171,7 +172,7 @@ func NewHumanPasswordCheckSucceededEvent( } } -func HumanPasswordCheckSucceededEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPasswordCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) { humanAdded := &HumanPasswordCheckSucceededEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -211,7 +212,7 @@ func NewHumanPasswordCheckFailedEvent( } } -func HumanPasswordCheckFailedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPasswordCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) { humanAdded := &HumanPasswordCheckFailedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/user/human_phone.go b/internal/repository/user/human_phone.go index 51a4757d36..dcd44c2d97 100644 --- a/internal/repository/user/human_phone.go +++ b/internal/repository/user/human_phone.go @@ -46,7 +46,7 @@ func NewHumanPhoneChangedEvent(ctx context.Context, aggregate *eventstore.Aggreg } } -func HumanPhoneChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPhoneChangedEventMapper(event *repository.Event) (eventstore.Event, error) { phoneChangedEvent := &HumanPhoneChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -80,7 +80,7 @@ func NewHumanPhoneRemovedEvent(ctx context.Context, aggregate *eventstore.Aggreg } } -func HumanPhoneRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPhoneRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &HumanPhoneRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -110,7 +110,7 @@ func NewHumanPhoneVerifiedEvent(ctx context.Context, aggregate *eventstore.Aggre } } -func HumanPhoneVerifiedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPhoneVerifiedEventMapper(event *repository.Event) (eventstore.Event, error) { return &HumanPhoneVerifiedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), IsPhoneVerified: true, @@ -139,7 +139,7 @@ func NewHumanPhoneVerificationFailedEvent(ctx context.Context, aggregate *events } } -func HumanPhoneVerificationFailedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPhoneVerificationFailedEventMapper(event *repository.Event) (eventstore.Event, error) { return &HumanPhoneVerificationFailedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -177,7 +177,7 @@ func NewHumanPhoneCodeAddedEvent( } } -func HumanPhoneCodeAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPhoneCodeAddedEventMapper(event *repository.Event) (eventstore.Event, error) { codeAdded := &HumanPhoneCodeAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -211,7 +211,7 @@ func NewHumanPhoneCodeSentEvent(ctx context.Context, aggregate *eventstore.Aggre } } -func HumanPhoneCodeSentEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanPhoneCodeSentEventMapper(event *repository.Event) (eventstore.Event, error) { return &HumanPhoneCodeSentEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil diff --git a/internal/repository/user/human_profile.go b/internal/repository/user/human_profile.go index 1ee977ec32..5f2ba0be43 100644 --- a/internal/repository/user/human_profile.go +++ b/internal/repository/user/human_profile.go @@ -3,6 +3,7 @@ package user import ( "context" "encoding/json" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/domain" @@ -94,7 +95,7 @@ func ChangeGender(gender domain.Gender) func(event *HumanProfileChangedEvent) { } } -func HumanProfileChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanProfileChangedEventMapper(event *repository.Event) (eventstore.Event, error) { profileChanged := &HumanProfileChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/user/human_refresh_token.go b/internal/repository/user/human_refresh_token.go index 7c4922dabf..4e59d8db13 100644 --- a/internal/repository/user/human_refresh_token.go +++ b/internal/repository/user/human_refresh_token.go @@ -78,7 +78,7 @@ func NewHumanRefreshTokenAddedEvent( } } -func HumanRefreshTokenAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanRefreshTokenAddedEventMapper(event *repository.Event) (eventstore.Event, error) { refreshTokenAdded := &HumanRefreshTokenAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -129,7 +129,7 @@ func NewHumanRefreshTokenRenewedEvent( } } -func HumanRefreshTokenRenewedEventEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanRefreshTokenRenewedEventEventMapper(event *repository.Event) (eventstore.Event, error) { tokenAdded := &HumanRefreshTokenRenewedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -174,7 +174,7 @@ func NewHumanRefreshTokenRemovedEvent( } } -func HumanRefreshTokenRemovedEventEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func HumanRefreshTokenRemovedEventEventMapper(event *repository.Event) (eventstore.Event, error) { tokenAdded := &HumanRefreshTokenRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/user/machine.go b/internal/repository/user/machine.go index 389c693b92..315741a677 100644 --- a/internal/repository/user/machine.go +++ b/internal/repository/user/machine.go @@ -3,6 +3,7 @@ package user import ( "context" "encoding/json" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/errors" @@ -54,7 +55,7 @@ func NewMachineAddedEvent( } } -func MachineAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MachineAddedEventMapper(event *repository.Event) (eventstore.Event, error) { machineAdded := &MachineAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -116,7 +117,7 @@ func ChangeDescription(description string) func(event *MachineChangedEvent) { } } -func MachineChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MachineChangedEventMapper(event *repository.Event) (eventstore.Event, error) { machineChanged := &MachineChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/user/machine_key.go b/internal/repository/user/machine_key.go index 9630e3d6db..73327b4cf8 100644 --- a/internal/repository/user/machine_key.go +++ b/internal/repository/user/machine_key.go @@ -55,7 +55,7 @@ func NewMachineKeyAddedEvent( } } -func MachineKeyAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MachineKeyAddedEventMapper(event *repository.Event) (eventstore.Event, error) { machineKeyAdded := &MachineKeyAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -101,7 +101,7 @@ func NewMachineKeyRemovedEvent( } } -func MachineKeyRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MachineKeyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { machineRemoved := &MachineKeyRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/user/metadata.go b/internal/repository/user/metadata.go index 66a8a918ae..9160f73854 100644 --- a/internal/repository/user/metadata.go +++ b/internal/repository/user/metadata.go @@ -30,7 +30,7 @@ func NewMetadataSetEvent(ctx context.Context, aggregate *eventstore.Aggregate, k } } -func MetadataSetEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MetadataSetEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := metadata.SetEventMapper(event) if err != nil { return nil, err @@ -54,7 +54,7 @@ func NewMetadataRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregat } } -func MetadataRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MetadataRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := metadata.RemovedEventMapper(event) if err != nil { return nil, err @@ -78,7 +78,7 @@ func NewMetadataRemovedAllEvent(ctx context.Context, aggregate *eventstore.Aggre } } -func MetadataRemovedAllEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func MetadataRemovedAllEventMapper(event *repository.Event) (eventstore.Event, error) { e, err := metadata.RemovedAllEventMapper(event) if err != nil { return nil, err diff --git a/internal/repository/user/user.go b/internal/repository/user/user.go index 9117d48b6b..a2549cd0b6 100644 --- a/internal/repository/user/user.go +++ b/internal/repository/user/user.go @@ -70,7 +70,7 @@ func NewUserLockedEvent(ctx context.Context, aggregate *eventstore.Aggregate) *U } } -func UserLockedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserLockedEventMapper(event *repository.Event) (eventstore.Event, error) { return &UserLockedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -98,7 +98,7 @@ func NewUserUnlockedEvent(ctx context.Context, aggregate *eventstore.Aggregate) } } -func UserUnlockedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserUnlockedEventMapper(event *repository.Event) (eventstore.Event, error) { return &UserUnlockedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -126,7 +126,7 @@ func NewUserDeactivatedEvent(ctx context.Context, aggregate *eventstore.Aggregat } } -func UserDeactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserDeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { return &UserDeactivatedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -154,7 +154,7 @@ func NewUserReactivatedEvent(ctx context.Context, aggregate *eventstore.Aggregat } } -func UserReactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { return &UserReactivatedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -202,7 +202,7 @@ func NewUserRemovedEvent( } } -func UserRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &UserRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -258,7 +258,7 @@ func NewUserTokenAddedEvent( } } -func UserTokenAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserTokenAddedEventMapper(event *repository.Event) (eventstore.Event, error) { tokenAdded := &UserTokenAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -299,7 +299,7 @@ func NewUserTokenRemovedEvent( } } -func UserTokenRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserTokenRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { tokenRemoved := &UserTokenRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -349,7 +349,7 @@ func NewDomainClaimedEvent( } } -func DomainClaimedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func DomainClaimedEventMapper(event *repository.Event) (eventstore.Event, error) { domainClaimed := &DomainClaimedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -386,7 +386,7 @@ func NewDomainClaimedSentEvent( } } -func DomainClaimedSentEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func DomainClaimedSentEventMapper(event *repository.Event) (eventstore.Event, error) { return &DomainClaimedSentEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -430,7 +430,7 @@ func NewUsernameChangedEvent( } } -func UsernameChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UsernameChangedEventMapper(event *repository.Event) (eventstore.Event, error) { domainClaimed := &UsernameChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } diff --git a/internal/repository/usergrant/user_grant.go b/internal/repository/usergrant/user_grant.go index ed3deaf8f2..5866976a13 100644 --- a/internal/repository/usergrant/user_grant.go +++ b/internal/repository/usergrant/user_grant.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "github.com/caos/zitadel/internal/eventstore" "github.com/caos/zitadel/internal/errors" @@ -72,7 +73,7 @@ func NewUserGrantAddedEvent( } } -func UserGrantAddedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserGrantAddedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &UserGrantAddedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -112,7 +113,7 @@ func NewUserGrantChangedEvent( } } -func UserGrantChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserGrantChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &UserGrantChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -152,7 +153,7 @@ func NewUserGrantCascadeChangedEvent( } } -func UserGrantCascadeChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserGrantCascadeChangedEventMapper(event *repository.Event) (eventstore.Event, error) { e := &UserGrantChangedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), } @@ -199,7 +200,7 @@ func NewUserGrantRemovedEvent( } } -func UserGrantRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserGrantRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &UserGrantRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -239,7 +240,7 @@ func NewUserGrantCascadeRemovedEvent( } } -func UserGrantCascadeRemovedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserGrantCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) { return &UserGrantCascadeRemovedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -267,7 +268,7 @@ func NewUserGrantDeactivatedEvent(ctx context.Context, aggregate *eventstore.Agg } } -func UserGrantDeactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserGrantDeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { return &UserGrantDeactivatedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil @@ -295,7 +296,7 @@ func NewUserGrantReactivatedEvent(ctx context.Context, aggregate *eventstore.Agg } } -func UserGrantReactivatedEventMapper(event *repository.Event) (eventstore.EventReader, error) { +func UserGrantReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) { return &UserGrantReactivatedEvent{ BaseEvent: *eventstore.BaseEventFromRepo(event), }, nil