TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 20:27:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: milestone multiple results per instance domain instead of primary instance domain (#9564)

Browse Source 
# Which Problems Are Solved

The milestones query returns multiple results for every milestone for
every instance domain.

# How the Problems Are Solved

Corrected where condition on milestone query.

# Additional Changes

None

# Additional Context

None

Co-authored-by: Livio Spring <livio.a@gmail.com>
(cherry picked from commit 352fa6aa6f)
This commit is contained in:
Stefan Benz
2025-03-20 08:57:36 +01:00
committed by Livio Spring
parent 0337a861ba
commit 3f329e8459
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/query/milestone.go
View File

@@ -73,8 +73,10 @@ func (q *Queries) SearchMilestones(ctx context.Context, instanceIDs []string, qu
instanceIDs = []string{authz.GetInstance(ctx).InstanceID()} instanceIDs = []string{authz.GetInstance(ctx).InstanceID()}
} }
stmt, args, err := queries.toQuery(query).Where( stmt, args, err := queries.toQuery(query).Where(
sq.Eq{MilestoneInstanceIDColID.identifier(): instanceIDs}, sq.Eq{
sq.Eq{InstanceDomainIsPrimaryCol.identifier(): true}, MilestoneInstanceIDColID.identifier(): instanceIDs,
InstanceDomainIsPrimaryCol.identifier(): true,
},
).ToSql() ).ToSql()
if err != nil { if err != nil {
return nil, zerrors.ThrowInternal(err, "QUERY-A9i5k", "Errors.Query.SQLStatement") return nil, zerrors.ThrowInternal(err, "QUERY-A9i5k", "Errors.Query.SQLStatement")
@@ -89,7 +91,6 @@ func (q *Queries) SearchMilestones(ctx context.Context, instanceIDs []string, qu
milestones.State, err = q.latestState(ctx, milestonesTable) milestones.State, err = q.latestState(ctx, milestonesTable)
return milestones, err return milestones, err
} }
func prepareMilestonesQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilder, func(*sql.Rows) (*Milestones, error)) { func prepareMilestonesQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilder, func(*sql.Rows) (*Milestones, error)) {