Merge branch 'dev' into frontend

backend/internal/handlers/handlers_report_related.go

@@ -37,13 +37,16 @@ func (gs *GState) SubmitWeeklyReport(c *fiber.Ctx) error {
 // Handler for retrieving weekly report
 func (gs *GState) GetWeeklyReport(c *fiber.Ctx) error {
 	// Extract the necessary parameters from the request
+	println("GetWeeklyReport")
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
 	username := claims["name"].(string)
 
 	// Extract project name and week from query parameters
 	projectName := c.Query("projectName")
+	println(projectName)
 	week := c.Query("week")
+	println(week)
 
 	// Convert week to integer
 	weekInt, err := strconv.Atoi(week)

backend/main.go

@@ -78,6 +78,7 @@ func main() {
 	server.Post("/api/loginrenew", gs.LoginRenew)
 	server.Delete("/api/userdelete/:username", gs.UserDelete) // Perhaps just use POST to avoid headaches
 	server.Post("/api/project", gs.CreateProject)
+	server.Get("/api/getWeeklyReport", gs.GetWeeklyReport)
 
 	// Announce the port we are listening on and start the server
 	err = server.Listen(fmt.Sprintf(":%d", conf.Port))

frontend/src/API/API.test.ts

@@ -1,87 +0,0 @@
-import { describe, expect, test } from "@jest/globals";
-import { api } from "../API/API";
-import { NewUser, NewWeeklyReport } from "../Types/goTypes";
-
-describe("API", () => {
-  test("registerUser", async () => {
-    const user: NewUser = {
-      username: "lol", // Add the username property
-      password: "lol",
-    };
-    const response = await api.registerUser(user);
-    console.log(response.message);
-    expect(response.success).toBe(true);
-    expect(response.data).toHaveProperty("userId");
-  });
-
-  test("createProject", async () => {
-    const project = {
-      name: "Project X",
-      description: "This is a test project",
-    };
-    const token =
-      "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhZG1pbiI6ZmFsc2UsImV4cCI6MTcxMDk0MDIwMywibmFtZSI6InJyZ3VtZHpwbWMifQ.V9NHoYMYV61t";
-
-    const response = await api.createProject(project, token);
-    console.log(response.message);
-    expect(response.success).toBe(true);
-    expect(response.data).toHaveProperty("projectId");
-  });
-
-  test("renewToken", async () => {
-    const refreshToken =
-      "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhZG1pbiI6ZmFsc2UsImV4cCI6MTcxMDk0MDIwMywibmFtZSI6InJyZ3VtZHpwbWMifQ.V9NHoYMYV61t";
-
-    const response = await api.renewToken(refreshToken);
-    console.log(response.message);
-    expect(response.success).toBe(true);
-    expect(response.data).toHaveProperty("accessToken");
-    expect(response.data).toHaveProperty("refreshToken");
-  });
-
-  test("getUserProjects", async () => {
-    const token =
-      "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhZG1pbiI6ZmFsc2UsImV4cCI6MTcxMDk0MDIwMywibmFtZSI6InJyZ3VtZHpwbWMifQ.V9NHoYMYV61t";
-    const username = "rrgumdzpmc";
-    const response = await api.getUserProjects(username, token);
-    console.log(response.message);
-    expect(response.success).toBe(true);
-    expect(response.data).toHaveProperty("projects");
-  });
-
-  test("submitWeeklyReport", async () => {
-    const report: NewWeeklyReport = {
-      projectName: "vtmosxssst",
-      week: 2,
-      developmentTime: 40,
-      meetingTime: 5,
-      adminTime: 2,
-      ownWorkTime: 10,
-      studyTime: 12,
-      testingTime: 41,
-    };
-    const token =
-      "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhZG1pbiI6ZmFsc2UsImV4cCI6MTcxMDk0MDIwMywibmFtZSI6InJyZ3VtZHpwbWMifQ.V9NHoYMYV61t";
-
-    const response = await api.submitWeeklyReport(report, token);
-    console.log(response.message);
-    expect(response.success).toBe(true);
-    expect(response.data).toHaveProperty(
-      "message",
-      "Report submitted successfully",
-    );
-  });
-
-  test("login", async () => {
-    const user: NewUser = {
-      username: "rrgumdzpmc", // Add an empty string value for the username property
-      password: "always_same",
-    };
-
-    const response = await api.login(user);
-    console.log(response.message);
-    expect(response.success).toBe(true);
-    expect(response.data).toHaveProperty("accessToken");
-    expect(response.data).toHaveProperty("refreshToken");
-  });
-});

frontend/src/API/API.ts

@@ -20,6 +20,10 @@ interface API {
   registerUser(user: NewUser): Promise<APIResponse<User>>;
   /** Remove a user */
   removeUser(username: string, token: string): Promise<APIResponse<User>>;
+  /** Login */
+  login(NewUser: NewUser): Promise<APIResponse<string>>;
+  /** Renew the token */
+  renewToken(token: string): Promise<APIResponse<string>>;
   /** Create a project */
   createProject(
     project: NewProject,
@@ -29,16 +33,19 @@ interface API {
   submitWeeklyReport(
     project: NewWeeklyReport,
     token: string,
-  ): Promise<APIResponse<Project>>;
+  ): Promise<APIResponse<NewWeeklyReport>>;
-  /** Renew the token */
+  /**Gets a weekly report*/
-  renewToken(token: string): Promise<APIResponse<string>>;
+  getWeeklyReport(
+    username: string,
+    projectName: string,
+    week: string,
+    token: string,
+  ): Promise<APIResponse<NewWeeklyReport>>;
   /** Gets all the projects of a user*/
   getUserProjects(
     username: string,
     token: string,
   ): Promise<APIResponse<Project[]>>;
-  /** Login */
-  login(NewUser: NewUser): Promise<APIResponse<string>>;
 }
 
 // Export an instance of the API
@@ -169,9 +176,9 @@ export const api: API = {
   },
 
   async submitWeeklyReport(
-    project: NewWeeklyReport,
+    weeklyReport: NewWeeklyReport,
     token: string,
-  ): Promise<APIResponse<Project>> {
+  ): Promise<APIResponse<NewWeeklyReport>> {
     try {
       const response = await fetch("/api/submitWeeklyReport", {
         method: "POST",
@@ -179,7 +186,7 @@ export const api: API = {
           "Content-Type": "application/json",
           Authorization: "Bearer " + token,
         },
-        body: JSON.stringify(project),
+        body: JSON.stringify(weeklyReport),
       });
 
       if (!response.ok) {
@@ -189,7 +196,7 @@ export const api: API = {
         };
       }
 
-      const data = (await response.json()) as Project;
+      const data = (await response.json()) as NewWeeklyReport;
       return { success: true, data };
     } catch (e) {
       return {
@@ -199,6 +206,33 @@ export const api: API = {
     }
   },
 
+  async getWeeklyReport(
+    username: string,
+    projectName: string,
+    week: string,
+    token: string,
+  ): Promise<APIResponse<NewWeeklyReport>> {
+    try {
+      const response = await fetch("/api/getWeeklyReport", {
+        method: "GET",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+        body: JSON.stringify({ username, projectName, week }),
+      });
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to get weekly report" };
+      } else {
+        const data = (await response.json()) as NewWeeklyReport;
+        return { success: true, data };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to get weekly report" };
+    }
+  },
+
   async login(NewUser: NewUser): Promise<APIResponse<string>> {
     try {
       const response = await fetch("/api/login", {

frontend/src/Components/Register.tsx

@@ -40,7 +40,7 @@ export default function Register(): JSX.Element {
 
   const handleRegister = async (): Promise<void> => {
     const newUser: NewUser = {
-      userName: username ?? "",
+      username: username ?? "",
       password: password ?? "",
     };
     const response = await api.registerUser(newUser);

testing.py

@@ -21,6 +21,7 @@ registerPath = base_url + "/api/register"
 loginPath = base_url + "/api/login"
 addProjectPath = base_url + "/api/project"
 submitReportPath = base_url + "/api/submitReport"
+getWeeklyReportPath = base_url + "/api/getWeeklyReport"
 
 
 # Posts the username and password to the register endpoint
@@ -74,7 +75,7 @@ def test_submit_report():
     response = requests.post(
         submitReportPath,
         json={
-            "projectName": "report1",
+            "projectName": projectName,
             "week": 1,
             "developmentTime": 10,
             "meetingTime": 5,
@@ -89,9 +90,18 @@ def test_submit_report():
     assert response.status_code == 200, "Submit report failed"
     print("Submit report successful")
 
+def test_get_weekly_report():
+    token = login(username, "always_same").json()["token"]
+    response = requests.get(
+        getWeeklyReportPath,
+        headers={"Authorization": "Bearer " + token},
+        params={"username": username, "projectName": projectName , "week": 1}
+    )
+    print(response.text)
 
 if __name__ == "__main__":
     test_create_user()
     test_login()
     test_add_project()
     test_submit_report()
+    test_get_weekly_report()