Merge branch 'main' into nov_28_activate_api

Author: JerrySentry

VERSION

@@ -1 +1 @@
-24.11.1
+24.12.2

api/internal/coverage/views.py

@@ -43,7 +43,7 @@ def get_object(self) -> ReportPaths:
         component_paths = []
         if components:
             all_components = components_service.commit_components(commit, self.owner)
-            filtered_components = components_service.filter_components_by_name(
+            filtered_components = components_service.filter_components_by_name_or_id(
                 all_components, components
             )
 

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

ci.yml

@@ -35,7 +35,6 @@ services:
   redis_url: redis://redis:@localhost:6379/
   minio:
     hash_key: testixik8qdauiab1yiffydimvi72ekq # never change this
-    periodic_callback_ms: false
     access_key_id: codecov-default-key
     secret_access_key: codecov-default-secret
     verify_ssl: false

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):