diff --git a/backend/src/routes/admin.routes.ts b/backend/src/routes/admin.routes.ts index b47297f..e2b2445 100644 --- a/backend/src/routes/admin.routes.ts +++ b/backend/src/routes/admin.routes.ts @@ -227,15 +227,10 @@ router.get("/users", async (_req: Request, res: Response): Promise => { isActive: u.isActive, createdAt: u.createdAt, roles: u.userRoles.map((ur) => ({ id: ur.role.id, slug: ur.role.slug, name: ur.role.name })), - activeSubscription: u.subscriptions.find((s) => s.status === "active") - ? { - id: u.subscriptions.find((s) => s.status === "active")!.id, - status: u.subscriptions.find((s) => s.status === "active")!.status, - startsAt: u.subscriptions.find((s) => s.status === "active")!.startsAt, - endsAt: u.subscriptions.find((s) => s.status === "active")!.endsAt, - plan: u.subscriptions.find((s) => s.status === "active")!.plan, - } - : null, + activeSubscription: (() => { + const sub = u.subscriptions.find((s) => s.status === "active"); + return sub ? { id: sub.id, status: sub.status, startsAt: sub.startsAt, endsAt: sub.endsAt, plan: sub.plan } : null; + })(), })); res.json({ success: true, data: { users: result } });