From 7bd45e7adacc2330400e86f0bbff40b347c841b7 Mon Sep 17 00:00:00 2001
From: ErickSkrauch <erickskrauch@yandex.ru>
Date: Mon, 15 Jun 2020 00:22:19 +0300
Subject: [PATCH] Improve file search algorithm

---
 config.js                        |  4 +---
 packages/scripts/i18n-crowdin.ts | 15 +++++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/config.js b/config.js
index e6b90a2..ff7ed81 100644
--- a/config.js
+++ b/config.js
@@ -1,8 +1,6 @@
 /* eslint-env node */
 /* eslint-disable @typescript-eslint/no-var-requires */
 
-const path = require('path');
-
 require('dotenv').config();
 
 const { env } = process;
@@ -17,7 +15,7 @@ module.exports = {
         projectId: 350687,
         filePath: 'accounts/site.json',
         sourceLang: 'en',
-        basePath: path.resolve(`${__dirname}/packages/app/i18n`),
+        basePath: `${__dirname}/packages/app/i18n`,
         minApproved: 80, // Minimal ready percent before translation can be published
     },
 };
diff --git a/packages/scripts/i18n-crowdin.ts b/packages/scripts/i18n-crowdin.ts
index 4e3af22..341f170 100644
--- a/packages/scripts/i18n-crowdin.ts
+++ b/packages/scripts/i18n-crowdin.ts
@@ -132,12 +132,19 @@ async function findFileId(filePath: string, branchId?: number): Promise<number |
         directoryId = (await findDirectoryId(dirPath, branchId)) || null;
     }
 
-    // We're receiving files list without branch filter until https://github.com/crowdin/crowdin-api-client-js/issues/63
-    // will be resolved. But right now it doesn't matter because for each branch directories will have its own ids,
-    // so if the file is stored into the some directory, algorithm will find correct file.
-    const { data: filesResponse } = await crowdin.sourceFilesApi.listProjectFiles(PROJECT_ID /*, branchId*/);
+    // When the branchId and directoryId aren't specified the list returned recursively,
+    // but if one of this param is specified, the list contains only the specified parent.
+    //
+    // Directories ids for each branch are different, so directoryId is already ensures
+    // that the file will be searched in the correct branch
+    const { data: filesResponse } = await crowdin.sourceFilesApi.listProjectFiles(
+        PROJECT_ID,
+        directoryId === null ? branchId : undefined,
+        directoryId || undefined, // directory ID can't be 0, but can be null
+    );
     const files = filesResponse.map((fileData) => fileData.data);
 
+    // Compare directoryId since when the file is placed in the root
     return files.find((file) => file.directoryId === directoryId && file.name === fileName)?.id;
 }