From 4820c7696db3c54959258b1a5b00c77e1246cbd7 Mon Sep 17 00:00:00 2001 From: Arda Serdar Pektezol <1669855+pektezol@users.noreply.github.com> Date: Fri, 6 Jan 2023 23:55:12 +0300 Subject: what the fuck is this mess (#21) --- backend/controllers/userController.go | 168 +++++++--------------------------- 1 file changed, 32 insertions(+), 136 deletions(-) (limited to 'backend/controllers/userController.go') diff --git a/backend/controllers/userController.go b/backend/controllers/userController.go index 87a9427..70a2a34 100644 --- a/backend/controllers/userController.go +++ b/backend/controllers/userController.go @@ -13,161 +13,57 @@ func Profile(c *gin.Context) { // Check if user exists user, exists := c.Get("user") if !exists { - c.JSON(http.StatusUnauthorized, gin.H{ - "code": http.StatusUnauthorized, - "output": gin.H{ - "error": "User not logged in. Could be invalid token.", - }, - }) - return - } else { - user := user.(models.User) - c.JSON(http.StatusOK, gin.H{ - "code": http.StatusOK, - "output": gin.H{ - "avatar": user.AvatarLink, - "country": user.CountryCode, - "types": user.TypeToString(), - "username": user.Username, - }, - "profile": true, - }) - return - } -} - -func FetchUser(c *gin.Context) { - id := c.Param("id") - // Check if id is all numbers and 17 length - match, _ := regexp.MatchString("^[0-9]{17}$", id) - if !match { - c.JSON(http.StatusNotFound, gin.H{ - "code": http.StatusNotFound, - "output": gin.H{ - "error": "User not found.", - }, - }) - return - } - // Check if user exists - var targetUser models.User - database.DB.QueryRow(`SELECT * FROM users WHERE steam_id = $1;`, id).Scan( - &targetUser.SteamID, &targetUser.Username, &targetUser.AvatarLink, &targetUser.CountryCode, - &targetUser.CreatedAt, &targetUser.UpdatedAt, &targetUser.UserType) - if targetUser.SteamID == "" { - // User does not exist - c.JSON(http.StatusNotFound, gin.H{ - "code": http.StatusNotFound, - "output": gin.H{ - "error": "User not found.", - }, - }) + c.JSON(http.StatusUnauthorized, models.ErrorResponse("User not logged in.")) return } - // Target user exists - _, exists := c.Get("user") - if exists { - c.Redirect(http.StatusFound, "/api/v1/profile") - return - } - c.JSON(http.StatusOK, gin.H{ - "code": http.StatusOK, - "output": gin.H{ - "avatar": targetUser.AvatarLink, - "country": targetUser.CountryCode, - "types": targetUser.TypeToString(), - "username": targetUser.Username, + c.JSON(http.StatusOK, models.Response{ + Success: true, + Message: "", + Data: models.ProfileResponse{ + Profile: true, + SteamID: user.(models.User).SteamID, + Username: user.(models.User).Username, + AvatarLink: user.(models.User).AvatarLink, + CountryCode: user.(models.User).CountryCode, }, - "profile": false, }) return } -/*func UpdateUserCountry(c *gin.Context) { +func FetchUser(c *gin.Context) { id := c.Param("id") - cc := c.Param("country") // Check if id is all numbers and 17 length match, _ := regexp.MatchString("^[0-9]{17}$", id) if !match { - c.JSON(http.StatusNotFound, gin.H{ - "code": http.StatusNotFound, - "output": gin.H{ - "error": "User not found.", - }, - }) - return - } - // Check if valid country code length - match, _ = regexp.MatchString("^[A-Z]{2}$", cc) - if !match { - c.JSON(http.StatusNotFound, gin.H{ - "code": http.StatusNotFound, - "output": gin.H{ - "error": "Invalid country code.", - }, - }) + c.JSON(http.StatusNotFound, models.ErrorResponse("User not found.")) return } // Check if user exists - var targetUser models.User - database.DB.QueryRow(`SELECT * FROM users WHERE steam_id = $1;`, id).Scan( - &targetUser.SteamID, &targetUser.Username, &targetUser.AvatarLink, &targetUser.CountryCode, - &targetUser.CreatedAt, &targetUser.UpdatedAt, &targetUser.UserType) - if targetUser.SteamID == "" { + var user models.User + 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 == "" { // User does not exist - c.JSON(http.StatusNotFound, gin.H{ - "code": http.StatusNotFound, - "output": gin.H{ - "error": "User not found.", - }, - }) + c.JSON(http.StatusNotFound, models.ErrorResponse("User not found.")) return } - // Target user exists - user, exists := c.Get("user") - if exists { - user := user.(models.User) - if user.SteamID == targetUser.SteamID { - // Can change because it's our own profile - // TODO:Check if country code exists in database // ADD countries TABLE - var existingCC string - database.DB.QueryRow(`SELECT country_code FROM countries WHERE country_code = $1;`, cc).Scan(&existingCC) - if existingCC == "" { - c.JSON(http.StatusNotFound, gin.H{ - "code": http.StatusForbidden, - "output": gin.H{ - "error": "Given country code is not found.", - }, - }) - return - } - // Valid to change - database.DB.Exec(`UPDATE users SET country_code = $1 WHERE steam_id = $2`, cc, user.SteamID) - c.JSON(http.StatusOK, gin.H{ - "code": http.StatusOK, - "output": gin.H{ - "avatar": user.AvatarLink, - "country": user.CountryCode, - "types": user.TypeToString(), - "username": user.Username, - }, - "profile": true, - }) - return - } - c.JSON(http.StatusForbidden, gin.H{ - "code": http.StatusForbidden, - "output": gin.H{ - "error": "Can not change country of another user.", - }, - }) + if err != nil { + c.JSON(http.StatusInternalServerError, models.ErrorResponse(err.Error())) return } - c.JSON(http.StatusUnauthorized, gin.H{ - "code": http.StatusUnauthorized, - "output": gin.H{ - "error": "User not logged in. Could be invalid token.", + // Target user exists + _, exists := c.Get("user") + c.JSON(http.StatusOK, models.Response{ + Success: true, + Message: "", + Data: models.ProfileResponse{ + Profile: exists, + SteamID: user.SteamID, + Username: user.Username, + AvatarLink: user.AvatarLink, + CountryCode: user.CountryCode, }, }) return -}*/ +} -- cgit v1.2.3