Merge pull request #1040 from buster-so/fixMetricFileCascadingPermissionsFromReports

Fix metric_file permissions not cascading from report_files

packages/ai/src/tools/visualization-tools/reports/create-reports-tool/create-reports-execute.ts

@@ -163,11 +163,13 @@ export function createCreateReportsExecute(
               userId: context.userId,
             });
 
-            await updateMetricsToReports({
-              reportId,
-              metricIds,
-              userId: context.userId,
-            });
+            if (metricIds.length > 0) {
+              await updateMetricsToReports({
+                reportId,
+                metricIds,
+                userId: context.userId,
+              });
+            }
 
             // Track file associations if messageId is available
             if (context.messageId) {

packages/ai/src/tools/visualization-tools/reports/modify-reports-tool/modify-reports-execute.ts

@@ -215,10 +215,12 @@ async function processEditOperations(
       metricIds,
     });
 
-    await updateMetricsToReports({
-      reportId,
-      metricIds,
-    });
+    if (metricIds.length > 0) {
+      await updateMetricsToReports({
+        reportId,
+        metricIds,
+      });
+    }
 
     if (messageId) {
       await trackFileAssociations({

packages/database/drizzle/0108_amazing_cassandra_nova.sql

@@ -0,0 +1,50 @@
+-- Custom SQL migration file, put your code below! --
+
+-- Function to populate metric_files_to_report_files table from existing report content
+-- Extracts metric IDs from report content and creates relationships
+
+-- Drop the existing function first to allow changing the return type
+DROP FUNCTION IF EXISTS populate_metric_files_to_report_files();
+
+-- Create the function with VOID return type
+CREATE FUNCTION populate_metric_files_to_report_files()
+RETURNS VOID AS $$
+BEGIN
+    -- Use CTE to extract all metric IDs from report content first
+    INSERT INTO metric_files_to_report_files (
+        metric_file_id,
+        report_file_id,
+        created_at,
+        updated_at,
+        deleted_at,
+        created_by
+    )
+    WITH extracted_metrics AS (
+        SELECT DISTINCT
+            rf.id AS report_file_id,
+            rf.created_by,
+            (regexp_matches(rf.content, '<metric[^>]*metricId="([a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})"[^>]*>', 'g'))[1]::UUID AS metric_file_id
+        FROM report_files rf
+        WHERE rf.deleted_at IS NULL
+            AND rf.content ~ '<metric[^>]*metricId="[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}"[^>]*>'
+    )
+    SELECT 
+        em.metric_file_id,
+        em.report_file_id,
+        CURRENT_TIMESTAMP AS created_at,
+        CURRENT_TIMESTAMP AS updated_at,
+        NULL AS deleted_at,
+        em.created_by
+    FROM extracted_metrics em
+    WHERE EXISTS (
+        SELECT 1 
+        FROM metric_files mf 
+        WHERE mf.id = em.metric_file_id
+            AND mf.deleted_at IS NULL
+    )
+    ON CONFLICT (metric_file_id, report_file_id) DO NOTHING;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Execute the function
+SELECT populate_metric_files_to_report_files();

packages/database/drizzle/meta/_journal.json

@@ -750,6 +750,13 @@
       "when": 1758309016682,
       "tag": "0107_deprecate_tables",
       "breakpoints": true
+    },
+    {
+      "idx": 108,
+      "version": "7",
+      "when": 1758568913678,
+      "tag": "0108_amazing_cassandra_nova",
+      "breakpoints": true
     }
   ]
 }

packages/database/src/queries/metrics-to-reports/update-metrics-to-reports.ts

@@ -1,7 +1,7 @@
 import { and, eq, inArray, isNull } from 'drizzle-orm';
 import { z } from 'zod';
 import { db } from '../../connection';
-import { metricFilesToReportFiles } from '../../schema';
+import { metricFilesToReportFiles, reportFiles } from '../../schema';
 
 // Input validation schema
 const UpdateMetricsToReportsInputSchema = z.object({
@@ -53,17 +53,32 @@ export const updateMetricsToReports = async (
       );
 
       // 3. Create new relationships
-      if (metricsToCreate.length > 0 && userId) {
-        const newRelationships = metricsToCreate.map((metricId) => ({
-          metricFileId: metricId,
-          reportFileId: reportId,
-          createdAt: now,
-          updatedAt: now,
-          deletedAt: null,
-          createdBy: userId,
-        }));
+      if (metricsToCreate.length > 0) {
+        let createdBy = userId;
+        if (!userId) {
+          const [createdByResponse] = await db
+            .select({ id: reportFiles.createdBy })
+            .from(reportFiles)
+            .where(eq(reportFiles.id, reportId));
+          if (createdByResponse?.id) {
+            createdBy = createdByResponse.id;
+          }
+        }
 
-        await tx.insert(metricFilesToReportFiles).values(newRelationships);
+        if (createdBy) {
+          const newRelationships = metricsToCreate.map((metricId) => ({
+            metricFileId: metricId,
+            reportFileId: reportId,
+            createdAt: now,
+            updatedAt: now,
+            deletedAt: null,
+            createdBy: createdBy,
+          }));
+
+          await tx.insert(metricFilesToReportFiles).values(newRelationships);
+        } else {
+          throw new Error('Could not find user id for reports created by');
+        }
       }
 
       // 4. Restore soft-deleted relationships (undelete and update)