From 661a494ce402da8e0ac3d305be85efc430595833 Mon Sep 17 00:00:00 2001
From: Amit91848 <samit91848@gmail.com>
Date: Mon, 23 Dec 2024 22:29:27 +0530
Subject: [PATCH 1/5] feat: Setting for rescheduling past bookings

---
 .../components/booking/BookingListItem.tsx    |  2 +-
 apps/web/lib/booking.ts                       |  1 +
 .../reschedule/[uid]/getServerSideProps.ts    |  3 +-
 .../bookings/views/bookings-single-view.tsx   | 32 +++++++++----------
 apps/web/public/static/locales/en/common.json |  2 ++
 .../tabs/advanced/EventAdvancedTab.tsx        | 19 +++++++++++
 packages/lib/defaultEvents.ts                 |  1 +
 packages/lib/server/eventTypeSelect.ts        |  1 +
 packages/lib/server/repository/eventType.ts   |  2 ++
 packages/lib/test/builder.ts                  |  1 +
 .../event-types/hooks/useEventTypeForm.ts     |  1 +
 .../migration.sql                             |  2 ++
 packages/prisma/schema.prisma                 |  1 +
 packages/prisma/zod-utils.ts                  |  1 +
 .../routers/viewer/bookings/get.handler.ts    |  1 +
 .../trpc/server/routers/viewer/slots/util.ts  |  1 +
 16 files changed, 53 insertions(+), 18 deletions(-)
 create mode 100644 packages/prisma/migrations/20241223163249_allow_rescheduling_past_booking_setting/migration.sql

diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx
index 3cfa857580cc40..158615340bdc95 100644
--- a/apps/web/components/booking/BookingListItem.tsx
+++ b/apps/web/components/booking/BookingListItem.tsx
@@ -215,7 +215,7 @@ function BookingListItem(booking: BookingItemProps) {
   ];
 
   const editBookingActions: ActionType[] = [
-    ...(isBookingInPast
+    ...(isBookingInPast && !booking.eventType.reschedulingPastBookings
       ? []
       : [
           {
diff --git a/apps/web/lib/booking.ts b/apps/web/lib/booking.ts
index 2a5e535efcaf6c..5e1e4c9bca8800 100644
--- a/apps/web/lib/booking.ts
+++ b/apps/web/lib/booking.ts
@@ -37,6 +37,7 @@ export const getEventTypesFromDB = async (id: number) => {
       price: true,
       currency: true,
       bookingFields: true,
+      reschedulingPastBookings: true,
       disableGuests: true,
       timeZone: true,
       profile: {
diff --git a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts b/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
index 11fc4aa184e1c4..fa3bdf658f9439 100644
--- a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
+++ b/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
@@ -54,6 +54,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
             },
           },
           slug: true,
+          reschedulingPastBookings: true,
           team: {
             select: {
               parentId: true,
@@ -128,7 +129,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
   });
 
   const isBookingInPast = booking.endTime && new Date(booking.endTime) < new Date();
-  if (isBookingInPast) {
+  if (isBookingInPast && !eventType.reschedulingPastBookings) {
     return {
       redirect: {
         destination: eventUrl,
diff --git a/apps/web/modules/bookings/views/bookings-single-view.tsx b/apps/web/modules/bookings/views/bookings-single-view.tsx
index c6e45ca79dd64e..69b339c96f3686 100644
--- a/apps/web/modules/bookings/views/bookings-single-view.tsx
+++ b/apps/web/modules/bookings/views/bookings-single-view.tsx
@@ -19,7 +19,6 @@ import type { nameObjectSchema } from "@calcom/core/event";
 import { getEventName } from "@calcom/core/event";
 import type { ConfigType } from "@calcom/dayjs";
 import dayjs from "@calcom/dayjs";
-import { getOrgFullOrigin } from "@calcom/ee/organizations/lib/orgDomains";
 import {
   useEmbedNonStylesConfig,
   useIsBackgroundTransparent,
@@ -728,22 +727,23 @@ export default function Success(props: PageProps) {
                             </span>
 
                             <>
-                              {!props.recurringBookings && !isBookingInPast && (
-                                <span className="text-default inline">
-                                  <span className="underline" data-testid="reschedule-link">
-                                    <Link
-                                      href={`/reschedule/${seatReferenceUid || bookingInfo?.uid}${
-                                        currentUserEmail
-                                          ? `?rescheduledBy=${encodeURIComponent(currentUserEmail)}`
-                                          : ""
-                                      }`}
-                                      legacyBehavior>
-                                      {t("reschedule")}
-                                    </Link>
+                              {!props.recurringBookings &&
+                                (!isBookingInPast || eventType.reschedulingPastBookings) && (
+                                  <span className="text-default inline">
+                                    <span className="underline" data-testid="reschedule-link">
+                                      <Link
+                                        href={`/reschedule/${seatReferenceUid || bookingInfo?.uid}${
+                                          currentUserEmail
+                                            ? `?rescheduledBy=${encodeURIComponent(currentUserEmail)}`
+                                            : ""
+                                        }`}
+                                        legacyBehavior>
+                                        {t("reschedule")}
+                                      </Link>
+                                    </span>
+                                    <span className="mx-2">{t("or_lowercase")}</span>
                                   </span>
-                                  <span className="mx-2">{t("or_lowercase")}</span>
-                                </span>
-                              )}
+                                )}
 
                               <button
                                 data-testid="cancel"
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index 06ef7e3b15b512..3dc34df2afbcc6 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -2893,6 +2893,8 @@
   "attribute_weight_enabled_description":"By enabling weights, it would be possible to assign higher priority to certain attributes per user. The higher the weight, the higher the priority.",
   "routed": "Routed",
   "reassigned": "Reassigned",
+  "allow_rescheduling_past_events": "Allow rescheduling past events",
+  "allow_rescheduling_past_events_description": "Enabling this option allows for past events to be rescheduled",
   "rerouted": "Rerouted",
   "salesforce_assigned": "Salesforce assignment",
   "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑"
diff --git a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
index f8accfd479836e..5193c4cfc78a73 100644
--- a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
+++ b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
@@ -893,6 +893,25 @@ export const EventAdvancedTab = ({
           />
         )}
       />
+      <Controller
+        name="reschedulingPastBookings"
+        render={({ field: { value, onChange } }) => (
+          <SettingsToggle
+            labelClassName={classNames("text-sm", customClassNames?.timezoneLock?.label)}
+            descriptionClassName={customClassNames?.timezoneLock?.description}
+            toggleSwitchAtTheEnd={true}
+            switchContainerClassName={classNames(
+              "border-subtle rounded-lg border py-6 px-4 sm:px-6",
+              customClassNames?.timezoneLock?.container
+            )}
+            title={t("allow_rescheduling_past_events")}
+            {...lockTimeZoneToggleOnBookingPageLocked}
+            description={t("allow_rescheduling_past_events_description")}
+            checked={value}
+            onCheckedChange={(e) => onChange(e)}
+          />
+        )}
+      />
       <Controller
         name="eventTypeColor"
         render={() => (
diff --git a/packages/lib/defaultEvents.ts b/packages/lib/defaultEvents.ts
index ed47ae8475884f..49e8c1b8121c92 100644
--- a/packages/lib/defaultEvents.ts
+++ b/packages/lib/defaultEvents.ts
@@ -87,6 +87,7 @@ const commons = {
   seatsShowAttendees: null,
   seatsShowAvailabilityCount: null,
   onlyShowFirstAvailableSlot: false,
+  reschedulingPastBookings: false,
   id: 0,
   hideCalendarNotes: false,
   hideCalendarEventDetails: false,
diff --git a/packages/lib/server/eventTypeSelect.ts b/packages/lib/server/eventTypeSelect.ts
index 1afb1ad2c6168f..91f438b3cd1b23 100644
--- a/packages/lib/server/eventTypeSelect.ts
+++ b/packages/lib/server/eventTypeSelect.ts
@@ -35,6 +35,7 @@ export const eventTypeSelect = Prisma.validator<Prisma.EventTypeSelect>()({
   afterEventBuffer: true,
   seatsPerTimeSlot: true,
   onlyShowFirstAvailableSlot: true,
+  reschedulingPastBookings: true,
   seatsShowAttendees: true,
   seatsShowAvailabilityCount: true,
   scheduleId: true,
diff --git a/packages/lib/server/repository/eventType.ts b/packages/lib/server/repository/eventType.ts
index 39b24a971435e3..29e36c30d65bb7 100644
--- a/packages/lib/server/repository/eventType.ts
+++ b/packages/lib/server/repository/eventType.ts
@@ -501,6 +501,7 @@ export class EventTypeRepository {
       onlyShowFirstAvailableSlot: true,
       durationLimits: true,
       assignAllTeamMembers: true,
+      reschedulingPastBookings: true,
       assignRRMembersUsingSegment: true,
       rrSegmentQueryValue: true,
       isRRWeightsEnabled: true,
@@ -784,6 +785,7 @@ export class EventTypeRepository {
         periodStartDate: true,
         periodEndDate: true,
         onlyShowFirstAvailableSlot: true,
+        reschedulingPastBookings: true,
         periodCountCalendarDays: true,
         rescheduleWithSameRoundRobinHost: true,
         periodDays: true,
diff --git a/packages/lib/test/builder.ts b/packages/lib/test/builder.ts
index c6de3193ad3a2b..920875709cd253 100644
--- a/packages/lib/test/builder.ts
+++ b/packages/lib/test/builder.ts
@@ -144,6 +144,7 @@ export const buildEventType = (eventType?: Partial<EventType>): EventType => {
     rrSegmentQueryValue: null,
     autoTranslateDescriptionEnabled: false,
     useEventLevelSelectedCalendars: false,
+    reschedulingPastBookings: false,
     ...eventType,
   };
 };
diff --git a/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts b/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts
index 8b5b354a10f8ac..88298cbbc68bc2 100644
--- a/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts
+++ b/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts
@@ -91,6 +91,7 @@ export const useEventTypeForm = ({
       requiresConfirmationForFreeEmail: eventType.requiresConfirmationForFreeEmail,
       slotInterval: eventType.slotInterval,
       minimumBookingNotice: eventType.minimumBookingNotice,
+      reschedulingPastBookings: eventType.reschedulingPastBookings,
       metadata: eventType.metadata,
       hosts: eventType.hosts.sort((a, b) => sortHosts(a, b, eventType.isRRWeightsEnabled)),
       successRedirectUrl: eventType.successRedirectUrl || "",
diff --git a/packages/prisma/migrations/20241223163249_allow_rescheduling_past_booking_setting/migration.sql b/packages/prisma/migrations/20241223163249_allow_rescheduling_past_booking_setting/migration.sql
new file mode 100644
index 00000000000000..491692d05add55
--- /dev/null
+++ b/packages/prisma/migrations/20241223163249_allow_rescheduling_past_booking_setting/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "EventType" ADD COLUMN     "reschedulingPastBookings" BOOLEAN NOT NULL DEFAULT false;
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index 183f84aea53bac..c44436e2d2fe7e 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -160,6 +160,7 @@ model EventType {
   fieldTranslations                       EventTypeTranslation[]
   maxLeadThreshold                        Int?
   selectedCalendars                       SelectedCalendar[]
+  reschedulingPastBookings                Boolean                   @default(false)
 
   /// @zod.custom(imports.eventTypeColor)
   eventTypeColor                   Json?
diff --git a/packages/prisma/zod-utils.ts b/packages/prisma/zod-utils.ts
index a861d18a078bbe..2fa93705939aaa 100644
--- a/packages/prisma/zod-utils.ts
+++ b/packages/prisma/zod-utils.ts
@@ -725,6 +725,7 @@ export const allManagedEventTypeProps: { [k in keyof Omit<Prisma.EventTypeSelect
   assignAllTeamMembers: true,
   isRRWeightsEnabled: true,
   eventTypeColor: true,
+  reschedulingPastBookings: true,
   rescheduleWithSameRoundRobinHost: true,
   maxLeadThreshold: true,
 };
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index 1160b03cc52ca3..fc558963642000 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -231,6 +231,7 @@ export async function getBookings({
         seatsShowAttendees: true,
         seatsShowAvailabilityCount: true,
         eventTypeColor: true,
+        reschedulingPastBookings: true,
         schedulingType: true,
         length: true,
         team: {
diff --git a/packages/trpc/server/routers/viewer/slots/util.ts b/packages/trpc/server/routers/viewer/slots/util.ts
index 0584e66f1ada58..44ddc3004ee8e3 100644
--- a/packages/trpc/server/routers/viewer/slots/util.ts
+++ b/packages/trpc/server/routers/viewer/slots/util.ts
@@ -764,6 +764,7 @@ async function getExistingBookings(
         seatsPerTimeSlot: true,
         requiresConfirmationWillBlockSlot: true,
         requiresConfirmation: true,
+        reschedulingPastBookings: true,
       },
     },
     ...(!!eventType?.seatsPerTimeSlot && {

From 8bd876cfa19a5fbf872f223ad128447b955ffa90 Mon Sep 17 00:00:00 2001
From: Amit91848 <samit91848@gmail.com>
Date: Mon, 23 Dec 2024 22:37:38 +0530
Subject: [PATCH 2/5] fix stuff

---
 .../components/tabs/advanced/EventAdvancedTab.tsx     | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
index 5193c4cfc78a73..95bdd2e56de3d5 100644
--- a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
+++ b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
@@ -476,6 +476,7 @@ export const EventAdvancedTab = ({
   const eventTypeColorLocked = shouldLockDisableProps("eventTypeColor");
   const lockTimeZoneToggleOnBookingPageLocked = shouldLockDisableProps("lockTimeZoneToggleOnBookingPage");
   const multiplePrivateLinksLocked = shouldLockDisableProps("multiplePrivateLinks");
+  const reschedulingPastBookingsLocked = shouldLockDisableProps("reschedulingPastBookings");
   const { isLocked, ...eventNameLocked } = shouldLockDisableProps("eventName");
 
   if (isManagedEventType) {
@@ -897,15 +898,11 @@ export const EventAdvancedTab = ({
         name="reschedulingPastBookings"
         render={({ field: { value, onChange } }) => (
           <SettingsToggle
-            labelClassName={classNames("text-sm", customClassNames?.timezoneLock?.label)}
-            descriptionClassName={customClassNames?.timezoneLock?.description}
+            labelClassName={classNames("text-sm")}
             toggleSwitchAtTheEnd={true}
-            switchContainerClassName={classNames(
-              "border-subtle rounded-lg border py-6 px-4 sm:px-6",
-              customClassNames?.timezoneLock?.container
-            )}
+            switchContainerClassName={classNames("border-subtle rounded-lg border py-6 px-4 sm:px-6")}
             title={t("allow_rescheduling_past_events")}
-            {...lockTimeZoneToggleOnBookingPageLocked}
+            {...reschedulingPastBookingsLocked}
             description={t("allow_rescheduling_past_events_description")}
             checked={value}
             onCheckedChange={(e) => onChange(e)}

From e5387ce87d8465dc3fdb61ba42c2801a0c49c8b7 Mon Sep 17 00:00:00 2001
From: Amit91848 <samit91848@gmail.com>
Date: Mon, 23 Dec 2024 22:42:20 +0530
Subject: [PATCH 3/5] rename column

---
 apps/web/components/booking/BookingListItem.tsx               | 2 +-
 apps/web/lib/booking.ts                                       | 2 +-
 apps/web/lib/reschedule/[uid]/getServerSideProps.ts           | 4 ++--
 apps/web/modules/bookings/views/bookings-single-view.tsx      | 2 +-
 .../eventtypes/components/tabs/advanced/EventAdvancedTab.tsx  | 4 ++--
 packages/lib/defaultEvents.ts                                 | 2 +-
 packages/lib/server/eventTypeSelect.ts                        | 2 +-
 packages/lib/server/repository/eventType.ts                   | 4 ++--
 packages/lib/test/builder.ts                                  | 2 +-
 packages/platform/atoms/event-types/hooks/useEventTypeForm.ts | 2 +-
 .../migration.sql                                             | 2 +-
 packages/prisma/schema.prisma                                 | 2 +-
 packages/prisma/zod-utils.ts                                  | 2 +-
 packages/trpc/server/routers/viewer/bookings/get.handler.ts   | 2 +-
 packages/trpc/server/routers/viewer/slots/util.ts             | 2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx
index 158615340bdc95..ba332c829cb0f9 100644
--- a/apps/web/components/booking/BookingListItem.tsx
+++ b/apps/web/components/booking/BookingListItem.tsx
@@ -215,7 +215,7 @@ function BookingListItem(booking: BookingItemProps) {
   ];
 
   const editBookingActions: ActionType[] = [
-    ...(isBookingInPast && !booking.eventType.reschedulingPastBookings
+    ...(isBookingInPast && !booking.eventType.alllowReschedulingPastBookings
       ? []
       : [
           {
diff --git a/apps/web/lib/booking.ts b/apps/web/lib/booking.ts
index 5e1e4c9bca8800..e792f7b79d50db 100644
--- a/apps/web/lib/booking.ts
+++ b/apps/web/lib/booking.ts
@@ -37,7 +37,7 @@ export const getEventTypesFromDB = async (id: number) => {
       price: true,
       currency: true,
       bookingFields: true,
-      reschedulingPastBookings: true,
+      alllowReschedulingPastBookings: true,
       disableGuests: true,
       timeZone: true,
       profile: {
diff --git a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts b/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
index fa3bdf658f9439..97983646a36cc1 100644
--- a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
+++ b/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
@@ -54,7 +54,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
             },
           },
           slug: true,
-          reschedulingPastBookings: true,
+          alllowReschedulingPastBookings: true,
           team: {
             select: {
               parentId: true,
@@ -129,7 +129,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
   });
 
   const isBookingInPast = booking.endTime && new Date(booking.endTime) < new Date();
-  if (isBookingInPast && !eventType.reschedulingPastBookings) {
+  if (isBookingInPast && !eventType.alllowReschedulingPastBookings) {
     return {
       redirect: {
         destination: eventUrl,
diff --git a/apps/web/modules/bookings/views/bookings-single-view.tsx b/apps/web/modules/bookings/views/bookings-single-view.tsx
index 69b339c96f3686..100d8c33c39c49 100644
--- a/apps/web/modules/bookings/views/bookings-single-view.tsx
+++ b/apps/web/modules/bookings/views/bookings-single-view.tsx
@@ -728,7 +728,7 @@ export default function Success(props: PageProps) {
 
                             <>
                               {!props.recurringBookings &&
-                                (!isBookingInPast || eventType.reschedulingPastBookings) && (
+                                (!isBookingInPast || eventType.alllowReschedulingPastBookings) && (
                                   <span className="text-default inline">
                                     <span className="underline" data-testid="reschedule-link">
                                       <Link
diff --git a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
index 95bdd2e56de3d5..5378740cb6a4ff 100644
--- a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
+++ b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
@@ -476,7 +476,7 @@ export const EventAdvancedTab = ({
   const eventTypeColorLocked = shouldLockDisableProps("eventTypeColor");
   const lockTimeZoneToggleOnBookingPageLocked = shouldLockDisableProps("lockTimeZoneToggleOnBookingPage");
   const multiplePrivateLinksLocked = shouldLockDisableProps("multiplePrivateLinks");
-  const reschedulingPastBookingsLocked = shouldLockDisableProps("reschedulingPastBookings");
+  const reschedulingPastBookingsLocked = shouldLockDisableProps("alllowReschedulingPastBookings");
   const { isLocked, ...eventNameLocked } = shouldLockDisableProps("eventName");
 
   if (isManagedEventType) {
@@ -895,7 +895,7 @@ export const EventAdvancedTab = ({
         )}
       />
       <Controller
-        name="reschedulingPastBookings"
+        name="alllowReschedulingPastBookings"
         render={({ field: { value, onChange } }) => (
           <SettingsToggle
             labelClassName={classNames("text-sm")}
diff --git a/packages/lib/defaultEvents.ts b/packages/lib/defaultEvents.ts
index 49e8c1b8121c92..52b9d7410fcdef 100644
--- a/packages/lib/defaultEvents.ts
+++ b/packages/lib/defaultEvents.ts
@@ -87,7 +87,7 @@ const commons = {
   seatsShowAttendees: null,
   seatsShowAvailabilityCount: null,
   onlyShowFirstAvailableSlot: false,
-  reschedulingPastBookings: false,
+  alllowReschedulingPastBookings: false,
   id: 0,
   hideCalendarNotes: false,
   hideCalendarEventDetails: false,
diff --git a/packages/lib/server/eventTypeSelect.ts b/packages/lib/server/eventTypeSelect.ts
index 91f438b3cd1b23..65a1159172642b 100644
--- a/packages/lib/server/eventTypeSelect.ts
+++ b/packages/lib/server/eventTypeSelect.ts
@@ -35,7 +35,7 @@ export const eventTypeSelect = Prisma.validator<Prisma.EventTypeSelect>()({
   afterEventBuffer: true,
   seatsPerTimeSlot: true,
   onlyShowFirstAvailableSlot: true,
-  reschedulingPastBookings: true,
+  alllowReschedulingPastBookings: true,
   seatsShowAttendees: true,
   seatsShowAvailabilityCount: true,
   scheduleId: true,
diff --git a/packages/lib/server/repository/eventType.ts b/packages/lib/server/repository/eventType.ts
index 29e36c30d65bb7..b0eaf742a669e2 100644
--- a/packages/lib/server/repository/eventType.ts
+++ b/packages/lib/server/repository/eventType.ts
@@ -501,7 +501,7 @@ export class EventTypeRepository {
       onlyShowFirstAvailableSlot: true,
       durationLimits: true,
       assignAllTeamMembers: true,
-      reschedulingPastBookings: true,
+      alllowReschedulingPastBookings: true,
       assignRRMembersUsingSegment: true,
       rrSegmentQueryValue: true,
       isRRWeightsEnabled: true,
@@ -785,7 +785,7 @@ export class EventTypeRepository {
         periodStartDate: true,
         periodEndDate: true,
         onlyShowFirstAvailableSlot: true,
-        reschedulingPastBookings: true,
+        alllowReschedulingPastBookings: true,
         periodCountCalendarDays: true,
         rescheduleWithSameRoundRobinHost: true,
         periodDays: true,
diff --git a/packages/lib/test/builder.ts b/packages/lib/test/builder.ts
index 920875709cd253..b87ae4144123ad 100644
--- a/packages/lib/test/builder.ts
+++ b/packages/lib/test/builder.ts
@@ -144,7 +144,7 @@ export const buildEventType = (eventType?: Partial<EventType>): EventType => {
     rrSegmentQueryValue: null,
     autoTranslateDescriptionEnabled: false,
     useEventLevelSelectedCalendars: false,
-    reschedulingPastBookings: false,
+    alllowReschedulingPastBookings: false,
     ...eventType,
   };
 };
diff --git a/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts b/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts
index 88298cbbc68bc2..38800cb561e917 100644
--- a/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts
+++ b/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts
@@ -91,7 +91,7 @@ export const useEventTypeForm = ({
       requiresConfirmationForFreeEmail: eventType.requiresConfirmationForFreeEmail,
       slotInterval: eventType.slotInterval,
       minimumBookingNotice: eventType.minimumBookingNotice,
-      reschedulingPastBookings: eventType.reschedulingPastBookings,
+      alllowReschedulingPastBookings: eventType.alllowReschedulingPastBookings,
       metadata: eventType.metadata,
       hosts: eventType.hosts.sort((a, b) => sortHosts(a, b, eventType.isRRWeightsEnabled)),
       successRedirectUrl: eventType.successRedirectUrl || "",
diff --git a/packages/prisma/migrations/20241223163249_allow_rescheduling_past_booking_setting/migration.sql b/packages/prisma/migrations/20241223163249_allow_rescheduling_past_booking_setting/migration.sql
index 491692d05add55..85ab99a11c5258 100644
--- a/packages/prisma/migrations/20241223163249_allow_rescheduling_past_booking_setting/migration.sql
+++ b/packages/prisma/migrations/20241223163249_allow_rescheduling_past_booking_setting/migration.sql
@@ -1,2 +1,2 @@
 -- AlterTable
-ALTER TABLE "EventType" ADD COLUMN     "reschedulingPastBookings" BOOLEAN NOT NULL DEFAULT false;
+ALTER TABLE "EventType" ADD COLUMN     "alllowReschedulingPastBookings" BOOLEAN NOT NULL DEFAULT false;
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index c44436e2d2fe7e..559daad374915c 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -160,7 +160,7 @@ model EventType {
   fieldTranslations                       EventTypeTranslation[]
   maxLeadThreshold                        Int?
   selectedCalendars                       SelectedCalendar[]
-  reschedulingPastBookings                Boolean                   @default(false)
+  alllowReschedulingPastBookings          Boolean                   @default(false)
 
   /// @zod.custom(imports.eventTypeColor)
   eventTypeColor                   Json?
diff --git a/packages/prisma/zod-utils.ts b/packages/prisma/zod-utils.ts
index 2fa93705939aaa..77f8d5ac8657a9 100644
--- a/packages/prisma/zod-utils.ts
+++ b/packages/prisma/zod-utils.ts
@@ -725,7 +725,7 @@ export const allManagedEventTypeProps: { [k in keyof Omit<Prisma.EventTypeSelect
   assignAllTeamMembers: true,
   isRRWeightsEnabled: true,
   eventTypeColor: true,
-  reschedulingPastBookings: true,
+  alllowReschedulingPastBookings: true,
   rescheduleWithSameRoundRobinHost: true,
   maxLeadThreshold: true,
 };
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index fc558963642000..2975d5fc940f8f 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -231,7 +231,7 @@ export async function getBookings({
         seatsShowAttendees: true,
         seatsShowAvailabilityCount: true,
         eventTypeColor: true,
-        reschedulingPastBookings: true,
+        alllowReschedulingPastBookings: true,
         schedulingType: true,
         length: true,
         team: {
diff --git a/packages/trpc/server/routers/viewer/slots/util.ts b/packages/trpc/server/routers/viewer/slots/util.ts
index 44ddc3004ee8e3..578f65cd6ebff7 100644
--- a/packages/trpc/server/routers/viewer/slots/util.ts
+++ b/packages/trpc/server/routers/viewer/slots/util.ts
@@ -764,7 +764,7 @@ async function getExistingBookings(
         seatsPerTimeSlot: true,
         requiresConfirmationWillBlockSlot: true,
         requiresConfirmation: true,
-        reschedulingPastBookings: true,
+        alllowReschedulingPastBookings: true,
       },
     },
     ...(!!eventType?.seatsPerTimeSlot && {

From 7300eb5e9a9383b119fbb15abbeee1c661ba67da Mon Sep 17 00:00:00 2001
From: Amit91848 <samit91848@gmail.com>
Date: Mon, 6 Jan 2025 12:23:09 +0530
Subject: [PATCH 4/5] add e2e test

---
 apps/web/playwright/reschedule.e2e.ts | 47 +++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/apps/web/playwright/reschedule.e2e.ts b/apps/web/playwright/reschedule.e2e.ts
index 09d365924b2bc1..c53f066bd9522f 100644
--- a/apps/web/playwright/reschedule.e2e.ts
+++ b/apps/web/playwright/reschedule.e2e.ts
@@ -50,6 +50,53 @@ test.describe("Reschedule Tests", async () => {
     await booking.delete();
   });
 
+  test("Should not show reschedule and request reschedule option if booking in past and disallowed", async ({
+    page,
+    users,
+    bookings,
+  }) => {
+    const user = await users.create();
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const booking = await bookings.create(user.id, user.username, user.eventTypes[0].id!, {
+      status: BookingStatus.ACCEPTED,
+      startTime: dayjs().subtract(2, "day").toDate(),
+      endTime: dayjs().subtract(2, "day").add(30, "minutes").toDate(),
+    });
+
+    await prisma.eventType.update({
+      where: {
+        id: user.eventTypes[0].id,
+      },
+      data: {
+        alllowReschedulingPastBookings: true,
+      },
+    });
+
+    await user.apiLogin();
+    await page.goto("/bookings/past");
+
+    await page.locator('[data-testid="edit_booking"]').nth(0).click();
+
+    await expect(page.locator('[data-testid="reschedule"]')).toBeVisible();
+    await expect(page.locator('[data-testid="reschedule_request"]')).toBeVisible();
+
+    await prisma.eventType.update({
+      where: {
+        id: user.eventTypes[0].id,
+      },
+      data: {
+        alllowReschedulingPastBookings: false,
+      },
+    });
+
+    await page.reload();
+
+    await page.locator('[data-testid="edit_booking"]').nth(0).click();
+
+    await expect(page.locator('[data-testid="reschedule"]')).toBeHidden();
+    await expect(page.locator('[data-testid="reschedule_request"]')).toBeHidden();
+  });
+
   test("Should display former time when rescheduling availability", async ({ page, users, bookings }) => {
     const user = await users.create();
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

From 2ff54e26637a9626adf2069e33f389a5cb31bc3a Mon Sep 17 00:00:00 2001
From: Amit91848 <samit91848@gmail.com>
Date: Mon, 6 Jan 2025 12:37:01 +0530
Subject: [PATCH 5/5] fix column name

---
 apps/web/components/booking/BookingListItem.tsx               | 2 +-
 apps/web/lib/booking.ts                                       | 2 +-
 apps/web/lib/reschedule/[uid]/getServerSideProps.ts           | 2 +-
 apps/web/modules/bookings/views/bookings-single-view.tsx      | 2 +-
 apps/web/playwright/reschedule.e2e.ts                         | 4 ++--
 .../eventtypes/components/tabs/advanced/EventAdvancedTab.tsx  | 4 ++--
 packages/lib/defaultEvents.ts                                 | 2 +-
 packages/lib/server/eventTypeSelect.ts                        | 2 +-
 packages/lib/server/repository/eventType.ts                   | 4 ++--
 packages/lib/test/builder.ts                                  | 2 +-
 packages/platform/atoms/event-types/hooks/useEventTypeForm.ts | 2 +-
 .../migration.sql                                             | 2 +-
 packages/prisma/schema.prisma                                 | 2 +-
 packages/prisma/zod-utils.ts                                  | 2 +-
 packages/trpc/server/routers/viewer/bookings/get.handler.ts   | 2 +-
 packages/trpc/server/routers/viewer/slots/util.ts             | 2 +-
 16 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx
index ba332c829cb0f9..ef9bac65a377a6 100644
--- a/apps/web/components/booking/BookingListItem.tsx
+++ b/apps/web/components/booking/BookingListItem.tsx
@@ -215,7 +215,7 @@ function BookingListItem(booking: BookingItemProps) {
   ];
 
   const editBookingActions: ActionType[] = [
-    ...(isBookingInPast && !booking.eventType.alllowReschedulingPastBookings
+    ...(isBookingInPast && !booking.eventType.allowReschedulingPastBookings
       ? []
       : [
           {
diff --git a/apps/web/lib/booking.ts b/apps/web/lib/booking.ts
index e792f7b79d50db..183c62f1adf304 100644
--- a/apps/web/lib/booking.ts
+++ b/apps/web/lib/booking.ts
@@ -37,7 +37,7 @@ export const getEventTypesFromDB = async (id: number) => {
       price: true,
       currency: true,
       bookingFields: true,
-      alllowReschedulingPastBookings: true,
+      allowReschedulingPastBookings: true,
       disableGuests: true,
       timeZone: true,
       profile: {
diff --git a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts b/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
index cef93fd02afb27..90c7635dcd7028 100644
--- a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
+++ b/apps/web/lib/reschedule/[uid]/getServerSideProps.ts
@@ -57,7 +57,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
             },
           },
           slug: true,
-          alllowReschedulingPastBookings: true,
+          allowReschedulingPastBookings: true,
           team: {
             select: {
               parentId: true,
diff --git a/apps/web/modules/bookings/views/bookings-single-view.tsx b/apps/web/modules/bookings/views/bookings-single-view.tsx
index 100094877bebaa..799dfe7b98b203 100644
--- a/apps/web/modules/bookings/views/bookings-single-view.tsx
+++ b/apps/web/modules/bookings/views/bookings-single-view.tsx
@@ -738,7 +738,7 @@ export default function Success(props: PageProps) {
 
                             <>
                               {!props.recurringBookings &&
-                                (!isBookingInPast || eventType.alllowReschedulingPastBookings) && (
+                                (!isBookingInPast || eventType.allowReschedulingPastBookings) && (
                                   <span className="text-default inline">
                                     <span className="underline" data-testid="reschedule-link">
                                       <Link
diff --git a/apps/web/playwright/reschedule.e2e.ts b/apps/web/playwright/reschedule.e2e.ts
index c53f066bd9522f..ead6f8de70e07c 100644
--- a/apps/web/playwright/reschedule.e2e.ts
+++ b/apps/web/playwright/reschedule.e2e.ts
@@ -68,7 +68,7 @@ test.describe("Reschedule Tests", async () => {
         id: user.eventTypes[0].id,
       },
       data: {
-        alllowReschedulingPastBookings: true,
+        allowReschedulingPastBookings: true,
       },
     });
 
@@ -85,7 +85,7 @@ test.describe("Reschedule Tests", async () => {
         id: user.eventTypes[0].id,
       },
       data: {
-        alllowReschedulingPastBookings: false,
+        allowReschedulingPastBookings: false,
       },
     });
 
diff --git a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
index 5378740cb6a4ff..fd07df2763a553 100644
--- a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
+++ b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
@@ -476,7 +476,7 @@ export const EventAdvancedTab = ({
   const eventTypeColorLocked = shouldLockDisableProps("eventTypeColor");
   const lockTimeZoneToggleOnBookingPageLocked = shouldLockDisableProps("lockTimeZoneToggleOnBookingPage");
   const multiplePrivateLinksLocked = shouldLockDisableProps("multiplePrivateLinks");
-  const reschedulingPastBookingsLocked = shouldLockDisableProps("alllowReschedulingPastBookings");
+  const reschedulingPastBookingsLocked = shouldLockDisableProps("allowReschedulingPastBookings");
   const { isLocked, ...eventNameLocked } = shouldLockDisableProps("eventName");
 
   if (isManagedEventType) {
@@ -895,7 +895,7 @@ export const EventAdvancedTab = ({
         )}
       />
       <Controller
-        name="alllowReschedulingPastBookings"
+        name="allowReschedulingPastBookings"
         render={({ field: { value, onChange } }) => (
           <SettingsToggle
             labelClassName={classNames("text-sm")}
diff --git a/packages/lib/defaultEvents.ts b/packages/lib/defaultEvents.ts
index f99671e4009f13..9aeddef0b3433d 100644
--- a/packages/lib/defaultEvents.ts
+++ b/packages/lib/defaultEvents.ts
@@ -88,7 +88,7 @@ const commons = {
   seatsShowAttendees: null,
   seatsShowAvailabilityCount: null,
   onlyShowFirstAvailableSlot: false,
-  alllowReschedulingPastBookings: false,
+  allowReschedulingPastBookings: false,
   id: 0,
   hideCalendarNotes: false,
   hideCalendarEventDetails: false,
diff --git a/packages/lib/server/eventTypeSelect.ts b/packages/lib/server/eventTypeSelect.ts
index 65a1159172642b..3c65195ff01ec8 100644
--- a/packages/lib/server/eventTypeSelect.ts
+++ b/packages/lib/server/eventTypeSelect.ts
@@ -35,7 +35,7 @@ export const eventTypeSelect = Prisma.validator<Prisma.EventTypeSelect>()({
   afterEventBuffer: true,
   seatsPerTimeSlot: true,
   onlyShowFirstAvailableSlot: true,
-  alllowReschedulingPastBookings: true,
+  allowReschedulingPastBookings: true,
   seatsShowAttendees: true,
   seatsShowAvailabilityCount: true,
   scheduleId: true,
diff --git a/packages/lib/server/repository/eventType.ts b/packages/lib/server/repository/eventType.ts
index 21494452602c44..761f9da5f5db93 100644
--- a/packages/lib/server/repository/eventType.ts
+++ b/packages/lib/server/repository/eventType.ts
@@ -501,7 +501,7 @@ export class EventTypeRepository {
       onlyShowFirstAvailableSlot: true,
       durationLimits: true,
       assignAllTeamMembers: true,
-      alllowReschedulingPastBookings: true,
+      allowReschedulingPastBookings: true,
       assignRRMembersUsingSegment: true,
       rrSegmentQueryValue: true,
       isRRWeightsEnabled: true,
@@ -785,7 +785,7 @@ export class EventTypeRepository {
         periodStartDate: true,
         periodEndDate: true,
         onlyShowFirstAvailableSlot: true,
-        alllowReschedulingPastBookings: true,
+        allowReschedulingPastBookings: true,
         periodCountCalendarDays: true,
         rescheduleWithSameRoundRobinHost: true,
         periodDays: true,
diff --git a/packages/lib/test/builder.ts b/packages/lib/test/builder.ts
index b87ae4144123ad..9b64d8b419759c 100644
--- a/packages/lib/test/builder.ts
+++ b/packages/lib/test/builder.ts
@@ -144,7 +144,7 @@ export const buildEventType = (eventType?: Partial<EventType>): EventType => {
     rrSegmentQueryValue: null,
     autoTranslateDescriptionEnabled: false,
     useEventLevelSelectedCalendars: false,
-    alllowReschedulingPastBookings: false,
+    allowReschedulingPastBookings: false,
     ...eventType,
   };
 };
diff --git a/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts b/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts
index 93679feb5bed18..cb01a90f45de86 100644
--- a/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts
+++ b/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts
@@ -90,7 +90,7 @@ export const useEventTypeForm = ({
       requiresConfirmationForFreeEmail: eventType.requiresConfirmationForFreeEmail,
       slotInterval: eventType.slotInterval,
       minimumBookingNotice: eventType.minimumBookingNotice,
-      alllowReschedulingPastBookings: eventType.alllowReschedulingPastBookings,
+      allowReschedulingPastBookings: eventType.allowReschedulingPastBookings,
       metadata: eventType.metadata,
       hosts: eventType.hosts.sort((a, b) => sortHosts(a, b, eventType.isRRWeightsEnabled)),
       successRedirectUrl: eventType.successRedirectUrl || "",
diff --git a/packages/prisma/migrations/20241223163249_allow_rescheduling_past_booking_setting/migration.sql b/packages/prisma/migrations/20241223163249_allow_rescheduling_past_booking_setting/migration.sql
index 85ab99a11c5258..71384956ca4861 100644
--- a/packages/prisma/migrations/20241223163249_allow_rescheduling_past_booking_setting/migration.sql
+++ b/packages/prisma/migrations/20241223163249_allow_rescheduling_past_booking_setting/migration.sql
@@ -1,2 +1,2 @@
 -- AlterTable
-ALTER TABLE "EventType" ADD COLUMN     "alllowReschedulingPastBookings" BOOLEAN NOT NULL DEFAULT false;
+ALTER TABLE "EventType" ADD COLUMN     "allowReschedulingPastBookings" BOOLEAN NOT NULL DEFAULT false;
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index a678a2872054ca..63551e915458dd 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -160,7 +160,7 @@ model EventType {
   fieldTranslations                       EventTypeTranslation[]
   maxLeadThreshold                        Int?
   selectedCalendars                       SelectedCalendar[]
-  alllowReschedulingPastBookings          Boolean                   @default(false)
+  allowReschedulingPastBookings           Boolean                   @default(false)
 
   /// @zod.custom(imports.eventTypeColor)
   eventTypeColor                   Json?
diff --git a/packages/prisma/zod-utils.ts b/packages/prisma/zod-utils.ts
index d50b64276791fc..92fa6b8da49c54 100644
--- a/packages/prisma/zod-utils.ts
+++ b/packages/prisma/zod-utils.ts
@@ -739,7 +739,7 @@ export const allManagedEventTypeProps: { [k in keyof Omit<Prisma.EventTypeSelect
   assignAllTeamMembers: true,
   isRRWeightsEnabled: true,
   eventTypeColor: true,
-  alllowReschedulingPastBookings: true,
+  allowReschedulingPastBookings: true,
   rescheduleWithSameRoundRobinHost: true,
   maxLeadThreshold: true,
 };
diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
index 597cffc2bc19f1..e39edfe3ecf00d 100644
--- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts
+++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts
@@ -235,7 +235,7 @@ export async function getBookings({
         seatsShowAttendees: true,
         seatsShowAvailabilityCount: true,
         eventTypeColor: true,
-        alllowReschedulingPastBookings: true,
+        allowReschedulingPastBookings: true,
         schedulingType: true,
         length: true,
         team: {
diff --git a/packages/trpc/server/routers/viewer/slots/util.ts b/packages/trpc/server/routers/viewer/slots/util.ts
index 99c842bcc11451..6a067870d67663 100644
--- a/packages/trpc/server/routers/viewer/slots/util.ts
+++ b/packages/trpc/server/routers/viewer/slots/util.ts
@@ -769,7 +769,7 @@ async function getExistingBookings(
         seatsPerTimeSlot: true,
         requiresConfirmationWillBlockSlot: true,
         requiresConfirmation: true,
-        alllowReschedulingPastBookings: true,
+        allowReschedulingPastBookings: true,
       },
     },
     ...(!!eventType?.seatsPerTimeSlot && {