The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Sort members by ProjectUser / PartnerUser createdAt ascending (#4747)
Steven Tey5a823a116f6b
diff --git a/apps/web/app/(ee)/api/partner-profile/users/route.ts b/apps/web/app/(ee)/api/partner-profile/users/route.tsindex 7c5ad92814..ab6e694d3a 100644--- a/apps/web/app/(ee)/api/partner-profile/users/route.ts+++ b/apps/web/app/(ee)/api/partner-profile/users/route.ts@@ -41,6 +41,9 @@ export const GET = withPartnerProfile(async ({ partner, searchParams }) => {include: {user: true,},+ orderBy: {+ createdAt: "asc",+ },});const parsedUsers = users.map(({ user, ...rest }) =>diff --git a/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/users/route.tsindex 6f177ce8c3..fe8a27d273 100644--- a/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts+++ b/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts@@ -36,6 +36,9 @@ export const GET = withWorkspace(include: {user: true,},+ orderBy: {+ createdAt: "asc",+ },});const parsedUsers = users.map(({ user, ...rest }) =>diff --git a/apps/web/playwright/api/partner-profile/users.spec.ts b/apps/web/playwright/api/partner-profile/users.spec.tsindex 2342f5f8a1..6bb7bb3fbc 100644--- a/apps/web/playwright/api/partner-profile/users.spec.ts+++ b/apps/web/playwright/api/partner-profile/users.spec.ts@@ -40,6 +40,95 @@ async function createPartnerProfileAuth(return { token, userId: user.id };}+test("GET /partner-profile/users – sorted by PartnerUser createdAt asc", async ({+ playwright,+}) => {+ let partnerId: string | undefined;+ const userIds: string[] = [];++ try {+ const partner = await prisma.partner.create({+ data: {+ id: createId({ prefix: "pn_" }),+ name: randomName("partner"),+ email: randomPartnerEmail(),+ },+ });+ partnerId = partner.id;++ const owner = await createPartnerProfileAuth(partner);+ userIds.push(owner.userId);++ const later = new Date("2030-01-02T00:00:00.000Z");+ const earlier = new Date("2030-01-01T00:00:00.000Z");++ const [laterUser, earlierUser] = await Promise.all([+ prisma.user.create({+ data: {+ id: createId({ prefix: "user_" }),+ email: randomPartnerEmail(),+ emailVerified: new Date(),+ partners: {+ create: {+ partnerId: partner.id,+ role: "member",+ createdAt: later,+ },+ },+ },+ }),+ prisma.user.create({+ data: {+ id: createId({ prefix: "user_" }),+ email: randomPartnerEmail(),+ emailVerified: new Date(),+ partners: {+ create: {+ partnerId: partner.id,+ role: "member",+ createdAt: earlier,+ },+ },+ },+ }),+ ]);+ userIds.push(laterUser.id, earlierUser.id);++ const { api: partnerApi, dispose } = await createBearerApiClient({+ playwright,+ token: owner.token,+ });++ try {+ const { status, data: users } = await partnerApi.get<+ { id: string | null; createdAt: string }[]+ >("/api/partner-profile/users");++ expect(status).toEqual(200);++ const createdAts = users.map((user) =>+ new Date(user.createdAt).getTime(),+ );+ expect(createdAts).toEqual([...createdAts].sort((a, b) => a - b));++ const earlierIndex = users.findIndex((user) => user.id === earlierUser.id);+ const laterIndex = users.findIndex((user) => user.id === laterUser.id);+ expect(earlierIndex).toBeGreaterThanOrEqual(0);+ expect(laterIndex).toBeGreaterThanOrEqual(0);+ expect(earlierIndex).toBeLessThan(laterIndex);+ } finally {+ await dispose();+ }+ } finally {+ await Promise.all(+ userIds.map((id) => prisma.user.delete({ where: { id } })),+ );+ if (partnerId) {+ await conn.execute(`DELETE FROM Partner WHERE id = ?`, [partnerId]);+ }+ }+});+test("DELETE /partner-profile/users - clears defaultPartnerId", async ({playwright,}) => {diff --git a/apps/web/playwright/api/workspaces/users.spec.ts b/apps/web/playwright/api/workspaces/users.spec.tsnew file mode 100644index 0000000000..6510c3e2f2--- /dev/null+++ b/apps/web/playwright/api/workspaces/users.spec.ts@@ -0,0 +1,71 @@+import { createId } from "@/lib/api/create-id";+import { prisma } from "@/lib/prisma";+import { expect } from "@playwright/test";+import { randomName } from "../../utils";+import { test } from "../fixtures";++test("GET /workspaces/{idOrSlug}/users – sorted by ProjectUsers createdAt asc", async ({+ api,+ workspace,+}) => {+ const userIds: string[] = [];++ try {+ const later = new Date("2030-01-02T00:00:00.000Z");+ const earlier = new Date("2030-01-01T00:00:00.000Z");++ const [laterUser, earlierUser] = await Promise.all([+ prisma.user.create({+ data: {+ id: createId({ prefix: "user_" }),+ email: `${randomName("member")}@dub-internal-test.com`,+ name: "Later Member",+ emailVerified: new Date(),+ projects: {+ create: {+ projectId: workspace.id,+ role: "member",+ createdAt: later,+ },+ },+ },+ }),+ prisma.user.create({+ data: {+ id: createId({ prefix: "user_" }),+ email: `${randomName("member")}@dub-internal-test.com`,+ name: "Earlier Member",+ emailVerified: new Date(),+ projects: {+ create: {+ projectId: workspace.id,+ role: "member",+ createdAt: earlier,+ },+ },+ },+ }),+ ]);++ userIds.push(laterUser.id, earlierUser.id);++ const { status, data: users } = await api.get<+ { id: string; createdAt: string }[]+ >(`/api/workspaces/${workspace.id}/users`);++ expect(status).toEqual(200);++ const createdAts = users.map((user) => new Date(user.createdAt).getTime());+ expect(createdAts).toEqual([...createdAts].sort((a, b) => a - b));++ const earlierIndex = users.findIndex((user) => user.id === earlierUser.id);+ const laterIndex = users.findIndex((user) => user.id === laterUser.id);+ expect(earlierIndex).toBeGreaterThanOrEqual(0);+ expect(laterIndex).toBeGreaterThanOrEqual(0);+ expect(earlierIndex).toBeLessThan(laterIndex);+ } finally {+ await Promise.all(+ userIds.map((id) => prisma.user.delete({ where: { id } })),+ );+ }+});