chore(deps): bump js-yaml in /app

.github/workflows/docker.yml

@@ -8,6 +8,7 @@ on:
 env:
   ENVIRONMENT: ${{ github.ref_name == 'master' && 'prod' || 'staging' }}
   IMAGE_NAME: ${{ github.ref_name == 'master' && 'freerooms' || 'freerooms-staging' }}
+  BRANCH_NAME: ${{ github.base_ref || github.ref_name }}
 
 jobs:
   build:
@@ -55,6 +56,8 @@ jobs:
             ghcr.io/devsoc-unsw/${{ env.IMAGE_NAME }}-${{ matrix.name }}:${{ github.sha }}
             ghcr.io/devsoc-unsw/${{ env.IMAGE_NAME }}-${{ matrix.name }}:latest
           labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            ${{ env.BRANCH_NAME == 'dev' && matrix.context == 'frontend' && 'NEXT_PUBLIC_STAGING=true' || '' }}
   deploy:
     name: Deploy (CD)
     runs-on: ubuntu-latest

app/components/RoomCard.tsx

@@ -22,8 +22,6 @@ const RoomCard: React.FC<RoomCardProps> = ({
     nav.navigate("Room", { roomName, roomId, status });
   };
 
-  //   console.log(roomName);
-
   const date = new Date(status.endtime);
   const hoursMinutes = date.toLocaleTimeString("en-AU", {
     hour: "numeric",

backend/src/ratingDbInterface.ts

@@ -1,7 +1,9 @@
 import {
+  AverageRating,
   BuildingRatingsResponse,
   Rating,
   RatingsResponse,
+  RawRatingDocument,
 } from "@common/types";
 import dotenv from "dotenv";
 import { Collection, MongoClient } from "mongodb";
@@ -102,13 +104,19 @@ export async function insertBuldingRating(
   }
 }
 
-export async function getRatings(roomId: string): Promise<Rating[]> {
+export async function getRatings(roomId: string): Promise<RatingsResponse> {
   if (!MONGO_URI) {
     throw new Error("MONGO_URI not found");
   }
 
   const client = new MongoClient(MONGO_URI);
 
+  const averagedRatings: AverageRating = {
+    cleanliness: 0,
+    location: 0,
+    quietness: 0,
+  };
+
   try {
     await client.connect();
     const database = client.db("room-ratings");
@@ -124,16 +132,39 @@ export async function getRatings(roomId: string): Promise<Rating[]> {
 
     // Document found, return ratings array
     if (roomDoc !== null) {
-      const roomRating = roomDoc as unknown as RatingsResponse;
-      return roomRating.ratings;
+      const foundDoc = roomDoc as unknown as RawRatingDocument;
+      let averagedOverallRating = 0;
+
+      foundDoc.ratings.map((doc: Rating) => {
+        averagedRatings.cleanliness += doc.cleanliness;
+        averagedRatings.location += doc.location;
+        averagedRatings.quietness += doc.quietness;
+        averagedOverallRating += doc.overall;
+      });
+
+      const numFound = foundDoc.ratings.length;
+      if (foundDoc.ratings.length > 0) {
+        averagedRatings.cleanliness /= numFound;
+        averagedRatings.location /= numFound;
+        averagedRatings.quietness /= numFound;
+        averagedOverallRating /= numFound;
+      }
+
+      const res = {
+        roomId: foundDoc.roomId,
+        overallRating: averagedOverallRating,
+        averageRating: averagedRatings,
+      };
+
+      return res;
     }
   } catch (error) {
     console.error("Error finding item:", error);
   } finally {
     await client.close();
   }
-  // No document found, return empty array
-  return [];
+  // No document found, return empty object
+  return { roomId: roomId, overallRating: 0, averageRating: averagedRatings };
 }
 
 export async function getBuildingRatings(

common/types.ts

@@ -53,6 +53,12 @@ export type Rating = {
   overall: number;
 };
 
+export type AverageRating = {
+  cleanliness: number;
+  location: number;
+  quietness: number;
+}
+
 ///////////////////////////////////////////////////////////////
 // API Response Types
 
@@ -80,10 +86,18 @@ export type BookingsResponse = {
   bookings: Booking[];
 };
 
+
+// how ratings are stored in Mongo
+export type RawRatingDocument = { 
+  roomId: string, 
+  ratings: Rating[] 
+}
+
 export type RatingsResponse = {
   // roomId refers to room name
   roomId: string;
-  ratings: Rating[];
+  overallRating: number;
+  averageRating: AverageRating;
 };
 
 export type BuildingRatingsResponse = {

frontend.dockerfile

@@ -11,11 +11,17 @@ RUN npm ci
 # Rebuild the source code only when needed
 FROM node:22-alpine AS builder
 
+# Accept build args for environment variables
+ARG NEXT_PUBLIC_STAGING=false
+
 WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
 COPY /frontend .
 COPY common ../common
 
+# Set the environment variable for Next.js build
+ENV NEXT_PUBLIC_STAGING=$NEXT_PUBLIC_STAGING
+
 # Next.js collects completely anonymous telemetry data about general usage.
 # Learn more here: https://nextjs.org/telemetry
 # Uncomment the following line in case you want to disable telemetry during the build.