Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

API: Migrate to Plan / Tier Tables #1099

Merged
merged 22 commits into from
Jan 30, 2025
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
947954a
starting transition, need the other PR merged to do imports and test …
ajay-sentry Jan 15, 2025
a06b8c8
other api stuff
ajay-sentry Jan 15, 2025
1f2e63b
revert trial status changes, update other instances of plan stuff
ajay-sentry Jan 15, 2025
5050704
fix a couple instances... still need to fix availablePlans
ajay-sentry Jan 15, 2025
40abd2d
a few more references for PAID and TEAM_PLANS
ajay-sentry Jan 15, 2025
16f7fba
missing s
ajay-sentry Jan 16, 2025
3a5b3af
add missing imports + refactor to call 1 query
RulaKhaled Jan 20, 2025
d26259a
update tests
RulaKhaled Jan 20, 2025
f21a5f1
testing locally, fix the tier checks and first test
ajay-sentry Jan 21, 2025
ba63895
starting to fix tests and some logic
ajay-sentry Jan 21, 2025
91ea64b
update api with mocked plans
RulaKhaled Jan 22, 2025
42488fb
fix all tests except account_viewset
ajay-sentry Jan 22, 2025
1bfc6d8
all tests passing now, fixed a couple small logic bugs too
ajay-sentry Jan 23, 2025
99a63e1
fix this suite, when using ttestcase need to have setup vs setupClass
ajay-sentry Jan 23, 2025
49f2af8
clean up the logic for update plan
ajay-sentry Jan 23, 2025
e2560c5
Merge branch 'main' into Ajay/milestone-3-migration
ajay-sentry Jan 24, 2025
34b1677
rebase
ajay-sentry Jan 27, 2025
3f7fe6f
Merge branch 'main' into Ajay/milestone-3-migration
ajay-sentry Jan 29, 2025
4fa07ca
staging check
ajay-sentry Jan 29, 2025
b6ad275
update with shared version
RulaKhaled Jan 30, 2025
ea7582c
PR comments
ajay-sentry Jan 30, 2025
e9662a2
Merge branch 'main' into Ajay/milestone-3-migration
ajay-sentry Jan 30, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix this suite, when using ttestcase need to have setup vs setupClass
ajay-sentry committed Jan 23, 2025
commit 99a63e113c944d6d3ed2639c12ccf2f7be579da6
17 changes: 2 additions & 15 deletions graphql_api/tests/test_owner.py
Original file line number Diff line number Diff line change
@@ -59,12 +59,8 @@


class TestOwnerType(GraphQLTestHelper, TransactionTestCase):
@classmethod
def setUpClass(cls):
super().setUpClass()
mock_all_plans_and_tiers()

def setUp(self):
mock_all_plans_and_tiers()
self.account = AccountFactory()
self.owner = OwnerFactory(
username="codecov-user", service="github", account=self.account
@@ -1130,7 +1126,7 @@ def test_fetch_available_plans_is_enterprise_plan(self):
current_org = OwnerFactory(
username="random-plan-user",
service="github",
plan=PlanName.FREE_PLAN_NAME.value,
plan=PlanName.BASIC_PLAN_NAME.value,
)

query = """{
@@ -1160,15 +1156,6 @@ def test_fetch_available_plans_is_enterprise_plan(self):
"isFreePlan": True,
"isTrialPlan": False,
},
{
"value": "users-free",
"isEnterprisePlan": False,
"isProPlan": False,
"isTeamPlan": False,
"isSentryPlan": False,
"isFreePlan": True,
"isTrialPlan": False,
},
{
"value": "users-pr-inappm",
"isEnterprisePlan": False,