Shorten logic for deciding when to ask for language

Let's only ask for the language when the language is not provided OR it's invalid.

Let's also add tests for these cases.

Author: elenatanasoiu

extensions/ql-vscode/src/databaseFetcher.ts

@@ -512,24 +512,18 @@ export async function convertGithubNwoToDatabaseUrl(
 
     const languages = response.data.map((db: any) => db.language);
 
-    if (language && languages.includes(language)) {
-      return {
-        databaseUrl: `https://api.github.com/repos/${owner}/${repo}/code-scanning/codeql/databases/${language}`,
-        owner,
-        name: repo,
-      };
-    } else {
-      const language = await promptForLanguage(languages, progress);
+    if (!language || !languages.includes(language)) {
+      language = await promptForLanguage(languages, progress);
       if (!language) {
         return;
       }
-
-      return {
-        databaseUrl: `https://api.github.com/repos/${owner}/${repo}/code-scanning/codeql/databases/${language}`,
-        owner,
-        name: repo,
-      };
     }
+
+    return {
+      databaseUrl: `https://api.github.com/repos/${owner}/${repo}/code-scanning/codeql/databases/${language}`,
+      owner,
+      name: repo,
+    };
   } catch (e) {
     void extLogger.log(`Error: ${getErrorMessage(e)}`);
     throw new Error(`Unable to get database for '${nwo}'`);

extensions/ql-vscode/test/vscode-tests/no-workspace/databaseFetcher.test.ts

@@ -23,55 +23,56 @@ describe("databaseFetcher", () => {
       request: mockRequest,
     } as unknown as Octokit.Octokit;
 
+    // We can't make the real octokit request (since we need credentials), so we mock the response.
+    const successfullMockApiResponse = {
+      data: [
+        {
+          id: 1495869,
+          name: "csharp-database",
+          language: "csharp",
+          uploader: {},
+          content_type: "application/zip",
+          state: "uploaded",
+          size: 55599715,
+          created_at: "2022-03-24T10:46:24Z",
+          updated_at: "2022-03-24T10:46:27Z",
+          url: "https://api.github.com/repositories/143040428/code-scanning/codeql/databases/csharp",
+        },
+        {
+          id: 1100671,
+          name: "database.zip",
+          language: "javascript",
+          uploader: {},
+          content_type: "application/zip",
+          state: "uploaded",
+          size: 29294434,
+          created_at: "2022-03-01T16:00:04Z",
+          updated_at: "2022-03-01T16:00:06Z",
+          url: "https://api.github.com/repositories/143040428/code-scanning/codeql/databases/javascript",
+        },
+        {
+          id: 648738,
+          name: "ql-database",
+          language: "ql",
+          uploader: {},
+          content_type: "application/json; charset=utf-8",
+          state: "uploaded",
+          size: 39735500,
+          created_at: "2022-02-02T09:38:50Z",
+          updated_at: "2022-02-02T09:38:51Z",
+          url: "https://api.github.com/repositories/143040428/code-scanning/codeql/databases/ql",
+        },
+      ],
+    };
+
     beforeEach(() => {
       quickPickSpy = jest
         .spyOn(window, "showQuickPick")
         .mockResolvedValue(undefined);
     });
 
     it("should convert a GitHub nwo to a database url", async () => {
-      // We can't make the real octokit request (since we need credentials), so we mock the response.
-      const mockApiResponse = {
-        data: [
-          {
-            id: 1495869,
-            name: "csharp-database",
-            language: "csharp",
-            uploader: {},
-            content_type: "application/zip",
-            state: "uploaded",
-            size: 55599715,
-            created_at: "2022-03-24T10:46:24Z",
-            updated_at: "2022-03-24T10:46:27Z",
-            url: "https://api.github.com/repositories/143040428/code-scanning/codeql/databases/csharp",
-          },
-          {
-            id: 1100671,
-            name: "database.zip",
-            language: "javascript",
-            uploader: {},
-            content_type: "application/zip",
-            state: "uploaded",
-            size: 29294434,
-            created_at: "2022-03-01T16:00:04Z",
-            updated_at: "2022-03-01T16:00:06Z",
-            url: "https://api.github.com/repositories/143040428/code-scanning/codeql/databases/javascript",
-          },
-          {
-            id: 648738,
-            name: "ql-database",
-            language: "ql",
-            uploader: {},
-            content_type: "application/json; charset=utf-8",
-            state: "uploaded",
-            size: 39735500,
-            created_at: "2022-02-02T09:38:50Z",
-            updated_at: "2022-02-02T09:38:51Z",
-            url: "https://api.github.com/repositories/143040428/code-scanning/codeql/databases/ql",
-          },
-        ],
-      };
-      mockRequest.mockResolvedValue(mockApiResponse);
+      mockRequest.mockResolvedValue(successfullMockApiResponse);
       quickPickSpy.mockResolvedValue(mockedQuickPickItem("javascript"));
       const githubRepo = "github/codeql";
       const result = await convertGithubNwoToDatabaseUrl(
@@ -127,6 +128,45 @@ describe("databaseFetcher", () => {
       ).rejects.toThrow(/Unable to get database/);
       expect(progressSpy).toBeCalledTimes(1);
     });
+
+    describe("when language is already provided", () => {
+      describe("when language is valid", () => {
+        it("should not prompt the user", async () => {
+          mockRequest.mockResolvedValue(successfullMockApiResponse);
+          const githubRepo = "github/codeql";
+          await convertGithubNwoToDatabaseUrl(
+            githubRepo,
+            octokit,
+            progressSpy,
+            "javascript",
+          );
+          expect(quickPickSpy).not.toHaveBeenCalled();
+        });
+      });
+
+      describe("when language is invalid", () => {
+        it("should prompt for language", async () => {
+          mockRequest.mockResolvedValue(successfullMockApiResponse);
+          const githubRepo = "github/codeql";
+          await convertGithubNwoToDatabaseUrl(
+            githubRepo,
+            octokit,
+            progressSpy,
+            "invalid-language",
+          );
+          expect(quickPickSpy).toHaveBeenCalled();
+        });
+      });
+    });
+
+    describe("when language is not provided", () => {
+      it("should prompt for language", async () => {
+        mockRequest.mockResolvedValue(successfullMockApiResponse);
+        const githubRepo = "github/codeql";
+        await convertGithubNwoToDatabaseUrl(githubRepo, octokit, progressSpy);
+        expect(quickPickSpy).toHaveBeenCalled();
+      });
+    });
   });
 
   describe("findDirWithFile", () => {