TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-02-28 21:27:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: handle sequence correctly in subscription (#1209)

Browse Source
This commit is contained in:
Livio Amstutz 2021-01-27 10:35:01 +01:00 committed by GitHub
parent 6f6d59f380
commit 1d472bac51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
129 changed files with 349 additions and 371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/admin/repository/eventsourcing/eventstore/administrator.go
View File

@ -48,7 +48,7 @@ func (repo *AdministratorRepo) GetViews() ([]*view_model.View, error) {
}
func (repo *AdministratorRepo) GetSpoolerDiv(database, view string) int64 {
sequence, err := repo.View.GetCurrentSequence(database, view, "")
sequence, err := repo.View.GetCurrentSequence(database, view)
if err != nil {
return 0

6
internal/admin/repository/eventsourcing/eventstore/iam.go
View File

@ -55,7 +55,7 @@ func (repo *IAMRepository) RemoveIAMMember(ctx context.Context, userID string) e
func (repo *IAMRepository) SearchIAMMembers(ctx context.Context, request *iam_model.IAMMemberSearchRequest) (*iam_model.IAMMemberSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
sequence, err := repo.View.GetLatestIAMMemberSequence("")
sequence, err := repo.View.GetLatestIAMMemberSequence()
logging.Log("EVENT-Slkci").OnError(err).WithField("traceID", tracing.TraceIDFromCtx(ctx)).Warn("could not read latest iam sequence")
members, count, err := repo.View.SearchIAMMembers(request)
if err != nil {
@ -157,7 +157,7 @@ func (repo *IAMRepository) ChangeOidcIDPConfig(ctx context.Context, oidcConfig *
func (repo *IAMRepository) SearchIDPConfigs(ctx context.Context, request *iam_model.IDPConfigSearchRequest) (*iam_model.IDPConfigSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
sequence, err := repo.View.GetLatestIDPConfigSequence("")
sequence, err := repo.View.GetLatestIDPConfigSequence()
logging.Log("EVENT-Dk8si").OnError(err).WithField("traceID", tracing.TraceIDFromCtx(ctx)).Warn("could not read latest idp config sequence")
idps, count, err := repo.View.SearchIDPConfigs(request)
if err != nil {
@ -189,7 +189,7 @@ func (repo *IAMRepository) ChangeDefaultLoginPolicy(ctx context.Context, policy
func (repo *IAMRepository) SearchDefaultIDPProviders(ctx context.Context, request *iam_model.IDPProviderSearchRequest) (*iam_model.IDPProviderSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
request.AppendAggregateIDQuery(repo.SystemDefaults.IamID)
sequence, err := repo.View.GetLatestIDPProviderSequence("")
sequence, err := repo.View.GetLatestIDPProviderSequence()
logging.Log("EVENT-Tuiks").OnError(err).WithField("traceID", tracing.TraceIDFromCtx(ctx)).Warn("could not read latest iam sequence")
providers, count, err := repo.View.SearchIDPProviders(request)
if err != nil {

2
internal/admin/repository/eventsourcing/eventstore/org.go
View File

@ -87,7 +87,7 @@ func (repo *OrgRepo) OrgByID(ctx context.Context, id string) (*org_model.Org, er
func (repo *OrgRepo) SearchOrgs(ctx context.Context, query *org_model.OrgSearchRequest) (*org_model.OrgSearchResult, error) {
query.EnsureLimit(repo.SearchLimit)
sequence, err := repo.View.GetLatestOrgSequence("")
sequence, err := repo.View.GetLatestOrgSequence()
logging.Log("EVENT-LXo9w").OnError(err).WithField("traceID", tracing.TraceIDFromCtx(ctx)).Warn("could not read latest iam sequence")
orgs, count, err := repo.View.SearchOrgs(query)
if err != nil {

6
internal/admin/repository/eventsourcing/handler/iam_member.go
View File

@ -45,8 +45,8 @@ func (m *IAMMember) subscribe() {
}()
}
func (m *IAMMember) CurrentSequence(event *es_models.Event) (uint64, error) {
sequence, err := m.view.GetLatestIAMMemberSequence(string(event.AggregateType))
func (m *IAMMember) CurrentSequence() (uint64, error) {
sequence, err := m.view.GetLatestIAMMemberSequence()
if err != nil {
return 0, err
}
@ -62,7 +62,7 @@ func (m *IAMMember) AggregateTypes() []es_models.AggregateType {
}
func (m *IAMMember) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := m.view.GetLatestIAMMemberSequence("")
sequence, err := m.view.GetLatestIAMMemberSequence()
if err != nil {
return nil, err
}

6
internal/admin/repository/eventsourcing/handler/idp_config.go
View File

@ -47,8 +47,8 @@ func (i *IDPConfig) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.IAMAggregate}
}
func (i *IDPConfig) CurrentSequence(event *es_models.Event) (uint64, error) {
sequence, err := i.view.GetLatestIDPConfigSequence(string(event.AggregateType))
func (i *IDPConfig) CurrentSequence() (uint64, error) {
sequence, err := i.view.GetLatestIDPConfigSequence()
if err != nil {
return 0, err
}
@ -56,7 +56,7 @@ func (i *IDPConfig) CurrentSequence(event *es_models.Event) (uint64, error) {
}
func (i *IDPConfig) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := i.view.GetLatestIDPConfigSequence("")
sequence, err := i.view.GetLatestIDPConfigSequence()
if err != nil {
return nil, err
}

6
internal/admin/repository/eventsourcing/handler/idp_providers.go
View File

@ -64,8 +64,8 @@ func (i *IDPProvider) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.IAMAggregate, org_es_model.OrgAggregate}
}
func (i *IDPProvider) CurrentSequence(event *es_models.Event) (uint64, error) {
sequence, err := i.view.GetLatestIDPProviderSequence(string(event.AggregateType))
func (i *IDPProvider) CurrentSequence() (uint64, error) {
sequence, err := i.view.GetLatestIDPProviderSequence()
if err != nil {
return 0, err
}
@ -73,7 +73,7 @@ func (i *IDPProvider) CurrentSequence(event *es_models.Event) (uint64, error) {
}
func (i *IDPProvider) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := i.view.GetLatestIDPProviderSequence("")
sequence, err := i.view.GetLatestIDPProviderSequence()
if err != nil {
return nil, err
}

6
internal/admin/repository/eventsourcing/handler/label_policy.go
View File

@ -47,7 +47,7 @@ func (p *LabelPolicy) AggregateTypes() []es_models.AggregateType {
}
func (p *LabelPolicy) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := p.view.GetLatestLabelPolicySequence("")
sequence, err := p.view.GetLatestLabelPolicySequence()
if err != nil {
return nil, err
}
@ -56,8 +56,8 @@ func (p *LabelPolicy) EventQuery() (*es_models.SearchQuery, error) {
LatestSequenceFilter(sequence.CurrentSequence), nil
}
func (p *LabelPolicy) CurrentSequence(event *es_models.Event) (uint64, error) {
sequence, err := p.view.GetLatestLabelPolicySequence(string(event.AggregateType))
func (p *LabelPolicy) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestLabelPolicySequence()
if err != nil {
return 0, err
}

6
internal/admin/repository/eventsourcing/handler/login_policy.go
View File

@ -48,7 +48,7 @@ func (p *LoginPolicy) AggregateTypes() []models.AggregateType {
}
func (p *LoginPolicy) EventQuery() (*models.SearchQuery, error) {
sequence, err := p.view.GetLatestLoginPolicySequence("")
sequence, err := p.view.GetLatestLoginPolicySequence()
if err != nil {
return nil, err
}
@ -57,8 +57,8 @@ func (p *LoginPolicy) EventQuery() (*models.SearchQuery, error) {
LatestSequenceFilter(sequence.CurrentSequence), nil
}
func (p *LoginPolicy) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestLoginPolicySequence(string(event.AggregateType))
func (p *LoginPolicy) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestLoginPolicySequence()
if err != nil {
return 0, err
}

6
internal/admin/repository/eventsourcing/handler/org.go
View File

@ -49,15 +49,15 @@ func (o *Org) AggregateTypes() []es_models.AggregateType {
}
func (o *Org) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := o.view.GetLatestOrgSequence("")
sequence, err := o.view.GetLatestOrgSequence()
if err != nil {
return nil, err
}
return eventsourcing.OrgQuery(sequence.CurrentSequence), nil
}
func (o *Org) CurrentSequence(event *es_models.Event) (uint64, error) {
sequence, err := o.view.GetLatestOrgSequence(string(event.AggregateType))
func (o *Org) CurrentSequence() (uint64, error) {
sequence, err := o.view.GetLatestOrgSequence()
if err != nil {
return 0, err
}

6
internal/admin/repository/eventsourcing/handler/org_iam_policy.go
View File

@ -48,7 +48,7 @@ func (p *OrgIAMPolicy) AggregateTypes() []es_models.AggregateType {
}
func (p *OrgIAMPolicy) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := p.view.GetLatestOrgIAMPolicySequence("")
sequence, err := p.view.GetLatestOrgIAMPolicySequence()
if err != nil {
return nil, err
}
@ -57,8 +57,8 @@ func (p *OrgIAMPolicy) EventQuery() (*es_models.SearchQuery, error) {
LatestSequenceFilter(sequence.CurrentSequence), nil
}
func (p *OrgIAMPolicy) CurrentSequence(event *es_models.Event) (uint64, error) {
sequence, err := p.view.GetLatestOrgIAMPolicySequence(string(event.AggregateType))
func (p *OrgIAMPolicy) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestOrgIAMPolicySequence()
if err != nil {
return 0, err
}

6
internal/admin/repository/eventsourcing/handler/password_age_policy.go
View File

@ -49,8 +49,8 @@ func (p *PasswordAgePolicy) AggregateTypes() []models.AggregateType {
return []models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
}
func (p *PasswordAgePolicy) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestPasswordAgePolicySequence(string(event.AggregateType))
func (p *PasswordAgePolicy) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestPasswordAgePolicySequence()
if err != nil {
return 0, err
}
@ -58,7 +58,7 @@ func (p *PasswordAgePolicy) CurrentSequence(event *models.Event) (uint64, error)
}
func (p *PasswordAgePolicy) EventQuery() (*models.SearchQuery, error) {
sequence, err := p.view.GetLatestPasswordAgePolicySequence("")
sequence, err := p.view.GetLatestPasswordAgePolicySequence()
if err != nil {
return nil, err
}

6
internal/admin/repository/eventsourcing/handler/password_complexity_policy.go
View File

@ -49,8 +49,8 @@ func (p *PasswordComplexityPolicy) AggregateTypes() []models.AggregateType {
return []models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
}
func (p *PasswordComplexityPolicy) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestPasswordComplexityPolicySequence(string(event.AggregateType))
func (p *PasswordComplexityPolicy) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestPasswordComplexityPolicySequence()
if err != nil {
return 0, err
}
@ -58,7 +58,7 @@ func (p *PasswordComplexityPolicy) CurrentSequence(event *models.Event) (uint64,
}
func (p *PasswordComplexityPolicy) EventQuery() (*models.SearchQuery, error) {
sequence, err := p.view.GetLatestPasswordComplexityPolicySequence("")
sequence, err := p.view.GetLatestPasswordComplexityPolicySequence()
if err != nil {
return nil, err
}

6
internal/admin/repository/eventsourcing/handler/password_lockout_policy.go
View File

@ -49,8 +49,8 @@ func (p *PasswordLockoutPolicy) AggregateTypes() []models.AggregateType {
return []models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
}
func (p *PasswordLockoutPolicy) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestPasswordLockoutPolicySequence(string(event.AggregateType))
func (p *PasswordLockoutPolicy) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestPasswordLockoutPolicySequence()
if err != nil {
return 0, err
}
@ -58,7 +58,7 @@ func (p *PasswordLockoutPolicy) CurrentSequence(event *models.Event) (uint64, er
}
func (p *PasswordLockoutPolicy) EventQuery() (*models.SearchQuery, error) {
sequence, err := p.view.GetLatestPasswordLockoutPolicySequence("")
sequence, err := p.view.GetLatestPasswordLockoutPolicySequence()
if err != nil {
return nil, err
}

6
internal/admin/repository/eventsourcing/handler/user.go
View File

@ -68,8 +68,8 @@ func (u *User) AggregateTypes() []models.AggregateType {
return []models.AggregateType{es_model.UserAggregate, org_es_model.OrgAggregate}
}
func (u *User) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := u.view.GetLatestUserSequence(string(event.AggregateType))
func (u *User) CurrentSequence() (uint64, error) {
sequence, err := u.view.GetLatestUserSequence()
if err != nil {
return 0, err
}
@ -77,7 +77,7 @@ func (u *User) CurrentSequence(event *models.Event) (uint64, error) {
}
func (u *User) EventQuery() (*models.SearchQuery, error) {
sequence, err := u.view.GetLatestUserSequence("")
sequence, err := u.view.GetLatestUserSequence()
if err != nil {
return nil, err
}

6
internal/admin/repository/eventsourcing/handler/user_external_idps.go
View File

@ -69,8 +69,8 @@ func (i *ExternalIDP) AggregateTypes() []models.AggregateType {
return []models.AggregateType{model.UserAggregate, iam_es_model.IAMAggregate, org_es_model.OrgAggregate}
}
func (i *ExternalIDP) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := i.view.GetLatestExternalIDPSequence(string(event.AggregateType))
func (i *ExternalIDP) CurrentSequence() (uint64, error) {
sequence, err := i.view.GetLatestExternalIDPSequence()
if err != nil {
return 0, err
}
@ -78,7 +78,7 @@ func (i *ExternalIDP) CurrentSequence(event *models.Event) (uint64, error) {
}
func (i *ExternalIDP) EventQuery() (*models.SearchQuery, error) {
sequence, err := i.view.GetLatestExternalIDPSequence("")
sequence, err := i.view.GetLatestExternalIDPSequence()
if err != nil {
return nil, err
}

4
internal/admin/repository/eventsourcing/view/external_idps.go
View File

@ -65,8 +65,8 @@ func (v *View) DeleteExternalIDPsByUserID(userID string, event *models.Event) er
return v.ProcessedExternalIDPSequence(event)
}
func (v *View) GetLatestExternalIDPSequence(aggregateType string) (*global_view.CurrentSequence, error) {
return v.latestSequence(externalIDPTable, aggregateType)
func (v *View) GetLatestExternalIDPSequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(externalIDPTable)
}
func (v *View) ProcessedExternalIDPSequence(event *models.Event) error {

4
internal/admin/repository/eventsourcing/view/iam_member.go
View File

@ -57,8 +57,8 @@ func (v *View) DeleteIAMMembersByUserID(userID string, event *models.Event) erro
return v.ProcessedIAMMemberSequence(event)
}
func (v *View) GetLatestIAMMemberSequence(aggregateType string) (*global_view.CurrentSequence, error) {
return v.latestSequence(iamMemberTable, aggregateType)
func (v *View) GetLatestIAMMemberSequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(iamMemberTable)
}
func (v *View) ProcessedIAMMemberSequence(event *models.Event) error {

4
internal/admin/repository/eventsourcing/view/idp_configs.go
View File

@ -37,8 +37,8 @@ func (v *View) DeleteIDPConfig(idpID string, event *models.Event) error {
return v.ProcessedIDPConfigSequence(event)
}
func (v *View) GetLatestIDPConfigSequence(aggregateType string) (*global_view.CurrentSequence, error) {
return v.latestSequence(idpConfigTable, aggregateType)
func (v *View) GetLatestIDPConfigSequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(idpConfigTable)
}
func (v *View) ProcessedIDPConfigSequence(event *models.Event) error {

4
internal/admin/repository/eventsourcing/view/idp_providers.go
View File

@ -49,8 +49,8 @@ func (v *View) DeleteIDPProvider(aggregateID, idpConfigID string, event *models.
return v.ProcessedIDPProviderSequence(event)
}
func (v *View) GetLatestIDPProviderSequence(aggregateType string) (*global_view.CurrentSequence, error) {
return v.latestSequence(idpProviderTable, aggregateType)
func (v *View) GetLatestIDPProviderSequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(idpProviderTable)
}
func (v *View) ProcessedIDPProviderSequence(event *models.Event) error {

4
internal/admin/repository/eventsourcing/view/label_policies.go
View File

@ -23,8 +23,8 @@ func (v *View) PutLabelPolicy(policy *model.LabelPolicyView, event *models.Event
return v.ProcessedLabelPolicySequence(event)
}
func (v *View) GetLatestLabelPolicySequence(aggregateType string) (*global_view.CurrentSequence, error) {
return v.latestSequence(labelPolicyTable, aggregateType)
func (v *View) GetLatestLabelPolicySequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(labelPolicyTable)
}
func (v *View) ProcessedLabelPolicySequence(event *models.Event) error {

4
internal/admin/repository/eventsourcing/view/login_policies.go
View File

@ -32,8 +32,8 @@ func (v *View) DeleteLoginPolicy(aggregateID string, event *models.Event) error
return v.ProcessedLoginPolicySequence(event)
}
func (v *View) GetLatestLoginPolicySequence(aggregateType string) (*global_view.CurrentSequence, error) {
return v.latestSequence(loginPolicyTable, aggregateType)
func (v *View) GetLatestLoginPolicySequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(loginPolicyTable)
}
func (v *View) ProcessedLoginPolicySequence(event *models.Event) error {

4
internal/admin/repository/eventsourcing/view/org.go
View File

@ -40,8 +40,8 @@ func (v *View) UpdateOrgSpoolerRunTimestamp() error {
return v.updateSpoolerRunSequence(orgTable)
}
func (v *View) GetLatestOrgSequence(aggregateType string) (*repository.CurrentSequence, error) {
return v.latestSequence(orgTable, aggregateType)
func (v *View) GetLatestOrgSequence() (*repository.CurrentSequence, error) {
return v.latestSequence(orgTable)
}
func (v *View) ProcessedOrgSequence(event *models.Event) error {

4
internal/admin/repository/eventsourcing/view/org_iam_policy.go
View File

@ -32,8 +32,8 @@ func (v *View) DeleteOrgIAMPolicy(aggregateID string, event *models.Event) error
return v.ProcessedOrgIAMPolicySequence(event)
}
func (v *View) GetLatestOrgIAMPolicySequence(aggregateType string) (*global_view.CurrentSequence, error) {
return v.latestSequence(orgIAMPolicyTable, aggregateType)
func (v *View) GetLatestOrgIAMPolicySequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(orgIAMPolicyTable)
}
func (v *View) ProcessedOrgIAMPolicySequence(event *models.Event) error {

4
internal/admin/repository/eventsourcing/view/password_age_policy.go
View File

@ -32,8 +32,8 @@ func (v *View) DeletePasswordAgePolicy(aggregateID string, event *models.Event)
return v.ProcessedPasswordAgePolicySequence(event)
}
func (v *View) GetLatestPasswordAgePolicySequence(aggregateType string) (*global_view.CurrentSequence, error) {
return v.latestSequence(passwordAgePolicyTable, aggregateType)
func (v *View) GetLatestPasswordAgePolicySequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(passwordAgePolicyTable)
}
func (v *View) ProcessedPasswordAgePolicySequence(event *models.Event) error {

4
internal/admin/repository/eventsourcing/view/password_complexity_policy.go
View File

@ -32,8 +32,8 @@ func (v *View) DeletePasswordComplexityPolicy(aggregateID string, event *models.
return v.ProcessedPasswordComplexityPolicySequence(event)
}
func (v *View) GetLatestPasswordComplexityPolicySequence(aggregateType string) (*global_view.CurrentSequence, error) {
return v.latestSequence(passwordComplexityPolicyTable, aggregateType)
func (v *View) GetLatestPasswordComplexityPolicySequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(passwordComplexityPolicyTable)
}
func (v *View) ProcessedPasswordComplexityPolicySequence(event *models.Event) error {

4
internal/admin/repository/eventsourcing/view/password_lockout_policy.go
View File

@ -32,8 +32,8 @@ func (v *View) DeletePasswordLockoutPolicy(aggregateID string, event *models.Eve
return v.ProcessedPasswordLockoutPolicySequence(event)
}
func (v *View) GetLatestPasswordLockoutPolicySequence(aggregateType string) (*global_view.CurrentSequence, error) {
return v.latestSequence(passwordLockoutPolicyTable, aggregateType)
func (v *View) GetLatestPasswordLockoutPolicySequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(passwordLockoutPolicyTable)
}
func (v *View) ProcessedPasswordLockoutPolicySequence(event *models.Event) error {

12
internal/admin/repository/eventsourcing/view/sequence.go
View File

@ -12,11 +12,11 @@ const (
)
func (v *View) saveCurrentSequence(viewName string, event *models.Event) error {
return repository.SaveCurrentSequence(v.Db, sequencesTable, viewName, string(event.AggregateType), event.Sequence, event.CreationDate)
return repository.SaveCurrentSequence(v.Db, sequencesTable, viewName, event.Sequence, event.CreationDate)
}
func (v *View) latestSequence(viewName, aggregateType string) (*repository.CurrentSequence, error) {
return repository.LatestSequence(v.Db, sequencesTable, viewName, aggregateType)
func (v *View) latestSequence(viewName string) (*repository.CurrentSequence, error) {
return repository.LatestSequence(v.Db, sequencesTable, viewName)
}
func (v *View) AllCurrentSequences(db string) ([]*repository.CurrentSequence, error) {
@ -24,7 +24,7 @@ func (v *View) AllCurrentSequences(db string) ([]*repository.CurrentSequence, er
}
func (v *View) updateSpoolerRunSequence(viewName string) error {
currentSequence, err := repository.LatestSequence(v.Db, sequencesTable, viewName, "")
currentSequence, err := repository.LatestSequence(v.Db, sequencesTable, viewName)
if err != nil {
return err
}
@ -38,10 +38,10 @@ func (v *View) updateSpoolerRunSequence(viewName string) error {
return repository.UpdateCurrentSequence(v.Db, sequencesTable, currentSequence)
}
func (v *View) GetCurrentSequence(db, viewName, aggregateType string) (*repository.CurrentSequence, error) {
func (v *View) GetCurrentSequence(db, viewName string) (*repository.CurrentSequence, error) {
sequenceTable := db + ".current_sequences"
fullView := db + "." + viewName
return repository.LatestSequence(v.Db, sequenceTable, fullView, aggregateType)
return repository.LatestSequence(v.Db, sequenceTable, fullView)
}
func (v *View) ClearView(db, viewName string) error {

4
internal/admin/repository/eventsourcing/view/user.go
View File

@ -65,8 +65,8 @@ func (v *View) DeleteUser(userID string, event *models.Event) error {
return v.ProcessedUserSequence(event)
}
func (v *View) GetLatestUserSequence(aggregateType string) (*repository.CurrentSequence, error) {
return v.latestSequence(userTable, aggregateType)
func (v *View) GetLatestUserSequence() (*repository.CurrentSequence, error) {
return v.latestSequence(userTable)
}
func (v *View) ProcessedUserSequence(event *models.Event) error {

2
internal/auth/repository/eventsourcing/eventstore/org.go
View File

@ -36,7 +36,7 @@ type OrgRepository struct {
func (repo *OrgRepository) SearchOrgs(ctx context.Context, request *org_model.OrgSearchRequest) (*org_model.OrgSearchResult, error) {
request.EnsureLimit(repo.SearchLimit)
sequence, err := repo.View.GetLatestOrgSequence("")
sequence, err := repo.View.GetLatestOrgSequence()
logging.Log("EVENT-7Udhz").OnError(err).WithField("traceID", tracing.TraceIDFromCtx(ctx)).Warn("could not read latest org sequence")
members, count, err := repo.View.SearchOrgs(request)
if err != nil {

2
internal/auth/repository/eventsourcing/eventstore/user.go
View File

@ -109,7 +109,7 @@ func (repo *UserRepo) ChangeMyProfile(ctx context.Context, profile *model.Profil
func (repo *UserRepo) SearchMyExternalIDPs(ctx context.Context, request *model.ExternalIDPSearchRequest) (*model.ExternalIDPSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
sequence, seqErr := repo.View.GetLatestExternalIDPSequence("")
sequence, seqErr := repo.View.GetLatestExternalIDPSequence()
logging.Log("EVENT-5Jsi8").OnError(seqErr).WithField("traceID", tracing.TraceIDFromCtx(ctx)).Warn("could not read latest user sequence")
request.AppendUserQuery(authz.GetCtxData(ctx).UserID)
externalIDPS, count, err := repo.View.SearchExternalIDPs(request)

2
internal/auth/repository/eventsourcing/eventstore/user_grant.go
View File

@ -29,7 +29,7 @@ type UserGrantRepo struct {
func (repo *UserGrantRepo) SearchMyUserGrants(ctx context.Context, request *grant_model.UserGrantSearchRequest) (*grant_model.UserGrantSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
sequence, err := repo.View.GetLatestUserGrantSequence("")
sequence, err := repo.View.GetLatestUserGrantSequence()
logging.Log("EVENT-Hd7s3").OnError(err).WithField("traceID", tracing.TraceIDFromCtx(ctx)).Warn("could not read latest user grant sequence")
request.Queries = append(request.Queries, &grant_model.UserGrantSearchQuery{Key: grant_model.UserGrantSearchKeyUserID, Method: global_model.SearchMethodEquals, Value: authz.GetCtxData(ctx).UserID})
grants, count, err := repo.View.SearchUserGrants(request)

2
internal/auth/repository/eventsourcing/handler/application.go
View File

@ -53,7 +53,7 @@ func (_ *Application) AggregateTypes() []models.AggregateType {
return []models.AggregateType{es_model.ProjectAggregate}
}
func (a *Application) CurrentSequence(event *models.Event) (uint64, error) {
func (a *Application) CurrentSequence() (uint64, error) {
sequence, err := a.view.GetLatestApplicationSequence()
if err != nil {
return 0, err

6
internal/auth/repository/eventsourcing/handler/idp_config.go
View File

@ -49,8 +49,8 @@ func (_ *IDPConfig) AggregateTypes() []models.AggregateType {
return []models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
}
func (i *IDPConfig) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := i.view.GetLatestIDPConfigSequence(string(event.AggregateType))
func (i *IDPConfig) CurrentSequence() (uint64, error) {
sequence, err := i.view.GetLatestIDPConfigSequence()
if err != nil {
return 0, err
}
@ -58,7 +58,7 @@ func (i *IDPConfig) CurrentSequence(event *models.Event) (uint64, error) {
}
func (i *IDPConfig) EventQuery() (*models.SearchQuery, error) {
sequence, err := i.view.GetLatestIDPConfigSequence("")
sequence, err := i.view.GetLatestIDPConfigSequence()
if err != nil {
return nil, err
}

6
internal/auth/repository/eventsourcing/handler/idp_providers.go
View File

@ -66,8 +66,8 @@ func (_ *IDPProvider) AggregateTypes() []models.AggregateType {
return []models.AggregateType{model.IAMAggregate, org_es_model.OrgAggregate}
}
func (i *IDPProvider) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := i.view.GetLatestIDPProviderSequence(string(event.AggregateType))
func (i *IDPProvider) CurrentSequence() (uint64, error) {
sequence, err := i.view.GetLatestIDPProviderSequence()
if err != nil {
return 0, err
}
@ -75,7 +75,7 @@ func (i *IDPProvider) CurrentSequence(event *models.Event) (uint64, error) {
}
func (i *IDPProvider) EventQuery() (*models.SearchQuery, error) {
sequence, err := i.view.GetLatestIDPProviderSequence("")
sequence, err := i.view.GetLatestIDPProviderSequence()
if err != nil {
return nil, err
}

6
internal/auth/repository/eventsourcing/handler/key.go
View File

@ -49,8 +49,8 @@ func (_ *Key) AggregateTypes() []models.AggregateType {
return []models.AggregateType{es_model.KeyPairAggregate}
}
func (k *Key) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := k.view.GetLatestKeySequence(string(event.AggregateType))
func (k *Key) CurrentSequence() (uint64, error) {
sequence, err := k.view.GetLatestKeySequence()
if err != nil {
return 0, err
}
@ -58,7 +58,7 @@ func (k *Key) CurrentSequence(event *models.Event) (uint64, error) {
}
func (k *Key) EventQuery() (*models.SearchQuery, error) {
sequence, err := k.view.GetLatestKeySequence("")
sequence, err := k.view.GetLatestKeySequence()
if err != nil {
return nil, err
}

6
internal/auth/repository/eventsourcing/handler/login_policy.go
View File

@ -49,8 +49,8 @@ func (_ *LoginPolicy) AggregateTypes() []models.AggregateType {
return []models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
}
func (p *LoginPolicy) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestLoginPolicySequence(string(event.AggregateType))
func (p *LoginPolicy) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestLoginPolicySequence()
if err != nil {
return 0, err
}
@ -58,7 +58,7 @@ func (p *LoginPolicy) CurrentSequence(event *models.Event) (uint64, error) {
}
func (p *LoginPolicy) EventQuery() (*models.SearchQuery, error) {
sequence, err := p.view.GetLatestLoginPolicySequence("")
sequence, err := p.view.GetLatestLoginPolicySequence()
if err != nil {
return nil, err
}

7
internal/auth/repository/eventsourcing/handler/machine_keys.go
View File

@ -6,7 +6,6 @@ import (
"github.com/caos/logging"
"github.com/caos/zitadel/internal/eventstore"
"github.com/caos/zitadel/internal/eventstore/models"
es_models "github.com/caos/zitadel/internal/eventstore/models"
"github.com/caos/zitadel/internal/eventstore/query"
"github.com/caos/zitadel/internal/eventstore/spooler"
@ -50,8 +49,8 @@ func (_ *MachineKeys) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.UserAggregate}
}
func (k *MachineKeys) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := k.view.GetLatestMachineKeySequence(string(event.AggregateType))
func (k *MachineKeys) CurrentSequence() (uint64, error) {
sequence, err := k.view.GetLatestMachineKeySequence()
if err != nil {
return 0, err
}
@ -59,7 +58,7 @@ func (k *MachineKeys) CurrentSequence(event *models.Event) (uint64, error) {
}
func (k *MachineKeys) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := k.view.GetLatestMachineKeySequence("")
sequence, err := k.view.GetLatestMachineKeySequence()
if err != nil {
return nil, err
}

7
internal/auth/repository/eventsourcing/handler/org.go
View File

@ -4,7 +4,6 @@ import (
"github.com/caos/logging"
"github.com/caos/zitadel/internal/eventstore"
"github.com/caos/zitadel/internal/eventstore/models"
es_models "github.com/caos/zitadel/internal/eventstore/models"
"github.com/caos/zitadel/internal/eventstore/query"
"github.com/caos/zitadel/internal/eventstore/spooler"
@ -49,8 +48,8 @@ func (_ *Org) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.OrgAggregate}
}
func (o *Org) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := o.view.GetLatestOrgSequence(string(event.AggregateType))
func (o *Org) CurrentSequence() (uint64, error) {
sequence, err := o.view.GetLatestOrgSequence()
if err != nil {
return 0, err
}
@ -58,7 +57,7 @@ func (o *Org) CurrentSequence(event *models.Event) (uint64, error) {
}
func (o *Org) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := o.view.GetLatestOrgSequence("")
sequence, err := o.view.GetLatestOrgSequence()
if err != nil {
return nil, err
}

8
internal/auth/repository/eventsourcing/handler/org_iam_policy.go
View File

@ -2,8 +2,8 @@ package handler
import (
"github.com/caos/logging"
"github.com/caos/zitadel/internal/eventstore"
"github.com/caos/zitadel/internal/eventstore/models"
es_models "github.com/caos/zitadel/internal/eventstore/models"
"github.com/caos/zitadel/internal/eventstore/query"
"github.com/caos/zitadel/internal/eventstore/spooler"
@ -48,8 +48,8 @@ func (_ *OrgIAMPolicy) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{org_es_model.OrgAggregate, iam_es_model.IAMAggregate}
}
func (p *OrgIAMPolicy) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestOrgIAMPolicySequence(string(event.AggregateType))
func (p *OrgIAMPolicy) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestOrgIAMPolicySequence()
if err != nil {
return 0, err
}
@ -57,7 +57,7 @@ func (p *OrgIAMPolicy) CurrentSequence(event *models.Event) (uint64, error) {
}
func (p *OrgIAMPolicy) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := p.view.GetLatestOrgIAMPolicySequence("")
sequence, err := p.view.GetLatestOrgIAMPolicySequence()
if err != nil {
return nil, err
}

8
internal/auth/repository/eventsourcing/handler/password_complexity_policy.go
View File

@ -2,8 +2,8 @@ package handler
import (
"github.com/caos/logging"
"github.com/caos/zitadel/internal/eventstore"
"github.com/caos/zitadel/internal/eventstore/models"
es_models "github.com/caos/zitadel/internal/eventstore/models"
"github.com/caos/zitadel/internal/eventstore/query"
"github.com/caos/zitadel/internal/eventstore/spooler"
@ -48,8 +48,8 @@ func (_ *PasswordComplexityPolicy) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{org_es_model.OrgAggregate, iam_es_model.IAMAggregate}
}
func (p *PasswordComplexityPolicy) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestPasswordComplexityPolicySequence(string(event.AggregateType))
func (p *PasswordComplexityPolicy) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestPasswordComplexityPolicySequence()
if err != nil {
return 0, err
}
@ -57,7 +57,7 @@ func (p *PasswordComplexityPolicy) CurrentSequence(event *models.Event) (uint64,
}
func (p *PasswordComplexityPolicy) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := p.view.GetLatestPasswordComplexityPolicySequence("")
sequence, err := p.view.GetLatestPasswordComplexityPolicySequence()
if err != nil {
return nil, err
}

8
internal/auth/repository/eventsourcing/handler/project_role.go
View File

@ -2,8 +2,8 @@ package handler
import (
"github.com/caos/logging"
"github.com/caos/zitadel/internal/eventstore"
"github.com/caos/zitadel/internal/eventstore/models"
es_models "github.com/caos/zitadel/internal/eventstore/models"
"github.com/caos/zitadel/internal/eventstore/query"
"github.com/caos/zitadel/internal/eventstore/spooler"
@ -54,8 +54,8 @@ func (_ *ProjectRole) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.ProjectAggregate}
}
func (p *ProjectRole) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestProjectRoleSequence(string(event.AggregateType))
func (p *ProjectRole) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestProjectRoleSequence()
if err != nil {
return 0, err
}
@ -63,7 +63,7 @@ func (p *ProjectRole) CurrentSequence(event *models.Event) (uint64, error) {
}
func (p *ProjectRole) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := p.view.GetLatestProjectRoleSequence("")
sequence, err := p.view.GetLatestProjectRoleSequence()
if err != nil {
return nil, err
}

6
internal/auth/repository/eventsourcing/handler/token.go
View File

@ -58,8 +58,8 @@ func (_ *Token) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{user_es_model.UserAggregate, project_es_model.ProjectAggregate}
}
func (p *Token) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestTokenSequence(string(event.AggregateType))
func (p *Token) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestTokenSequence()
if err != nil {
return 0, err
}
@ -67,7 +67,7 @@ func (p *Token) CurrentSequence(event *models.Event) (uint64, error) {
}
func (t *Token) EventQuery() (*models.SearchQuery, error) {
sequence, err := t.view.GetLatestTokenSequence("")
sequence, err := t.view.GetLatestTokenSequence()
if err != nil {
return nil, err
}

6
internal/auth/repository/eventsourcing/handler/user.go
View File

@ -64,8 +64,8 @@ func (_ *User) AggregateTypes() []models.AggregateType {
return []models.AggregateType{es_model.UserAggregate, org_es_model.OrgAggregate}
}
func (u *User) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := u.view.GetLatestUserSequence(string(event.AggregateType))
func (u *User) CurrentSequence() (uint64, error) {
sequence, err := u.view.GetLatestUserSequence()
if err != nil {
return 0, err
}
@ -73,7 +73,7 @@ func (u *User) CurrentSequence(event *models.Event) (uint64, error) {
}
func (u *User) EventQuery() (*models.SearchQuery, error) {
sequence, err := u.view.GetLatestUserSequence("")
sequence, err := u.view.GetLatestUserSequence()
if err != nil {
return nil, err
}

6
internal/auth/repository/eventsourcing/handler/user_external_idps.go
View File

@ -68,8 +68,8 @@ func (_ *ExternalIDP) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.UserAggregate, iam_es_model.IAMAggregate, org_es_model.OrgAggregate}
}
func (i *ExternalIDP) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := i.view.GetLatestExternalIDPSequence(string(event.AggregateType))
func (i *ExternalIDP) CurrentSequence() (uint64, error) {
sequence, err := i.view.GetLatestExternalIDPSequence()
if err != nil {
return 0, err
}
@ -77,7 +77,7 @@ func (i *ExternalIDP) CurrentSequence(event *models.Event) (uint64, error) {
}
func (i *ExternalIDP) EventQuery() (*models.SearchQuery, error) {
sequence, err := i.view.GetLatestExternalIDPSequence("")
sequence, err := i.view.GetLatestExternalIDPSequence()
if err != nil {
return nil, err
}

6
internal/auth/repository/eventsourcing/handler/user_grant.go
View File

@ -82,8 +82,8 @@ func (_ *UserGrant) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{grant_es_model.UserGrantAggregate, iam_es_model.IAMAggregate, org_es_model.OrgAggregate, usr_es_model.UserAggregate, proj_es_model.ProjectAggregate}
}
func (u *UserGrant) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := u.view.GetLatestUserGrantSequence(string(event.AggregateType))
func (u *UserGrant) CurrentSequence() (uint64, error) {
sequence, err := u.view.GetLatestUserGrantSequence()
if err != nil {
return 0, err
}
@ -97,7 +97,7 @@ func (u *UserGrant) EventQuery() (*models.SearchQuery, error) {
return nil, err
}
}
sequence, err := u.view.GetLatestUserGrantSequence("")
sequence, err := u.view.GetLatestUserGrantSequence()
if err != nil {
return nil, err
}

6
internal/auth/repository/eventsourcing/handler/user_membership.go
View File

@ -64,8 +64,8 @@ func (_ *UserMembership) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{iam_es_model.IAMAggregate, org_es_model.OrgAggregate, proj_es_model.ProjectAggregate, model.UserAggregate}
}
func (m *UserMembership) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := m.view.GetLatestUserMembershipSequence(string(event.AggregateType))
func (m *UserMembership) CurrentSequence() (uint64, error) {
sequence, err := m.view.GetLatestUserMembershipSequence()
if err != nil {
return 0, err
}
@ -73,7 +73,7 @@ func (m *UserMembership) CurrentSequence(event *models.Event) (uint64, error) {
}
func (m *UserMembership) EventQuery() (*models.SearchQuery, error) {
sequence, err := m.view.GetLatestUserMembershipSequence("")
sequence, err := m.view.GetLatestUserMembershipSequence()
if err != nil {
return nil, err
}

6
internal/auth/repository/eventsourcing/handler/user_session.go
View File

@ -55,8 +55,8 @@ func (_ *UserSession) AggregateTypes() []models.AggregateType {
return []models.AggregateType{es_model.UserAggregate}
}
func (u *UserSession) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := u.view.GetLatestUserSessionSequence(string(event.AggregateType))
func (u *UserSession) CurrentSequence() (uint64, error) {
sequence, err := u.view.GetLatestUserSessionSequence()
if err != nil {
return 0, err
}
@ -64,7 +64,7 @@ func (u *UserSession) CurrentSequence(event *models.Event) (uint64, error) {
}
func (u *UserSession) EventQuery() (*models.SearchQuery, error) {
sequence, err := u.view.GetLatestUserSessionSequence("")
sequence, err := u.view.GetLatestUserSessionSequence()
if err != nil {
return nil, err
}

2
internal/auth/repository/eventsourcing/view/application.go
View File

@ -57,7 +57,7 @@ func (v *View) DeleteApplicationsByProjectID(projectID string) error {
}
func (v *View) GetLatestApplicationSequence() (*repository.CurrentSequence, error) {
return v.latestSequence(applicationTable, "")
return v.latestSequence(applicationTable)
}
func (v *View) ProcessedApplicationSequence(event *models.Event) error {

4
internal/auth/repository/eventsourcing/view/external_idps.go
View File

@ -65,8 +65,8 @@ func (v *View) DeleteExternalIDPsByUserID(userID string, event *models.Event) er
return v.ProcessedExternalIDPSequence(event)
}
func (v *View) GetLatestExternalIDPSequence(aggregateType string) (*global_view.CurrentSequence, error) {
return v.latestSequence(externalIDPTable, aggregateType)
func (v *View) GetLatestExternalIDPSequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(externalIDPTable)
}
func (v *View) ProcessedExternalIDPSequence(event *models.Event) error {

4
internal/auth/repository/eventsourcing/view/idp_configs.go
View File

@ -41,8 +41,8 @@ func (v *View) DeleteIDPConfig(idpID string, event *models.Event) error {
return v.ProcessedIDPConfigSequence(event)
}
func (v *View) GetLatestIDPConfigSequence(aggregateType string) (*global_view.CurrentSequence, error) {
return v.latestSequence(idpConfigTable, aggregateType)
func (v *View) GetLatestIDPConfigSequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(idpConfigTable)
}
func (v *View) ProcessedIDPConfigSequence(event *models.Event) error {

4
internal/auth/repository/eventsourcing/view/idp_providers.go
View File

@ -61,8 +61,8 @@ func (v *View) DeleteIDPProvidersByAggregateID(aggregateID string, event *models
return v.ProcessedIDPProviderSequence(event)
}
func (v *View) GetLatestIDPProviderSequence(aggregateType string) (*global_view.CurrentSequence, error) {
return v.latestSequence(idpProviderTable, aggregateType)
func (v *View) GetLatestIDPProviderSequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(idpProviderTable)
}
func (v *View) ProcessedIDPProviderSequence(event *models.Event) error {

4
internal/auth/repository/eventsourcing/view/key.go
View File

@ -57,8 +57,8 @@ func (v *View) DeleteKeyPair(keyID string, event *models.Event) error {
return v.ProcessedKeySequence(event)
}
func (v *View) GetLatestKeySequence(aggregateType string) (*repository.CurrentSequence, error) {
return v.latestSequence(keyTable, aggregateType)
func (v *View) GetLatestKeySequence() (*repository.CurrentSequence, error) {
return v.latestSequence(keyTable)
}
func (v *View) ProcessedKeySequence(event *models.Event) error {

4
internal/auth/repository/eventsourcing/view/login_policies.go
View File

@ -32,8 +32,8 @@ func (v *View) DeleteLoginPolicy(aggregateID string, event *models.Event) error
return v.ProcessedLoginPolicySequence(event)
}
func (v *View) GetLatestLoginPolicySequence(aggregateType string) (*global_view.CurrentSequence, error) {
return v.latestSequence(loginPolicyTable, aggregateType)
func (v *View) GetLatestLoginPolicySequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(loginPolicyTable)
}
func (v *View) ProcessedLoginPolicySequence(event *models.Event) error {

4
internal/auth/repository/eventsourcing/view/machine_keys.go
View File

@ -53,8 +53,8 @@ func (v *View) DeleteMachineKeysByUserID(userID string, event *models.Event) err
return v.ProcessedMachineKeySequence(event)
}
func (v *View) GetLatestMachineKeySequence(aggregateType string) (*repository.CurrentSequence, error) {
return v.latestSequence(machineKeyTable, aggregateType)
func (v *View) GetLatestMachineKeySequence() (*repository.CurrentSequence, error) {
return v.latestSequence(machineKeyTable)
}
func (v *View) ProcessedMachineKeySequence(event *models.Event) error {

4
internal/auth/repository/eventsourcing/view/org.go
View File

@ -44,8 +44,8 @@ func (v *View) UpdateOrgSpoolerRunTimestamp() error {
return v.updateSpoolerRunSequence(orgTable)
}
func (v *View) GetLatestOrgSequence(aggregateType string) (*repository.CurrentSequence, error) {
return v.latestSequence(orgTable, aggregateType)
func (v *View) GetLatestOrgSequence() (*repository.CurrentSequence, error) {
return v.latestSequence(orgTable)
}
func (v *View) ProcessedOrgSequence(event *models.Event) error {

4
internal/auth/repository/eventsourcing/view/org_iam_policy.go
View File

@ -32,8 +32,8 @@ func (v *View) DeleteOrgIAMPolicy(aggregateID string, event *models.Event) error
return v.ProcessedOrgIAMPolicySequence(event)
}
func (v *View) GetLatestOrgIAMPolicySequence(aggregateType string) (*global_view.CurrentSequence, error) {
return v.latestSequence(orgIAMPolicyTable, aggregateType)
func (v *View) GetLatestOrgIAMPolicySequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(orgIAMPolicyTable)
}
func (v *View) ProcessedOrgIAMPolicySequence(event *models.Event) error {

4
internal/auth/repository/eventsourcing/view/password_complexity_policy.go
View File

@ -32,8 +32,8 @@ func (v *View) DeletePasswordComplexityPolicy(aggregateID string, event *models.
return v.ProcessedPasswordComplexityPolicySequence(event)
}
func (v *View) GetLatestPasswordComplexityPolicySequence(aggregateType string) (*global_view.CurrentSequence, error) {
return v.latestSequence(passwordComplexityPolicyTable, aggregateType)
func (v *View) GetLatestPasswordComplexityPolicySequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(passwordComplexityPolicyTable)
}
func (v *View) ProcessedPasswordComplexityPolicySequence(event *models.Event) error {

4
internal/auth/repository/eventsourcing/view/project_role.go
View File

@ -53,8 +53,8 @@ func (v *View) DeleteProjectRolesByProjectID(projectID string) error {
return view.DeleteProjectRolesByProjectID(v.Db, projectRoleTable, projectID)
}
func (v *View) GetLatestProjectRoleSequence(aggregateType string) (*repository.CurrentSequence, error) {
return v.latestSequence(projectRoleTable, aggregateType)
func (v *View) GetLatestProjectRoleSequence() (*repository.CurrentSequence, error) {
return v.latestSequence(projectRoleTable)
}
func (v *View) ProcessedProjectRoleSequence(event *models.Event) error {

8
internal/auth/repository/eventsourcing/view/sequence.go
View File

@ -12,15 +12,15 @@ const (
)
func (v *View) saveCurrentSequence(viewName string, event *models.Event) error {
return repository.SaveCurrentSequence(v.Db, sequencesTable, viewName, string(event.AggregateType), event.Sequence, event.CreationDate)
return repository.SaveCurrentSequence(v.Db, sequencesTable, viewName, event.Sequence, event.CreationDate)
}
func (v *View) latestSequence(viewName, aggregateType string) (*repository.CurrentSequence, error) {
return repository.LatestSequence(v.Db, sequencesTable, viewName, aggregateType)
func (v *View) latestSequence(viewName string) (*repository.CurrentSequence, error) {
return repository.LatestSequence(v.Db, sequencesTable, viewName)
}
func (v *View) updateSpoolerRunSequence(viewName string) error {
currentSequence, err := repository.LatestSequence(v.Db, sequencesTable, viewName, "")
currentSequence, err := repository.LatestSequence(v.Db, sequencesTable, viewName)
if err != nil {
return err
}

4
internal/auth/repository/eventsourcing/view/token.go
View File

@ -68,8 +68,8 @@ func (v *View) DeleteApplicationTokens(event *models.Event, ids ...string) error
return v.ProcessedTokenSequence(event)
}
func (v *View) GetLatestTokenSequence(aggregateType string) (*repository.CurrentSequence, error) {
return v.latestSequence(tokenTable, aggregateType)
func (v *View) GetLatestTokenSequence() (*repository.CurrentSequence, error) {
return v.latestSequence(tokenTable)
}
func (v *View) ProcessedTokenSequence(event *models.Event) error {

4
internal/auth/repository/eventsourcing/view/user.go
View File

@ -77,8 +77,8 @@ func (v *View) DeleteUser(userID string, event *models.Event) error {
return v.ProcessedUserSequence(event)
}
func (v *View) GetLatestUserSequence(aggregateType string) (*repository.CurrentSequence, error) {
return v.latestSequence(userTable, aggregateType)
func (v *View) GetLatestUserSequence() (*repository.CurrentSequence, error) {
return v.latestSequence(userTable)
}
func (v *View) ProcessedUserSequence(event *models.Event) error {

4
internal/auth/repository/eventsourcing/view/user_grant.go
View File

@ -61,8 +61,8 @@ func (v *View) DeleteUserGrant(grantID string, event *models.Event) error {
return v.ProcessedUserGrantSequence(event)
}
func (v *View) GetLatestUserGrantSequence(aggregateType string) (*repository.CurrentSequence, error) {
return v.latestSequence(userGrantTable, aggregateType)
func (v *View) GetLatestUserGrantSequence() (*repository.CurrentSequence, error) {
return v.latestSequence(userGrantTable)
}
func (v *View) ProcessedUserGrantSequence(event *models.Event) error {

4
internal/auth/repository/eventsourcing/view/user_membership.go
View File

@ -77,8 +77,8 @@ func (v *View) DeleteUserMembershipsByAggregateIDAndObjectID(aggregateID, object
return v.ProcessedUserMembershipSequence(event)
}
func (v *View) GetLatestUserMembershipSequence(aggregateType string) (*repository.CurrentSequence, error) {
return v.latestSequence(userMembershipTable, aggregateType)
func (v *View) GetLatestUserMembershipSequence() (*repository.CurrentSequence, error) {
return v.latestSequence(userMembershipTable)
}
func (v *View) ProcessedUserMembershipSequence(event *models.Event) error {

4
internal/auth/repository/eventsourcing/view/user_session.go
View File

@ -52,8 +52,8 @@ func (v *View) DeleteUserSessions(userID string, event *models.Event) error {
return v.ProcessedUserSessionSequence(event)
}
func (v *View) GetLatestUserSessionSequence(aggregateType string) (*repository.CurrentSequence, error) {
return v.latestSequence(userSessionTable, aggregateType)
func (v *View) GetLatestUserSessionSequence() (*repository.CurrentSequence, error) {
return v.latestSequence(userSessionTable)
}
func (v *View) ProcessedUserSessionSequence(event *models.Event) error {

6
internal/authz/repository/eventsourcing/handler/application.go
View File

@ -48,8 +48,8 @@ func (a *Application) AggregateTypes() []models.AggregateType {
return []models.AggregateType{es_model.ProjectAggregate}
}
func (a *Application) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := a.view.GetLatestApplicationSequence(string(event.AggregateType))
func (a *Application) CurrentSequence() (uint64, error) {
sequence, err := a.view.GetLatestApplicationSequence()
if err != nil {
return 0, err
}
@ -57,7 +57,7 @@ func (a *Application) CurrentSequence(event *models.Event) (uint64, error) {
}
func (a *Application) EventQuery() (*models.SearchQuery, error) {
sequence, err := a.view.GetLatestApplicationSequence("")
sequence, err := a.view.GetLatestApplicationSequence()
if err != nil {
return nil, err
}

7
internal/authz/repository/eventsourcing/handler/org.go
View File

@ -4,7 +4,6 @@ import (
"github.com/caos/logging"
"github.com/caos/zitadel/internal/eventstore"
"github.com/caos/zitadel/internal/eventstore/models"
es_models "github.com/caos/zitadel/internal/eventstore/models"
"github.com/caos/zitadel/internal/eventstore/query"
"github.com/caos/zitadel/internal/eventstore/spooler"
@ -49,8 +48,8 @@ func (_ *Org) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.OrgAggregate}
}
func (o *Org) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := o.view.GetLatestOrgSequence(string(event.AggregateType))
func (o *Org) CurrentSequence() (uint64, error) {
sequence, err := o.view.GetLatestOrgSequence()
if err != nil {
return 0, err
}
@ -58,7 +57,7 @@ func (o *Org) CurrentSequence(event *models.Event) (uint64, error) {
}
func (o *Org) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := o.view.GetLatestOrgSequence("")
sequence, err := o.view.GetLatestOrgSequence()
if err != nil {
return nil, err
}

6
internal/authz/repository/eventsourcing/handler/user_grant.go
View File

@ -66,8 +66,8 @@ func (_ *UserGrant) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{iam_es_model.IAMAggregate, org_es_model.OrgAggregate, proj_es_model.ProjectAggregate}
}
func (u *UserGrant) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := u.view.GetLatestUserGrantSequence(string(event.AggregateType))
func (u *UserGrant) CurrentSequence() (uint64, error) {
sequence, err := u.view.GetLatestUserGrantSequence()
if err != nil {
return 0, err
}
@ -81,7 +81,7 @@ func (u *UserGrant) EventQuery() (*models.SearchQuery, error) {
return nil, err
}
}
sequence, err := u.view.GetLatestUserGrantSequence("")
sequence, err := u.view.GetLatestUserGrantSequence()
if err != nil {
return nil, err
}

4
internal/authz/repository/eventsourcing/view/application.go
View File

@ -51,8 +51,8 @@ func (v *View) DeleteApplication(appID string, event *models.Event) error {
return v.ProcessedApplicationSequence(event)
}
func (v *View) GetLatestApplicationSequence(aggregateType string) (*repository.CurrentSequence, error) {
return v.latestSequence(applicationTable, aggregateType)
func (v *View) GetLatestApplicationSequence() (*repository.CurrentSequence, error) {
return v.latestSequence(applicationTable)
}
func (v *View) ProcessedApplicationSequence(event *models.Event) error {

4
internal/authz/repository/eventsourcing/view/org.go
View File

@ -36,8 +36,8 @@ func (v *View) ProcessedOrgFailedEvent(failedEvent *repository.FailedEvent) erro
return v.saveFailedEvent(failedEvent)
}
func (v *View) GetLatestOrgSequence(aggregateType string) (*repository.CurrentSequence, error) {
return v.latestSequence(orgTable, aggregateType)
func (v *View) GetLatestOrgSequence() (*repository.CurrentSequence, error) {
return v.latestSequence(orgTable)
}
func (v *View) ProcessedOrgSequence(event *models.Event) error {

8
internal/authz/repository/eventsourcing/view/sequence.go
View File

@ -12,15 +12,15 @@ const (
)
func (v *View) saveCurrentSequence(viewName string, event *models.Event) error {
return repository.SaveCurrentSequence(v.Db, sequencesTable, viewName, string(event.AggregateType), event.Sequence, event.CreationDate)
return repository.SaveCurrentSequence(v.Db, sequencesTable, viewName, event.Sequence, event.CreationDate)
}
func (v *View) latestSequence(viewName, aggregateType string) (*repository.CurrentSequence, error) {
return repository.LatestSequence(v.Db, sequencesTable, viewName, aggregateType)
func (v *View) latestSequence(viewName string) (*repository.CurrentSequence, error) {
return repository.LatestSequence(v.Db, sequencesTable, viewName)
}
func (v *View) updateSpoolerRunSequence(viewName string) error {
currentSequence, err := repository.LatestSequence(v.Db, sequencesTable, viewName, "")
currentSequence, err := repository.LatestSequence(v.Db, sequencesTable, viewName)
if err != nil {
return err
}

4
internal/authz/repository/eventsourcing/view/token.go
View File

@ -40,8 +40,8 @@ func (v *View) DeleteSessionTokens(agentID, userID string, event *models.Event)
return v.ProcessedTokenSequence(event)
}
func (v *View) GetLatestTokenSequence(aggregateType string) (*repository.CurrentSequence, error) {
return v.latestSequence(tokenTable, aggregateType)
func (v *View) GetLatestTokenSequence() (*repository.CurrentSequence, error) {
return v.latestSequence(tokenTable)
}
func (v *View) ProcessedTokenSequence(event *models.Event) error {

4
internal/authz/repository/eventsourcing/view/user_grant.go
View File

@ -49,8 +49,8 @@ func (v *View) DeleteUserGrant(grantID string, event *models.Event) error {
return v.ProcessedUserGrantSequence(event)
}
func (v *View) GetLatestUserGrantSequence(aggregateType string) (*repository.CurrentSequence, error) {
return v.latestSequence(userGrantTable, aggregateType)
func (v *View) GetLatestUserGrantSequence() (*repository.CurrentSequence, error) {
return v.latestSequence(userGrantTable)
}
func (v *View) ProcessedUserGrantSequence(event *models.Event) error {

28
internal/eventstore/query/handler.go
View File

@ -5,6 +5,7 @@ import (
"time"
"github.com/caos/logging"
"github.com/caos/zitadel/internal/eventstore"
"github.com/caos/zitadel/internal/eventstore/models"
)
@ -24,12 +25,12 @@ type Handler interface {
QueryLimit() uint64
AggregateTypes() []models.AggregateType
CurrentSequence(*models.Event) (uint64, error)
CurrentSequence() (uint64, error)
Eventstore() eventstore.Eventstore
}
func ReduceEvent(handler Handler, event *models.Event) {
currentSequence, err := handler.CurrentSequence(event)
currentSequence, err := handler.CurrentSequence()
if err != nil {
logging.Log("HANDL-BmpkC").WithError(err).Warn("unable to get current sequence")
return
@ -46,32 +47,23 @@ func ReduceEvent(handler Handler, event *models.Event) {
return
}
processedSequences := map[models.AggregateType]uint64{}
for _, unprocessedEvent := range unprocessedEvents {
currentSequence, err := handler.CurrentSequence(unprocessedEvent)
currentSequence, err := handler.CurrentSequence()
if err != nil {
logging.Log("HANDL-BmpkC").WithError(err).Warn("unable to get current sequence")
return
}
_, ok := processedSequences[unprocessedEvent.AggregateType]
if !ok {
processedSequences[unprocessedEvent.AggregateType] = currentSequence
}
if processedSequences[unprocessedEvent.AggregateType] != currentSequence {
if currentSequence < processedSequences[unprocessedEvent.AggregateType] {
logging.LogWithFields("QUERY-DOYVN",
"processed", processedSequences[unprocessedEvent.AggregateType],
"current", currentSequence,
"view", handler.ViewModel()).
Warn("sequence not matching")
}
if unprocessedEvent.Sequence < currentSequence {
logging.LogWithFields("QUERY-DOYVN",
"unprocessed", unprocessedEvent.Sequence,
"current", currentSequence,
"view", handler.ViewModel()).
Warn("sequence not matching")
return
}
err = handler.Reduce(unprocessedEvent)
logging.LogWithFields("HANDL-V42TI", "seq", unprocessedEvent.Sequence).OnError(err).Warn("reduce failed")
processedSequences[unprocessedEvent.AggregateType] = unprocessedEvent.Sequence
}
if len(unprocessedEvents) == eventLimit {
logging.LogWithFields("QUERY-BSqe9", "seq", event.Sequence).Warn("didnt process event")

2
internal/eventstore/spooler/spooler_test.go
View File

@ -29,7 +29,7 @@ func (h *testHandler) AggregateTypes() []models.AggregateType {
return nil
}
func (h *testHandler) CurrentSequence(event *models.Event) (uint64, error) {
func (h *testHandler) CurrentSequence() (uint64, error) {
return 0, nil
}

8
internal/management/repository/eventsourcing/eventstore/org.go
View File

@ -108,7 +108,7 @@ func (repo *OrgRepository) GetMyOrgIamPolicy(ctx context.Context) (*iam_model.Or
func (repo *OrgRepository) SearchMyOrgDomains(ctx context.Context, request *org_model.OrgDomainSearchRequest) (*org_model.OrgDomainSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
request.Queries = append(request.Queries, &org_model.OrgDomainSearchQuery{Key: org_model.OrgDomainSearchKeyOrgID, Method: global_model.SearchMethodEquals, Value: authz.GetCtxData(ctx).OrgID})
sequence, sequenceErr := repo.View.GetLatestOrgDomainSequence("")
sequence, sequenceErr := repo.View.GetLatestOrgDomainSequence()
logging.Log("EVENT-SLowp").OnError(sequenceErr).WithField("traceID", tracing.TraceIDFromCtx(ctx)).Warn("could not read latest org domain sequence")
domains, count, err := repo.View.SearchOrgDomains(request)
if err != nil {
@ -205,7 +205,7 @@ func (repo *OrgRepository) RemoveMyOrgMember(ctx context.Context, userID string)
func (repo *OrgRepository) SearchMyOrgMembers(ctx context.Context, request *org_model.OrgMemberSearchRequest) (*org_model.OrgMemberSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
request.Queries[len(request.Queries)-1] = &org_model.OrgMemberSearchQuery{Key: org_model.OrgMemberSearchKeyOrgID, Method: global_model.SearchMethodEquals, Value: authz.GetCtxData(ctx).OrgID}
sequence, sequenceErr := repo.View.GetLatestOrgMemberSequence("")
sequence, sequenceErr := repo.View.GetLatestOrgMemberSequence()
logging.Log("EVENT-Smu3d").OnError(sequenceErr).Warn("could not read latest org member sequence")
members, count, err := repo.View.SearchOrgMembers(request)
if err != nil {
@ -292,7 +292,7 @@ func (repo *OrgRepository) SearchIDPConfigs(ctx context.Context, request *iam_mo
request.EnsureLimit(repo.SearchLimit)
request.AppendMyOrgQuery(authz.GetCtxData(ctx).OrgID, repo.SystemDefaults.IamID)
sequence, sequenceErr := repo.View.GetLatestIDPConfigSequence("")
sequence, sequenceErr := repo.View.GetLatestIDPConfigSequence()
logging.Log("EVENT-Dk8si").OnError(sequenceErr).Warn("could not read latest idp config sequence")
idps, count, err := repo.View.SearchIDPConfigs(request)
if err != nil {
@ -414,7 +414,7 @@ func (repo *OrgRepository) SearchIDPProviders(ctx context.Context, request *iam_
request.AppendAggregateIDQuery(authz.GetCtxData(ctx).OrgID)
}
request.EnsureLimit(repo.SearchLimit)
sequence, sequenceErr := repo.View.GetLatestIDPProviderSequence("")
sequence, sequenceErr := repo.View.GetLatestIDPProviderSequence()
logging.Log("EVENT-Tuiks").OnError(sequenceErr).Warn("could not read latest iam sequence")
providers, count, err := repo.View.SearchIDPProviders(request)
if err != nil {

14
internal/management/repository/eventsourcing/eventstore/project.go
View File

@ -118,7 +118,7 @@ func (repo *ProjectRepo) RemoveProject(ctx context.Context, projectID string) er
func (repo *ProjectRepo) SearchProjects(ctx context.Context, request *proj_model.ProjectViewSearchRequest) (*proj_model.ProjectViewSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
sequence, sequenceErr := repo.View.GetLatestProjectSequence("")
sequence, sequenceErr := repo.View.GetLatestProjectSequence()
logging.Log("EVENT-Edc56").OnError(sequenceErr).Warn("could not read latest project sequence")
permissions := authz.GetRequestPermissionsFromCtx(ctx)
@ -198,7 +198,7 @@ func (repo *ProjectRepo) RemoveProjectMember(ctx context.Context, projectID, use
func (repo *ProjectRepo) SearchProjectMembers(ctx context.Context, request *proj_model.ProjectMemberSearchRequest) (*proj_model.ProjectMemberSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
sequence, sequenceErr := repo.View.GetLatestProjectMemberSequence("")
sequence, sequenceErr := repo.View.GetLatestProjectMemberSequence()
logging.Log("EVENT-3dgt6").OnError(sequenceErr).Warn("could not read latest project member sequence")
members, count, err := repo.View.SearchProjectMembers(request)
if err != nil {
@ -270,7 +270,7 @@ func (repo *ProjectRepo) RemoveProjectRole(ctx context.Context, projectID, key s
func (repo *ProjectRepo) SearchProjectRoles(ctx context.Context, projectID string, request *proj_model.ProjectRoleSearchRequest) (*proj_model.ProjectRoleSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
request.AppendProjectQuery(projectID)
sequence, sequenceErr := repo.View.GetLatestProjectRoleSequence("")
sequence, sequenceErr := repo.View.GetLatestProjectRoleSequence()
logging.Log("LSp0d-47suf").OnError(sequenceErr).Warn("could not read latest project role sequence")
roles, count, err := repo.View.SearchProjectRoles(request)
if err != nil {
@ -366,7 +366,7 @@ func (repo *ProjectRepo) RemoveApplication(ctx context.Context, projectID, appID
func (repo *ProjectRepo) SearchApplications(ctx context.Context, request *proj_model.ApplicationSearchRequest) (*proj_model.ApplicationSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
sequence, sequenceErr := repo.View.GetLatestApplicationSequence("")
sequence, sequenceErr := repo.View.GetLatestApplicationSequence()
logging.Log("EVENT-SKe8s").OnError(sequenceErr).Warn("could not read latest application sequence")
apps, count, err := repo.View.SearchApplications(request)
if err != nil {
@ -423,7 +423,7 @@ func (repo *ProjectRepo) ProjectGrantByID(ctx context.Context, grantID string) (
func (repo *ProjectRepo) SearchProjectGrants(ctx context.Context, request *proj_model.ProjectGrantViewSearchRequest) (*proj_model.ProjectGrantViewSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
sequence, sequenceErr := repo.View.GetLatestProjectGrantSequence("")
sequence, sequenceErr := repo.View.GetLatestProjectGrantSequence()
logging.Log("EVENT-Skw9f").OnError(sequenceErr).Warn("could not read latest project grant sequence")
projects, count, err := repo.View.SearchProjectGrants(request)
if err != nil {
@ -444,7 +444,7 @@ func (repo *ProjectRepo) SearchProjectGrants(ctx context.Context, request *proj_
func (repo *ProjectRepo) SearchGrantedProjects(ctx context.Context, request *proj_model.ProjectGrantViewSearchRequest) (*proj_model.ProjectGrantViewSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
sequence, sequenceErr := repo.View.GetLatestProjectGrantSequence("")
sequence, sequenceErr := repo.View.GetLatestProjectGrantSequence()
logging.Log("EVENT-Skw9f").OnError(sequenceErr).Warn("could not read latest project grant sequence")
permissions := authz.GetRequestPermissionsFromCtx(ctx)
@ -612,7 +612,7 @@ func (repo *ProjectRepo) RemoveProjectGrantMember(ctx context.Context, projectID
func (repo *ProjectRepo) SearchProjectGrantMembers(ctx context.Context, request *proj_model.ProjectGrantMemberSearchRequest) (*proj_model.ProjectGrantMemberSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
sequence, sequenceErr := repo.View.GetLatestProjectGrantMemberSequence("")
sequence, sequenceErr := repo.View.GetLatestProjectGrantMemberSequence()
logging.Log("EVENT-Du8sk").OnError(sequenceErr).Warn("could not read latest project grant sequence")
members, count, err := repo.View.SearchProjectGrantMembers(request)
if err != nil {

8
internal/management/repository/eventsourcing/eventstore/user.go
View File

@ -156,7 +156,7 @@ func (repo *UserRepo) RemoveUser(ctx context.Context, id string) error {
func (repo *UserRepo) SearchUsers(ctx context.Context, request *usr_model.UserSearchRequest) (*usr_model.UserSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
sequence, sequenceErr := repo.View.GetLatestUserSequence("")
sequence, sequenceErr := repo.View.GetLatestUserSequence()
logging.Log("EVENT-Lcn7d").OnError(sequenceErr).Warn("could not read latest user sequence")
users, count, err := repo.View.SearchUsers(request)
if err != nil {
@ -274,7 +274,7 @@ func (repo *UserRepo) ProfileByID(ctx context.Context, userID string) (*usr_mode
func (repo *UserRepo) SearchExternalIDPs(ctx context.Context, request *usr_model.ExternalIDPSearchRequest) (*usr_model.ExternalIDPSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
sequence, seqErr := repo.View.GetLatestExternalIDPSequence("")
sequence, seqErr := repo.View.GetLatestExternalIDPSequence()
logging.Log("EVENT-Qs7uf").OnError(seqErr).Warn("could not read latest external idp sequence")
externalIDPS, count, err := repo.View.SearchExternalIDPs(request)
if err != nil {
@ -311,7 +311,7 @@ func (repo *UserRepo) GetMachineKey(ctx context.Context, userID, keyID string) (
func (repo *UserRepo) SearchMachineKeys(ctx context.Context, request *usr_model.MachineKeySearchRequest) (*usr_model.MachineKeySearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
sequence, seqErr := repo.View.GetLatestMachineKeySequence("")
sequence, seqErr := repo.View.GetLatestMachineKeySequence()
logging.Log("EVENT-Sk8fs").OnError(seqErr).Warn("could not read latest user sequence")
keys, count, err := repo.View.SearchMachineKeys(request)
if err != nil {
@ -413,7 +413,7 @@ func (repo *UserRepo) ChangeAddress(ctx context.Context, address *usr_model.Addr
func (repo *UserRepo) SearchUserMemberships(ctx context.Context, request *usr_model.UserMembershipSearchRequest) (*usr_model.UserMembershipSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
sequence, sequenceErr := repo.View.GetLatestUserMembershipSequence("")
sequence, sequenceErr := repo.View.GetLatestUserMembershipSequence()
logging.Log("EVENT-Dn7sf").OnError(sequenceErr).Warn("could not read latest user sequence")
result := handleSearchUserMembershipsPermissions(ctx, request, sequence)

2
internal/management/repository/eventsourcing/eventstore/user_grant.go
View File

@ -116,7 +116,7 @@ func (repo *UserGrantRepo) BulkRemoveUserGrant(ctx context.Context, grantIDs ...
func (repo *UserGrantRepo) SearchUserGrants(ctx context.Context, request *grant_model.UserGrantSearchRequest) (*grant_model.UserGrantSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
sequence, sequenceErr := repo.View.GetLatestUserGrantSequence("")
sequence, sequenceErr := repo.View.GetLatestUserGrantSequence()
logging.Log("EVENT-5Viwf").OnError(sequenceErr).Warn("could not read latest user grant sequence")
result := handleSearchUserGrantPermissions(ctx, request, sequence)

6
internal/management/repository/eventsourcing/handler/application.go
View File

@ -56,8 +56,8 @@ func (_ *Application) AggregateTypes() []models.AggregateType {
return []models.AggregateType{es_model.ProjectAggregate}
}
func (a *Application) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := a.view.GetLatestApplicationSequence(string(event.AggregateType))
func (a *Application) CurrentSequence() (uint64, error) {
sequence, err := a.view.GetLatestApplicationSequence()
if err != nil {
return 0, err
}
@ -65,7 +65,7 @@ func (a *Application) CurrentSequence(event *models.Event) (uint64, error) {
}
func (a *Application) EventQuery() (*models.SearchQuery, error) {
sequence, err := a.view.GetLatestApplicationSequence("")
sequence, err := a.view.GetLatestApplicationSequence()
if err != nil {
return nil, err
}

8
internal/management/repository/eventsourcing/handler/idp_config.go
View File

@ -2,8 +2,8 @@ package handler
import (
"github.com/caos/logging"
"github.com/caos/zitadel/internal/eventstore"
"github.com/caos/zitadel/internal/eventstore/models"
es_models "github.com/caos/zitadel/internal/eventstore/models"
"github.com/caos/zitadel/internal/eventstore/query"
"github.com/caos/zitadel/internal/eventstore/spooler"
@ -49,8 +49,8 @@ func (_ *IDPConfig) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
}
func (m *IDPConfig) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := m.view.GetLatestIDPConfigSequence(string(event.AggregateType))
func (m *IDPConfig) CurrentSequence() (uint64, error) {
sequence, err := m.view.GetLatestIDPConfigSequence()
if err != nil {
return 0, err
}
@ -58,7 +58,7 @@ func (m *IDPConfig) CurrentSequence(event *models.Event) (uint64, error) {
}
func (m *IDPConfig) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := m.view.GetLatestIDPConfigSequence("")
sequence, err := m.view.GetLatestIDPConfigSequence()
if err != nil {
return nil, err
}

6
internal/management/repository/eventsourcing/handler/idp_providers.go
View File

@ -64,8 +64,8 @@ func (_ *IDPProvider) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.IAMAggregate, org_es_model.OrgAggregate}
}
func (m *IDPProvider) CurrentSequence(event *es_models.Event) (uint64, error) {
sequence, err := m.view.GetLatestIDPProviderSequence(string(event.AggregateType))
func (m *IDPProvider) CurrentSequence() (uint64, error) {
sequence, err := m.view.GetLatestIDPProviderSequence()
if err != nil {
return 0, err
}
@ -73,7 +73,7 @@ func (m *IDPProvider) CurrentSequence(event *es_models.Event) (uint64, error) {
}
func (m *IDPProvider) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := m.view.GetLatestIDPProviderSequence("")
sequence, err := m.view.GetLatestIDPProviderSequence()
if err != nil {
return nil, err
}

6
internal/management/repository/eventsourcing/handler/label_policy.go
View File

@ -48,8 +48,8 @@ func (_ *LabelPolicy) AggregateTypes() []models.AggregateType {
return []models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
}
func (m *LabelPolicy) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := m.view.GetLatestLabelPolicySequence(string(event.AggregateType))
func (m *LabelPolicy) CurrentSequence() (uint64, error) {
sequence, err := m.view.GetLatestLabelPolicySequence()
if err != nil {
return 0, err
}
@ -57,7 +57,7 @@ func (m *LabelPolicy) CurrentSequence(event *models.Event) (uint64, error) {
}
func (m *LabelPolicy) EventQuery() (*models.SearchQuery, error) {
sequence, err := m.view.GetLatestLabelPolicySequence("")
sequence, err := m.view.GetLatestLabelPolicySequence()
if err != nil {
return nil, err
}

6
internal/management/repository/eventsourcing/handler/login_policy.go
View File

@ -48,8 +48,8 @@ func (_ *LoginPolicy) AggregateTypes() []models.AggregateType {
return []models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
}
func (m *LoginPolicy) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := m.view.GetLatestLoginPolicySequence(string(event.AggregateType))
func (m *LoginPolicy) CurrentSequence() (uint64, error) {
sequence, err := m.view.GetLatestLoginPolicySequence()
if err != nil {
return 0, err
}
@ -57,7 +57,7 @@ func (m *LoginPolicy) CurrentSequence(event *models.Event) (uint64, error) {
}
func (m *LoginPolicy) EventQuery() (*models.SearchQuery, error) {
sequence, err := m.view.GetLatestLoginPolicySequence("")
sequence, err := m.view.GetLatestLoginPolicySequence()
if err != nil {
return nil, err
}

6
internal/management/repository/eventsourcing/handler/machine_keys.go
View File

@ -49,8 +49,8 @@ func (_ *MachineKeys) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.UserAggregate}
}
func (k *MachineKeys) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := k.view.GetLatestMachineKeySequence(string(event.AggregateType))
func (k *MachineKeys) CurrentSequence() (uint64, error) {
sequence, err := k.view.GetLatestMachineKeySequence()
if err != nil {
return 0, err
}
@ -58,7 +58,7 @@ func (k *MachineKeys) CurrentSequence(event *models.Event) (uint64, error) {
}
func (d *MachineKeys) EventQuery() (*models.SearchQuery, error) {
sequence, err := d.view.GetLatestMachineKeySequence("")
sequence, err := d.view.GetLatestMachineKeySequence()
if err != nil {
return nil, err
}

8
internal/management/repository/eventsourcing/handler/org.go
View File

@ -2,8 +2,8 @@ package handler
import (
"github.com/caos/logging"
"github.com/caos/zitadel/internal/eventstore"
"github.com/caos/zitadel/internal/eventstore/models"
es_models "github.com/caos/zitadel/internal/eventstore/models"
"github.com/caos/zitadel/internal/eventstore/query"
"github.com/caos/zitadel/internal/eventstore/spooler"
@ -48,8 +48,8 @@ func (_ *Org) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.OrgAggregate}
}
func (o *Org) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := o.view.GetLatestOrgSequence(string(event.AggregateType))
func (o *Org) CurrentSequence() (uint64, error) {
sequence, err := o.view.GetLatestOrgSequence()
if err != nil {
return 0, err
}
@ -57,7 +57,7 @@ func (o *Org) CurrentSequence(event *models.Event) (uint64, error) {
}
func (o *Org) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := o.view.GetLatestOrgSequence("")
sequence, err := o.view.GetLatestOrgSequence()
if err != nil {
return nil, err
}

6
internal/management/repository/eventsourcing/handler/org_domain.go
View File

@ -47,8 +47,8 @@ func (_ *OrgDomain) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.OrgAggregate}
}
func (p *OrgDomain) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestOrgDomainSequence(string(event.AggregateType))
func (p *OrgDomain) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestOrgDomainSequence()
if err != nil {
return 0, err
}
@ -56,7 +56,7 @@ func (p *OrgDomain) CurrentSequence(event *models.Event) (uint64, error) {
}
func (d *OrgDomain) EventQuery() (*models.SearchQuery, error) {
sequence, err := d.view.GetLatestOrgDomainSequence("")
sequence, err := d.view.GetLatestOrgDomainSequence()
if err != nil {
return nil, err
}

6
internal/management/repository/eventsourcing/handler/org_iam_policy.go
View File

@ -48,8 +48,8 @@ func (_ *OrgIAMPolicy) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
}
func (p *OrgIAMPolicy) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestOrgIAMPolicySequence(string(event.AggregateType))
func (p *OrgIAMPolicy) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestOrgIAMPolicySequence()
if err != nil {
return 0, err
}
@ -57,7 +57,7 @@ func (p *OrgIAMPolicy) CurrentSequence(event *models.Event) (uint64, error) {
}
func (m *OrgIAMPolicy) EventQuery() (*models.SearchQuery, error) {
sequence, err := m.view.GetLatestOrgIAMPolicySequence("")
sequence, err := m.view.GetLatestOrgIAMPolicySequence()
if err != nil {
return nil, err
}

6
internal/management/repository/eventsourcing/handler/org_member.go
View File

@ -57,8 +57,8 @@ func (_ *OrgMember) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.OrgAggregate, usr_es_model.UserAggregate}
}
func (p *OrgMember) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestOrgMemberSequence(string(event.AggregateType))
func (p *OrgMember) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestOrgMemberSequence()
if err != nil {
return 0, err
}
@ -66,7 +66,7 @@ func (p *OrgMember) CurrentSequence(event *models.Event) (uint64, error) {
}
func (m *OrgMember) EventQuery() (*models.SearchQuery, error) {
sequence, err := m.view.GetLatestOrgMemberSequence("")
sequence, err := m.view.GetLatestOrgMemberSequence()
if err != nil {
return nil, err
}

6
internal/management/repository/eventsourcing/handler/password_age_policy.go
View File

@ -48,8 +48,8 @@ func (_ *PasswordAgePolicy) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
}
func (o *PasswordAgePolicy) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := o.view.GetLatestPasswordAgePolicySequence(string(event.AggregateType))
func (o *PasswordAgePolicy) CurrentSequence() (uint64, error) {
sequence, err := o.view.GetLatestPasswordAgePolicySequence()
if err != nil {
return 0, err
}
@ -57,7 +57,7 @@ func (o *PasswordAgePolicy) CurrentSequence(event *models.Event) (uint64, error)
}
func (p *PasswordAgePolicy) EventQuery() (*models.SearchQuery, error) {
sequence, err := p.view.GetLatestPasswordAgePolicySequence("")
sequence, err := p.view.GetLatestPasswordAgePolicySequence()
if err != nil {
return nil, err
}

6
internal/management/repository/eventsourcing/handler/password_complexity_policy.go
View File

@ -48,8 +48,8 @@ func (_ *PasswordComplexityPolicy) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
}
func (p *PasswordComplexityPolicy) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestPasswordComplexityPolicySequence(string(event.AggregateType))
func (p *PasswordComplexityPolicy) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestPasswordComplexityPolicySequence()
if err != nil {
return 0, err
}
@ -57,7 +57,7 @@ func (p *PasswordComplexityPolicy) CurrentSequence(event *models.Event) (uint64,
}
func (p *PasswordComplexityPolicy) EventQuery() (*models.SearchQuery, error) {
sequence, err := p.view.GetLatestPasswordComplexityPolicySequence("")
sequence, err := p.view.GetLatestPasswordComplexityPolicySequence()
if err != nil {
return nil, err
}

6
internal/management/repository/eventsourcing/handler/password_lockout_policy.go
View File

@ -49,8 +49,8 @@ func (_ *PasswordLockoutPolicy) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
}
func (p *PasswordLockoutPolicy) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestPasswordLockoutPolicySequence(string(event.AggregateType))
func (p *PasswordLockoutPolicy) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestPasswordLockoutPolicySequence()
if err != nil {
return 0, err
}
@ -58,7 +58,7 @@ func (p *PasswordLockoutPolicy) CurrentSequence(event *models.Event) (uint64, er
}
func (p *PasswordLockoutPolicy) EventQuery() (*models.SearchQuery, error) {
sequence, err := p.view.GetLatestPasswordLockoutPolicySequence("")
sequence, err := p.view.GetLatestPasswordLockoutPolicySequence()
if err != nil {
return nil, err
}

6
internal/management/repository/eventsourcing/handler/project.go
View File

@ -48,8 +48,8 @@ func (_ *Project) AggregateTypes() []models.AggregateType {
return []models.AggregateType{es_model.ProjectAggregate}
}
func (p *Project) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestProjectSequence(string(event.AggregateType))
func (p *Project) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestProjectSequence()
if err != nil {
return 0, err
}
@ -57,7 +57,7 @@ func (p *Project) CurrentSequence(event *models.Event) (uint64, error) {
}
func (p *Project) EventQuery() (*models.SearchQuery, error) {
sequence, err := p.view.GetLatestProjectSequence("")
sequence, err := p.view.GetLatestProjectSequence()
if err != nil {
return nil, err
}

6
internal/management/repository/eventsourcing/handler/project_grant.go
View File

@ -61,8 +61,8 @@ func (_ *ProjectGrant) AggregateTypes() []models.AggregateType {
return []models.AggregateType{es_model.ProjectAggregate}
}
func (p *ProjectGrant) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestProjectGrantSequence(string(event.AggregateType))
func (p *ProjectGrant) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestProjectGrantSequence()
if err != nil {
return 0, err
}
@ -70,7 +70,7 @@ func (p *ProjectGrant) CurrentSequence(event *models.Event) (uint64, error) {
}
func (p *ProjectGrant) EventQuery() (*models.SearchQuery, error) {
sequence, err := p.view.GetLatestProjectGrantSequence("")
sequence, err := p.view.GetLatestProjectGrantSequence()
if err != nil {
return nil, err
}

6
internal/management/repository/eventsourcing/handler/project_grant_member.go
View File

@ -58,8 +58,8 @@ func (_ *ProjectGrantMember) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{proj_es_model.ProjectAggregate, usr_es_model.UserAggregate}
}
func (p *ProjectGrantMember) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestProjectGrantMemberSequence(string(event.AggregateType))
func (p *ProjectGrantMember) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestProjectGrantMemberSequence()
if err != nil {
return 0, err
}
@ -67,7 +67,7 @@ func (p *ProjectGrantMember) CurrentSequence(event *models.Event) (uint64, error
}
func (p *ProjectGrantMember) EventQuery() (*models.SearchQuery, error) {
sequence, err := p.view.GetLatestProjectGrantMemberSequence("")
sequence, err := p.view.GetLatestProjectGrantMemberSequence()
if err != nil {
return nil, err
}

6
internal/management/repository/eventsourcing/handler/project_member.go
View File

@ -58,8 +58,8 @@ func (_ *ProjectMember) AggregateTypes() []models.AggregateType {
return []models.AggregateType{proj_es_model.ProjectAggregate, usr_es_model.UserAggregate}
}
func (p *ProjectMember) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestProjectMemberSequence(string(event.AggregateType))
func (p *ProjectMember) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestProjectMemberSequence()
if err != nil {
return 0, err
}
@ -67,7 +67,7 @@ func (p *ProjectMember) CurrentSequence(event *models.Event) (uint64, error) {
}
func (p *ProjectMember) EventQuery() (*models.SearchQuery, error) {
sequence, err := p.view.GetLatestProjectMemberSequence("")
sequence, err := p.view.GetLatestProjectMemberSequence()
if err != nil {
return nil, err
}

6
internal/management/repository/eventsourcing/handler/project_role.go
View File

@ -54,8 +54,8 @@ func (_ *ProjectRole) AggregateTypes() []models.AggregateType {
return []models.AggregateType{es_model.ProjectAggregate}
}
func (p *ProjectRole) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := p.view.GetLatestProjectRoleSequence(string(event.AggregateType))
func (p *ProjectRole) CurrentSequence() (uint64, error) {
sequence, err := p.view.GetLatestProjectRoleSequence()
if err != nil {
return 0, err
}
@ -63,7 +63,7 @@ func (p *ProjectRole) CurrentSequence(event *models.Event) (uint64, error) {
}
func (p *ProjectRole) EventQuery() (*models.SearchQuery, error) {
sequence, err := p.view.GetLatestProjectRoleSequence("")
sequence, err := p.view.GetLatestProjectRoleSequence()
if err != nil {
return nil, err
}

6
internal/management/repository/eventsourcing/handler/user.go
View File

@ -64,8 +64,8 @@ func (_ *User) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{es_model.UserAggregate, org_es_model.OrgAggregate}
}
func (u *User) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := u.view.GetLatestUserSequence(string(event.AggregateType))
func (u *User) CurrentSequence() (uint64, error) {
sequence, err := u.view.GetLatestUserSequence()
if err != nil {
return 0, err
}
@ -73,7 +73,7 @@ func (u *User) CurrentSequence(event *models.Event) (uint64, error) {
}
func (u *User) EventQuery() (*models.SearchQuery, error) {
sequence, err := u.view.GetLatestUserSequence("")
sequence, err := u.view.GetLatestUserSequence()
if err != nil {
return nil, err
}

8
internal/management/repository/eventsourcing/handler/user_external_idps.go
View File

@ -4,10 +4,10 @@ import (
"context"
"github.com/caos/logging"
"github.com/caos/zitadel/internal/config/systemdefaults"
caos_errs "github.com/caos/zitadel/internal/errors"
"github.com/caos/zitadel/internal/eventstore"
"github.com/caos/zitadel/internal/eventstore/models"
es_models "github.com/caos/zitadel/internal/eventstore/models"
"github.com/caos/zitadel/internal/eventstore/query"
"github.com/caos/zitadel/internal/eventstore/spooler"
@ -68,8 +68,8 @@ func (_ *ExternalIDP) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{model.UserAggregate, iam_es_model.IAMAggregate, org_es_model.OrgAggregate}
}
func (i *ExternalIDP) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := i.view.GetLatestExternalIDPSequence(string(event.AggregateType))
func (i *ExternalIDP) CurrentSequence() (uint64, error) {
sequence, err := i.view.GetLatestExternalIDPSequence()
if err != nil {
return 0, err
}
@ -77,7 +77,7 @@ func (i *ExternalIDP) CurrentSequence(event *models.Event) (uint64, error) {
}
func (i *ExternalIDP) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := i.view.GetLatestExternalIDPSequence("")
sequence, err := i.view.GetLatestExternalIDPSequence()
if err != nil {
return nil, err
}

8
internal/management/repository/eventsourcing/handler/user_grant.go
View File

@ -4,8 +4,8 @@ import (
"context"
"github.com/caos/logging"
"github.com/caos/zitadel/internal/eventstore"
"github.com/caos/zitadel/internal/eventstore/models"
es_models "github.com/caos/zitadel/internal/eventstore/models"
"github.com/caos/zitadel/internal/eventstore/query"
"github.com/caos/zitadel/internal/eventstore/spooler"
@ -68,8 +68,8 @@ func (_ *UserGrant) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{grant_es_model.UserGrantAggregate, usr_es_model.UserAggregate, proj_es_model.ProjectAggregate}
}
func (u *UserGrant) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := u.view.GetLatestUserGrantSequence(string(event.AggregateType))
func (u *UserGrant) CurrentSequence() (uint64, error) {
sequence, err := u.view.GetLatestUserGrantSequence()
if err != nil {
return 0, err
}
@ -77,7 +77,7 @@ func (u *UserGrant) CurrentSequence(event *models.Event) (uint64, error) {
}
func (u *UserGrant) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := u.view.GetLatestUserGrantSequence("")
sequence, err := u.view.GetLatestUserGrantSequence()
if err != nil {
return nil, err
}

8
internal/management/repository/eventsourcing/handler/user_membership.go
View File

@ -4,8 +4,8 @@ import (
"context"
"github.com/caos/logging"
"github.com/caos/zitadel/internal/eventstore"
"github.com/caos/zitadel/internal/eventstore/models"
es_models "github.com/caos/zitadel/internal/eventstore/models"
"github.com/caos/zitadel/internal/eventstore/query"
"github.com/caos/zitadel/internal/eventstore/spooler"
@ -64,8 +64,8 @@ func (_ *UserMembership) AggregateTypes() []es_models.AggregateType {
return []es_models.AggregateType{iam_es_model.IAMAggregate, org_es_model.OrgAggregate, proj_es_model.ProjectAggregate, model.UserAggregate}
}
func (u *UserMembership) CurrentSequence(event *models.Event) (uint64, error) {
sequence, err := u.view.GetLatestUserMembershipSequence(string(event.AggregateType))
func (u *UserMembership) CurrentSequence() (uint64, error) {
sequence, err := u.view.GetLatestUserMembershipSequence()
if err != nil {
return 0, err
}
@ -73,7 +73,7 @@ func (u *UserMembership) CurrentSequence(event *models.Event) (uint64, error) {
}
func (m *UserMembership) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := m.view.GetLatestUserMembershipSequence("")
sequence, err := m.view.GetLatestUserMembershipSequence()
if err != nil {
return nil, err
}

Some files were not shown because too many files have changed in this diff Show More