Skip to content

Commit b42cf6e

Browse files
committed
Update calls.js
1 parent 7d989e1 commit b42cf6e

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

src/utils/api/calls.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ exports.sendEmail = async function sendEmail(toEmail, email, subject, content) {
3737
};
3838

3939
exports.getEvents = async function getEvents(pageToken = null, allEvents = []) {
40-
let url = `https://www.googleapis.com/calendar/v3/calendars/${CALENDAR_ID}/events?maxResults=50&key=${CALENDAR_API_KEY}`;
41-
if (pageToken) {
42-
url += `&pageToken=${pageToken}`;
43-
}
44-
const { data } = await axios.get(url);
45-
const events = [];
46-
data.items
40+
let url = `https://www.googleapis.com/calendar/v3/calendars/${CALENDAR_ID}/events?maxResults=50&key=${CALENDAR_API_KEY}`;
41+
if (pageToken) {
42+
url += `&pageToken=${pageToken}`;
43+
}
44+
const { data } = await axios.get(url);
45+
const events = [];
46+
data.items
4747
.filter((obj) => obj?.start?.date || obj?.start?.dateTime)
4848
.forEach((obj) => {
4949
renameKey(obj.start, 'dateTime', 'date');
@@ -56,11 +56,10 @@ exports.getEvents = async function getEvents(pageToken = null, allEvents = []) {
5656
});
5757
});
5858
allEvents.push(...events);
59-
if (data.nextPageToken) {
60-
return getEvents(data.nextPageToken, allEvents);
61-
} else {
62-
return { "events": _.sortBy(allEvents, (o) => moment(o.start)) };
63-
}
59+
if (data.nextPageToken) {
60+
return getEvents(data.nextPageToken, allEvents);
61+
}
62+
return { events: _.sortBy(allEvents, (o) => moment(o.start)) };
6463
};
6564

6665
exports.checkRecaptcha = async function checkRecaptcha(recaptchaToken) {

0 commit comments

Comments
 (0)