3 files changed, 31 insertions, 90 deletions

diff --git a/backend/handlers/map.go b/backend/handlers/map.go
index f2ea8ac..bf7c821 100644
--- a/backend/handlers/map.go
+++ b/backend/handlers/map.go
@@ -87,12 +87,11 @@ func FetchMapSummary(c *gin.Context) {
                 return
         }
         // Get map routes and histories
-        sql = `SELECT r.id, c.id, c.name, h.user_name, h.score_count, h.record_date, r.description, r.showcase, COALESCE(avg(rating), 0.0) FROM map_routes r
-    INNER JOIN categories c ON r.category_id = c.id
-    INNER JOIN map_history h ON r.map_id = h.map_id AND r.category_id = h.category_id
-    LEFT JOIN map_ratings rt ON r.map_id = rt.map_id AND r.category_id = rt.category_id 
-        WHERE r.map_id = $1 AND h.score_count = r.score_count GROUP BY r.id, c.id, h.user_name, h.score_count, h.record_date, r.description, r.showcase
-        ORDER BY h.record_date ASC;`
+        sql = `SELECT mh.id, c.id, c.name, mh.user_name, mh.score_count, mh.record_date, mh.description, mh.showcase, COALESCE(avg(rating), 0.0) FROM map_history mh
+    INNER JOIN categories c ON mh.category_id = c.id
+    LEFT JOIN map_ratings rt ON mh.map_id = rt.map_id AND mh.category_id = rt.category_id 
+        WHERE mh.map_id = $1 AND mh.score_count = mh.score_count GROUP BY mh.id, c.id, mh.user_name, mh.score_count, mh.record_date, mh.description, mh.showcase
+        ORDER BY mh.record_date ASC;`
         rows, err := database.DB.Query(sql, id)
         if err != nil {
                 c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
diff --git a/backend/handlers/mod.go b/backend/handlers/mod.go
index 3709e1d..72a9fd8 100644
--- a/backend/handlers/mod.go
+++ b/backend/handlers/mod.go
@@ -16,7 +16,7 @@ type CreateMapSummaryRequest struct {
         Description string    `json:"description" binding:"required"`
         Showcase    string    `json:"showcase"`
         UserName    string    `json:"user_name" binding:"required"`
-        ScoreCount  *int      `json:"score_count"`
+        ScoreCount  int       `json:"score_count" binding:"required"`
         RecordDate  time.Time `json:"record_date" binding:"required"`
 }
 
@@ -25,7 +25,7 @@ type EditMapSummaryRequest struct {
         Description string    `json:"description" binding:"required"`
         Showcase    string    `json:"showcase"`
         UserName    string    `json:"user_name" binding:"required"`
-        ScoreCount  int       `json:"score_count"`
+        ScoreCount  int       `json:"score_count" binding:"required"`
         RecordDate  time.Time `json:"record_date" binding:"required"`
 }
 
@@ -93,17 +93,9 @@ func CreateMapSummary(c *gin.Context) {
                 return
         }
         // Update database with new data
-        sql = `INSERT INTO map_routes (map_id,category_id,score_count,description,showcase)
+        sql = `INSERT INTO map_history (map_id,category_id,user_name,score_count,description,showcase,record_date)
         VALUES ($1,$2,$3,$4,$5)`
-        _, err = tx.Exec(sql, mapID, request.CategoryID, request.ScoreCount, request.Description, request.Showcase)
-        if err != nil {
-                CreateLog(user.(models.User).SteamID, LogTypeMod, LogDescriptionMapSummaryCreateFail, fmt.Sprintf("INSERT#map_routes: %s", err.Error()))
-                c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
-                return
-        }
-        sql = `INSERT INTO map_history (map_id,category_id,user_name,score_count,record_date)
-        VALUES ($1,$2,$3,$4,$5)`
-        _, err = tx.Exec(sql, mapID, request.CategoryID, request.UserName, request.ScoreCount, request.RecordDate)
+        _, err = tx.Exec(sql, mapID, request.CategoryID, request.UserName, request.ScoreCount, request.Description, request.Showcase, request.RecordDate)
         if err != nil {
                 CreateLog(user.(models.User).SteamID, LogTypeMod, LogDescriptionMapSummaryCreateFail, fmt.Sprintf("INSERT#map_history: %s", err.Error()))
                 c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
@@ -113,7 +105,7 @@ func CreateMapSummary(c *gin.Context) {
                 c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
                 return
         }
-        CreateLog(user.(models.User).SteamID, LogTypeMod, LogDescriptionMapSummaryCreateSuccess, fmt.Sprintf("MapID: %d | CategoryID: %d | ScoreCount: %d", mapID, request.CategoryID, *request.ScoreCount))
+        CreateLog(user.(models.User).SteamID, LogTypeMod, LogDescriptionMapSummaryCreateSuccess, fmt.Sprintf("MapID: %d | CategoryID: %d | ScoreCount: %d", mapID, request.CategoryID, request.ScoreCount))
         c.JSON(http.StatusOK, models.Response{
                 Success: true,
                 Message: "Successfully created map summary.",
@@ -145,7 +137,8 @@ func EditMapSummary(c *gin.Context) {
         }
         // Bind parameter and body
         id := c.Param("mapid")
-        mapID, err := strconv.Atoi(id)
+        // we get mapid in path parameters, but it's not really used anywhere here lol.
+        _, err := strconv.Atoi(id)
         if err != nil {
                 c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
                 return
@@ -163,34 +156,11 @@ func EditMapSummary(c *gin.Context) {
                 return
         }
         defer tx.Rollback()
-        // Fetch route category and score count
-        var categoryID, scoreCount, historyID int
-        sql := `SELECT mr.category_id, mr.score_count FROM map_routes mr INNER JOIN maps m ON m.id = mr.map_id WHERE m.id = $1 AND mr.id = $2`
-        err = database.DB.QueryRow(sql, mapID, request.RouteID).Scan(&categoryID, &scoreCount)
-        if err != nil {
-                CreateLog(user.(models.User).SteamID, LogTypeMod, LogDescriptionMapSummaryEditFail, fmt.Sprintf("(RouteID: %d) SELECT#map_routes: %s", request.RouteID, err.Error()))
-                c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
-                return
-        }
-        sql = `SELECT mh.id FROM map_history mh WHERE mh.score_count = $1 AND mh.category_id = $2 AND mh.map_id = $3`
-        err = database.DB.QueryRow(sql, scoreCount, categoryID, mapID).Scan(&historyID)
-        if err != nil {
-                CreateLog(user.(models.User).SteamID, LogTypeMod, LogDescriptionMapSummaryEditFail, fmt.Sprintf("(RouteID: %d) SELECT#map_history: %s", request.RouteID, err.Error()))
-                c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
-                return
-        }
         // Update database with new data
-        sql = `UPDATE map_routes SET score_count = $2, description = $3, showcase = $4 WHERE id = $1`
-        _, err = tx.Exec(sql, request.RouteID, request.ScoreCount, request.Description, request.Showcase)
-        if err != nil {
-                CreateLog(user.(models.User).SteamID, LogTypeMod, LogDescriptionMapSummaryEditFail, fmt.Sprintf("(RouteID: %d) UPDATE#map_routes: %s", request.RouteID, err.Error()))
-                c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
-                return
-        }
-        sql = `UPDATE map_history SET user_name = $2, score_count = $3, record_date = $4 WHERE id = $1`
-        _, err = tx.Exec(sql, historyID, request.UserName, request.ScoreCount, request.RecordDate)
+        sql := `UPDATE map_history SET user_name = $2, score_count = $3, record_date = $4, description = $5, showcase = $6 WHERE id = $1`
+        _, err = tx.Exec(sql, request.RouteID, request.UserName, request.ScoreCount, request.RecordDate, request.Description, request.Showcase)
         if err != nil {
-                CreateLog(user.(models.User).SteamID, LogTypeMod, LogDescriptionMapSummaryEditFail, fmt.Sprintf("(HistoryID: %d) UPDATE#map_history: %s", historyID, err.Error()))
+                CreateLog(user.(models.User).SteamID, LogTypeMod, LogDescriptionMapSummaryEditFail, fmt.Sprintf("(HistoryID: %d) UPDATE#map_history: %s", request.RouteID, err.Error()))
                 c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
                 return
         }
@@ -198,7 +168,6 @@ func EditMapSummary(c *gin.Context) {
                 c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
                 return
         }
-        CreateLog(user.(models.User).SteamID, LogTypeMod, LogDescriptionMapSummaryEditSuccess, fmt.Sprintf("MapID: %d | CategoryID: %d | ScoreCount: %d", mapID, categoryID, scoreCount))
         c.JSON(http.StatusOK, models.Response{
                 Success: true,
                 Message: "Successfully updated map summary.",
@@ -230,7 +199,8 @@ func DeleteMapSummary(c *gin.Context) {
         }
         // Bind parameter and body
         id := c.Param("mapid")
-        mapID, err := strconv.Atoi(id)
+        // we get mapid in path parameters, but it's not really used anywhere here lol.
+        _, err := strconv.Atoi(id)
         if err != nil {
                 c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
                 return
@@ -248,38 +218,11 @@ func DeleteMapSummary(c *gin.Context) {
                 return
         }
         defer tx.Rollback()
-        // Fetch route category and score count
-        var checkMapID, scoreCount, categoryID, mapHistoryID int
-        sql := `SELECT m.id, mr.score_count, mr.category_id FROM maps m INNER JOIN map_routes mr ON m.id=mr.map_id WHERE m.id = $1 AND mr.id = $2`
-        err = database.DB.QueryRow(sql, mapID, request.RouteID).Scan(&checkMapID, &scoreCount, &categoryID)
-        if err != nil {
-                CreateLog(user.(models.User).SteamID, LogTypeMod, LogDescriptionMapSummaryDeleteFail, fmt.Sprintf("(RouteID: %d) SELECT#map_routes: %s", request.RouteID, err.Error()))
-                c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
-                return
-        }
-        if mapID != checkMapID {
-                c.JSON(http.StatusOK, models.ErrorResponse("Map ID does not exist."))
-                return
-        }
-        sql = `SELECT mh.id FROM maps m INNER JOIN map_routes mr ON m.id=mr.map_id INNER JOIN map_history mh ON m.id=mh.map_id WHERE m.id = $1 AND mh.category_id = $2 AND mh.score_count = $3`
-        err = database.DB.QueryRow(sql, mapID, categoryID, scoreCount).Scan(&mapHistoryID)
-        if err != nil {
-                CreateLog(user.(models.User).SteamID, LogTypeMod, LogDescriptionMapSummaryDeleteFail, fmt.Sprintf("(RouteID: %d) SELECT#map_history: %s", request.RouteID, err.Error()))
-                c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
-                return
-        }
         // Update database with new data
-        sql = `DELETE FROM map_routes mr WHERE mr.id = $1 `
+        sql := `DELETE FROM map_history mh WHERE mh.id = $1`
         _, err = tx.Exec(sql, request.RouteID)
         if err != nil {
-                CreateLog(user.(models.User).SteamID, LogTypeMod, LogDescriptionMapSummaryDeleteFail, fmt.Sprintf("(RouteID: %d) DELETE#map_routes: %s", request.RouteID, err.Error()))
-                c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
-                return
-        }
-        sql = `DELETE FROM map_history mh WHERE mh.id = $1`
-        _, err = tx.Exec(sql, mapHistoryID)
-        if err != nil {
-                CreateLog(user.(models.User).SteamID, LogTypeMod, LogDescriptionMapSummaryDeleteFail, fmt.Sprintf("(HistoryID: %d) DELETE#map_history: %s", mapHistoryID, err.Error()))
+                CreateLog(user.(models.User).SteamID, LogTypeMod, LogDescriptionMapSummaryDeleteFail, fmt.Sprintf("(HistoryID: %d) DELETE#map_history: %s", request.RouteID, err.Error()))
                 c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
                 return
         }
@@ -287,7 +230,6 @@ func DeleteMapSummary(c *gin.Context) {
                 c.JSON(http.StatusOK, models.ErrorResponse(err.Error()))
                 return
         }
-        CreateLog(user.(models.User).SteamID, LogTypeMod, LogDescriptionMapSummaryDeleteSuccess, fmt.Sprintf("MapID: %d | CategoryID: %d | ScoreCount: %d", mapID, categoryID, scoreCount))
         c.JSON(http.StatusOK, models.Response{
                 Success: true,
                 Message: "Successfully delete map summary.",
diff --git a/backend/handlers/user.go b/backend/handlers/user.go
index 88bbe45..8febf3a 100644
--- a/backend/handlers/user.go
+++ b/backend/handlers/user.go
@@ -99,15 +99,15 @@ func Profile(c *gin.Context) {
         // Get user completion count
         sql = `SELECT 'records_sp' AS table_name, COUNT(sp.id)
         FROM records_sp sp JOIN (
-        SELECT mr.map_id, MIN(mr.score_count) AS min_score_count
-        FROM public.map_routes mr WHERE mr.category_id = 1 GROUP BY mr.map_id
+        SELECT mh.map_id, MIN(mh.score_count) AS min_score_count
+        FROM public.map_history mh WHERE mh.category_id = 1 GROUP BY mh.map_id
         ) AS subquery_sp ON sp.map_id = subquery_sp.map_id AND sp.score_count = subquery_sp.min_score_count
         WHERE sp.user_id = $1 AND sp.is_deleted = false
         UNION ALL
         SELECT 'records_mp' AS table_name, COUNT(mp.id)
         FROM public.records_mp mp JOIN (
-        SELECT mr.map_id, MIN(mr.score_count) AS min_score_count
-        FROM public.map_routes mr WHERE mr.category_id = 1 GROUP BY mr.map_id
+        SELECT mh.map_id, MIN(mh.score_count) AS min_score_count
+        FROM public.map_history mh WHERE mh.category_id = 1 GROUP BY mh.map_id
         ) AS subquery_mp ON mp.map_id = subquery_mp.map_id AND mp.score_count = subquery_mp.min_score_count
         WHERE (mp.host_id = $1 OR mp.partner_id = $1) AND mp.is_deleted = false`
         rows, err := database.DB.Query(sql, user.(models.User).SteamID)
@@ -293,7 +293,7 @@ func Profile(c *gin.Context) {
         }
         records := []ProfileRecords{}
         // Get singleplayer records
-        sql = `SELECT sp.id, m.game_id, m.chapter_id, sp.map_id, m."name", (SELECT mr.score_count FROM map_routes mr WHERE mr.map_id = sp.map_id ORDER BY mr.score_count ASC LIMIT 1) AS wr_count, sp.score_count, sp.score_time, sp.demo_id, sp.record_date
+        sql = `SELECT sp.id, m.game_id, m.chapter_id, sp.map_id, m."name", (SELECT mh.score_count FROM map_history mh WHERE mh.map_id = sp.map_id ORDER BY mh.score_count ASC LIMIT 1) AS wr_count, sp.score_count, sp.score_time, sp.demo_id, sp.record_date
         FROM records_sp sp INNER JOIN maps m ON sp.map_id = m.id WHERE sp.user_id = $1 AND sp.is_deleted = false ORDER BY sp.map_id, sp.score_count, sp.score_time`
         rows, err = database.DB.Query(sql, user.(models.User).SteamID)
         if err != nil {
@@ -347,7 +347,7 @@ func Profile(c *gin.Context) {
                 records[len(records)-1].Scores = append(records[len(records)-1].Scores, score)
         }
         // Get multiplayer records
-        sql = `SELECT mp.id, m.game_id, m.chapter_id, mp.map_id, m."name", (SELECT mr.score_count FROM map_routes mr WHERE mr.map_id = mp.map_id ORDER BY mr.score_count ASC LIMIT 1) AS wr_count,  mp.score_count, mp.score_time, CASE WHEN host_id = $1 THEN mp.host_demo_id WHEN partner_id = $1 THEN mp.partner_demo_id END demo_id, mp.record_date
+        sql = `SELECT mp.id, m.game_id, m.chapter_id, mp.map_id, m."name", (SELECT mh.score_count FROM map_history mh WHERE mh.map_id = mp.map_id ORDER BY mh.score_count ASC LIMIT 1) AS wr_count,  mp.score_count, mp.score_time, CASE WHEN host_id = $1 THEN mp.host_demo_id WHEN partner_id = $1 THEN mp.partner_demo_id END demo_id, mp.record_date
         FROM records_mp mp INNER JOIN maps m ON mp.map_id = m.id WHERE (mp.host_id = $1 OR mp.partner_id = $1) AND mp.is_deleted = false ORDER BY mp.map_id, mp.score_count, mp.score_time`
         rows, err = database.DB.Query(sql, user.(models.User).SteamID)
         if err != nil {
@@ -473,15 +473,15 @@ func FetchUser(c *gin.Context) {
         // Get user completion count
         sql = `SELECT 'records_sp' AS table_name, COUNT(sp.id)
         FROM records_sp sp JOIN (
-        SELECT mr.map_id, MIN(mr.score_count) AS min_score_count
-        FROM public.map_routes mr WHERE mr.category_id = 1 GROUP BY mr.map_id
+        SELECT mh.map_id, MIN(mh.score_count) AS min_score_count
+        FROM public.map_history mh WHERE mh.category_id = 1 GROUP BY mh.map_id
         ) AS subquery_sp ON sp.map_id = subquery_sp.map_id AND sp.score_count = subquery_sp.min_score_count
         WHERE sp.user_id = $1 AND sp.is_deleted = false
         UNION ALL
         SELECT 'records_mp' AS table_name, COUNT(mp.id)
         FROM public.records_mp mp JOIN (
-        SELECT mr.map_id, MIN(mr.score_count) AS min_score_count
-        FROM public.map_routes mr WHERE mr.category_id = 1 GROUP BY mr.map_id
+        SELECT mh.map_id, MIN(mh.score_count) AS min_score_count
+        FROM public.map_history mh WHERE mh.category_id = 1 GROUP BY mh.map_id
         ) AS subquery_mp ON mp.map_id = subquery_mp.map_id AND mp.score_count = subquery_mp.min_score_count
         WHERE (mp.host_id = $1 OR mp.partner_id = $1) AND mp.is_deleted = false`
         rows, err = database.DB.Query(sql, user.SteamID)
@@ -667,7 +667,7 @@ func FetchUser(c *gin.Context) {
         }
         records := []ProfileRecords{}
         // Get singleplayer records
-        sql = `SELECT sp.id, m.game_id, m.chapter_id, sp.map_id, m."name", (SELECT mr.score_count FROM map_routes mr WHERE mr.map_id = sp.map_id ORDER BY mr.score_count ASC LIMIT 1) AS wr_count, sp.score_count, sp.score_time, sp.demo_id, sp.record_date
+        sql = `SELECT sp.id, m.game_id, m.chapter_id, sp.map_id, m."name", (SELECT mh.score_count FROM map_history mh WHERE mh.map_id = sp.map_id ORDER BY mh.score_count ASC LIMIT 1) AS wr_count, sp.score_count, sp.score_time, sp.demo_id, sp.record_date
         FROM records_sp sp INNER JOIN maps m ON sp.map_id = m.id WHERE sp.user_id = $1 AND sp.is_deleted = false ORDER BY sp.map_id, sp.score_count, sp.score_time`
         rows, err = database.DB.Query(sql, user.SteamID)
         if err != nil {
@@ -721,7 +721,7 @@ func FetchUser(c *gin.Context) {
                 records[len(records)-1].Scores = append(records[len(records)-1].Scores, score)
         }
         // Get multiplayer records
-        sql = `SELECT mp.id, m.game_id, m.chapter_id, mp.map_id, m."name", (SELECT mr.score_count FROM map_routes mr WHERE mr.map_id = mp.map_id ORDER BY mr.score_count ASC LIMIT 1) AS wr_count,  mp.score_count, mp.score_time, CASE WHEN host_id = $1 THEN mp.host_demo_id WHEN partner_id = $1 THEN mp.partner_demo_id END demo_id, mp.record_date
+        sql = `SELECT mp.id, m.game_id, m.chapter_id, mp.map_id, m."name", (SELECT mh.score_count FROM map_history mh WHERE mh.map_id = mp.map_id ORDER BY mh.score_count ASC LIMIT 1) AS wr_count,  mp.score_count, mp.score_time, CASE WHEN host_id = $1 THEN mp.host_demo_id WHEN partner_id = $1 THEN mp.partner_demo_id END demo_id, mp.record_date
         FROM records_mp mp INNER JOIN maps m ON mp.map_id = m.id WHERE (mp.host_id = $1 OR mp.partner_id = $1) AND mp.is_deleted = false ORDER BY mp.map_id, mp.score_count, mp.score_time`
         rows, err = database.DB.Query(sql, user.SteamID)
         if err != nil {