Merge branch 'CodeChefVIT:master' into master

CodeChefVIT · Mar 16, 2024 · b652882 · b652882
2 parents 0cc274f + 9242fa4
commit b652882
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 7 deletions.
diff --git a/internal/controllers/auth_controller.go b/internal/controllers/auth_controller.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"os"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/golang-jwt/jwt/v5"
@@ -37,6 +38,8 @@ func Login(ctx echo.Context) error {
 		})
 	}
 
+	payload.Email = strings.ToLower(payload.Email)
+
 	user, err := services.FindUserByEmail(payload.Email)
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {

diff --git a/internal/controllers/team_controller.go b/internal/controllers/team_controller.go
@@ -112,18 +112,34 @@ func UpdateTeamName(ctx echo.Context) error {
 		})
 	}
 
-	team, err := services.FindTeamByTeamID(payload.ID)
+	if user.TeamID == uuid.Nil {
+		return ctx.JSON(http.StatusNotFound, map[string]string{
+			"message": "user not in a team",
+			"status":  "fail",
+		})
+	}
+
+	/*team, err := services.FindTeamByTeamID(payload.ID)
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
 			return ctx.JSON(http.StatusNotFound, map[string]string{
 				"message": "user not found",
 				"status":  "fail",
 			})
 		}
-	}
+	}*/
 
-	err = services.UpdateTeamName(payload.Name, team.ID)
+	err := services.UpdateTeamName(payload.Name, user.TeamID)
 	if err != nil {
+		var pgerr *pgconn.PgError
+		if errors.As(err, &pgerr) {
+			if pgerr.Code == "23505" {
+				return ctx.JSON(http.StatusConflict, map[string]string{
+					"message": "team name already exists",
+					"status":  "failed to update team",
+				})
+			}
+		}
 		return ctx.JSON(http.StatusInternalServerError, map[string]string{
 			"message": err.Error(),
 			"status":  "error",

diff --git a/internal/controllers/user_controller.go b/internal/controllers/user_controller.go
@@ -39,6 +39,8 @@ func CreateUser(ctx echo.Context) error {
 		})
 	}
 
+	payload.Email = strings.ToLower(payload.Email)
+
 	_, err := services.FindUserByEmail(payload.Email)
 	if err != nil && !errors.Is(err, sql.ErrNoRows) {
 		return ctx.JSON(http.StatusInternalServerError, map[string]string{

diff --git a/internal/models/team_model.go b/internal/models/team_model.go
@@ -13,8 +13,7 @@ type Team struct {
 }
 
 type CreateTeamRequest struct {
-	ID   uuid.UUID `json:"id"   validate:"required,uuid"`
-	Name string    `json:"name" validate:"required,min=1,max=50"`
+	Name string `json:"name" validate:"required,min=1,max=50"`
 }
 
 type JoinTeamRequest struct {

diff --git a/nginx/nginx.conf b/nginx/nginx.conf
@@ -36,7 +36,7 @@ http {
 		location / {
 
 			if ($request_method = 'OPTIONS') {
-				add_header 'Access-Control-Allow-Origin' 'https://for-your-eyes-only.codechefvit.com';
+				add_header 'Access-Control-Allow-Origin' 'https://portal.devsoc.codechefvit.com/';
 				add_header 'Access-Control-Allow-Credentials' 'true';
 				add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, PUT, DELETE, PATCH';
 				add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,Authorization,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
@@ -46,7 +46,7 @@ http {
 				return 204;
 			}
 
-			add_header 'Access-Control-Allow-Origin' 'https://for-your-eyes-only.codechefvit.com' always;
+			add_header 'Access-Control-Allow-Origin' 'https://portal.devsoc.codechefvit.com/' always;
 			add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, PATCH, DELETE' always;
 			add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always;
 			add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;