starting to fix tests and some logic

Author: ajay-sentry

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

@@ -5,8 +5,9 @@
 from django.test import TransactionTestCase
 from freezegun import freeze_time
 from shared.django_apps.codecov.commands.exceptions import ValidationError
+from shared.django_apps.codecov_auth.tests.factories import PlanFactory, TierFactory
 from shared.django_apps.core.tests.factories import OwnerFactory
-from shared.plan.constants import PlanName, TrialStatus
+from shared.plan.constants import PlanName, TierName, TrialStatus
 
 from codecov.commands.exceptions import Unauthorized
 from codecov.commands.exceptions import ValidationError as CodecovValidationError
@@ -16,6 +17,10 @@
 
 
 class CancelTrialInteractorTest(TransactionTestCase):
+    def setUp(self):
+        self.tier = TierFactory(tier_name=TierName.BASIC.value)
+        self.plan = PlanFactory(tier=self.tier)
+
     @async_to_sync
     def execute(self, current_user, org_username=None):
         current_user = current_user
@@ -27,6 +32,7 @@ def test_cancel_trial_raises_exception_when_owner_is_not_in_db(self):
         current_user = OwnerFactory(
             username="random-user-123",
             service="github",
+            plan=self.plan.name,
         )
         with pytest.raises(CodecovValidationError):
             self.execute(current_user=current_user, org_username="some-other-username")
@@ -35,10 +41,12 @@ def test_cancel_trial_raises_exception_when_current_user_not_part_of_org(self):
         current_user = OwnerFactory(
             username="random-user-123",
             service="github",
+            plan=self.plan.name,
         )
         OwnerFactory(
             username="random-user-456",
             service="github",
+            plan=self.plan.name,
         )
         with pytest.raises(Unauthorized):
             self.execute(current_user=current_user, org_username="random-user-456")
@@ -54,6 +62,7 @@ def test_cancel_trial_raises_exception_when_owners_trial_status_is_not_started(
             service="github",
             trial_start_date=trial_start_date,
             trial_end_date=trial_end_date,
+            plan=self.plan.name,
         )
         with pytest.raises(ValidationError):
             self.execute(current_user=current_user, org_username=current_user.username)
@@ -68,6 +77,7 @@ def test_cancel_trial_raises_exception_when_owners_trial_status_is_expired(self)
             service="github",
             trial_start_date=trial_start_date,
             trial_end_date=trial_end_date,
+            plan=self.plan.name,
         )
         with pytest.raises(ValidationError):
             self.execute(current_user=current_user, org_username=current_user.username)
@@ -77,13 +87,15 @@ def test_cancel_trial_starts_trial_for_org_that_has_trial_ongoing(self):
         now = datetime.now()
         trial_start_date = now
         trial_end_date = now + timedelta(days=3)
+        trial_tier = TierFactory(tier_name=TierName.TRIAL.value)
+        trial_plan = PlanFactory(tier=trial_tier, name=PlanName.TRIAL_PLAN_NAME.value)
         current_user: Owner = OwnerFactory(
             username="random-user-123",
             service="github",
             trial_start_date=trial_start_date,
             trial_end_date=trial_end_date,
             trial_status=TrialStatus.ONGOING.value,
-            plan=PlanName.TRIAL_PLAN_NAME.value,
+            plan=trial_plan.name,
         )
         self.execute(current_user=current_user, org_username=current_user.username)
         current_user.refresh_from_db()

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

@@ -1,13 +1,14 @@
 from datetime import datetime, timedelta
 
 from django.test import TransactionTestCase
+from shared.django_apps.codecov_auth.tests.factories import PlanFactory, TierFactory
 from shared.django_apps.core.tests.factories import (
     CommitFactory,
     OwnerFactory,
     RepositoryFactory,
 )
 from shared.django_apps.reports.models import ReportType
-from shared.plan.constants import TrialStatus
+from shared.plan.constants import PlanName, TierName, TrialStatus
 from shared.upload.utils import UploaderType, insert_coverage_measurement
 
 from reports.tests.factories import CommitReportFactory, UploadFactory
@@ -17,8 +18,10 @@
 
 class GetUploadsNumberPerUserInteractorTest(TransactionTestCase):
     def setUp(self):
