Merge branch 'main' into feb_06_public_api_fix

Author: JerrySentry

billing/tests/test_views.py

@@ -1643,6 +1643,132 @@ class MockPaymentMethod:
             "sub_123", default_payment_method=payment_method_retrieve_mock.return_value
         )
 
+    @patch("logging.Logger.error")
+    @patch("services.billing.stripe.PaymentMethod.attach")
+    @patch("services.billing.stripe.Customer.modify")
+    @patch("services.billing.stripe.Subscription.modify")
+    @patch("services.billing.stripe.PaymentMethod.retrieve")
+    def test_check_and_handle_delayed_notification_payment_methods_no_subscription(
+        self,
+        payment_method_retrieve_mock,
+        subscription_modify_mock,
+        customer_modify_mock,
+        payment_method_attach_mock,
+        log_error_mock,
+    ):
+        class MockPaymentMethod:
+            type = "us_bank_account"
+            us_bank_account = {}
+            id = "pm_123"
+
+        payment_method_retrieve_mock.return_value = MockPaymentMethod()
+
+        self.owner.stripe_subscription_id = None
+        self.owner.stripe_customer_id = "cus_123"
+        self.owner.save()
+
+        handler = StripeWebhookHandler()
+        handler._check_and_handle_delayed_notification_payment_methods(
+            "cus_123", "pm_123"
+        )
+
+        payment_method_retrieve_mock.assert_called_once_with("pm_123")
+        payment_method_attach_mock.assert_not_called()
+        customer_modify_mock.assert_not_called()
+        subscription_modify_mock.assert_not_called()
+
+        log_error_mock.assert_called_once_with(
+            "No owners found with that customer_id, something went wrong",
+            extra=dict(customer_id="cus_123"),
+        )
+
+    @patch("logging.Logger.error")
+    @patch("services.billing.stripe.PaymentMethod.attach")
+    @patch("services.billing.stripe.Customer.modify")
+    @patch("services.billing.stripe.Subscription.modify")
+    @patch("services.billing.stripe.PaymentMethod.retrieve")
+    def test_check_and_handle_delayed_notification_payment_methods_no_customer(
+        self,
+        payment_method_retrieve_mock,
+        subscription_modify_mock,
+        customer_modify_mock,
+        payment_method_attach_mock,
+        log_error_mock,
+    ):
+        class MockPaymentMethod:
+            type = "us_bank_account"
+            us_bank_account = {}
+            id = "pm_123"
+
+        payment_method_retrieve_mock.return_value = MockPaymentMethod()
+
+        handler = StripeWebhookHandler()
+        handler._check_and_handle_delayed_notification_payment_methods(
+            "cus_1", "pm_123"
+        )
+
+        payment_method_retrieve_mock.assert_called_once_with("pm_123")
+        payment_method_attach_mock.assert_not_called()
+        customer_modify_mock.assert_not_called()
+        subscription_modify_mock.assert_not_called()
+
+        log_error_mock.assert_called_once_with(
+            "No owners found with that customer_id, something went wrong",
+            extra=dict(customer_id="cus_1"),
+        )
+
+    @patch("services.billing.stripe.PaymentMethod.attach")
+    @patch("services.billing.stripe.Customer.modify")
+    @patch("services.billing.stripe.Subscription.modify")
+    @patch("services.billing.stripe.PaymentMethod.retrieve")
+    def test_check_and_handle_delayed_notification_payment_methods_multiple_subscriptions(
+        self,
+        payment_method_retrieve_mock,
+        subscription_modify_mock,
+        customer_modify_mock,
+        payment_method_attach_mock,
+    ):
+        class MockPaymentMethod:
+            type = "us_bank_account"
+            us_bank_account = {}
+            id = "pm_123"
+
+        payment_method_retrieve_mock.return_value = MockPaymentMethod()
+
+        self.owner.stripe_subscription_id = "sub_123"
+        self.owner.stripe_customer_id = "cus_123"
+        self.owner.save()
+
+        OwnerFactory(stripe_subscription_id="sub_124", stripe_customer_id="cus_123")
+
+        handler = StripeWebhookHandler()
+        handler._check_and_handle_delayed_notification_payment_methods(
+            "cus_123", "pm_123"
+        )
+
+        payment_method_retrieve_mock.assert_called_once_with("pm_123")
+        payment_method_attach_mock.assert_called_once_with(
+            payment_method_retrieve_mock.return_value, customer="cus_123"
+        )
+        customer_modify_mock.assert_called_once_with(
+            "cus_123",
+            invoice_settings={
+                "default_payment_method": payment_method_retrieve_mock.return_value
+            },
+        )
+        subscription_modify_mock.assert_has_calls(
+            [
+                call(
+                    "sub_123",
+                    default_payment_method=payment_method_retrieve_mock.return_value,
+                ),
+                call(
+                    "sub_124",
+                    default_payment_method=payment_method_retrieve_mock.return_value,
+                ),
+            ]
+        )
+
     @patch(
         "billing.views.StripeWebhookHandler._check_and_handle_delayed_notification_payment_methods"
     )

