From b960100d246a2c54778dc3501599adb1d7e4b224 Mon Sep 17 00:00:00 2001
From: Arda Serdar Pektezol <1669855+pektezol@users.noreply.github.com>
Date: Sat, 17 Jun 2023 17:26:46 +0300
Subject: fix: reorganize models (#44)

---
 backend/controllers/homeController.go | 25 +++++--------------------
 backend/controllers/userController.go |  2 +-
 2 files changed, 6 insertions(+), 21 deletions(-)

(limited to 'backend/controllers')

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) {
 	log.Println(query)
 	var response models.SearchResponse
 	// Cache all maps for faster response
-	var maps = []struct {
-		ID   int    `json:"id"`
-		Name string `json:"name"`
-	}{
+	var maps = []models.MapShort{
 		{ID: 1, Name: "Container Ride"},
 		{ID: 2, Name: "Portal Carousel"},
 		{ID: 3, Name: "Portal Gun"},
@@ -253,10 +250,7 @@ func SearchWithQuery(c *gin.Context) {
 		{ID: 109, Name: "Gel Maze"},
 		{ID: 110, Name: "Crazier Box"},
 	}
-	var filteredMaps []struct {
-		ID   int    `json:"id"`
-		Name string `json:"name"`
-	}
+	var filteredMaps []models.MapShort
 	for _, m := range maps {
 		if strings.Contains(strings.ToLower(m.Name), strings.ToLower(query)) {
 			filteredMaps = append(filteredMaps, m)
@@ -264,10 +258,7 @@ func SearchWithQuery(c *gin.Context) {
 	}
 	response.Maps = filteredMaps
 	if len(response.Maps) == 0 {
-		response.Maps = []struct {
-			ID   int    "json:\"id\""
-			Name string "json:\"name\""
-		}{}
+		response.Maps = []models.MapShort{}
 	}
 	rows, err := database.DB.Query("SELECT steam_id, user_name FROM users WHERE lower(user_name) LIKE $1", "%"+query+"%")
 	if err != nil {
@@ -275,10 +266,7 @@ func SearchWithQuery(c *gin.Context) {
 	}
 	defer rows.Close()
 	for rows.Next() {
-		var user struct {
-			SteamID  string `json:"steam_id"`
-			UserName string `json:"user_name"`
-		}
+		var user models.UserShort
 		if err := rows.Scan(&user.SteamID, &user.UserName); err != nil {
 			c.JSON(http.StatusBadRequest, models.ErrorResponse(err.Error()))
 			return
@@ -286,10 +274,7 @@ func SearchWithQuery(c *gin.Context) {
 		response.Players = append(response.Players, user)
 	}
 	if len(response.Players) == 0 {
-		response.Players = []struct {
-			SteamID  string "json:\"steam_id\""
-			UserName string "json:\"user_name\""
-		}{}
+		response.Players = []models.UserShort{}
 	}
 	c.JSON(http.StatusOK, models.Response{
 		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) {
 //	@Produce	json
 //	@Param		Authorization	header		string	true	"JWT Token"
 //	@Param		country_code	query		string	true	"Country Code [XX]"
-//	@Success	200				{object}	models.Response{data=models.ProfileResponse}
+//	@Success	200				{object}	models.Response
 //	@Failure	400				{object}	models.Response
 //	@Failure	401				{object}	models.Response
 //	@Router		/profile [put]
-- 
cgit v1.2.3