Merge remote-tracking branch 'origin/main' into sshin/fix/1859

Author: suejung-sentry

.github/workflows/ci.yml

@@ -49,15 +49,15 @@ jobs:
   test:
     name: Test
     needs: [build]
-    uses: codecov/gha-workflows/.github/workflows/[email protected].26
+    uses: codecov/gha-workflows/.github/workflows/[email protected].27
     secrets: inherit
     with:
       repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}
 
   build-self-hosted:
     name: Build Self Hosted API
     needs: [build, test]
-    uses: codecov/gha-workflows/.github/workflows/[email protected].26
+    uses: codecov/gha-workflows/.github/workflows/[email protected].27
     secrets: inherit
     with:
       repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}
@@ -66,7 +66,7 @@ jobs:
     name: Push Staging Image
     needs: [build, test]
     if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/staging' && github.repository_owner == 'codecov' }}
-    uses: codecov/gha-workflows/.github/workflows/[email protected].26
+    uses: codecov/gha-workflows/.github/workflows/[email protected].27
     secrets: inherit
     with:
       environment: staging
@@ -76,7 +76,7 @@ jobs:
     name: Push Production Image
     needs: [build, test]
     if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/main' && github.repository_owner == 'codecov' }}
-    uses: codecov/gha-workflows/.github/workflows/[email protected].26
+    uses: codecov/gha-workflows/.github/workflows/[email protected].27
     secrets: inherit
     with:
       environment: production
@@ -87,7 +87,7 @@ jobs:
     needs: [build-self-hosted, test]
     secrets: inherit
     if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/main' && github.repository_owner == 'codecov' }}
-    uses: codecov/gha-workflows/.github/workflows/[email protected].26
+    uses: codecov/gha-workflows/.github/workflows/[email protected].27
     with:
       push_rolling: true
       repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}

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

@@ -6,15 +6,15 @@
 from django.conf import settings
 from rest_framework import serializers
 from rest_framework.exceptions import PermissionDenied
-
-from codecov_auth.models import Owner
-from plan.constants import (
+from shared.plan.constants import (
     PAID_PLANS,
     SENTRY_PAID_USER_PLAN_REPRESENTATIONS,
     TEAM_PLAN_MAX_USERS,
     TEAM_PLAN_REPRESENTATIONS,
 )
-from plan.service import PlanService
+from shared.plan.service import PlanService
+
+from codecov_auth.models import Owner
 from services.billing import BillingService
 from services.sentry import send_user_webhook as send_sentry_webhook
 

api/internal/tests/views/test_account_viewset.py

@@ -14,11 +14,11 @@
     OwnerFactory,
     UserFactory,
 )
+from shared.plan.constants import PlanName, TrialStatus
 from stripe import StripeError
 
 from api.internal.tests.test_utils import GetAdminProviderAdapter
 from codecov_auth.models import Service
-from plan.constants import PlanName, TrialStatus
 from utils.test_utils import APIClient
 
 curr_path = os.path.dirname(__file__)

api/public/v2/component/views.py

@@ -1,6 +1,9 @@
+from typing import Any
+
 from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import OpenApiParameter, extend_schema
 from rest_framework import viewsets
+from rest_framework.request import Request
 from rest_framework.response import Response
 
 from api.public.v2.component.serializers import ComponentSerializer
@@ -34,7 +37,7 @@ class ComponentViewSet(viewsets.ViewSet, RepoPropertyMixin):
     permission_classes = [RepositoryArtifactPermissions]
 
     @extend_schema(summary="Component list")
-    def list(self, request, *args, **kwargs):
+    def list(self, request: Request, *args: Any, **kwargs: Any) -> Response:
         """
         Returns a list of components for the specified repository
         """

api/public/v2/owner/serializers.py

@@ -31,3 +31,11 @@ class Meta:
         model = Owner
         fields = ("username", "name", "has_active_session", "expiry_date")
         read_only_fields = fields
+
+
+class UserUpdateActivationSerializer(serializers.ModelSerializer):
+    activated = serializers.BooleanField()
+
+    class Meta:
+        model = Owner
+        fields = ("activated",)

api/public/v2/owner/views.py

@@ -3,20 +3,34 @@
 from django.db.models import Q, QuerySet
 from drf_spectacular.utils import extend_schema
 from rest_framework import mixins, viewsets
-from rest_framework.exceptions import NotFound
+from rest_framework.exceptions import APIException, NotFound
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from api.public.v2.schema import owner_parameters, service_parameter
+from api.public.v2.schema import (
+    owner_parameters,
+    service_parameter,
+)
 from api.shared.owner.mixins import (
     OwnerViewSetMixin,
     UserSessionViewSetMixin,
     UserViewSetMixin,
 )
 from codecov_auth.models import Owner, Service
 
-from .serializers import OwnerSerializer, UserSerializer, UserSessionSerializer
+from .serializers import (
+    OwnerSerializer,
+    UserSerializer,
+    UserSessionSerializer,
+    UserUpdateActivationSerializer,
+)
+
+
+class NotEnoughSeatsLeft(APIException):
+    status_code = 400
+    default_detail = "Cannot activate user -- not enough seats left."
+    default_code = "no_seats_left"
 
 
 @extend_schema(parameters=owner_parameters, tags=["Users"])
@@ -53,6 +67,31 @@ def retrieve(self, request: Request, *args: Any, **kwargs: Any) -> Owner:
         """
         return super().retrieve(request, *args, **kwargs)
 
+    @extend_schema(summary="Update a user", request=UserUpdateActivationSerializer)
+    def partial_update(self, request: Request, *args: Any, **kwargs: Any) -> Response:
+        """
+        Updates a user for the specified owner_username or ownerid
+
+        Allowed fields
+          - activated: boolean value to activate or deactivate the user
+        """
+        instance = self.get_object()
+        serializer = UserUpdateActivationSerializer(
+            instance,
+            data=request.data,
+        )
+        serializer.is_valid(raise_exception=True)
+
+        if serializer.validated_data["activated"]:
+            if self.owner.can_activate_user(instance):
+                self.owner.activate_user(instance)
+            else:
+                raise NotEnoughSeatsLeft()
+        else:
+            self.owner.deactivate_user(instance)
+
+        return super().retrieve(request, *args, **kwargs)
+
 
 @extend_schema(parameters=owner_parameters, tags=["Users"])
 class UserSessionViewSet(UserSessionViewSetMixin, mixins.ListModelMixin):