Merge branch 'pektezol:main' into main

7 files changed, 166 insertions, 26 deletions

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 bd85a97..d8783b7 100644
--- a/backend/controllers/mapController.go
+++ b/backend/controllers/mapController.go
@@ -15,7 +15,6 @@ import (
 //
 //      @Summary        Get map summary with specified id.
 //      @Tags           maps
-//      @Accept         json
 //      @Produce        json
 //      @Param          id      path            int     true    "Map ID"
 //      @Success        200     {object}        models.Response{data=models.Map{data=models.MapSummary}}
@@ -57,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 {
@@ -69,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()))
@@ -103,7 +102,6 @@ func FetchMapSummary(c *gin.Context) {
 //
 //      @Summary        Get map leaderboards with specified id.
 //      @Tags           maps
-//      @Accept         json
 //      @Produce        json
 //      @Param          id      path            int     true    "Map ID"
 //      @Success        200     {object}        models.Response{data=models.Map{data=models.MapRecords}}
@@ -125,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()))
@@ -146,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()))
@@ -181,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()))
@@ -215,3 +213,117 @@ func FetchMapLeaderboards(c *gin.Context) {
                 Data:    mapData,
         })
 }
+
+// GET Games
+//
+//      @Summary        Get games from the leaderboards.
+//      @Tags           games & chapters
+//      @Produce        json
+//      @Success        200     {object}        models.Response{data=[]models.Game}
+//      @Failure        400     {object}        models.Response
+//      @Router         /games [get]
+func FetchGames(c *gin.Context) {
+        rows, err := database.DB.Query(`SELECT id, name FROM games`)
+        if err != nil {
+                c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
+                return
+        }
+        var games []models.Game
+        for rows.Next() {
+                var game models.Game
+                if err := rows.Scan(&game.ID, &game.Name); err != nil {
+                        c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
+                        return
+                }
+                games = append(games, game)
+        }
+        c.JSON(http.StatusOK, models.Response{
+                Success: true,
+                Message: "Successfully retrieved games.",
+                Data:    games,
+        })
+}
+
+// GET Chapters of a Game
+//
+//      @Summary        Get chapters from the specified game id.
+//      @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         /games/{id} [get]
+func FetchChapters(c *gin.Context) {
+        gameID := c.Param("id")
+        intID, err := strconv.Atoi(gameID)
+        if err != nil {
+                c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
+                return
+        }
+        var response models.ChaptersResponse
+        rows, err := database.DB.Query(`SELECT c.id, c.name, g.name FROM chapters c INNER JOIN games g ON c.game_id = g.id WHERE game_id = $1`, gameID)
+        if err != nil {
+                c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
+                return
+        }
+        var chapters []models.Chapter
+        var gameName string
+        for rows.Next() {
+                var chapter models.Chapter
+                if err := rows.Scan(&chapter.ID, &chapter.Name, &gameName); err != nil {
+                        c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
+                        return
+                }
+                chapters = append(chapters, chapter)
+        }
+        response.Game.ID = intID
+        response.Game.Name = gameName
+        response.Chapters = chapters
+        c.JSON(http.StatusOK, models.Response{
+                Success: true,
+                Message: "Successfully retrieved chapters.",
+                Data:    response,
+        })
+}
+
+// GET Maps of a Chapter
+//
+//      @Summary        Get maps from the specified chapter id.
+//      @Tags           games & chapters
+//      @Produce        json
+//      @Param          id      path            int     true    "Chapter ID"
+//      @Success        200     {object}        models.Response{data=models.ChapterMapsResponse}
+//      @Failure        400     {object}        models.Response
+//      @Router         /chapters/{id} [get]
+func FetchChapterMaps(c *gin.Context) {
+        chapterID := c.Param("id")
+        intID, err := strconv.Atoi(chapterID)
+        if err != nil {
+                c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
+                return
+        }
+        var response models.ChapterMapsResponse
+        rows, err := database.DB.Query(`SELECT m.id, m.name, c.name FROM maps m INNER JOIN chapters c ON m.chapter_id = c.id WHERE chapter_id = $1`, chapterID)
+        if err != nil {
+                c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
+                return
+        }
+        var maps []models.MapShort
+        var chapterName string
+        for rows.Next() {
+                var mapShort models.MapShort
+                if err := rows.Scan(&mapShort.ID, &mapShort.Name, &chapterName); err != nil {
+                        c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
+                        return
+                }
+                maps = append(maps, mapShort)
+        }
+        response.Chapter.ID = intID
+        response.Chapter.Name = chapterName
+        response.Maps = maps
+        c.JSON(http.StatusOK, models.Response{
+                Success: true,
+                Message: "Successfully retrieved maps.",
+                Data:    response,
+        })
+}
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
diff --git a/backend/middleware/auth.go b/backend/middleware/auth.go
index cd00a30..14a0b78 100644
--- a/backend/middleware/auth.go
+++ b/backend/middleware/auth.go
@@ -36,7 +36,7 @@ func CheckAuth(c *gin.Context) {
                 }
                 // Get user from DB
                 var user models.User
-                database.DB.QueryRow(`SELECT * FROM users WHERE steam_id = $1;`, claims["sub"]).Scan(
+                database.DB.QueryRow(`SELECT * FROM users WHERE steam_id = $1`, claims["sub"]).Scan(
                         &user.SteamID, &user.UserName, &user.AvatarLink,
                         &user.CountryCode, &user.CreatedAt, &user.UpdatedAt)
                 if user.SteamID == "" {
diff --git a/backend/models/models.go b/backend/models/models.go
index cdcd111..6f5173a 100644
--- a/backend/models/models.go
+++ b/backend/models/models.go
@@ -153,6 +153,31 @@ type PlayerSummaries struct {
         GameServerIp      string `json:"gameserverip"`
 }
 
+type Game struct {
+        ID   int    `json:"id"`
+        Name string `json:"name"`
+}
+
+type ChaptersResponse struct {
+        Game     Game      `json:"game"`
+        Chapters []Chapter `json:"chapters"`
+}
+
+type Chapter struct {
+        ID   int    `json:"id"`
+        Name string `json:"name"`
+}
+
+type MapShort struct {
+        ID   int    `json:"id"`
+        Name string `json:"name"`
+}
+
+type ChapterMapsResponse struct {
+        Chapter Chapter    `json:"chapter"`
+        Maps    []MapShort `json:"maps"`
+}
+
 func ErrorResponse(message string) Response {
         return Response{
                 Success: false,
diff --git a/backend/routes/routes.go b/backend/routes/routes.go
index 53d4e78..2554fa4 100644
--- a/backend/routes/routes.go
+++ b/backend/routes/routes.go
@@ -28,5 +28,8 @@ func InitRoutes(router *gin.Engine) {
                 v1.POST("/maps/:id/record", middleware.CheckAuth, controllers.CreateRecordWithDemo)
                 v1.GET("/rankings", middleware.CheckAuth, controllers.Rankings)
                 v1.GET("/search", controllers.Search)
+                v1.GET("/games", controllers.FetchGames)
+                v1.GET("/games/:id", controllers.FetchChapters)
+                v1.GET("/chapters/:id", controllers.FetchChapterMaps)
         }
 }