Skip to content

refactor(analytics): replace any casts with typed prehandler and prisma where clause (#546) #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Harxhit merged 5 commits into from
Jun 15, 2026
+7 −6
Merged

refactor(analytics): replace any casts with typed prehandler and prisma where clause (#546) #563

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5cbbbe0
refactor(backend): type authenticate decorator and jwt user payload
ramnnn2006 Jun 12, 2026
9a65962
refactor(backend): use typed authenticate prehandler and jwt user in …
ramnnn2006 Jun 12, 2026
7b79278
refactor(backend): type analytics where clause with prisma cardviewwh…
ramnnn2006 Jun 12, 2026
2a94faf
Merge branch 'Dev-Card:main' into refactor/analytics-type-safety
ramnnn2006 Jun 13, 2026
2256eb5
Merge branch 'main' into refactor/analytics-type-safety
ramnnn2006 Jun 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions apps/backend/src/routes/analytics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { Prisma } from '@prisma/client';
import type {
FastifyInstance,
FastifyRequest,
Expand All @@ -12,14 +13,14 @@ export async function analyticsRoutes(
'/overview',
{
// eslint-disable-next-line @typescript-eslint/unbound-method
preHandler: [async (request, reply) => { const server = request.server as any; if (typeof server?.authenticate === 'function') { await server.authenticate(request, reply); return } if (typeof (app as any).authenticate === 'function') { await (app as any).authenticate(request, reply); return } try { await request.jwtVerify() } catch (e) { reply.status(401).send({ error: 'Unauthorized' }) } }],
preHandler: [app.authenticate],
Comment thread
ramnnn2006 marked this conversation as resolved.
},
async (
request: FastifyRequest,
_reply: FastifyReply
) => {
const userId = (request.user as any).id;
const username = (request.user as any).username;
const userId = request.user.id;
const username = request.user.username;

const today = new Date();
today.setHours(0, 0, 0, 0);
Expand Down Expand Up @@ -98,7 +99,7 @@ export async function analyticsRoutes(
'/views',
{
// eslint-disable-next-line @typescript-eslint/unbound-method
preHandler: [async (request, reply) => { const server = request.server as any; if (typeof server?.authenticate === 'function') { await server.authenticate(request, reply); return } if (typeof (app as any).authenticate === 'function') { await (app as any).authenticate(request, reply); return } try { await request.jwtVerify() } catch (e) { reply.status(401).send({ error: 'Unauthorized' }) } }],
preHandler: [app.authenticate],
},
async (
request: FastifyRequest<{
Expand All @@ -109,12 +110,12 @@ export async function analyticsRoutes(
}>,
_reply: FastifyReply
) => {
const userId = (request.user as any).id;
const userId = request.user.id;
const page = parseInt(request.query.page || '1', 10);
const limit = 20;
const skip = (page - 1) * limit;

const whereClause: any = { ownerId: userId };
const whereClause: Prisma.CardViewWhereInput = { ownerId: userId };

if (request.query.cardId) {
whereClause.cardId = request.query.cardId;
Expand Down