Fix merge conflicts

Author: izzhafeez

backend/question/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "build": "rimraf dist && npx tsc",
     "prestart": "npm run build",
-    "start": "cp .env dist/.env && npx tsc -w & nodemon dist/server.js",
+    "start": "npx tsc -w & nodemon dist/server.js",
     "test": "cross-env NODE_ENV=TEST && jest src/tests/app.spec.ts"
   },
   "author": "",

backend/question/sample.env

@@ -1,2 +1,3 @@
 PORT=
-MONGO_URL=
+MONGODB_URI=
+NODE_ENV=

backend/question/src/models/Question.ts

@@ -27,7 +27,7 @@ const questionSchema: Schema = new Schema(
       required: true,
     },
     category: {
-      type: String,
+      type: [String],
       required: true,
     },
     complexity: {

backend/question/src/routes/validators.ts

@@ -3,8 +3,19 @@ import { check, body } from "express-validator";
 export const createQuestionValidators = [
   check("title").isString().isLength({ min: 1 }),
   check("description").isString().isLength({ min: 1 }),
-  check("category").isString().isLength({ min: 1 }),
   check("complexity").isString().isLength({ min: 1 }),
+  //custom validation for category
+  check("category").custom((category) => {
+    if (!Array.isArray(category) || category.length === 0) {
+      throw new Error("Category must be a non-empty array");
+    }
+    //check if array contains only non-empty strings and trim whitespace
+    if (!category.every((element) => typeof element === "string" && element.length > 0 && element.trim().length > 0)) {
+      throw new Error("Category must contain only non-empty strings");
+    }
+    return true;
+  }
+  ),
 ];
 
 export const idValidators = [check("id").isInt({ min: 1 })];
@@ -18,7 +29,21 @@ export const updateQuestionValidators = [
     }
     for (const field of [title, description, category, complexity]) {
       if (field) {
-        check(field).isString().isLength({ min: 1 });
+        //if field is cateogry
+        if (field === category) {
+          if (!Array.isArray(field) || field.length === 0) {
+            throw new Error("Category must be a non-empty array");
+          }
+          //check if array contains only non-empty strings and trim whitespace
+          if (!field.every((element) => typeof element === "string" && element.length > 0 && element.trim().length > 0)) {
+            throw new Error("Category must contain only non-empty strings");
+          }
+        } else {
+          //check that it is string
+          if (typeof field !== "string") {
+            throw new Error("Field must be a string");
+          }
+        }
       }
     }
     return true;

backend/question/src/tests/app.spec.ts

@@ -25,7 +25,7 @@ describe("Test Question API", () => {
     const newQuestion = {
       title: "Sample Question",
       description: "This is a sample question",
-      category: "General",
+      category: ["General"],
       complexity: "Easy",
     };
 
@@ -37,7 +37,7 @@ describe("Test Question API", () => {
       "description",
       "This is a sample question"
     );
-    expect(res.body.question).toHaveProperty("category", "General");
+    expect(res.body.question).toHaveProperty("category", ["General"]);
     expect(res.body.question).toHaveProperty("complexity", "Easy");
   });
 
@@ -46,7 +46,7 @@ describe("Test Question API", () => {
     const newQuestion = {
       title: "",
       description: "This is a sample question",
-      category: "General",
+      category: ["General"],
       complexity: "Easy",
     };
 
@@ -61,7 +61,7 @@ describe("Test Question API", () => {
     const newQuestion = {
       title: "Sample Question",
       description: "",
-      category: "General",
+      category: ["General"],
       complexity: "Easy",
     };
 
@@ -76,13 +76,28 @@ describe("Test Question API", () => {
     const newQuestion = {
       title: "Sample Question",
       description: "This is a sample question",
-      category: "",
+      category: [],
       complexity: "Easy",
     };
 
     const res = await request.post("/api/create").send(newQuestion);
     expect(res.statusCode).toBe(400);
-    expect(res.body.errors[0].msg).toBe("Invalid value");
+    expect(res.body.errors[0].msg).toBe("Category must be a non-empty array");
+    expect(res.body.errors[0].path).toBe("category");
+  });
+
+  // Empty category with whitespace only
+  test("POST /api/create - empty category with whitespace string", async () => {
+    const newQuestion = {
+      title: "Sample Question",
+      description: "This is a sample question",
+      category: ["   "],
+      complexity: "Easy",
+    };
+
+    const res = await request.post("/api/create").send(newQuestion);
+    expect(res.statusCode).toBe(400);
+    expect(res.body.errors[0].msg).toBe("Category must contain only non-empty strings");
     expect(res.body.errors[0].path).toBe("category");
   });
 
@@ -91,7 +106,7 @@ describe("Test Question API", () => {
     const newQuestion = {
       title: "Sample Question",
       description: "This is a sample question",
-      category: "General",
+      category: ["General"],
       complexity: "",
     };
 
@@ -121,7 +136,7 @@ describe("Test Question API", () => {
     const newQuestion = {
       title: "Sample Question",
       description: ["test"],
-      category: "General",
+      category: ["General"],
       complexity: "Easy",
     };
 
@@ -136,13 +151,58 @@ describe("Test Question API", () => {
     const newQuestion = {
       title: "Sample Question",
       description: "This is a sample question",
-      category: ["test"],
+      category: "test",
       complexity: "Easy",
     };
 
     const res = await request.post("/api/create").send(newQuestion);
     expect(res.statusCode).toBe(400);
-    expect(res.body.errors[0].msg).toBe("Invalid value");
+    expect(res.body.errors[0].msg).toBe("Category must be a non-empty array");
+    expect(res.body.errors[0].path).toBe("category");
+  });
+
+  // Invalid category
+  test("POST /api/create - invalid category", async () => {
+    const newQuestion = {
+      title: "Sample Question",
+      description: "This is a sample question",
+      category: [3, "test"],
+      complexity: "Easy",
+    };
+
+    const res = await request.post("/api/create").send(newQuestion);
+    expect(res.statusCode).toBe(400);
+    expect(res.body.errors[0].msg).toBe("Category must contain only non-empty strings");
+    expect(res.body.errors[0].path).toBe("category");
+  });
+
+  // Invalid category
+  test("POST /api/create - invalid category", async () => {
+    const newQuestion = {
+      title: "Sample Question",
+      description: "This is a sample question",
+      category: ["test", ""],
+      complexity: "Easy",
+    };
+
+    const res = await request.post("/api/create").send(newQuestion);
+    expect(res.statusCode).toBe(400);
+    expect(res.body.errors[0].msg).toBe("Category must contain only non-empty strings");
+    expect(res.body.errors[0].path).toBe("category");
+  });
+
+  // Invalid category
+  test("POST /api/create - invalid category with whitespace", async () => {
+    const newQuestion = {
+      title: "Sample Question",
+      description: "This is a sample question",
+      category: ["   "],
+      complexity: "Easy",
+    };
+
+    const res = await request.post("/api/create").send(newQuestion);
+    expect(res.statusCode).toBe(400);
+    expect(res.body.errors[0].msg).toBe("Category must contain only non-empty strings");
     expect(res.body.errors[0].path).toBe("category");
   });
 
@@ -151,7 +211,7 @@ describe("Test Question API", () => {
     const newQuestion = {
       title: "Sample Question",
       description: "This is a sample question",
-      category: "General",
+      category: ["General"],
       complexity: ["test"],
     };
 
@@ -176,7 +236,7 @@ describe("Test Get All", () => {
       "description",
       "This is a sample question"
     );
-    expect(sampleQuestion).toHaveProperty("category", "General");
+    expect(sampleQuestion).toHaveProperty("category", ["General"]);
     expect(sampleQuestion).toHaveProperty("complexity", "Easy");
   });
 });
@@ -191,7 +251,7 @@ describe("Test Get by Id", () => {
     expect(res.body).toHaveProperty("questionid", questionId);
     expect(res.body).toHaveProperty("title", "Sample Question");
     expect(res.body).toHaveProperty("description", "This is a sample question");
-    expect(res.body).toHaveProperty("category", "General");
+    expect(res.body).toHaveProperty("category", ["General"]);
     expect(res.body).toHaveProperty("complexity", "Easy");
   });
 
@@ -219,7 +279,7 @@ describe("Test Update", () => {
     const updateQuestion = {
       title: "Update Title",
       description: "Update Description",
-      category: "Update Category",
+      category: ["Update Category"],
       complexity: "Update Complexity",
     };
     const questionId = 1090;
@@ -235,6 +295,19 @@ describe("Test Update", () => {
   });
 
   // Empty update
+  test("POST - empty title update", async () => {
+    const updateQuestion = {
+      title: 3,
+    };
+    const questionId = 1090;
+    const res = await request
+      .post(`/api/${questionId}/update`)
+      .send(updateQuestion);
+    expect(res.statusCode).toBe(400);
+    expect(res.body.errors[0].msg).toBe("Field must be a string");
+  });
+
+  // Empty field update
   test("POST - empty update", async () => {
     const updateQuestion = {
       title: "",
@@ -250,12 +323,54 @@ describe("Test Update", () => {
     expect(res.body.errors[0].msg).toBe("At least one field must be provided");
   });
 
+  // Update with invalid category
+  test("POST - empty category", async () => {
+    const updateQuestion = {
+      category: []
+    };
+    const questionId = 1090;
+    const res = await request
+      .post(`/api/${questionId}/update`)
+      .send(updateQuestion);
+    expect(res.statusCode).toBe(400);
+    expect(res.body.errors[0].msg).toBe("Category must be a non-empty array");
+  });
+
+  // Update with invalid category
+  test("POST - category containing numbers", async () => {
+    const updateQuestion = {
+      category: [3],
+      complexity: ["test"],
+    };
+    const questionId = 1090;
+    const res = await request
+      .post(`/api/${questionId}/update`)
+      .send(updateQuestion);
+    expect(res.statusCode).toBe(400);
+    expect(res.body.errors[0].msg).toBe("Category must contain only non-empty strings");
+  });
+
+  // Update with invalid category
+  test("POST - category containing empty string", async () => {
+    const updateQuestion = {
+      description: "This is a sample question",
+      category: ["test", ""],
+      complexity: ["test"],
+    };
+    const questionId = 1090;
+    const res = await request
+      .post(`/api/${questionId}/update`)
+      .send(updateQuestion);
+    expect(res.statusCode).toBe(400);
+    expect(res.body.errors[0].msg).toBe("Category must contain only non-empty strings");
+  });
+
   // Negative id
   test("POST - negative id update", async () => {
     const updateQuestion = {
       title: "Update Title",
       description: "Update Description",
-      category: "Update Category",
+      category: ["Update Category"],
       complexity: "Update Complexity",
     };
     const questionId = -1;
@@ -271,7 +386,7 @@ describe("Test Update", () => {
     const updateQuestion = {
       title: "Update Title",
       description: "Update Description",
-      category: "Update Category",
+      category: ["Update Category"],
       complexity: "Update Complexity",
     };
     const questionId = 999999;

frontend/src/api/user.tsx

@@ -0,0 +1,34 @@
+import { User } from "@/types/user";
+
+export const setGetProfile = async (access_token: string, user: User): Promise<User> => {
+  const username = user.username;
+  const bio = user.bio;
+  const linkedin = user.linkedin;
+  const github = user.github;
+
+  // POST request
+  // url from environment variable
+  const url = process.env.REACT_APP_USER_URL + "/";
+  const response = await fetch(url, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${access_token}`,
+    },
+    body: JSON.stringify({
+      username,
+      bio,
+      linkedin,
+      github,
+    }),
+  });
+  console.log(response.json());
+
+  // return response.json();
+  return {
+    username: "Hong Shan",
+    bio: "I live in Redhill",
+    linkedin: "www.linkedin.com/in/hongshan",
+    github: "www.github.com/hongshan",
+  }
+}

frontend/src/app/(auth)/components/dashboard/Dashboard.tsx

@@ -21,16 +21,15 @@ const initialUserInterviewMetaData: UserInterviewMetadata = {
 };
 
 const AuthDashboard = () => {
-  const { user } = useAuth();
+  const { token } = useAuth();
 
   const [userInterviewMetadata, setUserInterviewMetadata] =
     useState<UserInterviewMetadata>(initialUserInterviewMetaData);
 
   useEffect(() => {
-    if (!user) return;
-
+    if (!token) return;
     setUserInterviewMetadata(getUserInterviewMetadata());
-  }, [user]);
+  }, [token]);
 
   const dateFormattingOption: Intl.DateTimeFormatOptions = {
     year: "numeric",