feat: Add rescheduledBy & canceledBy fields in the DB #15337

Amit91848 · 2024-06-05T17:20:32Z

What does this PR do?

Fixes [CAL-3860] Add rescheduledBy & canceledBy fields in the DB #15317
Fixes CAL-3860

Steps:
After creating a booking, a bunch of places I have covered from where you can reschedule / cancel bookings and then it is updated in the db:

booking/{bookingUid} page - Reschedule or Cancel links.
CTA of email of all hosts and attendees
Request Reschedule in booking tab

Host:

host.mp4

Attendee:

attendee.mp4

Imp for context:
As per the discussion I had with @alishaz-polymath , in its current form this only populates the rescheduledBy and cancelledBy field in the db. It is not shown anywhere yet, but it sent as a part of webhook payload. It lacks validations and guards which makes it susceptible to misuse, so at some point as a follow up, we would have to introduce it.

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected)
I have added a Docs issue here if this PR makes changes that would require a documentation change
I have added or modified automated tests that prove my fix is effective or that my feature works (PRs might be rejected if logical changes are not properly tested)

vercel · 2024-06-05T17:20:38Z

@Amit91848 is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

github-actions · 2024-06-05T17:20:44Z

Thank you for following the naming conventions! 🙏 Feel free to join our discord and post your PR link.

graphite-app · 2024-06-05T17:25:11Z

Graphite Automations

"Add community label" took an action on this PR • (06/05/24)

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

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

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

github-actions · 2024-06-26T00:17:51Z

This PR is being marked as stale due to inactivity.

anikdhabal

Type checks and unit test both are failing . Could you fix them?

github-actions · 2024-08-01T00:20:57Z

This PR is being marked as stale due to inactivity.

anoniz · 2024-08-01T09:56:02Z

did someone fixed this? can i work on it?

apps/web/pages/reschedule/[uid].tsx

Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>

packages/prisma/zod-utils.ts

apps/web/modules/bookings/views/bookings-single-view.tsx

apps/web/pages/reschedule/[uid].tsx

CarinaWolli · 2024-08-22T12:02:39Z

apps/web/modules/bookings/views/bookings-single-view.tsx

