fix: stripe integration in `EventTypeSettings` atom #20919

Ryukemeister · 2025-04-23T19:09:00Z

What does this PR do?

Fixes stripe atom not working in EventTypeSettings atom
Fixes CAL-5556 (Linear issue number - should be visible at the bottom of the GitHub issue description)

Image Demo:

Before

After

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
(N/A) I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
(N/A) I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

This can be tested in the examples app

… undefined

linear · 2025-04-23T19:09:03Z

CAL-5556 fix: stripe atom

Ryukemeister · 2025-04-23T19:19:34Z

apps/api/v2/src/modules/atoms/services/event-types-atom.service.ts

@@ -299,7 +299,7 @@ export class EventTypesAtomService {
              userCredentialIds,
              invalidCredentialIds,
              teams,
-              isInstalled: !!userCredentialIds.length || !!teams.length || app.isGlobal,
+              isInstalled: (!!userCredentialIds.length || !!teams.length || app.isGlobal) ?? app.installed,


turns out for an individual user sometimes no user credentials or app.isGlobal property is present (which is weird) which results in isInstalled property set to undefined which we don't want, hence we should fallback to app.installed which is a depreceated property but should work for now

this will never happen for team events since there will always be a team length present if its a team event

…-atom

vercel · 2025-04-23T19:20:17Z

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

2 Skipped Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Apr 26, 2025 10:24am
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Apr 26, 2025 10:24am

mrge-io

mrge found 2 issues across 1 file. View them in mrge.io

mrge-io · 2025-04-23T19:22:59Z

apps/api/v2/src/modules/atoms/services/event-types-atom.service.ts

@@ -299,7 +299,7 @@ export class EventTypesAtomService {
              userCredentialIds,
              invalidCredentialIds,
              teams,
-              isInstalled: !!userCredentialIds.length || !!teams.length || app.isGlobal,
+              isInstalled: (!!userCredentialIds.length || !!teams.length || app.isGlobal) ?? app.installed,


Consider using a logical OR (||) instead of nullish coalescing operator (??), as it better matches the intent of providing a fallback when the left side is falsy.

I was just thinking of this

mrge-io · 2025-04-23T19:22:59Z

apps/api/v2/src/modules/atoms/services/event-types-atom.service.ts

@@ -299,7 +299,7 @@
              userCredentialIds,
              invalidCredentialIds,
              teams,
-              isInstalled: !!userCredentialIds.length || !!teams.length || app.isGlobal,
+              isInstalled: (!!userCredentialIds.length || !!teams.length || app.isGlobal) ?? app.installed,


Rule violated: Enforce Singular Naming for Single-Item Functions

Function name 'getEventTypesAppIntegration' uses plural form but returns a single item

graphite-app · 2025-04-23T19:25:32Z

Graphite Automations

"Add platform team as reviewer" took an action on this PR • (04/23/25)

1 reviewer was added to this PR based on Keith Williams's automation.

"Add ready-for-e2e label" took an action on this PR • (04/24/25)

1 label was added to this PR based on Keith Williams's automation.

…-atom

mrge-io

mrge reviewed 1 file and found no issues. Review this PR in mrge.io.

ThyMinimalDev · 2025-04-24T07:29:37Z

apps/api/v2/src/modules/atoms/services/event-types-atom.service.ts

@@ -299,7 +299,7 @@ export class EventTypesAtomService {
              userCredentialIds,
              invalidCredentialIds,
              teams,
-              isInstalled: !!userCredentialIds.length || !!teams.length || app.isGlobal,
+              isInstalled: !!userCredentialIds.length || !!teams.length || app.isGlobal || app.installed,


not sure to understand teams.length check in this but it's not related to this pr, we might want to add comments if this keep getting more and more complicated

the logic was referenced from getConnectedApps.ts which we use in the webapp, but after debugging a bit more found out the issue lies somewhere hence turned this PR into draft

…-atom

github-actions · 2025-04-24T08:58:18Z

E2E results are ready!

Workflow #58171.1 latest results

…-atom

mrge-io

mrge found 3 issues across 1 file. View them in mrge.io

mrge-io · 2025-04-26T10:25:49Z

apps/api/v2/src/modules/atoms/services/event-types-atom.service.ts

-    // We only add delegationCredentials if the request for location options is for a user because DelegationCredential Credential is applicable to Users only.
-    const { credentials: allCredentials } = await enrichUserWithDelegationConferencingCredentialsWithoutOrgId(
+
+    const enabledApps = await getEnabledAppsFromCredentials(


Type assertion from credentials to CredentialDataWithTeamName[] is a code smell that suggests a type mismatch. Consider fixing the types properly.

mrge-io · 2025-04-26T10:25:49Z

apps/api/v2/src/modules/atoms/services/event-types-atom.service.ts

@@ -226,20 +226,26 @@ export class EventTypesAtomService {
      } else {
        credentials = credentials.concat(teamAppCredentials);
      }
+    } else {


Missing rationale for special treatment of Stripe integration in comments

mrge-io · 2025-04-26T10:25:49Z

apps/api/v2/src/modules/atoms/services/event-types-atom.service.ts

@@ -226,20 +226,26 @@ export class EventTypesAtomService {
      } else {
        credentials = credentials.concat(teamAppCredentials);
      }
+    } else {
+      if (slug !== "stripe") {


Consider inverting the condition to return early and reduce nesting

fallback to depreceated installed property in case everything else is…

9453aa9

… undefined

keithwillcode added core area: core, team members only platform Anything related to our platform plan labels Apr 23, 2025

vercel bot deployed to Preview – api April 23, 2025 19:15 View deployment

Ryukemeister commented Apr 23, 2025

View reviewed changes

Merge branch 'main' into fix-broken-stripe-integration-for-event-type…

5a36d64

…-atom

Ryukemeister marked this pull request as ready for review April 23, 2025 19:20

Ryukemeister requested review from a team as code owners April 23, 2025 19:20

dosubot bot added the 🐛 bug Something isn't working label Apr 23, 2025

mrge-io bot reviewed Apr 23, 2025

View reviewed changes

vercel bot deployed to Preview – api April 23, 2025 19:39 View deployment

vercel bot deployed to Preview – dev April 23, 2025 19:47 View deployment

using nullish OR instead of nullish coalescing operator

6b9f99b

vercel bot deployed to Preview – api April 24, 2025 06:01 View deployment

Merge branch 'main' into fix-broken-stripe-integration-for-event-type…

54c0448

…-atom

vercel bot deployed to Preview – api April 24, 2025 06:17 View deployment

Ryukemeister marked this pull request as draft April 24, 2025 06:36

vercel bot deployed to Preview – dev April 24, 2025 06:38 View deployment

SomayChauhan previously approved these changes Apr 24, 2025

View reviewed changes

ThyMinimalDev marked this pull request as ready for review April 24, 2025 07:27

graphite-app bot added the ready-for-e2e label Apr 24, 2025

dosubot bot added the event-types area: event types, event-types label Apr 24, 2025

mrge-io bot reviewed Apr 24, 2025

View reviewed changes

ThyMinimalDev reviewed Apr 24, 2025

View reviewed changes

Merge branch 'main' into fix-broken-stripe-integration-for-event-type…

192da7b

…-atom

vercel bot deployed to Preview – api April 24, 2025 08:44 View deployment

vercel bot deployed to Preview – dev April 24, 2025 08:55 View deployment

fixup

8325610

Ryukemeister dismissed SomayChauhan’s stale review via 8325610 April 25, 2025 14:35

vercel bot deployed to Preview – dev April 25, 2025 14:52 View deployment

vercel bot had a problem deploying to Preview – api April 25, 2025 15:00 Failure

Ryukemeister marked this pull request as draft April 25, 2025 16:43

Ryukemeister marked this pull request as ready for review April 26, 2025 10:23

Merge branch 'main' into fix-broken-stripe-integration-for-event-type…

2a29d7e

…-atom

mrge-io bot reviewed Apr 26, 2025

View reviewed changes

vercel bot deployed to Preview – api April 26, 2025 10:32 View deployment

vercel bot deployed to Preview – dev April 26, 2025 11:02 View deployment

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: stripe integration in `EventTypeSettings` atom #20919

fix: stripe integration in `EventTypeSettings` atom #20919

Ryukemeister commented Apr 23, 2025 •

edited

Loading

linear bot commented Apr 23, 2025

Ryukemeister Apr 23, 2025 •

edited

Loading

Ryukemeister Apr 23, 2025

vercel bot commented Apr 23, 2025 •

edited

Loading

mrge-io bot left a comment

mrge-io bot Apr 23, 2025

Ryukemeister Apr 24, 2025

mrge-io bot Apr 23, 2025

graphite-app bot commented Apr 23, 2025 •

edited

Loading

mrge-io bot left a comment

ThyMinimalDev Apr 24, 2025

Ryukemeister Apr 24, 2025

github-actions bot commented Apr 24, 2025 •

edited

Loading

mrge-io bot left a comment

mrge-io bot Apr 26, 2025

mrge-io bot Apr 26, 2025

mrge-io bot Apr 26, 2025

fix: stripe integration in EventTypeSettings atom #20919

Are you sure you want to change the base?

fix: stripe integration in EventTypeSettings atom #20919

Conversation

Ryukemeister commented Apr 23, 2025 • edited Loading

What does this PR do?

Image Demo:

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

linear bot commented Apr 23, 2025

Ryukemeister Apr 23, 2025 • edited Loading

Choose a reason for hiding this comment

Ryukemeister Apr 23, 2025

Choose a reason for hiding this comment

vercel bot commented Apr 23, 2025 • edited Loading

mrge-io bot left a comment

Choose a reason for hiding this comment

mrge-io bot Apr 23, 2025

Choose a reason for hiding this comment

Ryukemeister Apr 24, 2025

Choose a reason for hiding this comment

mrge-io bot Apr 23, 2025

Choose a reason for hiding this comment

graphite-app bot commented Apr 23, 2025 • edited Loading

Graphite Automations

mrge-io bot left a comment

Choose a reason for hiding this comment

ThyMinimalDev Apr 24, 2025

Choose a reason for hiding this comment

Ryukemeister Apr 24, 2025

Choose a reason for hiding this comment

github-actions bot commented Apr 24, 2025 • edited Loading

E2E results are ready!

mrge-io bot left a comment

Choose a reason for hiding this comment

mrge-io bot Apr 26, 2025

Choose a reason for hiding this comment

mrge-io bot Apr 26, 2025

Choose a reason for hiding this comment

mrge-io bot Apr 26, 2025

Choose a reason for hiding this comment

fix: stripe integration in `EventTypeSettings` atom #20919

fix: stripe integration in `EventTypeSettings` atom #20919

Ryukemeister commented Apr 23, 2025 •

edited

Loading

Ryukemeister Apr 23, 2025 •

edited

Loading

vercel bot commented Apr 23, 2025 •

edited

Loading

graphite-app bot commented Apr 23, 2025 •

edited

Loading

github-actions bot commented Apr 24, 2025 •

edited

Loading