updates to search for users

src/dto/dto.go

@@ -0,0 +1,10 @@
+package dto
+
+type UserInfo struct {
+	UserId int64 `json:"id"`
+}
+
+type UserResponse struct {
+	UserId   int64  `json:"userId"`
+	Username string `json:"username"`
+}

src/handler/handler.go

@@ -3,6 +3,7 @@ package handler
 import (
 	"dwelt/src/auth"
 	"dwelt/src/config"
+	"dwelt/src/dto"
 	"dwelt/src/service/usrserv"
 	"dwelt/src/utils"
 	"dwelt/src/ws/chat"
@@ -55,7 +56,7 @@ func handlerLogin(w http.ResponseWriter, r *http.Request) {
 
 	token := auth.GenerateToken(userId)
 	w.Header().Set("Authorization", "Bearer "+token)
-	utils.WriteJson(w, userInfo{UserId: userId})
+	utils.WriteJson(w, dto.UserInfo{UserId: userId})
 }
 
 func handlerRegister(w http.ResponseWriter, r *http.Request) {
@@ -78,12 +79,12 @@ func handlerRegister(w http.ResponseWriter, r *http.Request) {
 
 	token := auth.GenerateToken(userId)
 	w.Header().Set("Authorization", "Bearer "+token)
-	utils.WriteJson(w, userInfo{UserId: userId})
+	utils.WriteJson(w, dto.UserInfo{UserId: userId})
 }
 
 func handlerSearchUsers(w http.ResponseWriter, r *http.Request) {
-	substring := r.URL.Query().Get("substring")
-	users, err := usrserv.SearchUsers(substring, DEFAULT_LIMIT)
+	prefix := r.URL.Query().Get("prefix")
+	users, err := usrserv.SearchUsers(prefix, DEFAULT_LIMIT)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		return

src/service/usrserv/mapping.go

@@ -0,0 +1,13 @@
+package usrserv
+
+import (
+	"dwelt/src/dto"
+	"dwelt/src/model/entity"
+)
+
+func userResponseFromEntity(user entity.User) dto.UserResponse {
+	return dto.UserResponse{
+		UserId:   user.ID,
+		Username: user.Username,
+	}
+}

src/service/usrserv/usrserv.go

@@ -2,6 +2,7 @@ package usrserv
 
 import (
 	"crypto/sha512"
+	"dwelt/src/dto"
 	"dwelt/src/model/dao"
 	"dwelt/src/model/entity"
 	"encoding/hex"
@@ -58,14 +59,14 @@ func RegisterUser(username string, password string) (userId int64, duplicate boo
 	return
 }
 
-func SearchUsers(substring string, limit int) (users []UserResponse, err error) {
+func SearchUsers(prefix string, limit int) (users []dto.UserResponse, err error) {
 	var usersEntity []entity.User
-	err = dao.Db.Where("username LIKE ?", substring+"%").Limit(limit).Find(&usersEntity).Error
+	err = dao.Db.Where("username LIKE ?", prefix+"%").Limit(limit).Find(&usersEntity).Error
 	if err != nil {
 		slog.Error(err.Error(), "method", "SearchUsers")
 	}
 
-	users = make([]UserResponse, len(usersEntity))
+	users = make([]dto.UserResponse, len(usersEntity))
 	for i, user := range usersEntity {
 		users[i] = userResponseFromEntity(user)
 	}