From 57e969a5626511cb88bc897e23e4fc3e7a143290 Mon Sep 17 00:00:00 2001 From: al8763be Date: Tue, 9 Apr 2024 22:17:50 +0200 Subject: [PATCH 1/2] Test for UnsignReport --- backend/internal/handlers/reports/UnsignReport.go | 2 +- testing/testing.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/backend/internal/handlers/reports/UnsignReport.go b/backend/internal/handlers/reports/UnsignReport.go index ea0f480..45943de 100644 --- a/backend/internal/handlers/reports/UnsignReport.go +++ b/backend/internal/handlers/reports/UnsignReport.go @@ -36,6 +36,6 @@ func UnsignReport(c *fiber.Ctx) error { return c.Status(500).SendString(err.Error()) } - log.Info("Project manager ID: ", projectManagerID, " signed report ID: ", reportId) + log.Info("Project manager ID: ", projectManagerID, " unsigned report ID: ", reportId) return c.Status(200).SendString("Weekly report unsigned successfully") } diff --git a/testing/testing.py b/testing/testing.py index 5eedc28..b01aa4c 100644 --- a/testing/testing.py +++ b/testing/testing.py @@ -264,7 +264,9 @@ def test_unsign_report(): dprint("Sign report successful") # Retrieve the report ID again for confirmation - report_id = getReport(member_token, member_user, project_name)["reportId"] + 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 @@ -273,8 +275,10 @@ def test_unsign_report(): dprint("Unsign report successful") # Retrieve the report ID again for confirmation - report_id = getReport(member_token, member_user, project_name)["reportId"] + report = getReport(member_token, member_user, project_name) assert report_id != None, "Get report failed" + dprint(report) + assert report["signed_by"] == None, "Report was not unsigned" gprint("test_unsign_report successful") From 2d2b63938ca884a19060c58ef651e2ac823f8179 Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Sat, 13 Apr 2024 09:36:34 +0200 Subject: [PATCH 2/2] Fix unsign --- backend/internal/database/db.go | 2 +- testing/testing.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/internal/database/db.go b/backend/internal/database/db.go index b5170b3..9a92b80 100644 --- a/backend/internal/database/db.go +++ b/backend/internal/database/db.go @@ -400,7 +400,7 @@ func (d *Db) UnsignWeeklyReport(reportId int, projectManagerId int) error { } // Update the signed_by field of the specified report - _, err = d.Exec("UPDATE weekly_reports SET signed_by = NULL WHERE report_id = ?;", projectManagerId, reportId) + _, err = d.Exec("UPDATE weekly_reports SET signed_by = NULL WHERE report_id = ?;", reportId) return err } diff --git a/testing/testing.py b/testing/testing.py index b01aa4c..a68124a 100644 --- a/testing/testing.py +++ b/testing/testing.py @@ -278,7 +278,7 @@ def test_unsign_report(): report = getReport(member_token, member_user, project_name) assert report_id != None, "Get report failed" dprint(report) - assert report["signed_by"] == None, "Report was not unsigned" + assert report["signedBy"] == None, "Report was not unsigned" gprint("test_unsign_report successful")