Merge pull request #78 from CodeChefVIT/feat/score

update score routes and docs

Author: RustyDev24

database/queries/score.sql

@@ -1,14 +1,16 @@
 -- name: GetTeamScores :many
-SELECT * FROM score WHERE team_id = $1;
+SELECT id, team_id, design, implementation, presentation, round, innovation, teamwork, comment
+FROM score
+WHERE team_id = $1;
 
 -- name: CreateScore :exec
-INSERT INTO score (id, team_id, design, implementation, presentation, round)
-VALUES ($1, $2, $3, $4, $5, $6);
+INSERT INTO score (id, team_id, design, implementation, presentation, round,  innovation, teamwork, comment)
+VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9);
 
 -- name: UpdateScore :exec
 UPDATE score
-SET team_id = $1, design = $2, implementation = $3, presentation = $4, round = $5
-WHERE id = $6;
+SET team_id = $1, design = $2, implementation = $3, presentation = $4, round = $5, innovation = $6, teamwork = $7, comment = $8
+WHERE id = $9;
 
 -- name: DeleteScore :exec
 DELETE FROM score

database/schema/011_add_points_text_field.sql

@@ -0,0 +1,11 @@
+-- +goose Up
+ALTER TABLE score
+ADD COLUMN innovation INTEGER NOT NULL DEFAULT 0,
+ADD COLUMN teamwork INTEGER NOT NULL DEFAULT 0,
+ADD COLUMN comment TEXT;
+
+-- +goose Down
+ALTER TABLE score
+DROP COLUMN innovation,
+DROP COLUMN teamwork,
+DROP COLUMN comment;

docs/sample.yaml

@@ -86,6 +86,9 @@ func UpdateScore(c echo.Context) error {
 		Design:         int32(points.Design),
 		Implementation: int32(points.Implementation),
 		Presentation:   int32(points.Presentation),
+		Teamwork:       int32(points.Teamwork),
+		Innovation:     int32(points.Innovation),
+		Comment:        &points.Comment,
 		Round:          int32(points.Round),
 	}
 
@@ -166,6 +169,9 @@ func CreateScore(c echo.Context) error {
 		Round:          int32(points.Round),
 		Presentation:   int32(points.Presentation),
 		Implementation: int32(points.Implementation),
+		Teamwork:       int32(points.Teamwork),
+		Comment:        &points.Comment,
+		Innovation:     int32(points.Innovation),
 		Design:         int32(points.Design),
 	}
 	score.ID, _ = uuid.NewV7()

pkg/controller/panel.go

@@ -41,14 +41,24 @@ func GetScore(c echo.Context) error {
 		})
 	}
 
+	if len(teamScore) == 0 {
+		return c.JSON(http.StatusNotFound, &models.Response{
+			Status:  "fail",
+			Message: "No scores found for the given team ID"},
+		)
+	}
+
 	scores := make([]models.GetScore, len(teamScore))
 	for i := 0; i < len(teamScore); i++ {
 		scores[i] = models.GetScore{
 			Id:             teamScore[i].ID.String(),
 			TeamID:         teamId,
 			Design:         int(teamScore[i].Design),
 			Implementation: int(teamScore[i].Implementation),
-			Presentation:   int(teamScore[i].Implementation),
+			Presentation:   int(teamScore[i].Presentation),
+			Innovation:     int(teamScore[i].Innovation),
+			Teamwork:       int(teamScore[i].Teamwork),
+			Comment:        getSafeString(teamScore[i].Comment),
 			Round:          int(teamScore[i].Round),
 		}
 	}

pkg/controller/score.go

@@ -16,6 +16,9 @@ type UpdateScore struct {
 	Implementation int    `json:"implementation" validate:"required,min=0,max=10"`
 	Presentation   int    `json:"presentation" validate:"required,min=0,max=10"`
 	Round          int    `json:"round" validate:"required"`
+	Innovation     int    `json:"innovation" validate:"required,min=0,max=10"`
+	Teamwork       int    `json:"teamwork" validate:"required,min=0,max=10"`
+	Comment        string `json:"comment"`
 	TeamID         string `json:"team_id" validate:"required,uuid"`
 }
 
@@ -24,5 +27,8 @@ type CreateScore struct {
 	Implementation int    `json:"implementation" validate:"required,min=0,max=10"`
 	Presentation   int    `json:"presentation" validate:"required,min=0,max=10"`
 	Round          int    `json:"round" validate:"required"`
+	Innovation     int    `json:"innovation" validate:"required,min=0,max=10"`
+	Teamwork       int    `json:"teamwork" validate:"required,min=0,max=10"`
+	Comment        string `json:"comment"`
 	TeamID         string `json:"team_id" validate:"required,uuid"`
 }

pkg/db/models.go

@@ -5,6 +5,9 @@ type GetScore struct {
 	Design         int    `json:"design" validate:"required,min=0,max=10"`
 	Implementation int    `json:"implementation" validate:"required,min=0,max=10"`
 	Presentation   int    `json:"presentation" validate:"required,min=0,max=10"`
-	Round          int    `json:"round" validate:"required,min=1"`
+	Round          int    `json:"round" validate:"required"`
+	Innovation     int    `json:"innovation" validate:"required,min=0,max=10"`
+	Teamwork       int    `json:"teamwork" validate:"required,min=0,max=10"`
+	Comment        string `json:"comment"`
 	TeamID         string `json:"team_id" validate:"required,uuid"`
 }