-        self.user_with_no_uploads = OwnerFactory()
-        self.user_with_uploads = OwnerFactory()
+        self.tier = TierFactory(tier_name=TierName.BASIC.value)
+        self.plan = PlanFactory(tier=self.tier, monthly_uploads_limit=250)
+        self.user_with_no_uploads = OwnerFactory(plan=self.plan.name)
+        self.user_with_uploads = OwnerFactory(plan=self.plan.name)
         repo = RepositoryFactory.create(author=self.user_with_uploads, private=True)
         commit = CommitFactory.create(repository=repo)
         report = CommitReportFactory.create(
@@ -44,10 +47,17 @@ def setUp(self):
         report_within_40_days.save()
 
         # Trial Data
+        trial_tier = TierFactory(tier_name=TierName.TRIAL.value)
+        trial_plan = PlanFactory(
+            tier=trial_tier,
+            name=PlanName.TRIAL_PLAN_NAME.value,
+            monthly_uploads_limit=250,
+        )
         self.trial_owner = OwnerFactory(
             trial_status=TrialStatus.EXPIRED.value,
             trial_start_date=datetime.now() + timedelta(days=-10),
             trial_end_date=datetime.now() + timedelta(days=-2),
+            plan=trial_plan.name,
         )
         trial_repo = RepositoryFactory.create(author=self.trial_owner, private=True)
         trial_commit = CommitFactory.create(repository=trial_repo)

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

@@ -5,10 +5,12 @@
 from django.test import TransactionTestCase
 from freezegun import freeze_time
 from shared.django_apps.codecov.commands.exceptions import ValidationError
+from shared.django_apps.codecov_auth.tests.factories import PlanFactory, TierFactory
 from shared.django_apps.core.tests.factories import OwnerFactory
 from shared.plan.constants import (
     TRIAL_PLAN_SEATS,
     PlanName,
+    TierName,
     TrialDaysAmount,
     TrialStatus,
 )
@@ -21,6 +23,10 @@
 
 
 class StartTrialInteractorTest(TransactionTestCase):
+    def setUp(self):
+        self.tier = TierFactory(tier_name=TierName.BASIC.value)
+        self.plan = PlanFactory(tier=self.tier, is_active=True)
+
     @async_to_sync
     def execute(self, current_user, org_username=None):
         current_user = current_user
@@ -32,6 +38,7 @@ def test_start_trial_raises_exception_when_owner_is_not_in_db(self):
         current_user = OwnerFactory(
             username="random-user-123",
             service="github",
+            plan=self.plan.name,
         )
         with pytest.raises(CodecovValidationError):
             self.execute(current_user=current_user, org_username="some-other-username")
@@ -40,10 +47,12 @@ def test_cancel_trial_raises_exception_when_current_user_not_part_of_org(self):
         current_user = OwnerFactory(
             username="random-user-123",
             service="github",
+            plan=self.plan.name,
         )
         OwnerFactory(
             username="random-user-456",
             service="github",
+            plan=self.plan.name,
         )
         with pytest.raises(Unauthorized):
             self.execute(current_user=current_user, org_username="random-user-456")
@@ -59,6 +68,7 @@ def test_start_trial_raises_exception_when_owners_trial_status_is_ongoing(self):
             trial_start_date=trial_start_date,
             trial_end_date=trial_end_date,
             trial_status=TrialStatus.ONGOING.value,
+            plan=self.plan.name,
         )
         with pytest.raises(ValidationError):
             self.execute(current_user=current_user, org_username=current_user.username)
@@ -74,6 +84,7 @@ def test_start_trial_raises_exception_when_owners_trial_status_is_expired(self):
             trial_start_date=trial_start_date,
             trial_end_date=trial_end_date,
             trial_status=TrialStatus.EXPIRED.value,
+            plan=self.plan.name,
         )
         with pytest.raises(ValidationError):
             self.execute(current_user=current_user, org_username=current_user.username)
@@ -91,6 +102,7 @@ def test_start_trial_raises_exception_when_owners_trial_status_cannot_trial(
             trial_start_date=trial_start_date,
             trial_end_date=trial_end_date,
             trial_status=TrialStatus.CANNOT_TRIAL.value,
+            plan=self.plan.name,
         )
         with pytest.raises(ValidationError):
             self.execute(current_user=current_user, org_username=current_user.username)
@@ -105,6 +117,7 @@ def test_start_trial_starts_trial_for_org_that_has_not_started_trial_before_and_
             trial_start_date=None,
             trial_end_date=None,
             trial_status=TrialStatus.NOT_STARTED.value,
+            plan=self.plan.name,
         )
         self.execute(current_user=current_user, org_username=current_user.username)
         current_user.refresh_from_db()

