From c662c97d14dbe19dc3236a9ce61b6d1690318d0e Mon Sep 17 00:00:00 2001 From: nicolas Date: Fri, 18 Jun 2021 02:44:41 +0200 Subject: [PATCH] Refactored EventOwner to EventOrganizer --- lib/calendarClient.ts | 12 ++++++------ .../{EventOwnerMail.ts => EventOrganizerMail.ts} | 2 +- ...duledMail.ts => EventOrganizerRescheduledMail.ts} | 4 ++-- ...oEventOwnerMail.ts => VideoEventOrganizerMail.ts} | 4 ++-- lib/videoClient.ts | 12 ++++++------ 5 files changed, 17 insertions(+), 17 deletions(-) rename lib/emails/{EventOwnerMail.ts => EventOrganizerMail.ts} (98%) rename lib/emails/{EventOwnerRescheduledMail.ts => EventOrganizerRescheduledMail.ts} (93%) rename lib/emails/{VideoEventOwnerMail.ts => VideoEventOrganizerMail.ts} (87%) diff --git a/lib/calendarClient.ts b/lib/calendarClient.ts index 5e670a95..d6ca21ff 100644 --- a/lib/calendarClient.ts +++ b/lib/calendarClient.ts @@ -1,8 +1,8 @@ -import EventOwnerMail from "./emails/EventOwnerMail"; +import EventOrganizerMail from "./emails/EventOrganizerMail"; import EventAttendeeMail from "./emails/EventAttendeeMail"; import {v5 as uuidv5} from 'uuid'; import short from 'short-uuid'; -import EventOwnerRescheduledMail from "./emails/EventOwnerRescheduledMail"; +import EventOrganizerRescheduledMail from "./emails/EventOrganizerRescheduledMail"; import EventAttendeeRescheduledMail from "./emails/EventAttendeeRescheduledMail"; const translator = short(); @@ -336,9 +336,9 @@ const createEvent = async (credential, calEvent: CalendarEvent): Promise => const creationResult = credential ? await calendars([credential])[0].createEvent(calEvent) : null; - const ownerMail = new EventOwnerMail(calEvent, uid); + const organizerMail = new EventOrganizerMail(calEvent, uid); const attendeeMail = new EventAttendeeMail(calEvent, uid); - await ownerMail.sendEmail(); + await organizerMail.sendEmail(); if (!creationResult || !creationResult.disableConfirmationEmail) { await attendeeMail.sendEmail(); @@ -355,9 +355,9 @@ const updateEvent = async (credential, uidToUpdate: String, calEvent: CalendarEv const updateResult = credential ? await calendars([credential])[0].updateEvent(uidToUpdate, calEvent) : null; - const ownerMail = new EventOwnerRescheduledMail(calEvent, newUid); + const organizerMail = new EventOrganizerRescheduledMail(calEvent, newUid); const attendeeMail = new EventAttendeeRescheduledMail(calEvent, newUid); - await ownerMail.sendEmail(); + await organizerMail.sendEmail(); if (!updateResult || !updateResult.disableConfirmationEmail) { await attendeeMail.sendEmail(); diff --git a/lib/emails/EventOwnerMail.ts b/lib/emails/EventOrganizerMail.ts similarity index 98% rename from lib/emails/EventOwnerMail.ts rename to lib/emails/EventOrganizerMail.ts index 762a73be..0f671efa 100644 --- a/lib/emails/EventOwnerMail.ts +++ b/lib/emails/EventOrganizerMail.ts @@ -2,7 +2,7 @@ import {createEvent} from "ics"; import dayjs, {Dayjs} from "dayjs"; import EventMail from "./EventMail"; -export default class EventOwnerMail extends EventMail { +export default class EventOrganizerMail extends EventMail { /** * Returns the instance's event as an iCal event in string representation. * @protected diff --git a/lib/emails/EventOwnerRescheduledMail.ts b/lib/emails/EventOrganizerRescheduledMail.ts similarity index 93% rename from lib/emails/EventOwnerRescheduledMail.ts rename to lib/emails/EventOrganizerRescheduledMail.ts index 1b9ac9ca..7e67ac44 100644 --- a/lib/emails/EventOwnerRescheduledMail.ts +++ b/lib/emails/EventOrganizerRescheduledMail.ts @@ -1,7 +1,7 @@ import dayjs, {Dayjs} from "dayjs"; -import EventOwnerMail from "./EventOwnerMail"; +import EventOrganizerMail from "./EventOrganizerMail"; -export default class EventOwnerRescheduledMail extends EventOwnerMail { +export default class EventOrganizerRescheduledMail extends EventOrganizerMail { /** * Returns the email text as HTML representation. * diff --git a/lib/emails/VideoEventOwnerMail.ts b/lib/emails/VideoEventOrganizerMail.ts similarity index 87% rename from lib/emails/VideoEventOwnerMail.ts rename to lib/emails/VideoEventOrganizerMail.ts index 515f1231..60d85237 100644 --- a/lib/emails/VideoEventOwnerMail.ts +++ b/lib/emails/VideoEventOrganizerMail.ts @@ -1,9 +1,9 @@ import {CalendarEvent} from "../calendarClient"; -import EventOwnerMail from "./EventOwnerMail"; +import EventOrganizerMail from "./EventOrganizerMail"; import {VideoCallData} from "../videoClient"; import {getFormattedMeetingId, getIntegrationName} from "./helpers"; -export default class VideoEventOwnerMail extends EventOwnerMail { +export default class VideoEventOrganizerMail extends EventOrganizerMail { videoCallData: VideoCallData; constructor(calEvent: CalendarEvent, uid: string, videoCallData: VideoCallData) { diff --git a/lib/videoClient.ts b/lib/videoClient.ts index 6397f971..b359e83a 100644 --- a/lib/videoClient.ts +++ b/lib/videoClient.ts @@ -1,11 +1,11 @@ import prisma from "./prisma"; import {CalendarEvent} from "./calendarClient"; -import VideoEventOwnerMail from "./emails/VideoEventOwnerMail"; +import VideoEventOrganizerMail from "./emails/VideoEventOrganizerMail"; import VideoEventAttendeeMail from "./emails/VideoEventAttendeeMail"; import {v5 as uuidv5} from 'uuid'; import short from 'short-uuid'; import EventAttendeeRescheduledMail from "./emails/EventAttendeeRescheduledMail"; -import EventOwnerRescheduledMail from "./emails/EventOwnerRescheduledMail"; +import EventOrganizerRescheduledMail from "./emails/EventOrganizerRescheduledMail"; const translator = short(); @@ -191,9 +191,9 @@ const createMeeting = async (credential, calEvent: CalendarEvent): Promise url: creationResult.join_url, }; - const ownerMail = new VideoEventOwnerMail(calEvent, uid, videoCallData); + const organizerMail = new VideoEventOrganizerMail(calEvent, uid, videoCallData); const attendeeMail = new VideoEventAttendeeMail(calEvent, uid, videoCallData); - await ownerMail.sendEmail(); + await organizerMail.sendEmail(); if (!creationResult || !creationResult.disableConfirmationEmail) { await attendeeMail.sendEmail(); @@ -214,9 +214,9 @@ const updateMeeting = async (credential, uidToUpdate: String, calEvent: Calendar const updateResult = credential ? await videoIntegrations([credential])[0].updateMeeting(uidToUpdate, calEvent) : null; - const ownerMail = new EventOwnerRescheduledMail(calEvent, newUid); + const organizerMail = new EventOrganizerRescheduledMail(calEvent, newUid); const attendeeMail = new EventAttendeeRescheduledMail(calEvent, newUid); - await ownerMail.sendEmail(); + await organizerMail.sendEmail(); if (!updateResult || !updateResult.disableConfirmationEmail) { await attendeeMail.sendEmail();