feat: support phone based booking api #17635

Udit-takkar · 2024-11-14T13:10:55Z

What does this PR do?

Fixes #XXXX (GitHub issue number)
Fixes CAL-XXXX (Linear issue number - should be visible at the bottom of the GitHub issue description)

https://app.campsite.com/cal/posts/muplmwz5gjpg

Create an event type and go to advance settings and make email field as not required and Phone number required and visible on booking page.

request payload:-

{
  "start": "2024-11-18T05:15:00.000Z",
  "eventTypeId": 32,
  "attendee": {
    "name": "John Doe",
    "attendeePhoneNumber":"+919876543210",
    "timeZone": "Asia/Kolkata",
    "language": "en"
  }
}

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.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

github-actions · 2024-11-14T13:11:06Z

Hey there and thank you for opening this pull request! 👋🏼

We require pull request titles to follow the Conventional Commits specification and it looks like your proposed title needs to be adjusted.

Details:

No release type found in pull request title "Feat/phone based api". Add a prefix to indicate what kind of release this pull request corresponds to. For reference, see https://www.conventionalcommits.org/

Available types:
 - feat: A new feature
 - fix: A bug fix
 - docs: Documentation only changes
 - style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
 - refactor: A code change that neither fixes a bug nor adds a feature
 - perf: A code change that improves performance
 - test: Adding missing tests or correcting existing tests
 - build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
 - ci: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
 - chore: Other changes that don't modify src or test files
 - revert: Reverts a previous commit

graphite-app · 2024-11-14T13:15:24Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (11/14/24)

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

"Add foundation team as reviewer" took an action on this PR • (01/08/25)

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

packages/platform/types/bookings/2024-08-13/inputs/create-booking.input.ts

supalarry

The PR looks good but the problem I see is that right now we can make a booking using attendee phone number for event types that don't have attendee phone number booking field. Just like we have in this PR RequireEmailOrPhone we should have the same logic in event type.

The 4.5 release blog states

To enable this (phone based bookings), go to your event type and enable 'Phone' under booking questions, mark it as required, and you can then turn off 'Email'.

So i think we should follow same logic and at least allow enabling phone based event types (event type without email but with phone) and allow an event type to have either phone or email booking field in files I described in the thread.

However, to not block users who do have event types with phone I guess we could merge this after tests are added to unblock those users, but a follow up for the event types would be needed. Do you think you would have time for that?

packages/platform/types/bookings/2024-08-13/inputs/create-booking.input.ts

vercel · 2024-11-15T13:24:47Z

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		Jan 8, 2025 3:00pm
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Jan 8, 2025 3:00pm

github-actions · 2024-12-03T00:24:10Z

This PR is being marked as stale due to inactivity.

github-actions · 2025-01-05T00:24:04Z

This PR is being marked as stale due to inactivity.

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/team-bookings.e2e-spec.ts

supalarry · 2025-01-08T09:48:20Z

...i/v2/src/modules/organizations/controllers/event-types/organizations-event-types.e2e-spec.ts

