Merge imbs -> dev

backend/internal/database/db.go

@@ -32,6 +32,7 @@ type Database interface {
 	GetUserRole(username string, projectname string) (string, error)
 	GetWeeklyReport(username string, projectName string, week int) (types.WeeklyReport, error)
 	SignWeeklyReport(reportId int, projectManagerId int) error
+	IsSiteAdmin(username string) (bool, error)
 }
 
 // This struct is a wrapper type that holds the database connection
@@ -316,6 +317,26 @@ func (d *Db) SignWeeklyReport(reportId int, projectManagerId int) error {
 	return err
 }
 
+// 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
+	query := `
+        SELECT COUNT(*) FROM site_admin 
+        JOIN users ON site_admin.admin_id = users.id 
+        WHERE users.username = ?
+    `
+
+	// Execute the query
+	var count int
+	err := d.Get(&count, query, username)
+	if err != nil {
+		return false, err
+	}
+
+	// If count is greater than 0, the user is a site admin
+	return count > 0, nil
+}
+
 // Reads a directory of migration files and applies them to the database.
 // This will eventually be used on an embedded directory
 func (d *Db) Migrate() error {

backend/internal/handlers/global_state.go

@@ -18,6 +18,8 @@ type GlobalState interface {
 	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
 	// GetProject(c *fiber.Ctx) error           // To get a specific project
 	// UpdateProject(c *fiber.Ctx) error        // To update a project
 	// DeleteProject(c *fiber.Ctx) error        // To delete a project

backend/internal/handlers/handlers_project_related.go

@@ -101,3 +101,45 @@ func (gs *GState) ListAllUsersProject(c *fiber.Ctx) error {
 	// 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 (gs *GState) 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 {
+		println("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)
+	println("Admin username from claims:", adminUsername)
+
+	isAdmin, err := gs.Db.IsSiteAdmin(adminUsername)
+	if err != nil {
+		println("Error checking admin status:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	if !isAdmin {
+		println("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 = gs.Db.AddUserToProject(requestData.Username, requestData.ProjectName, requestData.Role)
+	if err != nil {
+		println("Error adding user to project:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Return success message
+	println("User added to project successfully:", requestData.Username)
+	return c.SendStatus(fiber.StatusOK)
+}

backend/internal/handlers/handlers_report_related.go

@@ -64,30 +64,42 @@ func (gs *GState) GetWeeklyReport(c *fiber.Ctx) error {
 	return c.JSON(report)
 }
 
+type ReportId struct {
+	ReportId int
+}
+
 func (gs *GState) SignReport(c *fiber.Ctx) error {
+	println("Signing report...")
 	// Extract the necessary parameters from the token
 	user := c.Locals("user").(*jwt.Token)
 	claims := user.Claims.(jwt.MapClaims)
-	managerUsername := claims["name"].(string)
+	projectManagerUsername := claims["name"].(string)
 
-	// Extract the report ID and project manager ID from request parameters
-	reportID, err := strconv.Atoi(c.Params("reportId"))
-	if err != nil {
-		return c.Status(400).SendString("Invalid report ID")
+	// Extract report ID from the request query parameters
+	// reportID := c.Query("reportId")
+	rid := new(ReportId)
+	if err := c.BodyParser(rid); err != nil {
+		return err
 	}
+	println("Signing report for: ", rid.ReportId)
+	// reportIDInt, err := strconv.Atoi(rid.ReportId)
+	// println("Signing report for: ", rid.ReportId)
+	// if err != nil {
+	// 	return c.Status(400).SendString("Invalid report ID")
+	// }
 
-	// Call the database function to get the project manager ID
-	managerID, err := gs.Db.GetUserId(managerUsername)
+	// Get the project manager's ID
+	projectManagerID, err := gs.Db.GetUserId(projectManagerUsername)
 	if err != nil {
 		return c.Status(500).SendString("Failed to get project manager ID")
 	}
+	println("blabla", projectManagerID)
 
 	// Call the database function to sign the weekly report
-	err = gs.Db.SignWeeklyReport(reportID, managerID)
+	err = gs.Db.SignWeeklyReport(rid.ReportId, projectManagerID)
 	if err != nil {
-		return c.Status(500).SendString("Failed to sign the weekly report: " + err.Error())
+		return c.Status(500).SendString(err.Error())
 	}
 
-	// Return success response
 	return c.Status(200).SendString("Weekly report signed successfully")
 }

backend/internal/handlers/handlers_user_related.go

@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"fmt"
 	"time"
 	"ttime/internal/types"
 
@@ -122,3 +123,25 @@ func (gs *GState) ListAllUsers(c *fiber.Ctx) error {
 	// Return the list of users as JSON
 	return c.JSON(users)
 }
+
+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
+
+	println("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 {
+		fmt.Println("Error promoting user to admin:", err) // Debug print
+		return c.Status(500).SendString(err.Error())
+	}
+
+	println("User promoted to admin successfully:", username) // Debug print
+
+	// Return a success message
+	return c.SendStatus(fiber.StatusOK)
+}

backend/main.go

@@ -80,6 +80,9 @@ func main() {
 	server.Post("/api/project", gs.CreateProject)
 	server.Get("/api/project/:projectId", gs.GetProject)
 	server.Get("/api/getWeeklyReport", gs.GetWeeklyReport)
+	server.Post("/api/signReport", gs.SignReport)
+	server.Put("/api/addUserToProject", gs.AddUserToProjectHandler)
+	server.Post("/api/promoteToAdmin", gs.PromoteToAdmin)
 
 	// Announce the port we are listening on and start the server
 	err = server.Listen(fmt.Sprintf(":%d", conf.Port))