billing/views.py

@@ -539,7 +539,6 @@ def _check_and_handle_delayed_notification_payment_methods(
         When verification succeeds, this attaches the payment method to the customer and sets
         it as the default payment method for both the customer and subscription.
         """
-        owner = Owner.objects.get(stripe_customer_id=customer_id)
         payment_method = stripe.PaymentMethod.retrieve(payment_method_id)
 
         is_us_bank_account = payment_method.type == "us_bank_account" and hasattr(
@@ -548,19 +547,34 @@ def _check_and_handle_delayed_notification_payment_methods(
 
         should_set_as_default = is_us_bank_account
 
+        # attach the payment method + set as default on the invoice and subscription
         if should_set_as_default:
-            # attach the payment method + set as default on the invoice and subscription
-            stripe.PaymentMethod.attach(
-                payment_method, customer=owner.stripe_customer_id
-            )
-            stripe.Customer.modify(
-                owner.stripe_customer_id,
-                invoice_settings={"default_payment_method": payment_method},
-            )
-            stripe.Subscription.modify(
-                owner.stripe_subscription_id, default_payment_method=payment_method
+            # retrieve the number of owners to update
+            owners = Owner.objects.filter(
+                stripe_customer_id=customer_id, stripe_subscription_id__isnull=False
             )
 
+            if owners.exists():
+                # Even if multiple results are returned, these two stripe calls are
+                # just for a single customer
+                stripe.PaymentMethod.attach(payment_method, customer=customer_id)
+                stripe.Customer.modify(
+                    customer_id,
+                    invoice_settings={"default_payment_method": payment_method},
+                )
+
+                # But this one is for each subscription an owner may have
+                for owner in owners:
+                    stripe.Subscription.modify(
+                        owner.stripe_subscription_id,
+                        default_payment_method=payment_method,
+                    )
+            else:
+                log.error(
+                    "No owners found with that customer_id, something went wrong",
+                    extra=dict(customer_id=customer_id),
+                )
+
     def payment_intent_succeeded(self, payment_intent: stripe.PaymentIntent) -> None:
         """
         Stripe payment_intent.succeeded webhook event is emitted when a

codecov/settings_base.py

@@ -443,6 +443,7 @@
     "profiling": "shared.django_apps.profiling.migrations",
     "reports": "shared.django_apps.reports.migrations",
     "staticanalysis": "shared.django_apps.staticanalysis.migrations",
+    "timeseries": "shared.django_apps.timeseries.migrations",
 }
 
 # to aid in debugging, print out this info on startup. If no license, prints nothing

core/admin.py

@@ -7,6 +7,7 @@
 from codecov.admin import AdminMixin
 from codecov_auth.models import RepositoryToken
 from core.models import Pull, Repository
+from services.task.task import TaskService
 
 
 class RepositoryTokenInline(admin.TabularInline):
@@ -90,12 +91,19 @@ class RepositoryAdmin(AdminMixin, admin.ModelAdmin):
         "webhook_secret",
     )
 
-    def has_delete_permission(self, request, obj=None):
-        return False
-
     def has_add_permission(self, _, obj=None):
         return False
 
+    def has_delete_permission(self, request, obj=None):
+        return bool(request.user and request.user.is_superuser)
+
+    def delete_queryset(self, request, queryset) -> None:
+        for repo in queryset:
+            TaskService().flush_repo(repository_id=repo.repoid)
+
+    def delete_model(self, request, obj) -> None:
+        TaskService().flush_repo(repository_id=obj.repoid)
+
 
 @admin.register(Pull)
 class PullsAdmin(AdminMixin, admin.ModelAdmin):

core/apps.py

@@ -1,7 +1,6 @@
 import logging
 
 from django.apps import AppConfig
-from django.core.management import call_command
 from shared.helpers.cache import RedisBackend
 
 from services.redis_configuration import get_redis_connection
@@ -17,24 +16,6 @@ class CoreConfig(AppConfig):
     def ready(self):
         import core.signals  # noqa: F401
 
