Skip to content

fix: use-query-from-workflow-list-change-request #5568

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.

Sign up for GitHub

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

Merged
Zaimwa9 merged 2 commits into from
Jun 13, 2025
Merged

fix: use-query-from-workflow-list-change-request #5568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7deaa0e
fix: use-query-from-workflow-list-change-request
Zaimwa9 Jun 12, 2025
90cfc8b
fix: avoid-using-distinct-in-query
Zaimwa9 Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions api/environments/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,13 +430,32 @@ def get_change_requests_metrics_queryset(self) -> QuerySet["ChangeRequest"]:
return result

def get_scheduled_metrics_queryset(self) -> QuerySet[FeatureState]:
result: QuerySet[FeatureState] = FeatureState.objects.filter(
from features.workflows.core.models import ChangeRequest

qs = ChangeRequest.objects.filter(
environment=self,
identity_id__isnull=True,
feature_segment__isnull=True,
live_from__gt=timezone.now(),
committed_at__isnull=False,
deleted_at__isnull=True,
)
return result
scheduled_q = (
Q(
Q(feature_states__deleted_at__isnull=True)
& Q(feature_states__live_from__gt=timezone.now())
)
| Q(
Q(environment_feature_versions__deleted_at__isnull=True)
& Q(environment_feature_versions__live_from__gt=timezone.now())
)
| Q(
Q(change_sets__deleted_at__isnull=True)
& Q(change_sets__live_from__gt=timezone.now())
)
)

change_requests: QuerySet["ChangeRequest"] = qs.filter(
id__in=qs.filter(scheduled_q).values_list("id", flat=True)
)
return change_requests

@staticmethod
def is_bad_key(environment_key: str) -> bool:
Expand Down
7 changes: 7 additions & 0 deletions api/tests/unit/environments/test_unit_environments_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,9 +1174,16 @@ def test_environment_metric_query_helpers_match_expected_counts(
version += 1

for i in range(scheduled_change_count):
cr = ChangeRequest.objects.create(
environment=env,
title=f"Scheduled-CR-{i}",
user_id=admin_user.id,
committed_at=timezone.now(),
)
FeatureState.objects.update_or_create(
feature=random.choice(features),
environment=env,
change_request=cr,
identity=None,
enabled=True,
live_from=timezone.now() + timedelta(days=5),
Expand Down
Loading