Add-on minute checkout session setup #2944
Draft
+581
−88
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
emma-sg
force-pushed
the
additional-minutes-addon-purchase
branch
2 times, most recently
from
4ee2020 to
82a6295
Compare
ikreymer
reviewed
Nov 7, 2025
emma-sg
force-pushed
the
additional-minutes-addon-purchase
branch
from
5ad2648 to
93fd027
Compare
emma-sg
force-pushed
the
additional-minutes-addon-purchase
branch
3 times, most recently
from
96a7dd3 to
6f3a5d4
Compare
- add get_checkout_url method to create checkout session for additional minutes - add /checkout/execution-minutes endpoint to handle addon purchase requests (this will need to be updated in dev/prod playbooks) - update CI workflows to remove portalUrl suffix from secret value - add test endpoint in echo server to mock checkout response
convert to json before converting to output type more debugging fix model type pass return url to checkout session request fix fn ordering correctly pass in headers include content-type header fix double encoding as json properly dump model to dict in requests
try using `org_dep` directly in quotas endpoint this should be safe, since there's still a check for if user is superuser allow shared secret in org dep
- adds separate "add-ons" section to display extra execution minutes and gifted execution minutes when present - renames renderQuotas to renderMonthlyQuotas for clarity
entire orgs router - renames `shared_secret_or_active_user` to `shared_secret_or_superuser` to better reflect that it only allows superuser, not all users - moves the `quotas` endpoint to the app router to allow using `org_superuser_or_shared_secret_dep` dependency specifically - removes its user dependency & extra check for superuser, since user is required to be superuser in `superuser_or_shared_secret_dep` (depended on by `org_superuser_or_shared_secret_dep`) - adds a couple more types to `init_subs` arguments
seconds instead of quota
time when running other tests
emma-sg
force-pushed
the
additional-minutes-addon-purchase
branch
from
e583fe7 to
9fa5509
Compare
ikreymer
reviewed
Nov 18, 2025
| ).items(): | ||
| if field == "context" or value is None: | ||
| continue | ||
| inc = max(value, -org.quotas.model_dump().get(field, 0)) |
Member
There was a problem hiding this comment.
This is to avoid setting the quota to be <0, right?
Member
Author
There was a problem hiding this comment.
Exactly, it clips values below the the field's current value * -1 to that. Do you think we should error instead?
ikreymer
reviewed
Nov 18, 2025
| "quotas": update, | ||
| "quotaUpdates": quota_updates, | ||
| } | ||
| updated_org = await self.orgs.find_one_and_update( |
Member
There was a problem hiding this comment.
This is needed because we want to store the absolute quota update in quotaUpdates, so it needs to add first, then store the absolute entry in quotaUpdates, right?
As a result, we can't do it just one pass..
Member
Author
There was a problem hiding this comment.
Yeah, we hadn't previously had this come up because we were previously just receiving new absolute values. It might be possible to do it all within one update with $arrayElemAt or something, but I wasn't able to figure out a way to do it. The other option here would just be to wrap everything in a transaction — that might be the easiest solution here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For context & flow diagram, see https://github.com/webrecorder/cashew/pull/59