Merge branch 'frontend' into gruppPP

backend/internal/database/db.go

@@ -2,11 +2,12 @@ package database
 
 import (
 	"embed"
+	"encoding/json"
 	"errors"
-	"fmt"
 	"path/filepath"
 	"ttime/internal/types"
 
+	"github.com/gofiber/fiber/v2/log"
 	"github.com/jmoiron/sqlx"
 	_ "modernc.org/sqlite"
 )
@@ -22,8 +23,6 @@ type Database interface {
 	GetUserId(username string) (int, error)
 	AddProject(name string, description string, username string) error
 	DeleteProject(name string, username string) error
-	Migrate() error
-	MigrateSampleData() error
 	GetProjectId(projectname string) (int, error)
 	AddWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error
 	AddUserToProject(username string, projectname string, role string) error
@@ -41,15 +40,19 @@ type Database interface {
 	SignWeeklyReport(reportId int, projectManagerId int) error
 	IsSiteAdmin(username string) (bool, error)
 	IsProjectManager(username string, projectname string) (bool, error)
+	ReportStatistics(username string, projectName string) (*types.Statistics, 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
+	GetUserName(id int) (string, error)
+	UnsignWeeklyReport(reportId int, projectManagerId int) error
+	DeleteReport(reportID int) error
 }
 
 // This struct is a wrapper type that holds the database connection
 // Internally DB holds a connection pool, so it's safe for concurrent use
 type Db struct {
-	*sqlx.DB
+	*sqlx.Tx
 }
 
 type UserProjectMember struct {
@@ -91,8 +94,19 @@ const removeUserFromProjectQuery = `DELETE FROM user_roles
 									WHERE user_id = (SELECT id FROM users WHERE username = ?) 
 									AND project_id = (SELECT id FROM projects WHERE name = ?)`
 
+const reportStatistics = `SELECT SUM(development_time) AS total_development_time,
+							SUM(meeting_time) AS total_meeting_time,
+							SUM(admin_time) AS total_admin_time,
+							SUM(own_work_time) AS total_own_work_time,
+							SUM(study_time) AS total_study_time,
+							SUM(testing_time) AS total_testing_time
+							FROM weekly_reports
+							WHERE user_id = (SELECT id FROM users WHERE username = ?)
+							AND project_id = (SELECT id FROM projects WHERE name = ?)
+							GROUP BY user_id, project_id`
+
 // DbConnect connects to the database
-func DbConnect(dbpath string) Database {
+func DbConnect(dbpath string) sqlx.DB {
 	// Open the database
 	db, err := sqlx.Connect("sqlite", dbpath)
 	if err != nil {
@@ -105,7 +119,25 @@ func DbConnect(dbpath string) Database {
 		panic(err)
 	}
 
-	return &Db{db}
+	return *db
+}
+
+func (d *Db) ReportStatistics(username string, projectName string) (*types.Statistics, error) {
+	var result types.Statistics
+
+	err := d.Get(&result, reportStatistics, username, projectName)
+	if err != nil {
+		return nil, err
+	}
+
+	serialized, err := json.Marshal(result)
+	if err != nil {
+		return nil, err
+	}
+
+	log.Info(string(serialized))
+
+	return &result, nil
 }
 
 func (d *Db) CheckUser(username string, password string) bool {
@@ -209,25 +241,15 @@ func (d *Db) GetProjectId(projectname string) (int, error) {
 
 // Creates a new project in the database, associated with a user
 func (d *Db) AddProject(name string, description string, username string) error {
-	tx := d.MustBegin()
 	// Insert the project into the database
-	_, err := tx.Exec(projectInsert, name, description, username)
+	_, err := d.Exec(projectInsert, name, description, username)
 	if err != nil {
-		if err := tx.Rollback(); err != nil {
-			return err
-		}
 		return err
 	}
 
 	// Add creator to project as project manager
-	_, err = tx.Exec(addUserToProject, username, name, "project_manager")
+	_, err = d.Exec(addUserToProject, username, name, "project_manager")
 	if err != nil {
-		if err := tx.Rollback(); err != nil {
-			return err
-		}
-		return err
-	}
-	if err := tx.Commit(); err != nil {
 		return err
 	}
 
@@ -235,16 +257,7 @@ func (d *Db) AddProject(name string, description string, username string) error
 }
 
 func (d *Db) DeleteProject(projectID string, username string) error {
-	tx := d.MustBegin()
-
-	_, err := tx.Exec(deleteProject, projectID, username)
-
-	if err != nil {
-		if rollbackErr := tx.Rollback(); rollbackErr != nil {
-			return fmt.Errorf("error rolling back transaction: %v, delete error: %v", rollbackErr, err)
-		}
-		panic(err)
-	}
+	_, err := d.Exec(deleteProject, projectID, username)
 
 	return err
 }
@@ -349,9 +362,14 @@ func (d *Db) SignWeeklyReport(reportId int, projectManagerId int) error {
 		return err
 	}
 
+	managerQuery := `SELECT project_id FROM user_roles 
+					WHERE user_id = ?
+					AND project_id = (SELECT project_id FROM weekly_reports WHERE report_id = ?) 
+					AND p_role = 'project_manager'`
+
 	// Retrieve the project ID associated with the project manager
 	var managerProjectID int
-	err = d.Get(&managerProjectID, "SELECT project_id FROM user_roles WHERE user_id = ? AND p_role = 'project_manager'", projectManagerId)
+	err = d.Get(&managerProjectID, managerQuery, projectManagerId, reportId)
 	if err != nil {
 		return err
 	}
@@ -366,6 +384,36 @@ func (d *Db) SignWeeklyReport(reportId int, projectManagerId int) error {
 	return err
 }
 
+func (d *Db) UnsignWeeklyReport(reportId int, projectManagerId int) error {
+	// Retrieve the project ID associated with the report
+	var reportProjectID int
+	err := d.Get(&reportProjectID, "SELECT project_id FROM weekly_reports WHERE report_id = ?", reportId)
+	if err != nil {
+		return err
+	}
+
+	managerQuery := `SELECT project_id FROM user_roles 
+					WHERE user_id = ?
+					AND project_id = (SELECT project_id FROM weekly_reports WHERE report_id = ?) 
+					AND p_role = 'project_manager'`
+
+	// Retrieve the project ID associated with the project manager
+	var managerProjectID int
+	err = d.Get(&managerProjectID, managerQuery, projectManagerId, reportId)
+	if err != nil {
+		return err
+	}
+
+	// Check if the project manager is in the same project as the report
+	if reportProjectID != managerProjectID {
+		return errors.New("project manager doesn't have permission to unsign the report")
+	}
+
+	// Update the signed_by field of the specified report
+	_, err = d.Exec("UPDATE weekly_reports SET signed_by = NULL WHERE report_id = ?;", reportId)
+	return err
+}
+
 func (d *Db) GetUnsignedWeeklyReports(projectName string) ([]types.WeeklyReport, error) {
 	// Define the SQL query to fetch unsigned reports for a given user
 	query := `
@@ -433,7 +481,7 @@ func (d *Db) IsSiteAdmin(username string) (bool, error) {
 
 // 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 {
+func Migrate(db sqlx.DB) error {
 	// Read the embedded scripts directory
 	files, err := scripts.ReadDir("migrations")
 	if err != nil {
@@ -445,7 +493,7 @@ func (d *Db) Migrate() error {
 		return nil
 	}
 
-	tr := d.MustBegin()
+	tr := db.MustBegin()
 
 	// Iterate over each SQL file and execute it
 	for _, file := range files {
@@ -531,7 +579,7 @@ func (d *Db) UpdateWeeklyReport(projectName string, userName string, week int, d
 }
 
 // MigrateSampleData applies sample data to the database.
-func (d *Db) MigrateSampleData() error {
+func MigrateSampleData(db sqlx.DB) error {
 	// Insert sample data
 	files, err := sampleData.ReadDir("sample_data")
 	if err != nil {
@@ -541,7 +589,7 @@ func (d *Db) MigrateSampleData() error {
 	if len(files) == 0 {
 		println("No sample data files found")
 	}
-	tr := d.MustBegin()
+	tr := db.MustBegin()
 
 	// Iterate over each SQL file and execute it
 	for _, file := range files {
@@ -578,7 +626,7 @@ func (d *Db) GetProjectTimes(projectName string) (map[string]int, error) {
         WHERE projects.name = ?
     `
 
-	rows, err := d.DB.Query(query, projectName)
+	rows, err := d.Query(query, projectName)
 	if err != nil {
 		return nil, err
 	}
@@ -611,3 +659,14 @@ func (d *Db) RemoveProject(projectname string) error {
 	_, err := d.Exec("DELETE FROM projects WHERE name = ?", projectname)
 	return err
 }
+
+func (d *Db) GetUserName(id int) (string, error) {
+	var username string
+	err := d.Get(&username, "SELECT username FROM users WHERE id = ?", id)
+	return username, err
+}
+
+func (d *Db) DeleteReport(reportID int) error {
+	_, err := d.Exec("DELETE FROM weekly_reports WHERE report_id = ?", reportID)
+	return err
+}

backend/internal/database/db_test.go

@@ -9,11 +9,13 @@ import (
 // setupState initializes a database instance with necessary setup for testing
 func setupState() (Database, error) {
 	db := DbConnect(":memory:")
-	err := db.Migrate()
+	err := Migrate(db)
 	if err != nil {
 		return nil, err
 	}
-	return db, nil
+
+	db_iface := Db{db.MustBegin()}
+	return &db_iface, nil
 }
 
 // This is a more advanced setup that includes more data in the database.
@@ -583,6 +585,94 @@ func TestSignWeeklyReport(t *testing.T) {
 	}
 }
 
+func TestUnsignWeeklyReport(t *testing.T) {
+	db, err := setupState()
+	if err != nil {
+		t.Error("setupState failed:", err)
+	}
+
+	// Add project manager
+	err = db.AddUser("projectManager", "password")
+	if err != nil {
+		t.Error("AddUser failed:", err)
+	}
+
+	// Add a regular user
+	err = db.AddUser("testuser", "password")
+	if err != nil {
+		t.Error("AddUser failed:", err)
+	}
+
+	// Add project
+	err = db.AddProject("testproject", "description", "projectManager")
+	if err != nil {
+		t.Error("AddProject failed:", err)
+	}
+
+	// Add both regular users as members to the project
+	err = db.AddUserToProject("testuser", "testproject", "member")
+	if err != nil {
+		t.Error("AddUserToProject failed:", err)
+	}
+
+	err = db.AddUserToProject("projectManager", "testproject", "project_manager")
+	if err != nil {
+		t.Error("AddUserToProject failed:", err)
+	}
+
+	// Add a weekly report for one of the regular users
+	err = db.AddWeeklyReport("testproject", "testuser", 1, 1, 1, 1, 1, 1, 1)
+	if err != nil {
+		t.Error("AddWeeklyReport failed:", err)
+	}
+
+	// Retrieve the added report
+	report, err := db.GetWeeklyReport("testuser", "testproject", 1)
+	if err != nil {
+		t.Error("GetWeeklyReport failed:", err)
+	}
+
+	// Print project manager's ID
+	projectManagerID, err := db.GetUserId("projectManager")
+	if err != nil {
+		t.Error("GetUserId failed:", err)
+	}
+
+	// Sign the report with the project manager
+	err = db.SignWeeklyReport(report.ReportId, projectManagerID)
+	if err != nil {
+		t.Error("SignWeeklyReport failed:", err)
+	}
+
+	// Retrieve the report again to check if it's signed
+	signedReport, err := db.GetWeeklyReport("testuser", "testproject", 1)
+	if err != nil {
+		t.Error("GetWeeklyReport failed:", err)
+	}
+
+	// Ensure the report is signed by the project manager
+	if *signedReport.SignedBy != projectManagerID {
+		t.Errorf("Expected SignedBy to be %d, got %d", projectManagerID, *signedReport.SignedBy)
+	}
+
+	// Unsign the report
+	err = db.UnsignWeeklyReport(report.ReportId, projectManagerID)
+	if err != nil {
+		t.Error("UnsignWeeklyReport failed:", err)
+	}
+
+	// Retrieve the report again to check if it's unsigned
+	unsignedReport, err := db.GetWeeklyReport("testuser", "testproject", 1)
+	if err != nil {
+		t.Error("GetWeeklyReport failed:", err)
+	}
+
+	// Ensure the report is unsigned
+	if unsignedReport.SignedBy != nil {
+		t.Error("Expected SignedBy to be nil, got", unsignedReport.SignedBy)
+	}
+}
+
 // TestSignWeeklyReportByAnotherProjectManager tests the scenario where a project manager attempts to sign a weekly report for a user who is not assigned to their project
 func TestSignWeeklyReportByAnotherProjectManager(t *testing.T) {
 	db, err := setupState()
@@ -964,3 +1054,41 @@ func TestRemoveProject(t *testing.T) {
 	}
 
 }
+
+func TestDeleteReport(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)
+	}
+
+	// create a weekly report
+	err = db.AddWeeklyReport("projecttest", "demouser", 16, 1, 1, 1, 1, 1, 1)
+	if err != nil {
+		t.Error("AddWeeklyReport failed:", err)
+	}
+
+	// Check if the report was added
+	report, err := db.GetWeeklyReport("demouser", "projecttest", 16)
+	if err != nil {
+		t.Error("GetWeeklyReport failed:", err)
+	}
+
+	// Remove report
+	err = db.DeleteReport(report.ReportId)
+	if err != nil {
+		t.Error("RemoveReport failed:", err)
+	}
+
+	// Check if the report was removed
+	report, err = db.GetWeeklyReport("demouser", "projecttest", 16)
+	if err == nil {
+		t.Error("RemoveReport failed: report not removed")
+	}
+
+}

backend/internal/database/middleware.go

@@ -1,11 +1,28 @@
 package database
 
-import "github.com/gofiber/fiber/v2"
+import (
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/log"
+	"github.com/jmoiron/sqlx"
+)
 
-// Simple middleware that provides a shared database pool as a local key "db"
-func DbMiddleware(db *Database) func(c *fiber.Ctx) error {
+// Simple middleware that provides a transaction as a local key "db"
+func DbMiddleware(db *sqlx.DB) func(c *fiber.Ctx) error {
 	return func(c *fiber.Ctx) error {
-		c.Locals("db", db)
+		tx := db.MustBegin()
+
+		defer func() {
+			if err := tx.Commit(); err != nil {
+				if err = tx.Rollback(); err != nil {
+					log.Error("Failed to rollback transaction: ", err)
+				}
+				return
+			}
+		}()
+
+		var db_iface Database = &Db{tx}
+
+		c.Locals("db", &db_iface)
 		return c.Next()
 	}
 }

backend/internal/handlers/projects/PromoteToPm.go

@@ -44,6 +44,10 @@ func PromoteToPm(c *fiber.Ctx) error {
 
 	// Add the user to the project with the specified role
 	err = db.GetDb(c).ChangeUserRole(new_pm_name, project, "project_manager")
+	if err != nil {
+		log.Info("Error promoting user to project manager:", err)
+		return c.Status(500).SendString(err.Error())
+	}
 
 	// Return success message
 	log.Info("User : ", new_pm_name, " promoted to project manager in project: ", project)

backend/internal/handlers/reports/DeleteReport.go

@@ -0,0 +1,22 @@
+package reports
+
+import (
+	"strconv"
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+func DeleteReport(c *fiber.Ctx) error {
+	reportID := c.Params("reportID")
+	reportIDInt, err := strconv.Atoi(reportID)
+	if err != nil {
+		return c.Status(400).SendString("Invalid report ID")
+	}
+
+	if err := db.GetDb(c).DeleteReport(reportIDInt); err != nil {
+		return c.Status(500).SendString((err.Error()))
+	}
+
+	return c.Status(200).SendString("Weekly report deleted")
+}

backend/internal/handlers/reports/GetAllWeeklyReports.go

@@ -38,7 +38,7 @@ func GetAllWeeklyReports(c *fiber.Ctx) error {
 		return c.Status(500).SendString(err.Error())
 	}
 
-	if pm == false && target_user != username {
+	if !(pm || target_user == username) {
 		log.Info("Unauthorized access")
 		return c.Status(403).SendString("Unauthorized access")
 	}

backend/internal/handlers/reports/GetWeeklyReport.go

@@ -47,7 +47,7 @@ func GetWeeklyReport(c *fiber.Ctx) error {
 		return c.Status(500).SendString(err.Error())
 	}
 
-	if pm == false && target_user != username {
+	if !(pm || target_user == username) {
 		log.Info("Unauthorized access")
 		return c.Status(403).SendString("Unauthorized access")
 	}

backend/internal/handlers/reports/Statistics.go

@@ -0,0 +1,50 @@
+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 GetStatistics(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 project name from query parameters
+	projectName := c.Query("projectName")
+
+	log.Info(username, " trying to get statistics for project: ", projectName)
+
+	if projectName == "" {
+		log.Info("Missing project name")
+		return c.Status(400).SendString("Missing project name")
+	}
+
+	// If the user is not a project manager, they can't view statistics
+	pm, err := db.GetDb(c).IsProjectManager(username, projectName)
+	if err != nil {
+		log.Info("Error checking if user is project manager:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	if !pm {
+		log.Info("Unauthorized access")
+		return c.Status(403).SendString("Unauthorized access")
+	}
+
+	// Retrieve statistics for the project from the database
+	statistics, err := db.GetDb(c).ReportStatistics(username, projectName)
+	if err != nil {
+		log.Error("Error getting statistics for project:", projectName, ":", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Returning statistics")
+	// Return the retrieved statistics
+	return c.JSON(statistics)
+
+}

backend/internal/handlers/reports/UnsignReport.go

@@ -0,0 +1,41 @@
+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"
+)
+
+func UnsignReport(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 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")
+	}
+
+	// Get the project manager's ID
+	projectManagerID, err := db.GetDb(c).GetUserId(projectManagerUsername)
+	if err != nil {
+		log.Info("Failed to get project manager ID for user: ", projectManagerUsername)
+		return c.Status(500).SendString("Failed to get project manager ID")
+	}
+
+	// Call the database function to sign the weekly report
+	err = db.GetDb(c).UnsignWeeklyReport(reportId, projectManagerID)
+	if err != nil {
+		log.Info("Error Unsigning weekly report:", err)
+		return c.Status(500).SendString(err.Error())
+	}
+
+	log.Info("Project manager ID: ", projectManagerID, " unsigned report ID: ", reportId)
+	return c.Status(200).SendString("Weekly report unsigned successfully")
+}

backend/internal/handlers/users/GetUserName.go

@@ -0,0 +1,32 @@
+package users
+
+import (
+	"strconv"
+	db "ttime/internal/database"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+// Return the username of a user given their user id
+func GetUserName(c *fiber.Ctx) error {
+	// Check the query params for userId
+	user_id_string := c.Query("userId")
+	if user_id_string == "" {
+		return c.Status(400).SendString("Missing user id")
+	}
+
+	// Convert to int
+	user_id, err := strconv.Atoi(user_id_string)
+	if err != nil {
+		return c.Status(400).SendString("Invalid user id")
+	}
+
+	// Get the username from the database
+	username, err := db.GetDb(c).GetUserName(user_id)
+	if err != nil {
+		return c.Status(500).SendString(err.Error())
+	}
+
+	// Send the nuclear launch codes to north korea
+	return c.JSON(fiber.Map{"username": username})
+}

backend/internal/types/WeeklyReport.go

@@ -66,6 +66,15 @@ type WeeklyReport struct {
 	SignedBy *int `json:"signedBy" db:"signed_by"`
 }
 
+type Statistics struct {
+	TotalDevelopmentTime int `json:"totalDevelopmentTime" db:"total_development_time"`
+	TotalMeetingTime     int `json:"totalMeetingTime" db:"total_meeting_time"`
+	TotalAdminTime       int `json:"totalAdminTime" db:"total_admin_time"`
+	TotalOwnWorkTime     int `json:"totalOwnWorkTime" db:"total_own_work_time"`
+	TotalStudyTime       int `json:"totalStudyTime" db:"total_study_time"`
+	TotalTestingTime     int `json:"totalTestingTime" db:"total_testing_time"`
+}
+
 type UpdateWeeklyReport struct {
 	// The name of the project, as it appears in the database
 	ProjectName string `json:"projectName"`