From 937160bfda2c8edc5ff5dd73899b517bb0ceb515 Mon Sep 17 00:00:00 2001 From: Arda Serdar Pektezol <1669855+pektezol@users.noreply.github.com> Date: Wed, 3 May 2023 16:05:30 +0300 Subject: fix: sql typos, routing change --- backend/controllers/homeController.go | 10 +++++----- backend/controllers/mapController.go | 22 +++++++++++----------- backend/controllers/recordController.go | 12 ++++++------ backend/controllers/userController.go | 14 +++++++------- 4 files changed, 29 insertions(+), 29 deletions(-) (limited to 'backend/controllers') diff --git a/backend/controllers/homeController.go b/backend/controllers/homeController.go index 206e3ae..edb770f 100644 --- a/backend/controllers/homeController.go +++ b/backend/controllers/homeController.go @@ -29,7 +29,7 @@ func Home(c *gin.Context) { // @Failure 400 {object} models.Response // @Router /demo [get] func Rankings(c *gin.Context) { - rows, err := database.DB.Query(`SELECT steam_id, user_name FROM users;`) + rows, err := database.DB.Query(`SELECT steam_id, user_name FROM users`) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) return @@ -46,7 +46,7 @@ func Rankings(c *gin.Context) { // Getting all sp records for each user var uniqueSingleUserRecords, totalSingleMaps int sql := `SELECT COUNT(DISTINCT map_id), (SELECT COUNT(map_name) FROM maps - WHERE is_coop = FALSE AND is_disabled = false) FROM records_sp WHERE user_id = $1;` + WHERE is_coop = FALSE AND is_disabled = false) FROM records_sp WHERE user_id = $1` err = database.DB.QueryRow(sql, userID).Scan(&uniqueSingleUserRecords, &totalSingleMaps) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) @@ -57,7 +57,7 @@ func Rankings(c *gin.Context) { var ranking models.UserRanking ranking.UserID = userID ranking.UserName = username - sql := `SELECT DISTINCT map_id, score_count FROM records_sp WHERE user_id = $1 ORDER BY map_id, score_count;` + sql := `SELECT DISTINCT map_id, score_count FROM records_sp WHERE user_id = $1 ORDER BY map_id, score_count` rows, err := database.DB.Query(sql, userID) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) @@ -80,7 +80,7 @@ func Rankings(c *gin.Context) { // Getting all mp records for each user var uniqueMultiUserRecords, totalMultiMaps int sql = `SELECT COUNT(DISTINCT map_id), (SELECT COUNT(map_name) FROM maps - WHERE is_coop = TRUE AND is_disabled = false) FROM records_mp WHERE host_id = $1 OR partner_id = $2;` + WHERE is_coop = TRUE AND is_disabled = false) FROM records_mp WHERE host_id = $1 OR partner_id = $2` err = database.DB.QueryRow(sql, userID, userID).Scan(&uniqueMultiUserRecords, &totalMultiMaps) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) @@ -91,7 +91,7 @@ func Rankings(c *gin.Context) { var ranking models.UserRanking ranking.UserID = userID ranking.UserName = username - sql := `SELECT DISTINCT map_id, score_count FROM records_mp WHERE host_id = $1 OR partner_id = $2 ORDER BY map_id, score_count;` + sql := `SELECT DISTINCT map_id, score_count FROM records_mp WHERE host_id = $1 OR partner_id = $2 ORDER BY map_id, score_count` rows, err := database.DB.Query(sql, userID, userID) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) diff --git a/backend/controllers/mapController.go b/backend/controllers/mapController.go index 506daa2..d8783b7 100644 --- a/backend/controllers/mapController.go +++ b/backend/controllers/mapController.go @@ -56,7 +56,7 @@ func FetchMapSummary(c *gin.Context) { FROM maps m INNER JOIN games g ON m.game_id = g.id INNER JOIN chapters c ON m.chapter_id = c.id - WHERE m.id = $1;` + WHERE m.id = $1` // TODO: CategoryScores err = database.DB.QueryRow(sql, id).Scan(&mapData.GameName, &mapData.ChapterName, &mapData.MapName, &mapSummaryData.Description, &mapSummaryData.Showcase, &routers, &mapSummaryData.Rating) if err != nil { @@ -68,7 +68,7 @@ func FetchMapSummary(c *gin.Context) { var historyDates pq.StringArray sql = `SELECT array_agg(user_name), array_agg(score_count), array_agg(record_date) FROM map_history - WHERE map_id = $1;` + WHERE map_id = $1` err = database.DB.QueryRow(sql, id).Scan(&historyNames, &historyScores, &historyDates) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) @@ -123,7 +123,7 @@ func FetchMapLeaderboards(c *gin.Context) { FROM maps m INNER JOIN games g ON m.game_id = g.id INNER JOIN chapters c ON m.chapter_id = c.id - WHERE m.id = $1;` + WHERE m.id = $1` err = database.DB.QueryRow(sql, id).Scan(&mapData.GameName, &mapData.ChapterName, &mapData.MapName, &isDisabled) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) @@ -144,7 +144,7 @@ func FetchMapLeaderboards(c *gin.Context) { FROM records_mp WHERE map_id = $1 ) sub - WHERE rn = 1;` + WHERE rn = 1` rows, err := database.DB.Query(sql, id) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) @@ -179,7 +179,7 @@ func FetchMapLeaderboards(c *gin.Context) { WHERE map_id = $1 ) sub INNER JOIN users ON user_id = users.steam_id - WHERE rn = 1;` + WHERE rn = 1` rows, err := database.DB.Query(sql, id) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) @@ -217,7 +217,7 @@ func FetchMapLeaderboards(c *gin.Context) { // GET Games // // @Summary Get games from the leaderboards. -// @Tags games +// @Tags games & chapters // @Produce json // @Success 200 {object} models.Response{data=[]models.Game} // @Failure 400 {object} models.Response @@ -247,12 +247,12 @@ func FetchGames(c *gin.Context) { // GET Chapters of a Game // // @Summary Get chapters from the specified game id. -// @Tags chapters +// @Tags games & chapters // @Produce json // @Param id path int true "Game ID" // @Success 200 {object} models.Response{data=models.ChaptersResponse} // @Failure 400 {object} models.Response -// @Router /chapters/{id} [get] +// @Router /games/{id} [get] func FetchChapters(c *gin.Context) { gameID := c.Param("id") intID, err := strconv.Atoi(gameID) @@ -289,12 +289,12 @@ func FetchChapters(c *gin.Context) { // GET Maps of a Chapter // // @Summary Get maps from the specified chapter id. -// @Tags maps +// @Tags games & chapters // @Produce json // @Param id path int true "Chapter ID" -// @Success 200 {object} models.Response{data=[]models.MapShort} +// @Success 200 {object} models.Response{data=models.ChapterMapsResponse} // @Failure 400 {object} models.Response -// @Router /maps/{id} [get] +// @Router /chapters/{id} [get] func FetchChapterMaps(c *gin.Context) { chapterID := c.Param("id") intID, err := strconv.Atoi(chapterID) diff --git a/backend/controllers/recordController.go b/backend/controllers/recordController.go index bafa844..627be57 100644 --- a/backend/controllers/recordController.go +++ b/backend/controllers/recordController.go @@ -46,7 +46,7 @@ func CreateRecordWithDemo(c *gin.Context) { var gameID int var isCoop bool var isDisabled bool - sql := `SELECT game_id, is_disabled FROM maps WHERE id = $1;` + sql := `SELECT game_id, is_disabled FROM maps WHERE id = $1` err := database.DB.QueryRow(sql, mapId).Scan(&gameID, &isDisabled) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) @@ -153,7 +153,7 @@ func CreateRecordWithDemo(c *gin.Context) { // Insert into records if isCoop { sql := `INSERT INTO records_mp(map_id,score_count,score_time,host_id,partner_id,host_demo_id,partner_demo_id) - VALUES($1, $2, $3, $4, $5, $6, $7);` + VALUES($1, $2, $3, $4, $5, $6, $7)` var hostID string var partnerID string if record.IsPartnerOrange { @@ -171,7 +171,7 @@ func CreateRecordWithDemo(c *gin.Context) { } // If a new world record based on portal count // if record.ScoreCount < wrScore { - // _, err := tx.Exec(`UPDATE maps SET wr_score = $1, wr_time = $2 WHERE id = $3;`, record.ScoreCount, record.ScoreTime, mapId) + // _, err := tx.Exec(`UPDATE maps SET wr_score = $1, wr_time = $2 WHERE id = $3`, record.ScoreCount, record.ScoreTime, mapId) // if err != nil { // c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) // return @@ -179,7 +179,7 @@ func CreateRecordWithDemo(c *gin.Context) { // } } else { sql := `INSERT INTO records_sp(map_id,score_count,score_time,user_id,demo_id) - VALUES($1, $2, $3, $4, $5);` + VALUES($1, $2, $3, $4, $5)` _, err := tx.Exec(sql, mapId, record.ScoreCount, record.ScoreTime, user.(models.User).SteamID, hostDemoUUID) if err != nil { deleteFile(srv, fileID) @@ -188,7 +188,7 @@ func CreateRecordWithDemo(c *gin.Context) { } // If a new world record based on portal count // if record.ScoreCount < wrScore { - // _, err := tx.Exec(`UPDATE maps SET wr_score = $1, wr_time = $2 WHERE id = $3;`, record.ScoreCount, record.ScoreTime, mapId) + // _, err := tx.Exec(`UPDATE maps SET wr_score = $1, wr_time = $2 WHERE id = $3`, record.ScoreCount, record.ScoreTime, mapId) // if err != nil { // c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) // return @@ -224,7 +224,7 @@ func DownloadDemoWithID(c *gin.Context) { c.JSON(http.StatusBadRequest, models.ErrorResponse("Invalid id given.")) return } - err := database.DB.QueryRow(`SELECT location_id FROM demos WHERE id = $1;`, uuid).Scan(&locationID) + err := database.DB.QueryRow(`SELECT location_id FROM demos WHERE id = $1`, uuid).Scan(&locationID) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) return diff --git a/backend/controllers/userController.go b/backend/controllers/userController.go index 5ad800d..adf936b 100644 --- a/backend/controllers/userController.go +++ b/backend/controllers/userController.go @@ -31,7 +31,7 @@ func Profile(c *gin.Context) { } // Retrieve singleplayer records var scoresSP []models.ScoreResponse - sql := `SELECT id, map_id, score_count, score_time, demo_id, record_date FROM records_sp WHERE user_id = $1 ORDER BY map_id;` + sql := `SELECT id, map_id, score_count, score_time, demo_id, record_date FROM records_sp WHERE user_id = $1 ORDER BY map_id` rows, err := database.DB.Query(sql, user.(models.User).SteamID) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) @@ -58,7 +58,7 @@ func Profile(c *gin.Context) { // Retrieve multiplayer records var scoresMP []models.ScoreResponse sql = `SELECT id, map_id, host_id, partner_id, score_count, score_time, host_demo_id, partner_demo_id, record_date FROM records_mp - WHERE host_id = $1 OR partner_id = $2 ORDER BY map_id;` + WHERE host_id = $1 OR partner_id = $2 ORDER BY map_id` rows, err = database.DB.Query(sql, user.(models.User).SteamID, user.(models.User).SteamID) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) @@ -119,7 +119,7 @@ func FetchUser(c *gin.Context) { } // Check if user exists var user models.User - err := database.DB.QueryRow(`SELECT * FROM users WHERE steam_id = $1;`, id).Scan( + err := database.DB.QueryRow(`SELECT * FROM users WHERE steam_id = $1`, id).Scan( &user.SteamID, &user.UserName, &user.AvatarLink, &user.CountryCode, &user.CreatedAt, &user.UpdatedAt) if user.SteamID == "" { @@ -133,7 +133,7 @@ func FetchUser(c *gin.Context) { } // Retrieve singleplayer records var scoresSP []models.ScoreResponse - sql := `SELECT id, map_id, score_count, score_time, demo_id, record_date FROM records_sp WHERE user_id = $1 ORDER BY map_id;` + sql := `SELECT id, map_id, score_count, score_time, demo_id, record_date FROM records_sp WHERE user_id = $1 ORDER BY map_id` rows, err := database.DB.Query(sql, user.SteamID) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) @@ -160,7 +160,7 @@ func FetchUser(c *gin.Context) { // Retrieve multiplayer records var scoresMP []models.ScoreResponse sql = `SELECT id, map_id, host_id, partner_id, score_count, score_time, host_demo_id, partner_demo_id, record_date FROM records_mp - WHERE host_id = $1 OR partner_id = $2 ORDER BY map_id;` + WHERE host_id = $1 OR partner_id = $2 ORDER BY map_id` rows, err = database.DB.Query(sql, user.SteamID, user.SteamID) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) @@ -225,7 +225,7 @@ func UpdateUser(c *gin.Context) { } // Update profile _, err = database.DB.Exec(`UPDATE users SET username = $1, avatar_link = $2, country_code = $3, updated_at = $4 - WHERE steam_id = $5;`, profile.PersonaName, profile.AvatarFull, profile.LocCountryCode, time.Now().UTC(), user.(models.User).SteamID) + WHERE steam_id = $5`, profile.PersonaName, profile.AvatarFull, profile.LocCountryCode, time.Now().UTC(), user.(models.User).SteamID) if err != nil { c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) return @@ -268,7 +268,7 @@ func UpdateCountryCode(c *gin.Context) { return } var validCode string - err := database.DB.QueryRow(`SELECT country_code FROM countries WHERE country_code = $1;`, code).Scan(&validCode) + err := database.DB.QueryRow(`SELECT country_code FROM countries WHERE country_code = $1`, code).Scan(&validCode) if err != nil { c.JSON(http.StatusNotFound, models.ErrorResponse(err.Error())) return -- cgit v1.2.3