Merge branch 'master' of github.com:Black-Sirius69/devsoc-backend-24

Author: RustyDev24

internal/routes/idea_routes.go

@@ -10,6 +10,6 @@ func IdeaRoutes(incomingRoutes *echo.Echo) {
 	idea := incomingRoutes.Group("/idea")
 	idea.Use(middleware.Protected(), middleware.AuthUser)
 	idea.GET("", controllers.GetIdea)
-	idea.POST("/create", controllers.CreateIdea)
+	//idea.POST("/create", controllers.CreateIdea)
 	idea.PATCH("/update", controllers.UpdateIdea)
 }

internal/services/admin/get_reviews.go

@@ -52,7 +52,7 @@ func GetReviewsByTeamID(teamID uuid.UUID) (reviews []models.TeamReview, err erro
 func GetReviewsByRound(round int) (reviews []models.TeamReview, err error) {
 	var rows *sql.Rows
 	rows, err = database.DB.Query(
-		"SELECT id, team_id, reviewer, innovation_score, functionality_score, design_score, tech_score, presentation_score, comments, total_score FROM reviews WHERE review_round = $1",
+		"SELECT id, team_id, reviewer, innovation_score, functionality_score, design_score, tech_score, presentation_score, comments, total_score, review_round FROM reviews WHERE review_round = $1",
 		round,
 	)
 	if err != nil {

internal/services/admin/update_review.go

@@ -7,7 +7,7 @@ import (
 
 func UpdateReview(review models.TeamReview) error {
 	_, err := database.DB.Exec(
-		`UPDATE reviews SET reviwer = $1, innovation_score = $2, functionality_score = $3, design_score = $4, tech_score = $5, presentation_score = $6, comments = $7, total_score = $8, review_round = $9 WHERE id = $10`,
+		`UPDATE reviews SET reviewer = $1, innovation_score = $2, functionality_score = $3, design_score = $4, tech_score = $5, presentation_score = $6, comments = $7, total_score = $8, review_round = $9 WHERE id = $10`,
 		review.Reviewer,
 		review.InnovationScore,
 		review.FunctionalityScore,

internal/services/projects/get_projects.go

@@ -1,9 +1,6 @@
 package services
 
 import (
-	"database/sql"
-	"errors"
-
 	"github.com/CodeChefVIT/devsoc-backend-24/internal/database"
 	"github.com/CodeChefVIT/devsoc-backend-24/internal/models"
 	"github.com/google/uuid"
@@ -15,13 +12,6 @@ func GetProject(teamid uuid.UUID) (models.Project, error) {
 	err := database.DB.QueryRow(query, teamid).Scan(&proj.Name,
 		&proj.Description, &proj.GithubLink, &proj.FigmaLink,
 		&proj.Track, &proj.Others)
-	if err != nil {
-		if errors.Is(err, sql.ErrNoRows) {
-			return proj, nil
-		} else {
-			return proj, err
-		}
-	}
 	return proj, err
 }
 
@@ -31,14 +21,7 @@ func GetProjectByID(projectID uuid.UUID) (models.Project, error) {
 	err := database.DB.QueryRow(query, projectID).Scan(&proj.Name,
 		&proj.Description, &proj.GithubLink, &proj.FigmaLink,
 		&proj.Track, &proj.Others)
-	if err != nil {
-		if err == sql.ErrNoRows {
-			return proj, nil
-		} else {
-			return proj, err
-		}
-	}
-	return proj, nil
+	return proj, err
 }
 
 func GetAllProjects() ([]models.AdminGetProject, error) {