Merge remote-tracking branch 'origin/main' into sshin/2849

Author: suejung-sentry

api/internal/owner/serializers.py

@@ -12,9 +12,9 @@
     TEAM_PLAN_MAX_USERS,
     TEAM_PLAN_REPRESENTATIONS,
 )
+from shared.plan.service import PlanService
 
 from codecov_auth.models import Owner
-from plan.service import PlanService
 from services.billing import BillingService
 from services.sentry import send_user_webhook as send_sentry_webhook
 

billing/tests/test_views.py

@@ -571,7 +571,7 @@ def test_customer_subscription_created_sets_plan_info(self):
         assert self.owner.plan == plan_name
 
     @freeze_time("2023-06-19")
-    @patch("plan.service.PlanService.expire_trial_when_upgrading")
+    @patch("shared.plan.service.PlanService.expire_trial_when_upgrading")
     @patch("services.billing.stripe.PaymentMethod.attach")
     @patch("services.billing.stripe.Customer.modify")
     def test_customer_subscription_created_can_trigger_trial_expiration(

billing/views.py

@@ -10,9 +10,9 @@
 from rest_framework.permissions import AllowAny
 from rest_framework.response import Response
 from rest_framework.views import APIView
+from shared.plan.service import PlanService
 
 from codecov_auth.models import Owner
-from plan.service import PlanService
 from services.task.task import TaskService
 
 from .constants import StripeHTTPHeaders, StripeWebhookEvents

codecov_auth/admin.py

@@ -20,13 +20,13 @@
     StripeBilling,
 )
 from shared.plan.constants import USER_PLAN_REPRESENTATIONS
+from shared.plan.service import PlanService
 
 from codecov.admin import AdminMixin
 from codecov.commands.exceptions import ValidationError
 from codecov_auth.helpers import History
 from codecov_auth.models import OrganizationLevelToken, Owner, SentryUser, Session, User
 from codecov_auth.services.org_level_token_service import OrgLevelTokenService
-from plan.service import PlanService
 from services.task import TaskService
 from utils.services import get_short_service_name
 

codecov_auth/commands/owner/interactors/cancel_trial.py

@@ -1,9 +1,10 @@
+from shared.plan.service import PlanService
+
 from codecov.commands.base import BaseInteractor
 from codecov.commands.exceptions import 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 plan.service import PlanService
 
 
 class CancelTrialInteractor(BaseInteractor):

codecov_auth/commands/owner/interactors/get_uploads_number_per_user.py

@@ -1,9 +1,9 @@
+from shared.plan.service import PlanService
 from shared.upload.utils import query_monthly_coverage_measurements
 
 from codecov.commands.base import BaseInteractor
 from codecov.db import sync_to_async
 from codecov_auth.models import Owner
-from plan.service import PlanService
 from services.redis_configuration import get_redis_connection
 
 redis = get_redis_connection()

codecov_auth/commands/owner/interactors/start_trial.py

@@ -1,9 +1,10 @@
+from shared.plan.service import PlanService
+
 from codecov.commands.base import BaseInteractor
 from codecov.commands.exceptions import 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 plan.service import PlanService
 
 
 class StartTrialInteractor(BaseInteractor):

codecov_auth/commands/owner/interactors/tests/test_cancel_trial.py

@@ -4,10 +4,12 @@
 from asgiref.sync import async_to_sync
 from django.test import TransactionTestCase
 from freezegun import freeze_time
+from shared.django_apps.codecov.commands.exceptions import ValidationError
 from shared.django_apps.core.tests.factories import OwnerFactory
 from shared.plan.constants import PlanName, TrialStatus
 
-from codecov.commands.exceptions import Unauthorized, ValidationError
+from codecov.commands.exceptions import Unauthorized
+from codecov.commands.exceptions import ValidationError as CodecovValidationError
 from codecov_auth.models import Owner
 
 from ..cancel_trial import CancelTrialInteractor
@@ -26,7 +28,7 @@ def test_cancel_trial_raises_exception_when_owner_is_not_in_db(self):
             username="random-user-123",
             service="github",
         )
-        with pytest.raises(ValidationError):
+        with pytest.raises(CodecovValidationError):
             self.execute(current_user=current_user, org_username="some-other-username")
 
     def test_cancel_trial_raises_exception_when_current_user_not_part_of_org(self):

codecov_auth/commands/owner/interactors/tests/test_start_trial.py

@@ -4,6 +4,7 @@
 from asgiref.sync import async_to_sync
 from django.test import TransactionTestCase
 from freezegun import freeze_time
+from shared.django_apps.codecov.commands.exceptions import ValidationError
 from shared.django_apps.core.tests.factories import OwnerFactory
 from shared.plan.constants import (
     TRIAL_PLAN_SEATS,
@@ -12,7 +13,8 @@
     TrialStatus,
 )
 
-from codecov.commands.exceptions import Unauthorized, ValidationError
+from codecov.commands.exceptions import Unauthorized
+from codecov.commands.exceptions import ValidationError as CodecovValidationError
 from codecov_auth.models import Owner
 
 from ..start_trial import StartTrialInteractor
@@ -31,7 +33,7 @@ def test_start_trial_raises_exception_when_owner_is_not_in_db(self):
             username="random-user-123",
             service="github",
         )
-        with pytest.raises(ValidationError):
+        with pytest.raises(CodecovValidationError):
             self.execute(current_user=current_user, org_username="some-other-username")
 
     def test_cancel_trial_raises_exception_when_current_user_not_part_of_org(self):

codecov_auth/tests/test_admin.py

@@ -300,7 +300,7 @@ def test_start_trial_ui_display(self):
         assert res.status_code == 200
         assert "Extending trial for:" in str(res.content)
 
-    @patch("plan.service.PlanService.start_trial_manually")
+    @patch("shared.plan.service.PlanService.start_trial_manually")
     def test_start_trial_action(self, mock_start_trial_service):
         mock_start_trial_service.return_value = None
         org_to_be_trialed = OwnerFactory()
@@ -317,7 +317,7 @@ def test_start_trial_action(self, mock_start_trial_service):
         assert res.status_code == 302
         assert mock_start_trial_service.called
 
-    @patch("plan.service.PlanService._start_trial_helper")
+    @patch("shared.plan.service.PlanService._start_trial_helper")
     def test_extend_trial_action(self, mock_start_trial_service):
         mock_start_trial_service.return_value = None
         org_to_be_trialed = OwnerFactory()
@@ -337,7 +337,7 @@ def test_extend_trial_action(self, mock_start_trial_service):
         assert mock_start_trial_service.called
         assert mock_start_trial_service.call_args.kwargs == {"is_extension": True}
 
-    @patch("plan.service.PlanService.start_trial_manually")
+    @patch("shared.plan.service.PlanService.start_trial_manually")
     def test_start_trial_paid_plan(self, mock_start_trial_service):
         mock_start_trial_service.side_effect = ValidationError(
             "Cannot trial from a paid plan"