Merge branch 'main' of https://github.com/pektezol/LeastPortalsHub

Former-commit-id: 221385f463b7f5b0fc43a093b2c7c46e68d46d68

1 files changed, 97 insertions, 34 deletions

diff --git a/backend/controllers/mapController.go b/backend/handlers/map.go
index ebd65dd..1d9cee8 100644
--- a/backend/controllers/mapController.go
+++ b/backend/handlers/map.go
@@ -1,26 +1,69 @@
-package controllers
+package handlers
 
 import (
         "net/http"
         "strconv"
+        "time"
 
         "github.com/gin-gonic/gin"
         "github.com/pektezol/leastportalshub/backend/database"
         "github.com/pektezol/leastportalshub/backend/models"
 )
 
+type MapSummaryResponse struct {
+        Map     models.Map        `json:"map"`
+        Summary models.MapSummary `json:"summary"`
+}
+
+type MapLeaderboardsResponse struct {
+        Map     models.Map `json:"map"`
+        Records any        `json:"records"`
+}
+
+type ChaptersResponse struct {
+        Game     models.Game      `json:"game"`
+        Chapters []models.Chapter `json:"chapters"`
+}
+
+type ChapterMapsResponse struct {
+        Chapter models.Chapter    `json:"chapter"`
+        Maps    []models.MapShort `json:"maps"`
+}
+
+type RecordSingleplayer struct {
+        Placement  int                        `json:"placement"`
+        RecordID   int                        `json:"record_id"`
+        ScoreCount int                        `json:"score_count"`
+        ScoreTime  int                        `json:"score_time"`
+        User       models.UserShortWithAvatar `json:"user"`
+        DemoID     string                     `json:"demo_id"`
+        RecordDate time.Time                  `json:"record_date"`
+}
+
+type RecordMultiplayer struct {
+        Placement     int                        `json:"placement"`
+        RecordID      int                        `json:"record_id"`
+        ScoreCount    int                        `json:"score_count"`
+        ScoreTime     int                        `json:"score_time"`
+        Host          models.UserShortWithAvatar `json:"host"`
+        Partner       models.UserShortWithAvatar `json:"partner"`
+        HostDemoID    string                     `json:"host_demo_id"`
+        PartnerDemoID string                     `json:"partner_demo_id"`
+        RecordDate    time.Time                  `json:"record_date"`
+}
+
 // GET Map Summary
 //
 //      @Description    Get map summary with specified id.
 //      @Tags                   maps
 //      @Produce                json
 //      @Param                  id      path            int     true    "Map ID"
