feat: Rerouting a booking with corrected responses #17074

hariombalhara · 2024-10-12T07:56:20Z

What does this PR do?

Fixes CAL-4498

Loom Demo - With new UI Changes
Old Loom Demo - Not updated with UI/UX changes but should work

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?

See Loom

Review Ask

While reviewing please make sure to specifically review that it doesn't break any existing behaviour

vercel · 2024-10-12T07:56:24Z

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		Oct 17, 2024 0:28am
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Oct 17, 2024 0:28am

github-actions · 2024-10-12T07:56:31Z

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 "POC working with no TS error". 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

github-actions · 2024-10-12T08:25:00Z

E2E results are ready!

Workflow #34990.1 latest results

…d-responses

hariombalhara · 2024-10-15T11:02:46Z

apps/web/components/booking/BookingListItem.tsx

@@ -722,7 +780,7 @@ const FirstAttendee = ({
      className=" hover:text-blue-500"
      href={`mailto:${user.email}`}
      onClick={(e) => e.stopPropagation()}>
-      {user.name}
+      {user.name || user.email}


It fixes user not shown in the list if it doesn't have name set.

hariombalhara · 2024-10-15T11:07:44Z

packages/app-store/routing-forms/components/FormInputFields.tsx

-type Props = {
-  form: SerializableForm<App_RoutingForms_Form>;
+export type FormInputFieldsProps = {
+  form: Pick<SerializableForm<App_RoutingForms_Form>, "fields">;


Ask for what you need.

hariombalhara · 2024-10-15T11:12:16Z

packages/app-store/routing-forms/lib/processRoute.tsx

@@ -14,7 +14,7 @@ export function findMatchingRoute({
  form,
  response,
 }: {
-  form: SerializableForm<App_RoutingForms_Form>;
+  form: Pick<SerializableForm<App_RoutingForms_Form>, "routes" | "fields">;


Ask for what is needed.

hariombalhara · 2024-10-15T11:13:13Z

packages/app-store/routing-forms/pages/route-builder/[...appPages].tsx

@@ -453,11 +454,13 @@ const Route = ({
                        }
                        if (option.value !== "custom") {
                          setRoute(route.id, {
-                            action: { ...route.action, value: option.value },
+                            action: { ...route.action, value: option.value, eventTypeId: option.eventTypeId },


Now we store eventTypeId as well in routing to allow Rerouting to easily know which eventType is it rerouting to. Instead of it having to query by event slug.

…d-responses

hariombalhara · 2024-10-16T12:01:23Z

packages/app-store/routing-forms/trpc/utils.ts

@@ -121,7 +121,7 @@ export async function findTeamMembersMatchingAttributeLogicOfRoute({
      getFieldResponse,
    });

-    if (!attributesQueryValue) {
+    if (raqbQueryValueUtils.isQueryValueEmpty(attributesQueryValue)) {


attributesQueryValue could be an object but still without any rule. Better check for perf improvement.

linear · 2024-10-17T12:14:30Z

CAL-4498 Ability to edit routing form response and reschedule based on new inputs

graphite-app · 2024-10-17T12:15:11Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (10/17/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 • (10/17/24)

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

hariombalhara · 2024-10-17T12:22:12Z

packages/features/bookings/lib/handleNewBooking.ts

-  if (!eventType.seatsPerTimeSlot && originalRescheduledBooking?.uid) {
-    await prisma.booking.update({
-      where: {
-        id: originalRescheduledBooking.id,
-      },
-      data: {
-        rescheduled: true,
-        status: BookingStatus.CANCELLED,
-        rescheduledBy: reqBody.rescheduledBy,
-      },
-    });
-  }


It has been moved to createBooking to make it a part of transaction.

It has happened during testing that new booking creation failed but original booking got cancelled which is inconsistent state.

Moved here https://github.com/calcom/cal.com/pull/17074/files#diff-ef170c5be6fe8235704e6dc1614ddce14fe8b77160223dace06762c41c2edc93R294

hariombalhara · 2024-10-17T12:26:16Z

packages/trpc/server/routers/viewer/bookings/get.handler.ts

+     * Who uses it -
+     * 1. We need to be able to decide which booking can have a 'Reroute' action
+     */
+    routedFromRoutingFormReponse: {


Added comment to easily know why certain nested query was needed.

…d-responses

hariombalhara · 2024-10-17T12:52:44Z

Icon test seems to be failing maybe due to the new icon addition. Not sure how to fix it. @zomars

POC working with no TS error

c3e1f22

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

hariombalhara changed the title ~~POC working with no TS error~~ feat: Rerouting a booking with updated responses Oct 12, 2024

hariombalhara changed the title ~~feat: Rerouting a booking with updated responses~~ feat: Rerouting a booking with updated Routing Form responses Oct 12, 2024

hariombalhara self-assigned this Oct 12, 2024

hariombalhara added the ready-for-e2e label Oct 12, 2024

vercel bot deployed to Preview – api October 12, 2024 08:04 View deployment

vercel bot deployed to Preview – dev October 12, 2024 08:13 View deployment

hariombalhara added 2 commits October 12, 2024 14:29

Merge remote-tracking branch 'origin/main' into reroute-with-correcte…

2063fb8

…d-responses

cleanup

becfa2b

vercel bot deployed to Preview – api October 13, 2024 11:43 View deployment

vercel bot deployed to Preview – dev October 13, 2024 11:54 View deployment

Fix query booking

f0c6e94

hariombalhara force-pushed the reroute-with-corrected-responses branch from 4919e31 to f0c6e94 Compare October 13, 2024 13:44

vercel bot deployed to Preview – api October 13, 2024 13:52 View deployment

vercel bot deployed to Preview – dev October 13, 2024 14:02 View deployment

hariombalhara added 2 commits October 14, 2024 11:19

Simplify things

9c16054

Support rerouting to different event

30751c8

vercel bot deployed to Preview – api October 14, 2024 11:24 View deployment

vercel bot deployed to Preview – dev October 14, 2024 11:32 View deployment

Merge remote-tracking branch 'origin/main' into reroute-with-correcte…

14bf3b3

…d-responses

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

vercel bot deployed to Preview – dev October 14, 2024 13:36 View deployment

Merge remote-tracking branch 'origin/main' into reroute-with-correcte…

ce6a721

…d-responses

vercel bot deployed to Preview – api October 15, 2024 10:05 View deployment

hariombalhara force-pushed the reroute-with-corrected-responses branch from 24f52f5 to ce6a721 Compare October 15, 2024 10:05

Merge remote-tracking branch 'origin/main' into reroute-with-correcte…

10742c6

…d-responses

hariombalhara commented Oct 15, 2024

View reviewed changes

hariombalhara added 2 commits October 16, 2024 11:02

self-review fixes

c021ced

Merge remote-tracking branch 'origin/main' into reroute-with-correcte…

100cee2

…d-responses

hariombalhara commented Oct 16, 2024

View reviewed changes

hariombalhara changed the title ~~feat: Rerouting a booking with updated Routing Form responses~~ feat: Rerouting a booking with corrected responses Oct 17, 2024

Some improvements

9ebe3f1

vercel bot deployed to Preview – api October 17, 2024 09:21 View deployment

vercel bot deployed to Preview – dev October 17, 2024 09:30 View deployment

hariombalhara marked this pull request as ready for review October 17, 2024 12:14

graphite-app bot requested review from a team October 17, 2024 12:14

dosubot bot added bookings area: bookings, availability, timezones, double booking routing-forms area: routing forms, routing, forms ✨ feature New feature or request labels Oct 17, 2024

vercel bot deployed to Preview – api October 17, 2024 12:17 View deployment

hariombalhara commented Oct 17, 2024

View reviewed changes

vercel bot deployed to Preview – dev October 17, 2024 12:26 View deployment

hariombalhara commented Oct 17, 2024

View reviewed changes

hariombalhara added 2 commits October 17, 2024 17:57

add more tests

726444b

Merge remote-tracking branch 'origin/main' into reroute-with-correcte…

991b32a

…d-responses

hariombalhara force-pushed the reroute-with-corrected-responses branch from ec2f98a to 991b32a Compare October 17, 2024 12:28

vercel bot deployed to Preview – api October 17, 2024 12:37 View deployment

vercel bot deployed to Preview – dev October 17, 2024 12:45 View deployment

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Rerouting a booking with corrected responses #17074

feat: Rerouting a booking with corrected responses #17074

hariombalhara commented Oct 12, 2024 •

edited

Loading

vercel bot commented Oct 12, 2024 •

edited

Loading

github-actions bot commented Oct 12, 2024

github-actions bot commented Oct 12, 2024 •

edited

Loading

hariombalhara Oct 15, 2024

hariombalhara Oct 15, 2024

hariombalhara Oct 15, 2024

hariombalhara Oct 15, 2024

hariombalhara Oct 16, 2024

linear bot commented Oct 17, 2024

graphite-app bot commented Oct 17, 2024

hariombalhara Oct 17, 2024 •

edited

Loading

hariombalhara Oct 17, 2024

hariombalhara commented Oct 17, 2024

feat: Rerouting a booking with corrected responses #17074

Are you sure you want to change the base?

feat: Rerouting a booking with corrected responses #17074

Conversation

hariombalhara commented Oct 12, 2024 • edited Loading

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Review Ask

vercel bot commented Oct 12, 2024 • edited Loading

github-actions bot commented Oct 12, 2024

github-actions bot commented Oct 12, 2024 • edited Loading

E2E results are ready!

hariombalhara Oct 15, 2024

Choose a reason for hiding this comment

hariombalhara Oct 15, 2024

Choose a reason for hiding this comment

hariombalhara Oct 15, 2024

Choose a reason for hiding this comment

hariombalhara Oct 15, 2024

Choose a reason for hiding this comment

hariombalhara Oct 16, 2024

Choose a reason for hiding this comment

linear bot commented Oct 17, 2024

graphite-app bot commented Oct 17, 2024

Graphite Automations

hariombalhara Oct 17, 2024 • edited Loading

Choose a reason for hiding this comment

hariombalhara Oct 17, 2024

Choose a reason for hiding this comment

hariombalhara commented Oct 17, 2024

hariombalhara commented Oct 12, 2024 •

edited

Loading

vercel bot commented Oct 12, 2024 •

edited

Loading

github-actions bot commented Oct 12, 2024 •

edited

Loading

hariombalhara Oct 17, 2024 •

edited

Loading