From 8e956893caa51370fb91c961a560a1141ce3b8bf Mon Sep 17 00:00:00 2001
From: alannnc <alannnc@gmail.com>
Date: Thu, 28 Apr 2022 09:05:29 -0600
Subject: [PATCH] Fix emails and cal event descriptions (#2634)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 apps/web/pages/api/book/request-reschedule.ts    | 8 --------
 apps/web/pages/cancel/[uid].tsx                  | 4 ++--
 packages/core/builders/CalendarEvent/builder.ts  | 6 ++++++
 packages/core/builders/CalendarEvent/class.ts    | 1 +
 packages/core/builders/CalendarEvent/director.ts | 2 ++
 packages/lib/CalEventParser.ts                   | 6 ++++++
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/apps/web/pages/api/book/request-reschedule.ts b/apps/web/pages/api/book/request-reschedule.ts
index 0c321678..a4c96646 100644
--- a/apps/web/pages/api/book/request-reschedule.ts
+++ b/apps/web/pages/api/book/request-reschedule.ts
@@ -174,14 +174,6 @@ const handler = async (
         }
       });
 
-      // Creating cancelled event as placeholders in calendars, remove when virtual calendar handles it
-      const eventManager = new EventManager({
-        credentials: userOwner.credentials,
-        destinationCalendar: userOwner.destinationCalendar,
-      });
-      builder.calendarEvent.title = `Cancelled: ${builder.calendarEvent.title}`;
-      await eventManager.updateAndSetCancelledPlaceholder(builder.calendarEvent, bookingToReschedule);
-
       // Send emails
       await sendRequestRescheduleEmail(builder.calendarEvent, {
         rescheduleLink: builder.rescheduleLink,
diff --git a/apps/web/pages/cancel/[uid].tsx b/apps/web/pages/cancel/[uid].tsx
index 538d81f6..3f64966e 100644
--- a/apps/web/pages/cancel/[uid].tsx
+++ b/apps/web/pages/cancel/[uid].tsx
@@ -101,8 +101,8 @@ export default function Type(props: inferSSRProps<typeof getServerSideProps>) {
                           className="mb-5 sm:mb-6"
                         />
                         <div className="space-x-2 text-center rtl:space-x-reverse">
-                          <Button color="secondary" onClick={() => router.back()}>
-                            {t("back_to_bookings")}
+                          <Button color="secondary" onClick={() => router.push("/reschedule/" + uid)}>
+                            {t("reschedule_this")}
                           </Button>
                           <Button
                             data-testid="cancel"
diff --git a/packages/core/builders/CalendarEvent/builder.ts b/packages/core/builders/CalendarEvent/builder.ts
index d6ff8108..11c55cdc 100644
--- a/packages/core/builders/CalendarEvent/builder.ts
+++ b/packages/core/builders/CalendarEvent/builder.ts
@@ -5,6 +5,7 @@ import { v5 as uuidv5 } from "uuid";
 
 import { getTranslation } from "@calcom/lib/server/i18n";
 import prisma from "@calcom/prisma";
+import { CalendarEvent } from "@calcom/types/Calendar";
 
 import { CalendarEventClass } from "./class";
 
@@ -124,6 +125,7 @@ export class CalendarEventBuilder implements ICalendarEventBuilder {
               slug: true,
             },
           },
+          description: true,
           slug: true,
           teamId: true,
           title: true,
@@ -263,6 +265,10 @@ export class CalendarEventBuilder implements ICalendarEventBuilder {
     this.calendarEvent.description = description;
   }
 
+  public setNotes(notes: CalendarEvent["additionalNotes"]) {
+    this.calendarEvent.additionalNotes = notes;
+  }
+
   public setCancellationReason(cancellationReason: CalendarEventClass["cancellationReason"]) {
     this.calendarEvent.cancellationReason = cancellationReason;
   }
diff --git a/packages/core/builders/CalendarEvent/class.ts b/packages/core/builders/CalendarEvent/class.ts
index d433bda2..29e8b963 100644
--- a/packages/core/builders/CalendarEvent/class.ts
+++ b/packages/core/builders/CalendarEvent/class.ts
@@ -21,6 +21,7 @@ class CalendarEventClass implements CalendarEvent {
   cancellationReason?: string | null;
   rejectionReason?: string | null;
   hideCalendarNotes?: boolean;
+  additionalNotes?: string | null | undefined;
 
   constructor(initProps?: CalendarEvent) {
     // If more parameters are given we update this
diff --git a/packages/core/builders/CalendarEvent/director.ts b/packages/core/builders/CalendarEvent/director.ts
index 0eda82f9..b33311b8 100644
--- a/packages/core/builders/CalendarEvent/director.ts
+++ b/packages/core/builders/CalendarEvent/director.ts
@@ -27,6 +27,8 @@ export class CalendarEventDirector {
       this.builder.setLocation(this.existingBooking.location);
       this.builder.setUId(this.existingBooking.uid);
       this.builder.setCancellationReason(this.cancellationReason);
+      this.builder.setDescription(this.builder.eventType.description);
+      this.builder.setNotes(this.existingBooking.description);
       this.builder.buildRescheduleLink(this.existingBooking.uid);
     } else {
       throw new Error("buildForRescheduleEmail.missing.params.required");
diff --git a/packages/lib/CalEventParser.ts b/packages/lib/CalEventParser.ts
index 888a3748..69b9d14b 100644
--- a/packages/lib/CalEventParser.ts
+++ b/packages/lib/CalEventParser.ts
@@ -46,6 +46,9 @@ ${organizer + attendees}
 };
 
 export const getAdditionalNotes = (calEvent: CalendarEvent) => {
+  if (!calEvent.additionalNotes) {
+    return "";
+  }
   return `
 ${calEvent.organizer.language.translate("additional_notes")}:
 ${calEvent.additionalNotes}
@@ -53,6 +56,9 @@ ${calEvent.additionalNotes}
 };
 
 export const getDescription = (calEvent: CalendarEvent) => {
+  if (!calEvent.description) {
+    return "";
+  }
   return `\n${calEvent.attendees[0].language.translate("description")}
     ${calEvent.description}
     `;