Merge branch 'main' into feb_05_fix_upload_serializer

Author: JerrySentry

VERSION

@@ -1 +1 @@
-25.2.3
+25.2.7

api/internal/owner/serializers.py

@@ -3,7 +3,6 @@
 from typing import Any, Dict
 
 from dateutil.relativedelta import relativedelta
-from django.conf import settings
 from rest_framework import serializers
 from rest_framework.exceptions import PermissionDenied
 from shared.plan.constants import (
@@ -132,7 +131,7 @@ def validate_value(self, value: str) -> str:
 
         plan_service = PlanService(current_org=current_org)
         plan_values = [
-            plan["value"] for plan in plan_service.available_plans(current_owner)
+            plan.name for plan in plan_service.available_plans(current_owner)
         ]
         if value not in plan_values:
             raise serializers.ValidationError(
@@ -217,11 +216,7 @@ class StripeScheduledPhaseSerializer(serializers.Serializer):
 
     def get_plan(self, phase: Dict[str, Any]) -> str:
         plan_id = phase["items"][0]["plan"]
-        stripe_plan_dict = settings.STRIPE_PLAN_IDS
-        plan_name = list(stripe_plan_dict.keys())[
-            list(stripe_plan_dict.values()).index(plan_id)
-        ]
-        marketing_plan_name = Plan.objects.get(name=plan_name).marketing_name
+        marketing_plan_name = Plan.objects.get(stripe_id=plan_id).marketing_name
         return marketing_plan_name
 
     def get_quantity(self, phase: Dict[str, Any]) -> int:
@@ -344,11 +339,13 @@ def update(self, instance: Owner, validated_data: Dict[str, Any]) -> object:
                 instance, desired_plan
             )
 
-            sentry_plans = Plan.objects.filter(
-                tier__tier_name=TierName.SENTRY.value, is_active=True
-            ).values_list("name", flat=True)
+            plan = (
+                Plan.objects.select_related("tier")
+                .filter(name=desired_plan["value"])
+                .first()
+            )
 
-            if desired_plan["value"] in sentry_plans:
+            if plan and plan.tier.tier_name == TierName.SENTRY.value:
                 current_owner = self.context["view"].request.current_owner
                 send_sentry_webhook(current_owner, instance)
 

api/internal/tests/views/test_account_viewset.py

@@ -234,7 +234,7 @@ def test_retrieve_account_gets_account_fields_when_there_are_scheduled_details(
         schedule_params = {
             "id": 123,
             "start_date": 123689126736,
-            "stripe_plan_id": "plan_H6P3KZXwmAbqPS",
+            "stripe_plan_id": "plan_pro_yearly",
             "quantity": 6,
         }
         phases = [
@@ -330,7 +330,7 @@ def test_retrieve_account_returns_last_phase_when_more_than_one_scheduled_phases
         schedule_params = {
             "id": 123,
             "start_date": 123689126736,
-            "stripe_plan_id": "plan_H6P3KZXwmAbqPS",
+            "stripe_plan_id": "plan_pro_yearly",
             "quantity": 6,
         }
         phases = [

api/internal/tests/views/test_user_viewset.py

@@ -10,7 +10,7 @@
     PullFactory,
     RepositoryFactory,
 )
-from shared.plan.constants import PlanName, TierName
+from shared.plan.constants import DEFAULT_FREE_PLAN, TierName
 
 from core.models import Pull
 from utils.test_utils import APIClient
@@ -20,7 +20,7 @@ class UserViewSetTests(APITestCase):
     def setUp(self):
         non_org_active_user = OwnerFactory()
         tier = TierFactory(tier_name=TierName.BASIC.value)
-        plan = PlanFactory(name=PlanName.BASIC_PLAN_NAME.value, tier=tier)
+        plan = PlanFactory(name=DEFAULT_FREE_PLAN, tier=tier)
         self.current_owner = OwnerFactory(
             plan=plan.name,
             plan_user_count=5,

api/public/v1/serializers.py

@@ -16,3 +16,7 @@ class Meta:
             "state",
         )
         fields = read_only_fields + ("user_provided_base_sha",)
+
+
+class PullIdSerializer(serializers.Serializer):
+    pullid = serializers.IntegerField()

api/public/v1/tests/views/test_pull_viewset.py

@@ -133,3 +133,10 @@ def test_post_pull_user_provided_base(self, pulls_sync_mock):
         )
         self.assertEqual(response.status_code, 405)
         assert not pulls_sync_mock.called
+
+    def test_get_pull_no_pullid_provided(self):
+        self.client.credentials(HTTP_AUTHORIZATION="Token " + self.repo.upload_token)
+        response = self.client.get("/api/github/codecov/testRepoName/pulls/abc")
+        self.assertEqual(response.status_code, 400)
+        content = json.loads(response.content.decode())
+        self.assertEqual(content["pullid"], ["A valid integer is required."])

api/public/v1/views.py

@@ -1,17 +1,17 @@
 import logging
 
-from django.db.models import OuterRef, Subquery
+from django.db.models import OuterRef, QuerySet, Subquery
 from django.shortcuts import get_object_or_404
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework import filters, mixins, viewsets
 
 from api.shared.mixins import RepoPropertyMixin
 from codecov_auth.authentication.repo_auth import RepositoryLegacyTokenAuthentication
-from core.models import Commit
+from core.models import Commit, Pull
 from services.task import TaskService
 
 from .permissions import PullUpdatePermission
-from .serializers import PullSerializer
+from .serializers import PullIdSerializer, PullSerializer
 
 log = logging.getLogger(__name__)
 
@@ -30,8 +30,11 @@ class PullViewSet(
     authentication_classes = [RepositoryLegacyTokenAuthentication]
     permission_classes = [PullUpdatePermission]
 
-    def get_object(self):
-        pullid = self.kwargs.get("pk")
+    def get_object(self) -> Pull:
+        serializer = PullIdSerializer(data={"pullid": self.kwargs.get("pk")})
+        serializer.is_valid(raise_exception=True)
+        pullid = serializer.validated_data["pullid"]
+
         if self.request.method == "PUT":
             # Note: We create a new pull if needed to make sure that they can be updated
             # with a base before the upload has finished processing.
@@ -41,7 +44,7 @@ def get_object(self):
             return obj
         return get_object_or_404(self.get_queryset(), pullid=pullid)
 
-    def get_queryset(self):
+    def get_queryset(self) -> QuerySet:
         return self.repo.pull_requests.annotate(
             ci_passed=Subquery(
                 Commit.objects.filter(
@@ -50,7 +53,7 @@ def get_queryset(self):
             )
         )
 
-    def perform_update(self, serializer):
+    def perform_update(self, serializer: PullSerializer) -> Pull:
         result = super().perform_update(serializer)
         TaskService().pulls_sync(repoid=self.repo.repoid, pullid=self.kwargs.get("pk"))
         return result

api/public/v2/compare/serializers.py

@@ -16,10 +16,11 @@ class ComparisonSerializer(BaseComparisonSerializer):
 
     def get_files(self, comparison: Comparison) -> List[dict]:
         data = []
-        for filename in comparison.head_report.files:
-            file = comparison.get_file_comparison(filename, bypass_max_diff=True)
-            if self._should_include_file(file):
-                data.append(FileComparisonSerializer(file).data)
+        if comparison.head_report is not None:
+            for filename in comparison.head_report.files:
+                file = comparison.get_file_comparison(filename, bypass_max_diff=True)
+                if self._should_include_file(file):
+                    data.append(FileComparisonSerializer(file).data)
         return data
 
 

billing/helpers.py

@@ -27,6 +27,8 @@ def get_all_admins_for_owners(owners: QuerySet[Owner]):
 
 
 def mock_all_plans_and_tiers():
+    TierFactory(tier_name=TierName.BASIC.value)
+
     trial_tier = TierFactory(tier_name=TierName.TRIAL.value)
     PlanFactory(
         tier=trial_tier,
@@ -39,18 +41,7 @@ def mock_all_plans_and_tiers():
             "Unlimited private repositories",
             "Priority Support",
         ],
-    )
-
-    basic_tier = TierFactory(tier_name=TierName.BASIC.value)
-    PlanFactory(
-        name=PlanName.FREE_PLAN_NAME.value,
-        tier=basic_tier,
-        marketing_name="Developer",
-        benefits=[
-            "Up to 1 user",
-            "Unlimited public repositories",
-            "Unlimited private repositories",
-        ],
+        stripe_id="plan_trial",
     )
 
     pro_tier = TierFactory(tier_name=TierName.PRO.value)
@@ -67,6 +58,7 @@ def mock_all_plans_and_tiers():
         billing_rate=BillingRate.MONTHLY.value,
         base_unit_price=PlanPrice.MONTHLY.value,
         paid_plan=True,
+        stripe_id="plan_pro",
     )
     PlanFactory(
         name=PlanName.CODECOV_PRO_YEARLY.value,
@@ -81,6 +73,7 @@ def mock_all_plans_and_tiers():
         billing_rate=BillingRate.ANNUALLY.value,
         base_unit_price=PlanPrice.YEARLY.value,
         paid_plan=True,
+        stripe_id="plan_pro_yearly",
     )
 
     team_tier = TierFactory(tier_name=TierName.TEAM.value)
@@ -98,6 +91,7 @@ def mock_all_plans_and_tiers():
         base_unit_price=PlanPrice.TEAM_MONTHLY.value,
         monthly_uploads_limit=2500,
         paid_plan=True,
+        stripe_id="plan_team_monthly",
     )
     PlanFactory(
         name=PlanName.TEAM_YEARLY.value,
@@ -113,6 +107,7 @@ def mock_all_plans_and_tiers():
         base_unit_price=PlanPrice.TEAM_YEARLY.value,
         monthly_uploads_limit=2500,
         paid_plan=True,
+        stripe_id="plan_team_yearly",
     )
 
     sentry_tier = TierFactory(tier_name=TierName.SENTRY.value)
@@ -130,6 +125,7 @@ def mock_all_plans_and_tiers():
             "Unlimited private repositories",
             "Priority Support",
         ],
+        stripe_id="plan_sentry_monthly",
     )
     PlanFactory(
         name=PlanName.SENTRY_YEARLY.value,
@@ -145,6 +141,7 @@ def mock_all_plans_and_tiers():
             "Unlimited private repositories",
             "Priority Support",
         ],
+        stripe_id="plan_sentry_yearly",
     )
 
     enterprise_tier = TierFactory(tier_name=TierName.ENTERPRISE.value)
@@ -161,6 +158,7 @@ def mock_all_plans_and_tiers():
             "Unlimited private repositories",
             "Priority Support",
         ],
+        stripe_id="plan_enterprise_cloud_monthly",
     )
     PlanFactory(
         name=PlanName.ENTERPRISE_CLOUD_YEARLY.value,
@@ -175,6 +173,7 @@ def mock_all_plans_and_tiers():
             "Unlimited private repositories",
             "Priority Support",
         ],
+        stripe_id="plan_enterprise_cloud_yearly",
     )
 
     PlanFactory(
@@ -190,4 +189,5 @@ def mock_all_plans_and_tiers():
             "Unlimited public repositories",
             "Unlimited private repositories",
         ],
+        stripe_id="plan_default_free",
     )