Merge branch 'master' of https://github.com/CodeChefVIT/devsoc-backend-26

Author: atharvaSharma17

database/queries/ideas.sql

@@ -18,6 +18,10 @@ SELECT EXISTS (
     WHERE team_id = $1
 );
 
+-- name: SetIsSelectedByTeamID :exec
+UPDATE ideas SET is_selected = $2
+WHERE team_id = $1;
+
 -- name: GetIdeasByTeamID :one
 SELECT * from ideas WHERE team_id  = $1;
 

database/queries/score.sql

@@ -6,9 +6,10 @@ INSERT INTO score (
     design,
     implementation,
     presentation,
-    round
+    round,
+    panel
 )
-VALUES ($1, $2, $3, $4, $5, $6, $7)
+VALUES ($1, $2, $3, $4, $5, $6, $7,$8)
 RETURNING *;
 
 -- name: GetScoreByTeamAndRound :one
@@ -48,8 +49,8 @@ RETURNING *;
 
 -- name: DeleteScore :one
 DELETE FROM score
-WHERE id = $1
-RETURNING id;
+WHERE id = $1 AND round = $2
+RETURNING *;
 
 -- name: GetLeaderboard :many
 WITH TotalScores AS (

database/queries/submission.sql

@@ -25,8 +25,9 @@ SET
     title = $1,
     github_link = $2,
     figma_link = $3,
-    other_link = $4
-WHERE team_id = $5
+    other_link = $4,
+    description = $5
+WHERE team_id = $6
 RETURNING *;
 
 -- name: GetSubmissionByTeamID :one

database/queries/teams.sql

@@ -102,3 +102,7 @@ UPDATE teams
 SET round_qualified = round_qualified + 1
 WHERE id = $1;
 
+-- name: UpdateTeamScore :exec
+UPDATE teams
+SET total_score = total_score + $1
+WHERE id = $2;

database/queries/users.sql

@@ -22,42 +22,14 @@ 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.residency,
-  u.hostel_block,
-  u.room_no,
-  u.github_profile,
-  u.google_id,
-  u.google_profile_pic,
-  u.role,
-  u.is_leader,
-  u.is_banned,
-  u.is_profile_complete,
-  t.round_qualified
+SELECT u.*, 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
-)
+JOIN teams t ON t.id = u.team_id
+WHERE (u.name LIKE '%' || $1 || '%'
+       OR u.reg_no LIKE '%' || $1 || '%'
+       OR u.email LIKE '%' || $1 || '%')
+  AND u.id > $2
+  AND ($4 = '' OR u.gender = $4)
 ORDER BY u.id
 LIMIT $3;
 

pkg/controllers/admin.go

@@ -524,65 +524,63 @@ func DeletePanelMember(c echo.Context) error {
 	})
 }
 