-        if RUN_ENV == "DEV":
-            try:
-                # Call your management command here
-                call_command(
-                    "insert_data_to_db_from_csv",
-                    "core/management/commands/codecovTiers-Jan25.csv",
-                    "--model",
-                    "tiers",
-                )
-                call_command(
-                    "insert_data_to_db_from_csv",
-                    "core/management/commands/codecovPlans-Jan25.csv",
-                    "--model",
-                    "plans",
-                )
-            except Exception as e:
-                logger.error(f"Failed to run startup command: {e}")
-
         if RUN_ENV not in ["DEV", "TESTING"]:
             cache_backend = RedisBackend(get_redis_connection())
             cache.configure(cache_backend)

core/management/commands/codecovPlans-Jan25.csv

@@ -2,12 +2,12 @@
 10,2025-01-16 04:40:55.162 -0800,2025-01-24 11:33:46.043 -0800,0,"{""Configurable # of users"",""Unlimited public repositories"",""Unlimited private repositories""}",,true,Developer,,,false,users-trial,6,
 9,2025-01-16 04:39:59.759 -0800,2025-01-24 11:34:10.038 -0800,10,"{""Configurable # of users"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",annually,true,Enterprise Cloud,,,true,users-enterprisey,4,price_1LmjzwGlVGuVgOrkIwlM46EU
 8,2025-01-16 04:39:15.877 -0800,2025-01-24 11:34:31.904 -0800,12,"{""Configurable # of users"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",monthly,true,Enterprise Cloud,,,true,users-enterprisem,4,price_1LmjypGlVGuVgOrkzKtNqhwW
-7,2025-01-16 04:38:12.544 -0800,2025-01-24 11:34:53.935 -0800,4,"{""Up to 10 users"",""Unlimited repositories"",""2500 private repo uploads"",""Patch coverage analysis""}",annually,true,Team,10,2500,true,users-teamy,2,price_1NrlXiGlVGuVgOrkgMTw5yno
-6,2025-01-16 04:37:08.918 -0800,2025-01-24 11:35:15.346 -0800,5,"{""Up to 10 users"",""Unlimited repositories"",""2500 private repo uploads"",""Patch coverage analysis""}",monthly,true,Team,10,2500,true,users-teamm,2,price_1NqPKdGlVGuVgOrkm9OFvtz8
-5,2025-01-16 04:35:34.152 -0800,2025-01-24 11:35:42.724 -0800,10,"{""Includes 5 seats"",""$10 per additional seat"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",annually,true,Sentry Pro,5,,true,users-sentryy,5,price_1MlYAYGlVGuVgOrke9SdbBUn
-4,2025-01-16 04:34:33.867 -0800,2025-01-24 11:35:48.218 -0800,12,"{""Includes 5 seats"",""$10 per additional seat"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",monthly,true,Sentry Pro,5,,true,users-sentrym,5,price_1MlY9yGlVGuVgOrkHluurBtJ
-3,2025-01-16 04:32:44.655 -0800,2025-01-24 11:36:09.660 -0800,10,"{""Configurable # of users"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",annually,true,Pro,,,true,users-pr-inappy,3,price_1Gv2COGlVGuVgOrkuOYVLIj7
-2,2025-01-16 04:30:42.897 -0800,2025-01-24 11:36:14.651 -0800,12,"{""Configurable # of users"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",monthly,true,Pro,,,true,users-pr-inappm,3,price_1Gv2B8GlVGuVgOrkFnLunCgc
+7,2025-01-16 04:38:12.544 -0800,2025-01-24 11:34:53.935 -0800,4,"{""Up to 10 users"",""Unlimited repositories"",""2500 private repo uploads"",""Patch coverage analysis""}",annually,true,Team,10,2500,true,users-teamy,2,price_1OCM2cGlVGuVgOrkMWUFjPFz
+6,2025-01-16 04:37:08.918 -0800,2025-01-24 11:35:15.346 -0800,5,"{""Up to 10 users"",""Unlimited repositories"",""2500 private repo uploads"",""Patch coverage analysis""}",monthly,true,Team,10,2500,true,users-teamm,2,price_1OCM0gGlVGuVgOrkWDYEBtSL
+5,2025-01-16 04:35:34.152 -0800,2025-01-24 11:35:42.724 -0800,10,"{""Includes 5 seats"",""$10 per additional seat"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",annually,true,Sentry Pro,5,,true,users-sentryy,5,price_1Mj1mMGlVGuVgOrkC0ORc6iW
+4,2025-01-16 04:34:33.867 -0800,2025-01-24 11:35:48.218 -0800,12,"{""Includes 5 seats"",""$10 per additional seat"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",monthly,true,Sentry Pro,5,,true,users-sentrym,5,price_1Mj1kYGlVGuVgOrk7jucaZAa
+3,2025-01-16 04:32:44.655 -0800,2025-01-24 11:36:09.660 -0800,10,"{""Configurable # of users"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",annually,true,Pro,,,true,users-pr-inappy,3,plan_H6P16wij3lUuxg
+2,2025-01-16 04:30:42.897 -0800,2025-01-24 11:36:14.651 -0800,12,"{""Configurable # of users"",""Unlimited public repositories"",""Unlimited private repositories"",""Priority Support""}",monthly,true,Pro,,,true,users-pr-inappm,3,plan_H6P3KZXwmAbqPS
 13,2025-01-23 14:25:04.793 -0800,2025-01-23 14:25:04.793 -0800,12,"{""Configurable # of users"",""Unlimited public repositories"",""Unlimited private repositories""}",,true,Github Marketplace,,,false,users,3,
 12,2025-01-16 04:44:51.064 -0800,2025-01-24 11:33:14.405 -0800,0,"{""Up to 1 user"",""Unlimited public repositories"",""Unlimited private repositories""}",,true,Developer,1,250,false,users-developer,2,
 11,2025-01-16 04:44:01.249 -0800,2025-01-24 11:33:28.532 -0800,0,"{""Up to 1 user"",""Unlimited public repositories"",""Unlimited private repositories""}",,true,Developer,1,250,false,users-basic,1,

