Merge branch 'main' into rvinnakota/indirect-misses

Author: rohitvinnakota-codecov

api/internal/commit/serializers.py

@@ -41,7 +41,7 @@ def get_report(self, commit: Commit):
         for filename in report.files:
             file_report = report.get(filename)
             file_totals = CommitTotalsSerializer(
-                {key: val for key, val in zip(TOTALS_MAP, file_report.totals)}
+                dict(zip(TOTALS_MAP, file_report.totals))
             )
             files.append(
                 {

api/internal/owner/serializers.py

@@ -1,5 +1,4 @@
 import logging
-from dataclasses import asdict
 from datetime import datetime
 
 from dateutil.relativedelta import relativedelta
@@ -127,10 +126,9 @@ def validate_value(self, value):
         current_owner = self.context["request"].current_owner
 
         plan_service = PlanService(current_org=current_org)
-        available_plans = [
-            asdict(plan) for plan in plan_service.available_plans(current_owner)
+        plan_values = [
+            plan["value"] for plan in plan_service.available_plans(current_owner)
         ]
-        plan_values = [plan["value"] for plan in available_plans]
         if value not in plan_values:
             if value in SENTRY_PAID_USER_PLAN_REPRESENTATIONS:
                 log.warning(

api/internal/tests/views/test_account_viewset.py

@@ -960,7 +960,7 @@ def test_update_team_plan_must_fail_if_too_many_activated_users_during_trial(sel
         self.current_owner.plan = PlanName.BASIC_PLAN_NAME.value
         self.current_owner.plan_user_count = 1
         self.current_owner.trial_status = TrialStatus.ONGOING.value
-        self.current_owner.plan_activated_users = [i for i in range(11)]
+        self.current_owner.plan_activated_users = list(range(11))
         self.current_owner.save()
 
         desired_plans = [

api/internal/tests/views/test_self_hosted_user_viewset.py

@@ -1,6 +1,6 @@
 from unittest.mock import patch
 
-from django.test import TransactionTestCase, override_settings
+from django.test import TestCase, override_settings
 from rest_framework.reverse import reverse
 from shared.django_apps.core.tests.factories import OwnerFactory
 
@@ -10,15 +10,15 @@
 
 
 @override_settings(IS_ENTERPRISE=True, ROOT_URLCONF="api.internal.enterprise_urls")
-class UserViewsetUnauthenticatedTestCase(TransactionTestCase):
+class UserViewsetUnauthenticatedTestCase(TestCase):
     def test_list_users(self):
         res = self.client.get(reverse("selfhosted-users-list"))
         # not authenticated
         assert res.status_code == 401
 
 
 @override_settings(IS_ENTERPRISE=True, ROOT_URLCONF="api.internal.enterprise_urls")
-class UserViewsetTestCase(TransactionTestCase):
+class UserViewsetTestCase(TestCase):
     def setUp(self):
         self.owner = OwnerFactory()
         self.current_owner = OwnerFactory(organizations=[self.owner.ownerid])

api/internal/tests/views/test_user_viewset.py

@@ -3,7 +3,7 @@
 
 from rest_framework import status
 from rest_framework.reverse import reverse
-from rest_framework.test import APITransactionTestCase
+from rest_framework.test import APITestCase
 from shared.django_apps.core.tests.factories import (
     OwnerFactory,
     PullFactory,
@@ -14,7 +14,7 @@
 from utils.test_utils import APIClient
 
 
-class UserViewSetTests(APITransactionTestCase):
+class UserViewSetTests(APITestCase):
     def setUp(self):
         non_org_active_user = OwnerFactory()
         self.current_owner = OwnerFactory(

billing/tests/test_views.py

@@ -39,6 +39,35 @@ def __getitem__(self, key):
         return getattr(self, key)
 
 
+class MockCard(object):
+    def __init__(self):
+        self.brand = "visa"
+        self.last4 = "1234"
+
+    def __getitem__(self, key):
+        return getattr(self, key)
+
+
+class MockPaymentMethod(object):
+    def __init__(self, noCard=False):
+        if noCard:
+            self.card = None
+            return
+
+        self.card = MockCard()
+
+    def __getitem__(self, key):
+        return getattr(self, key)
+
+
+class MockPaymentIntent(object):
+    def __init__(self, noCard=False):
+        self.payment_method = MockPaymentMethod(noCard)
+
+    def __getitem__(self, key):
+        return getattr(self, key)
+
+
 class StripeWebhookHandlerTests(APITestCase):
     def setUp(self):
         self.owner = OwnerFactory(
@@ -97,6 +126,8 @@ def test_invoice_payment_succeeded_sets_owner_delinquent_false(self):
                     "object": {
                         "customer": self.owner.stripe_customer_id,
                         "subscription": self.owner.stripe_subscription_id,
+                        "total": 24000,
+                        "hosted_invoice_url": "https://stripe.com",
                     }
                 },
             }
@@ -120,6 +151,72 @@ def test_invoice_payment_succeeded_sets_multiple_owners_delinquent_false(self):
                     "object": {
                         "customer": self.owner.stripe_customer_id,
                         "subscription": self.owner.stripe_subscription_id,
+                        "total": 24000,
+                        "hosted_invoice_url": "https://stripe.com",
+                    }
+                },
+            }
+        )
+
+        self.owner.refresh_from_db()
+        self.other_owner.refresh_from_db()
+        assert response.status_code == status.HTTP_204_NO_CONTENT
+        assert self.owner.delinquent is False
+        assert self.other_owner.delinquent is False
+
+    @patch("services.task.TaskService.send_email")
+    def test_invoice_payment_succeeded_emails_only_emails_delinquents(
+        self,
+        mocked_send_email,
+    ):
+        self.add_second_owner()
+        self.owner.delinquent = False
+        self.owner.save()
+
+        response = self._send_event(
+            payload={
+                "type": "invoice.payment_succeeded",
+                "data": {
+                    "object": {
+                        "customer": self.owner.stripe_customer_id,
+                        "subscription": self.owner.stripe_subscription_id,
+                        "total": 24000,
+                        "hosted_invoice_url": "https://stripe.com",
+                    }
+                },
+            }
+        )
+
+        self.owner.refresh_from_db()
+        self.other_owner.refresh_from_db()
+        assert response.status_code == status.HTTP_204_NO_CONTENT
+        assert self.owner.delinquent is False
+
+        mocked_send_email.assert_not_called()
+
+    @patch("services.task.TaskService.send_email")
+    def test_invoice_payment_succeeded_emails_delinquents(self, mocked_send_email):
+        non_admin = OwnerFactory(email="[email protected]")
+        admin_1 = OwnerFactory(email="[email protected]")
+        admin_2 = OwnerFactory(email="[email protected]")
+        self.owner.admins = [admin_1.ownerid, admin_2.ownerid]
+        self.owner.plan_activated_users = [non_admin.ownerid]
+        self.owner.email = "[email protected]"
+        self.owner.delinquent = True
+        self.owner.save()
+        self.add_second_owner()
+        self.other_owner.delinquent = False
+        self.other_owner.save()
+
+        response = self._send_event(
+            payload={
+                "type": "invoice.payment_succeeded",
+                "data": {
+                    "object": {
+                        "customer": self.owner.stripe_customer_id,
+                        "subscription": self.owner.stripe_subscription_id,
+                        "total": 24000,
+                        "hosted_invoice_url": "https://stripe.com",
                     }
                 },
             }
@@ -131,22 +228,54 @@ def test_invoice_payment_succeeded_sets_multiple_owners_delinquent_false(self):
         assert self.owner.delinquent is False
         assert self.other_owner.delinquent is False
 
-    def test_invoice_payment_failed_sets_owner_delinquent_true(self):
+        expected_calls = [
+            call(
+                to_addr=self.owner.email,
+                subject="You're all set",
+                template_name="success-after-failed-payment",
+                amount=240,
+                cta_link="https://stripe.com",
+                date=datetime.now().strftime("%B %-d, %Y"),
+            ),
+            call(
+                to_addr=admin_1.email,
+                subject="You're all set",
+                template_name="success-after-failed-payment",
+                amount=240,
+                cta_link="https://stripe.com",
+                date=datetime.now().strftime("%B %-d, %Y"),
+            ),
+            call(
+                to_addr=admin_2.email,
+                subject="You're all set",
+                template_name="success-after-failed-payment",
+                amount=240,
+                cta_link="https://stripe.com",
+                date=datetime.now().strftime("%B %-d, %Y"),
+            ),
+        ]
+
+        mocked_send_email.assert_has_calls(expected_calls)
+
+    @patch("services.billing.stripe.PaymentIntent.retrieve")
+    def test_invoice_payment_failed_sets_owner_delinquent_true(
+        self, retrieve_paymentintent_mock
+    ):
         self.owner.delinquent = False
         self.owner.save()
 
+        retrieve_paymentintent_mock.return_value = MockPaymentIntent()
+
         response = self._send_event(
             payload={
                 "type": "invoice.payment_failed",
                 "data": {
                     "object": {
                         "customer": self.owner.stripe_customer_id,
                         "subscription": self.owner.stripe_subscription_id,
-                        "default_payment_method": {
-                            "card": {"brand": "visa", "last4": 1234}
-                        },
                         "total": 24000,
                         "hosted_invoice_url": "https://stripe.com",
+                        "payment_intent": "payment_intent_asdf",
                     }
                 },
             }
@@ -156,25 +285,28 @@ def test_invoice_payment_failed_sets_owner_delinquent_true(self):
         assert response.status_code == status.HTTP_204_NO_CONTENT
         assert self.owner.delinquent is True
 
-    def test_invoice_payment_failed_sets_multiple_owners_delinquent_true(self):
+    @patch("services.billing.stripe.PaymentIntent.retrieve")
+    def test_invoice_payment_failed_sets_multiple_owners_delinquent_true(
+        self, retrieve_paymentintent_mock
+    ):
         self.add_second_owner()
         self.owner.delinquent = False
         self.owner.save()
         self.other_owner.delinquent = False
         self.other_owner.save()
 
+        retrieve_paymentintent_mock.return_value = MockPaymentIntent()
+
         response = self._send_event(
             payload={
                 "type": "invoice.payment_failed",
                 "data": {
                     "object": {
                         "customer": self.owner.stripe_customer_id,
                         "subscription": self.owner.stripe_subscription_id,
-                        "default_payment_method": {
-                            "card": {"brand": "visa", "last4": 1234}
-                        },
                         "total": 24000,
                         "hosted_invoice_url": "https://stripe.com",
+                        "payment_intent": "payment_intent_asdf",
                     }
                 },
             }
@@ -187,7 +319,12 @@ def test_invoice_payment_failed_sets_multiple_owners_delinquent_true(self):
         assert self.other_owner.delinquent is True
 
     @patch("services.task.TaskService.send_email")
-    def test_invoice_payment_failed_sends_email_to_admins(self, mocked_send_email):
+    @patch("services.billing.stripe.PaymentIntent.retrieve")
+    def test_invoice_payment_failed_sends_email_to_admins(
+        self,
+        retrieve_paymentintent_mock,
+        mocked_send_email,
+    ):
         non_admin = OwnerFactory(email="[email protected]")
         admin_1 = OwnerFactory(email="[email protected]")
         admin_2 = OwnerFactory(email="[email protected]")
@@ -196,18 +333,18 @@ def test_invoice_payment_failed_sends_email_to_admins(self, mocked_send_email):
         self.owner.email = "[email protected]"
         self.owner.save()
 
+        retrieve_paymentintent_mock.return_value = MockPaymentIntent()
+
         response = self._send_event(
             payload={
                 "type": "invoice.payment_failed",
                 "data": {
                     "object": {
                         "customer": self.owner.stripe_customer_id,
                         "subscription": self.owner.stripe_subscription_id,
-                        "default_payment_method": {
-                            "card": {"brand": "visa", "last4": 1234}
-                        },
                         "total": 24000,
                         "hosted_invoice_url": "https://stripe.com",
+                        "payment_intent": "payment_intent_asdf",
                     }
                 },
             }
@@ -225,7 +362,7 @@ def test_invoice_payment_failed_sends_email_to_admins(self, mocked_send_email):
                 name=self.owner.username,
                 amount=240,
                 card_type="visa",
-                last_four=1234,
+                last_four="1234",
                 cta_link="https://stripe.com",
                 date=datetime.now().strftime("%B %-d, %Y"),
             ),
@@ -236,7 +373,7 @@ def test_invoice_payment_failed_sends_email_to_admins(self, mocked_send_email):
                 name=admin_1.username,
                 amount=240,
                 card_type="visa",
-                last_four=1234,
+                last_four="1234",
                 cta_link="https://stripe.com",
                 date=datetime.now().strftime("%B %-d, %Y"),
             ),
@@ -247,16 +384,20 @@ def test_invoice_payment_failed_sends_email_to_admins(self, mocked_send_email):
                 name=admin_2.username,
                 amount=240,
                 card_type="visa",
-                last_four=1234,
+                last_four="1234",
                 cta_link="https://stripe.com",
                 date=datetime.now().strftime("%B %-d, %Y"),
             ),
         ]
+
         mocked_send_email.assert_has_calls(expected_calls)
 
     @patch("services.task.TaskService.send_email")
+    @patch("services.billing.stripe.PaymentIntent.retrieve")
     def test_invoice_payment_failed_sends_email_to_admins_no_card(
-        self, mocked_send_email
+        self,
+        retrieve_paymentintent_mock,
+        mocked_send_email,
     ):
         non_admin = OwnerFactory(email="[email protected]")
         admin_1 = OwnerFactory(email="[email protected]")
@@ -266,6 +407,8 @@ def test_invoice_payment_failed_sends_email_to_admins_no_card(
         self.owner.email = "[email protected]"
         self.owner.save()
 
+        retrieve_paymentintent_mock.return_value = MockPaymentIntent(noCard=True)
+
         response = self._send_event(
             payload={
                 "type": "invoice.payment_failed",
@@ -276,6 +419,7 @@ def test_invoice_payment_failed_sends_email_to_admins_no_card(
                         "default_payment_method": None,
                         "total": 24000,
                         "hosted_invoice_url": "https://stripe.com",
+                        "payment_intent": "payment_intent_asdf",
                     }
                 },
             }