From cead29da4c38258e7037dfc87bc723faf3402d19 Mon Sep 17 00:00:00 2001 From: Killerrekt Date: Sun, 17 Mar 2024 11:03:25 +0530 Subject: [PATCH 1/8] changed status code for if user try to create idea when not in a team --- internal/controllers/idea_controller.go | 2 +- internal/controllers/project_controller.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/controllers/idea_controller.go b/internal/controllers/idea_controller.go index e8b22c1..5ecd194 100644 --- a/internal/controllers/idea_controller.go +++ b/internal/controllers/idea_controller.go @@ -73,7 +73,7 @@ func CreateIdea(ctx echo.Context) error { user := ctx.Get("user").(*models.User) if user.TeamID == uuid.Nil { - return ctx.JSON(http.StatusForbidden, map[string]string{ + return ctx.JSON(http.StatusConflict, map[string]string{ "message": "user is not in a team", "status": "fail", }) diff --git a/internal/controllers/project_controller.go b/internal/controllers/project_controller.go index c30ae68..a52621a 100644 --- a/internal/controllers/project_controller.go +++ b/internal/controllers/project_controller.go @@ -72,7 +72,7 @@ func CreateProject(ctx echo.Context) error { user := ctx.Get("user").(*models.User) if user.TeamID == uuid.Nil { - return ctx.JSON(http.StatusForbidden, map[string]string{ + return ctx.JSON(http.StatusConflict, map[string]string{ "message": "user is not in a team", "status": "fail", }) From 12d64e14eb8e238329483288d1a787cdd2fa2d06 Mon Sep 17 00:00:00 2001 From: Killerrekt Date: Sun, 17 Mar 2024 11:12:52 +0530 Subject: [PATCH 2/8] Change in status code in update routes --- internal/controllers/idea_controller.go | 2 +- internal/controllers/project_controller.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/controllers/idea_controller.go b/internal/controllers/idea_controller.go index 5ecd194..e8b22c1 100644 --- a/internal/controllers/idea_controller.go +++ b/internal/controllers/idea_controller.go @@ -73,7 +73,7 @@ func CreateIdea(ctx echo.Context) error { user := ctx.Get("user").(*models.User) if user.TeamID == uuid.Nil { - return ctx.JSON(http.StatusConflict, map[string]string{ + return ctx.JSON(http.StatusForbidden, map[string]string{ "message": "user is not in a team", "status": "fail", }) diff --git a/internal/controllers/project_controller.go b/internal/controllers/project_controller.go index a52621a..ecfeebf 100644 --- a/internal/controllers/project_controller.go +++ b/internal/controllers/project_controller.go @@ -72,7 +72,7 @@ func CreateProject(ctx echo.Context) error { user := ctx.Get("user").(*models.User) if user.TeamID == uuid.Nil { - return ctx.JSON(http.StatusConflict, map[string]string{ + return ctx.JSON(http.StatusForbidden, map[string]string{ "message": "user is not in a team", "status": "fail", }) @@ -135,7 +135,7 @@ func UpdateProject(ctx echo.Context) error { user := ctx.Get("user").(*models.User) if !user.IsLeader { - return ctx.JSON(http.StatusUnauthorized, map[string]string{ + return ctx.JSON(http.StatusConflict, map[string]string{ "message": "user is not a leader", "status": "fail", }) From e979be0cb434f692f6504c4605a62cc5ae7e9ea5 Mon Sep 17 00:00:00 2001 From: Killerrekt Date: Sun, 17 Mar 2024 11:14:31 +0530 Subject: [PATCH 3/8] change in status code --- internal/controllers/idea_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/controllers/idea_controller.go b/internal/controllers/idea_controller.go index e8b22c1..8a09f6c 100644 --- a/internal/controllers/idea_controller.go +++ b/internal/controllers/idea_controller.go @@ -142,7 +142,7 @@ func UpdateIdea(ctx echo.Context) error { } if !user.IsLeader { - return ctx.JSON(http.StatusUnauthorized, map[string]string{ + return ctx.JSON(http.StatusConflict, map[string]string{ "message": "user is not a leader", "status": "fail", }) From 2e9580890171911d736f2d9e1dbf7cd2e424bc73 Mon Sep 17 00:00:00 2001 From: Killerrekt Date: Sun, 17 Mar 2024 11:25:52 +0530 Subject: [PATCH 4/8] pls reflect the status code changes --- internal/controllers/idea_controller.go | 2 +- internal/controllers/project_controller.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/controllers/idea_controller.go b/internal/controllers/idea_controller.go index 8a09f6c..002c876 100644 --- a/internal/controllers/idea_controller.go +++ b/internal/controllers/idea_controller.go @@ -142,7 +142,7 @@ func UpdateIdea(ctx echo.Context) error { } if !user.IsLeader { - return ctx.JSON(http.StatusConflict, map[string]string{ + return ctx.JSON(http.StatusForbidden, map[string]string{ "message": "user is not a leader", "status": "fail", }) diff --git a/internal/controllers/project_controller.go b/internal/controllers/project_controller.go index ecfeebf..e49da9f 100644 --- a/internal/controllers/project_controller.go +++ b/internal/controllers/project_controller.go @@ -72,7 +72,7 @@ func CreateProject(ctx echo.Context) error { user := ctx.Get("user").(*models.User) if user.TeamID == uuid.Nil { - return ctx.JSON(http.StatusForbidden, map[string]string{ + return ctx.JSON(http.StatusConflict, map[string]string{ "message": "user is not in a team", "status": "fail", }) From c1fd5c5b484983eb9c112fb5669bc0f34864ef4b Mon Sep 17 00:00:00 2001 From: Killerrekt Date: Sun, 17 Mar 2024 11:31:42 +0530 Subject: [PATCH 5/8] merge fixes --- internal/controllers/admin_teams_controller.go | 4 ++-- internal/routes/admin_routes.go | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/controllers/admin_teams_controller.go b/internal/controllers/admin_teams_controller.go index f691d67..2ddf81f 100644 --- a/internal/controllers/admin_teams_controller.go +++ b/internal/controllers/admin_teams_controller.go @@ -189,7 +189,7 @@ func GetTeamLeader(ctx echo.Context) error { } -func GetAllFresherTeams(ctx echo.Context) error { +/*func GetAllFresherTeams(ctx echo.Context) error { team, err := teamService.GetAllFresherTeam() if err != nil { return ctx.JSON(http.StatusBadRequest, map[string]string{ @@ -219,4 +219,4 @@ func GetAllFemaleTeams(ctx echo.Context) error { "data": team, "status": "true", }) -} +}*/ diff --git a/internal/routes/admin_routes.go b/internal/routes/admin_routes.go index b486f23..4f32b69 100644 --- a/internal/routes/admin_routes.go +++ b/internal/routes/admin_routes.go @@ -2,6 +2,7 @@ package routes import ( "github.com/CodeChefVIT/devsoc-backend-24/internal/controllers" + "github.com/CodeChefVIT/devsoc-backend-24/internal/middleware" "github.com/labstack/echo/v4" ) @@ -29,6 +30,6 @@ func AdminRoutes(incomingRoutes *echo.Echo) { admin.GET("/projects/all", controllers.GetAllProject) admin.GET("/ideas/all", controllers.GetAllIdeas) - admin.GET("/team/freshers", controllers.GetAllFresherTeams) - admin.GET("/team/females", controllers.GetAllFemaleTeams) + //admin.GET("/team/freshers", controllers.GetAllFresherTeams) + //admin.GET("/team/females", controllers.GetAllFemaleTeams) } From 607c062bbdbc3dac7168beea7f52e5830bf1601d Mon Sep 17 00:00:00 2001 From: Killerrekt Date: Sun, 17 Mar 2024 11:39:02 +0530 Subject: [PATCH 6/8] please reflect for the love of god --- internal/controllers/project_controller.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/controllers/project_controller.go b/internal/controllers/project_controller.go index e49da9f..e660a3a 100644 --- a/internal/controllers/project_controller.go +++ b/internal/controllers/project_controller.go @@ -135,14 +135,14 @@ func UpdateProject(ctx echo.Context) error { user := ctx.Get("user").(*models.User) if !user.IsLeader { - return ctx.JSON(http.StatusConflict, map[string]string{ + return ctx.JSON(http.StatusForbidden, map[string]string{ "message": "user is not a leader", "status": "fail", }) } if user.TeamID == uuid.Nil { - return ctx.JSON(http.StatusForbidden, map[string]string{ + return ctx.JSON(http.StatusConflict, map[string]string{ "message": "The user is not in a team", "status": "fail", }) From 76ac9fefb50f19a622668bbcc915a418825bf4f5 Mon Sep 17 00:00:00 2001 From: Killerrekt Date: Sun, 17 Mar 2024 11:52:49 +0530 Subject: [PATCH 7/8] pls fix the status code :'( --- docker-compose.yml | 3 +-- internal/controllers/idea_controller.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index fbdd6a9..4d2bc10 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,5 @@ version: '3' services: - api: build: . ports: @@ -9,4 +8,4 @@ services: - .:/app env_file: - .env - restart: on-failure + restart: on-failure \ No newline at end of file diff --git a/internal/controllers/idea_controller.go b/internal/controllers/idea_controller.go index 002c876..b032264 100644 --- a/internal/controllers/idea_controller.go +++ b/internal/controllers/idea_controller.go @@ -73,7 +73,7 @@ func CreateIdea(ctx echo.Context) error { user := ctx.Get("user").(*models.User) if user.TeamID == uuid.Nil { - return ctx.JSON(http.StatusForbidden, map[string]string{ + return ctx.JSON(http.StatusConflict, map[string]string{ "message": "user is not in a team", "status": "fail", }) From 3396d372db28866e7402ffe7411d62b00949291b Mon Sep 17 00:00:00 2001 From: Killerrekt Date: Sun, 17 Mar 2024 11:57:49 +0530 Subject: [PATCH 8/8] don't know what vedant fixed --- docker-compose.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1744ba8..fbdd6a9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,6 @@ version: '3' services: + api: build: . ports: @@ -8,8 +9,4 @@ services: - .:/app env_file: - .env -<<<<<<< HEAD restart: on-failure -======= - restart: on-failure ->>>>>>> 726a9f37c180e1133236d65c47932deaa201ba2b