fix(bulk-import): improve repository import logic to handle catalog URL instead of substrings

Signed-off-by: Dominik Augustín <daugusti@redhat.com>

Author: dom-aug

workspaces/bulk-import/plugins/bulk-import-backend/src/service/handlers/repository/repositories.ts

@@ -20,6 +20,7 @@ import type { Config } from '@backstage/config';
 import gitUrlParse from 'git-url-parse';
 
 import { CatalogHttpClient } from '../../../catalog/catalogHttpClient';
+import { getCatalogUrl } from '../../../catalog/catalogUtils';
 import type { Components } from '../../../generated/openapi';
 import type {
   GithubApiService,
@@ -64,19 +65,35 @@ export async function findAllRepositories(
       deps.gitApiService.getRepositoriesFromIntegrations(search, pageSize),
     ]);
 
-  const alreadyImportedRepositoriesLocationTargets = Array.from(
-    new Set(alreadyImportedRepositories.uniqueCatalogUrlLocations.keys()),
+  const alreadyImportedRepositoriesLocationTargets = new Set(
+    alreadyImportedRepositories.uniqueCatalogUrlLocations.keys(),
   );
 
   const { repositories: allRepositories, errors } = allRepositoriesResponse;
 
   const notImportedYetRepositories = allRepositories.filter(repo => {
-    const html_urlWithSlash = repo.html_url.concat('/');
-
-    const alreadyImported = alreadyImportedRepositoriesLocationTargets.some(
-      target => target.startsWith(html_urlWithSlash),
+    const catalogUrl = getCatalogUrl(
+      deps.config,
+      repo.html_url.replace(/\/$/, ''),
+      repo.default_branch,
     );
 
+    let alreadyImported =
+      alreadyImportedRepositoriesLocationTargets.has(catalogUrl);
+
+    if (!alreadyImported) {
+      // Workaround: when a GitHub repository is imported via Backstage, the
+      // resulting registered catalog location may use a '/tree/' URL for the
+      // target instead of the '/blob/' URL format returned by getCatalogUrl.
+      // To correctly detect already-imported repositories regardless of which
+      // format was persisted, the '/tree/' variant is also checked here.
+      // This branch can be removed once catalog locations are consistently
+      // stored using the same '/blob/' format as getCatalogUrl returns.
+      alreadyImported = alreadyImportedRepositoriesLocationTargets.has(
+        catalogUrl.replace('/blob/', '/tree/'),
+      );
+    }
+
     return !alreadyImported;
   });