mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-15 04:18:01 +00:00
32bad3feb3
Some checks are pending
ZITADEL CI/CD / core (push) Waiting to run
ZITADEL CI/CD / console (push) Waiting to run
ZITADEL CI/CD / version (push) Waiting to run
ZITADEL CI/CD / compile (push) Blocked by required conditions
ZITADEL CI/CD / core-unit-test (push) Blocked by required conditions
ZITADEL CI/CD / core-integration-test (push) Blocked by required conditions
ZITADEL CI/CD / lint (push) Blocked by required conditions
ZITADEL CI/CD / container (push) Blocked by required conditions
ZITADEL CI/CD / e2e (push) Blocked by required conditions
ZITADEL CI/CD / release (push) Blocked by required conditions
Code Scanning / CodeQL-Build (go) (push) Waiting to run
Code Scanning / CodeQL-Build (javascript) (push) Waiting to run
# Which Problems Are Solved Milestones used existing events from a number of aggregates. OIDC session is one of them. We noticed in load-tests that the reduction of the oidc_session.added event into the milestone projection is a costly business with payload based conditionals. A milestone is reached once, but even then we remain subscribed to the OIDC events. This requires the projections.current_states to be updated continuously. # How the Problems Are Solved The milestone creation is refactored to use dedicated events instead. The command side decides when a milestone is reached and creates the reached event once for each milestone when required. # Additional Changes In order to prevent reached milestones being created twice, a migration script is provided. When the old `projections.milestones` table exist, the state is read from there and `v2` milestone aggregate events are created, with the original reached and pushed dates. # Additional Context - Closes https://github.com/zitadel/zitadel/issues/8800
139 lines
3.7 KiB
Go
139 lines
3.7 KiB
Go
package query
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"time"
|
|
|
|
sq "github.com/Masterminds/squirrel"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/api/call"
|
|
"github.com/zitadel/zitadel/internal/query/projection"
|
|
"github.com/zitadel/zitadel/internal/repository/milestone"
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
type Milestones struct {
|
|
SearchResponse
|
|
Milestones []*Milestone
|
|
}
|
|
|
|
type Milestone struct {
|
|
InstanceID string
|
|
Type milestone.Type
|
|
ReachedDate time.Time
|
|
PushedDate time.Time
|
|
PrimaryDomain string
|
|
}
|
|
|
|
type MilestonesSearchQueries struct {
|
|
SearchRequest
|
|
Queries []SearchQuery
|
|
}
|
|
|
|
func (q *MilestonesSearchQueries) toQuery(query sq.SelectBuilder) sq.SelectBuilder {
|
|
query = q.SearchRequest.toQuery(query)
|
|
for _, q := range q.Queries {
|
|
query = q.toQuery(query)
|
|
}
|
|
return query
|
|
}
|
|
|
|
var (
|
|
milestonesTable = table{
|
|
name: projection.MilestonesProjectionTable,
|
|
instanceIDCol: projection.MilestoneColumnInstanceID,
|
|
}
|
|
MilestoneInstanceIDColID = Column{
|
|
name: projection.MilestoneColumnInstanceID,
|
|
table: milestonesTable,
|
|
}
|
|
MilestoneTypeColID = Column{
|
|
name: projection.MilestoneColumnType,
|
|
table: milestonesTable,
|
|
}
|
|
MilestoneReachedDateColID = Column{
|
|
name: projection.MilestoneColumnReachedDate,
|
|
table: milestonesTable,
|
|
}
|
|
MilestonePushedDateColID = Column{
|
|
name: projection.MilestoneColumnPushedDate,
|
|
table: milestonesTable,
|
|
}
|
|
)
|
|
|
|
// SearchMilestones tries to defer the instanceID from the passed context if no instanceIDs are passed
|
|
func (q *Queries) SearchMilestones(ctx context.Context, instanceIDs []string, queries *MilestonesSearchQueries) (milestones *Milestones, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
query, scan := prepareMilestonesQuery(ctx, q.client)
|
|
if len(instanceIDs) == 0 {
|
|
instanceIDs = []string{authz.GetInstance(ctx).InstanceID()}
|
|
}
|
|
stmt, args, err := queries.toQuery(query).Where(
|
|
sq.Eq{MilestoneInstanceIDColID.identifier(): instanceIDs},
|
|
sq.Eq{InstanceDomainIsPrimaryCol.identifier(): true},
|
|
).ToSql()
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "QUERY-A9i5k", "Errors.Query.SQLStatement")
|
|
}
|
|
err = q.client.QueryContext(ctx, func(rows *sql.Rows) error {
|
|
milestones, err = scan(rows)
|
|
return err
|
|
}, stmt, args...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
milestones.State, err = q.latestState(ctx, milestonesTable)
|
|
return milestones, err
|
|
|
|
}
|
|
|
|
func prepareMilestonesQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilder, func(*sql.Rows) (*Milestones, error)) {
|
|
return sq.Select(
|
|
MilestoneInstanceIDColID.identifier(),
|
|
InstanceDomainDomainCol.identifier(),
|
|
MilestoneReachedDateColID.identifier(),
|
|
MilestonePushedDateColID.identifier(),
|
|
MilestoneTypeColID.identifier(),
|
|
countColumn.identifier(),
|
|
).
|
|
From(milestonesTable.identifier() + db.Timetravel(call.Took(ctx))).
|
|
LeftJoin(join(InstanceDomainInstanceIDCol, MilestoneInstanceIDColID)).
|
|
PlaceholderFormat(sq.Dollar),
|
|
func(rows *sql.Rows) (*Milestones, error) {
|
|
milestones := make([]*Milestone, 0)
|
|
var count uint64
|
|
for rows.Next() {
|
|
m := new(Milestone)
|
|
reachedDate := sql.NullTime{}
|
|
pushedDate := sql.NullTime{}
|
|
primaryDomain := sql.NullString{}
|
|
err := rows.Scan(
|
|
&m.InstanceID,
|
|
&primaryDomain,
|
|
&reachedDate,
|
|
&pushedDate,
|
|
&m.Type,
|
|
&count,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
m.PrimaryDomain = primaryDomain.String
|
|
m.ReachedDate = reachedDate.Time
|
|
m.PushedDate = pushedDate.Time
|
|
milestones = append(milestones, m)
|
|
}
|
|
return &Milestones{
|
|
Milestones: milestones,
|
|
SearchResponse: SearchResponse{
|
|
Count: count,
|
|
},
|
|
}, nil
|
|
}
|
|
}
|