core/management/commands/insert_data_to_db_from_csv.py

@@ -51,8 +51,15 @@ def handle(self, *args, **kwargs):
                         )
                         continue
 
-                Model.objects.create(**model_data)
-                self.stdout.write(self.style.SUCCESS(f"Inserted row: {row}"))
+                try:
+                    Model.objects.update_or_create(
+                        defaults=model_data,
+                        id=row.get("id"),
+                    )
+                    self.stdout.write(self.style.SUCCESS(f"Inserted row: {row}"))
+                except Exception as e:
+                    self.stdout.write(self.style.ERROR(f"Error inserting row: {e}"))
+                    continue
 
         self.stdout.write(
             self.style.SUCCESS(

dev.sh

@@ -2,7 +2,7 @@
 
 # starts the development server using gunicorn
 # NEVER run production with the --reload option command
-echo "Starting gunicorn in dev mode"
+echo "API: Starting gunicorn in dev mode"
 
 _start_gunicorn() {
   if [ -n "$PROMETHEUS_MULTIPROC_DIR" ]; then
@@ -19,6 +19,8 @@ _start_gunicorn() {
     python manage.py migrate
     python manage.py migrate --database "timeseries" timeseries
     python manage.py pgpartition --yes --skip-delete
+    python manage.py insert_data_to_db_from_csv core/management/commands/codecovTiers-Jan25.csv --model tiers
+    python manage.py insert_data_to_db_from_csv core/management/commands/codecovPlans-Jan25.csv --model plans
   fi
   if [[ "$DEBUGPY" ]]; then
       pip install debugpy

graphql_api/types/plan/plan.py

@@ -30,7 +30,7 @@ def resolve_trial_end_date(plan_service: PlanService, info) -> Optional[datetime
 
 @plan_bindable.field("trialStatus")
 def resolve_trial_status(plan_service: PlanService, info) -> TrialStatus:
-    if plan_service.trial_status is None:
+    if not plan_service.trial_status:
         return TrialStatus.NOT_STARTED
     return TrialStatus(plan_service.trial_status)
 

requirements.in

@@ -25,7 +25,7 @@ freezegun
 google-cloud-pubsub
 gunicorn>=22.0.0
 https://github.com/codecov/opentelem-python/archive/refs/tags/v0.0.4a1.tar.gz#egg=codecovopentelem
-https://github.com/codecov/shared/archive/7ba099fa0552244c77a8cc3a4b772216613c09c8.tar.gz#egg=shared
+https://github.com/codecov/shared/archive/abf6180de5cee3ac99b7fbf909bd82c7325063fd.tar.gz#egg=shared
 https://github.com/photocrowd/django-cursor-pagination/archive/f560902696b0c8509e4d95c10ba0d62700181d84.tar.gz
 idna>=3.7
 minio
@@ -58,4 +58,4 @@ starlette==0.40.0
 stripe>=11.4.1
 urllib3>=1.26.19
 vcrpy
-whitenoise
+whitenoise