Merge pull request #60 from leepoeaik/develop

fix(collaboration-service): Fix failing tests and remove unused code

Author: ChinZJ

collaboration-service/src/__tests__/codeServer.onBeforeConnect.test.ts

@@ -12,9 +12,10 @@ jest.unstable_mockModule('../storage/db.js', () => ({
   getDocument: jest.fn(),
   upsertDocument: jest.fn(),
   checkUserVerified: jest.fn(),
+  deleteRoom: jest.fn(),
 }));
 
-let YjsServer: typeof import('../party/codeServer.js').default;
+let YjsServer: typeof import('../party/websocketServer.js').default;
 
 class MockHeaders {
   private readonly store = new Map<string, string>();
@@ -41,7 +42,7 @@ const buildRequest = (url: string, headers: Record<string, string> = {}) =>
   }) as unknown as Request;
 
 beforeAll(async () => {
-  ({default: YjsServer} = await import('../party/codeServer.js'));
+  ({default: YjsServer} = await import('../party/websocketServer.js'));
 });
 
 describe('YjsServer.onBeforeConnect', () => {

collaboration-service/src/__tests__/codeServer.onConnect.test.ts

@@ -1,11 +1,22 @@
 import {afterAll, beforeAll, beforeEach, describe, expect, it, jest} from '@jest/globals';
+import {Buffer} from 'node:buffer';
+import type * as Party from 'partykit/server';
 import * as Y from 'yjs';
 
-const verifyTokenMock = jest.fn();
-const checkUserVerifiedMock = jest.fn();
-const getDocumentMock = jest.fn();
-const upsertDocumentMock = jest.fn();
-const partyOnConnectMock = jest.fn();
+const verifyTokenMock = jest.fn<() => Promise<{valid: boolean; payload?: any; error?: any}>>();
+const checkUserVerifiedMock = jest.fn<() => Promise<boolean>>();
+const getDocumentMock = jest.fn<() => Promise<{data: any; error: any}>>();
+const upsertDocumentMock = jest.fn<(roomId: string, content: Uint8Array) => Promise<{data: any; error: any}>>();
+const partyOnConnectMock = jest.fn<
+  (
+    connection: Party.Connection,
+    room: Party.Room,
+    options: {
+      load: () => Promise<Y.Doc>;
+      callback?: {handler: (doc: Y.Doc) => Promise<void>};
+    }
+  ) => Promise<void>
+>();
 
 jest.unstable_mockModule('../utils/jwt.js', () => ({
   verifyToken: verifyTokenMock,
@@ -16,17 +27,19 @@ jest.unstable_mockModule('../storage/db.js', () => ({
   getDocument: getDocumentMock,
   upsertDocument: upsertDocumentMock,
   checkRoomExists: jest.fn(),
+  deleteRoom: jest.fn(),
 }));
 
 jest.unstable_mockModule('y-partykit', () => ({
   onConnect: partyOnConnectMock,
 }));
 
-let YjsServer: typeof import('../party/codeServer.js').default;
+let YjsServer: typeof import('../party/websocketServer.js').default;
 
 const createConnection = () =>
   ({
     close: jest.fn(),
+    addEventListener: jest.fn(),
   }) as unknown as Party.Connection;
 
 const buildContext = (token?: string) =>
@@ -41,7 +54,7 @@ const buildContext = (token?: string) =>
 const room = {id: 'room-1'} as unknown as Party.Room;
 
 beforeAll(async () => {
-  ({default: YjsServer} = await import('../party/codeServer.js'));
+  ({default: YjsServer} = await import('../party/websocketServer.js'));
 });
 
 describe('YjsServer.onConnect', () => {
@@ -76,7 +89,7 @@ describe('YjsServer.onConnect', () => {
     const server = new YjsServer(room);
     const connection = createConnection();
 
-    verifyTokenMock.mockResolvedValue({valid: false, error: new Error('invalid token')} as any);
+    verifyTokenMock.mockResolvedValue({valid: false, error: new Error('invalid token')});
 
     await server.onConnect(connection, buildContext('token-1'));
 
@@ -91,7 +104,7 @@ describe('YjsServer.onConnect', () => {
     verifyTokenMock.mockResolvedValue({
       valid: true,
       payload: {userId: 'user-1'},
-    } as any);
+    });
     checkUserVerifiedMock.mockResolvedValue(false);
 
     await server.onConnect(connection, buildContext('token-1'));
@@ -110,10 +123,10 @@ describe('YjsServer.onConnect', () => {
     verifyTokenMock.mockResolvedValue({
       valid: true,
       payload: {userId: 'user-1'},
-    } as any);
+    });
     checkUserVerifiedMock.mockResolvedValue(true);
-    getDocumentMock.mockResolvedValue({data: null, error: null} as any);
-    upsertDocumentMock.mockResolvedValue({data: null, error: null} as any);
+    getDocumentMock.mockResolvedValue({data: null, error: null});
+    upsertDocumentMock.mockResolvedValue({data: null, error: null});
 
     partyOnConnectMock.mockImplementation(async (_connection, _, options) => {
       const doc = await options.load();
@@ -138,13 +151,13 @@ describe('YjsServer.onConnect', () => {
     verifyTokenMock.mockResolvedValue({
       valid: true,
       payload: {userId: 'user-1'},
-    } as any);
+    });
     checkUserVerifiedMock.mockResolvedValue(true);
     getDocumentMock.mockResolvedValue({
       data: {document: Buffer.from(encoded).toString('base64')},
       error: null,
-    } as any);
-    upsertDocumentMock.mockResolvedValue({data: null, error: null} as any);
+    });
+    upsertDocumentMock.mockResolvedValue({data: null, error: null});
 
     let loadedDoc: Y.Doc | null = null;
     partyOnConnectMock.mockImplementation(async (_connection, _, options) => {
@@ -153,7 +166,8 @@ describe('YjsServer.onConnect', () => {
 
     await server.onConnect(connection, buildContext('token-1'));
 
-    expect(loadedDoc?.getText('codemirror').toString()).toBe('hello');
+    expect(loadedDoc).not.toBeNull();
+    expect(loadedDoc!.getText('codemirror').toString()).toBe('hello');
   });
 
   it('closes the connection when loading the document fails', async () => {
@@ -163,20 +177,22 @@ describe('YjsServer.onConnect', () => {
     verifyTokenMock.mockResolvedValue({
       valid: true,
       payload: {userId: 'user-1'},
-    } as any);
+    });
     checkUserVerifiedMock.mockResolvedValue(true);
     getDocumentMock.mockResolvedValue({
       data: null,
       error: {message: 'database offline'},
-    } as any);
+    });
 
     partyOnConnectMock.mockImplementation(async (_connection, _, options) => {
+      // This will throw an error which should be caught by the outer try-catch
       await options.load();
     });
 
     await server.onConnect(connection, buildContext('token-1'));
 
     expect(connection.close).toHaveBeenCalledWith(4000, 'Internal server error');
+    expect(partyOnConnectMock).toHaveBeenCalledTimes(1);
   });
 });
 

collaboration-service/src/__tests__/yjsHelpers.test.ts

@@ -1,6 +1,6 @@
 import * as Y from 'yjs';
 
-import {ensureSharedStructures, pruneChatHistory} from '../party/codeServer.js';
+import {ensureSharedStructures, pruneChatHistory} from '../party/websocketServer.js';
 
 describe('Yjs helper utilities', () => {
   it('initialises the required collaborative structures', () => {
@@ -11,7 +11,8 @@ describe('Yjs helper utilities', () => {
     expect(doc.getText('codemirror')).toBeInstanceOf(Y.Text);
     expect(doc.getMap<string>('config')).toBeInstanceOf(Y.Map);
     expect(doc.getArray('chat')).toBeInstanceOf(Y.Array);
-    expect(doc.getMap('executionState')).toBeInstanceOf(Y.Map);
+    expect(doc.getMap('execution')).toBeInstanceOf(Y.Map);
+    expect(doc.getMap('submission')).toBeInstanceOf(Y.Map);
   });
 
   it('prunes chat history that exceeds the chat limit', () => {

docker-compose.yml

@@ -65,10 +65,10 @@ services:
     environment:
       - NODE_ENV=development
       - VITE_NGROK_COLLAB_HOST=${VITE_NGROK_COLLAB_HOST}
-      - VITE_HISTORY_SERVICE_URL=http://localhost:8085
+      - VITE_HISTORY_SERVICE_URL=${VITE_HISTORY_SERVICE_URL}
       - VITE_QUESTION_SERVICE_URL=http://localhost:8083
       - VITE_USER_SERVICE_URL=http://localhost:8080
-      - VITE_MATCHING_SERVICE_URL=http://localhost:8081
+      - VITE_MATCHING_SERVICE_URL=${VITE_MATCHING_SERVICE_URL}
     volumes:
       - ./frontend:/app
       - /app/node_modules

frontend/src/collaboration/components/CollabEditor.tsx

@@ -26,7 +26,6 @@ export default function CollabEditor({
   provider: YPartyKitProvider;
 }) {
   // const {ytext, awareness, isReady, languageConfig, setSharedLanguage} = useCollabEditor({roomId});
-  const [activeTab, setActiveTab] = useState('code');
   const {ytext, awareness, isReady, languageConfig, setSharedLanguage} = useCollabEditor({
     roomId,
     provider,
@@ -53,24 +52,10 @@ export default function CollabEditor({
       {/* Header with tabs and language selector */}
       <div className="flex items-center px-4 justify-between w-full border-b border-gray-200 py-2 flex-shrink-0">
         <div className="flex items-center space-x-4">
-          <button
-            onClick={() => setActiveTab('code')}
-            className={`flex items-center space-x-2 px-3 py-2 rounded ${
-              activeTab === 'code' ? 'bg-gray-100' : 'hover:bg-gray-50'
-            }`}
-          >
+          <button className={`flex items-center space-x-2 px-3 py-2 rounded 'bg-gray-100'}`}>
             <Code size={16} />
             <span className="text-sm font-medium">Code</span>
           </button>
-          <button
-            onClick={() => setActiveTab('whiteboard')}
-            className={`flex items-center space-x-2 px-3 py-2 rounded ${
-              activeTab === 'whiteboard' ? 'bg-gray-100' : 'hover:bg-gray-50'
-            }`}
-          >
-            <Image size={16} />
-            <span className="text-sm font-medium">Whiteboard</span>
-          </button>
         </div>
 
         <div className="flex items-center space-x-2"></div>

frontend/src/collaboration/components/SubmissionPanel.tsx

@@ -10,9 +10,11 @@ import useAuth from '@/hooks/useAuth';
 import * as Y from 'yjs';
 
 // const HISTORY_SERVICE_URL = import.meta.env.VITE_HISTORY_SERVICE_URL || 'http://localhost:8085';
-const HISTORY_SERVICE_URL = 'http://localhost:8085';
-const MATCHING_SERVICE_URL = 'http://localhost:8081';
-const COLLAB_SERVICE_URL = 'http://localhost:8082';
+const HISTORY_SERVICE_URL = import.meta.env['VITE_HISTORY_SERVICE_URL'] || 'http://localhost:8085';
+const MATCHING_SERVICE_URL =
+  import.meta.env['VITE_MATCHING_SERVICE_URL'] || 'http://localhost:8081';
+const COLLAB_SERVICE_URL =
+  `http://${import.meta.env['VITE_NGROK_COLLAB_HOST']}` || 'http://localhost:8082';
 
 export default function SubmissionPanel({
   isPenaltyOver,
@@ -311,11 +313,6 @@ export default function SubmissionPanel({
             <span>{isSubmitting ? 'Submitting...' : 'Submit Solution'}</span>
           </button>
 
-          <button className="w-full border border-gray-300 hover:bg-gray-50 py-3 rounded-lg font-semibold flex items-center justify-center space-x-2">
-            <Eye size={18} />
-            <span>View Solution</span>
-          </button>
-
           <button
             className="w-full bg-red-500 hover:bg-red-600 disabled:bg-gray-400 disabled:cursor-not-allowed text-white py-3 rounded-lg font-semibold flex items-center justify-center space-x-2"
             disabled={isLeavingRoom}