fix(issue): resolve --milestone titles before IDs in list and search filters

Signed-off-by: bircni <bircni@icloud.com>
This commit is contained in:
bircni committed 2026-10-18 17:16:05 +02:00
1 parent 219798732d
commit 51c436ef11
2 files changed
+32 -11

No files matched your search

+3 -3
View File
@@ -225,9 +225,9 @@ func TestIssueMilestoneFiltersRejectUnknownMilestones(t *testing.T) {
require.NoError(t, Execute(context.Background(), deps, append(args, "--json"))) require.NoError(t, Execute(context.Background(), deps, append(args, "--json")))
} }
require.Equal(t, []string{ require.Equal(t, []string{
"/api/v1/repos/alice/project/issues?milestones=1,2", "/api/v1/repos/alice/project/issues?milestones=v1.0,2026",
"/api/v1/repos/alice/project/issues?milestones=1", "/api/v1/repos/alice/project/issues?milestones=v1.0",
"/api/v1/repos/alice/project/issues?milestones=1", "/api/v1/repos/alice/project/issues?milestones=v1.0",
"/api/v1/repos/issues/search?milestones=nope", "/api/v1/repos/issues/search?milestones=nope",
}, listed) }, listed)
require.Contains(t, diagnostics.String(), "pass --repo to check them") require.Contains(t, diagnostics.String(), "pass --repo to check them")
+29 -8
View File
@@ -5,7 +5,9 @@ package services
import ( import (
"context" "context"
"fmt"
"strconv" "strconv"
"strings"
) )
// All returns the open and closed milestones of the repository. // All returns the open and closed milestones of the repository.
@@ -39,17 +41,36 @@ func (s Milestones) FindOne(ctx context.Context, raw string, byName bool) (Miles
return items[0], nil return items[0], nil
} }
// FilterIDs resolves the milestones that filter an issue listing, each an ID or a title, to their // FilterIDs resolves the milestones that filter an issue listing, each an ID or a title, to the
// IDs. Gitea drops filter values that name no milestone and lists every issue when none is left, // values the issues API reads back as the same milestones: Gitea matches a filter value by title
// so an unknown milestone is an error here. // first and by ID only then, so a unique title without a comma is sent as is, and an ID only when
// no title reads like it. Gitea drops filter values that name no milestone and lists every issue
// when none is left, so an unknown milestone is an error here.
func (s Milestones) FilterIDs(ctx context.Context, values []string) ([]string, error) { func (s Milestones) FilterIDs(ctx context.Context, values []string) ([]string, error) {
items, err := s.Find(ctx, values, false) items, err := s.All(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
ids := make([]string, len(items)) titles := make(map[string]int, len(items))
for i, item := range items { for _, item := range items {
ids[i] = strconv.FormatInt(item.ID, 10) titles[item.Title]++
} }
return ids, nil finder := NameOrID[Milestone]{Kind: "milestone", Scope: s.Repository, ID: func(m Milestone) int64 { return m.ID }, Name: func(m Milestone) string { return m.Title }}
result := make([]string, len(values))
for i, raw := range values {
item, err := finder.Find(items, raw)
if err != nil {
return nil, err
}
id := strconv.FormatInt(item.ID, 10)
switch {
case titles[item.Title] == 1 && !strings.Contains(item.Title, ","):
result[i] = item.Title
case titles[id] == 0:
result[i] = id
default:
return nil, fmt.Errorf("milestone %q (ID %s) cannot filter issues: another milestone of %s is titled %q", item.Title, id, s.Repository, id)
}
}
return result, nil
} }