Merge branch 'main' into rvinnakota/add-ai-auth-endpoint

Author: rohitvinnakota-codecov

VERSION

@@ -1 +1 @@
-25.1.10
+25.1.16

api/internal/owner/serializers.py

@@ -109,8 +109,14 @@ class StripeCardSerializer(serializers.Serializer):
     last4 = serializers.CharField()
 
 
+class StripeUSBankAccountSerializer(serializers.Serializer):
+    bank_name = serializers.CharField()
+    last4 = serializers.CharField()
+
+
 class StripePaymentMethodSerializer(serializers.Serializer):
     card = StripeCardSerializer(read_only=True)
+    us_bank_account = StripeUSBankAccountSerializer(read_only=True)
     billing_details = serializers.JSONField(read_only=True)
 
 

api/internal/owner/views.py

@@ -80,12 +80,33 @@ def update_payment(self, request, *args, **kwargs):
     @action(detail=False, methods=["patch"])
     @stripe_safe
     def update_email(self, request, *args, **kwargs):
+        """
+        Update the email address associated with the owner's billing account.
+
+        Args:
+            request: The HTTP request object containing:
+                - new_email: The new email address to update to
+                - apply_to_default_payment_method: Boolean flag to update email on the default payment method (default False)
+
+        Returns:
+            Response with serialized owner data
+
+        Raises:
+            ValidationError: If no new_email is provided in the request
+        """
         new_email = request.data.get("new_email")
         if not new_email:
             raise ValidationError(detail="No new_email sent")
         owner = self.get_object()
         billing = BillingService(requesting_user=request.current_owner)
-        billing.update_email_address(owner, new_email)
+        apply_to_default_payment_method = request.data.get(
+            "apply_to_default_payment_method", False
+        )
+        billing.update_email_address(
+            owner,
+            new_email,
+            apply_to_default_payment_method=apply_to_default_payment_method,
+        )
         return Response(self.get_serializer(owner).data)
 
     @action(detail=False, methods=["patch"])

api/internal/tests/views/test_account_viewset.py

@@ -1228,6 +1228,46 @@ def test_update_email_address(self, modify_customer_mock, retrieve_mock):
             self.current_owner.stripe_customer_id, email=new_email
         )
 
+    @patch("services.billing.stripe.Subscription.retrieve")
+    @patch("services.billing.stripe.Customer.modify")
+    @patch("services.billing.stripe.PaymentMethod.modify")
+    @patch("services.billing.stripe.Customer.retrieve")
+    def test_update_email_address_with_propagate(
+        self,
+        customer_retrieve_mock,
+        payment_method_mock,
+        modify_customer_mock,
+        retrieve_mock,
+    ):
+        self.current_owner.stripe_customer_id = "flsoe"
+        self.current_owner.stripe_subscription_id = "djfos"
+        self.current_owner.save()
+
+        payment_method_id = "pm_123"
+        customer_retrieve_mock.return_value = {
+            "invoice_settings": {"default_payment_method": payment_method_id}
+        }
+
+        new_email = "[email protected]"
+        kwargs = {
+            "service": self.current_owner.service,
+            "owner_username": self.current_owner.username,
+        }
+        data = {"new_email": new_email, "apply_to_default_payment_method": True}
+        url = reverse("account_details-update-email", kwargs=kwargs)
+        response = self.client.patch(url, data=data, format="json")
+        assert response.status_code == status.HTTP_200_OK
+
+        modify_customer_mock.assert_called_once_with(
+            self.current_owner.stripe_customer_id, email=new_email
+        )
+        customer_retrieve_mock.assert_called_once_with(
+            self.current_owner.stripe_customer_id
+        )
+        payment_method_mock.assert_called_once_with(
+            payment_method_id, billing_details={"email": new_email}
+        )
+
     def test_update_billing_address_without_body(self):
         kwargs = {
             "service": self.current_owner.service,

codecov/settings_base.py

@@ -429,6 +429,10 @@
 SHELTER_PUBSUB_PROJECT_ID = get_config("setup", "shelter", "pubsub_project_id")
 SHELTER_PUBSUB_SYNC_REPO_TOPIC_ID = get_config("setup", "shelter", "sync_repo_topic_id")
 
+STRIPE_PAYMENT_METHOD_CONFIGURATION_ID = get_config(
+    "setup", "stripe", "payment_method_configuration_id", default=None
+)
+
 # Allows to do migrations from another module
 MIGRATION_MODULES = {
     "codecov_auth": "shared.django_apps.codecov_auth.migrations",

codecov_auth/admin.py

@@ -8,7 +8,7 @@
 from django.contrib.admin.models import LogEntry
 from django.db.models import OuterRef, Subquery
 from django.db.models.fields import BLANK_CHOICE_DASH
-from django.forms import CheckboxInput, Select
+from django.forms import CheckboxInput, Select, Textarea
 from django.http import HttpRequest
 from django.shortcuts import redirect, render
 from django.utils import timezone
@@ -17,7 +17,9 @@
     Account,
     AccountsUsers,
     InvoiceBilling,
+    Plan,
     StripeBilling,
+    Tier,
 )
 from shared.plan.constants import USER_PLAN_REPRESENTATIONS
 from shared.plan.service import PlanService
@@ -708,3 +710,112 @@ class AccountsUsersAdmin(AdminMixin, admin.ModelAdmin):
     ]
 
     fields = readonly_fields + ["account", "user"]
