fix: todos (#1346)

* fix: pub sub in new eventstore

* fix: todos

* fix: todos

* fix: todos

* fix: todos

* fix: todos
This commit is contained in:
Fabi
2021-03-01 08:48:50 +01:00
committed by GitHub
parent c0f55e7209
commit 3c07a186fc
145 changed files with 645 additions and 575 deletions

View File

@@ -1,9 +1,8 @@
package model
import (
"github.com/caos/zitadel/internal/domain"
"time"
"github.com/caos/zitadel/internal/model"
)
type IAMMemberView struct {
@@ -42,7 +41,7 @@ const (
type IAMMemberSearchQuery struct {
Key IAMMemberSearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value interface{}
}

View File

@@ -2,7 +2,7 @@ package model
import (
"github.com/caos/zitadel/internal/crypto"
"github.com/caos/zitadel/internal/model"
"github.com/caos/zitadel/internal/domain"
"time"
)
@@ -46,7 +46,7 @@ const (
type IDPConfigSearchQuery struct {
Key IDPConfigSearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value interface{}
}
@@ -66,5 +66,5 @@ func (r *IDPConfigSearchRequest) EnsureLimit(limit uint64) {
}
func (r *IDPConfigSearchRequest) AppendMyOrgQuery(orgID, iamID string) {
r.Queries = append(r.Queries, &IDPConfigSearchQuery{Key: IDPConfigSearchKeyAggregateID, Method: model.SearchMethodIsOneOf, Value: []string{orgID, iamID}})
r.Queries = append(r.Queries, &IDPConfigSearchQuery{Key: IDPConfigSearchKeyAggregateID, Method: domain.SearchMethodIsOneOf, Value: []string{orgID, iamID}})
}

View File

@@ -2,7 +2,6 @@ package model
import (
"github.com/caos/zitadel/internal/domain"
"github.com/caos/zitadel/internal/model"
"time"
)
@@ -39,7 +38,7 @@ const (
type IDPProviderSearchQuery struct {
Key IDPProviderSearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value interface{}
}
@@ -59,7 +58,7 @@ func (r *IDPProviderSearchRequest) EnsureLimit(limit uint64) {
}
func (r *IDPProviderSearchRequest) AppendAggregateIDQuery(aggregateID string) {
r.Queries = append(r.Queries, &IDPProviderSearchQuery{Key: IDPProviderSearchKeyAggregateID, Method: model.SearchMethodEquals, Value: aggregateID})
r.Queries = append(r.Queries, &IDPProviderSearchQuery{Key: IDPProviderSearchKeyAggregateID, Method: domain.SearchMethodEquals, Value: aggregateID})
}
func IdpProviderViewsToDomain(idpProviders []*IDPProviderView) []*domain.IDPProvider {

View File

@@ -1,9 +1,8 @@
package model
import (
"github.com/caos/zitadel/internal/domain"
"time"
"github.com/caos/zitadel/internal/model"
)
type LabelPolicyView struct {
@@ -34,7 +33,7 @@ const (
type LabelPolicySearchQuery struct {
Key LabelPolicySearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value interface{}
}

View File

@@ -3,7 +3,6 @@ package model
import (
"github.com/caos/zitadel/internal/domain"
"github.com/caos/zitadel/internal/eventstore/v1/models"
"github.com/caos/zitadel/internal/model"
"time"
)
@@ -41,7 +40,7 @@ const (
type LoginPolicySearchQuery struct {
Key LoginPolicySearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value interface{}
}

View File

@@ -1,9 +1,8 @@
package model
import (
"github.com/caos/zitadel/internal/domain"
"time"
"github.com/caos/zitadel/internal/model"
)
type MailTemplateView struct {
@@ -33,7 +32,7 @@ const (
type MailTemplateSearchQuery struct {
Key MailTemplateSearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value interface{}
}

View File

@@ -1,9 +1,8 @@
package model
import (
"github.com/caos/zitadel/internal/domain"
"time"
"github.com/caos/zitadel/internal/model"
)
type MailTextsView struct {
@@ -46,7 +45,7 @@ const (
type MailTextSearchQuery struct {
Key MailTextSearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value interface{}
}

View File

@@ -1,7 +1,7 @@
package model
import (
"github.com/caos/zitadel/internal/model"
"github.com/caos/zitadel/internal/domain"
)
type SecondFactorsSearchRequest struct {
@@ -17,7 +17,7 @@ type MultiFactorsSearchRequest struct {
type MFASearchQuery struct {
Key MFASearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value interface{}
}
@@ -39,9 +39,9 @@ type MultiFactorsSearchResponse struct {
}
func (r *SecondFactorsSearchRequest) AppendAggregateIDQuery(aggregateID string) {
r.Queries = append(r.Queries, &MFASearchQuery{Key: MFASearchKeyAggregateID, Method: model.SearchMethodEquals, Value: aggregateID})
r.Queries = append(r.Queries, &MFASearchQuery{Key: MFASearchKeyAggregateID, Method: domain.SearchMethodEquals, Value: aggregateID})
}
func (r *MultiFactorsSearchRequest) AppendAggregateIDQuery(aggregateID string) {
r.Queries = append(r.Queries, &MFASearchQuery{Key: MFASearchKeyAggregateID, Method: model.SearchMethodEquals, Value: aggregateID})
r.Queries = append(r.Queries, &MFASearchQuery{Key: MFASearchKeyAggregateID, Method: domain.SearchMethodEquals, Value: aggregateID})
}

View File

@@ -1,7 +1,7 @@
package model
import (
"github.com/caos/zitadel/internal/model"
"github.com/caos/zitadel/internal/domain"
"time"
)
@@ -33,7 +33,7 @@ const (
type OrgIAMPolicySearchQuery struct {
Key OrgIAMPolicySearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value interface{}
}

View File

@@ -1,7 +1,7 @@
package model
import (
"github.com/caos/zitadel/internal/model"
"github.com/caos/zitadel/internal/domain"
"time"
)
@@ -33,7 +33,7 @@ const (
type PasswordAgePolicySearchQuery struct {
Key PasswordAgePolicySearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value interface{}
}

View File

@@ -1,8 +1,8 @@
package model
import (
"github.com/caos/zitadel/internal/domain"
caos_errs "github.com/caos/zitadel/internal/errors"
"github.com/caos/zitadel/internal/model"
"time"
)
@@ -37,7 +37,7 @@ const (
type PasswordComplexityPolicySearchQuery struct {
Key PasswordComplexityPolicySearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value interface{}
}

View File

@@ -1,7 +1,7 @@
package model
import (
"github.com/caos/zitadel/internal/model"
"github.com/caos/zitadel/internal/domain"
"time"
)
@@ -33,7 +33,7 @@ const (
type PasswordLockoutPolicySearchQuery struct {
Key PasswordLockoutPolicySearchKey
Method model.SearchMethod
Method domain.SearchMethod
Value interface{}
}