diff --git a/internal/admin/repository/eventsourcing/eventstore/iam.go b/internal/admin/repository/eventsourcing/eventstore/iam.go index 4a4c247450..8dca7fc347 100644 --- a/internal/admin/repository/eventsourcing/eventstore/iam.go +++ b/internal/admin/repository/eventsourcing/eventstore/iam.go @@ -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) { 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") members, count, err := repo.View.SearchIAMMembers(request) if err != nil { diff --git a/internal/admin/repository/eventsourcing/handler/mail_template.go b/internal/admin/repository/eventsourcing/handler/mail_template.go index b7ab53b8a9..c140ba1022 100644 --- a/internal/admin/repository/eventsourcing/handler/mail_template.go +++ b/internal/admin/repository/eventsourcing/handler/mail_template.go @@ -49,8 +49,8 @@ func (_ *MailTemplate) AggregateTypes() []es_models.AggregateType { return []es_models.AggregateType{iam_es_model.IAMAggregate} } -func (p *MailTemplate) CurrentSequence(event *models.Event) (uint64, error) { - sequence, err := p.view.GetLatestMailTemplateSequence(string(event.AggregateType)) +func (p *MailTemplate) CurrentSequence() (uint64, error) { + sequence, err := p.view.GetLatestMailTemplateSequence() if err != nil { return 0, err } @@ -58,7 +58,7 @@ func (p *MailTemplate) CurrentSequence(event *models.Event) (uint64, error) { } func (m *MailTemplate) EventQuery() (*models.SearchQuery, error) { - sequence, err := m.view.GetLatestMailTemplateSequence("") + sequence, err := m.view.GetLatestMailTemplateSequence() if err != nil { return nil, err } diff --git a/internal/admin/repository/eventsourcing/handler/mail_text.go b/internal/admin/repository/eventsourcing/handler/mail_text.go index 1cd5040a5c..6462bd54db 100644 --- a/internal/admin/repository/eventsourcing/handler/mail_text.go +++ b/internal/admin/repository/eventsourcing/handler/mail_text.go @@ -49,8 +49,8 @@ func (_ *MailText) AggregateTypes() []es_models.AggregateType { return []es_models.AggregateType{iam_es_model.IAMAggregate} } -func (p *MailText) CurrentSequence(event *models.Event) (uint64, error) { - sequence, err := p.view.GetLatestMailTextSequence(string(event.AggregateType)) +func (p *MailText) CurrentSequence() (uint64, error) { + sequence, err := p.view.GetLatestMailTextSequence() if err != nil { return 0, err } @@ -58,7 +58,7 @@ func (p *MailText) CurrentSequence(event *models.Event) (uint64, error) { } func (m *MailText) EventQuery() (*models.SearchQuery, error) { - sequence, err := m.view.GetLatestMailTextSequence("") + sequence, err := m.view.GetLatestMailTextSequence() if err != nil { return nil, err } diff --git a/internal/admin/repository/eventsourcing/view/mail_templates.go b/internal/admin/repository/eventsourcing/view/mail_templates.go index 4603ed78cf..a6ec850ab8 100644 --- a/internal/admin/repository/eventsourcing/view/mail_templates.go +++ b/internal/admin/repository/eventsourcing/view/mail_templates.go @@ -23,8 +23,8 @@ func (v *View) PutMailTemplate(template *model.MailTemplateView, event *models.E return v.ProcessedMailTemplateSequence(event) } -func (v *View) GetLatestMailTemplateSequence(aggregateType string) (*global_view.CurrentSequence, error) { - return v.latestSequence(mailTemplateTable, aggregateType) +func (v *View) GetLatestMailTemplateSequence() (*global_view.CurrentSequence, error) { + return v.latestSequence(mailTemplateTable) } func (v *View) ProcessedMailTemplateSequence(event *models.Event) error { diff --git a/internal/admin/repository/eventsourcing/view/mail_texts.go b/internal/admin/repository/eventsourcing/view/mail_texts.go index 9d7d5313a5..89d67fea6d 100644 --- a/internal/admin/repository/eventsourcing/view/mail_texts.go +++ b/internal/admin/repository/eventsourcing/view/mail_texts.go @@ -27,8 +27,8 @@ func (v *View) PutMailText(template *model.MailTextView, event *models.Event) er return v.ProcessedMailTextSequence(event) } -func (v *View) GetLatestMailTextSequence(aggregateType string) (*global_view.CurrentSequence, error) { - return v.latestSequence(mailTextTable, aggregateType) +func (v *View) GetLatestMailTextSequence() (*global_view.CurrentSequence, error) { + return v.latestSequence(mailTextTable) } func (v *View) ProcessedMailTextSequence(event *models.Event) error { diff --git a/internal/management/repository/eventsourcing/handler/mail_template.go b/internal/management/repository/eventsourcing/handler/mail_template.go index 23f080ec0c..14b529193c 100644 --- a/internal/management/repository/eventsourcing/handler/mail_template.go +++ b/internal/management/repository/eventsourcing/handler/mail_template.go @@ -49,8 +49,8 @@ func (_ *MailTemplate) AggregateTypes() []es_models.AggregateType { return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate} } -func (p *MailTemplate) CurrentSequence(event *models.Event) (uint64, error) { - sequence, err := p.view.GetLatestMailTemplateSequence(string(event.AggregateType)) +func (p *MailTemplate) CurrentSequence() (uint64, error) { + sequence, err := p.view.GetLatestMailTemplateSequence() if err != nil { return 0, err } @@ -58,7 +58,7 @@ func (p *MailTemplate) CurrentSequence(event *models.Event) (uint64, error) { } func (m *MailTemplate) EventQuery() (*models.SearchQuery, error) { - sequence, err := m.view.GetLatestMailTemplateSequence("") + sequence, err := m.view.GetLatestMailTemplateSequence() if err != nil { return nil, err } diff --git a/internal/management/repository/eventsourcing/handler/mail_text.go b/internal/management/repository/eventsourcing/handler/mail_text.go index 866bea6f2a..9cf65a2e28 100644 --- a/internal/management/repository/eventsourcing/handler/mail_text.go +++ b/internal/management/repository/eventsourcing/handler/mail_text.go @@ -49,8 +49,8 @@ func (_ *MailText) AggregateTypes() []es_models.AggregateType { return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate} } -func (p *MailText) CurrentSequence(event *models.Event) (uint64, error) { - sequence, err := p.view.GetLatestMailTextSequence(string(event.AggregateType)) +func (p *MailText) CurrentSequence() (uint64, error) { + sequence, err := p.view.GetLatestMailTextSequence() if err != nil { return 0, err } @@ -58,7 +58,7 @@ func (p *MailText) CurrentSequence(event *models.Event) (uint64, error) { } func (m *MailText) EventQuery() (*models.SearchQuery, error) { - sequence, err := m.view.GetLatestMailTextSequence("") + sequence, err := m.view.GetLatestMailTextSequence() if err != nil { return nil, err } diff --git a/internal/management/repository/eventsourcing/view/mail_templates.go b/internal/management/repository/eventsourcing/view/mail_templates.go index d5ec652d24..34c3ab2249 100644 --- a/internal/management/repository/eventsourcing/view/mail_templates.go +++ b/internal/management/repository/eventsourcing/view/mail_templates.go @@ -32,8 +32,8 @@ func (v *View) DeleteMailTemplate(aggregateID string, event *models.Event) error return v.ProcessedMailTemplateSequence(event) } -func (v *View) GetLatestMailTemplateSequence(aggregateType string) (*global_view.CurrentSequence, error) { - return v.latestSequence(mailTemplateTable, aggregateType) +func (v *View) GetLatestMailTemplateSequence() (*global_view.CurrentSequence, error) { + return v.latestSequence(mailTemplateTable) } func (v *View) ProcessedMailTemplateSequence(event *models.Event) error { diff --git a/internal/management/repository/eventsourcing/view/mail_texts.go b/internal/management/repository/eventsourcing/view/mail_texts.go index 4701bd8934..c9ab7cd443 100644 --- a/internal/management/repository/eventsourcing/view/mail_texts.go +++ b/internal/management/repository/eventsourcing/view/mail_texts.go @@ -36,8 +36,8 @@ func (v *View) DeleteMailText(aggregateID string, textType string, language stri return v.ProcessedMailTextSequence(event) } -func (v *View) GetLatestMailTextSequence(aggregateType string) (*global_view.CurrentSequence, error) { - return v.latestSequence(mailTextTable, aggregateType) +func (v *View) GetLatestMailTextSequence() (*global_view.CurrentSequence, error) { + return v.latestSequence(mailTextTable) } func (v *View) ProcessedMailTextSequence(event *models.Event) error {