Merge pull request #57 from DataScience-GT/refactor/routes

Refactor/routes

Author: aamoghS

.gitignore

@@ -11,6 +11,7 @@ coverage
 out/
 build
 dist/
+seed-super.ts
 
 # Production
 build
@@ -32,6 +33,7 @@ yarn-error.log*
 .env.production
 
 # Vercel
+.reset.ts
 .vercel
 
 # Turbo

.nvmrc

@@ -1 +1 @@
-20.11.0
+22.11.0

deploy-cloudrun.bat

@@ -28,7 +28,7 @@ async function getAuth() {
 }
 
 export async function createContext(
-  opts?: FetchCreateContextFnOptions & { clientIp?: string; req?: Request }
+  opts?: Partial<FetchCreateContextFnOptions> & { clientIp?: string; req?: Request }
 ) {
   let session = null;
 
@@ -50,7 +50,7 @@ export async function createContext(
     session,
     userId: session?.user?.id,
     cache,
-    clientIp: opts?.clientIp || 'unknown',
+    clientIp: opts?.clientIp || req?.headers.get("x-forwarded-for")?.split(",")[0] || 'unknown',
     req
   };
 }

deploy-cloudrun.sh

@@ -8,7 +8,6 @@ import { isAdmin, isSuperAdmin } from "../middleware/procedures";
 
 export const adminRouter = createTRPCRouter({
   isAdmin: protectedProcedure.query(async ({ ctx }) => {
-    // Check cache first
     const cacheKey = CacheKeys.admin(ctx.userId!);
     const cached = ctx.cache.get<{
       isAdmin: boolean;
@@ -30,7 +29,6 @@ export const adminRouter = createTRPCRouter({
       permissions: admin?.permissions || [],
     };
 
-    // Cache for 60 seconds
     ctx.cache.set(cacheKey, result, 60);
 
     return result;

packages/api/src/context.ts

@@ -7,7 +7,6 @@ import { randomUUID } from "crypto";
 import { isAdmin } from "../middleware/procedures";
 
 export const eventRouter = createTRPCRouter({
-  // ADMIN: Create event
   create: isAdmin
     .input(
       z.object({
@@ -33,7 +32,6 @@ export const eventRouter = createTRPCRouter({
       return newEvent;
     }),
 
-  // ADMIN: Regenerate QR code for an event
   regenerateQR: isAdmin
     .input(z.object({ eventId: z.string().uuid() }))
     .mutation(async ({ ctx, input }) => {
@@ -58,7 +56,6 @@ export const eventRouter = createTRPCRouter({
       return updatedEvent;
     }),
 
-  // ADMIN: List all events
   listAll: isAdmin.query(async ({ ctx }) => {
     const allEvents = await ctx.db!.query.events.findMany({
       orderBy: (events, { desc }) => [desc(events.eventDate)],
@@ -76,7 +73,6 @@ export const eventRouter = createTRPCRouter({
     return allEvents;
   }),
 
-  // ADMIN: Get event with check-ins
   getById: isAdmin
     .input(z.object({ id: z.string().uuid() }))
     .query(async ({ ctx, input }) => {
@@ -115,7 +111,6 @@ export const eventRouter = createTRPCRouter({
       return event;
     }),
 
-  // ADMIN: Toggle check-in enabled
   toggleCheckIn: isAdmin
     .input(
       z.object({
@@ -136,21 +131,17 @@ export const eventRouter = createTRPCRouter({
       return updatedEvent;
     }),
 
-  // ADMIN: Delete event
   delete: isAdmin
     .input(z.object({ eventId: z.string().uuid() }))
     .mutation(async ({ ctx, input }) => {
       await ctx.db!.delete(events).where(eq(events.id, input.eventId));
       return { success: true };
     }),
 
-  // MEMBER: Check in to event via QR code (OPTIMIZED - Single Query)
   checkIn: protectedProcedure
     .input(z.object({ qrCode: z.string().uuid() }))
     .mutation(async ({ ctx, input }) => {
-      // Single transaction with all checks and inserts
       return await ctx.db!.transaction(async (tx) => {
-        // 1. Get event and validate in one query
         const event = await tx.query.events.findFirst({
           where: eq(events.qrCode, input.qrCode),
         });
@@ -169,15 +160,13 @@ export const eventRouter = createTRPCRouter({
           });
         }
 
-        // 2. Check max capacity
         if (event.maxCheckIns && event.currentCheckIns >= event.maxCheckIns) {
           throw new TRPCError({
             code: "BAD_REQUEST",
             message: "Event is full",
           });
         }
 
-        // 3. Get member and check for existing check-in in parallel
         const [member, existingCheckIn] = await Promise.all([
           tx.query.members.findFirst({
             where: eq(members.userId, ctx.userId!),
@@ -204,7 +193,6 @@ export const eventRouter = createTRPCRouter({
           });
         }
 
-        // 4. Create check-in and update counter
         await Promise.all([
           tx.insert(eventCheckIns).values({
             eventId: event.id,
@@ -227,7 +215,6 @@ export const eventRouter = createTRPCRouter({
       });
     }),
 
-  // MEMBER: Get my attended events
   myEvents: protectedProcedure.query(async ({ ctx }) => {
     const checkIns = await ctx.db!.query.eventCheckIns.findMany({
       where: eq(eventCheckIns.userId, ctx.userId!),
@@ -249,7 +236,6 @@ export const eventRouter = createTRPCRouter({
     return checkIns;
   }),
 
-  // MEMBER: Get my stats (OPTIMIZED - Single Aggregation Query)
   myStats: protectedProcedure.query(async ({ ctx }) => {
     const result = await ctx.db!
       .select({

packages/api/src/routers/admin.ts

@@ -23,7 +23,6 @@ export const hackathonRouter = createTRPCRouter({
       })
     )
     .query(async ({ ctx, input }) => {
-      // Generate cache key based on input parameters
       const cacheKey = `hackathons:list:${input.status || 'all'}:${input.upcoming ? 'upcoming' : 'all'}:${input.limit}:${input.offset}`;
 
       // Check cache first
@@ -43,7 +42,6 @@ export const hackathonRouter = createTRPCRouter({
         orderBy: (hackathons, { desc }) => [desc(hackathons.startDate)],
       });
 
-      // Cache for 60 seconds (hackathon lists don't change often)
       ctx.cache.set(cacheKey, allHackathons, 60);
 
       return allHackathons;
@@ -68,7 +66,6 @@ export const hackathonRouter = createTRPCRouter({
         });
       }
 
-      // Cache for 120 seconds
       ctx.cache.set(cacheKey, hackathon, 120);
 
       return hackathon;
@@ -109,7 +106,6 @@ export const hackathonRouter = createTRPCRouter({
         })
         .returning();
 
-      // Invalidate hackathon list cache
       ctx.cache.deletePattern('hackathons:*');
 
       return newHackathon;
@@ -143,7 +139,6 @@ export const hackathonRouter = createTRPCRouter({
     .mutation(async ({ ctx, input }) => {
       const { id, ...updateData } = input;
 
-      // Verify hackathon exists
       const existing = await ctx.db!.query.hackathons.findFirst({
         where: eq(hackathons.id, id),
       });
@@ -164,7 +159,6 @@ export const hackathonRouter = createTRPCRouter({
         .where(eq(hackathons.id, id))
         .returning();
 
-      // Invalidate hackathon caches
       ctx.cache.delete(CacheKeys.hackathon(id));
       ctx.cache.deletePattern('hackathons:*');
 
@@ -182,7 +176,6 @@ export const hackathonRouter = createTRPCRouter({
       })
     )
     .mutation(async ({ ctx, input }) => {
-      // Use transaction to prevent race conditions
       return await ctx.db!.transaction(async (tx) => {
         const hackathon = await tx.query.hackathons.findFirst({
           where: eq(hackathons.id, input.hackathonId),