Skip to content

fix: Orgs publishing with billing#10662

Merged
joeauyeung merged 2 commits intomainfrom
fix/billing-orgs
Aug 9, 2023
Merged

fix: Orgs publishing with billing#10662
joeauyeung merged 2 commits intomainfrom
fix/billing-orgs

Conversation

@joeauyeung
Copy link
Copy Markdown
Contributor

What does this PR do?

This PR fixes an issue with the orgs metadata being overwritten after checking with Stripe.

Fixes # (issue)

Requirement/Documentation

  • If there is a requirement document, please, share it here.
  • If there is ab UI/UX design document, please, share it here.

Type of change

  • Bug fix (non-breaking change which fixes an issue)

How should this be tested?

  • Enable teams billing
  • Create an org and publish
  • In the orgs metadata the org specific data should still be present
  • Create a team that is not inside of an org

Mandatory Tasks

  • Make sure you have self-reviewed the code. A decent size PR without self-review might be rejected.

Checklist

  • I haven't added tests that prove my fix is effective or that my feature works
  • I haven't checked if new and existing unit tests pass locally with my changes

@vercel
Copy link
Copy Markdown

vercel Bot commented Aug 9, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
api ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 9, 2023 3:11pm
cal-demo ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 9, 2023 3:11pm
dev ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 9, 2023 3:11pm
ui ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 9, 2023 3:11pm
2 Ignored Deployments
Name Status Preview Comments Updated (UTC)
cal ⬜️ Ignored (Inspect) Visit Preview Aug 9, 2023 3:11pm
qa ⬜️ Ignored (Inspect) Visit Preview Aug 9, 2023 3:11pm

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Aug 9, 2023

Thank you for following the naming conventions! 🙏

Comment on lines +43 to +48
if (!metadata.data?.requestedSlug) {
throw new HttpError({
statusCode: 400,
message: "Can't publish team/org without `requestedSlug`",
});
}
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

All new team and org requests will contain requestedSlug

@zomars zomars added the core area: core, team members only label Aug 9, 2023
@leog leog changed the title fix/ Orgs publishing with billing fix: Orgs publishing with billing Aug 9, 2023
@leog leog requested a review from a team August 9, 2023 15:03
@leog leog added organizations area: organizations, orgs High priority Created by Linear-GitHub Sync labels Aug 9, 2023
@leog leog added this to the v3.2 milestone Aug 9, 2023
@alwaysmeticulous
Copy link
Copy Markdown

alwaysmeticulous Bot commented Aug 9, 2023

🤖 Meticulous spotted visual differences in 50 of 89 screens tested: view and approve differences detected.

Last updated for commit 9dcaeba. This comment will update as new commits are pushed.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Aug 9, 2023

📦 Next.js Bundle Analysis for @calcom/web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

@deploysentinel
Copy link
Copy Markdown

deploysentinel Bot commented Aug 9, 2023

Current Playwright Test Results Summary

✅ 114 Passing - ⚠️ 5 Flaky

Run may still be in progress, this comment will be updated as current testing workflow or job completes...

(Last updated on 08/09/2023 03:15:01pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 9dcaeba

Started: 08/09/2023 03:12:38pm UTC

⚠️ Flakes

📄   apps/web/playwright/login.2fa.e2e.ts • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
2FA Tests should allow a user to disable 2FA
Retry 1Initial Attempt
0.32% (1) 1 / 310 run
failed over last 7 days
4.52% (14) 14 / 310 runs
flaked over last 7 days

📄   packages/embeds/embed-core/playwright/tests/action-based.e2e.ts • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Popup Tests should be able to reschedule
Retry 1Initial Attempt
3.83% (12) 12 / 313 runs
failed over last 7 days
96.17% (301) 301 / 313 runs
flaked over last 7 days

📄   apps/web/playwright/integrations-stripe.e2e.ts • 2 Flakes

Top 1 Common Error Messages

null

2 Test Cases Affected

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Stripe integration Paid booking should be able to be rescheduled
Retry 1Initial Attempt
5.08% (16) 16 / 315 runs
failed over last 7 days
8.57% (27) 27 / 315 runs
flaked over last 7 days
Stripe integration Can book a paid booking
Retry 1Initial Attempt
4.43% (14) 14 / 316 runs
failed over last 7 days
7.28% (23) 23 / 316 runs
flaked over last 7 days

📄   packages/app-store/typeform/playwright/tests/basic.e2e.ts • 1 Flake

Test Case Results

Test Case Last 7 days Failures Last 7 days Flakes
Routing Forms Seeded Routing Form Routing Link should validate fields
Retry 1Initial Attempt
0.95% (3) 3 / 315 runs
failed over last 7 days
9.21% (29) 29 / 315 runs
flaked over last 7 days

View Detailed Build Results


Copy link
Copy Markdown
Contributor

@leog leog 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. Couldn’t test it from preview as license key is missing somehow. Let’s proceed to merge it and test it fully in dev.

@joeauyeung joeauyeung merged commit 68d2a97 into main Aug 9, 2023
@joeauyeung joeauyeung deleted the fix/billing-orgs branch August 9, 2023 16:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

core area: core, team members only High priority Created by Linear-GitHub Sync organizations area: organizations, orgs

Projects

No open projects
Status: No status

Development

Successfully merging this pull request may close these issues.

3 participants