D7: Docker files, bug fixes

Author: cyiting

backend/collaboration/entrypoint.sh

@@ -1,2 +1,13 @@
 #!/bin/sh
+
+# Drizzle will handle its own logic to remove conflicts
+npm run db:prod:migrate
+
+# Checks admin table and will not seed if data exists
+npm run db:prod:seed
+
+rm -rf drizzle src tsconfig.json
+
+npm uninstall tsx drizzle-kit
+
 npm run start

backend/collaboration/express.Dockerfile

@@ -15,6 +15,12 @@ RUN npm ci --omit=dev
 
 RUN sed -i 's|./ws|ws|g' ./dist/ws.js
 
+# For migration
+RUN npm install tsx drizzle-kit
+COPY drizzle ./drizzle
+COPY src/lib/db/ ./src/lib/db
+COPY src/config.ts ./src
+COPY tsconfig.json .
 COPY entrypoint.sh .
 
 ARG port

backend/collaboration/src/controller/room-auth-controller.ts

@@ -1,4 +1,4 @@
-import { eq } from 'drizzle-orm';
+import { sql } from 'drizzle-orm';
 import type { Request, Response } from 'express';
 import { StatusCodes } from 'http-status-codes';
 
@@ -7,8 +7,9 @@ import { db, rooms } from '@/lib/db';
 export async function authCheck(req: Request, res: Response) {
   const roomId = req.query.roomId as string | undefined;
   const userId = req.query.userId as string | undefined;
+  const questionId = req.query.questionId as string | undefined;
 
-  if (!roomId || !userId) {
+  if (!roomId || !userId || !questionId) {
     return {
       code: StatusCodes.UNPROCESSABLE_ENTITY,
       error: {
@@ -18,7 +19,11 @@ export async function authCheck(req: Request, res: Response) {
   }
 
   try {
-    const room = await db.select().from(rooms).where(eq(rooms.roomId, roomId)).limit(1);
+    const room = await db
+      .select()
+      .from(rooms)
+      .where(sql`${rooms.roomId} = ${roomId} and ${rooms.questionId} = ${questionId}`)
+      .limit(1);
 
     if (room.length === 0) {
       return res.status(StatusCodes.NOT_FOUND).json({

frontend/src/routes/interview/[room]/main.tsx

@@ -28,11 +28,10 @@ export const InterviewRoomContainer = () => {
   const { userId } = useAuthedRoute();
 
   const safeRoomId = roomId ?? '';
-  const safeUserId = userId ?? '';
 
   const { data: authResult, error } = useSuspenseQuery({
-    queryKey: ['checkRoomAuthorization', safeRoomId, safeUserId],
-    queryFn: () => checkRoomAuthorization(safeRoomId!, safeUserId!),
+    queryKey: ['checkRoomAuthorization', safeRoomId, userId, questionId],
+    queryFn: () => checkRoomAuthorization(safeRoomId!, userId!, questionId),
   });
 
   if (error || !authResult?.isAuthed || !roomId) {

frontend/src/services/collab-service.ts

@@ -1,13 +1,15 @@
 import { collabApiGetClient } from './api-clients';
 
 const COLLAB_SERVICE_ROUTES = {
-  CHECK_ROOM_AUTH: '/room/auth?roomId=<roomId>&userId=<userId>',
+  CHECK_ROOM_AUTH: '/room/auth?roomId=<roomId>&userId=<userId>&questionId=<questionId>',
 };
 
-export const checkRoomAuthorization = (roomId: string, userId: string) => {
+export const checkRoomAuthorization = (roomId: string, userId: string, questionId: number) => {
   return collabApiGetClient
     .get(
-      COLLAB_SERVICE_ROUTES.CHECK_ROOM_AUTH.replace(/<roomId>/, roomId).replace(/<userId>/, userId)
+      COLLAB_SERVICE_ROUTES.CHECK_ROOM_AUTH.replace(/<roomId>/, roomId)
+        .replace(/<userId>/, userId)
+        .replace(/<questionId>/, questionId.toString())
     )
     .then((response) => {
       return { isAuthed: response.status < 400 };

scripts/migrate-seed-databases.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Migrate Services
-migrate_services=("question" "user" "chat")
+migrate_services=("question" "user" "chat" "collaboration")
 for service in "${migrate_services[@]}"; do
   cd "backend/$service"
   npm run db:migrate