From fdc95aeee08409ff2b89ccdaa8c0b0bd22013215 Mon Sep 17 00:00:00 2001 From: Dmitriy_Kravchenko Date: Tue, 20 Oct 2026 16:03:55 +0300 Subject: [PATCH] Refactor getAllExecutorNames function to accept sourceSheet as a parameter, ensuring proper data retrieval and enhancing error handling for empty sheets in completed tasks report. --- src/reports/completed/main.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/reports/completed/main.ts b/src/reports/completed/main.ts index 0c35e4d..22e64f3 100644 --- a/src/reports/completed/main.ts +++ b/src/reports/completed/main.ts @@ -74,8 +74,9 @@ function findSingleTodayReport(prefix: string) { return found[0]; } -function getAllExecutorNames(): any[] { - const sourceSheet = getSourceSheet(); +function getAllExecutorNames(sourceSheet: GoogleAppsScript.Spreadsheet.Sheet): any[] { + if (!sourceSheet) return []; + const dataRange = sourceSheet.getDataRange(); const sourceSheetHeader = sourceSheet.getRange(1, 1, 1, dataRange.getNumColumns()).getValues()[0]; const executorColumnIndex = sourceSheetHeader.indexOf('Исполнитель'); @@ -125,7 +126,7 @@ function loadCompletedTasks(afterDate: Date) { throw new Error('На листе выгрузки завершенных задач не найдены колонки: ' + missingColumns.join(', ')); } - const performerNames = getAllExecutorNames().map(name => String(name ?? '').trim()).filter(Boolean); + const performerNames = getAllExecutorNames(sheet).map(name => String(name ?? '').trim()).filter(Boolean); const result = new Map(); performerNames.forEach(name => result.set(name, []));