+      const body: UpdateTeamEventTypeInput_2024_06_14 = {
+        bookingFields: [
+          {
+            type: "email",


Like before - shouldn't we also omit email booking field here?

packages/platform/types/bookings/2024-08-13/inputs/create-booking.input.ts

supalarry · 2025-01-08T09:52:04Z

packages/platform/types/event-types/event-types_2024_06_14/inputs/booking-fields.input.ts

+  @IsBoolean()
+  @IsOptional()
+  @DocsProperty()
+  required = true;


Why does it have to be required if we can have phone based bookings aka without email?

In the request payload of the PR description there is only attendee phone number.

there was no required field defined for email i just set the default value true if it hasn't been passed as false or empty

socket-security · 2025-01-08T12:59:52Z

Removed dependencies detected. Learn more about Socket for GitHub ↗︎

View full report↗︎

github-actions · 2025-01-08T13:26:43Z

E2E results are ready!

Workflow #43243.1 latest results

* chore: save progress * feat: support phone based booking using API v2 * chore: change name of the variable * fix: update event types and booking fields for improved validation and new properties - Updated imports in input and output event types services to use the correct library version. - Added new `avatarUrl` and `successRedirectUrl` properties to the Swagger documentation for user and booking schemas. - Enhanced booking fields validation by changing the `required` property to a boolean type. - Improved descriptions and examples in the OpenAPI specifications for better clarity. - Refactored booking fields input and output classes to include new properties and ensure proper validation. * fix: booking with phone number * test: add event type update test * test: add test for creating booking * chore: update unit test * fix: tests * fix: add turbo * chore: remove emial * refactor: make email optional and move it to service * fix: test * chore: bump platform-libraries * fix: e2e test --------- Co-authored-by: supalarry <laurisskraucis@gmail.com>

graphite-app bot requested a review from a team November 14, 2024 13:11

Udit-takkar changed the title ~~Feat/phone based api~~ feat: support phone based booking api Nov 14, 2024

keithwillcode added core area: core, team members only enterprise area: enterprise, audit log, organisation, SAML, SSO labels Nov 14, 2024

dosubot bot added api area: API, enterprise API, access token, OAuth ✨ feature New feature or request labels Nov 14, 2024

vercel bot deployed to Preview – api November 14, 2024 13:14 View deployment

Udit-takkar added this to the v4.7 milestone Nov 14, 2024

vercel bot deployed to Preview – dev November 14, 2024 13:21 View deployment

supalarry reviewed Nov 14, 2024

View reviewed changes

packages/platform/types/bookings/2024-08-13/inputs/create-booking.input.ts Outdated Show resolved Hide resolved

supalarry previously requested changes Nov 15, 2024

View reviewed changes

vercel bot deployed to Preview – api November 15, 2024 13:35 View deployment

vercel bot deployed to Preview – dev November 15, 2024 13:49 View deployment

keithwillcode modified the milestones: v4.7, v4.8 Nov 18, 2024

github-actions bot added the Stale label Dec 3, 2024

keithwillcode modified the milestones: v4.8, v4.9 Dec 15, 2024

github-actions bot removed the Stale label Dec 16, 2024

vercel bot deployed to Preview – api December 17, 2024 09:32 View deployment

vercel bot deployed to Preview – dev December 17, 2024 09:53 View deployment

vercel bot deployed to Preview – api December 17, 2024 15:01 View deployment

vercel bot deployed to Preview – dev December 17, 2024 15:06 View deployment

Udit-takkar marked this pull request as draft December 17, 2024 15:21

vercel bot deployed to Preview – api December 17, 2024 15:45 View deployment

vercel bot deployed to Preview – dev December 17, 2024 15:49 View deployment

vercel bot deployed to Preview – api December 20, 2024 19:55 View deployment

fix: add turbo

b5d55ab

vercel bot deployed to Preview – api December 21, 2024 16:48 View deployment

github-actions bot added the Stale label Jan 5, 2025

Udit-takkar requested a review from supalarry January 7, 2025 10:44

github-actions bot removed the Stale label Jan 8, 2025

Merge branch 'main' into feat/phone-based-api

0b3bbb0

supalarry reviewed Jan 8, 2025

View reviewed changes

vercel bot deployed to Preview – api January 8, 2025 09:58 View deployment

chore: remove emial

17ea671

vercel bot deployed to Preview – api January 8, 2025 10:42 View deployment

refactor: make email optional and move it to service

a964fc2

vercel bot deployed to Preview – api January 8, 2025 11:06 View deployment

fix: test

327bf23

vercel bot deployed to Preview – api January 8, 2025 11:49 View deployment

chore: bump platform-libraries

ec25096

graphite-app bot requested a review from a team January 8, 2025 12:58

vercel bot deployed to Preview – api January 8, 2025 13:05 View deployment

fix: e2e test

0711ceb

vercel bot deployed to Preview – api January 8, 2025 15:06 View deployment

supalarry self-requested a review January 8, 2025 15:27

supalarry approved these changes Jan 8, 2025

View reviewed changes

Udit-takkar merged commit c9c5493 into main Jan 8, 2025
38 checks passed

Udit-takkar deleted the feat/phone-based-api branch January 8, 2025 15:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: support phone based booking api #17635

feat: support phone based booking api #17635

Udit-takkar commented Nov 14, 2024 •

edited

Loading

github-actions bot commented Nov 14, 2024

graphite-app bot commented Nov 14, 2024 •

edited

Loading

supalarry left a comment •

edited

Loading

vercel bot commented Nov 15, 2024 •

edited

Loading

github-actions bot commented Dec 3, 2024

github-actions bot commented Jan 5, 2025

supalarry Jan 8, 2025

supalarry Jan 8, 2025

supalarry Jan 8, 2025

Udit-takkar Jan 8, 2025

socket-security bot commented Jan 8, 2025 •

edited

Loading

github-actions bot commented Jan 8, 2025 •

edited

Loading

feat: support phone based booking api #17635

feat: support phone based booking api #17635

Conversation

Udit-takkar commented Nov 14, 2024 • edited Loading

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

github-actions bot commented Nov 14, 2024

graphite-app bot commented Nov 14, 2024 • edited Loading

Graphite Automations

supalarry left a comment • edited Loading

Choose a reason for hiding this comment

vercel bot commented Nov 15, 2024 • edited Loading

github-actions bot commented Dec 3, 2024

github-actions bot commented Jan 5, 2025

supalarry Jan 8, 2025

Choose a reason for hiding this comment

supalarry Jan 8, 2025

Choose a reason for hiding this comment

supalarry Jan 8, 2025

Choose a reason for hiding this comment

Udit-takkar Jan 8, 2025

Choose a reason for hiding this comment

socket-security bot commented Jan 8, 2025 • edited Loading

github-actions bot commented Jan 8, 2025 • edited Loading

E2E results are ready!

Udit-takkar commented Nov 14, 2024 •

edited

Loading

graphite-app bot commented Nov 14, 2024 •

edited

Loading

supalarry left a comment •

edited

Loading

vercel bot commented Nov 15, 2024 •

edited

Loading

socket-security bot commented Jan 8, 2025 •

edited

Loading

github-actions bot commented Jan 8, 2025 •

edited

Loading