merge

Author: akmatchev

.env.example

@@ -5,6 +5,8 @@ WORKERS=
 # Server Configuration
 PORT=8000
 NODE_ENV=development
+CACHE_REFRESH_HEADER=
+CACHE_REFRESH_SECRET=
 
 # Database Configuration
 DATABASE_URL=

package-lock.json

@@ -29,17 +29,20 @@
   "dependencies": {
     "@prisma/client": "^6.16.2",
     "dotenv": "^17.2.3",
+    "escape-html": "^1.0.3",
     "express": "^5.1.0",
     "express-rate-limit": "^8.1.0",
     "firebase-admin": "^13.5.0",
     "helmet": "^8.1.0",
     "node-cron": "^4.2.1",
+    "node-cache": "^5.1.2",
     "zod": "^4.1.12"
   },
   "devDependencies": {
     "@eslint/js": "^9.36.0",
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",
     "@types/cookie-parser": "^1.4.9",
+    "@types/escape-html": "^1.0.4",
     "@types/express": "^5.0.3",
     "@types/node": "^24.5.2",
     "@types/node-cron": "^3.0.11",

package.json

@@ -0,0 +1,10 @@
+import { z } from 'zod';
+
+export const getAllEateriesSchema = z.object({
+  query: z.object({
+    days: z.coerce.number().int().min(0).default(0),
+  }),
+});
+
+// Schema for validating cached eatery data
+export const EaterySchema = z.array(z.any()); // This will be validated by the scraper that sends the data

src/courses/courseController.ts

@@ -0,0 +1,17 @@
+import type { Request, Response } from 'express';
+
+import * as eateryService from './eateryService.js';
+
+export const getAllEateries = async (req: Request, res: Response) => {
+  const { days } = req.query;
+  const eateries = await eateryService.getAllEateries(
+    days as number | undefined,
+  );
+  return res.json(eateries);
+};
+
+export const getEateryById = async (req: Request, res: Response) => {
+  const eateryId = parseInt(req.params.eateryId, 10);
+  const eatery = await eateryService.getEateryById(eateryId);
+  return res.json(eatery);
+};

src/courses/courses.schema.ts

@@ -0,0 +1,10 @@
+import { Router } from 'express';
+
+import { validateRequest } from '../middleware/validateRequest.js';
+import { getAllEateriesSchema } from './eateries.schema.js';
+import { getAllEateries, getEateryById } from './eateryController.js';
+
+export const eateryRouter = Router();
+
+eateryRouter.get('/', validateRequest(getAllEateriesSchema), getAllEateries);
+eateryRouter.get('/:eateryId', getEateryById);

src/eateries/eateries.schema.ts

@@ -0,0 +1,105 @@
+import type { Event } from '@prisma/client';
+
+import { prisma } from '../prisma.js';
+import { NotFoundError } from '../utils/AppError.js';
+import { getAllEateriesData } from '../utils/cache.js';
+
+export const getAllEateries = async (days: number = 0) => {
+  // Calculate date range for filtering events
+  // days=0 means today, days=1 means tomorrow, etc.
+  const now = new Date();
+  const targetDay = new Date(now);
+  targetDay.setDate(now.getDate() + days);
+
+  const startOfDay = new Date(targetDay);
+  startOfDay.setHours(0, 0, 0, 0);
+
+  const endOfDay = new Date(targetDay);
+  endOfDay.setHours(23, 59, 59, 999);
+
+  // Try to get from cache first
+  try {
+    const cachedEateries = getAllEateriesData();
+
+    // Filter events to only include those on the specified day
+    const filteredEateries = cachedEateries.map((eatery) => ({
+      ...eatery,
+      events: eatery.events.filter((event: Event) => {
+        const eventStart = new Date(event.startTimestamp);
+        const eventEnd = new Date(event.endTimestamp);
+
+        // Include event if it overlaps with the target day
+        return eventStart <= endOfDay && eventEnd >= startOfDay;
+      }),
+    }));
+
+    return filteredEateries;
+  } catch {
+    // If cache is cold (should never happen), fall back to database
+    const eateries = await prisma.eatery.findMany({
+      include: {
+        events: {
+          where: {
+            startTimestamp: {
+              lte: endOfDay,
+            },
+            endTimestamp: {
+              gte: startOfDay,
+            },
+          },
+        },
+      },
+    });
+
+    return eateries;
+  }
+};
+
+export const getEateryById = async (eateryId: number) => {
+  // Try to get eatery from cache first
+  try {
+    const cachedEateries = getAllEateriesData();
+    const eatery = cachedEateries.find((e) => e.id === eateryId);
+
+    if (!eatery) {
+      throw new NotFoundError('Eatery not found');
+    }
+
+    return eatery;
+  } catch (error) {
+    // If cache is cold or eatery not found in cache, fall back to database
+    if (error instanceof NotFoundError) {
+      throw error;
+    }
+
+    const eatery = await prisma.eatery.findUnique({
+      where: { id: eateryId },
+      include: {
+        events: {
+          include: {
+            menu: {
+              include: {
+                items: {
+                  include: {
+                    dietaryPreferences: true,
+                    allergens: true,
+                  },
+                },
+              },
+            },
+            userEventVotes: true,
+          },
+          orderBy: {
+            startTimestamp: 'asc',
+          },
+        },
+      },
+    });
+
+    if (!eatery) {
+      throw new NotFoundError('Eatery not found');
+    }
+
+    return eatery;
+  }
+};

src/eateries/eateryController.ts

@@ -5,7 +5,6 @@ import express from 'express';
 import type { Request, Response } from 'express';
 
 import authRouter from './auth/authRouter.js';
-import courseRouter from './courses/courseRouter.js';
 import { requireAuth } from './middleware/authentication.js';
 import { globalErrorHandler } from './middleware/errorHandler.js';
 import { requestLogger } from './middleware/logger.js';
@@ -51,7 +50,6 @@ router.use('/auth', authRouter);
 
 // Protected routes (require GET authentication)
 router.use(requireAuth);
-router.use('/courses', courseRouter);
 
 app.use(router);