From dea802bd91f3b3215eb6c440c8e2f21bfcf4688f Mon Sep 17 00:00:00 2001
From: al8763be <al8763be-s@student.lu.se>
Date: Thu, 21 Mar 2024 01:37:39 +0100
Subject: [PATCH 01/35] bummed handler

---
 backend/internal/database/db.go               | 46 +++++++++++++++++++
 backend/internal/database/db_test.go          | 31 +++++++++++++
 backend/internal/handlers/global_state.go     |  1 +
 .../handlers/handlers_report_related.go       | 36 +++++++++++++++
 backend/main.go                               |  1 +
 testing.py                                    | 43 +++++++++++++++++
 6 files changed, 158 insertions(+)

diff --git a/backend/internal/database/db.go b/backend/internal/database/db.go
index fd0a083..7410b16 100644
--- a/backend/internal/database/db.go
+++ b/backend/internal/database/db.go
@@ -36,6 +36,7 @@ type Database interface {
 	GetUserRole(username string, projectname string) (string, error)
 	GetWeeklyReport(username string, projectName string, week int) (types.WeeklyReport, error)
 	GetWeeklyReportsUser(username string, projectname string) ([]types.WeeklyReportList, error)
+	GetUnsignedWeeklyReports(projectName string) ([]types.WeeklyReport, error)
 	SignWeeklyReport(reportId int, projectManagerId int) error
 	IsSiteAdmin(username string) (bool, error)
 	IsProjectManager(username string, projectname string) (bool, error)
@@ -353,6 +354,51 @@ func (d *Db) SignWeeklyReport(reportId int, projectManagerId int) error {
 	return err
 }
 
+func (d *Db) GetUnsignedWeeklyReports(projectName string) ([]types.WeeklyReport, error) {
+	// Define the SQL query to fetch unsigned reports for a given user
+	query := `
+		SELECT
+			report_id,
+			user_id,
+			project_id,
+			week,
+			development_time,
+			meeting_time,
+			admin_time,
+			own_work_time,
+			study_time,
+			testing_time,
+			signed_by
+		FROM
+			weekly_reports
+		WHERE
+			signed_by IS NULL
+			AND project_id = (SELECT id FROM projects WHERE name = ?)
+	`
+
+	// Execute the query
+	rows, err := d.Queryx(query, projectName)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	// Iterate over the rows and populate the result slice
+	var reports []types.WeeklyReport
+	for rows.Next() {
+		var report types.WeeklyReport
+		if err := rows.StructScan(&report); err != nil {
+			return nil, err
+		}
+		reports = append(reports, report)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+
+	return reports, nil
+}
+
 // IsSiteAdmin checks if a given username is a site admin
 func (d *Db) IsSiteAdmin(username string) (bool, error) {
 	// Define the SQL query to check if the user is a site admin
diff --git a/backend/internal/database/db_test.go b/backend/internal/database/db_test.go
index 139fba9..cff70a0 100644
--- a/backend/internal/database/db_test.go
+++ b/backend/internal/database/db_test.go
@@ -470,6 +470,37 @@ func TestGetWeeklyReport(t *testing.T) {
 	// Check other fields similarly
 }
 
+func TestGetUnsignedWeeklyReports(t *testing.T) {
+	db, err := setupAdvancedState()
+	if err != nil {
+		t.Error("setupState failed:", err)
+	}
+
+	err = db.AddUser("testuser", "password")
+	if err != nil {
+		t.Error("AddUser failed:", err)
+	}
+
+	err = db.AddProject("testproject", "description", "testuser")
+	if err != nil {
+		t.Error("AddProject failed:", err)
+	}
+
+	err = db.AddWeeklyReport("testproject", "testuser", 1, 1, 1, 1, 1, 1, 1)
+	if err != nil {
+		t.Error("AddWeeklyReport failed:", err)
+	}
+
+	reports, err := db.GetUnsignedWeeklyReports("testproject")
+	if err != nil {
+		t.Error("GetUnsignedWeeklyReports failed:", err)
+	}
+
+	if reports == nil {
+		t.Error("Expected non-nil reports, got nil")
+	}
+}
+
 // TestSignWeeklyReport tests SignWeeklyReport function of the database
 func TestSignWeeklyReport(t *testing.T) {
 	db, err := setupState()
diff --git a/backend/internal/handlers/global_state.go b/backend/internal/handlers/global_state.go
index b88bdcd..6b197bb 100644
--- a/backend/internal/handlers/global_state.go
+++ b/backend/internal/handlers/global_state.go
@@ -28,6 +28,7 @@ type GlobalState interface {
 	ProjectRoleChange(c *fiber.Ctx) error   // To change a users role in a project
 	ChangeUserName(c *fiber.Ctx) error      // WIP
 	GetAllUsersProject(c *fiber.Ctx) error  // WIP
+	GetUnsignedReports(c *fiber.Ctx) error  // 
 }
 
 // "Constructor"
diff --git a/backend/internal/handlers/handlers_report_related.go b/backend/internal/handlers/handlers_report_related.go
index fcba523..534050a 100644
--- a/backend/internal/handlers/handlers_report_related.go
+++ b/backend/internal/handlers/handlers_report_related.go
@@ -115,6 +115,42 @@ func (gs *GState) SignReport(c *fiber.Ctx) error {
 	return c.Status(200).SendString("Weekly report signed successfully")
 }
 
+func (gs *GState) GetUnsignedReports(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	projectManagerUsername := claims["name"].(string)
+
+	// Extract project name and week from query parameters
+	projectName := c.Query("projectName")
+
+	log.Info("Getting unsigned reports for")
+
+	if projectName == "" {
+		log.Info("Missing project name")
+		return c.Status(400).SendString("Missing project name")
+	}
+
+	// Get the project manager's ID
+	isProjectManager, err := gs.Db.IsProjectManager(projectManagerUsername, projectName)
+	if err != nil {
+		log.Info("Failed to get project manager ID")
+		return c.Status(500).SendString("Failed to get project manager ID")
+	}
+	log.Info("User is Project Manager: ", isProjectManager)
+
+	// Call the database function to get the unsigned weekly reports
+	reports, err := gs.Db.GetUnsignedWeeklyReports(projectName)
+	if err != nil {
+		log.Info("Error getting unsigned weekly reports:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning unsigned reports")
+	// Return the list of unsigned reports
+	return c.JSON(reports)
+}
+
 // GetWeeklyReportsUserHandler retrieves all weekly reports for a user in a specific project
 func (gs *GState) GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
 	// Extract the necessary parameters from the token
diff --git a/backend/main.go b/backend/main.go
index ff6b94e..835524c 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -92,6 +92,7 @@ func main() {
 	server.Get("/api/project/:projectId", gs.GetProject)
 	server.Get("/api/project/getAllUsers", gs.GetAllUsersProject)
 	server.Get("/api/getWeeklyReport", gs.GetWeeklyReport)
+	server.Get("/api/getUnsignedReports", gs.GetUnsignedReports)
 	server.Post("/api/signReport", gs.SignReport)
 	server.Put("/api/addUserToProject", gs.AddUserToProjectHandler)
 	server.Put("/api/changeUserName", gs.ChangeUserName)
diff --git a/testing.py b/testing.py
index b8fbe43..3350497 100644
--- a/testing.py
+++ b/testing.py
@@ -41,6 +41,7 @@ getWeeklyReportsUserPath = base_url + "/api/getWeeklyReportsUser"
 checkIfProjectManagerPath = base_url + "/api/checkIfProjectManager"
 ProjectRoleChangePath = base_url + "/api/ProjectRoleChange"
 getUsersProjectPath = base_url + "/api/getUsersProject"
+getUsignedReportsPath = base_url + "/api/getUsignedReports"
 
 #ta bort auth i handlern för att få testet att gå igenom
 def test_ProjectRoleChange():
@@ -329,6 +330,47 @@ def test_get_weekly_reports_user():
     assert response.status_code == 200, "Get weekly reports for user failed"
     gprint("test_get_weekly_reports_user successful")
 
+def test_get_usigned_reports():
+    # Log in as the user
+
+    token = login(username, "always_same").json()["token"]
+    response = requests.post(
+        submitReportPath,
+        json={
+            "projectName": projectName,
+            "week": 3,
+            "developmentTime": 10,
+            "meetingTime": 5,
+            "adminTime": 5,
+            "ownWorkTime": 10,
+            "studyTime": 10,
+            "testingTime": 10,
+        },
+        headers={"Authorization": "Bearer " + token},
+    )
+    dprint(response.text)
+    assert response.status_code == 200, "Submit report failed"
+
+
+    # Get weekly reports for the user in the project
+    response = requests.get(
+        getWeeklyReportsUserPath + "/" + projectName,
+        headers={"Authorization": "Bearer " + token},
+    )
+
+    dprint(response.text)
+    assert response.status_code == 200, "Get weekly reports for user failed"
+
+    response = requests.get(
+        getUsignedReportsPath + "/" + projectName,
+        headers={"Authorization": "Bearer " + token},
+    )
+    dprint(response.text)
+    assert response.status_code == 200, "Get unsigned reports for user failed"
+    gprint("test_get_usigned_reports successful")
+
+
+
 # Test function to check if a user is a project manager
 def test_check_if_project_manager():
     # Log in as the user
@@ -369,6 +411,7 @@ def test_ensure_manager_of_created_project():
 
 
 if __name__ == "__main__":
+    test_get_usigned_reports()
     test_get_user_projects()
     test_create_user()
     test_login()

From 9e2a3cca8114939f17e17e4594c8a25520a6f8a4 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Thu, 21 Mar 2024 01:56:27 +0100
Subject: [PATCH 02/35] Update the method signature in the API interface to use
 StrNameChange

---
 frontend/src/API/API.ts | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts
index 5c49a8d..a39ce9b 100644
--- a/frontend/src/API/API.ts
+++ b/frontend/src/API/API.ts
@@ -6,6 +6,7 @@ import {
   NewProject,
   UserProjectMember,
   WeeklyReport,
+  StrNameChange,
 } from "../Types/goTypes";
 
 /**
@@ -133,6 +134,16 @@ interface API {
     projectName: string,
     token: string,
   ): Promise<APIResponse<UserProjectMember[]>>;
+  /**
+   * Changes the username of a user in the database.
+   * @param {StrNameChange} data The object containing the previous and new username.
+   * @param {string} token The authentication token.
+   * @returns {Promise<APIResponse<void>>} A promise resolving to an API response.
+   */
+  changeUserName(
+    data: StrNameChange,
+    token: string,
+  ): Promise<APIResponse<void>>;
 }
 
 /** An instance of the API */
@@ -342,7 +353,9 @@ export const api: API = {
       if (!response.ok) {
         return { success: false, message: "Failed to get weekly report" };
       } else {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         const data = (await response.json()) as WeeklyReport;
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         return { success: true, data };
       }
     } catch (e) {
@@ -484,4 +497,12 @@ export const api: API = {
       });
     }
   },
+  changeUserName: function (
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _data: StrNameChange,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    token: string,
+  ): Promise<APIResponse<void>> {
+    throw new Error("Function not implemented.");
+  },
 };

From 3e11b87eee3bf7c0ac8468e6a303790dc3956e64 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Thu, 21 Mar 2024 01:58:57 +0100
Subject: [PATCH 03/35] Modify the implementation of the changeUserName method
 in the api object

---
 frontend/src/API/API.ts | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts
index a39ce9b..70e36c9 100644
--- a/frontend/src/API/API.ts
+++ b/frontend/src/API/API.ts
@@ -497,12 +497,28 @@ export const api: API = {
       });
     }
   },
-  changeUserName: function (
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    _data: StrNameChange,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
+  async changeUserName(
+    data: StrNameChange,
     token: string,
   ): Promise<APIResponse<void>> {
-    throw new Error("Function not implemented.");
+    try {
+      const response = await fetch("/api/changeUserName", {
+        method: "PUT",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+        body: JSON.stringify(data),
+      });
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to change username" };
+      } else {
+        return { success: true };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to change username" };
+    }
   },
 };

From 19501122020f52baa1f607cf80b93c77e60f98e3 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Thu, 21 Mar 2024 02:22:23 +0100
Subject: [PATCH 04/35] implementing changeUsername component

---
 frontend/src/Components/ChangeUsername.tsx | 40 ++++++++++++++++------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/frontend/src/Components/ChangeUsername.tsx b/frontend/src/Components/ChangeUsername.tsx
index 3c35e94..04abc26 100644
--- a/frontend/src/Components/ChangeUsername.tsx
+++ b/frontend/src/Components/ChangeUsername.tsx
@@ -1,23 +1,41 @@
 import React, { useState } from "react";
 import InputField from "./InputField";
+import { api } from "../API/API";
 
 function ChangeUsername(): JSX.Element {
   const [newUsername, setNewUsername] = useState("");
+  const [errorMessage, setErrorMessage] = useState("");
 
   const handleChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
     setNewUsername(e.target.value);
   };
 
-  // const handleSubmit = async (): Promise<void> => {
-  //   try {
-  //     // Call the API function to update the username
-  //     await api.updateUsername(newUsername);
-  //     // Optionally, add a success message or redirect the user
-  //   } catch (error) {
-  //     console.error("Error updating username:", error);
-  //     // Optionally, handle the error
-  //   }
-  // };
+  const handleSubmit = async (): Promise<void> => {
+    try {
+      // Call the API function to change the username
+      const response = await api.changeUserName(
+        { prevName: "currentName", newName: newUsername },
+        "token",
+      );
+      if (response.success) {
+        // Optionally, add a success message or redirect the user
+        console.log("Username changed successfully");
+      } else {
+        // Handle the error message
+        console.error("Failed to change username:", response.message);
+      }
+    } catch (error) {
+      console.error("Error changing username:", error);
+      // Optionally, handle the error
+      setErrorMessage("Failed to change username");
+    }
+  };
+
+  const handleButtonClick = (): void => {
+    handleSubmit().catch((error) => {
+      console.error("Error in handleSubmit:", error);
+    });
+  };
 
   return (
     <div>
@@ -27,6 +45,8 @@ function ChangeUsername(): JSX.Element {
         value={newUsername}
         onChange={handleChange}
       />
+      {errorMessage && <div>{errorMessage}</div>}
+      <button onClick={handleButtonClick}>Update Username</button>
     </div>
   );
 }

From baf11f19d6c5fab9a4856c22115845179b9d4b44 Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Thu, 21 Mar 2024 02:47:51 +0100
Subject: [PATCH 05/35] added token

---
 frontend/src/Components/ChangeUsername.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/Components/ChangeUsername.tsx b/frontend/src/Components/ChangeUsername.tsx
