TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-04-22 22:51:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct master after merges again (#1230)

Browse Source
This commit is contained in:
Livio Amstutz 2021-02-01 15:20:18 +01:00 committed by GitHub
parent 1d472bac51
commit 5a5c2c8744
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -454,7 +454,7 @@ func (repo *IAMRepository) ChangeDefaultMailTemplate(ctx context.Context, templa
func (repo *IAMRepository) SearchIAMMembersx(ctx context.Context, request *iam_model.IAMMemberSearchRequest) (*iam_model.IAMMemberSearchResponse, error) { func (repo *IAMRepository) SearchIAMMembersx(ctx context.Context, request *iam_model.IAMMemberSearchRequest) (*iam_model.IAMMemberSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit) request.EnsureLimit(repo.SearchLimit)
sequence, err := repo.View.GetLatestIAMMemberSequence("") sequence, err := repo.View.GetLatestIAMMemberSequence()
logging.Log("EVENT-Slkci").OnError(err).Warn("could not read latest iam sequence") logging.Log("EVENT-Slkci").OnError(err).Warn("could not read latest iam sequence")
members, count, err := repo.View.SearchIAMMembers(request) members, count, err := repo.View.SearchIAMMembers(request)
if err != nil { if err != nil {

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

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

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

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

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

@ -23,8 +23,8 @@ func (v *View) PutMailTemplate(template *model.MailTemplateView, event *models.E
return v.ProcessedMailTemplateSequence(event) return v.ProcessedMailTemplateSequence(event)
} }
func (v *View) GetLatestMailTemplateSequence(aggregateType string) (*global_view.CurrentSequence, error) { func (v *View) GetLatestMailTemplateSequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(mailTemplateTable, aggregateType) return v.latestSequence(mailTemplateTable)
} }
func (v *View) ProcessedMailTemplateSequence(event *models.Event) error { func (v *View) ProcessedMailTemplateSequence(event *models.Event) error {

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

@ -27,8 +27,8 @@ func (v *View) PutMailText(template *model.MailTextView, event *models.Event) er
return v.ProcessedMailTextSequence(event) return v.ProcessedMailTextSequence(event)
} }
func (v *View) GetLatestMailTextSequence(aggregateType string) (*global_view.CurrentSequence, error) { func (v *View) GetLatestMailTextSequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(mailTextTable, aggregateType) return v.latestSequence(mailTextTable)
} }
func (v *View) ProcessedMailTextSequence(event *models.Event) error { func (v *View) ProcessedMailTextSequence(event *models.Event) error {

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

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

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

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

4
internal/management/repository/eventsourcing/view/mail_templates.go
View File

@ -32,8 +32,8 @@ func (v *View) DeleteMailTemplate(aggregateID string, event *models.Event) error
return v.ProcessedMailTemplateSequence(event) return v.ProcessedMailTemplateSequence(event)
} }
func (v *View) GetLatestMailTemplateSequence(aggregateType string) (*global_view.CurrentSequence, error) { func (v *View) GetLatestMailTemplateSequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(mailTemplateTable, aggregateType) return v.latestSequence(mailTemplateTable)
} }
func (v *View) ProcessedMailTemplateSequence(event *models.Event) error { func (v *View) ProcessedMailTemplateSequence(event *models.Event) error {

4
internal/management/repository/eventsourcing/view/mail_texts.go
View File

@ -36,8 +36,8 @@ func (v *View) DeleteMailText(aggregateID string, textType string, language stri
return v.ProcessedMailTextSequence(event) return v.ProcessedMailTextSequence(event)
} }
func (v *View) GetLatestMailTextSequence(aggregateType string) (*global_view.CurrentSequence, error) { func (v *View) GetLatestMailTextSequence() (*global_view.CurrentSequence, error) {
return v.latestSequence(mailTextTable, aggregateType) return v.latestSequence(mailTextTable)
} }
func (v *View) ProcessedMailTextSequence(event *models.Event) error { func (v *View) ProcessedMailTextSequence(event *models.Event) error {