+
+
+class PlansInline(admin.TabularInline):
+    model = Plan
+    extra = 1
+    verbose_name_plural = "Plans (click save to commit changes)"
+    verbose_name = "Plan"
+    fields = [
+        "name",
+        "marketing_name",
+        "base_unit_price",
+        "billing_rate",
+        "max_seats",
+        "monthly_uploads_limit",
+        "paid_plan",
+        "is_active",
+        "stripe_id",
+    ]
+    formfield_overrides = {
+        Plan._meta.get_field("benefits"): {"widget": Textarea(attrs={"rows": 3})},
+    }
+
+
+@admin.register(Tier)
+class TierAdmin(admin.ModelAdmin):
+    list_display = (
+        "tier_name",
+        "bundle_analysis",
+        "test_analytics",
+        "flaky_test_detection",
+        "project_coverage",
+        "private_repo_support",
+    )
+    list_editable = (
+        "bundle_analysis",
+        "test_analytics",
+        "flaky_test_detection",
+        "project_coverage",
+        "private_repo_support",
+    )
+    search_fields = ("tier_name__iregex",)
+    inlines = [PlansInline]
+    fields = [
+        "tier_name",
+        "bundle_analysis",
+        "test_analytics",
+        "flaky_test_detection",
+        "project_coverage",
+        "private_repo_support",
+    ]
+
+
+class PlanAdminForm(forms.ModelForm):
+    class Meta:
+        model = Plan
+        fields = "__all__"
+
+    def clean_base_unit_price(self) -> int | None:
+        base_unit_price = self.cleaned_data.get("base_unit_price")
+        if base_unit_price is not None and base_unit_price < 0:
+            raise forms.ValidationError("Base unit price cannot be negative.")
+        return base_unit_price
+
+    def clean_max_seats(self) -> int | None:
+        max_seats = self.cleaned_data.get("max_seats")
+        if max_seats is not None and max_seats < 0:
+            raise forms.ValidationError("Max seats cannot be negative.")
+        return max_seats
+
+    def clean_monthly_uploads_limit(self) -> int | None:
+        monthly_uploads_limit = self.cleaned_data.get("monthly_uploads_limit")
+        if monthly_uploads_limit is not None and monthly_uploads_limit < 0:
+            raise forms.ValidationError("Monthly uploads limit cannot be negative.")
+        return monthly_uploads_limit
+
+
+@admin.register(Plan)
+class PlanAdmin(admin.ModelAdmin):
+    form = PlanAdminForm
+    list_display = (
+        "name",
+        "marketing_name",
+        "is_active",
+        "tier",
+        "paid_plan",
+        "billing_rate",
+        "base_unit_price",
+        "max_seats",
+        "monthly_uploads_limit",
+    )
+    list_filter = ("is_active", "paid_plan", "billing_rate", "tier")
+    search_fields = ("name__iregex", "marketing_name__iregex")
+    fields = [
+        "tier",
+        "name",
+        "marketing_name",
+        "base_unit_price",
+        "benefits",
+        "billing_rate",
+        "is_active",
+        "max_seats",
+        "monthly_uploads_limit",
+        "paid_plan",
+        "stripe_id",
+    ]
+    formfield_overrides = {
+        Plan._meta.get_field("benefits"): {"widget": Textarea(attrs={"rows": 3})},
+    }
+    autocomplete_fields = ["tier"]  # a dropdown for selecting related Tiers

codecov_auth/commands/owner/interactors/create_stripe_setup_intent.py

@@ -0,0 +1,42 @@
+import logging
+
+import stripe
+
+from codecov.commands.base import BaseInteractor
+from codecov.commands.exceptions import Unauthenticated, Unauthorized, ValidationError
+from codecov.db import sync_to_async
+from codecov_auth.helpers import current_user_part_of_org
+from codecov_auth.models import Owner
+from services.billing import BillingService
+
+log = logging.getLogger(__name__)
+
+
+class CreateStripeSetupIntentInteractor(BaseInteractor):
+    def validate(self, owner_obj: Owner) -> None:
+        if not self.current_user.is_authenticated:
+            raise Unauthenticated()
+        if not owner_obj:
+            raise ValidationError("Owner not found")
+        if not current_user_part_of_org(self.current_owner, owner_obj):
+            raise Unauthorized()
+
+    def create_setup_intent(self, owner_obj: Owner) -> stripe.SetupIntent:
+        try:
+            billing = BillingService(requesting_user=self.current_owner)
+            return billing.create_setup_intent(owner_obj)
+        except Exception as e:
+            log.error(
+                "Error getting setup intent",
+                extra={
+                    "ownerid": owner_obj.ownerid,
+                    "error": str(e),
+                },
+            )
+            raise ValidationError("Unable to create setup intent")
+
+    @sync_to_async
+    def execute(self, owner: str) -> stripe.SetupIntent:
+        owner_obj = Owner.objects.filter(username=owner, service=self.service).first()
+        self.validate(owner_obj)
+        return self.create_setup_intent(owner_obj)

codecov_auth/commands/owner/owner.py

@@ -2,6 +2,7 @@
 
 from .interactors.cancel_trial import CancelTrialInteractor
 from .interactors.create_api_token import CreateApiTokenInteractor
+from .interactors.create_stripe_setup_intent import CreateStripeSetupIntentInteractor
 from .interactors.create_user_token import CreateUserTokenInteractor
 from .interactors.delete_session import DeleteSessionInteractor
 from .interactors.fetch_owner import FetchOwnerInteractor
@@ -28,6 +29,9 @@ class OwnerCommands(BaseCommand):
     def create_api_token(self, name):
         return self.get_interactor(CreateApiTokenInteractor).execute(name)
 
+    def create_stripe_setup_intent(self, owner):
+        return self.get_interactor(CreateStripeSetupIntentInteractor).execute(owner)
+
     def delete_session(self, sessionid: int):
         return self.get_interactor(DeleteSessionInteractor).execute(sessionid)