Added GetWeeklyReportsUser function and handler, also corresponding tests to both GetWeeklyReportsUser and handler added
This commit is contained in:
parent
2f3730ca90
commit
2b41085865
7 changed files with 131 additions and 0 deletions
|
@ -32,6 +32,7 @@ type Database interface {
|
|||
GetProject(projectId int) (types.Project, error)
|
||||
GetUserRole(username string, projectname string) (string, error)
|
||||
GetWeeklyReport(username string, projectName string, week int) (types.WeeklyReport, error)
|
||||
GetWeeklyReportsUser(username string, projectname string) ([]types.WeeklyReportList, error)
|
||||
SignWeeklyReport(reportId int, projectManagerId int) error
|
||||
IsSiteAdmin(username string) (bool, error)
|
||||
}
|
||||
|
@ -402,6 +403,36 @@ func (d *Db) Migrate() error {
|
|||
return nil
|
||||
}
|
||||
|
||||
// GetWeeklyReportsUser retrieves weekly reports for a specific user and project.
|
||||
func (d *Db) GetWeeklyReportsUser(username string, projectName string) ([]types.WeeklyReportList, error) {
|
||||
query := `
|
||||
SELECT
|
||||
wr.week,
|
||||
wr.development_time,
|
||||
wr.meeting_time,
|
||||
wr.admin_time,
|
||||
wr.own_work_time,
|
||||
wr.study_time,
|
||||
wr.testing_time,
|
||||
wr.signed_by
|
||||
FROM
|
||||
weekly_reports wr
|
||||
INNER JOIN
|
||||
users u ON wr.user_id = u.id
|
||||
INNER JOIN
|
||||
projects p ON wr.project_id = p.id
|
||||
WHERE
|
||||
u.username = ? AND p.name = ?
|
||||
`
|
||||
|
||||
var reports []types.WeeklyReportList
|
||||
if err := d.Select(&reports, query, username, projectName); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return reports, nil
|
||||
}
|
||||
|
||||
// MigrateSampleData applies sample data to the database.
|
||||
func (d *Db) MigrateSampleData() error {
|
||||
// Insert sample data
|
||||
|
|
|
@ -566,3 +566,42 @@ func TestGetProject(t *testing.T) {
|
|||
t.Errorf("Expected Name to be testproject, got %s", project.Name)
|
||||
}
|
||||
}
|
||||
|
||||
func TestGetWeeklyReportsUser(t *testing.T) {
|
||||
db, err := setupState()
|
||||
if err != nil {
|
||||
t.Error("setupState failed:", err)
|
||||
}
|
||||
|
||||
err = db.AddUser("testuser", "password")
|
||||
if err != nil {
|
||||
t.Error("AddUser failed:", err)
|
||||
}
|
||||
|
||||
err = db.AddProject("testproject", "description", "testuser")
|
||||
if err != nil {
|
||||
t.Error("AddProject failed:", err)
|
||||
}
|
||||
|
||||
err = db.AddWeeklyReport("testproject", "testuser", 1, 1, 1, 1, 1, 1, 1)
|
||||
if err != nil {
|
||||
t.Error("AddWeeklyReport failed:", err)
|
||||
}
|
||||
|
||||
err = db.AddWeeklyReport("testproject", "testuser", 2, 1, 1, 1, 1, 1, 1)
|
||||
if err != nil {
|
||||
t.Error("AddWeeklyReport failed:", err)
|
||||
}
|
||||
|
||||
reports, err := db.GetWeeklyReportsUser("testuser", "testproject")
|
||||
if err != nil {
|
||||
t.Error("GetWeeklyReportsUser failed:", err)
|
||||
}
|
||||
|
||||
// Check if the retrieved reports match the expected values
|
||||
if len(reports) != 2 {
|
||||
t.Errorf("Expected 1 report, got %d", len(reports))
|
||||
}
|
||||
|
||||
// You can add further checks here if needed
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue