Fix static eatery event times, dev override, and favorite matches format

.github/workflows/deploy-dev.yml

@@ -1,4 +1,4 @@
-name: Docker Build & Push and Deploy to dev for eatery-blue-backend
+name: Docker Build & Push and Deploy to dev for eatery-backend
 
 on:
   push:
@@ -32,7 +32,7 @@ jobs:
           context: ./
           file: ./Dockerfile
           push: true
-          tags: cornellappdev/eatery-blue-dev:${{ steps.vars.outputs.sha_short }}
+          tags: cornellappdev/eatery-dev:${{ steps.vars.outputs.sha_short }}
 
       - name: Remote SSH and Deploy
         uses: appleboy/ssh-action@v1.0.3
@@ -45,7 +45,7 @@ jobs:
           script: |
             export IMAGE_TAG=${{ steps.vars.outputs.sha_short }}
             cd docker-compose
-            docker stack rm thestack
+            docker-compose down
             sleep 20s
-            docker stack deploy -c docker-compose.yml thestack
+            docker-compose up -d
             yes | docker system prune -a

prisma/scraper.ts

@@ -1,3 +1,4 @@
+import { fromZonedTime } from 'date-fns-tz';
 import 'dotenv/config';
 import { readFileSync } from 'fs';
 import cron from 'node-cron';
@@ -11,6 +12,7 @@ import {
 } from '@prisma/client';
 
 import { DEFAULT_IMAGE_URL } from '../src/constants.js';
+import { TimeZone } from '../src/constants.js';
 import {
   createWeeklyDate,
   mapCampusArea,
@@ -197,8 +199,14 @@ function transformStaticEatery(rawStaticEatery: RawStaticEatery) {
 
   for (const operatingHour of rawStaticEatery.operatingHours) {
     for (const event of operatingHour.events) {
-      const startDate = createWeeklyDate(operatingHour.weekday, event.start);
-      const endDate = createWeeklyDate(operatingHour.weekday, event.end);
+      const startDate = fromZonedTime(
+        createWeeklyDate(operatingHour.weekday, event.start),
+        TimeZone.EASTERN,
+      );
+      const endDate = fromZonedTime(
+        createWeeklyDate(operatingHour.weekday, event.end),
+        TimeZone.EASTERN,
+      );
 
       if (endDate < startDate) {
         endDate.setDate(endDate.getDate() + 1);

src/middleware/authentication.ts

@@ -10,13 +10,6 @@ export const requireAuth = (
   _res: Response,
   next: NextFunction,
 ) => {
-  // Development bypass
-  if (process.env.NODE_ENV === 'development') {
-    req.user = {
-      userId: 1,
-    };
-    return next();
-  }
 
   const authHeader = req.headers.authorization;
   if (!authHeader || !authHeader.startsWith('Bearer ')) {

src/users/userController.ts

@@ -226,7 +226,7 @@ export const getFavoriteMatches = async (
     const { favoritedItemNames } = user;
 
     if (favoritedItemNames.length === 0) {
-      return res.json({});
+      return res.json([]);
     }
 
     const { start, end } = getTodayTimeWindow();
@@ -271,7 +271,10 @@ export const getFavoriteMatches = async (
     });
 
     // Format the response
-    const matches: Record<string, { name: string; events: EventType[] }[]> = {};
+    const matches: {
+      eateryName: string;
+      items: { name: string; events: EventType[] }[];
+    }[] = [];
     const userFavoritesSet = new Set(favoritedItemNames);
 
     for (const eatery of eateries) {
@@ -292,12 +295,15 @@ export const getFavoriteMatches = async (
       }
 
       if (itemToEventsMap.size > 0) {
-        matches[eatery.name] = Array.from(itemToEventsMap.entries()).map(
-          ([itemName, eventSet]) => ({
-            name: itemName,
-            events: Array.from(eventSet).sort(),
-          }),
-        );
+        matches.push({
+          eateryName: eatery.name,
+          items: Array.from(itemToEventsMap.entries()).map(
+            ([itemName, eventSet]) => ({
+              name: itemName,
+              events: Array.from(eventSet).sort(),
+            }),
+          ),
+        });
       }
     }