resolve failing tests

Author: RulaKhaled

api/internal/owner/views.py

@@ -7,7 +7,6 @@
 from rest_framework.exceptions import PermissionDenied, ValidationError
 from rest_framework.response import Response
 from shared.django_apps.codecov_auth.models import Owner
-from shared.plan.constants import DEFAULT_FREE_PLAN
 
 from api.shared.mixins import OwnerPropertyMixin
 from api.shared.owner.mixins import OwnerViewSetMixin, UserViewSetMixin
@@ -47,10 +46,10 @@ def retrieve(self, *args, **kwargs):
 
     @stripe_safe
     def update(self, request, *args, **kwargs):
-        # Temporary fix. Remove once Gazebo uses the new free plan
-        plan_value = request.data.get("plan", {}).get("value")
-        if plan_value == "users-basic":
-            request.data["plan"]["value"] = DEFAULT_FREE_PLAN
+        # # Temporary fix. Remove once Gazebo uses the new free plan
+        # plan_value = request.data.get("plan", {}).get("value")
+        # if plan_value == "users-basic":
+        #     request.data["plan"]["value"] = DEFAULT_FREE_PLAN
 
         return super().update(request, *args, **kwargs)
 

api/internal/tests/views/test_account_viewset.py

@@ -690,7 +690,7 @@ def test_update_can_set_plan_auto_activate_on_org_with_account(self):
         assert self.current_owner.plan_auto_activate is False
         assert response.data["plan_auto_activate"] is False
 
-    def test_update_can_set_plan_to_users_basic_should_set_to_developer(self):
+    def test_update_can_set_plan_to_users_developer_should_set_to_developer(self):
         self.current_owner.plan = PlanName.CODECOV_PRO_YEARLY.value
         self.current_owner.save()
 
@@ -699,7 +699,7 @@ def test_update_can_set_plan_to_users_basic_should_set_to_developer(self):
                 "service": self.current_owner.service,
                 "owner_username": self.current_owner.username,
             },
-            data={"plan": {"value": PlanName.BASIC_PLAN_NAME.value}},
+            data={"plan": {"value": DEFAULT_FREE_PLAN}},
         )
 
         assert response.status_code == status.HTTP_200_OK

graphql_api/types/owner/owner.py

@@ -8,7 +8,7 @@
 from ariadne import ObjectType
 from django.conf import settings
 from graphql import GraphQLResolveInfo
-from shared.plan.constants import PlanData, PlanName, convert_to_DTO
+from shared.plan.constants import DEFAULT_FREE_PLAN, PlanData, convert_to_DTO
 from shared.plan.service import PlanService
 
 import services.activation as activation
@@ -113,9 +113,7 @@ def resolve_plan(owner: Owner, info: GraphQLResolveInfo) -> PlanService:
 @sync_to_async
 def resolve_plan_representation(owner: Owner, info: GraphQLResolveInfo) -> PlanData:
     info.context["plan_service"] = PlanService(current_org=owner)
-    free_plan = Plan.objects.select_related("tier").get(
-        name=PlanName.BASIC_PLAN_NAME.value
-    )
+    free_plan = Plan.objects.select_related("tier").get(name=DEFAULT_FREE_PLAN)
     return convert_to_DTO(free_plan)