diff options
| author | Nidboj132 <lol2s@vp.pl> | 2023-05-06 16:11:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-06 16:11:37 +0200 |
| commit | cbe16bdb713a5d82a7a67a4a2a4f1d49b59663ae (patch) | |
| tree | 4d04c0cdea26e0e497134b99c0e34a7d9d478f34 /backend/controllers/userController.go | |
| parent | login test (diff) | |
| parent | fix: allow credentials cors (diff) | |
| download | lphub-cbe16bdb713a5d82a7a67a4a2a4f1d49b59663ae.tar.gz lphub-cbe16bdb713a5d82a7a67a4a2a4f1d49b59663ae.tar.bz2 lphub-cbe16bdb713a5d82a7a67a4a2a4f1d49b59663ae.zip | |
Merge branch 'pektezol:main' into main
Diffstat (limited to 'backend/controllers/userController.go')
| -rw-r--r-- | backend/controllers/userController.go | 14 |
1 files changed, 7 insertions, 7 deletions
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) { | |||
| 31 | } | 31 | } |
| 32 | // Retrieve singleplayer records | 32 | // Retrieve singleplayer records |
| 33 | var scoresSP []models.ScoreResponse | 33 | var scoresSP []models.ScoreResponse |
| 34 | sql := `SELECT id, map_id, score_count, score_time, demo_id, record_date FROM records_sp WHERE user_id = $1 ORDER BY map_id;` | 34 | sql := `SELECT id, map_id, score_count, score_time, demo_id, record_date FROM records_sp WHERE user_id = $1 ORDER BY map_id` |
| 35 | rows, err := database.DB.Query(sql, user.(models.User).SteamID) | 35 | rows, err := database.DB.Query(sql, user.(models.User).SteamID) |
| 36 | if err != nil { | 36 | if err != nil { |
| 37 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) | 37 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) |
| @@ -58,7 +58,7 @@ func Profile(c *gin.Context) { | |||
| 58 | // Retrieve multiplayer records | 58 | // Retrieve multiplayer records |
| 59 | var scoresMP []models.ScoreResponse | 59 | var scoresMP []models.ScoreResponse |
| 60 | sql = `SELECT id, map_id, host_id, partner_id, score_count, score_time, host_demo_id, partner_demo_id, record_date FROM records_mp | 60 | sql = `SELECT id, map_id, host_id, partner_id, score_count, score_time, host_demo_id, partner_demo_id, record_date FROM records_mp |
| 61 | WHERE host_id = $1 OR partner_id = $2 ORDER BY map_id;` | 61 | WHERE host_id = $1 OR partner_id = $2 ORDER BY map_id` |
| 62 | rows, err = database.DB.Query(sql, user.(models.User).SteamID, user.(models.User).SteamID) | 62 | rows, err = database.DB.Query(sql, user.(models.User).SteamID, user.(models.User).SteamID) |
| 63 | if err != nil { | 63 | if err != nil { |
| 64 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) | 64 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) |
| @@ -119,7 +119,7 @@ func FetchUser(c *gin.Context) { | |||
| 119 | } | 119 | } |
| 120 | // Check if user exists | 120 | // Check if user exists |
| 121 | var user models.User | 121 | var user models.User |
| 122 | err := database.DB.QueryRow(`SELECT * FROM users WHERE steam_id = $1;`, id).Scan( | 122 | err := database.DB.QueryRow(`SELECT * FROM users WHERE steam_id = $1`, id).Scan( |
| 123 | &user.SteamID, &user.UserName, &user.AvatarLink, &user.CountryCode, | 123 | &user.SteamID, &user.UserName, &user.AvatarLink, &user.CountryCode, |
| 124 | &user.CreatedAt, &user.UpdatedAt) | 124 | &user.CreatedAt, &user.UpdatedAt) |
| 125 | if user.SteamID == "" { | 125 | if user.SteamID == "" { |
| @@ -133,7 +133,7 @@ func FetchUser(c *gin.Context) { | |||
| 133 | } | 133 | } |
| 134 | // Retrieve singleplayer records | 134 | // Retrieve singleplayer records |
| 135 | var scoresSP []models.ScoreResponse | 135 | var scoresSP []models.ScoreResponse |
| 136 | sql := `SELECT id, map_id, score_count, score_time, demo_id, record_date FROM records_sp WHERE user_id = $1 ORDER BY map_id;` | 136 | sql := `SELECT id, map_id, score_count, score_time, demo_id, record_date FROM records_sp WHERE user_id = $1 ORDER BY map_id` |
| 137 | rows, err := database.DB.Query(sql, user.SteamID) | 137 | rows, err := database.DB.Query(sql, user.SteamID) |
| 138 | if err != nil { | 138 | if err != nil { |
| 139 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) | 139 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) |
| @@ -160,7 +160,7 @@ func FetchUser(c *gin.Context) { | |||
| 160 | // Retrieve multiplayer records | 160 | // Retrieve multiplayer records |
| 161 | var scoresMP []models.ScoreResponse | 161 | var scoresMP []models.ScoreResponse |
| 162 | sql = `SELECT id, map_id, host_id, partner_id, score_count, score_time, host_demo_id, partner_demo_id, record_date FROM records_mp | 162 | sql = `SELECT id, map_id, host_id, partner_id, score_count, score_time, host_demo_id, partner_demo_id, record_date FROM records_mp |
| 163 | WHERE host_id = $1 OR partner_id = $2 ORDER BY map_id;` | 163 | WHERE host_id = $1 OR partner_id = $2 ORDER BY map_id` |
| 164 | rows, err = database.DB.Query(sql, user.SteamID, user.SteamID) | 164 | rows, err = database.DB.Query(sql, user.SteamID, user.SteamID) |
| 165 | if err != nil { | 165 | if err != nil { |
| 166 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) | 166 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) |
| @@ -225,7 +225,7 @@ func UpdateUser(c *gin.Context) { | |||
| 225 | } | 225 | } |
| 226 | // Update profile | 226 | // Update profile |
| 227 | _, err = database.DB.Exec(`UPDATE users SET username = $1, avatar_link = $2, country_code = $3, updated_at = $4 | 227 | _, err = database.DB.Exec(`UPDATE users SET username = $1, avatar_link = $2, country_code = $3, updated_at = $4 |
| 228 | WHERE steam_id = $5;`, profile.PersonaName, profile.AvatarFull, profile.LocCountryCode, time.Now().UTC(), user.(models.User).SteamID) | 228 | WHERE steam_id = $5`, profile.PersonaName, profile.AvatarFull, profile.LocCountryCode, time.Now().UTC(), user.(models.User).SteamID) |
| 229 | if err != nil { | 229 | if err != nil { |
| 230 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) | 230 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) |
| 231 | return | 231 | return |
| @@ -268,7 +268,7 @@ func UpdateCountryCode(c *gin.Context) { | |||
| 268 | return | 268 | return |
| 269 | } | 269 | } |
| 270 | var validCode string | 270 | var validCode string |
| 271 | err := database.DB.QueryRow(`SELECT country_code FROM countries WHERE country_code = $1;`, code).Scan(&validCode) | 271 | err := database.DB.QueryRow(`SELECT country_code FROM countries WHERE country_code = $1`, code).Scan(&validCode) |
| 272 | if err != nil { | 272 | if err != nil { |
| 273 | c.JSON(http.StatusNotFound, models.ErrorResponse(err.Error())) | 273 | c.JSON(http.StatusNotFound, models.ErrorResponse(err.Error())) |
| 274 | return | 274 | return |