Pagination and search on long lists (1.50.1)

Audit log: search (person, target, IP), role filter, every action in the
filter, inclusive To date. Data requests: search and paging (was cut at
200). Webhook deliveries: status filter and Load older. Supervisor Payments
loads only what it needs (unpaid registrations, recent/today/donation
payments, a person's own for refunds) instead of everything.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Ls1vMdg2GYqbnKZmPaX1ot
This commit is contained in:
2026-10-29 06:53:54 +02:00
co-authored by Claude Opus 5.5
parent b9a886fc52
commit 43bbdbc405
26 changed files with 460 additions and 147 deletions
@@ -6,8 +6,8 @@ const { safeErrorMessage } = require('../utils/errorUtils');
// @access Admin
const listAuditLog = async (req, res) => {
try {
const { page, limit, actorId, action, from, to } = req.query;
const result = await getAdminAuditLog({ page, limit, actorId, action, from, to });
const { page, limit, actorId, action, role, from, to, search } = req.query;
const result = await getAdminAuditLog({ page, limit, actorId, action, role, from, to, search });
res.json(result);
} catch (e) {
res.status(500).json({ message: safeErrorMessage(e) });
@@ -154,6 +154,9 @@ const test = async (req, res) => {
const deliveries = async (req, res) => {
try {
const where = { endpointId: req.params.id, ...(req.query.status ? { status: String(req.query.status) } : {}) };
// "Load older": the next page is everything before the last one shown.
const before = req.query.before ? new Date(String(req.query.before)) : null;
if (before && !Number.isNaN(before.getTime())) where.createdAt = { lt: before };
const rows = await prisma.webhookDelivery.findMany({
where, orderBy: { createdAt: 'desc' }, take: Math.min(200, parseInt(req.query.limit, 10) || 50),
select: { id: true, eventId: true, type: true, status: true, attempts: true, nextAttemptAt: true, lastStatusCode: true, lastError: true, deliveredAt: true, createdAt: true, payload: true },
@@ -354,7 +354,15 @@ const getPayments = async (req, res) => {
// Campus-scoped supervisors: payments for events they can see (through the payment's event or
// its registration's), so unlinked donations aren't listed for them.
const scopeW = require('../utils/campusScope').eventWhere(await require('../utils/campusScope').scopeFor(req));
const where = Object.keys(scopeW).length ? { OR: [{ event: scopeW }, { registration: { event: scopeW } }] } : {};
const scopeWhere = Object.keys(scopeW).length ? { OR: [{ event: scopeW }, { registration: { event: scopeW } }] } : {};
// Narrowing filters: ?userId= (one person's), ?from= (on or after, e.g. today's start),
// ?donations=1 (donations and the legs that apply them to registrations).
const filters = [];
if (req.query.userId) filters.push({ userId: String(req.query.userId) });
const from = req.query.from ? new Date(String(req.query.from)) : null;
if (from && !Number.isNaN(from.getTime())) filters.push({ createdAt: { gte: from } });
if (['1', 'true'].includes(String(req.query.donations || ''))) filters.push({ OR: [{ isDonation: true }, { originalPaymentId: { not: null } }] });
const where = filters.length ? { AND: [scopeWhere, ...filters] } : scopeWhere;
const [payments, total] = await prisma.$transaction([
prisma.payment.findMany({ where, include, orderBy: { createdAt: 'desc' }, skip, take: limit }),
prisma.payment.count({ where })
@@ -227,12 +227,18 @@ const listRequests = async (req, res) => {
const where = { selfService: false };
if (status === 'open') where.status = 'open';
else if (status === 'closed') where.status = { not: 'open' };
const rows = await prisma.dataRequest.findMany({
const q = String(req.query.search || '').trim().slice(0, 100);
if (q) where.OR = [{ name: { contains: q, mode: 'insensitive' } }, { email: { contains: q, mode: 'insensitive' } }];
// Closed requests pile up over the years, so they come a page at a time (newest first).
const limit = Math.min(200, Math.max(1, parseInt(req.query.limit, 10) || 50));
const page = Math.max(1, parseInt(req.query.page, 10) || 1);
const [rows, total] = await Promise.all([prisma.dataRequest.findMany({
where,
orderBy: status === 'open' ? { dueAt: 'asc' } : { createdAt: 'desc' },
take: 200,
take: limit,
skip: (page - 1) * limit,
include: { handledBy: { select: { name: true } }, user: { select: { isActive: true, phoneNumber: true } } },
});
}), prisma.dataRequest.count({ where })]);
const requests = await Promise.all(rows.map(async r => ({
id: r.id, type: r.type, status: r.status, name: r.name, email: r.email, details: r.details, response: r.response,
dueAt: r.dueAt, closedAt: r.closedAt, createdAt: r.createdAt, userId: r.userId,
@@ -240,8 +246,8 @@ const listRequests = async (req, res) => {
overdue: r.status === 'open' && r.dueAt < new Date(),
blockers: r.type === 'deletion' && r.status === 'open' && r.userId ? await privacy.deletionBlockers(r.userId) : [],
})));
const openCount = status === 'open' ? requests.length : await prisma.dataRequest.count({ where: { selfService: false, status: 'open' } });
res.json({ requests, openCount });
const openCount = status === 'open' && !q ? total : await prisma.dataRequest.count({ where: { selfService: false, status: 'open' } });
res.json({ requests, openCount, total, page, limit, pages: Math.max(1, Math.ceil(total / limit)) });
} catch (error) {
fail(res, error);
}
@@ -569,7 +569,13 @@ const getRegistrations = async (req, res) => {
// array of every registration) working unchanged; callers that pass either param get back
// the { data, total, page, limit, pages } shape used by /api/payments and /api/users.
// Campus-scoped staff: registrations for events they can see.
const where = await require('../utils/campusScope').listWhere(req, 'event');
const scopeWhere = await require('../utils/campusScope').listWhere(req, 'event');
// Narrowing filters, so callers needn't download every registration ever made:
// ?unpaid=1 — still owing (not paid or cancelled); ?userId= — one person's.
const filters = [];
if (['1', 'true'].includes(String(req.query.unpaid || ''))) filters.push({ status: { in: ['pending', 'confirmed', 'partial_paid'] } });
if (req.query.userId) filters.push({ userId: String(req.query.userId) });
const where = filters.length ? { AND: [scopeWhere, ...filters] } : scopeWhere;
if (typeof req.query.page === 'undefined' && typeof req.query.limit === 'undefined') {
const registrations = await prisma.registration.findMany({ where, include });
return res.json(attachComputedTotalsToList(registrations));
+1 -1
View File
@@ -704,7 +704,7 @@ app.get('/docs', async (req, res) => {
]},
{ title: 'Impersonation', base: '/api/admin', endpoints: [
{ method:'GET', path:'/api/admin/audit-log', auth:'admin', desc:'Paginated admin/supervisor audit trail (?page, limit, actorId, action, from, to)' },
{ method:'GET', path:'/api/admin/audit-log', auth:'admin', desc:'Paginated admin/supervisor audit trail (?page, limit, actorId, action, role, from, to, search)' },
{ method:'GET', path:'/api/admin/jobs', auth:'admin', desc:'Background jobs: queue mode, timezone, and each job schedule, next run and last 10 runs' },
{ method:'POST', path:'/api/admin/jobs/:name/run', auth:'admin', desc:'Run a background job now (queued for a worker); audit-logged' },
{ method:'POST', path:'/api/admin/impersonate/:userId', auth:'admin (2FA)', desc:'View the site as a user — read-only token, 30 minutes, audited', request:{ body:{ reason:'Ticket not showing in My Events' }}, responses:[{ status:201, desc:'Started', body:{ token:'jwt…', session:{ id:'sess-uuid', expiresAt:'2025-07-10T08:45:00.000Z' }}}, { status:403, desc:'Not allowed', body:{ message:"Admins can't be impersonated." }}]},
+33 -5
View File
@@ -21,16 +21,44 @@ async function logAdminAction({ actorId, actorRole, action, targetType, targetId
}
}
// Paginated listing for the admin audit-log page, with optional actor/action/date filters.
async function getAdminAuditLog({ page = 1, limit = 50, actorId, action, from, to } = {}) {
const DATE_ONLY = /^\d{4}-\d{2}-\d{2}$/;
const DAY_MS = 24 * 60 * 60 * 1000;
// A date (YYYY-MM-DD) means midnight in the server's time zone (APP_TIMEZONE), not UTC.
const startOf = (v) => new Date(DATE_ONLY.test(v) ? `${v}T00:00:00` : v);
// The Prisma filter for the audit-log page. Dates (YYYY-MM-DD) are whole days, so `to`
// includes that day. `search` matches the person (name or email), the target type or id,
// or the IP.
function auditLogWhere({ actorId, action, role, from, to, search } = {}) {
const where = {};
if (actorId) where.actorId = actorId;
if (action) where.action = action;
if (role) where.actorRole = role;
if (from || to) {
where.createdAt = {};
if (from) where.createdAt.gte = new Date(from);
if (to) where.createdAt.lte = new Date(to);
if (from) where.createdAt.gte = startOf(from);
if (to) {
if (DATE_ONLY.test(to)) where.createdAt.lt = new Date(startOf(to).getTime() + DAY_MS);
else where.createdAt.lte = new Date(to);
}
}
const q = String(search || '').trim().slice(0, 100);
if (q) {
const contains = { contains: q, mode: 'insensitive' };
where.OR = [
{ actor: { name: contains } },
{ actor: { email: contains } },
{ targetType: contains },
{ targetId: { startsWith: q.replace(/^#/, '') } },
{ ip: { startsWith: q } },
];
}
return where;
}
// Paginated listing for the admin audit-log page.
async function getAdminAuditLog({ page = 1, limit = 50, ...filters } = {}) {
const where = auditLogWhere(filters);
const take = Math.min(Math.max(Number(limit) || 50, 1), 200);
const skip = (Math.max(Number(page) || 1, 1) - 1) * take;
@@ -49,4 +77,4 @@ async function getAdminAuditLog({ page = 1, limit = 50, actorId, action, from, t
return { rows, total, page: Math.max(Number(page) || 1, 1), limit: take };
}
module.exports = { logAdminAction, getAdminAuditLog };
module.exports = { logAdminAction, getAdminAuditLog, auditLogWhere };