Merge pull request #220 from CS3219-AY2425S1/219-final-bug-fix

Final bug fixes
CS3219-AY2425S1 · Nov 13, 2024 · d49d36d · d49d36d
2 parents 714b694 + 0e9afb4
commit d49d36d
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 15 deletions.
diff --git a/backend/collaboration-service/src/services/socketio.service.ts b/backend/collaboration-service/src/services/socketio.service.ts
@@ -63,6 +63,7 @@ export class WebSocketConnection {
 
             socket.on('end-session', async () => {
                 const socketsInRoom = this.io.sockets.adapter.rooms.get(roomId)
+                this.io.to(roomId).emit('session-ended')
                 if (socketsInRoom) {
                     socketsInRoom.forEach((socketId) => {
                         const socket = this.io.sockets.sockets.get(socketId)

diff --git a/backend/matching-service/src/controllers/matching.controller.ts b/backend/matching-service/src/controllers/matching.controller.ts
@@ -11,7 +11,7 @@ import logger from '../common/logger.util'
 import {
     createMatch,
     findCompletedQuestionCount,
-    findMatchCount,
+    findMatchCountByUserId,
     findOngoingMatch,
     findPaginatedMatches,
     findPaginatedMatchesWithSort,
@@ -165,7 +165,7 @@ export async function handleGetPaginatedSessions(request: IPaginationRequest, re
         response.status(400).json('INVALID_SORT').send()
         return
     }
-    const count = await findMatchCount()
+    const count = await findMatchCountByUserId(userId)
     let matches: IMatch[]
 
     if (sortBy.length) {

diff --git a/backend/matching-service/src/models/matching.repository.ts b/backend/matching-service/src/models/matching.repository.ts
@@ -64,8 +64,10 @@ export function isValidSort(key: string, order: string): boolean {
     return orders.includes(order) && keys.includes(key)
 }
 
-export async function findMatchCount(): Promise<number> {
-    return matchModel.countDocuments()
+export async function findMatchCountByUserId(userId: string): Promise<number> {
+    return matchModel.countDocuments({
+        $or: [{ user1Id: userId }, { user2Id: userId }],
+    })
 }
 
 export async function findOngoingMatch(userId: string): Promise<IMatch> {

diff --git a/frontend/components/account/Settings.tsx b/frontend/components/account/Settings.tsx
@@ -38,8 +38,11 @@ function Setting() {
             setIsFormSubmit(true)
             toggleUpdateDialogOpen(false)
             update({ ...session, user: response })
-            toast.success('Profile has been updated successfully.')
+            toast.success('Profile has been updated successfully. You will be signed out.')
             setFormValues({ ...initialFormValues, email: defaultEmail })
+            setTimeout(async () => {
+                await signOut({ callbackUrl: '/auth' })
+            }, 1000)
         } catch (error) {
             if (error instanceof Error) {
                 toast.error(error.message)
@@ -92,6 +95,7 @@ function Setting() {
                             value={formValues.email}
                             onChange={handleFormChange}
                             error={formErrors.email}
+                            isDisabled={true}
                         />
 
                         <InputField

diff --git a/frontend/components/auth/PasswordReset.tsx b/frontend/components/auth/PasswordReset.tsx
@@ -144,7 +144,7 @@ export function PasswordReset() {
                 className="w-full py-3 px-3 border bg-[#EFEFEF] rounded-[5px]"
             />
             <DialogFooter>
-                <Button type="submit" className="bg-purple-600 hover:bg-[#A78BFA]" onClick={onEnterEmail}>
+                <Button type="submit" variant="primary" onClick={onEnterEmail}>
                     Send Email
                 </Button>
             </DialogFooter>

diff --git a/frontend/components/customs/custom-input.tsx b/frontend/components/customs/custom-input.tsx
@@ -14,6 +14,7 @@ interface InputFieldProps {
     className?: string
     page?: string
     handleKeyDown?: (e: React.KeyboardEvent<HTMLInputElement>) => void
+    isDisabled?: boolean
 }
 
 interface OptionsFieldProps {
@@ -39,6 +40,7 @@ export const InputField = (props: InputFieldProps): JSX.Element => {
                     placeholder={props.placeholder}
                     value={props.value}
                     onChange={props.onChange}
+                    disabled={props.isDisabled}
                     className={
                         props.className
                             ? props.className

diff --git a/frontend/pages/code/[id]/index.tsx b/frontend/pages/code/[id]/index.tsx
@@ -132,6 +132,12 @@ export default function Code() {
         })
 
         socketRef.current.on('disconnect', () => {
+            if (!isViewOnly) {
+                router.push('/')
+            }
+        })
+
+        socketRef.current.on('session-ended', () => {
             if (!isViewOnly) {
                 router.push('/')
                 toast.info('The session has ended')
@@ -197,7 +203,6 @@ export default function Code() {
     function handleEndSessionConfirmation() {
         if (socketRef.current) {
             socketRef.current.emit('end-session')
-            router.push('/')
         }
         setIsDialogOpen(false)
     }

diff --git a/frontend/pages/sessions/index.tsx b/frontend/pages/sessions/index.tsx
@@ -44,6 +44,7 @@ export default function Sessions() {
     })
 
     const handleConfirmSessionOver = () => {
+        loadData()
         setDialog((prev) => ({ ...prev, dialogData: { ...prev.dialogData, isOpen: false } }))
         setOngoingSession('')
     }

diff --git a/frontend/services/question-service-api.ts b/frontend/services/question-service-api.ts
@@ -23,7 +23,8 @@ export const getQuestionsRequest = async (data: IGetQuestions): Promise<IQuestio
         return response
     } catch (error) {
         if (axios.isAxiosError(error)) {
-            throw new Error('An unexpected error occurred: ' + error.message)
+            const errMsg = error?.response?.data || 'INTERNAL SERVER ERROR'
+            throw new Error('An unexpected error occurred: ' + errMsg)
         } else {
             throw new Error('An unexpected error occurred')
         }
@@ -47,12 +48,13 @@ export const getQuestionbyIDRequest = async (id: string): Promise<IQuestion | un
     } catch (error) {
         if (axios.isAxiosError(error)) {
             const statusCode = error.response?.status
+            const errMsg = error?.response?.data || 'INTERNAL SERVER ERROR'
 
             switch (statusCode) {
                 case 404:
                     throw new Error('Error getting questions: No such user!')
                 default:
-                    throw new Error('An error occurred: ' + error.message)
+                    throw new Error('An error occurred: ' + errMsg)
             }
         } else {
             throw new Error('An unexpected error occurred')
@@ -77,6 +79,7 @@ export const createQuestionRequest = async (data: IQuestion): Promise<IQuestion
     } catch (error) {
         if (axios.isAxiosError(error)) {
             const statusCode = error.response?.status
+            const errMsg = error?.response?.data || 'INTERNAL SERVER ERROR'
 
             switch (statusCode) {
                 case 404:
@@ -89,7 +92,7 @@ export const createQuestionRequest = async (data: IQuestion): Promise<IQuestion
                             error.response?.data.map((err: string) => `(${err})`).join(', ')
                     )
                 default:
-                    throw new Error('An unexpected error occurred: ' + error.message)
+                    throw new Error('An unexpected error occurred: ' + errMsg)
             }
         } else {
             throw new Error('An unexpected error occurred')
@@ -111,6 +114,7 @@ export const updateQuestionRequest = async (data: IQuestion): Promise<IQuestion
     } catch (error) {
         if (axios.isAxiosError(error)) {
             const statusCode = error.response?.status
+            const errMsg = error?.response?.data || 'INTERNAL SERVER ERROR'
 
             switch (statusCode) {
                 case 401:
@@ -123,7 +127,7 @@ export const updateQuestionRequest = async (data: IQuestion): Promise<IQuestion
                             error.response?.data.map((err: string) => `(${err})`).join(', ')
                     )
                 default:
-                    throw new Error('An unexpected error occurred: ' + error.message)
+                    throw new Error('An unexpected error occurred: ' + errMsg)
             }
         } else {
             throw new Error('An unexpected error occurred')
@@ -139,14 +143,15 @@ export const deleteQuestionById = async (id: string): Promise<IQuestion | undefi
     } catch (error) {
         if (axios.isAxiosError(error)) {
             const statusCode = error.response?.status
+            const errMsg = error?.response?.data || 'INTERNAL SERVER ERROR'
 
             switch (statusCode) {
                 case 401:
                     throw new Error('Error deleting the question: Unauthorized')
                 case 404:
                     throw new Error('Error deleting the question: No such user!')
                 default:
-                    throw new Error('An unexpected error occurred: ' + error.message)
+                    throw new Error('An unexpected error occurred: ' + errMsg)
             }
         } else {
             throw new Error('An unexpected error occurred')
@@ -161,7 +166,8 @@ export const getQuestionCountsRequest = async (): Promise<IQuestionCountsDto | u
         return response
     } catch (error) {
         if (axios.isAxiosError(error)) {
-            throw new Error('An unexpected error occurred: ' + error.message)
+            const errMsg = error?.response?.data || 'INTERNAL SERVER ERROR'
+            throw new Error('An unexpected error occurred: ' + errMsg)
         } else {
             throw new Error('An unexpected error occurred')
         }

diff --git a/packages/collaboration-types/src/LanguageMode.ts b/packages/collaboration-types/src/LanguageMode.ts
@@ -1,10 +1,10 @@
 export enum LanguageMode {
-    Csharp = 'csharp',
+    Csharp = 'CSharp',
     Golang = 'Go',
     Javascript = 'Javascript',
     Java = 'Java',
     Python = 'Python',
-    Ruby = 'ruby',
+    Ruby = 'Ruby',
     Typescript = 'Typescript',
 }