fix: move v2 pkgs (#1331)

* fix: move eventstore pkgs

* fix: move eventstore pkgs

* fix: remove v2 view

* fix: remove v2 view
This commit is contained in:
Fabi
2021-02-23 15:13:04 +01:00
committed by GitHub
parent 57b277bc7c
commit d8e42744b4
797 changed files with 2116 additions and 2224 deletions

View File

@@ -2,12 +2,11 @@ package handler
import (
"github.com/caos/logging"
"github.com/caos/zitadel/internal/eventstore/v1"
"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"
es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
"github.com/caos/zitadel/internal/eventstore/v1/query"
"github.com/caos/zitadel/internal/eventstore/v1/spooler"
"github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
iam_model "github.com/caos/zitadel/internal/iam/repository/view/model"
@@ -15,7 +14,7 @@ import (
type MailText struct {
handler
subscription *eventstore.Subscription
subscription *v1.Subscription
}
func newMailText(handler handler) *MailText {
@@ -57,7 +56,7 @@ func (p *MailText) CurrentSequence() (uint64, error) {
return sequence.CurrentSequence, nil
}
func (m *MailText) EventQuery() (*models.SearchQuery, error) {
func (m *MailText) EventQuery() (*es_models.SearchQuery, error) {
sequence, err := m.view.GetLatestMailTextSequence()
if err != nil {
return nil, err
@@ -67,7 +66,7 @@ func (m *MailText) EventQuery() (*models.SearchQuery, error) {
LatestSequenceFilter(sequence.CurrentSequence), nil
}
func (m *MailText) Reduce(event *models.Event) (err error) {
func (m *MailText) Reduce(event *es_models.Event) (err error) {
switch event.AggregateType {
case model.IAMAggregate:
err = m.processMailText(event)
@@ -75,7 +74,7 @@ func (m *MailText) Reduce(event *models.Event) (err error) {
return err
}
func (m *MailText) processMailText(event *models.Event) (err error) {
func (m *MailText) processMailText(event *es_models.Event) (err error) {
mailText := new(iam_model.MailTextView)
switch event.Type {
case model.MailTextAdded:
@@ -99,7 +98,7 @@ func (m *MailText) processMailText(event *models.Event) (err error) {
return m.view.PutMailText(mailText, event)
}
func (m *MailText) OnError(event *models.Event, err error) error {
func (m *MailText) OnError(event *es_models.Event, err error) error {
logging.LogWithFields("HANDL-5jk84", "id", event.AggregateID).WithError(err).Warn("something went wrong in label mailText handler")
return spooler.HandleError(event, err, m.view.GetLatestMailTextFailedEvent, m.view.ProcessedMailTextFailedEvent, m.view.ProcessedMailTextSequence, m.errorCountUntilSkip)
}