diff options
Diffstat (limited to 'backend/handlers/home.go')
| -rw-r--r-- | backend/handlers/home.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/backend/handlers/home.go b/backend/handlers/home.go index 53be1de..eb3912c 100644 --- a/backend/handlers/home.go +++ b/backend/handlers/home.go | |||
| @@ -68,7 +68,7 @@ func Rankings(c *gin.Context) { | |||
| 68 | ranking := models.UserRanking{} | 68 | ranking := models.UserRanking{} |
| 69 | var currentCount int | 69 | var currentCount int |
| 70 | var totalCount int | 70 | var totalCount int |
| 71 | err = rows.Scan(&ranking.UserID, &ranking.UserName, ¤tCount, &totalCount, &ranking.TotalScore) | 71 | err = rows.Scan(&ranking.User.SteamID, &ranking.User.UserName, ¤tCount, &totalCount, &ranking.TotalScore) |
| 72 | if err != nil { | 72 | if err != nil { |
| 73 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) | 73 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) |
| 74 | return | 74 | return |
| @@ -100,7 +100,7 @@ func Rankings(c *gin.Context) { | |||
| 100 | ranking := models.UserRanking{} | 100 | ranking := models.UserRanking{} |
| 101 | var currentCount int | 101 | var currentCount int |
| 102 | var totalCount int | 102 | var totalCount int |
| 103 | err = rows.Scan(&ranking.UserID, &ranking.UserName, ¤tCount, &totalCount, &ranking.TotalScore) | 103 | err = rows.Scan(&ranking.User.SteamID, &ranking.User.UserName, ¤tCount, &totalCount, &ranking.TotalScore) |
| 104 | if err != nil { | 104 | if err != nil { |
| 105 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) | 105 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) |
| 106 | return | 106 | return |
| @@ -113,11 +113,10 @@ func Rankings(c *gin.Context) { | |||
| 113 | // Has both so they are qualified for overall ranking | 113 | // Has both so they are qualified for overall ranking |
| 114 | for _, spRanking := range response.Singleplayer { | 114 | for _, spRanking := range response.Singleplayer { |
| 115 | for _, mpRanking := range response.Multiplayer { | 115 | for _, mpRanking := range response.Multiplayer { |
| 116 | if spRanking.UserID == mpRanking.UserID { | 116 | if spRanking.User.SteamID == mpRanking.User.SteamID { |
| 117 | totalScore := spRanking.TotalScore + mpRanking.TotalScore | 117 | totalScore := spRanking.TotalScore + mpRanking.TotalScore |
| 118 | overallRanking := models.UserRanking{ | 118 | overallRanking := models.UserRanking{ |
| 119 | UserID: spRanking.UserID, | 119 | User: spRanking.User, |
| 120 | UserName: spRanking.UserName, | ||
| 121 | TotalScore: totalScore, | 120 | TotalScore: totalScore, |
| 122 | } | 121 | } |
| 123 | response.Overall = append(response.Overall, overallRanking) | 122 | response.Overall = append(response.Overall, overallRanking) |