Merge pull request #27 from RewanshChoudhary/master

Removed repeated team ban routes from admin

Author: Soham-Maha

.env.save

@@ -0,0 +1 @@
+

cmd/api/main.go

@@ -42,7 +42,7 @@ func main() {
 			"status": "devsoc-backend-26 running",
 		})
 	})
-
+  utils.InitValidator()
 	e.Use(middlewares.RequestLogger)
 	router.RegisterRoute(e)
 

database/queries/teams.sql

@@ -33,3 +33,12 @@ SET name = $1,
     is_banned = $4,
     total_score = $5
 WHERE id = $6;
+
+
+
+-- name: GetTeamByTrack :many
+SELECT t.id, t.name, t.team_size, t.round_qualified, t.code, t.is_banned, i.title, i.description, i.track
+FROM teams t
+LEFT JOIN ideas i ON i.team_id = t.id
+WHERE i.track = $1;
+

database/queries/users.sql

@@ -33,8 +33,78 @@ SELECT id
 FROM users
 WHERE email = $1;
 
+-- name: GetAllUsers :many
+SELECT
+  u.id,
+  u.team_id,
+  u.name,
+  u.email,
+  u.phone_no,
+  u.reg_no,
+  u.gender,
+  u.hostel_block,
+  u.room_no,
+  u.github_profile,
+  u.role,
+  u.is_leader,
+  u.is_verified,
+  u.is_banned,
+  u.is_profile_complete,
+  t.round_qualified
+FROM users u
+JOIN teams t
+  ON t.id = u.team_id
+WHERE (
+      $1 = ''
+   OR u.name ILIKE '%' || $1 || '%'
+   OR u.reg_no ILIKE '%' || $1 || '%'
+   OR u.email ILIKE '%' || $1 || '%'
+)
+AND (
+      $2::uuid IS NULL
+   OR u.id > $2
+)
+AND (
+      $4 = ''
+   OR u.gender = $4
+)
+ORDER BY u.id
+LIMIT $3;
+
+-- name: GetUsersByGender :many
+SELECT * FROM users WHERE gender = $1;
+
+-- name: GetUsersByTeamId :many
+SELECT
+  name,
+  email,
+  reg_no,
+  phone_no,
+  hostel_block
+FROM users
+WHERE team_id = $1::uuid;
+
+-- name: GetUserByEmail :one
+SELECT * FROM users WHERE email = $1;
+
 -- name: GetTeamIDByEmail :one
 SELECT team_id
 FROM users
 WHERE email = $1;
 
+-- name: GetTeamLeaderByID :one
+SELECT *
+FROM users
+WHERE team_id = $1::uuid
+  AND is_leader = true;
+
+-- name: BanUser :exec
+UPDATE users
+SET is_banned = TRUE
+WHERE email = $1;
+
+-- name: UnbanUser :exec
+UPDATE users
+SET is_banned = FALSE
+WHERE email = $1;
+

go.mod

@@ -43,5 +43,4 @@ require (
 	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/sys v0.39.0 // indirect
 	golang.org/x/text v0.32.0 // indirect
-	golang.org/x/time v0.11.0 // indirect
 )

go.sum

@@ -89,8 +89,6 @@ golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
 golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
 golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
-golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
-golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=