Merge dev into main #8

Merged
avm merged 12 commits from codex/merge-main-20260616 into main 2026-06-16 16:14:35 +03:00
2 changed files with 4 additions and 4 deletions
Showing only changes of commit af49962970 - Show all commits

View File

@@ -1177,7 +1177,9 @@ class DashboardAnalyticsService:
)
if executors_total:
return executors_total
return sum(1 for organization in organizations if organization.goz_participation)
return sum(
1 for organization in organizations if organization.goz_participation
)
@classmethod
def get_dashboard(

View File

@@ -575,9 +575,7 @@ class OrganizationAnalyticsApiTest(APITestCase):
self.assertEqual(
response.data["executors_by_cluster"][0]["cluster"], "roscosmos"
)
self.assertEqual(
response.data["executors_by_cluster"][0]["executors_count"], 1
)
self.assertEqual(response.data["executors_by_cluster"][0]["executors_count"], 1)
def test_dashboard_endpoint_uses_latest_available_f3_years_for_growth(self):
organization = OrganizationFactory.create(