fix: use DAL, fix order for regex

Signed-off-by: Umberto Sgueglia <usgueglia@contractor.linuxfoundation.org>

Author: ulemons

services/apps/automatic_projects_discovery_worker/src/sources/insights-discussions/source.ts

@@ -101,8 +101,8 @@ function extractRepoUrls(text: string): string[] {
   while ((match = regex.exec(text)) !== null) {
     const owner = match[1].toLowerCase()
     const repo = match[2]
-      .replace(/\.git$/, '')
       .replace(/[.,;:!?]+$/, '')
+      .replace(/\.git$/, '')
       .toLowerCase()
     if (owner && repo && !GITHUB_NON_REPO_OWNERS.has(owner)) {
       urls.add(`https://github.com/${owner}/${repo}`)

services/apps/automatic_projects_discovery_worker/src/sources/types.ts

@@ -1,5 +1,7 @@
 import { Readable } from 'stream'
 
+import { ProjectCatalogAction } from '@crowd/data-access-layer/src/project-catalog/types'
+
 export interface IDatasetDescriptor {
   id: string
   date: string
@@ -22,6 +24,6 @@ export interface IDiscoverySourceRow {
   projectSlug: string
   repoName: string
   repoUrl: string
-  action?: 'auto' | 'evaluate' | 'onboard' | 'unsure'
+  action?: ProjectCatalogAction
   lfCriticalityScore?: number
 }

services/libs/data-access-layer/src/project-catalog/projectCatalog.ts

@@ -216,7 +216,11 @@ export async function upsertProjectCatalog(
       "projectSlug" = EXCLUDED."projectSlug",
       "repoName" = EXCLUDED."repoName",
       "source" = COALESCE(EXCLUDED."source", "projectCatalog"."source"),
-      "action" = CASE WHEN EXCLUDED.action = 'evaluate' THEN 'evaluate' ELSE "projectCatalog"."action" END,
+      "action" = CASE
+        WHEN "projectCatalog"."action" IN ('onboard', 'unsure') THEN "projectCatalog"."action"
+        WHEN EXCLUDED.action = 'evaluate' THEN 'evaluate'
+        ELSE "projectCatalog"."action"
+      END,
       "lfCriticalityScore" = COALESCE(EXCLUDED."lfCriticalityScore", "projectCatalog"."lfCriticalityScore"),
       "updatedAt" = NOW(),
       "syncedAt" = NOW()
@@ -285,7 +289,11 @@ export async function bulkUpsertProjectCatalog(
       "projectSlug" = EXCLUDED."projectSlug",
       "repoName" = EXCLUDED."repoName",
       "source" = COALESCE(EXCLUDED."source", "projectCatalog"."source"),
-      "action" = CASE WHEN EXCLUDED.action = 'evaluate' THEN 'evaluate' ELSE "projectCatalog"."action" END,
+      "action" = CASE
+        WHEN "projectCatalog"."action" IN ('onboard', 'unsure') THEN "projectCatalog"."action"
+        WHEN EXCLUDED.action = 'evaluate' THEN 'evaluate'
+        ELSE "projectCatalog"."action"
+      END,
       "lfCriticalityScore" = COALESCE(EXCLUDED."lfCriticalityScore", "projectCatalog"."lfCriticalityScore"),
       "updatedAt" = NOW(),
       "syncedAt" = NOW()

services/libs/data-access-layer/src/project-catalog/types.ts

@@ -1,10 +1,12 @@
+export type ProjectCatalogAction = 'auto' | 'evaluate' | 'onboard' | 'unsure'
+
 export interface IDbProjectCatalog {
   id: string
   projectSlug: string
   repoName: string
   repoUrl: string
   source: string | null
-  action: string
+  action: ProjectCatalogAction
   lfCriticalityScore: number | null
   evaluatedAt: string | null
   onboardedAt: string | null
@@ -23,7 +25,7 @@ export type IDbProjectCatalogCreate = Omit<
   'source' | 'action' | 'lfCriticalityScore'
 > & {
   source?: string | null
-  action?: string
+  action?: ProjectCatalogAction
   lfCriticalityScore?: number
 }