From d885daa6a1948c3b633e1fc0b36cf73d761522c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 26 Oct 2023 11:33:11 +0200
Subject: [PATCH] refactor(Google Sheets Node): Prevent reporting to Sentry
 failure to find spreadsheet (no-changelog) (#7518)

To silence this very frequently reported error:
https://n8nio.sentry.io/issues/3823103947/?project=4503924908883968&query=&referrer=issue-stream&statsPeriod=90d&stream_index=0
---
 .../nodes/Google/Sheet/v2/actions/router.ts           |  6 +++++-
 .../Google/Sheet/v2/helpers/GoogleSheets.utils.ts     | 11 +++++++++--
 .../nodes/Google/Sheet/v2/methods/listSearch.ts       |  2 +-
 .../nodes/Google/Sheet/v2/methods/loadOptions.ts      |  4 ++--
 .../nodes/Google/Sheet/v2/methods/resourceMapping.ts  |  2 +-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts
index 70432adf01..c35ccaca3b 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts
@@ -20,7 +20,11 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 		let results: INodeExecutionData[] | undefined;
 		if (googleSheets.resource === 'sheet') {
 			const { mode, value } = this.getNodeParameter('documentId', 0) as IDataObject;
-			const spreadsheetId = getSpreadsheetId(mode as ResourceLocator, value as string);
+			const spreadsheetId = getSpreadsheetId(
+				this.getNode(),
+				mode as ResourceLocator,
+				value as string,
+			);
 
 			const googleSheet = new GoogleSheet(spreadsheetId, this);
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts
index bea92aa442..c7869fc7c0 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeListSearchItems,
 	INodePropertyOptions,
+	INode,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 import type { GoogleSheet } from './GoogleSheet';
@@ -18,10 +19,16 @@ import { ResourceLocatorUiNames, ROW_NUMBER } from './GoogleSheets.types';
 export const untilSheetSelected = { sheetName: [''] };
 
 // Used to extract the ID from the URL
-export function getSpreadsheetId(documentIdType: ResourceLocator, value: string): string {
+export function getSpreadsheetId(
+	node: INode,
+	documentIdType: ResourceLocator,
+	value: string,
+): string {
 	if (!value) {
-		throw new Error(
+		throw new NodeOperationError(
+			node,
 			`Can not get sheet '${ResourceLocatorUiNames[documentIdType]}' with a value of '${value}'`,
+			{ severity: 'warning' },
 		);
 	}
 	if (documentIdType === 'url') {
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Google/Sheet/v2/methods/listSearch.ts
index 60fb036ad7..ad6d15e6c7 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/methods/listSearch.ts
@@ -52,7 +52,7 @@ export async function sheetsSearch(
 	_filter?: string,
 ): Promise<INodeListSearchResult> {
 	const { mode, value } = this.getNodeParameter('documentId', 0) as IDataObject;
-	const spreadsheetId = getSpreadsheetId(mode as ResourceLocator, value as string);
+	const spreadsheetId = getSpreadsheetId(this.getNode(), mode as ResourceLocator, value as string);
 
 	const query = {
 		fields: 'sheets.properties',
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Google/Sheet/v2/methods/loadOptions.ts
index b9fe07f9f4..4c9611de7d 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/methods/loadOptions.ts
@@ -6,7 +6,7 @@ import type { ResourceLocator } from '../helpers/GoogleSheets.types';
 
 export async function getSheets(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 	const { mode, value } = this.getNodeParameter('documentId', 0) as IDataObject;
-	const spreadsheetId = getSpreadsheetId(mode as ResourceLocator, value as string);
+	const spreadsheetId = getSpreadsheetId(this.getNode(), mode as ResourceLocator, value as string);
 
 	const sheet = new GoogleSheet(spreadsheetId, this);
 	const responseData = await sheet.spreadsheetGetSheets();
@@ -34,7 +34,7 @@ export async function getSheetHeaderRow(
 	this: ILoadOptionsFunctions,
 ): Promise<INodePropertyOptions[]> {
 	const { mode, value } = this.getNodeParameter('documentId', 0) as IDataObject;
-	const spreadsheetId = getSpreadsheetId(mode as ResourceLocator, value as string);
+	const spreadsheetId = getSpreadsheetId(this.getNode(), mode as ResourceLocator, value as string);
 
 	const sheet = new GoogleSheet(spreadsheetId, this);
 	let sheetWithinDocument = this.getNodeParameter('sheetName', undefined, {
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts b/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts
index 11c7ed8bb2..d28676493e 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts
@@ -12,7 +12,7 @@ export async function getMappingColumns(
 	this: ILoadOptionsFunctions,
 ): Promise<ResourceMapperFields> {
 	const { mode, value } = this.getNodeParameter('documentId', 0) as IDataObject;
-	const spreadsheetId = getSpreadsheetId(mode as ResourceLocator, value as string);
+	const spreadsheetId = getSpreadsheetId(this.getNode(), mode as ResourceLocator, value as string);
 
 	const sheet = new GoogleSheet(spreadsheetId, this);
 	let sheetWithinDocument = this.getNodeParameter('sheetName', undefined, {