Merge remote-tracking branch 'origin/AlexTester' into BumBranch

backend/internal/database/db.go

@@ -42,6 +42,7 @@ type Database interface {
 	IsProjectManager(username string, projectname string) (bool, error)
 	GetProjectTimes(projectName string) (map[string]int, error)
 	UpdateWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error
+	RemoveProject(projectname string) error
 }
 
 // This struct is a wrapper type that holds the database connection
@@ -595,3 +596,8 @@ func (d *Db) GetProjectTimes(projectName string) (map[string]int, error) {
 
 	return totalTime, nil
 }
+
+func (d *Db) RemoveProject(projectname string) error {
+	_, err := d.Exec("DELETE FROM projects WHERE name = ?", projectname)
+	return err
+}

backend/internal/database/db_test.go

@@ -935,3 +935,33 @@ func TestUpdateWeeklyReport(t *testing.T) {
 		t.Error("UpdateWeeklyReport failed: report not updated correctly")
 	}
 }
+
+func TestRemoveProject(t *testing.T) {
+	db, err := setupAdvancedState()
+	if err != nil {
+		t.Error("setupState failed:", err)
+	}
+
+	// Promote user to Admin
+	err = db.PromoteToAdmin("demouser")
+	if err != nil {
+		t.Error("PromoteToAdmin failed:", err)
+	}
+
+	// Remove project
+	err = db.RemoveProject("projecttest")
+	if err != nil {
+		t.Error("RemoveProject failed:", err)
+	}
+
+	// Check if the project was removed
+	projects, err := db.GetAllProjects()
+	if err != nil {
+		t.Error("GetAllProjects failed:", err)
+	}
+	if len(projects) != 0 {
+		t.Error("RemoveProject failed: expected 0, got", len(projects))
+	}
+	
+}
+	

backend/internal/handlers/global_state.go

@@ -30,6 +30,7 @@ type GlobalState interface {
 	GetAllUsersProject(c *fiber.Ctx) error  // WIP
 	GetUnsignedReports(c *fiber.Ctx) error  // 
 	UpdateWeeklyReport(c *fiber.Ctx) error
+	RemoveProject(c *fiber.Ctx) error
 }
 
 // "Constructor"

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.Params("projectName")
+	projectName := c.Query("projectName")
 
 	log.Info("Checking if user ", username, " is a project manager for project ", projectName)
 
@@ -231,59 +231,85 @@ func (gs *GState) IsProjectManagerHandler(c *fiber.Ctx) error {
 	}
 
 	// Return the result as JSON
-	return c.JSON(fiber.Map{"isProjectManager": isManager})
+	return c.JSON(map[string]bool{"isProjectManager": isManager})
 }
 
 func (gs *GState) 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 := gs.Db.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 := gs.Db.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 := gs.Db.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)
-}
+	// 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 := gs.Db.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 := gs.Db.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 := gs.Db.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 (gs *GState) 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)
+	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 := gs.Db.RemoveProject(projectName); err != nil {
+		return c.Status(500).SendString((err.Error()))
+	}
+
+	return c.Status(200).SendString("Project deleted")
+}