Resolve comment issues

-fix code execution test bug
-update tests and swagger for qn history
-return bearer token only if token exists, else auth context useeffect will run even when token does not exist since accesstoken still returns a non falsy value

Author: feliciagan

backend/code-execution-service/tests/codeExecutionRoutes.spec.ts

@@ -90,7 +90,7 @@ describe("Code execution routes", () => {
       expect(response.body.data).toBeInstanceOf(Array);
       expect(response.body.data[0]).toHaveProperty("isMatch", true);
       expect(response.body.data[0]["isMatch"]).toBe(true);
-      expect(response.body.data[1]["isMatch"]).toBe(false);
+      expect(response.body.data[1]["isMatch"]).toBe(true);
     });
   });
 });

backend/qn-history-service/swagger.yml

@@ -5,6 +5,12 @@ info:
   version: 1.0.0
 
 components:
+  securitySchemes:
+    bearerAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: JWT
+
   schemas:
     QnHistory:
       properties:
@@ -28,7 +34,7 @@ components:
           description: Date that question was attempted
         timeTaken:
           type: number
-          description: Time taken for question attempt in minutes
+          description: Time taken for question attempt in seconds
         code:
           type: string
           description: Code submitted
@@ -63,7 +69,7 @@ definitions:
         description: Date that question was attempted
       timeTaken:
         type: number
-        description: Time taken for question attempt in minutes
+        description: Time taken for question attempt in seconds
       code:
         type: string
         description: Code submitted
@@ -119,6 +125,8 @@ paths:
         - qnhistories
       summary: Creates a question history
       description: Creates a question history
+      security:
+        - bearerAuth: []
       requestBody:
         required: true
         content:
@@ -218,6 +226,8 @@ paths:
         - qnhistories
       summary: Updates a question history
       description: Updates a question history
+      security:
+        - bearerAuth: []
       parameters:
         - in: path
           name: id

backend/qn-history-service/tests/qnHistoryRoutes.spec.ts

@@ -1,3 +1,4 @@
+import { NextFunction, Request, Response } from "express";
 import { faker } from "@faker-js/faker";
 import supertest from "supertest";
 import app from "../src/app";
@@ -16,6 +17,12 @@ const BASE_URL = "/api/qnhistories";
 
 faker.seed(0);
 
+jest.mock("../src/middlewares/basicAccessControl", () => ({
+  verifyToken: jest.fn((res: Request, req: Response, next: NextFunction) =>
+    next()
+  ),
+}));
+
 describe("Qn History Routes", () => {
   describe("POST / ", () => {
     it("Creates new qn history", async () => {

frontend/src/components/CodeEditor/index.tsx

@@ -75,8 +75,8 @@ const CodeEditor: React.FC<CodeEditorProps> = (props) => {
 
     const loadTemplate = async () => {
       if (matchUser && partner && matchCriteria && questionId && questionTitle) {
-        await initDocument(uid, roomId, template, matchUser.id, partner.id, matchCriteria.language, questionId, questionTitle);
         checkDocReady();
+        await initDocument(uid, roomId, template, matchUser.id, partner.id, matchCriteria.language, questionId, questionTitle);
         setIsDocumentLoaded(true);
       }
     };

frontend/src/reducers/qnHistoryReducer.ts

@@ -1,6 +1,7 @@
 import { Dispatch } from "react";
 import { qnHistoryClient } from "../utils/api";
 import { isString, isStringArray } from "../utils/typeChecker";
+import { getToken } from "../utils/token";
 
 type QnHistoryDetail = {
   id: string;
@@ -151,7 +152,6 @@ export const updateQnHistoryById = async (
   >,
   dispatch: Dispatch<QnHistoryActions>
 ): Promise<boolean> => {
-  const accessToken = localStorage.getItem("token");
   return qnHistoryClient
     .put(
       `/${qnHistoryId}`,
@@ -163,7 +163,7 @@ export const updateQnHistoryById = async (
       },
       {
         headers: {
-          Authorization: `Bearer ${accessToken}`,
+          Authorization: getToken(),
         },
       }
     )

frontend/src/utils/sessionTime.ts

@@ -5,8 +5,6 @@ export const extractMinutesFromTime = (time: number) =>
 
 export const extractSecondsFromTime = (time: number) => time % 60; // after extracting hours and minutes
 
-export const extractMinutesOnly = (time: number) => time / 60;
-
 export const convertDateString = (date: string): string => {
   const convertedDate = new Date(date);
   const dateString = convertedDate.toLocaleDateString("en-GB", {

frontend/src/utils/token.ts

@@ -4,8 +4,12 @@ export const setToken = (token: string) => {
 
 export const getToken = () => {
   const token = localStorage.getItem("accessToken");
-  const bearerToken = `Bearer ${token}`;
-  return bearerToken;
+  if (token) {
+    const bearerToken = `Bearer ${token}`;
+    return bearerToken;
+  } else {
+    return null;
+  }
 };
 
 export const removeToken = () => {