-
-
Notifications
You must be signed in to change notification settings - Fork 4.5k
feat(issues): Fallback to case insensitive short id lookup #102103
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 2 commits
1000193
0dc83da
01794e9
4e2eae2
5d40143
3b26d7d
8dc0199
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -369,6 +369,41 @@ def by_qualified_short_id_bulk( | |||||||||||
| ).filter(short_id_lookup, project__organization=organization_id) | ||||||||||||
| ) | ||||||||||||
| group_lookup: set[int] = {group.short_id for group in groups} | ||||||||||||
|
|
||||||||||||
| # If any requested short_ids are missing after the exact slug match, | ||||||||||||
| # fallback to a case-insensitive slug lookup to handle legacy/mixed-case slugs. | ||||||||||||
| missing_short_ids = [sid.short_id for sid in short_ids if sid.short_id not in group_lookup] | ||||||||||||
| if missing_short_ids: | ||||||||||||
| # Build a lookup only for the missing short_ids per slug | ||||||||||||
| missing_by_slug = defaultdict(list) | ||||||||||||
| for sid in short_ids: | ||||||||||||
| if sid.short_id in missing_short_ids: | ||||||||||||
| missing_by_slug[sid.project_slug].append(sid.short_id) | ||||||||||||
|
|
||||||||||||
| ci_short_id_lookup = reduce( | ||||||||||||
| or_, | ||||||||||||
| [ | ||||||||||||
| Q(project__slug__iexact=slug, short_id__in=sids) | ||||||||||||
| for slug, sids in missing_by_slug.items() | ||||||||||||
| ], | ||||||||||||
| ) | ||||||||||||
|
||||||||||||
|
|
||||||||||||
| fallback_groups = list( | ||||||||||||
| self.exclude( | ||||||||||||
| status__in=[ | ||||||||||||
| GroupStatus.PENDING_DELETION, | ||||||||||||
| GroupStatus.DELETION_IN_PROGRESS, | ||||||||||||
| GroupStatus.PENDING_MERGE, | ||||||||||||
| ] | ||||||||||||
| ).filter(ci_short_id_lookup, project__organization=organization_id) | ||||||||||||
| ) | ||||||||||||
|
|
||||||||||||
| if fallback_groups: | ||||||||||||
| # Merge unique groups from fallback | ||||||||||||
| existing_ids = {g.id for g in groups} | ||||||||||||
| groups.extend(g for g in fallback_groups if g.id not in existing_ids) | ||||||||||||
| group_lookup = {group.short_id for group in groups} | ||||||||||||
|
||||||||||||
| existing_ids = {g.id for g in groups} | |
| groups.extend(g for g in fallback_groups if g.id not in existing_ids) | |
| group_lookup = {group.short_id for group in groups} | |
| groups.extend(g for g in fallback_groups) | |
| group_lookup = {group.short_id for group in groups} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think you hold all the missing short ids already in missing_short_ids?