Co-authored-by: Imbus <imbus64@users.noreply.github.com>

backend/internal/database/db.go

@@ -40,7 +40,8 @@ type Database interface {
 	SignWeeklyReport(reportId int, projectManagerId int) error
 	IsSiteAdmin(username string) (bool, error)
 	IsProjectManager(username string, projectname string) (bool, error)
-	GetTotalTimePerActivity(projectName string) (map[string]int, 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
 }
 
 // This struct is a wrapper type that holds the database connection
@@ -498,6 +499,26 @@ func (d *Db) IsProjectManager(username string, projectname string) (bool, error)
 	return manager, err
 }
 
+func (d *Db) UpdateWeeklyReport(projectName string, userName string, week int, developmentTime int, meetingTime int, adminTime int, ownWorkTime int, studyTime int, testingTime int) error {
+	query := `
+		UPDATE weekly_reports
+		SET
+			development_time = ?,
+			meeting_time = ?,
+			admin_time = ?,
+			own_work_time = ?,
+			study_time = ?,
+			testing_time = ?
+		WHERE
+			user_id = (SELECT id FROM users WHERE username = ?)
+			AND project_id = (SELECT id FROM projects WHERE name = ?)
+			AND week = ?
+	`
+
+	_, err := d.Exec(query, developmentTime, meetingTime, adminTime, ownWorkTime, studyTime, testingTime, userName, projectName, week)
+	return err
+}
+
 // MigrateSampleData applies sample data to the database.
 func (d *Db) MigrateSampleData() error {
 	// Insert sample data
@@ -537,11 +558,11 @@ func (d *Db) MigrateSampleData() error {
 	return nil
 }
 
-func (d *Db) GetTotalTimePerActivity(projectName string) (map[string]int, error) {
-
+// GetProjectTimes retrieves a map with times per "Activity" for a given project
+func (d *Db) GetProjectTimes(projectName string) (map[string]int, error) {
 	query := `
         SELECT development_time, meeting_time, admin_time, own_work_time, study_time, testing_time
-	    FROM weekly_reports
+        FROM weekly_reports
         JOIN projects ON weekly_reports.project_id = projects.id
         WHERE projects.name = ?
     `

backend/internal/database/db_test.go

@@ -770,27 +770,90 @@ func TestIsProjectManager(t *testing.T) {
 	}
 }
 
-func TestGetTotalTimePerActivity(t *testing.T) {
-	// Initialize your test database connection
+func TestGetProjectTimes(t *testing.T) {
+	// Initialize
 	db, err := setupState()
 	if err != nil {
 		t.Error("setupState failed:", err)
+		return
 	}
 
-	// Run the query to get total time per activity
-	totalTime, err := db.GetTotalTimePerActivity("projecttest")
+	// Create a user
+	user := "TeaUser"
+	password := "Vanilla"
+	err = db.AddUser(user, password)
+	if err != nil {
+		t.Error("AddUser failed:", err)
+		return
+	}
+
+	// Create a project
+	projectName := "ProjectVanilla"
+	projectDescription := "When tea tastes its best"
+	err = db.AddProject(projectName, projectDescription, user) // Fix the variable name here
+	if err != nil {
+		t.Error("AddProject failed:", err)
+		return
+	}
+
+	// Tests the func in db.go
+	totalTime, err := db.GetProjectTimes(projectName)
 	if err != nil {
 		t.Error("GetTotalTimePerActivity failed:", err)
+		return
 	}
 
 	// Check if the totalTime map is not nil
 	if totalTime == nil {
 		t.Error("Expected non-nil totalTime map, got nil")
+		return
 	}
 
-	// ska lägga till fler  assertions
-}
+	// Define the expected valeus
+	expectedTotalTime := map[string]int{
+		"development": 0,
+		"meeting":     0,
+		"admin":       0,
+		"own_work":    0,
+		"study":       0,
+		"testing":     0,
+	}
 
+	// Compare the expectedTotalTime with the totalTime retrieved from the database
+	for activity, expectedTime := range expectedTotalTime {
+		if totalTime[activity] != expectedTime {
+			t.Errorf("Expected %s time to be %d, got %d", activity, expectedTime, totalTime[activity])
+		}
+	}
+
+	// Insert some data into the database for different activities
+	err = db.AddWeeklyReport(projectName, user, 1, 1, 3, 2, 1, 4, 5)
+	if err != nil {
+		t.Error("Failed to insert data into the database:", err)
+		return
+	}
+
+	newTotalTime, err := db.GetProjectTimes(projectName)
+	if err != nil {
+		t.Error("GetTotalTimePerActivity failed:", err)
+		return
+	}
+
+	newExpectedTotalTime := map[string]int{
+		"development": 1,
+		"meeting":     3,
+		"admin":       2,
+		"own_work":    1,
+		"study":       4,
+		"testing":     5,
+	}
+
+	for activity, newExpectedTime := range newExpectedTotalTime {
+		if newTotalTime[activity] != newExpectedTime {
+			t.Errorf("Expected %s time to be %d, got %d", activity, newExpectedTime, newTotalTime[activity])
+		}
+	}
+}
 func TestEnsureManagerOfCreatedProject(t *testing.T) {
 	db, err := setupState()
 	if err != nil {
@@ -824,3 +887,51 @@ func TestEnsureManagerOfCreatedProject(t *testing.T) {
 		t.Error("Expected testuser to be a project manager, but it's not.")
 	}
 }
+
+// TestUpdateWeeklyReport tests the UpdateWeeklyReport function of the database
+func TestUpdateWeeklyReport(t *testing.T) {
+	db, err := setupState()
+	if err != nil {
+		t.Error("setupState failed:", err)
+	}
+
+	// Add a user
+	err = db.AddUser("testuser", "password")
+	if err != nil {
+		t.Error("AddUser failed:", err)
+	}
+
+	// Add a project
+	err = db.AddProject("testproject", "description", "testuser")
+	if err != nil {
+		t.Error("AddProject failed:", err)
+	}
+
+	// Add a weekly report
+	err = db.AddWeeklyReport("testproject", "testuser", 1, 1, 1, 1, 1, 1, 1)
+	if err != nil {
+		t.Error("AddWeeklyReport failed:", err)
+	}
+
+	// Update the weekly report
+	err = db.UpdateWeeklyReport("testproject", "testuser", 1, 2, 2, 2, 2, 2, 2)
+	if err != nil {
+		t.Error("UpdateWeeklyReport failed:", err)
+	}
+
+	// Retrieve the updated report
+	updatedReport, err := db.GetWeeklyReport("testuser", "testproject", 1)
+	if err != nil {
+		t.Error("GetWeeklyReport failed:", err)
+	}
+
+	// Check if the report was updated correctly
+	if updatedReport.DevelopmentTime != 2 ||
+		updatedReport.MeetingTime != 2 ||
+		updatedReport.AdminTime != 2 ||
+		updatedReport.OwnWorkTime != 2 ||
+		updatedReport.StudyTime != 2 ||
+		updatedReport.TestingTime != 2 {
+		t.Error("UpdateWeeklyReport failed: report not updated correctly")
+	}
+}