feat: Add report location backend

.env.test

@@ -0,0 +1,6 @@
+# placeholder variables used for running tests
+AXIOS_RETRY_INTERVAL_MS=0
+IN_TEST_MODE=true
+SLACK_BACKEND_WEBHOOK_URL=/
+SLACK_FRONTEND_WEBHOOK_URL=/
+DATABASE_URL=/

.github/dependabot.yml

@@ -1,14 +1,14 @@
 version: 2
 updates:
   # Enable version updates for npm
-  - package-ecosystem: 'npm'
+  - package-ecosystem: "npm"
     # Look for `package.json` and `lock` files in the `root` directory
-    directory: '/'
+    directory: "/"
     # Check the npm registry for updates every day (weekdays)
     schedule:
-      interval: 'daily'
-  - package-ecosystem: 'github-actions'
-    directory: '/'
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
     schedule:
       # Check for updates to GitHub Actions every weekday
-      interval: 'daily'
+      interval: "daily"

.github/workflows/test.yml

@@ -6,11 +6,23 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [24]
     steps:
       - uses: actions/checkout@v4
-      - uses: oven-sh/setup-bun@v2 # Setup bun
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
         with:
-          bun-version: latest
-      - run: bun install
-      - name: Run bun test
-        run: bun run test
+          version: 10
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: "pnpm"
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+      - name: run tests
+        run: pnpm test:coverage
+      - name: "Report Coverage"
+        uses: davelosert/vitest-coverage-report-action@v2

Dockerfile

@@ -1,10 +1,20 @@
-FROM oven/bun:latest
+# this is the file that railway will run
+FROM node:24-slim AS base
+ENV PNPM_HOME="/pnpm"
+# ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+COPY . /app
+WORKDIR /app
 
-WORKDIR /runtime
-COPY . /runtime
+FROM base AS prod-deps
+RUN --mount=type=cache,id=s/8ced5fd2-dd3a-4a6d-9429-f4bcf2553871-/pnpm/store,target=/pnpm/store pnpm install --prod --frozen-lockfile
 
-RUN bun install
-RUN bun run build
+FROM base AS build
+RUN --mount=type=cache,id=s/8ced5fd2-dd3a-4a6d-9429-f4bcf2553871-/pnpm/store,target=/pnpm/store pnpm install --frozen-lockfile
+RUN pnpm run build
 
+FROM base
+COPY --from=prod-deps /app/node_modules /app/node_modules
+COPY --from=build /app/dist /app/dist
 EXPOSE 5010
-CMD bun run start
+CMD ["sh","./run-pnpm.sh"]

Dockerfile.pnpm.simple

@@ -0,0 +1,12 @@
+FROM node:24-slim AS base
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+COPY . /app
+WORKDIR /app
+
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install
+RUN pnpm run build
+
+EXPOSE 5010
+CMD ["sh","./run-pnpm.sh"]

README.md

@@ -1,11 +1,8 @@
 # Dining API
 
-> [!IMPORTANT]  
-> Make sure `bun` is on the latest version! (Earlier versions are rather buggy) Run `bun upgrade` to update.
+This Dining API scrapes location data from the CMU dining sites and distributes it as a RESTful API. Access the API [here](https://dining.apis.scottylabs.org/).
 
-This Dining API scrapes location data from the CMU dining sites and distributes it as a RESTful API. Access the API [here](https://apis.scottylabs.org/dining/).
-
-To build and deploy the service, you'll need [Bun](https://bun.sh),
+To build and deploy the service, you'll need [pnpm](https://pnpm.io/),
 which you should install beforehand.
 
 Then, clone this repository to your computer by running
@@ -27,24 +24,32 @@ If you already have the node_modules folder or package-lock.json from previous v
 Now install the API's dependencies by 'cd'-ing into the root of the repository and running:
 
 ```
-bun install
+pnpm install
 ```
 
-Then, you can run the server with `bun dev` and it should work! You can also use
-`bun run dev` since `bun dev` is its shorthand version.
+Start your local database with `pnpm db:start`, `pnpm db:push` (if this is your first time) and then start the server with `pnpm dev` and it should work, assuming you have the correct env variables. (To see the contents of the database, I recommend using DBeaver. You can also run `pnpm db:studio` to start up drizzle studio)
+
+## Database schema changes (important!)
+
+When you make changes to the database schema, be sure to run `pnpm db:push` to keep your local db in sync.
 
-Note: To add new dependencies, use `bun add dependency-name`. To remove dependencies, use `bun remove dependency-name`. Run `bun outdated` to see what dependencies are outdated and `bun update` to update all outdated dependencies to the latest version.
+Before merging your PR, be sure to run `pnpm db:generate` to generate a migration file, which will then be automatically applied to the staging and production databases when deployed. (You should do this before running tests as well!)
 
-## Testing the Dockerfile
+To test if the migration files work, you can run `pnpm run-prod`, which will spin up a production version of the server and a postgres database mounted on a new volume. The server is created using the same Dockerfile used in our Railway deployments, so if it works locally, it (probably) works in production as well.
 
-Build: `docker build -f Dockerfile . -t dining`
-Run the server: `docker run -p 127.0.0.1:5010:5010 dining`
-Run bash inside it (for debugging): `docker run --rm -it --entrypoint bash -p 127.0.0.1:5010:5010 dining`
+## Extra docker commands
+
+Run bash inside it (for debugging): `docker run --rm -it --entrypoint bash  dining-api-server`
+Close dockerfile + delete volumes: `docker-compose down --volumes`
 
 ## Under the hood
 
 We get the entire list of locations from `DINING_URL`, fetch location specifics under their corresponding `CONCEPT_BASE_LINK`, and retrieve soups and specials from `DINING_SOUPS_URL` and `DINING_SPECIALS_URL`, respectively. See the `process()` method in `diningParser.ts` for more details.
 
 ## Before submitting a PR
 
-- Make sure all tests pass with `bun run test` or `bun run test --watch` for watch mode. (NOTE! `bun test` does something different and does NOT work!)
+- Make sure all tests pass with `pnpm test` or `pnpm test --watch` for watch mode.
+
+## Random notes
+
+the "cheerio" package is pinned at version "1.0.0-rc.12" because newer versions seem to be incompatible with jest.