From 9070846b0bbf6bdc12a42f3ae1bb01a282ee0e91 Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Sun, 17 Mar 2024 23:17:06 +0100 Subject: [PATCH] Fixing getWeeklyReport tests --- backend/internal/handlers/handlers_report_related.go | 3 --- backend/main.go | 1 + testing.py | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/backend/internal/handlers/handlers_report_related.go b/backend/internal/handlers/handlers_report_related.go index 79da61a..506225b 100644 --- a/backend/internal/handlers/handlers_report_related.go +++ b/backend/internal/handlers/handlers_report_related.go @@ -39,11 +39,8 @@ func (gs *GState) GetWeeklyReport(c *fiber.Ctx) error { // Extract the necessary parameters from the request println("GetWeeklyReport") user := c.Locals("user").(*jwt.Token) - println(user) claims := user.Claims.(jwt.MapClaims) - println(claims) username := claims["name"].(string) - println(username) // Extract project name and week from query parameters projectName := c.Query("projectName") diff --git a/backend/main.go b/backend/main.go index 7f0f81e..bc33942 100644 --- a/backend/main.go +++ b/backend/main.go @@ -78,6 +78,7 @@ func main() { server.Post("/api/loginrenew", gs.LoginRenew) server.Delete("/api/userdelete/:username", gs.UserDelete) // Perhaps just use POST to avoid headaches server.Post("/api/project", gs.CreateProject) + server.Get("/api/getWeeklyReport", gs.GetWeeklyReport) // Announce the port we are listening on and start the server err = server.Listen(fmt.Sprintf(":%d", conf.Port)) diff --git a/testing.py b/testing.py index d75d0f2..38d09cc 100644 --- a/testing.py +++ b/testing.py @@ -75,7 +75,7 @@ def test_submit_report(): response = requests.post( submitReportPath, json={ - "projectName": "report1", + "projectName": projectName, "week": 1, "developmentTime": 10, "meetingTime": 5, @@ -95,7 +95,7 @@ def test_get_weekly_report(): response = requests.get( getWeeklyReportPath, headers={"Authorization": "Bearer " + token}, - params={"username": username, "projectName": "report1", "week": 1} + params={"username": username, "projectName": projectName , "week": 1} ) print(response.text)