fix: add logic on insights repo on code level, remove from db

Author: ulemons

backend/src/services/collectionService.ts

@@ -20,7 +20,7 @@ import {
   queryCollections,
   queryInsightsProjectById,
   queryInsightsProjects,
-  softDeleteInsightsProjectRepositories,
+  softDeleteMissingInsightsProjectRepositories,
   updateCollection,
   updateInsightsProject,
   upsertInsightsProjectRepositories,
@@ -364,21 +364,20 @@ export class CollectionService extends LoggerBase {
       offset,
     }
   }
- 
-  static normalizeRepositories(
-  repositories?: string[] | { platform: string; url: string }[]
-): string[] {
-  if (!repositories) return [];
 
-  if (typeof repositories[0] === 'string') {
-    return repositories as string[];
-  }
+  static normalizeRepositories(
+    repositories?: string[] | { platform: string; url: string }[],
+  ): string[] {
+    if (!repositories) return []
 
-  return (repositories as { platform: string; url: string }[]).map(r => r.url);
-}
+    if (typeof repositories[0] === 'string') {
+      return repositories as string[]
+    }
 
+    return (repositories as { platform: string; url: string }[]).map((r) => r.url)
+  }
 
-  async updateInsightsProject(id: string, project: Partial<ICreateInsightsProject>) {
+  async updateInsightsProject(insightsProjectId: string, project: Partial<ICreateInsightsProject>) {
     return SequelizeRepository.withTx(this.options, async (tx) => {
       const qx = SequelizeRepository.getQueryExecutor(this.options, tx)
 
@@ -388,26 +387,23 @@ export class CollectionService extends LoggerBase {
         project.isLF = segment?.isLF ?? false
       }
 
-      await updateInsightsProject(qx, id, project)
-
-      console.log(`repositories: ${project.repositories} and id: ${id}`)
-      
-      if (project.repositories?.length > 0) {
-        // TODO: sistemare tutto in modo che le repository possono essere anche zero
-        const repositories = CollectionService.normalizeRepositories(project.repositories)
-  
-        await upsertInsightsProjectRepositories(qx, `${id}`, repositories)
-  
-        await softDeleteInsightsProjectRepositories(qx, id, repositories)
-      }
+      await updateInsightsProject(qx, insightsProjectId, project)
+
+      const repositories = CollectionService.normalizeRepositories(project.repositories)
 
+      await upsertInsightsProjectRepositories(qx, { insightsProjectId, repositories })
+
+      await softDeleteMissingInsightsProjectRepositories(qx, {
+        insightsProjectId,
+        repositories,
+      })
 
       if (project.collections) {
-        await disconnectProjectsAndCollections(qx, { insightsProjectId: id })
+        await disconnectProjectsAndCollections(qx, { insightsProjectId })
         await connectProjectsAndCollections(
           qx,
           project.collections.map((c) => ({
-            insightsProjectId: id,
+            insightsProjectId,
             collectionId: c,
             starred: project.starred ?? true,
           })),
@@ -418,7 +414,7 @@ export class CollectionService extends LoggerBase {
         ...this.options,
         transaction: tx,
       })
-      return txSvc.findInsightsProjectById(id)
+      return txSvc.findInsightsProjectById(insightsProjectId)
     })
   }
 

services/libs/data-access-layer/src/collections/index.ts

@@ -295,32 +295,53 @@ export async function findBySlug(qx: QueryExecutor, slug: string) {
   return collections
 }
 
-export async function upsertInsightsProjectRepositories(qx: QueryExecutor, insightsProjectId, repositories: string[]) {
+export async function upsertInsightsProjectRepositories(
+  qx: QueryExecutor,
+  {
+    insightsProjectId,
+    repositories,
+  }: {
+    insightsProjectId: string
+    repositories: string[]
+  },
+): Promise<void> {
+  if (repositories.length === 0) {
+    return null
+  }
+
   const data = repositories.map((repo) => ({
     insightsProjectId,
     repository: repo,
   }))
-  
+
   return qx.result(
     prepareBulkInsert(
       'insightsProjectsRepositories',
       ['insightsProjectId', 'repository'],
       data,
-      'do nothing',
+      '("insightsProjectId", "repository") DO UPDATE SET "deletedAt" = NULL',
     ),
   )
 }
 
-export async function softDeleteInsightsProjectRepositories(
+export async function softDeleteMissingInsightsProjectRepositories(
   qx: QueryExecutor,
-  insightsProjectId: string,
-  currentRepositories: string[],
+  {
+    insightsProjectId,
+    repositories,
+  }: {
+    insightsProjectId: string
+    repositories: string[]
+  },
 ): Promise<void> {
-  return qx.result(`
+  return qx.result(
+    `
     UPDATE "insightsProjectsRepositories"
     SET "deletedAt" = NOW()
     WHERE "insightsProjectId" = '${insightsProjectId}'
       AND "deletedAt" IS NULL
-      AND "repository" NOT IN (${currentRepositories.map(repo => `'${repo}'`).join(', ')})
-  `, { insightsProjectId, currentRepositories } )
+      AND ${repositories.length > 0 ? `"repository" != ALL(ARRAY[${repositories.map((repo) => `'${repo}'`).join(', ')}])` : 'TRUE'}
+  `,
+    { insightsProjectId, repositories },
+  )
 }