index 04abc26..247c2fb 100644
--- a/frontend/src/Components/ChangeUsername.tsx
+++ b/frontend/src/Components/ChangeUsername.tsx
@@ -13,9 +13,10 @@ function ChangeUsername(): JSX.Element {
   const handleSubmit = async (): Promise<void> => {
     try {
       // Call the API function to change the username
+      const token = localStorage.getItem("accessToken") ?? "";
       const response = await api.changeUserName(
         { prevName: "currentName", newName: newUsername },
-        "token",
+        token,
       );
       if (response.success) {
         // Optionally, add a success message or redirect the user

From e9eb2e9ab60133840328485b2b70b53488678a8f Mon Sep 17 00:00:00 2001
From: pavel Hamawand <pavelhamawand@gmail.com>
Date: Thu, 21 Mar 2024 02:51:28 +0100
Subject: [PATCH 06/35] checks

---
 frontend/src/Components/ChangeUsername.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/Components/ChangeUsername.tsx b/frontend/src/Components/ChangeUsername.tsx
index 247c2fb..e297a04 100644
--- a/frontend/src/Components/ChangeUsername.tsx
+++ b/frontend/src/Components/ChangeUsername.tsx
@@ -13,17 +13,23 @@ function ChangeUsername(): JSX.Element {
   const handleSubmit = async (): Promise<void> => {
     try {
       // Call the API function to change the username
-      const token = localStorage.getItem("accessToken") ?? "";
+      const token = localStorage.getItem("accessToken");
+      if (!token) {
+        throw new Error("Access token not found");
+      }
+
       const response = await api.changeUserName(
         { prevName: "currentName", newName: newUsername },
         token,
       );
+
       if (response.success) {
         // Optionally, add a success message or redirect the user
         console.log("Username changed successfully");
       } else {
         // Handle the error message
         console.error("Failed to change username:", response.message);
+        setErrorMessage(response.message ?? "Failed to change username");
       }
     } catch (error) {
       console.error("Error changing username:", error);

From a73432669cc71db1c2a19a957278db705fda95fc Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 21 Mar 2024 03:36:30 +0100
Subject: [PATCH 07/35] New path

---
 frontend/src/main.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index bac2292..5fd4d68 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -31,6 +31,7 @@ import AdminProjectViewMemberInfo from "./Pages/AdminPages/AdminProjectViewMembe
 import AdminProjectPage from "./Pages/AdminPages/AdminProjectPage.tsx";
 import NotFoundPage from "./Pages/NotFoundPage.tsx";
 import UnauthorizedPage from "./Pages/UnauthorizedPage.tsx";
+import AddUserToProject from "./Components/AddUserToProject.tsx";
 
 // This is where the routes are mounted
 const router = createBrowserRouter([
@@ -147,6 +148,10 @@ const router = createBrowserRouter([
     path: "/unauthorized",
     element: <UnauthorizedPage />,
   },
+  {
+    path: "/addUserToProject",
+    element: <AddUserToProject />,
+  },
 ]);
 
 // Semi-hacky way to get the root element

From 2694beb0e8d80a95565b2f6a14c46e07e30f4464 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 21 Mar 2024 03:36:57 +0100
Subject: [PATCH 08/35] AddUserToProject API

---
 frontend/src/API/API.ts | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts
index 70e36c9..7920e0e 100644
--- a/frontend/src/API/API.ts
+++ b/frontend/src/API/API.ts
@@ -7,6 +7,7 @@ import {
   UserProjectMember,
   WeeklyReport,
   StrNameChange,
+  NewProjMember,
 } from "../Types/goTypes";
 
 /**
@@ -144,6 +145,10 @@ interface API {
     data: StrNameChange,
     token: string,
   ): Promise<APIResponse<void>>;
+  addUserToProject(
+    user: NewProjMember,
+    token: string,
+  ): Promise<APIResponse<NewProjMember>>;
 }
 
 /** An instance of the API */
@@ -254,6 +259,30 @@ export const api: API = {
     }
   },
 
+  async addUserToProject(
+    user: NewProjMember,
+    token: string,
+  ): Promise<APIResponse<NewProjMember>> {
+    try {
+      const response = await fetch("/api/addUserToProject", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+        body: JSON.stringify(user),
+      });
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to add member" };
+      } else {
+        return { success: true, message: "Added member" };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to add member" };
+    }
+  },
+
   async renewToken(token: string): Promise<APIResponse<string>> {
     try {
       const response = await fetch("/api/loginrenew", {
@@ -353,9 +382,7 @@ export const api: API = {
       if (!response.ok) {
         return { success: false, message: "Failed to get weekly report" };
       } else {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         const data = (await response.json()) as WeeklyReport;
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         return { success: true, data };
       }
     } catch (e) {

From c5bc6c1c585ae0efae9b818f70d2a4333ff42688 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 21 Mar 2024 03:37:37 +0100
Subject: [PATCH 09/35] Add user to project component

---
 frontend/src/Components/AddUserToProject.tsx | 132 +++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 frontend/src/Components/AddUserToProject.tsx

diff --git a/frontend/src/Components/AddUserToProject.tsx b/frontend/src/Components/AddUserToProject.tsx
new file mode 100644
index 0000000..debd0f9
--- /dev/null
+++ b/frontend/src/Components/AddUserToProject.tsx
@@ -0,0 +1,132 @@
+import { useState } from "react";
+import { APIResponse, api } from "../API/API";
+import { NewProjMember } from "../Types/goTypes";
+import Logo from "../assets/Logo.svg";
+import Button from "./Button";
+import GetAllUsers from "./GetAllUsers";
+
+/**
+ * Tries to add a member to a project
+ * @param {Object} props - A NewProjMember
+ * @returns {boolean} True if added, false if not
+ */
+function MemberAdd(props: { memberToAdd: NewProjMember }): boolean {
+  let added = false;
+
+  api
+    .addUserToProject(
+      props.memberToAdd,
+      localStorage.getItem("accessToken") ?? "",
+    )
+    .then((response: APIResponse<NewProjMember>) => {
+      if (response.success) {
+        added = true;
+      } else {
+        console.error(response.message);
+      }
+    })
+    .catch((error) => {
+      console.error("An error occurred during member add:", error);
+    });
+  return added;
+}
+
+/**
+ * Provides UI for adding a project to the system.
+ * @returns {JSX.Element} - Returns the component UI for adding a project
+ */
+function AddUserToProject(): JSX.Element {
+  const [name, setName] = useState("");
+  const [users, setUsers] = useState<string[]>([]);
+  const [role, setRole] = useState("");
+  GetAllUsers({ setUsersProp: setUsers });
+
+  const handleClick = (): boolean => {
+    const newMember: NewProjMember = {
+      username: name,
+      projectname: localStorage.getItem("projectName") ?? "",
+      role: "user",
+    };
+    return MemberAdd({ memberToAdd: newMember });
+  };
+
+  return (
+    <div className="flex flex-col h-fit w-screen items-center justify-center">
+      <div className="border-4 border-black bg-white flex flex-col items-center justify-center rounded-3xl content-center pl-20 pr-20  h-[84vh] w-[50vh]">
+        <form
+          className="bg-white rounded px-8 pt-6 pb-8 mb-4 items-center justify-center flex flex-col w-fit h-fit"
+          onSubmit={(e) => {
+            e.preventDefault();
+            MemberAdd({
+              memberToAdd: {
+                username: "",
+                projectname: "",
+                role: "project_manager",
+              },
+            });
+          }}
+        >
+          <img
+            src={Logo}
+            className="logo w-[7vw] mb-10 mt-10"
+            alt="TTIME Logo"
+          />
+          <h3 className="pb-4 mb-2 text-center font-bold text-[18px]">
+            Add {name} to {localStorage.getItem("projectName") ?? ""} as {role}
+          </h3>
+          <p className="p-1">Role for user:</p>
+          <div className="border-2 border-black p-2 rounded-xl text-center h-[10h] w-[16vh]">
+            <ul className="text-center items-center font-medium space-y-2">
+              <li
+                className="h-[10h] w-[14vh] items-start p-1 border-2 border-black rounded-full bg-orange-200 hover:bg-orange-600 hover:text-slate-100 hover:cursor-pointer"
+                onClick={() => {
+                  setRole("user");
+                }}
+              >
+                {"User"}
+              </li>
+              <li
+                className="h-[10h] w-[14vh] items-start p-1 border-2 border-black rounded-full bg-orange-200 hover:bg-orange-600 hover:text-slate-100 hover:cursor-pointer"
+                onClick={() => {
+                  setRole("project_manager");
+                }}
+              >
+                {"Project manager"}
+              </li>
+            </ul>
+          </div>
+          <p className="p-1">User to add:</p>
+          <div className="border-2 border-black p-2 rounded-xl text-center overflow-scroll h-[26vh] w-[26vh]">
+            <ul className="text-center font-medium space-y-2">
+              <div></div>
+              {users.map((user) => (
+                <li
+                  className="items-start p-1 border-2 border-black rounded-full bg-orange-200 hover:bg-orange-600 hover:text-slate-100 hover:cursor-pointer"
+                  key={user}
+                  value={user}
+                  onClick={() => {
+                    setName(user);
+                  }}
+                >
+                  <span>{user}</span>
+                </li>
+              ))}
+            </ul>
+          </div>
+          <div className="flex items-center justify-between">
+            <Button
+              text="Add"
+              onClick={(): void => {
+                handleClick();
+              }}
+              type="submit"
+            />
+          </div>
+        </form>
+        <p className="text-center text-gray-500 text-xs"></p>
+      </div>
+    </div>
+  );
+}
+
+export default AddUserToProject;

From b2db9c54ca78a1fd0499e441630895f2a39ace91 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 21 Mar 2024 03:39:18 +0100
Subject: [PATCH 10/35] Add member functionality added

---
 frontend/src/Components/ProjectInfoModal.tsx | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/frontend/src/Components/ProjectInfoModal.tsx b/frontend/src/Components/ProjectInfoModal.tsx
index b153e9c..4d79cac 100644
--- a/frontend/src/Components/ProjectInfoModal.tsx
+++ b/frontend/src/Components/ProjectInfoModal.tsx
@@ -2,6 +2,7 @@ import { useState } from "react";
 import Button from "./Button";
 import { UserProjectMember } from "../Types/goTypes";
 import GetUsersInProject from "./GetUsersInProject";
+import { Link } from "react-router-dom";
 
 function ProjectInfoModal(props: {
   isVisible: boolean;
@@ -50,6 +51,16 @@ function ProjectInfoModal(props: {
             }}
             type="button"
           />
+          <Link to={"/addUserToProject"}>
+            <Button
+              text={"Add Member"}
+              onClick={function (): void {
+                // Might wanna change this later
+                localStorage.setItem("projectName", props.projectname);
+              }}
+              type="button"
+            />
+          </Link>
           <Button
             text={"Close"}
             onClick={function (): void {

From c9e28e9b5b660d9058ff4b5737898206c46f8812 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 21 Mar 2024 03:39:53 +0100
Subject: [PATCH 11/35] New type to match fetch

---
 frontend/src/Types/goTypes.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/frontend/src/Types/goTypes.ts b/frontend/src/Types/goTypes.ts
index 6433b13..302e785 100644
--- a/frontend/src/Types/goTypes.ts
+++ b/frontend/src/Types/goTypes.ts
@@ -151,9 +151,16 @@ export interface NewProject {
  */
 export interface RoleChange {
   username: string;
-  role: 'project_manager' | 'user';
+  role: "project_manager" | "user";
   projectname: string;
 }
+
+export interface NewProjMember {
+  username: string;
+  projectname: string;
+  role: "project_manager" | "user";
+}
+
 export interface NameChange {
   id: number /* int */;
   name: string;
@@ -186,8 +193,8 @@ export interface PublicUser {
 }
 
 export interface UserProjectMember {
-	Username: string;
-	UserRole: string;
+  Username: string;
+  UserRole: string;
 }
 /**
  * wrapper type for token

From 36c158b54b7242d2dd437102b0daf6d7a42fde5b Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 28 Mar 2024 00:27:07 +0100
Subject: [PATCH 12/35] Insert user "admin" to site_admin in sample_data

---
 backend/internal/database/sample_data/0010_sample_data.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/internal/database/sample_data/0010_sample_data.sql b/backend/internal/database/sample_data/0010_sample_data.sql
index 092fbb0..ab74f1a 100644
--- a/backend/internal/database/sample_data/0010_sample_data.sql
+++ b/backend/internal/database/sample_data/0010_sample_data.sql
@@ -7,6 +7,8 @@ VALUES ("user", "123");
 INSERT OR IGNORE INTO users(username, password)
 VALUES ("user2", "123");
 
+INSERT OR IGNORE INTO site_admin VALUES (1);
+
 INSERT OR IGNORE INTO projects(name,description,owner_user_id)
 VALUES ("projecttest","test project", 1);
 

From 99a1430188066a388bd3ffe996bdd0e51debf7a6 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 28 Mar 2024 00:57:16 +0100
Subject: [PATCH 13/35] Fix to addUserToProject API

---
 frontend/src/API/API.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts
index 7920e0e..d898206 100644
--- a/frontend/src/API/API.ts
+++ b/frontend/src/API/API.ts
@@ -265,7 +265,7 @@ export const api: API = {
   ): Promise<APIResponse<NewProjMember>> {
     try {
       const response = await fetch("/api/addUserToProject", {
-        method: "POST",
+        method: "PUT",
         headers: {
           "Content-Type": "application/json",
           Authorization: "Bearer " + token,

From 0299bb477986bfb64df4dd01d9069ea630ad0ff6 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 28 Mar 2024 01:31:35 +0100
Subject: [PATCH 14/35] Removed unused path

---
 frontend/src/main.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index 5fd4d68..bac2292 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -31,7 +31,6 @@ import AdminProjectViewMemberInfo from "./Pages/AdminPages/AdminProjectViewMembe
 import AdminProjectPage from "./Pages/AdminPages/AdminProjectPage.tsx";
 import NotFoundPage from "./Pages/NotFoundPage.tsx";
 import UnauthorizedPage from "./Pages/UnauthorizedPage.tsx";
-import AddUserToProject from "./Components/AddUserToProject.tsx";
 
 // This is where the routes are mounted
 const router = createBrowserRouter([
@@ -148,10 +147,6 @@ const router = createBrowserRouter([
     path: "/unauthorized",
     element: <UnauthorizedPage />,
   },
-  {
-    path: "/addUserToProject",
-    element: <AddUserToProject />,
-  },
 ]);
 
 // Semi-hacky way to get the root element

From dc3f91eee16850ee1fbd093ee1fc2fc0da34774e Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 28 Mar 2024 01:31:53 +0100
Subject: [PATCH 15/35] Add member component

---
 frontend/src/Components/AddMember.tsx | 39 +++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 frontend/src/Components/AddMember.tsx

diff --git a/frontend/src/Components/AddMember.tsx b/frontend/src/Components/AddMember.tsx
new file mode 100644
index 0000000..d29be68
--- /dev/null
+++ b/frontend/src/Components/AddMember.tsx
@@ -0,0 +1,39 @@
+import { APIResponse, api } from "../API/API";
+import { NewProjMember } from "../Types/goTypes";
+
+/**
+ * Tries to add a member to a project
+ * @param {Object} props - A NewProjMember
+ * @returns {boolean} True if added, false if not
+ */
+function AddMember(props: { memberToAdd: NewProjMember }): boolean {
+  let added = false;
+  if (
+    props.memberToAdd.username === "" ||
+    props.memberToAdd.role === "" ||
+    props.memberToAdd.projectname === ""
+  ) {
+    alert("All fields must be filled before adding");
+    return added;
+  }
+  api
+    .addUserToProject(
+      props.memberToAdd,
+      localStorage.getItem("accessToken") ?? "",
+    )
+    .then((response: APIResponse<NewProjMember>) => {
+      if (response.success) {
+        alert("Member added");
+        added = true;
+      } else {
+        alert("Member not added");
+        console.error(response.message);
+      }
+    })
+    .catch((error) => {
+      console.error("An error occurred during member add:", error);
+    });
+  return added;
+}
+
+export default AddMember;

From b6d1a2926ec90d7b4d1c1554af858ccaf902596f Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 28 Mar 2024 01:33:03 +0100
Subject: [PATCH 16/35] Moved MemberAdd to own component and changed design a
 little

---
 frontend/src/Components/AddUserToProject.tsx | 170 +++++++------------
 1 file changed, 65 insertions(+), 105 deletions(-)

diff --git a/frontend/src/Components/AddUserToProject.tsx b/frontend/src/Components/AddUserToProject.tsx
index debd0f9..9f4439b 100644
--- a/frontend/src/Components/AddUserToProject.tsx
+++ b/frontend/src/Components/AddUserToProject.tsx
@@ -1,39 +1,13 @@
 import { useState } from "react";
-import { APIResponse, api } from "../API/API";
 import { NewProjMember } from "../Types/goTypes";
-import Logo from "../assets/Logo.svg";
 import Button from "./Button";
 import GetAllUsers from "./GetAllUsers";
+import AddMember from "./AddMember";
+import BackButton from "./BackButton";
 
 /**
- * Tries to add a member to a project
- * @param {Object} props - A NewProjMember
- * @returns {boolean} True if added, false if not
- */
-function MemberAdd(props: { memberToAdd: NewProjMember }): boolean {
-  let added = false;
-
-  api
-    .addUserToProject(
-      props.memberToAdd,
-      localStorage.getItem("accessToken") ?? "",
-    )
-    .then((response: APIResponse<NewProjMember>) => {
-      if (response.success) {
-        added = true;
-      } else {
-        console.error(response.message);
-      }
-    })
-    .catch((error) => {
-      console.error("An error occurred during member add:", error);
-    });
-  return added;
-}
-
-/**
- * Provides UI for adding a project to the system.
- * @returns {JSX.Element} - Returns the component UI for adding a project
+ * Provides UI for adding a member to a project.
+ * @returns {JSX.Element} - Returns the component UI for adding a member
  */
 function AddUserToProject(): JSX.Element {
   const [name, setName] = useState("");
@@ -45,86 +19,72 @@ function AddUserToProject(): JSX.Element {
     const newMember: NewProjMember = {
       username: name,
       projectname: localStorage.getItem("projectName") ?? "",
-      role: "user",
+      role: role,
     };
-    return MemberAdd({ memberToAdd: newMember });
+    return AddMember({ memberToAdd: newMember });
   };
 
   return (
-    <div className="flex flex-col h-fit w-screen items-center justify-center">
-      <div className="border-4 border-black bg-white flex flex-col items-center justify-center rounded-3xl content-center pl-20 pr-20  h-[84vh] w-[50vh]">
-        <form
-          className="bg-white rounded px-8 pt-6 pb-8 mb-4 items-center justify-center flex flex-col w-fit h-fit"
-          onSubmit={(e) => {
-            e.preventDefault();
-            MemberAdd({
-              memberToAdd: {
-                username: "",
-                projectname: "",
-                role: "project_manager",
-              },
-            });
-          }}
-        >
-          <img
-            src={Logo}
-            className="logo w-[7vw] mb-10 mt-10"
-            alt="TTIME Logo"
-          />
-          <h3 className="pb-4 mb-2 text-center font-bold text-[18px]">
-            Add {name} to {localStorage.getItem("projectName") ?? ""} as {role}
-          </h3>
-          <p className="p-1">Role for user:</p>
-          <div className="border-2 border-black p-2 rounded-xl text-center h-[10h] w-[16vh]">
-            <ul className="text-center items-center font-medium space-y-2">
-              <li
-                className="h-[10h] w-[14vh] items-start p-1 border-2 border-black rounded-full bg-orange-200 hover:bg-orange-600 hover:text-slate-100 hover:cursor-pointer"
-                onClick={() => {
-                  setRole("user");
-                }}
-              >
-                {"User"}
-              </li>
-              <li
-                className="h-[10h] w-[14vh] items-start p-1 border-2 border-black rounded-full bg-orange-200 hover:bg-orange-600 hover:text-slate-100 hover:cursor-pointer"
-                onClick={() => {
-                  setRole("project_manager");
-                }}
-              >
-                {"Project manager"}
-              </li>
-            </ul>
-          </div>
-          <p className="p-1">User to add:</p>
-          <div className="border-2 border-black p-2 rounded-xl text-center overflow-scroll h-[26vh] w-[26vh]">
-            <ul className="text-center font-medium space-y-2">
-              <div></div>
-              {users.map((user) => (
-                <li
-                  className="items-start p-1 border-2 border-black rounded-full bg-orange-200 hover:bg-orange-600 hover:text-slate-100 hover:cursor-pointer"
-                  key={user}
-                  value={user}
-                  onClick={() => {
-                    setName(user);
-                  }}
-                >
-                  <span>{user}</span>
-                </li>
-              ))}
-            </ul>
-          </div>
-          <div className="flex items-center justify-between">
-            <Button
-              text="Add"
-              onClick={(): void => {
-                handleClick();
-              }}
-              type="submit"
-            />
-          </div>
-        </form>
-        <p className="text-center text-gray-500 text-xs"></p>
+    <div className="border-4 border-black bg-white flex flex-col items-center justify-center rounded-3xl content-center pl-20 pr-20  h-[75vh] w-[50vh]">
+      <p className="pb-4 mb-2 text-center font-bold text-[18px]">
+        User chosen: [{name}]
+      </p>
+      <p className="pb-4 mb-2 text-center font-bold text-[18px]">
+        Role chosen: [{role}]
+      </p>
+      <p className="pb-4 mb-2 text-center font-bold text-[18px]">
+        Project chosen: [{localStorage.getItem("projectName") ?? ""}]
+      </p>
+      <p className="p-1">Choose role:</p>
+      <div className="border-2 border-black p-2 rounded-xl text-center h-[10h] w-[16vh]">
+        <ul className="text-center items-center font-medium space-y-2">
+          <li
+            className="h-[10h] w-[14vh] items-start p-1 border-2 border-black rounded-full bg-orange-200 hover:bg-orange-600 hover:text-slate-100 hover:cursor-pointer"
+            onClick={() => {
+              setRole("member");
+            }}
+          >
+            {"Member"}
+          </li>
+          <li
+            className="h-[10h] w-[14vh] items-start p-1 border-2 border-black rounded-full bg-orange-200 hover:bg-orange-600 hover:text-slate-100 hover:cursor-pointer"
+            onClick={() => {
+              setRole("project_manager");
+            }}
+          >
+            {"Project manager"}
+          </li>
+        </ul>
       </div>
+      <p className="p-1">Choose user:</p>
+      <div className="border-2 border-black p-2 rounded-xl text-center overflow-scroll h-[26vh] w-[26vh]">
+        <ul className="text-center font-medium space-y-2">
+          <div></div>
+          {users.map((user) => (
+            <li
+              className="items-start p-1 border-2 border-black rounded-full bg-orange-200 hover:bg-orange-600 hover:text-slate-100 hover:cursor-pointer"
+              key={user}
+              value={user}
+              onClick={() => {
+                setName(user);
+              }}
+            >
+              <span>{user}</span>
+            </li>
+          ))}
+        </ul>
+      </div>
+      <div className="flex space-x-5 items-center justify-between">
+        <Button
+          text="Add"
+          onClick={(): void => {
+            handleClick();
+          }}
+          type="submit"
+        />
+        <BackButton />
+      </div>
+      <p className="text-center text-gray-500 text-xs"></p>
     </div>
   );
 }

From 19cb8dbd94f06e96f9b3bb100799435084543e73 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 28 Mar 2024 01:34:49 +0100
Subject: [PATCH 17/35] Small fixes

---
 frontend/src/Components/ProjectInfoModal.tsx | 12 +++++++-----
 frontend/src/Components/ProjectListAdmin.tsx | 10 ++++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/frontend/src/Components/ProjectInfoModal.tsx b/frontend/src/Components/ProjectInfoModal.tsx
index 4d79cac..3075b19 100644
--- a/frontend/src/Components/ProjectInfoModal.tsx
+++ b/frontend/src/Components/ProjectInfoModal.tsx
@@ -19,9 +19,12 @@ function ProjectInfoModal(props: {
       className="fixed inset-0 bg-black bg-opacity-30 backdrop-blur-sm 
       flex justify-center items-center"
     >
-      <div className="border-4 border-black bg-white p-2 rounded-2xl text-center h-[41vh] w-[40vw] flex flex-col">
+      <div className="border-4 border-black bg-white p-2 rounded-2xl text-center h-[47vh] w-[40] flex flex-col">
         <div className="pl-20 pr-20">
-          <h1 className="font-bold text-[32px] mb-[20px]">Project members:</h1>
+          <h1 className="font-bold text-[32px] mb-[20px]">
+            {localStorage.getItem("projectName") ?? ""}
+          </h1>
+          <h2 className="font-bold text-[24px] mb-[20px]">Project members:</h2>
           <div className="border-2 border-black p-2 rounded-lg text-center overflow-scroll h-[26vh]">
             <ul className="text-left font-medium space-y-2">
               <div></div>
@@ -51,12 +54,11 @@ function ProjectInfoModal(props: {
             }}
             type="button"
           />
-          <Link to={"/addUserToProject"}>
+          <Link to={"/adminProjectAddMember"}>
             <Button
               text={"Add Member"}
               onClick={function (): void {
-                // Might wanna change this later
-                localStorage.setItem("projectName", props.projectname);
+                return;
               }}
               type="button"
             />
diff --git a/frontend/src/Components/ProjectListAdmin.tsx b/frontend/src/Components/ProjectListAdmin.tsx
index 4ebdaf8..f25ee47 100644
--- a/frontend/src/Components/ProjectListAdmin.tsx
+++ b/frontend/src/Components/ProjectListAdmin.tsx
@@ -2,7 +2,6 @@ import { useState } from "react";
 import { NewProject } from "../Types/goTypes";
 import ProjectInfoModal from "./ProjectInfoModal";
 import UserInfoModal from "./UserInfoModal";
-import DeleteUser from "./DeleteUser";
 
 /**
  * A list of projects for admin manage projects page, that sets an onClick
@@ -28,8 +27,9 @@ export function ProjectListAdmin(props: {
     setUserModalVisible(true);
   };
 
-  const handleClickProject = (username: string): void => {
-    setProjectname(username);
+  const handleClickProject = (projectname: string): void => {
+    setProjectname(projectname);
+    localStorage.setItem("projectName", projectname);
     setProjectModalVisible(true);
   };
 
@@ -55,7 +55,9 @@ export function ProjectListAdmin(props: {
         manageMember={true}
         onClose={handleCloseUser}
         //TODO: CHANGE TO REMOVE USER FROM PROJECT
-        onDelete={() => DeleteUser}
+        onDelete={() => {
+          return;
+        }}
         isVisible={userModalVisible}
         username={username}
       />

From 752d366cf75bb63f884c00f9b31b07fb0b1785f5 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 28 Mar 2024 01:35:16 +0100
Subject: [PATCH 18/35] Added some alerts

---
 frontend/src/Components/Register.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/frontend/src/Components/Register.tsx b/frontend/src/Components/Register.tsx
index df07c6e..6192637 100644
--- a/frontend/src/Components/Register.tsx
+++ b/frontend/src/Components/Register.tsx
@@ -4,7 +4,6 @@ import { api } from "../API/API";
 import Logo from "../assets/Logo.svg";
 import Button from "./Button";
 import InputField from "./InputField";
-import { useNavigate } from "react-router-dom";
 
 /**
  * Renders a registration form for the admin to add new users in.
@@ -15,8 +14,6 @@ export default function Register(): JSX.Element {
   const [password, setPassword] = useState<string>();
   const [errMessage, setErrMessage] = useState<string>();
 
-  const nav = useNavigate();
-
   const handleRegister = async (): Promise<void> => {
     const newUser: NewUser = {
       username: username ?? "",
@@ -24,8 +21,9 @@ export default function Register(): JSX.Element {
     };
     const response = await api.registerUser(newUser);
     if (response.success) {
-      nav("/"); // Instantly navigate to the login page
+      alert("User added!");
     } else {
+      alert("User not added");
       setErrMessage(response.message ?? "Unknown error");
       console.error(errMessage);
     }

From 9052babaaee633d6d802e16a5bdece52366875ff Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 28 Mar 2024 01:35:36 +0100
Subject: [PATCH 19/35] Now uses addUserToProject

---
 .../Pages/AdminPages/AdminProjectAddMember.tsx | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx b/frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx
index 712df86..893bdad 100644
--- a/frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx
+++ b/frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx
@@ -1,22 +1,10 @@
-import BackButton from "../../Components/BackButton";
+import AddUserToProject from "../../Components/AddUserToProject";
 import BasicWindow from "../../Components/BasicWindow";
-import Button from "../../Components/Button";
 
 function AdminProjectAddMember(): JSX.Element {
-  const content = <></>;
+  const content = <AddUserToProject />;
 
-  const buttons = (
-    <>
-      <Button
-        text="Add"
-        onClick={(): void => {
-          return;
-        }}
-        type="button"
-      />
-      <BackButton />
-    </>
-  );
+  const buttons = <></>;
 
   return <BasicWindow content={content} buttons={buttons} />;
 }

From cef7b3409211df371fa3fb70d443c55b45dd6c5e Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 28 Mar 2024 01:36:48 +0100
Subject: [PATCH 20/35] Small change to newprojmember type

---
 frontend/src/Types/goTypes.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/Types/goTypes.ts b/frontend/src/Types/goTypes.ts
index 302e785..c519aac 100644
--- a/frontend/src/Types/goTypes.ts
+++ b/frontend/src/Types/goTypes.ts
@@ -158,7 +158,7 @@ export interface RoleChange {
 export interface NewProjMember {
   username: string;
   projectname: string;
-  role: "project_manager" | "user";
+  role: string;
 }
 
 export interface NameChange {

From 50042ded4191e9678cea5f73039f1f6541b7d88c Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 28 Mar 2024 12:37:04 +0100
Subject: [PATCH 21/35] Fix in handler

---
 backend/internal/handlers/handlers_user_related.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/internal/handlers/handlers_user_related.go b/backend/internal/handlers/handlers_user_related.go
index 4e54e38..78c622e 100644
--- a/backend/internal/handlers/handlers_user_related.go
+++ b/backend/internal/handlers/handlers_user_related.go
@@ -59,9 +59,9 @@ func (gs *GState) UserDelete(c *fiber.Ctx) error {
 	// Read username from Locals
 	auth_username := c.Locals("user").(*jwt.Token).Claims.(jwt.MapClaims)["name"].(string)
 
-	if username != auth_username {
-		log.Info("User tried to delete another user")
-		return c.Status(403).SendString("You can only delete yourself")
+	if username == auth_username {
+		log.Info("User tried to delete itself")
+		return c.Status(403).SendString("You can't delete yourself")
 	}
 
 	if err := gs.Db.RemoveUser(username); err != nil {

From 3d9bd2ef96050f9f667a8e1adb273b4a96dd18c4 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 28 Mar 2024 12:38:12 +0100
Subject: [PATCH 22/35] Fixed bugs in removeUser api

---
 frontend/src/API/API.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts
index d898206..41be31a 100644
--- a/frontend/src/API/API.ts
+++ b/frontend/src/API/API.ts
@@ -186,19 +186,17 @@ export const api: API = {
   ): Promise<APIResponse<User>> {
     try {
       const response = await fetch(`/api/userdelete/${username}`, {
-        method: "POST",
+        method: "DELETE",
         headers: {
           "Content-Type": "application/json",
           Authorization: "Bearer " + token,
         },
         body: JSON.stringify(username),
       });
-
       if (!response.ok) {
-        return { success: false, message: "Failed to remove user" };
+        return { success: false, message: "Could not remove user" };
       } else {
-        const data = (await response.json()) as User;
-        return { success: true, data };
+        return { success: true };
       }
     } catch (e) {
       return { success: false, message: "Failed to remove user" };

From 48e53b876896d15370b2a31b5872831d2730820f Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 28 Mar 2024 12:38:40 +0100
Subject: [PATCH 23/35] Added some alerts

---
 frontend/src/Components/DeleteUser.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/Components/DeleteUser.tsx b/frontend/src/Components/DeleteUser.tsx
index db49724..d1dbc7f 100644
--- a/frontend/src/Components/DeleteUser.tsx
+++ b/frontend/src/Components/DeleteUser.tsx
@@ -11,7 +11,6 @@ import { api, APIResponse } from "../API/API";
  */
 
 function DeleteUser(props: { usernameToDelete: string }): boolean {
-  //console.log(props.usernameToDelete); FOR DEBUG
   let removed = false;
   api
     .removeUser(
@@ -20,12 +19,16 @@ function DeleteUser(props: { usernameToDelete: string }): boolean {
     )
     .then((response: APIResponse<User>) => {
       if (response.success) {
+        alert("User has been deleted!");
+        location.reload();
         removed = true;
       } else {
+        alert("User has not been deleted");
         console.error(response.message);
       }
     })
     .catch((error) => {
+      alert("User has not been deleted");
       console.error("An error occurred during creation:", error);
     });
   return removed;

From a96f0fb488ebae34730f6eaa2f1da296014aa378 Mon Sep 17 00:00:00 2001
From: Peter KW <peter.k.w.96@gmail.com>
Date: Thu, 28 Mar 2024 12:39:23 +0100
Subject: [PATCH 24/35] Can now delete user, and also asks user to confirm
 action

---
 frontend/src/Components/UserInfoModal.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/Components/UserInfoModal.tsx b/frontend/src/Components/UserInfoModal.tsx
index 2334388..9695899 100644
--- a/frontend/src/Components/UserInfoModal.tsx
+++ b/frontend/src/Components/UserInfoModal.tsx
@@ -49,7 +49,13 @@ function UserInfoModal(props: {
           <Button
             text={"Delete"}
             onClick={function (): void {
-              DeleteUser({ usernameToDelete: props.username });
+              if (
+                window.confirm("Are you sure you want to delete this user?")
+              ) {
+                DeleteUser({
+                  usernameToDelete: props.username,
+                });
+              }
             }}
             type="button"
           />

From f6dcdcc376e2e3276db34959d2f4951e00a4ff6d Mon Sep 17 00:00:00 2001
From: al8763be <al8763be-s@student.lu.se>
Date: Thu, 28 Mar 2024 16:40:55 +0100
Subject: [PATCH 25/35] GetUnsignedReports

---
 backend/internal/database/db_test.go          | 10 +++++
 .../handlers/handlers_report_related.go       |  2 +-
 backend/main.go                               |  2 +-
 testing.py                                    | 45 ++-----------------
 4 files changed, 15 insertions(+), 44 deletions(-)

diff --git a/backend/internal/database/db_test.go b/backend/internal/database/db_test.go
index cff70a0..fb394e0 100644
--- a/backend/internal/database/db_test.go
+++ b/backend/internal/database/db_test.go
@@ -481,6 +481,11 @@ func TestGetUnsignedWeeklyReports(t *testing.T) {
 		t.Error("AddUser failed:", err)
 	}
 
+	err = db.AddUser("testuser1", "password")
+	if err != nil {
+		t.Error("AddUser failed:", err)
+	}
+
 	err = db.AddProject("testproject", "description", "testuser")
 	if err != nil {
 		t.Error("AddProject failed:", err)
@@ -491,6 +496,11 @@ func TestGetUnsignedWeeklyReports(t *testing.T) {
 		t.Error("AddWeeklyReport failed:", err)
 	}
 
+	err = db.AddWeeklyReport("testproject", "testuser1", 1, 1, 1, 1, 1, 1, 1)
+	if err != nil {
+		t.Error("AddWeeklyReport failed:", err)
+	}
+
 	reports, err := db.GetUnsignedWeeklyReports("testproject")
 	if err != nil {
 		t.Error("GetUnsignedWeeklyReports failed:", err)
diff --git a/backend/internal/handlers/handlers_report_related.go b/backend/internal/handlers/handlers_report_related.go
index 534050a..5ac49b0 100644
--- a/backend/internal/handlers/handlers_report_related.go
+++ b/backend/internal/handlers/handlers_report_related.go
@@ -122,7 +122,7 @@ func (gs *GState) GetUnsignedReports(c *fiber.Ctx) error {
 	projectManagerUsername := claims["name"].(string)
 
 	// Extract project name and week from query parameters
-	projectName := c.Query("projectName")
+	projectName := c.Params("projectName")
 
 	log.Info("Getting unsigned reports for")
 
diff --git a/backend/main.go b/backend/main.go
index 835524c..dc5b86b 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -92,7 +92,7 @@ func main() {
 	server.Get("/api/project/:projectId", gs.GetProject)
 	server.Get("/api/project/getAllUsers", gs.GetAllUsersProject)
 	server.Get("/api/getWeeklyReport", gs.GetWeeklyReport)
-	server.Get("/api/getUnsignedReports", gs.GetUnsignedReports)
+	server.Get("/api/getUnsignedReports/:projectName", gs.GetUnsignedReports)
 	server.Post("/api/signReport", gs.SignReport)
 	server.Put("/api/addUserToProject", gs.AddUserToProjectHandler)
 	server.Put("/api/changeUserName", gs.ChangeUserName)
diff --git a/testing.py b/testing.py
index 3350497..ca23e78 100644
--- a/testing.py
+++ b/testing.py
@@ -2,7 +2,7 @@ import requests
 import string
 import random
 
-debug_output = False
+debug_output = True
 
 def gprint(*args, **kwargs):
     print("\033[92m", *args, "\033[00m", **kwargs)
@@ -41,7 +41,7 @@ getWeeklyReportsUserPath = base_url + "/api/getWeeklyReportsUser"
 checkIfProjectManagerPath = base_url + "/api/checkIfProjectManager"
 ProjectRoleChangePath = base_url + "/api/ProjectRoleChange"
 getUsersProjectPath = base_url + "/api/getUsersProject"
-getUsignedReportsPath = base_url + "/api/getUsignedReports"
+getUnsignedReportsPath = base_url + "/api/getUnsignedReports"
 
 #ta bort auth i handlern för att få testet att gå igenom
 def test_ProjectRoleChange():
@@ -330,45 +330,6 @@ def test_get_weekly_reports_user():
     assert response.status_code == 200, "Get weekly reports for user failed"
     gprint("test_get_weekly_reports_user successful")
 
-def test_get_usigned_reports():
-    # Log in as the user
-
-    token = login(username, "always_same").json()["token"]
-    response = requests.post(
-        submitReportPath,
-        json={
-            "projectName": projectName,
-            "week": 3,
-            "developmentTime": 10,
-            "meetingTime": 5,
-            "adminTime": 5,
-            "ownWorkTime": 10,
-            "studyTime": 10,
-            "testingTime": 10,
-        },
-        headers={"Authorization": "Bearer " + token},
-    )
-    dprint(response.text)
-    assert response.status_code == 200, "Submit report failed"
-
-
-    # Get weekly reports for the user in the project
-    response = requests.get(
-        getWeeklyReportsUserPath + "/" + projectName,
-        headers={"Authorization": "Bearer " + token},
-    )
-
-    dprint(response.text)
-    assert response.status_code == 200, "Get weekly reports for user failed"
-
-    response = requests.get(
-        getUsignedReportsPath + "/" + projectName,
-        headers={"Authorization": "Bearer " + token},
-    )
-    dprint(response.text)
-    assert response.status_code == 200, "Get unsigned reports for user failed"
-    gprint("test_get_usigned_reports successful")
-
 
 
 # Test function to check if a user is a project manager
@@ -411,7 +372,6 @@ def test_ensure_manager_of_created_project():
 
 
 if __name__ == "__main__":
-    test_get_usigned_reports()
     test_get_user_projects()
     test_create_user()
     test_login()
@@ -426,3 +386,4 @@ if __name__ == "__main__":
     test_ProjectRoleChange()
     #test_list_all_users_project()
     test_ensure_manager_of_created_project()
+    test_get_unsigned_reports()

From 9edcc74ee2fc5fe42a188ed20beff049b02dd346 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 12:41:51 +0100
Subject: [PATCH 26/35] Fix for IsProjectManagerHandler

---
 backend/internal/handlers/handlers_project_related.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/internal/handlers/handlers_project_related.go b/backend/internal/handlers/handlers_project_related.go
index bdcabd7..d63d7eb 100644
--- a/backend/internal/handlers/handlers_project_related.go
+++ b/backend/internal/handlers/handlers_project_related.go
@@ -219,7 +219,7 @@ func (gs *GState) IsProjectManagerHandler(c *fiber.Ctx) error {
 	username := claims["name"].(string)
 
 	// Extract necessary parameters from the request query string
-	projectName := c.Query("projectName")
+	projectName := c.Params("projectName")
 
 	log.Info("Checking if user ", username, " is a project manager for project ", projectName)
 
@@ -231,7 +231,7 @@ func (gs *GState) IsProjectManagerHandler(c *fiber.Ctx) error {
 	}
 
 	// Return the result as JSON
-	return c.JSON(map[string]bool{"isProjectManager": isManager})
+	return c.JSON(fiber.Map{"isProjectManager": isManager})
 }
 
 func (gs *GState) GetProjectTimesHandler(c *fiber.Ctx) error {

From c466a98b15d389cad4e22d4f52c685a157b41862 Mon Sep 17 00:00:00 2001
From: al8763be <al8763be-s@student.lu.se>
Date: Fri, 29 Mar 2024 12:43:35 +0100
Subject: [PATCH 27/35] test for getUnsigned

---
 testing.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/testing.py b/testing.py
index 032e56c..5fb8ffe 100644
--- a/testing.py
+++ b/testing.py
@@ -503,6 +503,17 @@ def test_remove_project():
     assert response.status_code == 200, "Remove project failed"
     gprint("test_remove_project successful")
 
+def test_get_unsigned_reports():
+    # Log in as the user
+        token = login("user2", "123").json()["token"]
+
+        # Make a request to get all unsigned reports
+        response = requests.get(
+            getUnsignedReportsPath + "/" + projectName,
+            headers={"Authorization": "Bearer " + token},
+        )
+        assert response.status_code == 200, "Get unsigned reports failed"
+        gprint("test_get_unsigned_reports successful")
 
 
 if __name__ == "__main__":

From 13d3035e49a8cef39fba84d6db095855df83051a Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 14:37:22 +0100
Subject: [PATCH 28/35] Major refactor, splitting user handlers into separate
 files and changes to how the database is accessed

---
 backend/internal/database/middleware.go       |  17 ++
 backend/internal/handlers/global_state.go     |  44 ---
 .../internal/handlers/global_state_test.go    |  15 -
 .../handlers/handlers_user_related.go         | 269 ------------------
 .../handlers_project_related.go               |  57 ++--
 .../{ => reports}/handlers_report_related.go  |  31 +-
 .../internal/handlers/users/ChangeUserName.go |  44 +++
 .../handlers/users/GetUsersProjects.go        |  22 ++
 .../internal/handlers/users/ListAllUsers.go   |  31 ++
 backend/internal/handlers/users/Login.go      |  65 +++++
 backend/internal/handlers/users/LoginRenew.go |  44 +++
 .../internal/handlers/users/PromoteToAdmin.go |  42 +++
 backend/internal/handlers/users/Register.go   |  38 +++
 backend/internal/handlers/users/UserDelete.go |  43 +++
 backend/main.go                               |  77 +++--
 15 files changed, 439 insertions(+), 400 deletions(-)
 create mode 100644 backend/internal/database/middleware.go
 delete mode 100644 backend/internal/handlers/global_state.go
 delete mode 100644 backend/internal/handlers/global_state_test.go
 delete mode 100644 backend/internal/handlers/handlers_user_related.go
 rename backend/internal/handlers/{ => projects}/handlers_project_related.go (83%)
 rename backend/internal/handlers/{ => reports}/handlers_report_related.go (83%)
 create mode 100644 backend/internal/handlers/users/ChangeUserName.go
 create mode 100644 backend/internal/handlers/users/GetUsersProjects.go
 create mode 100644 backend/internal/handlers/users/ListAllUsers.go
 create mode 100644 backend/internal/handlers/users/Login.go
 create mode 100644 backend/internal/handlers/users/LoginRenew.go
 create mode 100644 backend/internal/handlers/users/PromoteToAdmin.go
 create mode 100644 backend/internal/handlers/users/Register.go
 create mode 100644 backend/internal/handlers/users/UserDelete.go

diff --git a/backend/internal/database/middleware.go b/backend/internal/database/middleware.go
new file mode 100644
index 0000000..69fa3a2
--- /dev/null
+++ b/backend/internal/database/middleware.go
@@ -0,0 +1,17 @@
+package database
+
+import "github.com/gofiber/fiber/v2"
+
+// Simple middleware that provides a shared database pool as a local key "db"
+func DbMiddleware(db *Database) func(c *fiber.Ctx) error {
+	return func(c *fiber.Ctx) error {
+		c.Locals("db", db)
+		return c.Next()
+	}
+}
+
+// Helper function to get the database from the context, without fiddling with casts
+func GetDb(c *fiber.Ctx) Database {
+	// Dereference a pointer to a local, casted to a pointer to a Database
+	return *c.Locals("db").(*Database)
+}
diff --git a/backend/internal/handlers/global_state.go b/backend/internal/handlers/global_state.go
deleted file mode 100644
index 0db4340..0000000
--- a/backend/internal/handlers/global_state.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package handlers
-
-import (
-	"ttime/internal/database"
-
-	"github.com/gofiber/fiber/v2"
-)
-
-// The actual interface that we will use
-type GlobalState interface {
-	Register(c *fiber.Ctx) error        // To register a new user
-	UserDelete(c *fiber.Ctx) error      // To delete a user
-	Login(c *fiber.Ctx) error           // To get the token
-	LoginRenew(c *fiber.Ctx) error      // To renew the token
-	CreateProject(c *fiber.Ctx) error   // To create a new project
-	GetUserProjects(c *fiber.Ctx) error // To get all projects
-	SubmitWeeklyReport(c *fiber.Ctx) error
-	GetWeeklyReport(c *fiber.Ctx) error
-	SignReport(c *fiber.Ctx) error
-	GetProject(c *fiber.Ctx) error
-	AddUserToProjectHandler(c *fiber.Ctx) error
-	PromoteToAdmin(c *fiber.Ctx) error
-	GetWeeklyReportsUserHandler(c *fiber.Ctx) error
-	IsProjectManagerHandler(c *fiber.Ctx) error
-	DeleteProject(c *fiber.Ctx) error       // To delete a project // WIP
-	ListAllUsers(c *fiber.Ctx) error        // To get a list of all users in the application database
-	ListAllUsersProject(c *fiber.Ctx) error // To get a list of all users for a specific project
-	ProjectRoleChange(c *fiber.Ctx) error   // To change a users role in a project
-	ChangeUserName(c *fiber.Ctx) error      // WIP
-	GetAllUsersProject(c *fiber.Ctx) error  // WIP
-	GetUnsignedReports(c *fiber.Ctx) error  // 
-	UpdateWeeklyReport(c *fiber.Ctx) error
-	RemoveProject(c *fiber.Ctx) error
-}
-
-// "Constructor"
-func NewGlobalState(db database.Database) GlobalState {
-	return &GState{Db: db}
-}
-
-// The global state, which implements all the handlers
-type GState struct {
-	Db database.Database
-}
diff --git a/backend/internal/handlers/global_state_test.go b/backend/internal/handlers/global_state_test.go
deleted file mode 100644
index c0b64f7..0000000
--- a/backend/internal/handlers/global_state_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package handlers
-
-import (
-	"testing"
-	"ttime/internal/database"
-)
-
-// The actual interface that we will use
-func TestGlobalState(t *testing.T) {
-	db := database.DbConnect(":memory:")
-	gs := NewGlobalState(db)
-	if gs == nil {
-		t.Error("NewGlobalState returned nil")
-	}
-}
diff --git a/backend/internal/handlers/handlers_user_related.go b/backend/internal/handlers/handlers_user_related.go
deleted file mode 100644
index bc4ae2d..0000000
--- a/backend/internal/handlers/handlers_user_related.go
+++ /dev/null
@@ -1,269 +0,0 @@
-package handlers
-
-import (
-	"time"
-	"ttime/internal/types"
-
-	"github.com/gofiber/fiber/v2/log"
-
-	"github.com/gofiber/fiber/v2"
-	"github.com/golang-jwt/jwt/v5"
-)
-
-// Register is a simple handler that registers a new user
-//
-//	@Summary		Register
-//	@Description	Register a new user
-//	@Tags			User
-//	@Accept			json
-//	@Produce		plain
-//	@Param			NewUser	body		types.NewUser	true	"User to register"
-//	@Success		200		{string}	string			"User added"
-//	@Failure		400		{string}	string			"Bad request"
-//	@Failure		500		{string}	string			"Internal server error"
-//	@Router			/register [post]
-func (gs *GState) Register(c *fiber.Ctx) error {
-	u := new(types.NewUser)
-	if err := c.BodyParser(u); err != nil {
-		log.Warn("Error parsing body")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	log.Info("Adding user:", u.Username)
-	if err := gs.Db.AddUser(u.Username, u.Password); err != nil {
-		log.Warn("Error adding user:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("User added:", u.Username)
-	return c.Status(200).SendString("User added")
-}
-
-// This path should obviously be protected in the future
-// UserDelete deletes a user from the database
-//
-//	@Summary		UserDelete
-//	@Description	UserDelete deletes a user from the database
-//	@Tags			User
-//	@Accept			json
-//	@Produce		plain
-//	@Success		200	{string}	string	"User deleted"
-//	@Failure		403	{string}	string	"You can only delete yourself"
-//	@Failure		500	{string}	string	"Internal server error"
-//	@Failure		401	{string}	string	"Unauthorized"
-//	@Router			/userdelete/{username} [delete]
-func (gs *GState) UserDelete(c *fiber.Ctx) error {
-	// Read from path parameters
-	username := c.Params("username")
-
-	// Read username from Locals
-	auth_username := c.Locals("user").(*jwt.Token).Claims.(jwt.MapClaims)["name"].(string)
-
-	if username == auth_username {
-		log.Info("User tried to delete itself")
-		return c.Status(403).SendString("You can't delete yourself")
-	}
-
-	if err := gs.Db.RemoveUser(username); err != nil {
-		log.Warn("Error deleting user:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("User deleted:", username)
-	return c.Status(200).SendString("User deleted")
-}
-
-// Login is a simple login handler that returns a JWT token
-//
-//	@Summary		login
-//	@Description	logs the user in and returns a jwt token
-//	@Tags			User
-//	@Accept			json
-//	@Param			NewUser	body	types.NewUser	true	"login info"
-//	@Produce		plain
-//	@Success		200	Token		types.Token	"Successfully signed token for user"
-//	@Failure		400	{string}	string		"Bad request"
-//	@Failure		401	{string}	string		"Unauthorized"
-//	@Failure		500	{string}	string		"Internal server error"
-//	@Router			/login [post]
-func (gs *GState) Login(c *fiber.Ctx) error {
-	// The body type is identical to a NewUser
-
-	u := new(types.NewUser)
-	if err := c.BodyParser(u); err != nil {
-		log.Warn("Error parsing body")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	log.Info("Username logging in:", u.Username)
-	if !gs.Db.CheckUser(u.Username, u.Password) {
-		log.Info("User not found")
-		return c.SendStatus(fiber.StatusUnauthorized)
-	}
-
-	isAdmin, err := gs.Db.IsSiteAdmin(u.Username)
-	if err != nil {
-		log.Info("Error checking admin status:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-	// Create the Claims
-	claims := jwt.MapClaims{
-		"name":  u.Username,
-		"admin": isAdmin,
-		"exp":   time.Now().Add(time.Hour * 72).Unix(),
-	}
-
-	// Create token
-	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
-	log.Info("Token created for user:", u.Username)
-
-	// Generate encoded token and send it as response.
-	t, err := token.SignedString([]byte("secret"))
-	if err != nil {
-		log.Warn("Error signing token")
-		return c.SendStatus(fiber.StatusInternalServerError)
-	}
-
-	println("Successfully signed token for user:", u.Username)
-	return c.JSON(types.Token{Token: t})
-}
-
-// LoginRenew is a simple handler that renews the token
-//
-//	@Summary		LoginRenews
-//	@Description	renews the users token
-//	@Security		bererToken
-//	@Tags			User
-//	@Accept			json
-//	@Produce		plain
-//	@Success		200	Token		types.Token	"Successfully signed token for user"
-//	@Failure		401	{string}	string		"Unauthorized"
-//	@Failure		500	{string}	string		"Internal server error"
-//	@Router			/loginerenew [post]
-func (gs *GState) LoginRenew(c *fiber.Ctx) error {
-	user := c.Locals("user").(*jwt.Token)
-
-	log.Info("Renewing token for user:", user.Claims.(jwt.MapClaims)["name"])
-
-	claims := user.Claims.(jwt.MapClaims)
-	claims["exp"] = time.Now().Add(time.Hour * 72).Unix()
-	renewed := jwt.MapClaims{
-		"name":  claims["name"],
-		"admin": claims["admin"],
-		"exp":   claims["exp"],
-	}
-	token := jwt.NewWithClaims(jwt.SigningMethodHS256, renewed)
-	t, err := token.SignedString([]byte("secret"))
-	if err != nil {
-		log.Warn("Error signing token")
-		return c.SendStatus(fiber.StatusInternalServerError)
-	}
-
-	log.Info("Successfully renewed token for user:", user.Claims.(jwt.MapClaims)["name"])
-	return c.JSON(types.Token{Token: t})
-}
-
-// ListAllUsers is a handler that returns a list of all users in the application database
-//
-//	@Summary		ListsAllUsers
-//	@Description	lists all users
-//	@Tags			User
-//	@Accept			json
-//	@Produce		plain
-//	@Success		200	{json}		json	"Successfully signed token for user"
-//	@Failure		401	{string}	string	"Unauthorized"
-//	@Failure		500	{string}	string	"Internal server error"
-//	@Router			/users/all [get]
-func (gs *GState) ListAllUsers(c *fiber.Ctx) error {
-	// Get all users from the database
-	users, err := gs.Db.GetAllUsersApplication()
-	if err != nil {
-		log.Info("Error getting users from db:", err) // Debug print
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Returning all users")
-	// Return the list of users as JSON
-	return c.JSON(users)
-}
-
-func (gs *GState) GetAllUsersProject(c *fiber.Ctx) error {
-	// Get all users from a project
-	projectName := c.Params("projectName")
-	users, err := gs.Db.GetAllUsersProject(projectName)
-	if err != nil {
-		log.Info("Error getting users from project:", err) // Debug print
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Returning all users")
-	// Return the list of users as JSON
-	return c.JSON(users)
-}
-
-// @Summary		PromoteToAdmin
-// @Description	promote chosen user to admin
-// @Tags			User
-// @Accept			json
-// @Produce		plain
-// @Param			NewUser	body		types.NewUser	true	"user info"
-// @Success		200		{json}		json			"Successfully promoted user"
-// @Failure		400		{string}	string			"Bad request"
-// @Failure		401		{string}	string			"Unauthorized"
-// @Failure		500		{string}	string			"Internal server error"
-// @Router			/promoteToAdmin [post]
-func (gs *GState) PromoteToAdmin(c *fiber.Ctx) error {
-	// Extract the username from the request body
-	var newUser types.NewUser
-	if err := c.BodyParser(&newUser); err != nil {
-		return c.Status(400).SendString("Bad request")
-	}
-	username := newUser.Username
-
-	log.Info("Promoting user to admin:", username) // Debug print
-
-	// Promote the user to a site admin in the database
-	if err := gs.Db.PromoteToAdmin(username); err != nil {
-		log.Info("Error promoting user to admin:", err) // Debug print
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("User promoted to admin successfully:", username) // Debug print
-
-	// Return a success message
-	return c.SendStatus(fiber.StatusOK)
-}
-
-// ChangeUserName changes a user's username in the database
-func (gs *GState) ChangeUserName(c *fiber.Ctx) error {
-	// Check token and get username of current user
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	adminUsername := claims["name"].(string)
-	log.Info(adminUsername)
-
-	// Extract the necessary parameters from the request
-	data := new(types.StrNameChange)
-	if err := c.BodyParser(data); err != nil {
-		log.Info("Error parsing username")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	// Check if the current user is an admin
-	isAdmin, err := gs.Db.IsSiteAdmin(adminUsername)
-	if err != nil {
-		log.Warn("Error checking if admin:", err)
-		return c.Status(500).SendString(err.Error())
-	} else if !isAdmin {
-		log.Warn("Tried changing name when not admin")
-		return c.Status(401).SendString("You cannot change name unless you are an admin")
-	}
-
-	// Change the user's name in the database
-	if err := gs.Db.ChangeUserName(data.PrevName, data.NewName); err != nil {
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return a success message
-	return c.SendStatus(fiber.StatusOK)
-}
diff --git a/backend/internal/handlers/handlers_project_related.go b/backend/internal/handlers/projects/handlers_project_related.go
similarity index 83%
rename from backend/internal/handlers/handlers_project_related.go
rename to backend/internal/handlers/projects/handlers_project_related.go
index d63d7eb..3429504 100644
--- a/backend/internal/handlers/handlers_project_related.go
+++ b/backend/internal/handlers/projects/handlers_project_related.go
@@ -1,7 +1,8 @@
-package handlers
+package projects
 
 import (
 	"strconv"
+	db "ttime/internal/database"
 	"ttime/internal/types"
 
 	"github.com/gofiber/fiber/v2"
@@ -10,7 +11,7 @@ import (
 )
 
 // CreateProject is a simple handler that creates a new project
-func (gs *GState) CreateProject(c *fiber.Ctx) error {
+func CreateProject(c *fiber.Ctx) error {
 	user := c.Locals("user").(*jwt.Token)
 
 	p := new(types.NewProject)
@@ -23,19 +24,19 @@ func (gs *GState) CreateProject(c *fiber.Ctx) error {
 	claims := user.Claims.(jwt.MapClaims)
 	owner := claims["name"].(string)
 
-	if err := gs.Db.AddProject(p.Name, p.Description, owner); err != nil {
+	if err := db.GetDb(c).AddProject(p.Name, p.Description, owner); err != nil {
 		return c.Status(500).SendString(err.Error())
 	}
 
 	return c.Status(200).SendString("Project added")
 }
 
-func (gs *GState) DeleteProject(c *fiber.Ctx) error {
+func DeleteProject(c *fiber.Ctx) error {
 
 	projectID := c.Params("projectID")
 	username := c.Params("username")
 
-	if err := gs.Db.DeleteProject(projectID, username); err != nil {
+	if err := db.GetDb(c).DeleteProject(projectID, username); err != nil {
 		return c.Status(500).SendString((err.Error()))
 	}
 
@@ -43,14 +44,14 @@ func (gs *GState) DeleteProject(c *fiber.Ctx) error {
 }
 
 // GetUserProjects returns all projects that the user is a member of
-func (gs *GState) GetUserProjects(c *fiber.Ctx) error {
+func GetUserProjects(c *fiber.Ctx) error {
 	// First we get the username from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
 	username := claims["name"].(string)
 
 	// Then dip into the database to get the projects
-	projects, err := gs.Db.GetProjectsForUser(username)
+	projects, err := db.GetDb(c).GetProjectsForUser(username)
 	if err != nil {
 		return c.Status(500).SendString(err.Error())
 	}
@@ -60,7 +61,7 @@ func (gs *GState) GetUserProjects(c *fiber.Ctx) error {
 }
 
 // ProjectRoleChange is a handler that changes a user's role within a project
-func (gs *GState) ProjectRoleChange(c *fiber.Ctx) error {
+func ProjectRoleChange(c *fiber.Ctx) error {
 
 	//check token and get username of current user
 	user := c.Locals("user").(*jwt.Token)
@@ -77,7 +78,7 @@ func (gs *GState) ProjectRoleChange(c *fiber.Ctx) error {
 	log.Info("Changing role for user: ", username, " in project: ", data.Projectname, " to: ", data.Role)
 
 	// Dubble diping and checcking if current user is
-	if ismanager, err := gs.Db.IsProjectManager(username, data.Projectname); err != nil {
+	if ismanager, err := db.GetDb(c).IsProjectManager(username, data.Projectname); err != nil {
 		log.Warn("Error checking if projectmanager:", err)
 		return c.Status(500).SendString(err.Error())
 	} else if !ismanager {
@@ -86,7 +87,7 @@ func (gs *GState) ProjectRoleChange(c *fiber.Ctx) error {
 	}
 
 	// Change the user's role within the project in the database
-	if err := gs.Db.ChangeUserRole(username, data.Projectname, data.Role); err != nil {
+	if err := db.GetDb(c).ChangeUserRole(username, data.Projectname, data.Role); err != nil {
 		return c.Status(500).SendString(err.Error())
 	}
 
@@ -95,7 +96,7 @@ func (gs *GState) ProjectRoleChange(c *fiber.Ctx) error {
 }
 
 // GetProject retrieves a specific project by its ID
-func (gs *GState) GetProject(c *fiber.Ctx) error {
+func GetProject(c *fiber.Ctx) error {
 	// Extract the project ID from the request parameters or body
 	projectID := c.Params("projectID")
 	if projectID == "" {
@@ -112,7 +113,7 @@ func (gs *GState) GetProject(c *fiber.Ctx) error {
 	}
 
 	// Get the project from the database by its ID
-	project, err := gs.Db.GetProject(projectIDInt)
+	project, err := db.GetDb(c).GetProject(projectIDInt)
 	if err != nil {
 		log.Info("Error getting project:", err)
 		return c.Status(500).SendString(err.Error())
@@ -123,7 +124,7 @@ func (gs *GState) GetProject(c *fiber.Ctx) error {
 	return c.JSON(project)
 }
 
-func (gs *GState) ListAllUsersProject(c *fiber.Ctx) error {
+func ListAllUsersProject(c *fiber.Ctx) error {
 	// Extract the project name from the request parameters or body
 	projectName := c.Params("projectName")
 	if projectName == "" {
@@ -137,7 +138,7 @@ func (gs *GState) ListAllUsersProject(c *fiber.Ctx) error {
 	username := claims["name"].(string)
 
 	// Check if the user is a project manager for the specified project
-	isManager, err := gs.Db.IsProjectManager(username, projectName)
+	isManager, err := db.GetDb(c).IsProjectManager(username, projectName)
 	if err != nil {
 		log.Info("Error checking project manager status:", err)
 		return c.Status(500).SendString(err.Error())
@@ -145,7 +146,7 @@ func (gs *GState) ListAllUsersProject(c *fiber.Ctx) error {
 
 	// If the user is not a project manager, check if the user is a site admin
 	if !isManager {
-		isAdmin, err := gs.Db.IsSiteAdmin(username)
+		isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
 		if err != nil {
 			log.Info("Error checking admin status:", err)
 			return c.Status(500).SendString(err.Error())
@@ -157,7 +158,7 @@ func (gs *GState) ListAllUsersProject(c *fiber.Ctx) error {
 	}
 
 	// Get all users associated with the project from the database
-	users, err := gs.Db.GetAllUsersProject(projectName)
+	users, err := db.GetDb(c).GetAllUsersProject(projectName)
 	if err != nil {
 		log.Info("Error getting users for project:", err)
 		return c.Status(500).SendString(err.Error())
@@ -170,7 +171,7 @@ func (gs *GState) ListAllUsersProject(c *fiber.Ctx) error {
 }
 
 // AddUserToProjectHandler is a handler that adds a user to a project with a specified role
-func (gs *GState) AddUserToProjectHandler(c *fiber.Ctx) error {
+func AddUserToProjectHandler(c *fiber.Ctx) error {
 	// Extract necessary parameters from the request
 	var requestData struct {
 		Username    string `json:"username"`
@@ -188,7 +189,7 @@ func (gs *GState) AddUserToProjectHandler(c *fiber.Ctx) error {
 	adminUsername := claims["name"].(string)
 	log.Info("Admin username from claims:", adminUsername)
 
-	isAdmin, err := gs.Db.IsSiteAdmin(adminUsername)
+	isAdmin, err := db.GetDb(c).IsSiteAdmin(adminUsername)
 	if err != nil {
 		log.Info("Error checking admin status:", err)
 		return c.Status(500).SendString(err.Error())
@@ -200,7 +201,7 @@ func (gs *GState) AddUserToProjectHandler(c *fiber.Ctx) error {
 	}
 
 	// Add the user to the project with the specified role
-	err = gs.Db.AddUserToProject(requestData.Username, requestData.ProjectName, requestData.Role)
+	err = db.GetDb(c).AddUserToProject(requestData.Username, requestData.ProjectName, requestData.Role)
 	if err != nil {
 		log.Info("Error adding user to project:", err)
 		return c.Status(500).SendString(err.Error())
@@ -212,7 +213,7 @@ func (gs *GState) AddUserToProjectHandler(c *fiber.Ctx) error {
 }
 
 // IsProjectManagerHandler is a handler that checks if a user is a project manager for a given project
-func (gs *GState) IsProjectManagerHandler(c *fiber.Ctx) error {
+func IsProjectManagerHandler(c *fiber.Ctx) error {
 	// Get the username from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
@@ -224,7 +225,7 @@ func (gs *GState) IsProjectManagerHandler(c *fiber.Ctx) error {
 	log.Info("Checking if user ", username, " is a project manager for project ", projectName)
 
 	// Check if the user is a project manager for the specified project
-	isManager, err := gs.Db.IsProjectManager(username, projectName)
+	isManager, err := db.GetDb(c).IsProjectManager(username, projectName)
 	if err != nil {
 		log.Info("Error checking project manager status:", err)
 		return c.Status(500).SendString(err.Error())
@@ -234,7 +235,7 @@ func (gs *GState) IsProjectManagerHandler(c *fiber.Ctx) error {
 	return c.JSON(fiber.Map{"isProjectManager": isManager})
 }
 
-func (gs *GState) GetProjectTimesHandler(c *fiber.Ctx) error {
+func GetProjectTimesHandler(c *fiber.Ctx) error {
 	// Get the username from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
@@ -248,7 +249,7 @@ func (gs *GState) GetProjectTimesHandler(c *fiber.Ctx) error {
 	}
 
 	// Get all users in the project and roles
-	userProjects, err := gs.Db.GetAllUsersProject(projectName)
+	userProjects, err := db.GetDb(c).GetAllUsersProject(projectName)
 	if err != nil {
 		log.Info("Error getting users in project:", err)
 		return c.Status(500).SendString(err.Error())
@@ -265,7 +266,7 @@ func (gs *GState) GetProjectTimesHandler(c *fiber.Ctx) error {
 
 	// If the user is admin
 	if !isMember {
-		isAdmin, err := gs.Db.IsSiteAdmin(username)
+		isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
 		if err != nil {
 			log.Info("Error checking admin status:", err)
 			return c.Status(500).SendString(err.Error())
@@ -277,7 +278,7 @@ func (gs *GState) GetProjectTimesHandler(c *fiber.Ctx) error {
 	}
 
 	// Get project times
-	projectTimes, err := gs.Db.GetProjectTimes(projectName)
+	projectTimes, err := db.GetDb(c).GetProjectTimes(projectName)
 	if err != nil {
 		log.Info("Error getting project times:", err)
 		return c.Status(500).SendString(err.Error())
@@ -288,13 +289,13 @@ func (gs *GState) GetProjectTimesHandler(c *fiber.Ctx) error {
 	return c.JSON(projectTimes)
 }
 
-func (gs *GState) RemoveProject(c *fiber.Ctx) error {
+func RemoveProject(c *fiber.Ctx) error {
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
 	username := claims["name"].(string)
 
 	// Check if the user is a site admin
-	isAdmin, err := gs.Db.IsSiteAdmin(username)
+	isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
 	if err != nil {
 		log.Info("Error checking admin status:", err)
 		return c.Status(500).SendString(err.Error())
@@ -307,7 +308,7 @@ func (gs *GState) RemoveProject(c *fiber.Ctx) error {
 
 	projectName := c.Params("projectName")
 
-	if err := gs.Db.RemoveProject(projectName); err != nil {
+	if err := db.GetDb(c).RemoveProject(projectName); err != nil {
 		return c.Status(500).SendString((err.Error()))
 	}
 
diff --git a/backend/internal/handlers/handlers_report_related.go b/backend/internal/handlers/reports/handlers_report_related.go
similarity index 83%
rename from backend/internal/handlers/handlers_report_related.go
rename to backend/internal/handlers/reports/handlers_report_related.go
index 52e1564..1c84d52 100644
--- a/backend/internal/handlers/handlers_report_related.go
+++ b/backend/internal/handlers/reports/handlers_report_related.go
@@ -1,7 +1,8 @@
-package handlers
+package reports
 
 import (
 	"strconv"
+	db "ttime/internal/database"
 	"ttime/internal/types"
 
 	"github.com/gofiber/fiber/v2"
@@ -9,7 +10,7 @@ import (
 	"github.com/golang-jwt/jwt/v5"
 )
 
-func (gs *GState) SubmitWeeklyReport(c *fiber.Ctx) error {
+func SubmitWeeklyReport(c *fiber.Ctx) error {
 	// Extract the necessary parameters from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
@@ -31,7 +32,7 @@ func (gs *GState) SubmitWeeklyReport(c *fiber.Ctx) error {
 		return c.Status(400).SendString("Invalid time report")
 	}
 
-	if err := gs.Db.AddWeeklyReport(report.ProjectName, username, report.Week, report.DevelopmentTime, report.MeetingTime, report.AdminTime, report.OwnWorkTime, report.StudyTime, report.TestingTime); err != nil {
+	if err := db.GetDb(c).AddWeeklyReport(report.ProjectName, username, report.Week, report.DevelopmentTime, report.MeetingTime, report.AdminTime, report.OwnWorkTime, report.StudyTime, report.TestingTime); err != nil {
 		log.Info("Error adding weekly report to db:", err)
 		return c.Status(500).SendString(err.Error())
 	}
@@ -41,7 +42,7 @@ func (gs *GState) SubmitWeeklyReport(c *fiber.Ctx) error {
 }
 
 // Handler for retrieving weekly report
-func (gs *GState) GetWeeklyReport(c *fiber.Ctx) error {
+func GetWeeklyReport(c *fiber.Ctx) error {
 	// Extract the necessary parameters from the request
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
@@ -66,7 +67,7 @@ func (gs *GState) GetWeeklyReport(c *fiber.Ctx) error {
 	}
 
 	// Call the database function to get the weekly report
-	report, err := gs.Db.GetWeeklyReport(username, projectName, weekInt)
+	report, err := db.GetDb(c).GetWeeklyReport(username, projectName, weekInt)
 	if err != nil {
 		log.Info("Error getting weekly report from db:", err)
 		return c.Status(500).SendString(err.Error())
@@ -81,7 +82,7 @@ type ReportId struct {
 	ReportId int
 }
 
-func (gs *GState) SignReport(c *fiber.Ctx) error {
+func SignReport(c *fiber.Ctx) error {
 	// Extract the necessary parameters from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
@@ -98,7 +99,7 @@ func (gs *GState) SignReport(c *fiber.Ctx) error {
 	log.Info("Signing report for: ", rid.ReportId)
 
 	// Get the project manager's ID
-	projectManagerID, err := gs.Db.GetUserId(projectManagerUsername)
+	projectManagerID, err := db.GetDb(c).GetUserId(projectManagerUsername)
 	if err != nil {
 		log.Info("Failed to get project manager ID")
 		return c.Status(500).SendString("Failed to get project manager ID")
@@ -106,7 +107,7 @@ func (gs *GState) SignReport(c *fiber.Ctx) error {
 	log.Info("Project manager ID: ", projectManagerID)
 
 	// Call the database function to sign the weekly report
-	err = gs.Db.SignWeeklyReport(rid.ReportId, projectManagerID)
+	err = db.GetDb(c).SignWeeklyReport(rid.ReportId, projectManagerID)
 	if err != nil {
 		log.Info("Error signing weekly report:", err)
 		return c.Status(500).SendString(err.Error())
@@ -115,7 +116,7 @@ func (gs *GState) SignReport(c *fiber.Ctx) error {
 	return c.Status(200).SendString("Weekly report signed successfully")
 }
 
-func (gs *GState) GetUnsignedReports(c *fiber.Ctx) error {
+func GetUnsignedReports(c *fiber.Ctx) error {
 	// Extract the necessary parameters from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
@@ -132,7 +133,7 @@ func (gs *GState) GetUnsignedReports(c *fiber.Ctx) error {
 	}
 
 	// Get the project manager's ID
-	isProjectManager, err := gs.Db.IsProjectManager(projectManagerUsername, projectName)
+	isProjectManager, err := db.GetDb(c).IsProjectManager(projectManagerUsername, projectName)
 	if err != nil {
 		log.Info("Failed to get project manager ID")
 		return c.Status(500).SendString("Failed to get project manager ID")
@@ -140,7 +141,7 @@ func (gs *GState) GetUnsignedReports(c *fiber.Ctx) error {
 	log.Info("User is Project Manager: ", isProjectManager)
 
 	// Call the database function to get the unsigned weekly reports
-	reports, err := gs.Db.GetUnsignedWeeklyReports(projectName)
+	reports, err := db.GetDb(c).GetUnsignedWeeklyReports(projectName)
 	if err != nil {
 		log.Info("Error getting unsigned weekly reports:", err)
 		return c.Status(500).SendString(err.Error())
@@ -152,7 +153,7 @@ func (gs *GState) GetUnsignedReports(c *fiber.Ctx) error {
 }
 
 // GetWeeklyReportsUserHandler retrieves all weekly reports for a user in a specific project
-func (gs *GState) GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
+func GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
 	// Extract the necessary parameters from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
@@ -166,7 +167,7 @@ func (gs *GState) GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
 	// the returned list of reports will (should) allways be empty.
 
 	// Retrieve weekly reports for the user in the project from the database
-	reports, err := gs.Db.GetWeeklyReportsUser(username, projectName)
+	reports, err := db.GetDb(c).GetWeeklyReportsUser(username, projectName)
 	if err != nil {
 		log.Error("Error getting weekly reports for user:", username, "in project:", projectName, ":", err)
 		return c.Status(500).SendString(err.Error())
@@ -178,7 +179,7 @@ func (gs *GState) GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
 	return c.JSON(reports)
 }
 
-func (gs *GState) UpdateWeeklyReport(c *fiber.Ctx) error {
+func UpdateWeeklyReport(c *fiber.Ctx) error {
 	// Extract the necessary parameters from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
@@ -203,7 +204,7 @@ func (gs *GState) UpdateWeeklyReport(c *fiber.Ctx) error {
 	}
 
 	// Update the weekly report in the database
-	if err := gs.Db.UpdateWeeklyReport(updateReport.ProjectName, username, updateReport.Week, updateReport.DevelopmentTime, updateReport.MeetingTime, updateReport.AdminTime, updateReport.OwnWorkTime, updateReport.StudyTime, updateReport.TestingTime); err != nil {
+	if err := db.GetDb(c).UpdateWeeklyReport(updateReport.ProjectName, username, updateReport.Week, updateReport.DevelopmentTime, updateReport.MeetingTime, updateReport.AdminTime, updateReport.OwnWorkTime, updateReport.StudyTime, updateReport.TestingTime); err != nil {
 		log.Info("Error updating weekly report in db:", err)
 		return c.Status(500).SendString(err.Error())
 	}
diff --git a/backend/internal/handlers/users/ChangeUserName.go b/backend/internal/handlers/users/ChangeUserName.go
new file mode 100644
index 0000000..75032e4
--- /dev/null
+++ b/backend/internal/handlers/users/ChangeUserName.go
@@ -0,0 +1,44 @@
+package users
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// ChangeUserName changes a user's username in the database
+func ChangeUserName(c *fiber.Ctx) error {
+	// Check token and get username of current user
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	adminUsername := claims["name"].(string)
+	log.Info(adminUsername)
+
+	// Extract the necessary parameters from the request
+	data := new(types.StrNameChange)
+	if err := c.BodyParser(data); err != nil {
+		log.Info("Error parsing username")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	// Check if the current user is an admin
+	isAdmin, err := db.GetDb(c).IsSiteAdmin(adminUsername)
+	if err != nil {
+		log.Warn("Error checking if admin:", err)
+		return c.Status(500).SendString(err.Error())
+	} else if !isAdmin {
+		log.Warn("Tried changing name when not admin")
+		return c.Status(401).SendString("You cannot change name unless you are an admin")
+	}
+
+	// Change the user's name in the database
+	if err := db.GetDb(c).ChangeUserName(data.PrevName, data.NewName); err != nil {
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return a success message
+	return c.SendStatus(fiber.StatusOK)
+}
diff --git a/backend/internal/handlers/users/GetUsersProjects.go b/backend/internal/handlers/users/GetUsersProjects.go
new file mode 100644
index 0000000..10a6ec6
--- /dev/null
+++ b/backend/internal/handlers/users/GetUsersProjects.go
@@ -0,0 +1,22 @@
+package users
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+)
+
+func GetAllUsersProject(c *fiber.Ctx) error {
+	// Get all users from a project
+	projectName := c.Params("projectName")
+	users, err := db.GetDb(c).GetAllUsersProject(projectName)
+	if err != nil {
+		log.Info("Error getting users from project:", err) // Debug print
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning all users")
+	// Return the list of users as JSON
+	return c.JSON(users)
+}
diff --git a/backend/internal/handlers/users/ListAllUsers.go b/backend/internal/handlers/users/ListAllUsers.go
new file mode 100644
index 0000000..1cae76c
--- /dev/null
+++ b/backend/internal/handlers/users/ListAllUsers.go
@@ -0,0 +1,31 @@
+package users
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+)
+
+// ListAllUsers is a handler that returns a list of all users in the application database
+// @Summary		ListsAllUsers
+// @Description	lists all users
+// @Tags			User
+// @Accept			json
+// @Produce		plain
+// @Success		200	{json}		json	"Successfully signed token for user"
+// @Failure		401	{string}	string	"Unauthorized"
+// @Failure		500	{string}	string	"Internal server error"
+// @Router			/users/all [get]
+func ListAllUsers(c *fiber.Ctx) error {
+	// Get all users from the database
+	users, err := db.GetDb(c).GetAllUsersApplication()
+	if err != nil {
+		log.Info("Error getting users from db:", err) // Debug print
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning all users")
+	// Return the list of users as JSON
+	return c.JSON(users)
+}
diff --git a/backend/internal/handlers/users/Login.go b/backend/internal/handlers/users/Login.go
new file mode 100644
index 0000000..c4d6c60
--- /dev/null
+++ b/backend/internal/handlers/users/Login.go
@@ -0,0 +1,65 @@
+package users
+
+import (
+	"time"
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// Login is a simple login handler that returns a JWT token
+// @Summary		login
+// @Description	logs the user in and returns a jwt token
+// @Tags			User
+// @Accept			json
+// @Param			NewUser	body	types.NewUser	true	"login info"
+// @Produce		plain
+// @Success		200	Token		types.Token	"Successfully signed token for user"
+// @Failure		400	{string}	string		"Bad request"
+// @Failure		401	{string}	string		"Unauthorized"
+// @Failure		500	{string}	string		"Internal server error"
+// @Router			/login [post]
+func Login(c *fiber.Ctx) error {
+	// The body type is identical to a NewUser
+
+	u := new(types.NewUser)
+	if err := c.BodyParser(u); err != nil {
+		log.Warn("Error parsing body")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	log.Info("Username logging in:", u.Username)
+	if !db.GetDb(c).CheckUser(u.Username, u.Password) {
+		log.Info("User not found")
+		return c.SendStatus(fiber.StatusUnauthorized)
+	}
+
+	isAdmin, err := db.GetDb(c).IsSiteAdmin(u.Username)
+	if err != nil {
+		log.Info("Error checking admin status:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+	// Create the Claims
+	claims := jwt.MapClaims{
+		"name":  u.Username,
+		"admin": isAdmin,
+		"exp":   time.Now().Add(time.Hour * 72).Unix(),
+	}
+
+	// Create token
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
+	log.Info("Token created for user:", u.Username)
+
+	// Generate encoded token and send it as response.
+	t, err := token.SignedString([]byte("secret"))
+	if err != nil {
+		log.Warn("Error signing token")
+		return c.SendStatus(fiber.StatusInternalServerError)
+	}
+
+	println("Successfully signed token for user:", u.Username)
+	return c.JSON(types.Token{Token: t})
+}
diff --git a/backend/internal/handlers/users/LoginRenew.go b/backend/internal/handlers/users/LoginRenew.go
new file mode 100644
index 0000000..78eadfd
--- /dev/null
+++ b/backend/internal/handlers/users/LoginRenew.go
@@ -0,0 +1,44 @@
+package users
+
+import (
+	"time"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// LoginRenew is a simple handler that renews the token
+// @Summary		LoginRenews
+// @Description	renews the users token
+// @Security		bererToken
+// @Tags			User
+// @Accept			json
+// @Produce		plain
+// @Success		200	Token		types.Token	"Successfully signed token for user"
+// @Failure		401	{string}	string		"Unauthorized"
+// @Failure		500	{string}	string		"Internal server error"
+// @Router			/loginerenew [post]
+func LoginRenew(c *fiber.Ctx) error {
+	user := c.Locals("user").(*jwt.Token)
+
+	log.Info("Renewing token for user:", user.Claims.(jwt.MapClaims)["name"])
+
+	claims := user.Claims.(jwt.MapClaims)
+	claims["exp"] = time.Now().Add(time.Hour * 72).Unix()
+	renewed := jwt.MapClaims{
+		"name":  claims["name"],
+		"admin": claims["admin"],
+		"exp":   claims["exp"],
+	}
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, renewed)
+	t, err := token.SignedString([]byte("secret"))
+	if err != nil {
+		log.Warn("Error signing token")
+		return c.SendStatus(fiber.StatusInternalServerError)
+	}
+
+	log.Info("Successfully renewed token for user:", user.Claims.(jwt.MapClaims)["name"])
+	return c.JSON(types.Token{Token: t})
+}
diff --git a/backend/internal/handlers/users/PromoteToAdmin.go b/backend/internal/handlers/users/PromoteToAdmin.go
new file mode 100644
index 0000000..4a21758
--- /dev/null
+++ b/backend/internal/handlers/users/PromoteToAdmin.go
@@ -0,0 +1,42 @@
+package users
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+)
+
+// @Summary		PromoteToAdmin
+// @Description	promote chosen user to admin
+// @Tags			User
+// @Accept			json
+// @Produce		plain
+// @Param			NewUser	body		types.NewUser	true	"user info"
+// @Success		200		{json}		json			"Successfully promoted user"
+// @Failure		400		{string}	string			"Bad request"
+// @Failure		401		{string}	string			"Unauthorized"
+// @Failure		500		{string}	string			"Internal server error"
+// @Router			/promoteToAdmin [post]
+func PromoteToAdmin(c *fiber.Ctx) error {
+	// Extract the username from the request body
+	var newUser types.NewUser
+	if err := c.BodyParser(&newUser); err != nil {
+		return c.Status(400).SendString("Bad request")
+	}
+	username := newUser.Username
+
+	log.Info("Promoting user to admin:", username) // Debug print
+
+	// Promote the user to a site admin in the database
+	if err := db.GetDb(c).PromoteToAdmin(username); err != nil {
+		log.Info("Error promoting user to admin:", err) // Debug print
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("User promoted to admin successfully:", username) // Debug print
+
+	// Return a success message
+	return c.SendStatus(fiber.StatusOK)
+}
diff --git a/backend/internal/handlers/users/Register.go b/backend/internal/handlers/users/Register.go
new file mode 100644
index 0000000..9977246
--- /dev/null
+++ b/backend/internal/handlers/users/Register.go
@@ -0,0 +1,38 @@
+package users
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+)
+
+// Register is a simple handler that registers a new user
+//
+//	@Summary		Register
+//	@Description	Register a new user
+//	@Tags			User
+//	@Accept			json
+//	@Produce		plain
+//	@Param			NewUser	body		types.NewUser	true	"User to register"
+//	@Success		200		{string}	string			"User added"
+//	@Failure		400		{string}	string			"Bad request"
+//	@Failure		500		{string}	string			"Internal server error"
+//	@Router			/register [post]
+func Register(c *fiber.Ctx) error {
+	u := new(types.NewUser)
+	if err := c.BodyParser(u); err != nil {
+		log.Warn("Error parsing body")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	log.Info("Adding user:", u.Username)
+	if err := db.GetDb(c).AddUser(u.Username, u.Password); err != nil {
+		log.Warn("Error adding user:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("User added:", u.Username)
+	return c.Status(200).SendString("User added")
+}
diff --git a/backend/internal/handlers/users/UserDelete.go b/backend/internal/handlers/users/UserDelete.go
new file mode 100644
index 0000000..5957c2d
--- /dev/null
+++ b/backend/internal/handlers/users/UserDelete.go
@@ -0,0 +1,43 @@
+package users
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// This path should obviously be protected in the future
+// UserDelete deletes a user from the database
+//
+//	@Summary		UserDelete
+//	@Description	UserDelete deletes a user from the database
+//	@Tags			User
+//	@Accept			json
+//	@Produce		plain
+//	@Success		200	{string}	string	"User deleted"
+//	@Failure		403	{string}	string	"You can only delete yourself"
+//	@Failure		500	{string}	string	"Internal server error"
+//	@Failure		401	{string}	string	"Unauthorized"
+//	@Router			/userdelete/{username} [delete]
+func UserDelete(c *fiber.Ctx) error {
+	// Read from path parameters
+	username := c.Params("username")
+
+	// Read username from Locals
+	auth_username := c.Locals("user").(*jwt.Token).Claims.(jwt.MapClaims)["name"].(string)
+
+	if username == auth_username {
+		log.Info("User tried to delete itself")
+		return c.Status(403).SendString("You can't delete yourself")
+	}
+
+	if err := db.GetDb(c).RemoveUser(username); err != nil {
+		log.Warn("Error deleting user:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("User deleted:", username)
+	return c.Status(200).SendString("User deleted")
+}
diff --git a/backend/main.go b/backend/main.go
index 669bbc7..ebe5660 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -6,7 +6,9 @@ import (
 	_ "ttime/docs"
 	"ttime/internal/config"
 	"ttime/internal/database"
-	"ttime/internal/handlers"
+	"ttime/internal/handlers/projects"
+	"ttime/internal/handlers/reports"
+	"ttime/internal/handlers/users"
 
 	"github.com/BurntSushi/toml"
 	"github.com/gofiber/fiber/v2"
@@ -54,24 +56,28 @@ func main() {
 
 	// Connect to the database
 	db := database.DbConnect(conf.DbPath)
+
 	// Migrate the database
 	if err = db.Migrate(); err != nil {
 		fmt.Println("Error migrating database: ", err)
 		os.Exit(1)
 	}
 
+	// Migrate sample data, should not be used in production
 	if err = db.MigrateSampleData(); err != nil {
 		fmt.Println("Error migrating sample data: ", err)
 		os.Exit(1)
 	}
 
-	// Get our global state
-	gs := handlers.NewGlobalState(db)
 	// Create the server
 	server := fiber.New()
 
+	// We want some logs
 	server.Use(logger.New())
 
+	// Sets up db middleware, accessed as Local "db" key
+	server.Use(database.DbMiddleware(&db))
+
 	// Mounts the swagger documentation, this is available at /swagger/index.html
 	server.Get("/swagger/*", swagger.HandlerDefault)
 
@@ -79,37 +85,50 @@ func main() {
 	// This will likely be replaced by an embedded filesystem in the future
 	server.Static("/", "./static")
 
-	// Register our unprotected routes
-	server.Post("/api/register", gs.Register)
-	server.Post("/api/login", gs.Login)
+	// Create a group for our API
+	api := server.Group("/api")
 
-	// Every route from here on will require a valid JWT
+	// Register our unprotected routes
+	api.Post("/register", users.Register)
+	api.Post("/login", users.Login)
+
+	// Every route from here on will require a valid
+	// JWT bearer token authentication in the header
 	server.Use(jwtware.New(jwtware.Config{
 		SigningKey: jwtware.SigningKey{Key: []byte("secret")},
 	}))
 
-	// Protected routes (require a valid JWT bearer token authentication header)
-	server.Post("/api/submitWeeklyReport", gs.SubmitWeeklyReport)
-	server.Get("/api/getUserProjects", gs.GetUserProjects)
-	server.Post("/api/loginrenew", gs.LoginRenew)
-	server.Delete("/api/userdelete/:username", gs.UserDelete) // Perhaps just use POST to avoid headaches
-	server.Delete("api/project/:projectID", gs.DeleteProject) // WIP
-	server.Post("/api/project", gs.CreateProject)             // WIP
-	server.Get("/api/project/:projectId", gs.GetProject)
-	server.Get("/api/project/getAllUsers", gs.GetAllUsersProject)
-	server.Get("/api/getWeeklyReport", gs.GetWeeklyReport)
-	server.Get("/api/getUnsignedReports/:projectName", gs.GetUnsignedReports)
-	server.Post("/api/signReport", gs.SignReport)
-	server.Put("/api/addUserToProject", gs.AddUserToProjectHandler)
-	server.Put("/api/changeUserName", gs.ChangeUserName)
-	server.Post("/api/promoteToAdmin", gs.PromoteToAdmin)
-	server.Get("/api/users/all", gs.ListAllUsers)
-	server.Get("/api/getWeeklyReportsUser/:projectName", gs.GetWeeklyReportsUserHandler)
-	server.Get("/api/checkIfProjectManager/:projectName", gs.IsProjectManagerHandler)
-	server.Post("/api/ProjectRoleChange", gs.ProjectRoleChange)
-	server.Get("/api/getUsersProject/:projectName", gs.ListAllUsersProject)
-	server.Put("/api/updateWeeklyReport", gs.UpdateWeeklyReport)
-	server.Delete("/api/removeProject/:projectName", gs.RemoveProject)
+	// All user related routes
+	// userGroup := api.Group("/user") // Not currently in use
+	api.Post("/login", users.Login)
+	api.Post("/register", users.Register)
+	api.Post("/loginrenew", users.LoginRenew)
+	api.Delete("/userdelete/:username", users.UserDelete) // Perhaps just use POST to avoid headaches
+	api.Put("/changeUserName", users.ChangeUserName)
+	api.Get("/users/all", users.ListAllUsers)
+	api.Post("/promoteToAdmin", users.PromoteToAdmin)
+	api.Get("/project/getAllUsers", users.GetAllUsersProject)
+
+	// All project related routes
+	// projectGroup := api.Group("/project") // Not currently in use
+	api.Get("/getUserProjects", projects.GetUserProjects)
+	api.Delete("/project/:projectID", projects.DeleteProject)
+	api.Post("/project", projects.CreateProject)
+	api.Get("/project/:projectId", projects.GetProject)
+	api.Get("/checkIfProjectManager/:projectName", projects.IsProjectManagerHandler)
+	api.Post("/ProjectRoleChange", projects.ProjectRoleChange)
+	api.Get("/getUsersProject/:projectName", projects.ListAllUsersProject)
+	api.Delete("/removeProject/:projectName", projects.RemoveProject)
+
+	// All report related routes
+	// reportGroup := api.Group("/report") // Not currently in use
+	api.Get("/getWeeklyReport", reports.GetWeeklyReport)
+	api.Post("/submitWeeklyReport", reports.SubmitWeeklyReport)
+	api.Get("/getUnsignedReports/:projectName", reports.GetUnsignedReports)
+	api.Post("/signReport", reports.SignReport)
+	api.Put("/addUserToProject", projects.AddUserToProjectHandler)
+	api.Get("/getWeeklyReportsUser/:projectName", reports.GetWeeklyReportsUserHandler)
+	api.Put("/updateWeeklyReport", reports.UpdateWeeklyReport)
 
 	// Announce the port we are listening on and start the server
 	err = server.Listen(fmt.Sprintf(":%d", conf.Port))

From 1d5fcd61b6e11712731561a7344df550e00e18b2 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 14:50:56 +0100
Subject: [PATCH 29/35] Refactor, report related endpoints now reside in
 individual files

---
 .../handlers/reports/GetUnsignedReports.go    |  45 ++++
 .../handlers/reports/GetWeeklyReport.go       |  47 ++++
 .../reports/GetWeeklyReportsUserHandler.go    |  36 +++
 .../internal/handlers/reports/SignReport.go   |  48 ++++
 .../handlers/reports/SubmitWeeklyReport.go    |  41 ++++
 .../handlers/reports/UpdateWeeklyReport.go    |  44 ++++
 .../reports/handlers_report_related.go        | 214 ------------------
 7 files changed, 261 insertions(+), 214 deletions(-)
 create mode 100644 backend/internal/handlers/reports/GetUnsignedReports.go
 create mode 100644 backend/internal/handlers/reports/GetWeeklyReport.go
 create mode 100644 backend/internal/handlers/reports/GetWeeklyReportsUserHandler.go
 create mode 100644 backend/internal/handlers/reports/SignReport.go
 create mode 100644 backend/internal/handlers/reports/SubmitWeeklyReport.go
 create mode 100644 backend/internal/handlers/reports/UpdateWeeklyReport.go
 delete mode 100644 backend/internal/handlers/reports/handlers_report_related.go

diff --git a/backend/internal/handlers/reports/GetUnsignedReports.go b/backend/internal/handlers/reports/GetUnsignedReports.go
new file mode 100644
index 0000000..9525f55
--- /dev/null
+++ b/backend/internal/handlers/reports/GetUnsignedReports.go
@@ -0,0 +1,45 @@
+package reports
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func GetUnsignedReports(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	projectManagerUsername := claims["name"].(string)
+
+	// Extract project name and week from query parameters
+	projectName := c.Params("projectName")
+
+	log.Info("Getting unsigned reports for")
+
+	if projectName == "" {
+		log.Info("Missing project name")
+		return c.Status(400).SendString("Missing project name")
+	}
+
+	// Get the project manager's ID
+	isProjectManager, err := db.GetDb(c).IsProjectManager(projectManagerUsername, projectName)
+	if err != nil {
+		log.Info("Failed to get project manager ID")
+		return c.Status(500).SendString("Failed to get project manager ID")
+	}
+	log.Info("User is Project Manager: ", isProjectManager)
+
+	// Call the database function to get the unsigned weekly reports
+	reports, err := db.GetDb(c).GetUnsignedWeeklyReports(projectName)
+	if err != nil {
+		log.Info("Error getting unsigned weekly reports:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning unsigned reports")
+	// Return the list of unsigned reports
+	return c.JSON(reports)
+}
diff --git a/backend/internal/handlers/reports/GetWeeklyReport.go b/backend/internal/handlers/reports/GetWeeklyReport.go
new file mode 100644
index 0000000..422bc0b
--- /dev/null
+++ b/backend/internal/handlers/reports/GetWeeklyReport.go
@@ -0,0 +1,47 @@
+package reports
+
+import (
+	"strconv"
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// Handler for retrieving weekly report
+func GetWeeklyReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the request
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	log.Info("Getting weekly report for: ", username)
+
+	// Extract project name and week from query parameters
+	projectName := c.Query("projectName")
+	week := c.Query("week")
+
+	if projectName == "" || week == "" {
+		log.Info("Missing project name or week number")
+		return c.Status(400).SendString("Missing project name or week number")
+	}
+
+	// Convert week to integer
+	weekInt, err := strconv.Atoi(week)
+	if err != nil {
+		log.Info("Invalid week number")
+		return c.Status(400).SendString("Invalid week number")
+	}
+
+	// Call the database function to get the weekly report
+	report, err := db.GetDb(c).GetWeeklyReport(username, projectName, weekInt)
+	if err != nil {
+		log.Info("Error getting weekly report from db:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning weekly report")
+	// Return the retrieved weekly report
+	return c.JSON(report)
+}
diff --git a/backend/internal/handlers/reports/GetWeeklyReportsUserHandler.go b/backend/internal/handlers/reports/GetWeeklyReportsUserHandler.go
new file mode 100644
index 0000000..da8a90b
--- /dev/null
+++ b/backend/internal/handlers/reports/GetWeeklyReportsUserHandler.go
@@ -0,0 +1,36 @@
+package reports
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// GetWeeklyReportsUserHandler retrieves all weekly reports for a user in a specific project
+func GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Extract necessary (path) parameters from the request
+	projectName := c.Params("projectName")
+
+	// TODO: Here we need to check whether the user is a member of the project
+	// If not, we should return an error. On the other hand, if the user not a member,
+	// the returned list of reports will (should) allways be empty.
+
+	// Retrieve weekly reports for the user in the project from the database
+	reports, err := db.GetDb(c).GetWeeklyReportsUser(username, projectName)
+	if err != nil {
+		log.Error("Error getting weekly reports for user:", username, "in project:", projectName, ":", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning weekly reports for user:", username, "in project:", projectName)
+
+	// Return the list of reports as JSON
+	return c.JSON(reports)
+}
diff --git a/backend/internal/handlers/reports/SignReport.go b/backend/internal/handlers/reports/SignReport.go
new file mode 100644
index 0000000..5769caf
--- /dev/null
+++ b/backend/internal/handlers/reports/SignReport.go
@@ -0,0 +1,48 @@
+package reports
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// TODO: This information should be extracted from path parameters
+type ReportId struct {
+	ReportId int
+}
+
+func SignReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	projectManagerUsername := claims["name"].(string)
+
+	log.Info("Signing report for: ", projectManagerUsername)
+
+	// Extract report ID from the request query parameters
+	// reportID := c.Query("reportId")
+	rid := new(ReportId)
+	if err := c.BodyParser(rid); err != nil {
+		return err
+	}
+	log.Info("Signing report for: ", rid.ReportId)
+
+	// Get the project manager's ID
+	projectManagerID, err := db.GetDb(c).GetUserId(projectManagerUsername)
+	if err != nil {
+		log.Info("Failed to get project manager ID")
+		return c.Status(500).SendString("Failed to get project manager ID")
+	}
+	log.Info("Project manager ID: ", projectManagerID)
+
+	// Call the database function to sign the weekly report
+	err = db.GetDb(c).SignWeeklyReport(rid.ReportId, projectManagerID)
+	if err != nil {
+		log.Info("Error signing weekly report:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	return c.Status(200).SendString("Weekly report signed successfully")
+}
diff --git a/backend/internal/handlers/reports/SubmitWeeklyReport.go b/backend/internal/handlers/reports/SubmitWeeklyReport.go
new file mode 100644
index 0000000..900aa03
--- /dev/null
+++ b/backend/internal/handlers/reports/SubmitWeeklyReport.go
@@ -0,0 +1,41 @@
+package reports
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func SubmitWeeklyReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	report := new(types.NewWeeklyReport)
+	if err := c.BodyParser(report); err != nil {
+		log.Info("Error parsing weekly report")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	// Make sure all the fields of the report are valid
+	if report.Week < 1 || report.Week > 52 {
+		log.Info("Invalid week number")
+		return c.Status(400).SendString("Invalid week number")
+	}
+	if report.DevelopmentTime < 0 || report.MeetingTime < 0 || report.AdminTime < 0 || report.OwnWorkTime < 0 || report.StudyTime < 0 || report.TestingTime < 0 {
+		log.Info("Invalid time report")
+		return c.Status(400).SendString("Invalid time report")
+	}
+
+	if err := db.GetDb(c).AddWeeklyReport(report.ProjectName, username, report.Week, report.DevelopmentTime, report.MeetingTime, report.AdminTime, report.OwnWorkTime, report.StudyTime, report.TestingTime); err != nil {
+		log.Info("Error adding weekly report to db:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Weekly report added")
+	return c.Status(200).SendString("Time report added")
+}
diff --git a/backend/internal/handlers/reports/UpdateWeeklyReport.go b/backend/internal/handlers/reports/UpdateWeeklyReport.go
new file mode 100644
index 0000000..3ab835d
--- /dev/null
+++ b/backend/internal/handlers/reports/UpdateWeeklyReport.go
@@ -0,0 +1,44 @@
+package reports
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func UpdateWeeklyReport(c *fiber.Ctx) error {
+	// Extract the necessary parameters from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Parse the request body into an UpdateWeeklyReport struct
+	var updateReport types.UpdateWeeklyReport
+	if err := c.BodyParser(&updateReport); err != nil {
+		log.Info("Error parsing weekly report")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	// Make sure all the fields of the report are valid
+	if updateReport.Week < 1 || updateReport.Week > 52 {
+		log.Info("Invalid week number")
+		return c.Status(400).SendString("Invalid week number")
+	}
+
+	if updateReport.DevelopmentTime < 0 || updateReport.MeetingTime < 0 || updateReport.AdminTime < 0 || updateReport.OwnWorkTime < 0 || updateReport.StudyTime < 0 || updateReport.TestingTime < 0 {
+		log.Info("Invalid time report")
+		return c.Status(400).SendString("Invalid time report")
+	}
+
+	// Update the weekly report in the database
+	if err := db.GetDb(c).UpdateWeeklyReport(updateReport.ProjectName, username, updateReport.Week, updateReport.DevelopmentTime, updateReport.MeetingTime, updateReport.AdminTime, updateReport.OwnWorkTime, updateReport.StudyTime, updateReport.TestingTime); err != nil {
+		log.Info("Error updating weekly report in db:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Weekly report updated")
+	return c.Status(200).SendString("Weekly report updated")
+}
diff --git a/backend/internal/handlers/reports/handlers_report_related.go b/backend/internal/handlers/reports/handlers_report_related.go
deleted file mode 100644
index 1c84d52..0000000
--- a/backend/internal/handlers/reports/handlers_report_related.go
+++ /dev/null
@@ -1,214 +0,0 @@
-package reports
-
-import (
-	"strconv"
-	db "ttime/internal/database"
-	"ttime/internal/types"
-
-	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/log"
-	"github.com/golang-jwt/jwt/v5"
-)
-
-func SubmitWeeklyReport(c *fiber.Ctx) error {
-	// Extract the necessary parameters from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	report := new(types.NewWeeklyReport)
-	if err := c.BodyParser(report); err != nil {
-		log.Info("Error parsing weekly report")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	// Make sure all the fields of the report are valid
-	if report.Week < 1 || report.Week > 52 {
-		log.Info("Invalid week number")
-		return c.Status(400).SendString("Invalid week number")
-	}
-	if report.DevelopmentTime < 0 || report.MeetingTime < 0 || report.AdminTime < 0 || report.OwnWorkTime < 0 || report.StudyTime < 0 || report.TestingTime < 0 {
-		log.Info("Invalid time report")
-		return c.Status(400).SendString("Invalid time report")
-	}
-
-	if err := db.GetDb(c).AddWeeklyReport(report.ProjectName, username, report.Week, report.DevelopmentTime, report.MeetingTime, report.AdminTime, report.OwnWorkTime, report.StudyTime, report.TestingTime); err != nil {
-		log.Info("Error adding weekly report to db:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Weekly report added")
-	return c.Status(200).SendString("Time report added")
-}
-
-// Handler for retrieving weekly report
-func GetWeeklyReport(c *fiber.Ctx) error {
-	// Extract the necessary parameters from the request
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	log.Info("Getting weekly report for: ", username)
-
-	// Extract project name and week from query parameters
-	projectName := c.Query("projectName")
-	week := c.Query("week")
-
-	if projectName == "" || week == "" {
-		log.Info("Missing project name or week number")
-		return c.Status(400).SendString("Missing project name or week number")
-	}
-
-	// Convert week to integer
-	weekInt, err := strconv.Atoi(week)
-	if err != nil {
-		log.Info("Invalid week number")
-		return c.Status(400).SendString("Invalid week number")
-	}
-
-	// Call the database function to get the weekly report
-	report, err := db.GetDb(c).GetWeeklyReport(username, projectName, weekInt)
-	if err != nil {
-		log.Info("Error getting weekly report from db:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Returning weekly report")
-	// Return the retrieved weekly report
-	return c.JSON(report)
-}
-
-type ReportId struct {
-	ReportId int
-}
-
-func SignReport(c *fiber.Ctx) error {
-	// Extract the necessary parameters from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	projectManagerUsername := claims["name"].(string)
-
-	log.Info("Signing report for: ", projectManagerUsername)
-
-	// Extract report ID from the request query parameters
-	// reportID := c.Query("reportId")
-	rid := new(ReportId)
-	if err := c.BodyParser(rid); err != nil {
-		return err
-	}
-	log.Info("Signing report for: ", rid.ReportId)
-
-	// Get the project manager's ID
-	projectManagerID, err := db.GetDb(c).GetUserId(projectManagerUsername)
-	if err != nil {
-		log.Info("Failed to get project manager ID")
-		return c.Status(500).SendString("Failed to get project manager ID")
-	}
-	log.Info("Project manager ID: ", projectManagerID)
-
-	// Call the database function to sign the weekly report
-	err = db.GetDb(c).SignWeeklyReport(rid.ReportId, projectManagerID)
-	if err != nil {
-		log.Info("Error signing weekly report:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	return c.Status(200).SendString("Weekly report signed successfully")
-}
-
-func GetUnsignedReports(c *fiber.Ctx) error {
-	// Extract the necessary parameters from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	projectManagerUsername := claims["name"].(string)
-
-	// Extract project name and week from query parameters
-	projectName := c.Params("projectName")
-
-	log.Info("Getting unsigned reports for")
-
-	if projectName == "" {
-		log.Info("Missing project name")
-		return c.Status(400).SendString("Missing project name")
-	}
-
-	// Get the project manager's ID
-	isProjectManager, err := db.GetDb(c).IsProjectManager(projectManagerUsername, projectName)
-	if err != nil {
-		log.Info("Failed to get project manager ID")
-		return c.Status(500).SendString("Failed to get project manager ID")
-	}
-	log.Info("User is Project Manager: ", isProjectManager)
-
-	// Call the database function to get the unsigned weekly reports
-	reports, err := db.GetDb(c).GetUnsignedWeeklyReports(projectName)
-	if err != nil {
-		log.Info("Error getting unsigned weekly reports:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Returning unsigned reports")
-	// Return the list of unsigned reports
-	return c.JSON(reports)
-}
-
-// GetWeeklyReportsUserHandler retrieves all weekly reports for a user in a specific project
-func GetWeeklyReportsUserHandler(c *fiber.Ctx) error {
-	// Extract the necessary parameters from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Extract necessary (path) parameters from the request
-	projectName := c.Params("projectName")
-
-	// TODO: Here we need to check whether the user is a member of the project
-	// If not, we should return an error. On the other hand, if the user not a member,
-	// the returned list of reports will (should) allways be empty.
-
-	// Retrieve weekly reports for the user in the project from the database
-	reports, err := db.GetDb(c).GetWeeklyReportsUser(username, projectName)
-	if err != nil {
-		log.Error("Error getting weekly reports for user:", username, "in project:", projectName, ":", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Returning weekly reports for user:", username, "in project:", projectName)
-
-	// Return the list of reports as JSON
-	return c.JSON(reports)
-}
-
-func UpdateWeeklyReport(c *fiber.Ctx) error {
-	// Extract the necessary parameters from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Parse the request body into an UpdateWeeklyReport struct
-	var updateReport types.UpdateWeeklyReport
-	if err := c.BodyParser(&updateReport); err != nil {
-		log.Info("Error parsing weekly report")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	// Make sure all the fields of the report are valid
-	if updateReport.Week < 1 || updateReport.Week > 52 {
-		log.Info("Invalid week number")
-		return c.Status(400).SendString("Invalid week number")
-	}
-
-	if updateReport.DevelopmentTime < 0 || updateReport.MeetingTime < 0 || updateReport.AdminTime < 0 || updateReport.OwnWorkTime < 0 || updateReport.StudyTime < 0 || updateReport.TestingTime < 0 {
-		log.Info("Invalid time report")
-		return c.Status(400).SendString("Invalid time report")
-	}
-
-	// Update the weekly report in the database
-	if err := db.GetDb(c).UpdateWeeklyReport(updateReport.ProjectName, username, updateReport.Week, updateReport.DevelopmentTime, updateReport.MeetingTime, updateReport.AdminTime, updateReport.OwnWorkTime, updateReport.StudyTime, updateReport.TestingTime); err != nil {
-		log.Info("Error updating weekly report in db:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Weekly report updated")
-	return c.Status(200).SendString("Weekly report updated")
-}

From b927fb80fb7aa08b68bcccb8c1ca4fe474a7e905 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 15:00:29 +0100
Subject: [PATCH 30/35] Refactor again, splitting project related handlers

---
 .../handlers/projects/AddUserToProject.go     |  51 +++
 .../handlers/projects/CreateProject.go        |  30 ++
 .../handlers/projects/DeleteProject.go        |  19 ++
 .../internal/handlers/projects/GetProject.go  |  38 +++
 .../handlers/projects/GetProjectTimes.go      |  63 ++++
 .../handlers/projects/GetUserProject.go       |  25 ++
 .../handlers/projects/IsProjectManager.go     |  32 ++
 .../handlers/projects/ListAllUserProjects.go  |  55 +++
 .../handlers/projects/ProjectRoleChange.go    |  45 +++
 .../handlers/projects/RemoveProject.go        |  35 ++
 .../projects/handlers_project_related.go      | 316 ------------------
 11 files changed, 393 insertions(+), 316 deletions(-)
 create mode 100644 backend/internal/handlers/projects/AddUserToProject.go
 create mode 100644 backend/internal/handlers/projects/CreateProject.go
 create mode 100644 backend/internal/handlers/projects/DeleteProject.go
 create mode 100644 backend/internal/handlers/projects/GetProject.go
 create mode 100644 backend/internal/handlers/projects/GetProjectTimes.go
 create mode 100644 backend/internal/handlers/projects/GetUserProject.go
 create mode 100644 backend/internal/handlers/projects/IsProjectManager.go
 create mode 100644 backend/internal/handlers/projects/ListAllUserProjects.go
 create mode 100644 backend/internal/handlers/projects/ProjectRoleChange.go
 create mode 100644 backend/internal/handlers/projects/RemoveProject.go
 delete mode 100644 backend/internal/handlers/projects/handlers_project_related.go

diff --git a/backend/internal/handlers/projects/AddUserToProject.go b/backend/internal/handlers/projects/AddUserToProject.go
new file mode 100644
index 0000000..702b7dd
--- /dev/null
+++ b/backend/internal/handlers/projects/AddUserToProject.go
@@ -0,0 +1,51 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// AddUserToProjectHandler is a handler that adds a user to a project with a specified role
+func AddUserToProjectHandler(c *fiber.Ctx) error {
+	// Extract necessary parameters from the request
+	var requestData struct {
+		Username    string `json:"username"`
+		ProjectName string `json:"projectName"`
+		Role        string `json:"role"`
+	}
+	if err := c.BodyParser(&requestData); err != nil {
+		log.Info("Error parsing request body:", err)
+		return c.Status(400).SendString("Bad request")
+	}
+
+	// Check if the user adding another user to the project is a site admin
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	adminUsername := claims["name"].(string)
+	log.Info("Admin username from claims:", adminUsername)
+
+	isAdmin, err := db.GetDb(c).IsSiteAdmin(adminUsername)
+	if err != nil {
+		log.Info("Error checking admin status:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	if !isAdmin {
+		log.Info("User is not a site admin:", adminUsername)
+		return c.Status(403).SendString("User is not a site admin")
+	}
+
+	// Add the user to the project with the specified role
+	err = db.GetDb(c).AddUserToProject(requestData.Username, requestData.ProjectName, requestData.Role)
+	if err != nil {
+		log.Info("Error adding user to project:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return success message
+	log.Info("User added to project successfully:", requestData.Username)
+	return c.SendStatus(fiber.StatusOK)
+}
diff --git a/backend/internal/handlers/projects/CreateProject.go b/backend/internal/handlers/projects/CreateProject.go
new file mode 100644
index 0000000..cef2f2b
--- /dev/null
+++ b/backend/internal/handlers/projects/CreateProject.go
@@ -0,0 +1,30 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// CreateProject is a simple handler that creates a new project
+func CreateProject(c *fiber.Ctx) error {
+	user := c.Locals("user").(*jwt.Token)
+
+	p := new(types.NewProject)
+	if err := c.BodyParser(p); err != nil {
+		return c.Status(400).SendString(err.Error())
+	}
+
+	// Get the username from the token and set it as the owner of the project
+	// This is ugly but
+	claims := user.Claims.(jwt.MapClaims)
+	owner := claims["name"].(string)
+
+	if err := db.GetDb(c).AddProject(p.Name, p.Description, owner); err != nil {
+		return c.Status(500).SendString(err.Error())
+	}
+
+	return c.Status(200).SendString("Project added")
+}
diff --git a/backend/internal/handlers/projects/DeleteProject.go b/backend/internal/handlers/projects/DeleteProject.go
new file mode 100644
index 0000000..415424a
--- /dev/null
+++ b/backend/internal/handlers/projects/DeleteProject.go
@@ -0,0 +1,19 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+func DeleteProject(c *fiber.Ctx) error {
+
+	projectID := c.Params("projectID")
+	username := c.Params("username")
+
+	if err := db.GetDb(c).DeleteProject(projectID, username); err != nil {
+		return c.Status(500).SendString((err.Error()))
+	}
+
+	return c.Status(200).SendString("Project deleted")
+}
diff --git a/backend/internal/handlers/projects/GetProject.go b/backend/internal/handlers/projects/GetProject.go
new file mode 100644
index 0000000..03333ce
--- /dev/null
+++ b/backend/internal/handlers/projects/GetProject.go
@@ -0,0 +1,38 @@
+package projects
+
+import (
+	"strconv"
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+)
+
+// GetProject retrieves a specific project by its ID
+func GetProject(c *fiber.Ctx) error {
+	// Extract the project ID from the request parameters or body
+	projectID := c.Params("projectID")
+	if projectID == "" {
+		log.Info("No project ID provided")
+		return c.Status(400).SendString("No project ID provided")
+	}
+	log.Info("Getting project with ID: ", projectID)
+
+	// Parse the project ID into an integer
+	projectIDInt, err := strconv.Atoi(projectID)
+	if err != nil {
+		log.Info("Invalid project ID")
+		return c.Status(400).SendString("Invalid project ID")
+	}
+
+	// Get the project from the database by its ID
+	project, err := db.GetDb(c).GetProject(projectIDInt)
+	if err != nil {
+		log.Info("Error getting project:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return the project as JSON
+	log.Info("Returning project: ", project.Name)
+	return c.JSON(project)
+}
diff --git a/backend/internal/handlers/projects/GetProjectTimes.go b/backend/internal/handlers/projects/GetProjectTimes.go
new file mode 100644
index 0000000..573a95e
--- /dev/null
+++ b/backend/internal/handlers/projects/GetProjectTimes.go
@@ -0,0 +1,63 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func GetProjectTimesHandler(c *fiber.Ctx) error {
+	// Get the username from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Get project
+	projectName := c.Params("projectName")
+	if projectName == "" {
+		log.Info("No project name provided")
+		return c.Status(400).SendString("No project name provided")
+	}
+
+	// Get all users in the project and roles
+	userProjects, err := db.GetDb(c).GetAllUsersProject(projectName)
+	if err != nil {
+		log.Info("Error getting users in project:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// If the user is member
+	isMember := false
+	for _, userProject := range userProjects {
+		if userProject.Username == username {
+			isMember = true
+			break
+		}
+	}
+
+	// If the user is admin
+	if !isMember {
+		isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
+		if err != nil {
+			log.Info("Error checking admin status:", err)
+			return c.Status(500).SendString(err.Error())
+		}
+		if !isAdmin {
+			log.Info("User is neither a project member nor a site admin:", username)
+			return c.Status(403).SendString("User is neither a project member nor a site admin")
+		}
+	}
+
+	// Get project times
+	projectTimes, err := db.GetDb(c).GetProjectTimes(projectName)
+	if err != nil {
+		log.Info("Error getting project times:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return project times as JSON
+	log.Info("Returning project times for project:", projectName)
+	return c.JSON(projectTimes)
+}
diff --git a/backend/internal/handlers/projects/GetUserProject.go b/backend/internal/handlers/projects/GetUserProject.go
new file mode 100644
index 0000000..99ed63b
--- /dev/null
+++ b/backend/internal/handlers/projects/GetUserProject.go
@@ -0,0 +1,25 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// GetUserProjects returns all projects that the user is a member of
+func GetUserProjects(c *fiber.Ctx) error {
+	// First we get the username from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Then dip into the database to get the projects
+	projects, err := db.GetDb(c).GetProjectsForUser(username)
+	if err != nil {
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return a json serialized list of projects
+	return c.JSON(projects)
+}
diff --git a/backend/internal/handlers/projects/IsProjectManager.go b/backend/internal/handlers/projects/IsProjectManager.go
new file mode 100644
index 0000000..678fad5
--- /dev/null
+++ b/backend/internal/handlers/projects/IsProjectManager.go
@@ -0,0 +1,32 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// IsProjectManagerHandler is a handler that checks if a user is a project manager for a given project
+func IsProjectManagerHandler(c *fiber.Ctx) error {
+	// Get the username from the token
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Extract necessary parameters from the request query string
+	projectName := c.Params("projectName")
+
+	log.Info("Checking if user ", username, " is a project manager for project ", projectName)
+
+	// Check if the user is a project manager for the specified project
+	isManager, err := db.GetDb(c).IsProjectManager(username, projectName)
+	if err != nil {
+		log.Info("Error checking project manager status:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return the result as JSON
+	return c.JSON(fiber.Map{"isProjectManager": isManager})
+}
diff --git a/backend/internal/handlers/projects/ListAllUserProjects.go b/backend/internal/handlers/projects/ListAllUserProjects.go
new file mode 100644
index 0000000..e0bcaf5
--- /dev/null
+++ b/backend/internal/handlers/projects/ListAllUserProjects.go
@@ -0,0 +1,55 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func ListAllUsersProject(c *fiber.Ctx) error {
+	// Extract the project name from the request parameters or body
+	projectName := c.Params("projectName")
+	if projectName == "" {
+		log.Info("No project name provided")
+		return c.Status(400).SendString("No project name provided")
+	}
+
+	// Get the user token
+	userToken := c.Locals("user").(*jwt.Token)
+	claims := userToken.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Check if the user is a project manager for the specified project
+	isManager, err := db.GetDb(c).IsProjectManager(username, projectName)
+	if err != nil {
+		log.Info("Error checking project manager status:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// If the user is not a project manager, check if the user is a site admin
+	if !isManager {
+		isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
+		if err != nil {
+			log.Info("Error checking admin status:", err)
+			return c.Status(500).SendString(err.Error())
+		}
+		if !isAdmin {
+			log.Info("User is neither a project manager nor a site admin:", username)
+			return c.Status(403).SendString("User is neither a project manager nor a site admin")
+		}
+	}
+
+	// Get all users associated with the project from the database
+	users, err := db.GetDb(c).GetAllUsersProject(projectName)
+	if err != nil {
+		log.Info("Error getting users for project:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning users for project: ", projectName)
+
+	// Return the list of users as JSON
+	return c.JSON(users)
+}
diff --git a/backend/internal/handlers/projects/ProjectRoleChange.go b/backend/internal/handlers/projects/ProjectRoleChange.go
new file mode 100644
index 0000000..266127d
--- /dev/null
+++ b/backend/internal/handlers/projects/ProjectRoleChange.go
@@ -0,0 +1,45 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+	"ttime/internal/types"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+// ProjectRoleChange is a handler that changes a user's role within a project
+func ProjectRoleChange(c *fiber.Ctx) error {
+
+	//check token and get username of current user
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Extract the necessary parameters from the request
+	data := new(types.RoleChange)
+	if err := c.BodyParser(data); err != nil {
+		log.Info("error parsing username, project or role")
+		return c.Status(400).SendString(err.Error())
+	}
+
+	log.Info("Changing role for user: ", username, " in project: ", data.Projectname, " to: ", data.Role)
+
+	// Dubble diping and checcking if current user is
+	if ismanager, err := db.GetDb(c).IsProjectManager(username, data.Projectname); err != nil {
+		log.Warn("Error checking if projectmanager:", err)
+		return c.Status(500).SendString(err.Error())
+	} else if !ismanager {
+		log.Warn("User is not projectmanager")
+		return c.Status(401).SendString("User is not projectmanager")
+	}
+
+	// Change the user's role within the project in the database
+	if err := db.GetDb(c).ChangeUserRole(username, data.Projectname, data.Role); err != nil {
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return a success message
+	return c.SendStatus(fiber.StatusOK)
+}
diff --git a/backend/internal/handlers/projects/RemoveProject.go b/backend/internal/handlers/projects/RemoveProject.go
new file mode 100644
index 0000000..7b140dd
--- /dev/null
+++ b/backend/internal/handlers/projects/RemoveProject.go
@@ -0,0 +1,35 @@
+package projects
+
+import (
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func RemoveProject(c *fiber.Ctx) error {
+	user := c.Locals("user").(*jwt.Token)
+	claims := user.Claims.(jwt.MapClaims)
+	username := claims["name"].(string)
+
+	// Check if the user is a site admin
+	isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
+	if err != nil {
+		log.Info("Error checking admin status:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	if !isAdmin {
+		log.Info("User is not a site admin:", username)
+		return c.Status(403).SendString("User is not a site admin")
+	}
+
+	projectName := c.Params("projectName")
+
+	if err := db.GetDb(c).RemoveProject(projectName); err != nil {
+		return c.Status(500).SendString((err.Error()))
+	}
+
+	return c.Status(200).SendString("Project deleted")
+}
diff --git a/backend/internal/handlers/projects/handlers_project_related.go b/backend/internal/handlers/projects/handlers_project_related.go
deleted file mode 100644
index 3429504..0000000
--- a/backend/internal/handlers/projects/handlers_project_related.go
+++ /dev/null
@@ -1,316 +0,0 @@
-package projects
-
-import (
-	"strconv"
-	db "ttime/internal/database"
-	"ttime/internal/types"
-
-	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/log"
-	"github.com/golang-jwt/jwt/v5"
-)
-
-// CreateProject is a simple handler that creates a new project
-func CreateProject(c *fiber.Ctx) error {
-	user := c.Locals("user").(*jwt.Token)
-
-	p := new(types.NewProject)
-	if err := c.BodyParser(p); err != nil {
-		return c.Status(400).SendString(err.Error())
-	}
-
-	// Get the username from the token and set it as the owner of the project
-	// This is ugly but
-	claims := user.Claims.(jwt.MapClaims)
-	owner := claims["name"].(string)
-
-	if err := db.GetDb(c).AddProject(p.Name, p.Description, owner); err != nil {
-		return c.Status(500).SendString(err.Error())
-	}
-
-	return c.Status(200).SendString("Project added")
-}
-
-func DeleteProject(c *fiber.Ctx) error {
-
-	projectID := c.Params("projectID")
-	username := c.Params("username")
-
-	if err := db.GetDb(c).DeleteProject(projectID, username); err != nil {
-		return c.Status(500).SendString((err.Error()))
-	}
-
-	return c.Status(200).SendString("Project deleted")
-}
-
-// GetUserProjects returns all projects that the user is a member of
-func GetUserProjects(c *fiber.Ctx) error {
-	// First we get the username from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Then dip into the database to get the projects
-	projects, err := db.GetDb(c).GetProjectsForUser(username)
-	if err != nil {
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return a json serialized list of projects
-	return c.JSON(projects)
-}
-
-// ProjectRoleChange is a handler that changes a user's role within a project
-func ProjectRoleChange(c *fiber.Ctx) error {
-
-	//check token and get username of current user
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Extract the necessary parameters from the request
-	data := new(types.RoleChange)
-	if err := c.BodyParser(data); err != nil {
-		log.Info("error parsing username, project or role")
-		return c.Status(400).SendString(err.Error())
-	}
-
-	log.Info("Changing role for user: ", username, " in project: ", data.Projectname, " to: ", data.Role)
-
-	// Dubble diping and checcking if current user is
-	if ismanager, err := db.GetDb(c).IsProjectManager(username, data.Projectname); err != nil {
-		log.Warn("Error checking if projectmanager:", err)
-		return c.Status(500).SendString(err.Error())
-	} else if !ismanager {
-		log.Warn("User is not projectmanager")
-		return c.Status(401).SendString("User is not projectmanager")
-	}
-
-	// Change the user's role within the project in the database
-	if err := db.GetDb(c).ChangeUserRole(username, data.Projectname, data.Role); err != nil {
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return a success message
-	return c.SendStatus(fiber.StatusOK)
-}
-
-// GetProject retrieves a specific project by its ID
-func GetProject(c *fiber.Ctx) error {
-	// Extract the project ID from the request parameters or body
-	projectID := c.Params("projectID")
-	if projectID == "" {
-		log.Info("No project ID provided")
-		return c.Status(400).SendString("No project ID provided")
-	}
-	log.Info("Getting project with ID: ", projectID)
-
-	// Parse the project ID into an integer
-	projectIDInt, err := strconv.Atoi(projectID)
-	if err != nil {
-		log.Info("Invalid project ID")
-		return c.Status(400).SendString("Invalid project ID")
-	}
-
-	// Get the project from the database by its ID
-	project, err := db.GetDb(c).GetProject(projectIDInt)
-	if err != nil {
-		log.Info("Error getting project:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return the project as JSON
-	log.Info("Returning project: ", project.Name)
-	return c.JSON(project)
-}
-
-func ListAllUsersProject(c *fiber.Ctx) error {
-	// Extract the project name from the request parameters or body
-	projectName := c.Params("projectName")
-	if projectName == "" {
-		log.Info("No project name provided")
-		return c.Status(400).SendString("No project name provided")
-	}
-
-	// Get the user token
-	userToken := c.Locals("user").(*jwt.Token)
-	claims := userToken.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Check if the user is a project manager for the specified project
-	isManager, err := db.GetDb(c).IsProjectManager(username, projectName)
-	if err != nil {
-		log.Info("Error checking project manager status:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// If the user is not a project manager, check if the user is a site admin
-	if !isManager {
-		isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
-		if err != nil {
-			log.Info("Error checking admin status:", err)
-			return c.Status(500).SendString(err.Error())
-		}
-		if !isAdmin {
-			log.Info("User is neither a project manager nor a site admin:", username)
-			return c.Status(403).SendString("User is neither a project manager nor a site admin")
-		}
-	}
-
-	// Get all users associated with the project from the database
-	users, err := db.GetDb(c).GetAllUsersProject(projectName)
-	if err != nil {
-		log.Info("Error getting users for project:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	log.Info("Returning users for project: ", projectName)
-
-	// Return the list of users as JSON
-	return c.JSON(users)
-}
-
-// AddUserToProjectHandler is a handler that adds a user to a project with a specified role
-func AddUserToProjectHandler(c *fiber.Ctx) error {
-	// Extract necessary parameters from the request
-	var requestData struct {
-		Username    string `json:"username"`
-		ProjectName string `json:"projectName"`
-		Role        string `json:"role"`
-	}
-	if err := c.BodyParser(&requestData); err != nil {
-		log.Info("Error parsing request body:", err)
-		return c.Status(400).SendString("Bad request")
-	}
-
-	// Check if the user adding another user to the project is a site admin
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	adminUsername := claims["name"].(string)
-	log.Info("Admin username from claims:", adminUsername)
-
-	isAdmin, err := db.GetDb(c).IsSiteAdmin(adminUsername)
-	if err != nil {
-		log.Info("Error checking admin status:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	if !isAdmin {
-		log.Info("User is not a site admin:", adminUsername)
-		return c.Status(403).SendString("User is not a site admin")
-	}
-
-	// Add the user to the project with the specified role
-	err = db.GetDb(c).AddUserToProject(requestData.Username, requestData.ProjectName, requestData.Role)
-	if err != nil {
-		log.Info("Error adding user to project:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return success message
-	log.Info("User added to project successfully:", requestData.Username)
-	return c.SendStatus(fiber.StatusOK)
-}
-
-// IsProjectManagerHandler is a handler that checks if a user is a project manager for a given project
-func IsProjectManagerHandler(c *fiber.Ctx) error {
-	// Get the username from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Extract necessary parameters from the request query string
-	projectName := c.Params("projectName")
-
-	log.Info("Checking if user ", username, " is a project manager for project ", projectName)
-
-	// Check if the user is a project manager for the specified project
-	isManager, err := db.GetDb(c).IsProjectManager(username, projectName)
-	if err != nil {
-		log.Info("Error checking project manager status:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return the result as JSON
-	return c.JSON(fiber.Map{"isProjectManager": isManager})
-}
-
-func GetProjectTimesHandler(c *fiber.Ctx) error {
-	// Get the username from the token
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Get project
-	projectName := c.Params("projectName")
-	if projectName == "" {
-		log.Info("No project name provided")
-		return c.Status(400).SendString("No project name provided")
-	}
-
-	// Get all users in the project and roles
-	userProjects, err := db.GetDb(c).GetAllUsersProject(projectName)
-	if err != nil {
-		log.Info("Error getting users in project:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// If the user is member
-	isMember := false
-	for _, userProject := range userProjects {
-		if userProject.Username == username {
-			isMember = true
-			break
-		}
-	}
-
-	// If the user is admin
-	if !isMember {
-		isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
-		if err != nil {
-			log.Info("Error checking admin status:", err)
-			return c.Status(500).SendString(err.Error())
-		}
-		if !isAdmin {
-			log.Info("User is neither a project member nor a site admin:", username)
-			return c.Status(403).SendString("User is neither a project member nor a site admin")
-		}
-	}
-
-	// Get project times
-	projectTimes, err := db.GetDb(c).GetProjectTimes(projectName)
-	if err != nil {
-		log.Info("Error getting project times:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	// Return project times as JSON
-	log.Info("Returning project times for project:", projectName)
-	return c.JSON(projectTimes)
-}
-
-func RemoveProject(c *fiber.Ctx) error {
-	user := c.Locals("user").(*jwt.Token)
-	claims := user.Claims.(jwt.MapClaims)
-	username := claims["name"].(string)
-
-	// Check if the user is a site admin
-	isAdmin, err := db.GetDb(c).IsSiteAdmin(username)
-	if err != nil {
-		log.Info("Error checking admin status:", err)
-		return c.Status(500).SendString(err.Error())
-	}
-
-	if !isAdmin {
-		log.Info("User is not a site admin:", username)
-		return c.Status(403).SendString("User is not a site admin")
-	}
-
-	projectName := c.Params("projectName")
-
-	if err := db.GetDb(c).RemoveProject(projectName); err != nil {
-		return c.Status(500).SendString((err.Error()))
-	}
-
-	return c.Status(200).SendString("Project deleted")
-}

From 4538a3b1938b6df923d3f96907301870ffafcba0 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 15:33:20 +0100
Subject: [PATCH 31/35] SignReport handler changes along with tests and TS
 interface

---
 .../internal/handlers/reports/SignReport.go   | 25 +++++--------
 backend/main.go                               |  2 +-
 frontend/src/API/API.ts                       | 35 +++++++++++++++++++
 testing.py                                    |  5 ++-
 4 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/backend/internal/handlers/reports/SignReport.go b/backend/internal/handlers/reports/SignReport.go
index 5769caf..a486ecc 100644
--- a/backend/internal/handlers/reports/SignReport.go
+++ b/backend/internal/handlers/reports/SignReport.go
@@ -1,6 +1,7 @@
 package reports
 
 import (
+	"strconv"
 	db "ttime/internal/database"
 
 	"github.com/gofiber/fiber/v2"
@@ -8,41 +9,33 @@ import (
 	"github.com/golang-jwt/jwt/v5"
 )
 
-// TODO: This information should be extracted from path parameters
-type ReportId struct {
-	ReportId int
-}
-
 func SignReport(c *fiber.Ctx) error {
 	// Extract the necessary parameters from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
 	projectManagerUsername := claims["name"].(string)
 
-	log.Info("Signing report for: ", projectManagerUsername)
-
-	// Extract report ID from the request query parameters
-	// reportID := c.Query("reportId")
-	rid := new(ReportId)
-	if err := c.BodyParser(rid); err != nil {
-		return err
+	// Extract report ID from the path
+	reportId, err := strconv.Atoi(c.Params("reportId"))
+	if err != nil {
+		log.Info("Invalid report ID")
+		return c.Status(400).SendString("Invalid report ID")
 	}
-	log.Info("Signing report for: ", rid.ReportId)
 
 	// Get the project manager's ID
 	projectManagerID, err := db.GetDb(c).GetUserId(projectManagerUsername)
 	if err != nil {
-		log.Info("Failed to get project manager ID")
+		log.Info("Failed to get project manager ID for user: ", projectManagerUsername)
 		return c.Status(500).SendString("Failed to get project manager ID")
 	}
-	log.Info("Project manager ID: ", projectManagerID)
 
 	// Call the database function to sign the weekly report
-	err = db.GetDb(c).SignWeeklyReport(rid.ReportId, projectManagerID)
+	err = db.GetDb(c).SignWeeklyReport(reportId, projectManagerID)
 	if err != nil {
 		log.Info("Error signing weekly report:", err)
 		return c.Status(500).SendString(err.Error())
 	}
 
+	log.Info("Project manager ID: ", projectManagerID, " signed report ID: ", reportId)
 	return c.Status(200).SendString("Weekly report signed successfully")
 }
diff --git a/backend/main.go b/backend/main.go
index ebe5660..cae088f 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -125,7 +125,7 @@ func main() {
 	api.Get("/getWeeklyReport", reports.GetWeeklyReport)
 	api.Post("/submitWeeklyReport", reports.SubmitWeeklyReport)
 	api.Get("/getUnsignedReports/:projectName", reports.GetUnsignedReports)
-	api.Post("/signReport", reports.SignReport)
+	api.Put("/signReport/:reportId", reports.SignReport)
 	api.Put("/addUserToProject", projects.AddUserToProjectHandler)
 	api.Get("/getWeeklyReportsUser/:projectName", reports.GetWeeklyReportsUserHandler)
 	api.Put("/updateWeeklyReport", reports.UpdateWeeklyReport)
diff --git a/frontend/src/API/API.ts b/frontend/src/API/API.ts
index 0160e15..886c957 100644
--- a/frontend/src/API/API.ts
+++ b/frontend/src/API/API.ts
@@ -153,6 +153,18 @@ interface API {
     projectName: string,
     token: string,
   ): Promise<APIResponse<string>>;
+
+  /**
+   * Signs a report. Keep in mind that the user which the token belongs to must be
+   * the project manager of the project the report belongs to.
+   *
+   * @param {number} reportId The id of the report to sign
+   * @param {string} token The authentication token
+   */
+  signReport(
+    reportId: number,
+    token: string,
+  ): Promise<APIResponse<string>>;
 }
 
 /** An instance of the API */
@@ -581,4 +593,27 @@ export const api: API = {
       });
     }
   },
+
+  async signReport(
+    reportId: number,
+    token: string,
+  ): Promise<APIResponse<string>> {
+    try {
+      const response = await fetch(`/api/signReport/${reportId}`, {
+        method: "PUT",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        },
+      });
+
+      if (!response.ok) {
+        return { success: false, message: "Failed to sign report" };
+      } else {
+        return { success: true, message: "Report signed" };
+      }
+    } catch (e) {
+      return { success: false, message: "Failed to sign report" };
+    }
+  }
 };
diff --git a/testing.py b/testing.py
index 5fb8ffe..d4594d1 100644
--- a/testing.py
+++ b/testing.py
@@ -301,9 +301,8 @@ def test_sign_report():
     report_id = response.json()["reportId"]
 
     # Sign the report as the project manager
-    response = requests.post(
-        signReportPath,
-        json={"reportId": report_id},
+    response = requests.put(
+        signReportPath + "/" + str(report_id),
         headers={"Authorization": "Bearer " + project_manager_token},
     )
     assert response.status_code == 200, "Sign report failed"

From 0cd0c8d8326a131aec98c95e84a3b47b794bdf7f Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 15:36:42 +0100
Subject: [PATCH 32/35] Handler re-order to satisfy human OCD

---
 backend/main.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/backend/main.go b/backend/main.go
index cae088f..4c2056e 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -100,34 +100,34 @@ func main() {
 
 	// All user related routes
 	// userGroup := api.Group("/user") // Not currently in use
+	api.Get("/users/all", users.ListAllUsers)
+	api.Get("/project/getAllUsers", users.GetAllUsersProject)
 	api.Post("/login", users.Login)
 	api.Post("/register", users.Register)
 	api.Post("/loginrenew", users.LoginRenew)
-	api.Delete("/userdelete/:username", users.UserDelete) // Perhaps just use POST to avoid headaches
-	api.Put("/changeUserName", users.ChangeUserName)
-	api.Get("/users/all", users.ListAllUsers)
 	api.Post("/promoteToAdmin", users.PromoteToAdmin)
-	api.Get("/project/getAllUsers", users.GetAllUsersProject)
+	api.Put("/changeUserName", users.ChangeUserName)
+	api.Delete("/userdelete/:username", users.UserDelete) // Perhaps just use POST to avoid headaches
 
 	// All project related routes
 	// projectGroup := api.Group("/project") // Not currently in use
 	api.Get("/getUserProjects", projects.GetUserProjects)
-	api.Delete("/project/:projectID", projects.DeleteProject)
-	api.Post("/project", projects.CreateProject)
 	api.Get("/project/:projectId", projects.GetProject)
 	api.Get("/checkIfProjectManager/:projectName", projects.IsProjectManagerHandler)
-	api.Post("/ProjectRoleChange", projects.ProjectRoleChange)
 	api.Get("/getUsersProject/:projectName", projects.ListAllUsersProject)
+	api.Post("/project", projects.CreateProject)
+	api.Post("/ProjectRoleChange", projects.ProjectRoleChange)
 	api.Delete("/removeProject/:projectName", projects.RemoveProject)
+	api.Delete("/project/:projectID", projects.DeleteProject)
 
 	// All report related routes
 	// reportGroup := api.Group("/report") // Not currently in use
 	api.Get("/getWeeklyReport", reports.GetWeeklyReport)
-	api.Post("/submitWeeklyReport", reports.SubmitWeeklyReport)
 	api.Get("/getUnsignedReports/:projectName", reports.GetUnsignedReports)
+	api.Get("/getWeeklyReportsUser/:projectName", reports.GetWeeklyReportsUserHandler)
+	api.Post("/submitWeeklyReport", reports.SubmitWeeklyReport)
 	api.Put("/signReport/:reportId", reports.SignReport)
 	api.Put("/addUserToProject", projects.AddUserToProjectHandler)
-	api.Get("/getWeeklyReportsUser/:projectName", reports.GetWeeklyReportsUserHandler)
 	api.Put("/updateWeeklyReport", reports.UpdateWeeklyReport)
 
 	// Announce the port we are listening on and start the server

From 1db1b84e8f9ee514f4c8e30fe35ac942e380d75e Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 15:58:36 +0100
Subject: [PATCH 33/35] Initial demo of swagger-typescript-api interface
 generation

---
 .gitignore       | 1 +
 backend/Makefile | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/.gitignore b/.gitignore
index 3b1c6d3..281e866 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ backend/*.svg
 
 /go.work.sum
 /package-lock.json
+/backend/docs/swagger.json
 
 # Test binary, built with `go test -c`
 *.test
diff --git a/backend/Makefile b/backend/Makefile
index 3443e94..4e6e20e 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -104,6 +104,12 @@ default: build
 docs:
 	swag init -outputTypes go
 
+api: ./docs/swagger.json
+	npx swagger-typescript-api --path ./docs/swagger.json --output ../frontend/src/API --name GAPI.ts
+
+./docs/swagger.json:
+	swag init -outputTypes json
+
 .PHONY: docfmt
 docfmt:
 	swag fmt

From 45e891ed2ccef542dceac43fa1d9bd3eafb594c1 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 15:59:36 +0100
Subject: [PATCH 34/35] Regenerated swagger docs

---
 backend/docs/docs.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/docs/docs.go b/backend/docs/docs.go
index 322c812..0009c17 100644
--- a/backend/docs/docs.go
+++ b/backend/docs/docs.go
@@ -137,13 +137,13 @@ const docTemplate = `{
                 ],
                 "responses": {
                     "200": {
-                        "description": "Successfully prometed user",
+                        "description": "Successfully promoted user",
                         "schema": {
                             "type": "json"
                         }
                     },
                     "400": {
-                        "description": "bad request",
+                        "description": "Bad request",
                         "schema": {
                             "type": "string"
                         }

From 0792c6b8a3160f9096468438ce867389dac9cf37 Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Fri, 29 Mar 2024 16:36:47 +0100
Subject: [PATCH 35/35] More sane swagger-typescript-api generator parameters

---
 backend/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/backend/Makefile b/backend/Makefile
index 4e6e20e..039340c 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -105,7 +105,11 @@ docs:
 	swag init -outputTypes go
 
 api: ./docs/swagger.json
-	npx swagger-typescript-api --path ./docs/swagger.json --output ../frontend/src/API --name GAPI.ts
+	npx swagger-typescript-api \
+		--api-class-name GenApi \
+		--path ./docs/swagger.json \
+		--output ../frontend/src/API \
+		--name GenApi.ts \
 
 ./docs/swagger.json:
 	swag init -outputTypes json