5 files changed, 56 insertions, 9 deletions

diff --git a/backend/controllers/homeController.go b/backend/controllers/homeController.go
index edb770f..d30c835 100644
--- a/backend/controllers/homeController.go
+++ b/backend/controllers/homeController.go
@@ -3,6 +3,7 @@ package controllers
 import (
         "log"
         "net/http"
+        "strings"
 
         "github.com/gin-gonic/gin"
         "github.com/pektezol/leastportals/backend/database"
@@ -122,15 +123,19 @@ func Rankings(c *gin.Context) {
         })
 }
 
-// GET Search
+// GET Search With Query
 //
-//      @Summary        Get all user and map data.
+//      @Summary        Get all user and map data matching to the query.
 //      @Tags           search
 //      @Produce        json
+//      @Param          q       query           string  false   "Search user or map name."
 //      @Success        200     {object}        models.Response{data=models.SearchResponse}
 //      @Failure        400     {object}        models.Response
 //      @Router         /search [get]
-func Search(c *gin.Context) {
+func SearchWithQuery(c *gin.Context) {
+        query := c.Query("q")
+        query = strings.ToLower(query)
+        log.Println(query)
         var response models.SearchResponse
         // Cache all maps for faster response
         var maps = []struct {
@@ -248,8 +253,23 @@ func Search(c *gin.Context) {
                 {ID: 109, Name: "Gel Maze"},
                 {ID: 110, Name: "Crazier Box"},
         }
-        response.Maps = maps
-        rows, err := database.DB.Query("SELECT steam_id, user_name FROM users") //WHERE player_name LIKE ?", "%"+query+"%")
+        var filteredMaps []struct {
+                ID   int    `json:"id"`
+                Name string `json:"name"`
+        }
+        for _, m := range maps {
+                if strings.Contains(strings.ToLower(m.Name), strings.ToLower(query)) {
+                        filteredMaps = append(filteredMaps, m)
+                }
+        }
+        response.Maps = filteredMaps
+        if len(response.Maps) == 0 {
+                response.Maps = []struct {
+                        ID   int    "json:\"id\""
+                        Name string "json:\"name\""
+                }{}
+        }
+        rows, err := database.DB.Query("SELECT steam_id, user_name FROM users WHERE lower(user_name) LIKE $1", "%"+query+"%")
         if err != nil {
                 log.Fatal(err)
         }
@@ -265,6 +285,12 @@ func Search(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\""
+                }{}
+        }
         c.JSON(http.StatusOK, models.Response{
                 Success: true,
                 Message: "Search successfully retrieved.",
diff --git a/backend/routes/routes.go b/backend/routes/routes.go
index 96da1ce..bf8a995 100644
--- a/backend/routes/routes.go
+++ b/backend/routes/routes.go
@@ -29,7 +29,7 @@ func InitRoutes(router *gin.Engine) {
                 v1.GET("/maps/:id/leaderboards", middleware.CheckAuth, controllers.FetchMapLeaderboards)
                 v1.POST("/maps/:id/record", middleware.CheckAuth, controllers.CreateRecordWithDemo)
                 v1.GET("/rankings", middleware.CheckAuth, controllers.Rankings)
-                v1.GET("/search", controllers.Search)
+                v1.GET("/search", controllers.SearchWithQuery)
                 v1.GET("/games", controllers.FetchGames)
                 v1.GET("/games/:id", controllers.FetchChapters)
                 v1.GET("/chapters/:id", controllers.FetchChapterMaps)
diff --git a/docs/docs.go b/docs/docs.go
index d39fd1c..34aa7f4 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -651,7 +651,15 @@ const docTemplate = `{
                 "tags": [
                     "search"
                 ],
-                "summary": "Get all user and map data.",
+                "summary": "Get all user and map data matching to the query.",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "Search user or map name.",
+                        "name": "q",
+                        "in": "query"
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "OK",
diff --git a/docs/swagger.json b/docs/swagger.json
index ad2a659..8491d2e 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -644,7 +644,15 @@
                 "tags": [
                     "search"
                 ],
-                "summary": "Get all user and map data.",
+                "summary": "Get all user and map data matching to the query.",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "Search user or map name.",
+                        "name": "q",
+                        "in": "query"
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "OK",
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index d62b46b..597df9f 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -574,6 +574,11 @@ paths:
       - users
   /search:
     get:
+      parameters:
+      - description: Search user or map name.
+        in: query
+        name: q
+        type: string
       produces:
       - application/json
       responses:
@@ -590,7 +595,7 @@ paths:
           description: Bad Request
           schema:
             $ref: '#/definitions/models.Response'
-      summary: Get all user and map data.
+      summary: Get all user and map data matching to the query.
       tags:
       - search
   /token: