Merge branch 'main' into rvinnakota/update-ai-repo

Author: rohitvinnakota-codecov

api/internal/owner/serializers.py

@@ -131,7 +131,7 @@ def validate_value(self, value: str) -> str:
 
         plan_service = PlanService(current_org=current_org)
         plan_values = [
-            plan["value"] for plan in plan_service.available_plans(current_owner)
+            plan.name for plan in plan_service.available_plans(current_owner)
         ]
         if value not in plan_values:
             raise serializers.ValidationError(

api/internal/tests/views/test_user_viewset.py

@@ -10,7 +10,7 @@
     PullFactory,
     RepositoryFactory,
 )
-from shared.plan.constants import PlanName, TierName
+from shared.plan.constants import DEFAULT_FREE_PLAN, TierName
 
 from core.models import Pull
 from utils.test_utils import APIClient
@@ -20,7 +20,7 @@ class UserViewSetTests(APITestCase):
     def setUp(self):
         non_org_active_user = OwnerFactory()
         tier = TierFactory(tier_name=TierName.BASIC.value)
-        plan = PlanFactory(name=PlanName.BASIC_PLAN_NAME.value, tier=tier)
+        plan = PlanFactory(name=DEFAULT_FREE_PLAN, tier=tier)
         self.current_owner = OwnerFactory(
             plan=plan.name,
             plan_user_count=5,

billing/tests/test_views.py

@@ -871,7 +871,7 @@ def test_customer_subscription_updated_does_not_change_subscription_if_not_paid_
         has_unverified_initial_payment_method_mock,
     ):
         has_unverified_initial_payment_method_mock.return_value = False
-        self.owner.plan = PlanName.BASIC_PLAN_NAME.value
+        self.owner.plan = DEFAULT_FREE_PLAN
         self.owner.plan_user_count = 0
         self.owner.plan_auto_activate = False
         self.owner.save()
@@ -895,7 +895,7 @@ def test_customer_subscription_updated_does_not_change_subscription_if_not_paid_
         )
 
         self.owner.refresh_from_db()
