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

Jump to bottom

Ensure a suspended trial project is not added to billing at trial end #1696

Merged
merged 3 commits into from
Feb 13, 2023
Merged

Ensure a suspended trial project is not added to billing at trial end #1696

merged 3 commits into from
Feb 13, 2023

Conversation

knolleary
Copy link
Member

Description

When a team trial ends, the trialTask adds all trial projects to the billing subscription. However it should not do that if the trial project is suspended.

This fixes the logic for that and adds a test for the scenario.

Related Issue(s)

#1578

Checklist

  • I have read the contribution guidelines
  • Suitable unit/system level tests have been added and they pass
  • Documentation has been updated
    • Upgrade instructions
    • Configuration details
    • Concepts
  • Changes flowforge.yml?
    • Issue/PR raised on flowforge/helm to update ConfigMap Template
    • Issue/PR raised on flowforge/CloudProject to update values for Staging/Production

Labels

  • Backport needed? -> add the backport label
  • Includes a DB migration? -> add the area:migration label

@knolleary knolleary requested a review from Pezmc February 10, 2023 21:28
Pezmc
Pezmc previously requested changes Feb 13, 2023
View reviewed changes
Copy link
Contributor

@Pezmc Pezmc left a comment

Choose a reason for hiding this comment

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

See comment

@Pezmc Pezmc requested a review from hardillb February 13, 2023 13:53
@Pezmc @hardillb
Update forge/ee/lib/billing/trialTask.js
fa9ec36 
Co-authored-by: Ben Hardill <ben@flowforge.com>
@hardillb hardillb requested a review from Pezmc February 13, 2023 14:44
@hardillb hardillb dismissed Pezmc’s stale review February 13, 2023 14:51

Changes have been made

@hardillb hardillb merged commit bbb2d54 into main Feb 13, 2023
@hardillb hardillb deleted the do-not-bill-suspended-trial branch February 13, 2023 14:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hardillb hardillb hardillb approved these changes

@Pezmc Pezmc Awaiting requested review from Pezmc

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@knolleary @Pezmc @hardillb