Merge pull request #232 from emrysal/change-email-sending-moments

pull/190/head^2
Bailey Pumfleet 2021-06-01 23:38:49 +01:00 committed by GitHub
commit 6e76cc386c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 10 deletions

View File

@ -135,7 +135,10 @@ const MicrosoftOffice365Calendar = (credential): CalendarApiAdapter => {
'Content-Type': 'application/json',
},
body: JSON.stringify(translateEvent(event))
}).then(handleErrors))
}).then(handleErrors).then( (responseBody) => ({
...responseBody,
disableConfirmationEmail: true,
})))
}
};
@ -228,14 +231,17 @@ const getBusyTimes = (withCredentials, dateFrom, dateTo) => Promise.all(
(results) => results.reduce( (acc, availability) => acc.concat(availability), [])
);
const createEvent = (credential, calEvent: CalendarEvent) => {
if (credential) {
return calendars([credential])[0].createEvent(calEvent);
}
// send email if no Calendar integration is found for now.
const createEvent = (credential, calEvent: CalendarEvent): Promise<any> => {
createNewEventEmail(
calEvent,
);
if (credential) {
return calendars([credential])[0].createEvent(calEvent);
}
return Promise.resolve({});
};
export { getBusyTimes, createEvent, CalendarEvent };

View File

@ -31,12 +31,13 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
]
};
// TODO: for now, first integration created; primary = obvious todo; ability to change primary.
const result = await createEvent(currentUser.credentials[0], evt);
createConfirmBookedEmail(
evt
);
if (!result.disableConfirmationEmail) {
createConfirmBookedEmail(
evt
);
}
res.status(200).json(result);
}