Merge branch 'mt/scrum-138-child-139-backendTesting-timetablesController' of https://github.com/UTSC-CSCC01-Software-Engineering-I/term-group-project-c01w25-project-course-matrix into mt/scrum-138-child-139-backendTesting-timetablesController

Author: minhhaitran08

course-matrix/backend/__tests__/timetablesController.test.ts

@@ -15,7 +15,7 @@ jest.mock("@ai-sdk/openai", () => ({
 
 jest.mock("ai", () => ({
   streamText: jest.fn(() =>
-    Promise.resolve({ pipeDataStreamToResponse: jest.fn() })
+    Promise.resolve({ pipeDataStreamToResponse: jest.fn() }),
   ),
 }));
 
@@ -179,7 +179,7 @@ describe("GET /api/timetables", () => {
     (
       authHandler as jest.MockedFunction<typeof authHandler>
     ).mockImplementationOnce(
-      mockAuthHandler("testuser01-ab9e6877-f603-4c6a-9832-864e520e4d01")
+      mockAuthHandler("testuser01-ab9e6877-f603-4c6a-9832-864e520e4d01"),
     );
 
     const response = await request(app).get("/api/timetables");
@@ -194,7 +194,7 @@ describe("GET /api/timetables", () => {
     (
       authHandler as jest.MockedFunction<typeof authHandler>
     ).mockImplementationOnce(
-      mockAuthHandler("testuser02-1d3f02df-f926-4c1f-9f41-58ca50816a33")
+      mockAuthHandler("testuser02-1d3f02df-f926-4c1f-9f41-58ca50816a33"),
     );
 
     const response = await request(app).get("/api/timetables");

course-matrix/backend/src/controllers/aiController.ts

@@ -36,7 +36,7 @@ const pinecone = new Pinecone({
 });
 
 const index: Index<RecordMetadata> = pinecone.Index(
-  process.env.PINECONE_INDEX_NAME!
+  process.env.PINECONE_INDEX_NAME!,
 );
 
 console.log("Connected to OpenAI API");
@@ -93,7 +93,7 @@ function analyzeQuery(query: string): {
       "prerequisites",
       "corequisites",
       "departments",
-      "programs"
+      "programs",
     );
   }
 
@@ -111,7 +111,7 @@ async function searchSelectedNamespaces(
   query: string,
   k: number,
   namespaces: string[],
-  filters?: Object
+  filters?: Object,
 ): Promise<Document[]> {
   let allResults: Document[] = [];
 
@@ -133,7 +133,7 @@ async function searchSelectedNamespaces(
       const results = await namespaceStore.similaritySearch(
         query,
         Math.max(k, namespaceToMinResults.get(namespace)),
-        namespace === "courses_v3" ? filters : undefined
+        namespace === "courses_v3" ? filters : undefined,
       );
       console.log(`Found ${results.length} results in namespace: ${namespace}`);
       allResults = [...allResults, ...results];
@@ -154,7 +154,7 @@ async function searchSelectedNamespaces(
 // Reformulate user query to make more concise query to database, taking into consideration context
 async function reformulateQuery(
   latestQuery: string,
-  conversationHistory: any[]
+  conversationHistory: any[],
 ): Promise<string> {
   try {
     const openai = new OpenAI({
@@ -252,7 +252,7 @@ function includeFilters(query: string) {
       if (keywords.some((keyword) => lowerQuery.includes(keyword))) {
         relaventBreadthRequirements.push(convertBreadthRequirement(namespace));
       }
-    }
+    },
   );
 
   Object.entries(YEAR_LEVEL_KEYWORDS).forEach(([namespace, keywords]) => {
@@ -317,7 +317,7 @@ export const chat = asyncHandler(async (req: Request, res: Response) => {
   // Use GPT-4o to reformulate the query based on conversation history
   const reformulatedQuery = await reformulateQuery(
     latestMessage,
-    conversationHistory.slice(-CHATBOT_MEMORY_THRESHOLD) // last K messages
+    conversationHistory.slice(-CHATBOT_MEMORY_THRESHOLD), // last K messages
   );
   console.log(">>>> Original query:", latestMessage);
   console.log(">>>> Reformulated query:", reformulatedQuery);
@@ -331,8 +331,8 @@ export const chat = asyncHandler(async (req: Request, res: Response) => {
   if (requiresSearch) {
     console.log(
       `Query requires knowledge retrieval, searching namespaces: ${relevantNamespaces.join(
-        ", "
-      )}`
+        ", ",
+      )}`,
     );
 
     const filters = includeFilters(reformulatedQuery);
@@ -343,7 +343,7 @@ export const chat = asyncHandler(async (req: Request, res: Response) => {
       reformulatedQuery,
       3,
       relevantNamespaces,
-      Object.keys(filters).length === 0 ? undefined : filters
+      Object.keys(filters).length === 0 ? undefined : filters,
     );
     // console.log("Search Results: ", searchResults);
 
@@ -411,15 +411,15 @@ export const testSimilaritySearch = asyncHandler(
     if (requiresSearch) {
       console.log(
         `Query requires knowledge retrieval, searching namespaces: ${relevantNamespaces.join(
-          ", "
-        )}`
+          ", ",
+        )}`,
       );
 
       // Search only the relevant namespaces
       const searchResults = await searchSelectedNamespaces(
         message,
         3,
-        relevantNamespaces
+        relevantNamespaces,
       );
       console.log("Search Results: ", searchResults);
 
@@ -429,11 +429,11 @@ export const testSimilaritySearch = asyncHandler(
       }
     } else {
       console.log(
-        "Query does not require knowledge retrieval, skipping search"
+        "Query does not require knowledge retrieval, skipping search",
       );
     }
 
     console.log("CONTEXT: ", context);
     res.status(200).send(context);
-  }
+  },
 );

course-matrix/backend/src/index.ts

@@ -49,8 +49,8 @@ app.get(
   asyncHandler(async (_, response) =>
     response.json({
       info: "Testing course matrix backend server",
-    })
-  )
+    }),
+  ),
 );
 
 /**
@@ -67,7 +67,7 @@ app.get(
     } catch (err) {
       return res.status(500).send({ err });
     }
-  })
+  }),
 );
 
 server = app.listen(config.PORT, () => {