Merge branch 'dev' into email-monitor

Author: nams1570

.github/workflows/db-migration-backwards-compatibility.yaml

@@ -215,7 +215,7 @@ jobs:
         run: pnpm test
 
       - name: Verify data integrity
-        run: pnpm run verify-data-integrity
+        run: pnpm run verify-data-integrity --no-bail
 
       - name: Print Docker Compose logs
         if: always()

.github/workflows/e2e-api-tests.yaml

@@ -156,7 +156,7 @@ jobs:
         run: pnpm test ${{ matrix.freestyle-mode == 'prod' && '--min-workers=1 --max-workers=1' || '' }}
 
       - name: Verify data integrity
-        run: pnpm run verify-data-integrity
+        run: pnpm run verify-data-integrity --no-bail
 
       - name: Print Docker Compose logs
         if: always()

.github/workflows/e2e-custom-base-port-api-tests.yaml

@@ -150,7 +150,7 @@ jobs:
         run: pnpm test
 
       - name: Verify data integrity
-        run: pnpm run verify-data-integrity
+        run: pnpm run verify-data-integrity --no-bail
 
       - name: Print Docker Compose logs
         if: always()

.github/workflows/e2e-source-of-truth-api-tests.yaml

@@ -156,7 +156,7 @@ jobs:
         run: pnpm test
 
       - name: Verify data integrity
-        run: pnpm run verify-data-integrity
+        run: pnpm run verify-data-integrity --no-bail
 
       - name: Print Docker Compose logs
         if: always()

apps/backend/prisma/migrations/20260201240000_event_created_at_index/migration.sql

@@ -0,0 +1,11 @@
+-- SPLIT_STATEMENT_SENTINEL
+-- SINGLE_STATEMENT_SENTINEL
+-- RUN_OUTSIDE_TRANSACTION_SENTINEL
+-- Add index on createdAt for efficient range queries (used by ClickHouse migration and similar count queries).
+CREATE INDEX CONCURRENTLY IF NOT EXISTS "Event_createdAt_idx" ON /* SCHEMA_NAME_SENTINEL */."Event" ("createdAt");
+
+-- SPLIT_STATEMENT_SENTINEL
+-- SINGLE_STATEMENT_SENTINEL
+-- RUN_OUTSIDE_TRANSACTION_SENTINEL
+-- Add composite index (createdAt, id) for cursor-based pagination queries.
+CREATE INDEX CONCURRENTLY IF NOT EXISTS "Event_createdAt_id_idx" ON /* SCHEMA_NAME_SENTINEL */."Event" ("createdAt", "id");

apps/backend/prisma/schema.prisma

@@ -659,6 +659,8 @@ model Event {
   // =============================== END END USER PROPERTIES ===============================
 
   @@index([data(ops: JsonbPathOps)], type: Gin)
+  @@index([createdAt])
+  @@index([createdAt, id])
 }
 
 // An IP address that was seen in an event. Use the location fields instead of refetching the location from the ip, as the real-world geoip data may have changed since the event was logged.

apps/backend/scripts/clickhouse-migrations.ts

@@ -35,12 +35,8 @@ CREATE TABLE IF NOT EXISTS analytics_internal.events (
     data             JSON,
     project_id       String,
     branch_id        String,
-    user_id          String,
-    team_id          String,
-    refresh_token_id String,
-    is_anonymous     Boolean,
-    session_id       String,
-    ip_address       String,
+    user_id          Nullable(String),
+    team_id          Nullable(String),
     created_at DateTime64(3, 'UTC') DEFAULT now64(3)
 )
 ENGINE MergeTree

apps/backend/scripts/verify-data-integrity/index.ts

@@ -21,8 +21,6 @@ const USE_MOCK_STRIPE_API = STRIPE_SECRET_KEY === "sk_test_mockstripekey";
 let targetOutputData: OutputData | undefined = undefined;
 const currentOutputData: OutputData = {};
 
-const recurse = createRecurse();
-
 async function main() {
   console.log();
   console.log();
@@ -80,6 +78,13 @@ async function main() {
   const shouldVerifyOutput = flags.includes("--verify-output");
   const shouldSkipNeon = flags.includes("--skip-neon");
   const recentFirst = flags.includes("--recent-first");
+  const noBail = flags.includes("--no-bail");
+
+  const { recurse, collectedErrors } = createRecurse({ noBail });
+
+  if (noBail) {
+    console.log(`Running in no-bail mode: will continue on errors and report all at the end.`);
+  }
 
   if (shouldSaveOutput) {
     console.log(`Will save output to ${OUTPUT_FILE_PATH}`);
@@ -318,6 +323,27 @@ async function main() {
     console.log(`Output saved to ${OUTPUT_FILE_PATH}`);
   }
 
+  // Report collected errors if in no-bail mode
+  if (collectedErrors.length > 0) {
+    console.log();
+    console.log();
+    console.log();
+    console.log();
+    console.log("===================================================");
+    console.log(`\x1b[41mFAILED\x1b[0m! Found ${collectedErrors.length} error(s):`);
+    console.log();
+    for (let i = 0; i < collectedErrors.length; i++) {
+      const { context, error } = collectedErrors[i];
+      console.log(`--- Error ${i + 1}/${collectedErrors.length} ---`);
+      console.log(`Context: ${context}`);
+      console.error(error);
+      console.log();
+    }
+    console.log("===================================================");
+    console.log();
+    process.exit(1);
+  }
+
   console.log();
   console.log();
   console.log();

apps/backend/scripts/verify-data-integrity/recurse.ts

@@ -1,15 +1,23 @@
 export type RecurseFunction = (progressPrefix: string, inner: (recurse: RecurseFunction) => Promise<void>) => Promise<void>;
 
-export function createRecurse(): RecurseFunction {
+export type CollectedError = {
+  context: string,
+  error: unknown,
+};
+
+export function createRecurse(options: { noBail: boolean }): { recurse: RecurseFunction, collectedErrors: CollectedError[] } {
   let lastProgress = performance.now() - 9999999999;
+  const collectedErrors: CollectedError[] = [];
 
   const _recurse = async (
     progressPrefix: string | ((...args: any[]) => void),
     inner: Parameters<RecurseFunction>[1],
+    contextPath: string = "",
   ): Promise<void> => {
     const progressFunc = typeof progressPrefix === "function" ? progressPrefix : (...args: any[]) => {
       console.log(`${progressPrefix}`, ...args);
     };
+    const currentContext = typeof progressPrefix === "string" ? progressPrefix : contextPath;
     if (performance.now() - lastProgress > 1000) {
       progressFunc();
       lastProgress = performance.now();
@@ -19,14 +27,24 @@ export function createRecurse(): RecurseFunction {
         (progressPrefix, inner) => _recurse(
           (...args) => progressFunc(progressPrefix, ...args),
           inner,
+          `${currentContext} > ${typeof progressPrefix === "string" ? progressPrefix : ""}`,
         ),
       );
     } catch (error) {
       progressFunc(`\x1b[41mERROR\x1b[0m!`);
-      throw error;
+      if (options.noBail) {
+        collectedErrors.push({
+          context: currentContext,
+          error,
+        });
+      } else {
+        throw error;
+      }
     }
   };
 
-  return _recurse;
+  const recurse: RecurseFunction = (progressPrefix, inner) => _recurse(progressPrefix, inner, progressPrefix);
+
+  return { recurse, collectedErrors };
 }