address two comments

Author: khvn26

api/app_analytics/analytics_db_service.py

@@ -136,22 +136,22 @@ def get_total_events_count(organisation) -> int:  # type: ignore[no-untyped-def]
 def get_feature_evaluation_data(
     feature: Feature,
     environment_id: int,
-    period: int = 30,
+    period_days: int = 30,
     labels_filter: Labels | None = None,
 ) -> List[FeatureEvaluationData]:
     if settings.USE_POSTGRES_FOR_ANALYTICS:
         return get_feature_evaluation_data_from_local_db(
             feature=feature,
             environment_id=environment_id,
-            period=period,
+            period_days=period_days,
             labels_filter=labels_filter,
         )
 
     if settings.INFLUXDB_TOKEN:
         return get_feature_evaluation_data_from_influxdb(
             feature_name=feature.name,
             environment_id=environment_id,
-            period=f"{period}d",
+            period_days=period_days,
             labels_filter=labels_filter,
         )
 
@@ -162,15 +162,15 @@ def get_feature_evaluation_data(
 def get_feature_evaluation_data_from_local_db(
     feature: Feature,
     environment_id: int,
-    period: int = 30,
+    period_days: int = 30,
     labels_filter: Labels | None = None,
 ) -> List[FeatureEvaluationData]:
     filter = Q(
         environment_id=environment_id,
         bucket_size=constants.ANALYTICS_READ_BUCKET_SIZE,
         feature_name=feature.name,
         created_at__date__lte=timezone.now(),
-        created_at__date__gt=timezone.now() - timedelta(days=period),
+        created_at__date__gt=timezone.now() - timedelta(days=period_days),
     )
     if labels_filter:
         filter &= Q(labels__contains=labels_filter)
@@ -197,7 +197,12 @@ def _get_environment_ids_for_org(organisation: Organisation) -> list[int]:
     # references the environments and projects tables,
     # as they do not exist in the analytics database.
     return [
-        e.id for e in Environment.objects.filter(project__organisation=organisation)
+        *Environment.objects.filter(
+            project__organisation=organisation,
+        ).values_list(
+            "id",
+            flat=True,
+        )
     ]
 
 

api/app_analytics/influxdb_wrapper.py

@@ -346,12 +346,10 @@ def get_multiple_event_list_for_feature(
 def get_feature_evaluation_data(
     feature_name: str,
     environment_id: int,
-    period: str = "30d",
+    period_days: int = 30,
     labels_filter: Labels | None = None,
 ) -> list[FeatureEvaluationData]:
-    assert period.endswith("d")
-    days = int(period[:-1])
-    date_start = timezone.now() - timedelta(days=days)
+    date_start = timezone.now() - timedelta(days=period_days)
     return get_multiple_event_list_for_feature(
         feature_name=feature_name,
         environment_id=environment_id,

api/features/serializers.py

@@ -609,7 +609,10 @@ class GetInfluxDataQuerySerializer(serializers.Serializer):  # type: ignore[type
 
 class GetUsageDataQuerySerializer(LabelsQuerySerializerMixin, serializers.Serializer):  # type: ignore[type-arg]
     period = serializers.IntegerField(
-        required=False, default=30, help_text="number of days"
+        required=False,
+        default=30,
+        help_text="number of days",
+        source="period_days",
     )
     environment_id = serializers.IntegerField(required=True)
 

api/tests/unit/app_analytics/test_analytics_db_service.py

@@ -586,7 +586,7 @@ def test_get_feature_evaluation_data_calls_influx_method_if_postgres_not_configu
     mocked_get_feature_evaluation_data_from_influxdb.assert_called_once_with(
         feature_name=feature.name,
         environment_id=environment.id,
-        period="30d",
+        period_days=30,
         labels_filter=None,
     )
 
@@ -643,7 +643,7 @@ def test_get_feature_evaluation_data_calls_get_feature_evaluation_data_from_loca
     mocked_get_feature_evaluation_data_from_local_db.assert_called_once_with(
         feature=feature,
         environment_id=environment.id,
-        period=30,
+        period_days=30,
         labels_filter=None,
     )
 

api/tests/unit/features/test_unit_features_views.py

@@ -912,7 +912,7 @@ def test_get_feature_evaluation_data(
         },
     ]
     mocked_get_feature_evaluation_data.assert_called_with(
-        feature=feature, period=30, environment_id=environment.id
+        feature=feature, period_days=30, environment_id=environment.id
     )
 
 
@@ -960,7 +960,7 @@ def test_get_feature_evaluation_data__labels_filter__returns_expected(
     ]
     mocked_get_feature_evaluation_data.assert_called_with(
         feature=feature,
-        period=30,
+        period_days=30,
         environment_id=environment.id,
         labels_filter={"client_application_name": "web"},
     )