From 3f329e8459b77a3606c1d6a99e327c5d9ecb88c5 Mon Sep 17 00:00:00 2001 From: Stefan Benz <46600784+stebenz@users.noreply.github.com> Date: Thu, 20 Mar 2025 08:57:36 +0100 Subject: [PATCH] fix: milestone multiple results per instance domain instead of primary instance domain (#9564) # 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 (cherry picked from commit 352fa6aa6f478f6ba1da0033daf3a0e2c02b2719) --- internal/query/milestone.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/query/milestone.go b/internal/query/milestone.go index 4277b8e68a..631020e393 100644 --- a/internal/query/milestone.go +++ b/internal/query/milestone.go @@ -73,8 +73,10 @@ func (q *Queries) SearchMilestones(ctx context.Context, instanceIDs []string, qu instanceIDs = []string{authz.GetInstance(ctx).InstanceID()} } stmt, args, err := queries.toQuery(query).Where( - sq.Eq{MilestoneInstanceIDColID.identifier(): instanceIDs}, - sq.Eq{InstanceDomainIsPrimaryCol.identifier(): true}, + sq.Eq{ + MilestoneInstanceIDColID.identifier(): instanceIDs, + InstanceDomainIsPrimaryCol.identifier(): true, + }, ).ToSql() if err != nil { 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) return milestones, err - } func prepareMilestonesQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilder, func(*sql.Rows) (*Milestones, error)) {