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.

Sign up for GitHub

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

fix: allow unknown attrs from cb json meta #4509

Merged
merged 2 commits into from
Aug 19, 2024
Merged

fix: allow unknown attrs from cb json meta #4509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd37a87
Allow unknown attrs from cb json meta
matthewelwell Aug 19, 2024
15cf6c5
Minor test improvements
matthewelwell Aug 19, 2024
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
1 change: 1 addition & 0 deletions api/organisations/subscriptions/metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ def __init__(
api_calls: int = 0,
projects: typing.Optional[int] = None,
chargebee_email=None,
**kwargs, # allows for extra unknown attrs from CB json metadata
):
self.seats = seats
self.api_calls = api_calls
Expand Down
4 changes: 4 additions & 0 deletions api/tests/unit/organisations/chargebee/test_unit_chargebee_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ def test_chargebee_cache(mocker, db):
"seats": 10,
"api_calls": 100,
"projects": 10,
"some_unknown_key": 1, # should be ignored
}
plan_id = "plan_id"
plan_items = [
Expand All @@ -69,6 +70,7 @@ def test_chargebee_cache(mocker, db):
"seats": 1,
"api_calls": 10,
"projects": 1,
"some_unknown_key": 1, # should be ignored
}
addon_id = "addon_id"
addon_items = [
Expand All @@ -90,8 +92,10 @@ def test_chargebee_cache(mocker, db):
assert cache.plans[plan_id].seats == plan_metadata["seats"]
assert cache.plans[plan_id].api_calls == plan_metadata["api_calls"]
assert cache.plans[plan_id].projects == plan_metadata["projects"]
assert not hasattr(cache.plans[plan_id], "some_unknown_key")

assert len(cache.addons) == 1
assert cache.addons[addon_id].seats == addon_metadata["seats"]
assert cache.addons[addon_id].api_calls == addon_metadata["api_calls"]
assert cache.addons[addon_id].projects == addon_metadata["projects"]
assert not hasattr(cache.addons[addon_id], "some_unknown_key")
Loading