Merge pull request #60 from ABHINAVGARG05/master

updated leave team

Author: Abh1noob

database/queries/teams.sql

@@ -100,7 +100,7 @@ From users
 where team_id = $1;
 
 -- name: BanTeam :exec
-UPDATE teams
+UPDATE users
 SET is_banned = TRUE
 WHERE id = $1;
 

database/schema/002_teams.sql

@@ -5,7 +5,6 @@ CREATE TABLE teams (
     number_of_people INTEGER NOT NULL,
     round_qualified INTEGER DEFAULT 0,
     code TEXT UNIQUE NOT NULL,
-    is_banned BOOLEAN NOT NULL,
     PRIMARY KEY (id)
 );
 

pkg/controller/team.go

@@ -61,7 +61,7 @@ func JoinTeam(c echo.Context) error {
 	}
 
 	user := c.Get("user").(db.User)
-	// fmt.Println(user)  -- For testing
+	fmt.Println(user)  
 
 	member, err := utils.Queries.GetUser(ctx, user.ID)
 	fmt.Println(member.TeamID)
@@ -73,6 +73,7 @@ func JoinTeam(c echo.Context) error {
 	}
 
 	team, err := utils.Queries.FindTeam(ctx, payload.Code)
+	fmt.Println(team)
 
 	if err != nil {
 		if errors.Is(err, context.Canceled) {
@@ -346,7 +347,7 @@ func LeaveTeam(c echo.Context) error {
 		})
 	}
 
-	member, err := utils.Queries.GetUser(ctx, user.ID)
+	member, err := utils.Queries.GetUserByEmail(ctx, user.Email)
 
 	if member.TeamID.UUID == uuid.Nil {
 		return c.JSON(http.StatusBadRequest, models.Response{
@@ -436,7 +437,7 @@ func LeaveTeam(c echo.Context) error {
 		})
 	}
 
-	if err := utils.Queries.LeaveTeam(ctx, payload.UserID); err != nil {
+	if err := utils.Queries.LeaveTeam(ctx, user.ID); err != nil {
 		return c.JSON(http.StatusBadRequest, models.Response{
 			Status: "fail",
 			Data:   err,

pkg/middleware/jwt.go

@@ -3,7 +3,6 @@ package middleware
 import (
 	"fmt"
 	"net/http"
-	"os"
 
 	logger "github.com/CodeChefVIT/devsoc-be-24/pkg/logging"
 	"github.com/CodeChefVIT/devsoc-be-24/pkg/models"
@@ -17,13 +16,13 @@ import (
 
 func Protected() echo.MiddlewareFunc {
 	return echojwt.WithConfig(echojwt.Config{
-		SigningKey: []byte(os.Getenv("JWT_SECRET")),
+		SigningKey: []byte(utils.Config.JwtSecret),
 	})
 }
 
 func JWTMiddleware() echo.MiddlewareFunc {
 	config := echojwt.Config{
-		SigningKey:  []byte(os.Getenv("JWT_SECRET")),
+		SigningKey:  []byte(utils.Config.JwtSecret),
 		TokenLookup: "cookie:jwt",
 		SuccessHandler: func(c echo.Context) {
 			token := c.Get("user").(*jwt.Token)

pkg/models/team_model.go

@@ -35,7 +35,7 @@ type GetTeams struct {
 }
 
 type LeaveTeam struct {
-	UserID uuid.UUID `json:"id" validate:"required"`
+	Email string `json:"email" validate:"required"`
 }
 
 type DeleteTeam struct {

pkg/utils/jwt.go

@@ -2,7 +2,6 @@ package utils
 
 import (
 	"fmt"
-	"os"
 	"time"
 
 	"github.com/golang-jwt/jwt/v5"
@@ -14,7 +13,7 @@ type JWTClaims struct {
 	jwt.RegisteredClaims
 }
 
-var secretKey = []byte(os.Getenv("JWT_SECRET"))
+var secretKey = []byte(Config.JwtSecret)
 
 func GenerateToken(userId *uuid.UUID, isRefresh bool) (string, error) {
 	if isRefresh {