codecov_auth/tests/test_admin.py

@@ -29,6 +29,7 @@
 from shared.plan.constants import (
     ENTERPRISE_CLOUD_USER_PLAN_REPRESENTATIONS,
     PlanName,
+    TierName,
 )
 
 from codecov.commands.exceptions import ValidationError
@@ -60,6 +61,17 @@ def setUp(self):
         admin_site.register(OrganizationLevelToken)
         self.owner_admin = OwnerAdmin(Owner, admin_site)
 
+        self.basic_tier = TierFactory(tier_name=TierName.BASIC.value)
+        self.basic_plan = PlanFactory(
+            tier=self.basic_tier, name=PlanName.BASIC_PLAN_NAME.value
+        )
+
+        self.enterprise_tier = TierFactory(tier_name=TierName.ENTERPRISE.value)
+        self.enterprise_plan = PlanFactory(
+            tier=self.enterprise_tier,
+            name=PlanName.ENTERPRISE_CLOUD_YEARLY.value,
+        )
+
     def test_owner_admin_detail_page(self):
         owner = OwnerFactory()
         response = self.client.get(
@@ -68,8 +80,10 @@ def test_owner_admin_detail_page(self):
         self.assertEqual(response.status_code, 200)
 
     def test_owner_admin_impersonate_owner(self):
-        owner_to_impersonate = OwnerFactory(service="bitbucket")
-        other_owner = OwnerFactory()
+        owner_to_impersonate = OwnerFactory(
+            service="bitbucket", plan=self.basic_plan.name
+        )
+        other_owner = OwnerFactory(plan=self.basic_plan.name)
 
         with self.subTest("more than one user selected"):
             response = self.client.post(
@@ -103,7 +117,7 @@ def test_owner_admin_impersonate_owner(self):
 
     @patch("codecov_auth.admin.TaskService.delete_owner")
     def test_delete_queryset(self, delete_mock):
-        user_to_delete = OwnerFactory()
+        user_to_delete = OwnerFactory(plan=self.basic_plan.name)
         ownerid = user_to_delete.ownerid
         queryset = MagicMock()
         queryset.__iter__.return_value = [user_to_delete]
@@ -114,14 +128,14 @@ def test_delete_queryset(self, delete_mock):
 
     @patch("codecov_auth.admin.TaskService.delete_owner")
     def test_delete_model(self, delete_mock):
-        user_to_delete = OwnerFactory()
+        user_to_delete = OwnerFactory(plan=self.basic_plan.name)
         ownerid = user_to_delete.ownerid
         self.owner_admin.delete_model(MagicMock(), user_to_delete)
         delete_mock.assert_called_once_with(ownerid=ownerid)
 
     @patch("codecov_auth.admin.admin.ModelAdmin.get_deleted_objects")
     def test_confirmation_deleted_objects(self, mocked_deleted_objs):
-        user_to_delete = OwnerFactory()
+        user_to_delete = OwnerFactory(plan=self.basic_plan.name)
         deleted_objs = [
             'Owner: <a href="/admin/codecov_auth/owner/{}/change/">{};</a>'.format(
                 user_to_delete.ownerid, user_to_delete
@@ -141,7 +155,7 @@ def test_confirmation_deleted_objects(self, mocked_deleted_objs):
 
     @patch("codecov_auth.admin.admin.ModelAdmin.log_change")
     def test_prev_and_new_values_in_log_entry(self, mocked_super_log_change):
-        owner = OwnerFactory(staff=True)
+        owner = OwnerFactory(staff=True, plan=self.basic_plan.name)
         owner.save()
         owner.staff = False
         form = MagicMock()
@@ -161,7 +175,7 @@ def test_prev_and_new_values_in_log_entry(self, mocked_super_log_change):
         ]
 
     def test_inline_orgwide_tokens_display(self):
-        owner = OwnerFactory()
+        owner = OwnerFactory(plan=self.basic_plan.name)
         request_url = reverse("admin:codecov_auth_owner_change", args=[owner.ownerid])
         request = RequestFactory().get(request_url)
         request.user = self.staff_user
@@ -170,7 +184,7 @@ def test_inline_orgwide_tokens_display(self):
         assert isinstance(inlines[0], OrgUploadTokenInline)
 
     def test_inline_orgwide_permissions(self):
-        owner_in_cloud_plan = OwnerFactory(plan="users-enterprisey")
+        owner_in_cloud_plan = OwnerFactory(plan=self.enterprise_plan.name)
         org_token = OrganizationLevelTokenFactory(owner=owner_in_cloud_plan)
         owner_in_cloud_plan.save()
         org_token.save()
@@ -194,7 +208,7 @@ def test_inline_orgwide_permissions(self):
     def test_inline_orgwide_add_token_permission_no_token_and_user_in_enterprise_cloud_plan(
         self,
     ):
-        owner = OwnerFactory()
+        owner = OwnerFactory(plan=self.basic_plan.name)
         assert owner.plan not in ENTERPRISE_CLOUD_USER_PLAN_REPRESENTATIONS
         assert OrganizationLevelToken.objects.filter(owner=owner).count() == 0
         request_url = reverse("admin:codecov_auth_owner_change", args=[owner.ownerid])
@@ -207,7 +221,7 @@ def test_inline_orgwide_add_token_permission_no_token_and_user_in_enterprise_clo
     def test_inline_orgwide_add_token_permission_no_token_user_not_in_enterprise_cloud_plan(
         self,
     ):
-        owner_in_cloud_plan = OwnerFactory(plan="users-enterprisey")
+        owner_in_cloud_plan = OwnerFactory(plan=self.enterprise_plan.name)
         assert (
             OrganizationLevelToken.objects.filter(owner=owner_in_cloud_plan).count()
             == 0
@@ -227,7 +241,7 @@ def test_inline_orgwide_add_token_permission_no_token_user_not_in_enterprise_clo
     def test_org_token_refresh_request_calls_service_to_refresh_token(
         self, mock_refresh
     ):
-        owner_in_cloud_plan = OwnerFactory(plan="users-enterprisey")
+        owner_in_cloud_plan = OwnerFactory(plan=self.enterprise_plan.name)
         org_token = OrganizationLevelTokenFactory(owner=owner_in_cloud_plan)
         owner_in_cloud_plan.save()
         org_token.save()
@@ -264,7 +278,7 @@ def test_org_token_refresh_request_calls_service_to_refresh_token(
         "codecov_auth.services.org_level_token_service.OrgLevelTokenService.refresh_token"
     )
     def test_org_token_request_doesnt_call_service_to_refresh_token(self, mock_refresh):
-        owner_in_cloud_plan = OwnerFactory(plan="users-enterprisey")
+        owner_in_cloud_plan = OwnerFactory(plan=self.enterprise_plan.name)
         org_token = OrganizationLevelTokenFactory(owner=owner_in_cloud_plan)
         owner_in_cloud_plan.save()
         org_token.save()
@@ -297,7 +311,7 @@ def test_org_token_request_doesnt_call_service_to_refresh_token(self, mock_refre
         mock_refresh.assert_not_called()
 
     def test_start_trial_ui_display(self):
-        owner = OwnerFactory()
+        owner = OwnerFactory(plan=self.basic_plan.name)
 
         res = self.client.post(
             reverse("admin:codecov_auth_owner_changelist"),
@@ -312,7 +326,7 @@ def test_start_trial_ui_display(self):
     @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()
+        org_to_be_trialed = OwnerFactory(plan=self.basic_plan.name)
 
         res = self.client.post(
             reverse("admin:codecov_auth_owner_changelist"),
@@ -329,7 +343,7 @@ def test_start_trial_action(self, mock_start_trial_service):
     @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()
+        org_to_be_trialed = OwnerFactory(plan=self.basic_plan.name)
         org_to_be_trialed.plan = PlanName.TRIAL_PLAN_NAME.value
         org_to_be_trialed.save()
 
@@ -352,7 +366,7 @@ def test_start_trial_paid_plan(self, mock_start_trial_service):
             "Cannot trial from a paid plan"
         )
 
-        org_to_be_trialed = OwnerFactory()
+        org_to_be_trialed = OwnerFactory(plan=self.basic_plan.name)
 
         res = self.client.post(
             reverse("admin:codecov_auth_owner_changelist"),
@@ -367,7 +381,7 @@ def test_start_trial_paid_plan(self, mock_start_trial_service):
         assert mock_start_trial_service.called
 
     def test_account_widget(self):
-        owner = OwnerFactory(user=UserFactory(), plan="users-enterprisey")
+        owner = OwnerFactory(user=UserFactory(), plan=self.enterprise_plan.name)
         rf = RequestFactory()
         get_request = rf.get(f"/admin/codecov_auth/owner/{owner.ownerid}/change/")
         get_request.user = self.staff_user