Merge branch 'formatter' into post-ms6

Author: tzyian

kubernetes/apply_k8s_configs.ps1

@@ -0,0 +1,30 @@
+# Array of Kubernetes YAML files to apply
+$files = @(
+    "backend-deployment.yaml",
+    "backend-service.yaml",
+    "collab-service-deployment.yaml",
+    "collab-service-service.yaml",
+    "matching-service-api-deployment.yaml",
+    "matching-service-api-service.yaml",
+    "matching-service-deployment.yaml",
+    "nginx-deployment.yaml",
+    "nginx-service.yaml",
+    "peerprep-deployment.yaml",
+    "peerprep-service.yaml",
+    "rabbitmq-service.yaml",
+    "rabbitmq-statefulset.yaml",
+    "redis-service.yaml",
+    "redis-statefulset.yaml",
+    "storage-blob-api-deployment.yaml",
+    "storage-blob-api-service.yaml",
+    "user-service-deployment.yaml",
+    "user-service-service.yaml"
+)
+
+# Loop through each file and apply it using kubectl
+foreach ($file in $files) {
+    Write-Output "Applying $file..."
+    kubectl apply -f $file
+}
+
+Write-Output "All files applied."

peerprep/.gitignore

@@ -2,6 +2,7 @@
 
 # environment file
 .env
+.dockerignore
 
 # dependencies
 /node_modules

peerprep/app/actions/server_actions.ts

@@ -57,7 +57,7 @@ export async function login(state: FormState, formData: FormData) {
     await createSession(json.data);
     redirect("/questions");
   } else {
-    console.log(json.error);
+    console.log("Get session login error: " + json.error + " : " + json.status);
   }
 }
 

peerprep/app/actions/session.ts

@@ -9,33 +9,42 @@ export enum CookieNames {
 
 export async function createSession(userDataAccessToken: UserDataAccessToken) {
   const expiresAt = new Date(Date.now() + 24 * 60 * 60 * 1000);
-  cookies().set(
-    CookieNames.SESSION.valueOf(),
-    userDataAccessToken.accessToken,
-    {
+  try {
+    console.log("Setting cookie...");
+
+    cookies().set(
+      CookieNames.SESSION.valueOf(),
+      userDataAccessToken.accessToken,
+      {
+        httpOnly: true,
+        // TODO: set this to true
+        secure: false,
+        expires: expiresAt,
+        sameSite: "lax",
+        path: "/",
+      },
+    );
+
+    const userData: UserData = {
+      email: userDataAccessToken.email,
+      username: userDataAccessToken.username,
+      id: userDataAccessToken.id,
+      isAdmin: userDataAccessToken.isAdmin,
+      createdAt: userDataAccessToken.createdAt,
+    };
+
+    cookies().set(CookieNames.USER_DATA.valueOf(), JSON.stringify(userData), {
       httpOnly: true,
       secure: false,
       expires: expiresAt,
       sameSite: "lax",
       path: "/",
-    },
-  );
-
-  const userData: UserData = {
-    email: userDataAccessToken.email,
-    username: userDataAccessToken.username,
-    id: userDataAccessToken.id,
-    isAdmin: userDataAccessToken.isAdmin,
-    createdAt: userDataAccessToken.createdAt,
-  };
+    });
 
-  cookies().set(CookieNames.USER_DATA.valueOf(), JSON.stringify(userData), {
-    httpOnly: true,
-    secure: false,
-    expires: expiresAt,
-    sameSite: "lax",
-    path: "/",
-  });
+    console.log("Cookies set successfully.");
+  } catch (error) {
+    console.error("Error setting cookie:", error);
+  }
 }
 
 export async function expireSession() {

peerprep/app/api/internal/formatter/helper.ts

@@ -14,15 +14,15 @@ export async function callFormatter(
     });
 
     if (!response.ok) {
-      const errorData = await response.json();
-      console.error("Formatter: ", errorData);
-      throw new Error(`${errorData.detail}`);
+      const errorData = (await response.json()) as StatusBody;
+      console.error("FormatterHelper: ", errorData);
+      throw new Error(`${errorData.error}`);
     }
 
     const formattedCode = (await response.json()) as FormatResponse;
     console.log(formattedCode);
     return formattedCode;
   } catch (err: any) {
-    throw new Error(`Failed to format code: ${err.message}`);
+    throw new Error(`${err.message}`);
   }
 }

peerprep/app/api/internal/formatter/route.ts

@@ -39,15 +39,12 @@ export async function POST(req: NextRequest) {
     if (!response.ok) {
       const errorData = await response.json();
       console.log("Formatter: ", errorData);
-      throw new Error(`Failed to format code: ${response.statusText}`);
+      throw new Error(`Failed to format code: ${errorData.detail}`);
     }
 
     const formattedCode = (await response.json()) as FormatResponse;
     return NextResponse.json(formattedCode);
   } catch (error: any) {
-    return NextResponse.json(
-      { error: `Formatting failed: ${error.message}` },
-      { status: 500 },
-    );
+    return NextResponse.json({ error: `${error.message}` }, { status: 500 });
   }
 }

peerprep/components/questionpage/CollabEditor.tsx

@@ -93,9 +93,6 @@ export default function CollabEditor({
   async function formatCode(value: string, language: Language) {
     try {
       const res = await callFormatter(value, language);
-      if ("detail" in res) {
-        console.log(res.detail);
-      }
       const formatResponse = res as FormatResponse;
       const formatted_code = formatResponse.formatted_code;
 
@@ -113,8 +110,8 @@ export default function CollabEditor({
         };
         socket.send(JSON.stringify(msg));
       }
-    } catch (e) {
-      alert("Failed to format code. Check console.");
+    } catch (e: any) {
+      alert(e.message);
     }
   }
 

peerprep/components/questionpage/Matchmaking.tsx

@@ -17,7 +17,7 @@ import {
 import ResettingStopwatch from "../shared/ResettingStopwatch";
 import PeerprepDropdown from "../shared/PeerprepDropdown";
 
-const QUERY_INTERVAL_MILLISECONDS = 1000;
+const QUERY_INTERVAL_MILLISECONDS = 5000;
 const TIMEOUT_MILLISECONDS = 30000;
 
 const getMatchRequestTime = (): string => {