diff options
Diffstat (limited to 'backend/controllers')
| -rw-r--r-- | backend/controllers/homeController.go | 25 | ||||
| -rw-r--r-- | backend/controllers/userController.go | 2 |
2 files changed, 6 insertions, 21 deletions
diff --git a/backend/controllers/homeController.go b/backend/controllers/homeController.go index d30c835..b5c6b60 100644 --- a/backend/controllers/homeController.go +++ b/backend/controllers/homeController.go | |||
| @@ -138,10 +138,7 @@ func SearchWithQuery(c *gin.Context) { | |||
| 138 | log.Println(query) | 138 | log.Println(query) |
| 139 | var response models.SearchResponse | 139 | var response models.SearchResponse |
| 140 | // Cache all maps for faster response | 140 | // Cache all maps for faster response |
| 141 | var maps = []struct { | 141 | var maps = []models.MapShort{ |
| 142 | ID int `json:"id"` | ||
| 143 | Name string `json:"name"` | ||
| 144 | }{ | ||
| 145 | {ID: 1, Name: "Container Ride"}, | 142 | {ID: 1, Name: "Container Ride"}, |
| 146 | {ID: 2, Name: "Portal Carousel"}, | 143 | {ID: 2, Name: "Portal Carousel"}, |
| 147 | {ID: 3, Name: "Portal Gun"}, | 144 | {ID: 3, Name: "Portal Gun"}, |
| @@ -253,10 +250,7 @@ func SearchWithQuery(c *gin.Context) { | |||
| 253 | {ID: 109, Name: "Gel Maze"}, | 250 | {ID: 109, Name: "Gel Maze"}, |
| 254 | {ID: 110, Name: "Crazier Box"}, | 251 | {ID: 110, Name: "Crazier Box"}, |
| 255 | } | 252 | } |
| 256 | var filteredMaps []struct { | 253 | var filteredMaps []models.MapShort |
| 257 | ID int `json:"id"` | ||
| 258 | Name string `json:"name"` | ||
| 259 | } | ||
| 260 | for _, m := range maps { | 254 | for _, m := range maps { |
| 261 | if strings.Contains(strings.ToLower(m.Name), strings.ToLower(query)) { | 255 | if strings.Contains(strings.ToLower(m.Name), strings.ToLower(query)) { |
| 262 | filteredMaps = append(filteredMaps, m) | 256 | filteredMaps = append(filteredMaps, m) |
| @@ -264,10 +258,7 @@ func SearchWithQuery(c *gin.Context) { | |||
| 264 | } | 258 | } |
| 265 | response.Maps = filteredMaps | 259 | response.Maps = filteredMaps |
| 266 | if len(response.Maps) == 0 { | 260 | if len(response.Maps) == 0 { |
| 267 | response.Maps = []struct { | 261 | response.Maps = []models.MapShort{} |
| 268 | ID int "json:\"id\"" | ||
| 269 | Name string "json:\"name\"" | ||
| 270 | }{} | ||
| 271 | } | 262 | } |
| 272 | rows, err := database.DB.Query("SELECT steam_id, user_name FROM users WHERE lower(user_name) LIKE $1", "%"+query+"%") | 263 | rows, err := database.DB.Query("SELECT steam_id, user_name FROM users WHERE lower(user_name) LIKE $1", "%"+query+"%") |
| 273 | if err != nil { | 264 | if err != nil { |
| @@ -275,10 +266,7 @@ func SearchWithQuery(c *gin.Context) { | |||
| 275 | } | 266 | } |
| 276 | defer rows.Close() | 267 | defer rows.Close() |
| 277 | for rows.Next() { | 268 | for rows.Next() { |
| 278 | var user struct { | 269 | var user models.UserShort |
| 279 | SteamID string `json:"steam_id"` | ||
| 280 | UserName string `json:"user_name"` | ||
| 281 | } | ||
| 282 | if err := rows.Scan(&user.SteamID, &user.UserName); err != nil { | 270 | if err := rows.Scan(&user.SteamID, &user.UserName); err != nil { |
| 283 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) | 271 | c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error())) |
| 284 | return | 272 | return |
| @@ -286,10 +274,7 @@ func SearchWithQuery(c *gin.Context) { | |||
| 286 | response.Players = append(response.Players, user) | 274 | response.Players = append(response.Players, user) |
| 287 | } | 275 | } |
| 288 | if len(response.Players) == 0 { | 276 | if len(response.Players) == 0 { |
| 289 | response.Players = []struct { | 277 | response.Players = []models.UserShort{} |
| 290 | SteamID string "json:\"steam_id\"" | ||
| 291 | UserName string "json:\"user_name\"" | ||
| 292 | }{} | ||
| 293 | } | 278 | } |
| 294 | c.JSON(http.StatusOK, models.Response{ | 279 | c.JSON(http.StatusOK, models.Response{ |
| 295 | Success: true, | 280 | Success: true, |
diff --git a/backend/controllers/userController.go b/backend/controllers/userController.go index adf936b..cbce0fe 100644 --- a/backend/controllers/userController.go +++ b/backend/controllers/userController.go | |||
| @@ -251,7 +251,7 @@ func UpdateUser(c *gin.Context) { | |||
| 251 | // @Produce json | 251 | // @Produce json |
| 252 | // @Param Authorization header string true "JWT Token" | 252 | // @Param Authorization header string true "JWT Token" |
| 253 | // @Param country_code query string true "Country Code [XX]" | 253 | // @Param country_code query string true "Country Code [XX]" |
| 254 | // @Success 200 {object} models.Response{data=models.ProfileResponse} | 254 | // @Success 200 {object} models.Response |
| 255 | // @Failure 400 {object} models.Response | 255 | // @Failure 400 {object} models.Response |
| 256 | // @Failure 401 {object} models.Response | 256 | // @Failure 401 {object} models.Response |
| 257 | // @Router /profile [put] | 257 | // @Router /profile [put] |