-        assert self.owner.plan == PlanName.BASIC_PLAN_NAME.value
+        assert self.owner.plan == DEFAULT_FREE_PLAN
         assert self.owner.plan_user_count == 0
         assert self.owner.plan_auto_activate == False
         pm_mock.assert_called_once_with(

codecov/settings_base.py

@@ -345,11 +345,11 @@
 IS_ENTERPRISE = get_settings_module() == SettingsModule.ENTERPRISE.value
 IS_DEV = get_settings_module() == SettingsModule.DEV.value
 
-DATA_UPLOAD_MAX_MEMORY_SIZE = get_config(
-    "setup", "http", "upload_max_memory_size", default=2621440
+DATA_UPLOAD_MAX_MEMORY_SIZE = int(
+    get_config("setup", "http", "upload_max_memory_size", default=2621440)
 )
-FILE_UPLOAD_MAX_MEMORY_SIZE = get_config(
-    "setup", "http", "file_upload_max_memory_size", default=2621440
+FILE_UPLOAD_MAX_MEMORY_SIZE = int(
+    get_config("setup", "http", "file_upload_max_memory_size", default=2621440)
 )
 
 CORS_ALLOWED_ORIGIN_REGEXES = get_config(
@@ -433,6 +433,8 @@
     "setup", "stripe", "payment_method_configuration_id", default=None
 )
 
+AMPLITUDE_API_KEY = os.environ.get("AMPLITUDE_API_KEY", None)
+
 # Allows to do migrations from another module
 MIGRATION_MODULES = {
     "codecov_auth": "shared.django_apps.codecov_auth.migrations",

codecov_auth/tests/unit/services/test_org_level_token_service.py

@@ -10,7 +10,7 @@
     PlanFactory,
     TierFactory,
 )
-from shared.plan.constants import PlanName, TierName
+from shared.plan.constants import DEFAULT_FREE_PLAN, PlanName, TierName
 
 from codecov_auth.models import OrganizationLevelToken
 from codecov_auth.services.org_level_token_service import OrgLevelTokenService
@@ -47,7 +47,7 @@ def setUp(self):
         self.basic_tier = TierFactory(tier_name=TierName.BASIC.value)
         self.basic_plan = PlanFactory(
             tier=self.basic_tier,
-            name=PlanName.BASIC_PLAN_NAME.value,
+            name=DEFAULT_FREE_PLAN,
         )
         self.owner = OwnerFactory(plan=self.enterprise_plan.name)
 

codecov_auth/tests/unit/views/test_base.py

@@ -1,5 +1,5 @@
 from datetime import datetime, timedelta, timezone
-from unittest.mock import Mock, patch
+from unittest.mock import Mock, call, patch
 
 import pytest
 from django.conf import settings
@@ -174,6 +174,27 @@ def test_get_or_create_calls_analytics_user_signed_up_when_owner_created(
         )
         user_signed_up_mock.assert_called_once()
 
+    @patch("shared.events.amplitude.AmplitudeEventPublisher.publish")
+    def test_get_or_create_calls_amplitude_user_created_when_owner_created(
+        self, amplitude_publish_mock
+    ):
+        self.mixin_instance._get_or_create_owner(
+            {
+                "user": {"id": 12345, "key": "4567", "login": "testuser"},
+                "has_private_access": False,
+            },
+            self.request,
+        )
+
+        owner = Owner.objects.get(service_id=12345, username="testuser")
+
+        amplitude_publish_mock.assert_has_calls(
+            [
+                call("User Created", {"user_ownerid": owner.ownerid}),
+                call("set_orgs", {"user_ownerid": owner.ownerid, "org_ids": []}),
+            ]
+        )
+
     @patch("services.analytics.AnalyticsService.user_signed_in")
     def test_get_or_create_calls_analytics_user_signed_in_when_owner_not_created(
         self, user_signed_in_mock
@@ -192,6 +213,30 @@ def test_get_or_create_calls_analytics_user_signed_in_when_owner_not_created(
         )
         user_signed_in_mock.assert_called_once()
 
+    @patch("shared.events.amplitude.AmplitudeEventPublisher.publish")
+    def test_get_or_create_calls_amplitude_user_logged_in_when_owner_not_created(
+        self, amplitude_publish_mock
+    ):
+        owner = OwnerFactory(service_id=89, service="github", organizations=[1, 2])
+        self.mixin_instance._get_or_create_owner(
+            {
+                "user": {
+                    "id": owner.service_id,
+                    "key": "02or0sa",
+                    "login": owner.username,
+                },
+                "has_private_access": owner.private_access,
+            },
+            self.request,
+        )
+
+        amplitude_publish_mock.assert_has_calls(
+            [
+                call("User Logged in", {"user_ownerid": owner.ownerid}),
+                call("set_orgs", {"user_ownerid": owner.ownerid, "org_ids": [1, 2]}),
+            ]
+        )
+
     @override_settings(IS_ENTERPRISE=False)
     @patch("services.analytics.AnalyticsService.user_signed_in")
     def test_set_marketing_tags_on_cookies(self, user_signed_in_mock):

codecov_auth/views/base.py

@@ -15,6 +15,7 @@
 from django.utils import timezone
 from django.utils.timezone import now
 from shared.encryption.token import encode_token
+from shared.events.amplitude import AmplitudeEventPublisher
 from shared.license import LICENSE_ERRORS_MESSAGES, get_current_license
 
 from codecov_auth.models import Owner, OwnerProfile, Session, User
@@ -393,10 +394,21 @@ def _get_or_create_owner(
         owner.save(update_fields=fields_to_update)
 
         marketing_tags = self.retrieve_marketing_tags_from_cookie()
+        amplitude = AmplitudeEventPublisher()
         if was_created:
             self.analytics_service.user_signed_up(owner, **marketing_tags)
+            amplitude.publish("User Created", {"user_ownerid": owner.ownerid})
         else:
             self.analytics_service.user_signed_in(owner, **marketing_tags)
+            amplitude.publish("User Logged in", {"user_ownerid": owner.ownerid})
+        orgs = owner.organizations
+        amplitude.publish(
+            "set_orgs",
+            {
+                "user_ownerid": owner.ownerid,
+                "org_ids": orgs if orgs is not None else [],
+            },
+        )
 
         return (owner, was_created)
 

compare/commands/compare/interactors/fetch_impacted_files.py

@@ -1,7 +1,7 @@
 import enum
 from typing import List, Optional
 
-from shared.utils.match import match
+from shared.utils.match import Matcher
 
 import services.components as components
 from codecov.commands.base import BaseInteractor
@@ -74,11 +74,8 @@ def _apply_filters(
         res = impacted_files
 
         if components_paths:
-            res = [
-                file
-                for file in impacted_files
-                if match(components_paths, file.head_name)
-            ]
+            matcher = Matcher(components_paths)
+            res = [file for file in impacted_files if matcher.match(file.head_name)]
         return res
 
     def get_attribute(

graphql_api/actions/path_contents.py

@@ -1,46 +1,18 @@
-from typing import Iterable, Union
-
 import sentry_sdk
 
 from graphql_api.types.enums import PathContentDisplayType
 from services.path import Dir, File
 
 
-def partition_list_into_files_and_directories(
-    items: Iterable[Union[File, Dir]],
-) -> tuple[Union[File, Dir]]:
-    files = []
-    directories = []
-
-    # Separate files and directories
-    for item in items:
-        if isinstance(item, Dir):
-            directories.append(item)
-        else:
-            files.append(item)
-
-    return (files, directories)
-
-
-def sort_list_by_directory(
-    items: Iterable[Union[File, Dir]],
-) -> Iterable[Union[File, Dir]]:
-    (files, directories) = partition_list_into_files_and_directories(items=items)
-    return directories + files
-
-
 @sentry_sdk.trace
-def sort_path_contents(
-    items: Iterable[Union[File, Dir]], filters={}
-) -> Iterable[Union[File, Dir]]:
+def sort_path_contents(items: list[File | Dir], filters: dict = {}) -> list[File | Dir]:
     filter_parameter = filters.get("ordering", {}).get("parameter")
     filter_direction = filters.get("ordering", {}).get("direction")
 
     if filter_parameter and filter_direction:
         parameter_value = filter_parameter.value
         direction_value = filter_direction.value
-        items = sorted(
-            items,
+        items.sort(
             key=lambda item: getattr(item, parameter_value),
             reverse=direction_value == "descending",
         )
@@ -49,6 +21,6 @@ def sort_path_contents(
             parameter_value == "name"
             and display_type is not PathContentDisplayType.LIST
         ):
-            items = sort_list_by_directory(items=items)
+            items.sort(key=lambda item: isinstance(item, File))
 
     return items

graphql_api/tests/mutation/test_erase_repository.py

@@ -22,6 +22,10 @@
 class EraseRepositoryTests(GraphQLTestHelper, TransactionTestCase):
     def setUp(self):
         self.org = OwnerFactory(username="codecov", service="github")
+        self.non_admin_user = OwnerFactory(organizations=[self.org.ownerid])
+        self.admin_user = OwnerFactory(organizations=[self.org.ownerid])
+        self.org.add_admin(self.admin_user)
+
         self.repo = RepositoryFactory(author=self.org, name="gazebo", active=True)
 
     def test_when_authenticated(self):
@@ -92,3 +96,31 @@ def test_when_self_hosted_admin(self, is_admin_owner):
         )
 
         assert data == {"eraseRepository": None}
+
+    def test_when_other_admin(self):
+        data = self.gql_request(
+            query,
+            owner=self.admin_user,
+            variables={
+                "input": {
+                    "owner": "codecov",
+                    "repoName": "gazebo",
+                }
+            },
+        )
+
+        assert data == {"eraseRepository": None}
+
+    def test_when_not_other_admin(self):
+        data = self.gql_request(
+            query,
+            owner=self.non_admin_user,
+            variables={
+                "input": {
+                    "owner": "codecov",
+                    "repoName": "gazebo",
+                }
+            },
+        )
+
+        assert data["eraseRepository"]["error"]["__typename"] == "UnauthorizedError"