backend/Makefile

@@ -47,7 +47,7 @@ itest:
 	make build
 	./bin/$(PROC_NAME) >/dev/null 2>&1 &
 	sleep 1 # Adjust if needed
-	python ../testing/testing.py || pkill $(PROC_NAME)
+	python ../testing.py
 	pkill $(PROC_NAME)
 
 # Get dependencies target

backend/go.mod

@@ -13,10 +13,10 @@ require (
 require (
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonpointer v0.20.3 // indirect
-	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.20.5 // indirect
-	github.com/go-openapi/spec v0.21.0 // indirect
+	github.com/go-openapi/spec v0.20.15 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/go-openapi/swag v0.22.10 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -25,10 +25,10 @@ require (
 	github.com/swaggo/files/v2 v2.0.0 // indirect
 	golang.org/x/tools v0.19.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b // indirect
+	modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
-	modernc.org/libc v1.49.1 // indirect
+	modernc.org/libc v1.41.0 // indirect
 	modernc.org/mathutil v1.6.0 // indirect
-	modernc.org/memory v1.8.0 // indirect
+	modernc.org/memory v1.7.2 // indirect
 	modernc.org/strutil v1.2.0 // indirect
 	modernc.org/token v1.1.0 // indirect
 )
@@ -42,7 +42,7 @@ require (
 // These are all for fiber
 require (
 	github.com/andybalholm/brotli v1.1.0 // indirect
-	github.com/gofiber/fiber/v2 v2.52.4
+	github.com/gofiber/fiber/v2 v2.52.2
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/klauspost/compress v1.17.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
@@ -52,5 +52,5 @@ require (
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasthttp v1.52.0 // indirect
 	github.com/valyala/tcplisten v1.0.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
 )

backend/go.sum

@@ -10,20 +10,20 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
+github.com/go-openapi/jsonpointer v0.20.3 h1:jykzYWS/kyGtsHfRt6aV8JTB9pcQAXPIA7qlZ5aRlyk=
-github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
+github.com/go-openapi/jsonpointer v0.20.3/go.mod h1:c7l0rjoouAuIxCm8v/JWKRgMjDG/+/7UBWsXMrv6PsM=
-github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
+github.com/go-openapi/jsonreference v0.20.5 h1:hutI+cQI+HbSQaIGSfsBsYI0pHk+CATf8Fk5gCSj0yI=
-github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
+github.com/go-openapi/jsonreference v0.20.5/go.mod h1:thAqAp31UABtI+FQGKAQfmv7DbFpKNUlva2UPCxKu2Y=
-github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY=
+github.com/go-openapi/spec v0.20.15 h1:8bDcVxF607pTh9NpPwgsH4J5Uhh5mV5XoWnkurdiY+U=
-github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk=
+github.com/go-openapi/spec v0.20.15/go.mod h1:o0upgqg5uYFG7O5mADrDVmSG3Wa6y6OLhwiCqQ+sTv4=
-github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
+github.com/go-openapi/swag v0.22.10 h1:4y86NVn7Z2yYd6pfS4Z+Nyh3aAUL3Nul+LMbhFKy0gA=
-github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
+github.com/go-openapi/swag v0.22.10/go.mod h1:Cnn8BYtRlx6BNE3DPN86f/xkapGIcLWzh3CLEb4C1jI=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/gofiber/contrib/jwt v1.0.8 h1:/GeOsm/Mr1OGr0GTy+RIVSz5VgNNyP3ZgK4wdqxF/WY=
 github.com/gofiber/contrib/jwt v1.0.8/go.mod h1:gWWBtBiLmKXRN7xy6a96QO0KGvPEyxdh8x496Ujtg84=
-github.com/gofiber/fiber/v2 v2.52.4 h1:P+T+4iK7VaqUsq2PALYEfBBo6bJZ4q3FP8cZ84EggTM=
+github.com/gofiber/fiber/v2 v2.52.2 h1:b0rYH6b06Df+4NyrbdptQL8ifuxw/Tf2DgfkZkDaxEo=
-github.com/gofiber/fiber/v2 v2.52.4/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ=
+github.com/gofiber/fiber/v2 v2.52.2/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ=
 github.com/gofiber/swagger v1.0.0 h1:BzUzDS9ZT6fDUa692kxmfOjc1DZiloLiPK/W5z1H1tc=
 github.com/gofiber/swagger v1.0.0/go.mod h1:QrYNF1Yrc7ggGK6ATsJ6yfH/8Zi5bu9lA7wB8TmCecg=
 github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
@@ -85,8 +85,8 @@ golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
 golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
 golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -94,26 +94,16 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-modernc.org/cc/v4 v4.20.0 h1:45Or8mQfbUqJOG9WaxvlFYOAQO0lQ5RvqBcFCXngjxk=
-modernc.org/cc/v4 v4.20.0/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ=
-modernc.org/ccgo/v4 v4.15.0 h1:uwfCZOkKhaNNotgYW7kxkJwrkQC1HfGitt/7ousudJE=
-modernc.org/ccgo/v4 v4.15.0/go.mod h1:XVITcYGiI+O97UNDLMsnZ9ZjJOhC+ACX+TfxpsWWyRc=
 modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
 modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
-modernc.org/gc/v2 v2.4.1 h1:9cNzOqPyMJBvrUipmynX0ZohMhcxPtMccYgGOJdOiBw=
+modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 h1:5D53IMaUuA5InSeMu9eJtlQXS2NxAhyWQvkKEgXZhHI=
-modernc.org/gc/v2 v2.4.1/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU=
+modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
-modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b h1:BnN1t+pb1cy61zbvSUV7SeI0PwosMhlAEi/vBY4qxp8=
+modernc.org/libc v1.41.0 h1:g9YAc6BkKlgORsUWj+JwqoB1wU3o4DE3bM3yvA3k+Gk=
-modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
+modernc.org/libc v1.41.0/go.mod h1:w0eszPsiXoOnoMJgrXjglgLuDy/bt5RR4y3QzUUeodY=
-modernc.org/libc v1.49.1 h1:r4UaWllkYXRPA7Mq/KzmassZBvNJiH9egF4O/KV/gdE=
-modernc.org/libc v1.49.1/go.mod h1:Hx2rWfza47GSzCluTU7Vf0Qx3z9rWCVORL6RNgq+Xog=
 modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
 modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
-modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E=
+modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
-modernc.org/memory v1.8.0/go.mod h1:XPZ936zp5OMKGWPqbD3JShgd/ZoQ7899TUuQqxY+peU=
+modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=
-modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
-modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc=
-modernc.org/sortutil v1.2.0/go.mod h1:TKU2s7kJMf1AE84OoiGppNHJwvB753OYfNl2WRb++Ss=
 modernc.org/sqlite v1.29.5 h1:8l/SQKAjDtZFo9lkJLdk8g9JEOeYRG4/ghStDCCTiTE=
 modernc.org/sqlite v1.29.5/go.mod h1:S02dvcmm7TnTRvGhv8IGYyLnIt7AS2KPaB1F/71p75U=
 modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=

backend/internal/database/db.go

@@ -2,12 +2,11 @@ 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"
 )
@@ -23,6 +22,8 @@ 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
@@ -40,19 +41,16 @@ 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.Tx
+	*sqlx.DB
 }
 
 type UserProjectMember struct {
@@ -94,19 +92,8 @@ 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) sqlx.DB {
+func DbConnect(dbpath string) Database {
 	// Open the database
 	db, err := sqlx.Connect("sqlite", dbpath)
 	if err != nil {
@@ -119,25 +106,7 @@ func DbConnect(dbpath string) sqlx.DB {
 		panic(err)
 	}
 
-	return *db
+	return &Db{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 {
@@ -241,15 +210,25 @@ 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 := d.Exec(projectInsert, name, description, username)
+	_, err := tx.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 = d.Exec(addUserToProject, username, name, "project_manager")
+	_, err = tx.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
 	}
 
@@ -257,7 +236,16 @@ func (d *Db) AddProject(name string, description string, username string) error
 }
 
 func (d *Db) DeleteProject(projectID string, username string) error {
-	_, err := d.Exec(deleteProject, projectID, username)
+	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)
+	}
 
 	return err
 }
@@ -384,36 +372,6 @@ 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 := `
@@ -481,7 +439,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 Migrate(db sqlx.DB) error {
+func (d *Db) Migrate() error {
 	// Read the embedded scripts directory
 	files, err := scripts.ReadDir("migrations")
 	if err != nil {
@@ -493,7 +451,7 @@ func Migrate(db sqlx.DB) error {
 		return nil
 	}
 
-	tr := db.MustBegin()
+	tr := d.MustBegin()
 
 	// Iterate over each SQL file and execute it
 	for _, file := range files {
@@ -579,7 +537,7 @@ func (d *Db) UpdateWeeklyReport(projectName string, userName string, week int, d
 }
 
 // MigrateSampleData applies sample data to the database.
-func MigrateSampleData(db sqlx.DB) error {
+func (d *Db) MigrateSampleData() error {
 	// Insert sample data
 	files, err := sampleData.ReadDir("sample_data")
 	if err != nil {
@@ -589,7 +547,7 @@ func MigrateSampleData(db sqlx.DB) error {
 	if len(files) == 0 {
 		println("No sample data files found")
 	}
-	tr := db.MustBegin()
+	tr := d.MustBegin()
 
 	// Iterate over each SQL file and execute it
 	for _, file := range files {
@@ -626,7 +584,7 @@ func (d *Db) GetProjectTimes(projectName string) (map[string]int, error) {
         WHERE projects.name = ?
     `
 
-	rows, err := d.Query(query, projectName)
+	rows, err := d.DB.Query(query, projectName)
 	if err != nil {
 		return nil, err
 	}
@@ -665,8 +623,3 @@ func (d *Db) GetUserName(id int) (string, error) {
 	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,13 +9,11 @@ import (
 // setupState initializes a database instance with necessary setup for testing
 func setupState() (Database, error) {
 	db := DbConnect(":memory:")
-	err := Migrate(db)
+	err := db.Migrate()
 	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.
@@ -585,94 +583,6 @@ 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()
@@ -1054,41 +964,3 @@ 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,28 +1,11 @@
 package database
 
-import (
+import "github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/log"
-	"github.com/jmoiron/sqlx"
-)
 
-// Simple middleware that provides a transaction as a local key "db"
+// Simple middleware that provides a shared database pool as a local key "db"
-func DbMiddleware(db *sqlx.DB) func(c *fiber.Ctx) error {
+func DbMiddleware(db *Database) func(c *fiber.Ctx) error {
 	return func(c *fiber.Ctx) error {
-		tx := db.MustBegin()
+		c.Locals("db", db)
-
-		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,10 +44,6 @@ 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

@@ -1,22 +0,0 @@
-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 || target_user == username) {
+	if pm == false && 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 || target_user == username) {
+	if pm == false && target_user != username {
 		log.Info("Unauthorized access")
 		return c.Status(403).SendString("Unauthorized access")
 	}

backend/internal/handlers/reports/Statistics.go

@@ -1,50 +0,0 @@
-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

@@ -1,41 +0,0 @@
-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/types/WeeklyReport.go

@@ -66,15 +66,6 @@ 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"`

backend/main.go

@@ -59,13 +59,13 @@ func main() {
 	db := database.DbConnect(conf.DbPath)
 
 	// Migrate the database
-	if err = database.Migrate(db); err != nil {
+	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 = database.MigrateSampleData(db); err != nil {
+	if err = db.MigrateSampleData(); err != nil {
 		fmt.Println("Error migrating sample data: ", err)
 		os.Exit(1)
 	}
@@ -131,12 +131,9 @@ func main() {
 	api.Get("/getWeeklyReport", reports.GetWeeklyReport)
 	api.Get("/getUnsignedReports/:projectName", reports.GetUnsignedReports)
 	api.Get("/getAllWeeklyReports/:projectName", reports.GetAllWeeklyReports)
-	api.Get("/getStatistics", reports.GetStatistics)
 	api.Post("/submitWeeklyReport", reports.SubmitWeeklyReport)
 	api.Put("/signReport/:reportId", reports.SignReport)
 	api.Put("/updateWeeklyReport", reports.UpdateWeeklyReport)
-	api.Put("/unsignReport/:reportId", reports.UnsignReport)
-	api.Delete("/deleteReport/:reportId", reports.DeleteReport)
 
 	// Announce the port we are listening on and start the server
 	err = server.Listen(fmt.Sprintf(":%d", conf.Port))

frontend/src/API/API.ts

@@ -11,7 +11,6 @@ import {
   NewProject,
   WeeklyReport,
   StrNameChange,
-  Statistics,
 } from "../Types/goTypes";
 
 /**
@@ -222,15 +221,6 @@ interface API {
    */
   signReport(reportId: number, token: string): Promise<APIResponse<string>>;
 
-  /**
-   * Unsigns 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
-   */
-  unsignReport(reportId: number, token: string): Promise<APIResponse<string>>;
-
   /**
    * Promotes a user to project manager within a project.
    *
@@ -249,27 +239,6 @@ interface API {
    * @param {string} token Your token
    */
   getUsername(id: number, token: string): Promise<APIResponse<string>>;
-
-  /**
-   * Deletes a WeeklyReport from the database
-   * @param {number} reportId The id of the report to delete
-   * @param {string} token The authentication token
-   */
-  deleteWeeklyReport(
-    reportId: number,
-    token: string,
-  ): Promise<APIResponse<string>>;
-
-  /**
-   * Retrieves the total time spent on a project for a particular user (the user is determined by the token)
-   *
-   * @param {string} projectName The name of the project
-   * @param {string} token The authentication token
-   */
-  getStatistics(
-    projectName: string,
-    token: string,
-  ): Promise<APIResponse<Statistics>>;
 }
 
 /** An instance of the API */
@@ -877,29 +846,6 @@ export const api: API = {
     }
   },
 
-  async unsignReport(
-    reportId: number,
-    token: string,
-  ): Promise<APIResponse<string>> {
-    try {
-      const response = await fetch(`/api/unsignReport/${reportId}`, {
-        method: "PUT",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
-        },
-      });
-
-      if (!response.ok) {
-        return { success: false, message: "Failed to unsign report" };
-      } else {
-        return { success: true, message: "Report unsigned" };
-      }
-    } catch (e) {
-      return { success: false, message: "Failed to unsign report" };
-    }
-  },
-
   async promoteToPm(
     userName: string,
     projectName: string,
@@ -951,53 +897,4 @@ export const api: API = {
       return { success: false, message: "Failed to get username" };
     }
   },
-
-  async deleteWeeklyReport(
-    reportId: number,
-    token: string,
-  ): Promise<APIResponse<string>> {
-    try {
-      const response = await fetch(`/api/deleteReport/${reportId}`, {
-        method: "DELETE",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
-        },
-      });
-
-      if (!response.ok) {
-        return { success: false, message: "Failed to delete report" };
-      } else {
-        return { success: true, message: "Report deleted" };
-      }
-    } catch (e) {
-      return { success: false, message: "Failed to delete report" };
-    }
-  },
-  async getStatistics(
-    token: string,
-    projectName: string,
-  ): Promise<APIResponse<Statistics>> {
-    try {
-      const response = await fetch(
-        `/api/getStatistics/?projectName=${projectName}`,
-        {
-          method: "GET",
-          headers: {
-            "Content-Type": "application/json",
-            Authorization: "Bearer " + token,
-          },
-        },
-      );
-
-      if (!response.ok) {
-        return { success: false, message: "Failed to get statistics" };
-      } else {
-        const data = (await response.json()) as Statistics;
-        return { success: true, data };
-      }
-    } catch (e) {
-      return { success: false, message: "Failed to get statistics" };
-    }
-  },
 };

frontend/src/Components/AllTimeReportsInProjectOtherUser.tsx

@@ -60,7 +60,7 @@ function AllTimeReportsInProject(): JSX.Element {
               </h1>
               <h1>
                 <span className="font-bold">{"Signed: "}</span>
-                {newWeeklyReport.signedBy ? "YES" : "NO"}
+                NO
               </h1>
             </div>
           </Link>

frontend/src/Types/goTypes.ts

@@ -124,14 +124,6 @@ export interface WeeklyReport {
    */
   signedBy?: number /* int */;
 }
-export interface Statistics {
-  totalDevelopmentTime: number /* int */;
-  totalMeetingTime: number /* int */;
-  totalAdminTime: number /* int */;
-  totalOwnWorkTime: number /* int */;
-  totalStudyTime: number /* int */;
-  totalTestingTime: number /* int */;
-}
 export interface UpdateWeeklyReport {
   /**
    * The name of the project, as it appears in the database

testing/helpers.py

@@ -34,11 +34,8 @@ getChangeUserNamePath = base_url + "/api/changeUserName"
 getUpdateWeeklyReportPath = base_url + "/api/updateWeeklyReport"
 removeProjectPath = base_url + "/api/removeProject"
 promoteToPmPath = base_url + "/api/promoteToPm"
-unsignReportPath = base_url + "/api/unsignReport"
-deleteReportPath = base_url + "/api/deleteReport"
-getStatisticsPath = base_url + "/api/getStatistics"
 
-debug_output = False
+debug_output = True
 
 
 def gprint(*args, **kwargs):
@@ -152,22 +149,3 @@ def signReport(project_manager_token: string, report_id: int):
         signReportPath + "/" + str(report_id),
         headers={"Authorization": "Bearer " + project_manager_token},
     )
-
-def unsignReport(project_manager_token: string, report_id: int):
-    return requests.put(
-        unsignReportPath + "/" + str(report_id),
-        headers={"Authorization": "Bearer " + project_manager_token},
-    )
-
-def deleteReport(report_id: int):
-    return requests.delete(
-        deleteReportPath + "/" + str(report_id),
-    )
-
-def getStatistics(token: string, projectName: string):
-    response = requests.get(
-        getStatisticsPath,
-        headers = {"Authorization": "Bearer " + token},
-        params={"projectName": projectName}
-    )
-    return response.json()

testing/testing.py

@@ -215,72 +215,6 @@ def test_sign_report():
     assert report_id != None, "Get report failed"
     gprint("test_sign_report successful")
 
-# Test function to unsign a report
-def test_unsign_report():
-    # Pm user
-    pm_username = "pm" + randomString()
-    pm_password = "admin_password2"
-
-    # User to add
-    member_user = "member" + randomString()
-    member_passwd = "password"
-
-    # Name of the project to be created
-    project_name = "project" + randomString()
-
-    # Register and get the tokens for both users
-    pm_token = register_and_login(pm_username, pm_password)
-    member_token = register_and_login(member_user, member_passwd)
-
-    # Create the project
-    response = create_project(pm_token, project_name)
-    assert response.status_code == 200, "Create project failed"
-
-    # Add the user to the project
-    response = addToProject(pm_token, member_user, project_name)
-
-    # Submit a report for the project
-    response = submitReport(
-        member_token,
-        {
-            "projectName": project_name,
-            "week": 1,
-            "developmentTime": 10,
-            "meetingTime": 5,
-            "adminTime": 5,
-            "ownWorkTime": 10,
-            "studyTime": 10,
-            "testingTime": 10,
-        },
-    )
-    assert response.status_code == 200, "Submit report failed"
-
-    # Retrieve the report ID
-    report_id = getReport(member_token, member_user, project_name)["reportId"]
-
-    # Sign the report as the project manager
-    response = signReport(pm_token, report_id)
-    assert response.status_code == 200, "Sign report failed"
-    dprint("Sign  report successful")
-
-    # Retrieve the report ID again for confirmation
-    report = getReport(member_token, member_user, project_name)
-    dprint(report)
-    report_id = report["reportId"]
-    assert report_id != None, "Get report failed"
-
-    # Unsign the report as the project manager
-    response = unsignReport(pm_token, report_id)
-    assert response.status_code == 200, "Unsign report failed"
-    dprint("Unsign report successful")
-
-    # Retrieve the report ID again for confirmation
-    report = getReport(member_token, member_user, project_name)
-    assert report_id != None, "Get report failed"
-    dprint(report)
-    assert report["signedBy"] == None, "Report was not unsigned"
-    gprint("test_unsign_report successful")
-
 
 # Test function to get weekly reports for a user in a project
 def test_get_all_weekly_reports():
@@ -561,115 +495,8 @@ def test_promote_to_manager():
     response = promoteToManager(pm_token, member_user, project_name)
     assert response.status_code == 200, "Promote to manager failed"
 
-def test_delete_report():
-    # Create admin
-    admin_username = randomString()
-    admin_password = "admin_password2"
-    dprint(
-        "Registering with username: ", admin_username, " and password: ", admin_password
-    )
-    response = requests.post(
-        registerPath, json={"username": admin_username, "password": admin_password}
-    )
-    dprint(response.text)
-
-    # Log in as the admin
-    admin_token = login(admin_username, admin_password).json()["token"]
-    response = requests.post(
-        promoteToAdminPath,
-        json={"username": admin_username},
-        headers={"Authorization": "Bearer " + admin_token},
-    )
-
-    # Create a new project
-    new_project = randomString()
-    response = requests.post(
-        addProjectPath,
-        json={"name": new_project, "description": "This is a project"},
-        headers={"Authorization": "Bearer " + admin_token},
-    )
-    assert response.status_code == 200, "Add project failed"
-
-    # Create a new report
-    new_report = {
-        "projectName": new_project,
-        "week": 1,
-        "developmentTime": 10,
-        "meetingTime": 5,
-        "adminTime": 5,
-        "ownWorkTime": 10,
-        "studyTime": 10,
-        "testingTime": 10,
-    }
-    response = submitReport(admin_token, new_report);
-    assert response.status_code == 200, "Submit report failed"
-
-    # Get the report ID
-    report_id = getReport(admin_token, admin_username, new_project)["reportId"]
-    assert report_id != None, "Get report failed"
-
-    # Delete the report
-    response = requests.delete(
-        deleteReportPath + "/" + str(report_id),
-        headers={"Authorization": "Bearer " + admin_token},
-    )
-    assert response.status_code == 200, "Delete report failed"
-
-    # Check if the report was deleted
-    response = requests.get(
-        getWeeklyReportPath,
-        headers={"Authorization": "Bearer " + admin_token},
-        params={"username": admin_username, "projectName": new_project, "week": 1},
-    )
-    assert response.status_code == 500, "Report was not deleted"
-        
-    gprint("test_delete_report successful")
-
-def test_get_statistics():
-    # Create admin
-    admin_username = randomString()
-    admin_password = randomString()
-
-    project_name = "project" + randomString()
-
-    token = register_and_login(admin_username, admin_password)
-
-    response = create_project(token, project_name)
-    assert response.status_code == 200, "Create project failed"
-
-    response = submitReport(token, {
-        "projectName": project_name,
-        "week": 1,
-        "developmentTime": 10,
-        "meetingTime": 5,
-        "adminTime": 5,
-        "ownWorkTime": 10,
-        "studyTime": 10,
-        "testingTime": 10,
-    })
-
-    response = submitReport(token, {
-        "projectName": project_name,
-        "week": 2,
-        "developmentTime": 10,
-        "meetingTime": 5,
-        "adminTime": 5,
-        "ownWorkTime": 10,
-        "studyTime": 10,
-        "testingTime": 10,
-    })
-
-    assert response.status_code == 200, "Submit report failed"
-
-    stats = getStatistics(token, project_name)
-
-    assert stats["totalDevelopmentTime"] == 20, "Total development time is not correct"
-    gprint("test_get_statistics successful")
-
 
 if __name__ == "__main__":
-    test_delete_report()
-    test_unsign_report()
     test_promote_to_manager()
     test_remove_project()
     test_get_user_projects()
@@ -690,4 +517,3 @@ if __name__ == "__main__":
     test_change_user_name()
     test_update_weekly_report()
     test_get_other_users_report_as_pm()
-    test_get_statistics()