-func GetAllUsers(ec echo.Context) error {
-	ctx := ec.Request().Context()
-	limitParam := ec.QueryParam("limit")
-	cursor := ec.QueryParam("cursor")
-	name := ec.QueryParam("name")
-	gender := ec.QueryParam("gender")
-
-	limit := 20
-	if limitParam != "" {
-		lt, err := strconv.Atoi(limitParam)
-		if err != nil || lt <= 0 {
-			return ec.JSON(http.StatusBadRequest, &models.Response{
-				Success: false,
-				Message: "limit must be a valid positive integer",
-			})
-		}
-		limit = lt
+func GetAllUsers(c echo.Context) error {
+	ctx := c.Request().Context()
+	limitParam := c.QueryParam("limit")
+	cursor := c.QueryParam("cursor")
+	name := c.QueryParam("name")
+	gender := c.QueryParam("gender")
+
+	limit, err := strconv.Atoi(limitParam)
+	if err != nil {
+		return c.JSON(http.StatusInternalServerError, &models.Response{
+			Success: false,
+			Message: "Invalid limit parameter",
+			Data:    map[string]string{"error": err.Error()},
+		})
 	}
 
-	var cursorUUID pgtype.UUID
+	var cursorUUID uuid.UUID
 	if cursor == "" {
-		cursorUUID = pgtype.UUID{Valid: false}
+		cursorUUID = uuid.Nil
 	} else {
-		if err := cursorUUID.Scan(cursor); err != nil {
-			return ec.JSON(http.StatusBadRequest, &models.Response{
-				Success: false,
-				Message: "Invalid UUID for cursor",
+		cursorUUID, err = uuid.Parse(cursor)
+		if err != nil {
+			return c.JSON(http.StatusBadRequest, map[string]string{
+				"error": "Invalid UUID for cursor",
 			})
 		}
 	}
 
 	users, err := db.Queries.GetAllUsers(ctx, sqlc.GetAllUsersParams{
-		Column1: name,
-		Column2: cursorUUID,
-		Limit:   int32(limit + 1),
+		Limit:   int32(limit),
+		ID:      pgtype.UUID{Bytes: cursorUUID, Valid: true},
+		Column1: &name,
 		Column4: gender,
 	})
 	if err != nil {
-		return ec.JSON(http.StatusInternalServerError, &models.Response{
+		return c.JSON(http.StatusInternalServerError, &models.Response{
 			Success: false,
-			Message: err.Error(),
+			Message: "Failed to fetch users",
+			Data:    map[string]string{"error": err.Error()},
 		})
 	}
 
-	var nextCursorStr string
-	if len(users) > int(limit) {
-		nextCursor := users[len(users)-1].ID
-		nextCursorStr = nextCursor.String()
-		users = users[:limit]
-	} else {
-		nextCursorStr = ""
+	var nextCursor uuid.NullUUID
+
+	for _, user := range users {
+		nextCursor = uuid.NullUUID{
+			UUID:  uuid.UUID(user.ID.Bytes),
+			Valid: true,
+		}
 	}
 
-	return ec.JSON(http.StatusOK, &models.Response{
+	return c.JSON(http.StatusOK, &models.Response{
 		Success: true,
 		Message: "Users fetched successfully",
 		Data: map[string]interface{}{
 			"users":       users,
-			"next_cursor": nextCursorStr,
+			"next_cursor": nextCursor.UUID.String(),
 		},
 	})
 }
@@ -1002,6 +1000,17 @@ func IncrementTeamRound(c echo.Context) error {
 				Data:    map[string]string{"error": err.Error()},
 			})
 		}
+
+		if err := db.Queries.SetIsSelectedByTeamID(ctx, sqlc.SetIsSelectedByTeamIDParams{
+			TeamID:     teamUUID,
+			IsSelected: true,
+		}); err != nil {
+			return c.JSON(http.StatusInternalServerError, &models.Response{
+				Success: false,
+				Message: "failed to update team selection status",
+				Data:    map[string]string{"team_id": teamUUID.String(), "error": err.Error()},
+			})
+		}
 	}
 
 	return c.JSON(http.StatusOK, &models.Response{

pkg/controllers/scores.go

@@ -44,12 +44,12 @@ func SetScore(c echo.Context) error {
 		})
 	}
 	roundVal := *req.Round
-	// if len(req.Panel) == 0 {
-	// 	return c.JSON(http.StatusBadRequest, &models.Response{
-	// 		Success: false,
-	// 		Message: "Panel is required",
-	// 	})
-	// }
+	if len(req.Panel) == 0 {
+		return c.JSON(http.StatusBadRequest, &models.Response{
+			Success: false,
+			Message: "Panel is required",
+		})
+	}
 	team, err := db.Queries.GetTeamById(ctx, teamUUID)
 	if err != nil {
 		return c.JSON(http.StatusNotFound, &models.Response{
@@ -111,7 +111,7 @@ func SetScore(c echo.Context) error {
 		Implementation: implementation,
 		Presentation:   presentation,
 		Round:          roundVal,
-		// Panel:          req.Panel,
+		Panel:          req.Panel,
 	}
 
 	score, err := db.Queries.CreateScore(ctx, params)
@@ -121,7 +121,19 @@ func SetScore(c echo.Context) error {
 			Message: "Failed to create score",
 		})
 	}
-
+	total := design + implementation + presentation
+	if total > 0 {
+		err := db.Queries.UpdateTeamScore(ctx, sqlc.UpdateTeamScoreParams{
+			TotalScore: total,
+			ID:         teamUUID,
+		})
+		if err != nil {
+			return c.JSON(http.StatusInternalServerError, &models.Response{
+				Success: false,
+				Message: "Failed to update team total score",
+			})
+		}
+	}
 	return c.JSON(http.StatusOK, &models.Response{
 		Success: true,
 		Message: "Score set successfully",
@@ -277,9 +289,21 @@ func DeleteScore(c echo.Context) error {
 		})
 	}
 
-	_, err = db.Queries.DeleteScore(ctx, pgtype.UUID{
-		Bytes: scoreIDRaw,
-		Valid: true,
+	round, err := strconv.Atoi(c.Param("round"))
+	if err != nil {
+		return c.JSON(http.StatusBadRequest, &models.Response{
+			Success: false,
+			Message: "Invalid round",
+			Data:    err,
+		})
+	}
+
+	score, err := db.Queries.DeleteScore(ctx, sqlc.DeleteScoreParams{
+		ID: pgtype.UUID{
+			Bytes: scoreIDRaw,
+			Valid: true,
+		},
+		Round: int32(round),
 	})
 	if err != nil {
 		if err == pgx.ErrNoRows {
@@ -296,8 +320,24 @@ func DeleteScore(c echo.Context) error {
 		})
 	}
 
+	negativeTotal := -(score.Design + score.Implementation + score.Presentation)
+	if negativeTotal != 0 {
+		err := db.Queries.UpdateTeamScore(ctx, sqlc.UpdateTeamScoreParams{
+			TotalScore: negativeTotal,
+			ID:         score.TeamID,
+		})
+		if err != nil {
+			return c.JSON(http.StatusInternalServerError, &models.Response{
+				Success: false,
+				Message: "Failed to update team total score",
+				Data:    err,
+			})
+		}
+	}
+
 	return c.JSON(http.StatusOK, &models.Response{
 		Success: true,
 		Message: "Score successfully deleted",
+		Data:    utils.ToScoreResponse(score),
 	})
 }

pkg/controllers/submission.go

@@ -130,11 +130,12 @@ func UpdateSubmission(c echo.Context) error {
 	}
 
 	submission, err := db.Queries.UpdateSubmission(ctx, sqlc.UpdateSubmissionParams{
-		TeamID:     teamID,
-		Title:      req.Title,
-		GithubLink: req.GithubLink,
-		FigmaLink:  req.FigmaLink,
-		OtherLink:  req.OtherLink,
+		TeamID:      teamID,
+		Title:       req.Title,
+		Description: req.Description,
+		GithubLink:  req.GithubLink,
+		FigmaLink:   req.FigmaLink,
+		OtherLink:   req.OtherLink,
 	})
 	if err != nil {
 		log.Println("Error while updating submission on db: ", err)