@@ -163,6 +163,7 @@ export default function Success(props: PageProps) {
  const [calculatedDuration, setCalculatedDuration] = useState<number | undefined>(undefined);
  const [comment, setComment] = useState("");
  const parsedRating = rating ? parseInt(rating, 10) : 3;
+  const currentUserEmail = searchParams?.get("email") ?? session?.user?.email ?? undefined;


when coming from the email cancel button then we don't have an email param but the cancelledBy param

Should be both actually. When a booking is made, the booker is redirected to booking page where it also has email param. Forgot to include the cancelledBy for the email

fixed

CarinaWolli

Let's wait for @alishaz-polymath for final approval. It looks good to me 👍

fixed

alishaz-polymath · 2024-08-22T16:01:22Z

Requesting Platform Review as it touches Platform 🙏

alishaz-polymath

Code looks good,
tested locally and works as well 🚀
Just waiting on Platform to clear it before we ship.

github-actions · 2024-08-22T16:31:12Z

E2E results are ready!

Workflow #29339.1 latest results

* feat: Add rescheduledBy & canceledBy fields in the DB * fix: type check * fix: type check * fix: use session user email for reschedule * fix: unit test * feat: db field email validation * feat: rescheduledBy and cancelledBy in webhooks * revert unrelated changes. * make session user secondary, default to Anonymous * if condition not required * Make cancelledBy optional Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> * update cancel booking type * fix: update cancelledBy in db when requesting reschedule * remove default value for fields * fix: type check * feat: manage fields via api v1 * fix: add fields in booking read api v1 * test: expand to cover new fields * fix: use cancelledBy param on booking page --------- Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com>

feat: Add rescheduledBy & canceledBy fields in the DB

7cec84c

graphite-app bot added the community Created by Linear-GitHub Sync label Jun 5, 2024

graphite-app bot requested a review from a team June 5, 2024 17:20

github-actions bot added the ❗️ migrations contains migration files label Jun 5, 2024

dosubot bot added this to the v4.3 milestone Jun 5, 2024

dosubot bot modified the milestones: v4.3, v4.4 Jun 11, 2024

github-actions bot added the Stale label Jun 26, 2024

anikdhabal previously requested changes Jul 4, 2024

View reviewed changes

Merge branch 'main' into feat/add_rescheduledBy_canceledBy_for_bookings

c06af84

keithwillcode added the community-interns The team responsible for reviewing, testing and shipping low/medium community PRs label Jul 4, 2024

github-actions bot removed the Stale label Jul 5, 2024

Amit91848 marked this pull request as draft July 16, 2024 15:15

dosubot bot modified the milestones: v4.4, v4.5 Jul 17, 2024

github-actions bot added the Stale label Aug 1, 2024

github-actions bot removed the Stale label Aug 2, 2024

Merge branch 'main' into feat/add_rescheduledBy_canceledBy_for_bookings

f61c2e6

Amit91848 commented Aug 21, 2024

View reviewed changes

apps/web/pages/reschedule/[uid].tsx Show resolved Hide resolved

Amit91848 and others added 4 commits August 21, 2024 20:19

if condition not required

2577697

Make cancelledBy optional

b5c3d13

Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>

update cancel booking type

c67f724

fix: update cancelledBy in db when requesting reschedule

d537a64

Amit91848 commented Aug 21, 2024

View reviewed changes

packages/prisma/zod-utils.ts Show resolved Hide resolved

Amit91848 commented Aug 22, 2024

View reviewed changes

apps/web/modules/bookings/views/bookings-single-view.tsx Outdated Show resolved Hide resolved

Amit91848 commented Aug 22, 2024

View reviewed changes

apps/web/pages/reschedule/[uid].tsx Outdated Show resolved Hide resolved

Amit91848 added 5 commits August 22, 2024 16:13

remove default value for fields

b64efb3

fix: type check

e8ac645

feat: manage fields via api v1

c0ead7c

fix: add fields in booking read api v1

7c8f2b2

test: expand to cover new fields

168b1e5

CarinaWolli previously requested changes Aug 22, 2024

View reviewed changes

fix: use cancelledBy param on booking page

26f50d2

Amit91848 requested review from alishaz-polymath and CarinaWolli August 22, 2024 12:49

CarinaWolli added the ready-for-e2e label Aug 22, 2024

CarinaWolli reviewed Aug 22, 2024

View reviewed changes

alishaz-polymath requested a review from a team August 22, 2024 16:01

alishaz-polymath approved these changes Aug 22, 2024

View reviewed changes

Merge branch 'main' into feat/add_rescheduledBy_canceledBy_for_bookings

683083f

Merge branch 'main' into feat/add_rescheduledBy_canceledBy_for_bookings

6bdbc3e

PeerRich merged commit b6d3112 into calcom:main Aug 25, 2024
31 of 38 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Add rescheduledBy & canceledBy fields in the DB #15337

feat: Add rescheduledBy & canceledBy fields in the DB #15337

Amit91848 commented Jun 5, 2024 •

edited

Loading

vercel bot commented Jun 5, 2024

github-actions bot commented Jun 5, 2024 •

edited

Loading

graphite-app bot commented Jun 5, 2024 •

edited

Loading

github-actions bot commented Jun 26, 2024

anikdhabal left a comment

github-actions bot commented Aug 1, 2024

anoniz commented Aug 1, 2024

CarinaWolli Aug 22, 2024

Amit91848 Aug 22, 2024

CarinaWolli left a comment

alishaz-polymath commented Aug 22, 2024

alishaz-polymath left a comment

github-actions bot commented Aug 22, 2024 •

edited

Loading

feat: Add rescheduledBy & canceledBy fields in the DB #15337

feat: Add rescheduledBy & canceledBy fields in the DB #15337

Conversation

Amit91848 commented Jun 5, 2024 • edited Loading

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

vercel bot commented Jun 5, 2024

github-actions bot commented Jun 5, 2024 • edited Loading

graphite-app bot commented Jun 5, 2024 • edited Loading

Graphite Automations

github-actions bot commented Jun 26, 2024

anikdhabal left a comment

Choose a reason for hiding this comment

github-actions bot commented Aug 1, 2024

anoniz commented Aug 1, 2024

CarinaWolli Aug 22, 2024

Choose a reason for hiding this comment

Amit91848 Aug 22, 2024

Choose a reason for hiding this comment

CarinaWolli left a comment

Choose a reason for hiding this comment

alishaz-polymath commented Aug 22, 2024

alishaz-polymath left a comment

Choose a reason for hiding this comment

github-actions bot commented Aug 22, 2024 • edited Loading

E2E results are ready!

Amit91848 commented Jun 5, 2024 •

edited

Loading

github-actions bot commented Jun 5, 2024 •

edited

Loading

graphite-app bot commented Jun 5, 2024 •

edited

Loading

github-actions bot commented Aug 22, 2024 •

edited

Loading