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

[server] Don't count "Professional Open Source" as personal subscription #12754

Merged
merged 1 commit into from
Sep 8, 2022

Conversation

geropl
Copy link
Member

@geropl geropl commented Sep 8, 2022

Description

Don't count "Professional Open Source" as personal subscription when calculating billing mode.

Related Issue(s)

Fixes #12672

How to test

Release Notes

NONE

Documentation

Werft options:

  • /werft with-preview

@geropl geropl requested a review from a team September 8, 2022 08:10
@github-actions github-actions bot added the team: webapp Issue belongs to the WebApp team label Sep 8, 2022
Copy link
Contributor

@jankeromnes jankeromnes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good to me, thanks!

(Wonder if semantically, it mightn't have been better to filter out free subscriptions from cbSubscriptions, but functionally it's all the same so no blocker here. 👍)

@@ -108,7 +108,9 @@ export class BillingModesImpl implements BillingModes {
}
const cbSubscriptions = await this.subscriptionSvc.getActivePaidSubscription(user.id, now);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Side note: getActivePaidSubscription is wrongly named (because it also returns unpaid / free subscriptions 🙄). Thankfully, this is all going away soon. 👋

@roboquat roboquat merged commit 2814f38 into main Sep 8, 2022
@roboquat roboquat deleted the gpl/bm-oss branch September 8, 2022 08:15
@roboquat roboquat added deployed: webapp Meta team change is running in production deployed Change is completely running in production labels Sep 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deployed: webapp Meta team change is running in production deployed Change is completely running in production release-note-none size/XS team: webapp Issue belongs to the WebApp team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

BillingMode: ignore personal OSS subscription
3 participants