Merge branch 'main' of https://github.com/pektezol/LeastPortals

Former-commit-id: af8d8680aafc3d662f8b53a4f50f0ea356b26c26

1 files changed, 35 insertions, 24 deletions

diff --git a/backend/controllers/homeController.go b/backend/controllers/homeController.go
index edb770f..2780e63 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"
@@ -22,12 +23,12 @@ func Home(c *gin.Context) {
 
 // GET Rankings
 //
-//      @Summary        Get rankings of every player.
-//      @Tags           rankings
-//      @Produce        json
-//      @Success        200     {object}        models.Response{data=models.RankingsResponse}
-//      @Failure        400     {object}        models.Response
-//      @Router         /demo [get]
+//      @Description    Get rankings of every player.
+//      @Tags                   rankings
+//      @Produce                json
+//      @Success                200     {object}        models.Response{data=models.RankingsResponse}
+//      @Failure                400     {object}        models.Response
+//      @Router                 /rankings [get]
 func Rankings(c *gin.Context) {
         rows, err := database.DB.Query(`SELECT steam_id, user_name FROM users`)
         if err != nil {
@@ -122,21 +123,22 @@ func Rankings(c *gin.Context) {
         })
 }
 
-// GET Search
+// GET Search With Query
 //
-//      @Summary        Get all user and map data.
-//      @Tags           search
-//      @Produce        json
-//      @Success        200     {object}        models.Response{data=models.SearchResponse}
-//      @Failure        400     {object}        models.Response
-//      @Router         /search [get]
-func Search(c *gin.Context) {
+//      @Description    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 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 {
-                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"},
@@ -248,23 +250,32 @@ 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 []models.MapShort
+        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 = []models.MapShort{}
+        }
+        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)
         }
         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
                 }
                 response.Players = append(response.Players, user)
         }
+        if len(response.Players) == 0 {
+                response.Players = []models.UserShort{}
+        }
         c.JSON(http.StatusOK, models.Response{
                 Success: true,
                 Message: "Search successfully retrieved.",