-//      @Success                200     {object}        models.Response{data=models.MapSummaryResponse}
+//      @Success                200     {object}        models.Response{data=MapSummaryResponse}
 //      @Failure                400     {object}        models.Response
 //      @Router                 /maps/{id}/summary [get]
 func FetchMapSummary(c *gin.Context) {
         id := c.Param("id")
-        response := models.MapSummaryResponse{Map: models.Map{}, Summary: models.MapSummary{Routes: []models.MapRoute{}}}
+        response := MapSummaryResponse{Map: models.Map{}, Summary: models.MapSummary{Routes: []models.MapRoute{}}}
         intID, err := strconv.Atoi(id)
         if err != nil {
                 c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
@@ -73,28 +116,29 @@ func FetchMapSummary(c *gin.Context) {
 //      @Tags                   maps
 //      @Produce                json
 //      @Param                  id      path            int     true    "Map ID"
-//      @Success                200     {object}        models.Response{data=models.Map{data=models.MapRecords}}
+//      @Success                200     {object}        models.Response{data=MapLeaderboardsResponse}
 //      @Failure                400     {object}        models.Response
 //      @Router                 /maps/{id}/leaderboards [get]
 func FetchMapLeaderboards(c *gin.Context) {
         // TODO: make new response type
         id := c.Param("id")
         // Get map data
-        var mapData models.Map
-        var mapRecordsData models.MapRecords
+        response := MapLeaderboardsResponse{Map: models.Map{}, Records: nil}
+        // var mapData models.Map
+        // var mapRecordsData models.MapRecords
         var isDisabled bool
         intID, err := strconv.Atoi(id)
         if err != nil {
                 c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
                 return
         }
-        mapData.ID = intID
-        sql := `SELECT g.name, c.name, m.name, is_disabled, m.image
+        response.Map.ID = intID
+        sql := `SELECT g.name, c.name, m.name, is_disabled, m.image, g.is_coop
         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`
-        err = database.DB.QueryRow(sql, id).Scan(&mapData.GameName, &mapData.ChapterName, &mapData.MapName, &isDisabled, &mapData.Image)
+        err = database.DB.QueryRow(sql, id).Scan(&response.Map.GameName, &response.Map.ChapterName, &response.Map.MapName, &isDisabled, &response.Map.Image, &response.Map.IsCoop)
         if err != nil {
                 c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
                 return
@@ -104,17 +148,38 @@ func FetchMapLeaderboards(c *gin.Context) {
                 return
         }
         // TODO: avatar and names for host & partner
-        // Get records from the map
-        if mapData.GameName == "Portal 2 - Cooperative" {
-                var records []models.RecordMP
-                sql = `SELECT id, host_id, partner_id, score_count, score_time, host_demo_id, partner_demo_id, record_date
-                FROM (
-                  SELECT id, host_id, partner_id, score_count, score_time, host_demo_id, partner_demo_id, record_date,
-                                 ROW_NUMBER() OVER (PARTITION BY host_id, partner_id ORDER BY score_count, score_time) AS rn
-                  FROM records_mp
-                  WHERE map_id = $1
-                ) sub
-                WHERE rn = 1`
+        if response.Map.GameName == "Portal 2 - Cooperative" {
+                records := []RecordMultiplayer{}
+                sql = `SELECT
+                sub.id,
+                sub.host_id,
+                host.user_name AS host_user_name,
+                host.avatar_link AS host_avatar_link,
+                sub.partner_id,
+                partner.user_name AS partner_user_name,
+                partner.avatar_link AS partner_avatar_link,
+                sub.score_count,
+                sub.score_time,
+                sub.host_demo_id,
+                sub.partner_demo_id,
+                sub.record_date
+        FROM (
+                SELECT
+                        id,
+                        host_id,
+                        partner_id,
+                        score_count,
+                        score_time,
+                        host_demo_id,
+                        partner_demo_id,
+                        record_date,
+                        ROW_NUMBER() OVER (PARTITION BY host_id, partner_id ORDER BY score_count, score_time) AS rn
+                FROM records_mp
+                WHERE map_id = $1
+        ) sub
+        JOIN users AS host ON sub.host_id = host.steam_id 
+        JOIN users AS partner ON sub.partner_id = partner.steam_id 
+        WHERE sub.rn = 1;`
                 rows, err := database.DB.Query(sql, id)
                 if err != nil {
                         c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
@@ -123,8 +188,8 @@ func FetchMapLeaderboards(c *gin.Context) {
                 placement := 1
                 ties := 0
                 for rows.Next() {
-                        var record models.RecordMP
-                        err := rows.Scan(&record.RecordID, &record.HostID, &record.PartnerID, &record.ScoreCount, &record.ScoreTime, &record.HostDemoID, &record.PartnerDemoID, &record.RecordDate)
+                        var record RecordMultiplayer
+                        err := rows.Scan(&record.RecordID, &record.Host.SteamID, &record.Host.UserName, &record.Host.AvatarLink, &record.Partner.SteamID, &record.Partner.UserName, &record.Partner.AvatarLink, &record.ScoreCount, &record.ScoreTime, &record.HostDemoID, &record.PartnerDemoID, &record.RecordDate)
                         if err != nil {
                                 c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
                                 return
@@ -138,9 +203,9 @@ func FetchMapLeaderboards(c *gin.Context) {
                         records = append(records, record)
                         placement++
                 }
-                mapRecordsData.Records = records
+                response.Records = records
         } else {
-                var records []models.RecordSP
+                records := []RecordSingleplayer{}
                 sql = `SELECT id, user_id, users.user_name, users.avatar_link, score_count, score_time, demo_id, record_date
                 FROM (
                   SELECT id, user_id, score_count, score_time, demo_id, record_date,
@@ -158,8 +223,8 @@ func FetchMapLeaderboards(c *gin.Context) {
                 placement := 1
                 ties := 0
                 for rows.Next() {
-                        var record models.RecordSP
-                        err := rows.Scan(&record.RecordID, &record.UserID, &record.UserName, &record.UserAvatar, &record.ScoreCount, &record.ScoreTime, &record.DemoID, &record.RecordDate)
+                        var record RecordSingleplayer
+                        err := rows.Scan(&record.RecordID, &record.User.SteamID, &record.User.UserName, &record.User.AvatarLink, &record.ScoreCount, &record.ScoreTime, &record.DemoID, &record.RecordDate)
                         if err != nil {
                                 c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
                                 return
@@ -173,14 +238,12 @@ func FetchMapLeaderboards(c *gin.Context) {
                         records = append(records, record)
                         placement++
                 }
-                mapRecordsData.Records = records
+                response.Records = records
         }
-        // mapData.Data = mapRecordsData
-        // Return response
         c.JSON(http.StatusOK, models.Response{
                 Success: true,
                 Message: "Successfully retrieved map leaderboards.",
-                Data:    mapData,
+                Data:    response,
         })
 }
 
@@ -220,7 +283,7 @@ func FetchGames(c *gin.Context) {
 //      @Tags                   games & chapters
 //      @Produce                json
 //      @Param                  id      path            int     true    "Game ID"
-//      @Success                200     {object}        models.Response{data=models.ChaptersResponse}
+//      @Success                200     {object}        models.Response{data=ChaptersResponse}
 //      @Failure                400     {object}        models.Response
 //      @Router                 /games/{id} [get]
 func FetchChapters(c *gin.Context) {
@@ -230,7 +293,7 @@ func FetchChapters(c *gin.Context) {
                 c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
                 return
         }
-        var response models.ChaptersResponse
+        var response 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()))
@@ -262,7 +325,7 @@ func FetchChapters(c *gin.Context) {
 //      @Tags                   games & chapters
 //      @Produce                json
 //      @Param                  id      path            int     true    "Chapter ID"
-//      @Success                200     {object}        models.Response{data=models.ChapterMapsResponse}
+//      @Success                200     {object}        models.Response{data=ChapterMapsResponse}
 //      @Failure                400     {object}        models.Response
 //      @Router                 /chapters/{id} [get]
 func FetchChapterMaps(c *gin.Context) {
@@ -272,7 +335,7 @@ func FetchChapterMaps(c *gin.Context) {
                 c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
                 return
         }
-        var response models.ChapterMapsResponse
+        var response 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()))