Merge branch 'dev' into api-migration

.gitignore

@@ -2,6 +2,9 @@
 *.untracked.*
 
 
+*.cpuprofile
+
+
 
 .vercel
 

apps/backend/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @stackframe/stack-backend
 
+## 2.7.4
+
+### Patch Changes
+
+- Various changes
+  - @stackframe/stack-emails@2.7.4
+  - @stackframe/stack-shared@2.7.4
+
+## 2.7.3
+
+### Patch Changes
+
+- Various changes
+- Updated dependencies
+  - @stackframe/stack-shared@2.7.3
+  - @stackframe/stack-emails@2.7.3
+
+## 2.7.2
+
+### Patch Changes
+
+- Various changes
+- Updated dependencies
+  - @stackframe/stack-shared@2.7.2
+  - @stackframe/stack-emails@2.7.2
+
 ## 2.7.1
 
 ### Patch Changes

apps/backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stackframe/stack-backend",
-  "version": "2.7.1",
+  "version": "2.7.4",
   "private": true,
   "scripts": {
     "clean": "rimraf .next && rimraf node_modules",

apps/backend/prisma/migrations/20241228033652_more_event_indices/migration.sql

@@ -0,0 +1,5 @@
+-- It's very common to query by userId, projectId, and eventStartedAt at the same time.
+-- We can use a composite index to speed up the query.
+-- Sadly we can't add this to the Prisma schema itself because Prisma does not understand composite indexes of JSONB fields.
+-- So we have to add it manually.
+CREATE INDEX idx_event_userid_projectid_eventstartedat ON "Event" ((data->>'projectId'), (data->>'userId'), "eventStartedAt");

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

@@ -1,6 +1,6 @@
 import { PrismaClient } from "@prisma/client";
 import { getEnvVariable } from "@stackframe/stack-shared/dist/utils/env";
-import { StackAssertionError } from "@stackframe/stack-shared/dist/utils/errors";
+import { StackAssertionError, throwErr } from "@stackframe/stack-shared/dist/utils/errors";
 import { filterUndefined } from "@stackframe/stack-shared/dist/utils/objects";
 import { wait } from "@stackframe/stack-shared/dist/utils/promises";
 import { deindent } from "@stackframe/stack-shared/dist/utils/strings";
@@ -70,7 +70,7 @@ async function main() {
   for (let i = 0; i < projects.length; i++) {
     const projectId = projects[i].id;
     await recurse(`[project ${i + 1}/${projects.length}] ${projectId} ${projects[i].displayName}`, async (recurse) => {
-      await Promise.all([
+      const [currentProject, users] = await Promise.all([
         expectStatusCode(200, `/api/v1/projects/current`, {
           method: "GET",
           headers: {
@@ -88,6 +88,21 @@ async function main() {
           },
         }),
       ]);
+      if (users.pagination?.next_cursor) throwErr("Users are paginated? Please update the verify-data-integrity.ts script to handle this.");
+
+      for (let j = 0; j < users.items.length; j++) {
+        const user = users.items[j];
+        await recurse(`[user ${j + 1}/${users.items.length}] ${user.display_name ?? user.primary_email}`, async (recurse) => {
+          await expectStatusCode(200, `/api/v1/users/${user.id}`, {
+            method: "GET",
+            headers: {
+              "x-stack-project-id": projectId,
+              "x-stack-access-type": "admin",
+              "x-stack-development-override-key": getEnvVariable("STACK_SEED_INTERNAL_PROJECT_SUPER_SECRET_ADMIN_KEY"),
+            },
+          });
+        });
+      }
     });
   }
 

apps/backend/src/app/api/v1/internal/metrics/route.tsx

@@ -47,7 +47,7 @@ async function loadTotalUsers(projectId: string, now: Date): Promise<DataPoints>
   return (await prismaClient.$queryRaw<{date: Date, dailyUsers: bigint, cumUsers: bigint}[]>`
     WITH date_series AS (
         SELECT GENERATE_SERIES(
-          ${now}::date - INTERVAL '1 month',
+          ${now}::date - INTERVAL '30 days',
           ${now}::date,
           '1 day'
         )
@@ -72,7 +72,7 @@ async function loadDailyActiveUsers(projectId: string, now: Date) {
   const res = await prismaClient.$queryRaw<{day: Date, dau: bigint}[]>`
     WITH date_series AS (
       SELECT GENERATE_SERIES(
-        ${now}::date - INTERVAL '1 month',
+        ${now}::date - INTERVAL '30 days',
         ${now}::date,
         '1 day'
       )
@@ -83,7 +83,7 @@ async function loadDailyActiveUsers(projectId: string, now: Date) {
         DATE_TRUNC('day', "eventStartedAt") AS "day",
         COUNT(DISTINCT "data"->'userId') AS "dau"
       FROM "Event"
-      WHERE "eventStartedAt" >= ${now} - INTERVAL '1 month'
+      WHERE "eventStartedAt" >= ${now} - INTERVAL '30 days'
         AND "eventStartedAt" < ${now}
         AND '$user-activity' = ANY("systemEventTypeIds"::text[])
         AND "data"->>'projectId' = ${projectId}

apps/backend/src/app/api/v1/team-member-profiles/crud.tsx

@@ -76,7 +76,7 @@ export const teamMemberProfilesCrudHandlers = createLazyProxy(() => createCrudHa
         include: fullInclude,
       });
 
-      const lastActiveAtMillis = await getUsersLastActiveAtMillis(db.map(user => user.projectUserId), db.map(user => user.createdAt));
+      const lastActiveAtMillis = await getUsersLastActiveAtMillis(auth.project.id, db.map(user => user.projectUserId), db.map(user => user.createdAt));
 
       return {
         items: db.map((user, index) => prismaToCrud(user, lastActiveAtMillis[index])),
@@ -118,7 +118,7 @@ export const teamMemberProfilesCrudHandlers = createLazyProxy(() => createCrudHa
         throw new KnownErrors.TeamMembershipNotFound(params.team_id, params.user_id);
       }
 
-      return prismaToCrud(db, await getUserLastActiveAtMillis(db.projectUser.projectUserId) ?? db.projectUser.createdAt.getTime());
+      return prismaToCrud(db, await getUserLastActiveAtMillis(auth.project.id, db.projectUser.projectUserId) ?? db.projectUser.createdAt.getTime());
     });
   },
   onUpdate: async ({ auth, data, params }) => {
@@ -151,7 +151,7 @@ export const teamMemberProfilesCrudHandlers = createLazyProxy(() => createCrudHa
         include: fullInclude,
       });
 
-      return prismaToCrud(db, await getUserLastActiveAtMillis(db.projectUser.projectUserId) ?? db.projectUser.createdAt.getTime());
+      return prismaToCrud(db, await getUserLastActiveAtMillis(auth.project.id, db.projectUser.projectUserId) ?? db.projectUser.createdAt.getTime());
     });
   },
 }));