Skip to content

Commit

Permalink
fix(GoogleCalendar Node): Fix timezone
Browse files Browse the repository at this point in the history 
* Fix timezone in google calendar

* change timezone additionalFields variable name in Google.Calendar.nodes.ts
  from timeZone to timezone
* add timezone information to formated code

Signed-off-by: 5pecia1 <pdpxpd@gmail.com>

* ⚡ nodelinter fixes

* 🔨 fixes for incorrect timezonez

Co-authored-by: michael-radency <michael.k@radency.com>
  • Loading branch information
@5pecia1 @michael-radency
5pecia1 and michael-radency authored Mar 13, 2022
1 parent e8500e6 commit 3c5df3f
Showing 1 changed file with 43 additions and 31 deletions.
74 changes: 43 additions & 31 deletions packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
INodePropertyOptions,
INodeType,
INodeTypeDescription,
JsonObject,
NodeApiError,
NodeOperationError,
} from 'n8n-workflow';
Expand All @@ -35,6 +36,7 @@ import {
import * as moment from 'moment-timezone';

import { v4 as uuid } from 'uuid';
import { moveMessagePortToContext } from 'worker_threads';

export class GoogleCalendar implements INodeType {
description: INodeTypeDescription = {
Expand All @@ -61,6 +63,7 @@ export class GoogleCalendar implements INodeType {
displayName: 'Resource',
name: 'resource',
type: 'options',
noDataExpression: true,
options: [
{
name: 'Calendar',
Expand All @@ -72,7 +75,7 @@ export class GoogleCalendar implements INodeType {
},
],
default: 'event',
description: 'The resource to operate on.',
description: 'The resource to operate on',
},
...calendarOperations,
...calendarFields,
Expand Down Expand Up @@ -183,16 +186,16 @@ export class GoogleCalendar implements INodeType {
if (resource === 'calendar') {
//https://developers.google.com/calendar/v3/reference/freebusy/query
if (operation === 'availability') {
const timezone = this.getTimezone();
const timezone = moment.tz.guess();
const calendarId = this.getNodeParameter('calendar', i) as string;
const timeMin = this.getNodeParameter('timeMin', i) as string;
const timeMax = this.getNodeParameter('timeMax', i) as string;
const options = this.getNodeParameter('options', i) as IDataObject;
const outputFormat = options.outputFormat || 'availability';

const body: IDataObject = {
timeMin: moment.tz(timeMin, timezone).utc().format(),
timeMax: moment.tz(timeMax, timezone).utc().format(),
timeMin: options.timezone ? moment.tz(timeMin, options.timezone as string).utc(true).format() : timeMin,
timeMax: options.timezone ? moment.tz(timeMax, options.timezone as string).utc(true).format() : timeMax,
items: [
{
id: calendarId,
Expand Down Expand Up @@ -237,6 +240,8 @@ export class GoogleCalendar implements INodeType {
'additionalFields',
i,
) as IDataObject;
const timezone = (additionalFields.timezone as string);

if (additionalFields.maxAttendees) {
qs.maxAttendees = additionalFields.maxAttendees as number;
}
Expand All @@ -248,12 +253,12 @@ export class GoogleCalendar implements INodeType {
}
const body: IEvent = {
start: {
dateTime: start,
timeZone: additionalFields.timeZone || this.getTimezone(),
dateTime: timezone ? moment.tz(start, timezone).utc(true).format() : start,
timeZone: timezone || moment.tz.guess(),
},
end: {
dateTime: end,
timeZone: additionalFields.timeZone || this.getTimezone(),
dateTime: timezone ? moment.tz(end, timezone).utc(true).format() : end,
timeZone: timezone || moment.tz.guess(),
},
};
if (additionalFields.attendees) {
Expand Down Expand Up @@ -304,16 +309,17 @@ export class GoogleCalendar implements INodeType {
body.reminders.overrides = reminders;
}
}

if (additionalFields.allday) {
body.start = {
date: moment(start)
.utc()
.format('YYYY-MM-DD'),
date: timezone ?
moment.tz(start, timezone).utc(true).format('YYYY-MM-DD') :
moment.tz(start, moment.tz.guess()).utc(true).format('YYYY-MM-DD'),
};
body.end = {
date: moment(end)
.utc()
.format('YYYY-MM-DD'),
date: timezone ?
moment.tz(end, timezone).utc(true).format('YYYY-MM-DD') :
moment.tz(end, moment.tz.guess()).utc(true).format('YYYY-MM-DD'),
};
}
//exampel: RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=10;UNTIL=20110701T170000Z
Expand Down Expand Up @@ -341,10 +347,12 @@ export class GoogleCalendar implements INodeType {
);
}
if (additionalFields.repeatUntil) {
const repeatUntil = timezone ?
moment.tz(additionalFields.repeatUntil as string, timezone).utc(true).format('YYYYMMDDTHHmmss') :
moment(additionalFields.repeatUntil as string).utc().format('YYYYMMDDTHHmmss');

body.recurrence?.push(
`UNTIL=${moment(additionalFields.repeatUntil as string)
.utc()
.format('YYYYMMDDTHHmmss')}Z`,
`UNTIL=${repeatUntil}Z`,
);
}
if (body.recurrence.length !== 0) {
Expand Down Expand Up @@ -482,6 +490,8 @@ export class GoogleCalendar implements INodeType {
'updateFields',
i,
) as IDataObject;
const timezone = (updateFields.timezone as string);

if (updateFields.maxAttendees) {
qs.maxAttendees = updateFields.maxAttendees as number;
}
Expand All @@ -494,14 +504,14 @@ export class GoogleCalendar implements INodeType {
const body: IEvent = {};
if (updateFields.start) {
body.start = {
dateTime: updateFields.start,
timeZone: updateFields.timeZone || this.getTimezone(),
dateTime: timezone ? moment.tz(updateFields.start as string, timezone).utc(true).format() : updateFields.start as string,
timeZone: timezone || moment.tz.guess(),
};
}
if (updateFields.end) {
body.end = {
dateTime: updateFields.end,
timeZone: updateFields.timeZone || this.getTimezone(),
dateTime: timezone ? moment.tz(updateFields.end as string, timezone).utc(true).format() : updateFields.end as string,
timeZone: timezone || moment.tz.guess(),
};
}
if (updateFields.attendees) {
Expand Down Expand Up @@ -554,14 +564,14 @@ export class GoogleCalendar implements INodeType {
}
if (updateFields.allday && updateFields.start && updateFields.end) {
body.start = {
date: moment(updateFields.start as string)
.utc()
.format('YYYY-MM-DD'),
date: timezone ?
moment.tz(updateFields.start, timezone).utc(true).format('YYYY-MM-DD') :
moment.tz(updateFields.start, moment.tz.guess()).utc(true).format('YYYY-MM-DD'),
};
body.end = {
date: moment(updateFields.end as string)
.utc()
.format('YYYY-MM-DD'),
date: timezone ?
moment.tz(updateFields.end, timezone).utc(true).format('YYYY-MM-DD') :
moment.tz(updateFields.end, moment.tz.guess()).utc(true).format('YYYY-MM-DD'),
};
}
//exampel: RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=10;UNTIL=20110701T170000Z
Expand All @@ -584,10 +594,12 @@ export class GoogleCalendar implements INodeType {
body.recurrence?.push(`COUNT=${updateFields.repeatHowManyTimes};`);
}
if (updateFields.repeatUntil) {
const repeatUntil = timezone ?
moment.tz(updateFields.repeatUntil as string, timezone).utc(true).format('YYYYMMDDTHHmmss') :
moment(updateFields.repeatUntil as string).utc().format('YYYYMMDDTHHmmss');

body.recurrence?.push(
`UNTIL=${moment(updateFields.repeatUntil as string)
.utc()
.format('YYYYMMDDTHHmmss')}Z`,
`UNTIL=${repeatUntil}Z`,
);
}
if (body.recurrence.length !== 0) {
Expand Down Expand Up @@ -618,7 +630,7 @@ export class GoogleCalendar implements INodeType {
// Return the actual reason as error
returnData.push(
{
error: error.message,
error: (error as JsonObject).message,
},
);
continue;
Expand Down

0 comments on commit 3c5df3f

Please sign in to comment.