fix(SeaTableTrigger Node): Fix timezone issues (#2726)

* SeaTable: Add timezone field to credentials, make trigger query timezone-aware * ⚡ replaced string input with options for timezone, small fixes * ⚡ small fixes Co-authored-by: Michael Kret <[email protected]>
n8n-io · Mar 13, 2022 · 2d8ac4b · 2d8ac4b
1 parent 3c5df3f
commit 2d8ac4b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 5 deletions.
diff --git a/packages/nodes-base/credentials/SeaTableApi.credentials.ts b/packages/nodes-base/credentials/SeaTableApi.credentials.ts
@@ -1,8 +1,17 @@
 import {
 	ICredentialType,
 	INodeProperties,
+	INodePropertyOptions,
 } from 'n8n-workflow';
 
+import * as moment from 'moment-timezone';
+
+// Get options for timezones
+const timezones: INodePropertyOptions[] = moment.tz.countries().reduce( (timezones: INodePropertyOptions[], country: string) => {
+	const zonesForCountry = moment.tz.zonesForCountry(country).map(zone => ({value: zone, name: zone}));
+	return timezones.concat(zonesForCountry);
+}, []);
+
 export class SeaTableApi implements ICredentialType {
 	name = 'seaTableApi';
 	displayName = 'SeaTable API';
@@ -44,5 +53,15 @@ export class SeaTableApi implements ICredentialType {
 			type: 'string',
 			default: '',
 		},
+		{
+			displayName: 'Timezone',
+			name: 'timezone',
+			type: 'options',
+			default: 'Europe/Berlin',
+			description: `Seatable server's timezone`,
+			options: [
+				...timezones,
+			],
+		},
 	];
 }
diff --git a/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.ts b/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.ts
@@ -3,6 +3,7 @@ import {
 } from 'n8n-core';
 
 import {
+	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
@@ -108,13 +109,12 @@ export class SeaTableTrigger implements INodeType {
 		const simple = this.getNodeParameter('simple') as boolean;
 		const event = this.getNodeParameter('event') as string;
 		const ctx: ICtx = {};
+		const credentials = await this.getCredentials('seaTableApi') as IDataObject;
 
+		const timezone = credentials.timezone as string || 'Europe/Berlin';
 		const now = moment().utc().format();
-
 		const startDate = webhookData.lastTimeChecked as string || now;
-
 		const endDate = now;
-
 		webhookData.lastTimeChecked = endDate;
 
 		let rows;
@@ -126,8 +126,15 @@ export class SeaTableTrigger implements INodeType {
 		if (this.getMode() === 'manual') {
 			rows = await seaTableApiRequest.call(this, ctx, 'POST', endpoint, { sql: `SELECT * FROM ${tableName} LIMIT 1` }) as IRowResponse;
 		} else {
-			rows = await seaTableApiRequest.call(this, ctx, 'POST', endpoint,
-				{ sql: `SELECT * FROM ${tableName} WHERE ${filterField} BETWEEN "${moment(startDate).utc().format('YYYY-MM-D HH:mm:ss')}" AND "${moment(endDate).utc().format('YYYY-MM-D HH:mm:ss')}"` }) as IRowResponse;
+			rows = (await seaTableApiRequest.call(this, ctx, 'POST', endpoint, {
+				sql: `SELECT * FROM ${tableName}
+					WHERE ${filterField} BETWEEN "${moment(startDate)
+					.tz(timezone)
+					.format('YYYY-MM-D HH:mm:ss')}"
+					AND "${moment(endDate)
+					.tz(timezone)
+					.format('YYYY-MM-D HH:mm:ss')}"`,
+			})) as IRowResponse;
 		}
 
 		let response;