calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-01-28 22:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

♻️ list approvals with client & user data

Browse Source
This commit is contained in:
Fred KISSIE
2026-01-09 01:33:40 +01:00
parent a81bbb9192
commit fdb03c9626
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/private/routers/approvals/listApprovals.ts
View File

@@ -21,8 +21,8 @@ import type { Request, Response, NextFunction } from "express";
import { build } from "@server/build"; import { build } from "@server/build";
import { getOrgTierData } from "@server/lib/billing"; import { getOrgTierData } from "@server/lib/billing";
import { TierId } from "@server/lib/billing/tiers"; import { TierId } from "@server/lib/billing/tiers";
import { approvals, db } from "@server/db"; import { approvals, clients, db, users } from "@server/db";
import { eq, sql } from "drizzle-orm"; import { eq, isNull, sql, not, and } from "drizzle-orm";
import response from "@server/lib/response"; import response from "@server/lib/response";
const paramsSchema = z.strictObject({ const paramsSchema = z.strictObject({
@@ -48,6 +48,14 @@ async function queryApprovals(orgId: string, limit: number, offset: number) {
const res = await db const res = await db
.select() .select()
.from(approvals) .from(approvals)
.leftJoin(
clients,
and(
eq(approvals.clientId, clients.clientId),
not(isNull(clients.userId)) // only user devices
)
)
.leftJoin(users, and(eq(approvals.userId, users.userId)))
.where(eq(approvals.orgId, orgId)) .where(eq(approvals.orgId, orgId))
.limit(limit) .limit(limit)
.offset(offset); .offset(offset);