From 0d9b504be62b5a440f74209e496a8f236c078bea Mon Sep 17 00:00:00 2001
From: Andrey Ivanov <tiburon-777@users.noreply.github.com>
Date: Mon, 1 Feb 2021 10:36:26 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BD=D1=8F=D0=B5=D0=BC=20OR=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20AND?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/handlers/handlers.go | 18 ++++++++++--------
 templates/list.tmpl           |  5 +++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/internal/handlers/handlers.go b/internal/handlers/handlers.go
index 17bb70c..e50f640 100755
--- a/internal/handlers/handlers.go
+++ b/internal/handlers/handlers.go
@@ -108,7 +108,8 @@ func GetUserList(app application.App, r render.Render) {
 }
 
 func PostUserList(app application.App, user auth.User, r render.Render, req *http.Request) {
-	pref := req.FormValue("pref")
+	postName := req.FormValue("name")
+	postSurname := req.FormValue("surname")
 	doc := make(map[string]interface{})
 	doc["user"] = user.(*auth.UserModel)
 	var users []auth.UserModel
@@ -132,11 +133,11 @@ func PostUserList(app application.App, user auth.User, r render.Render, req *htt
 					relations
 				WHERE
 					relations.userId=?)
-			AND ( users.Name LIKE concat(?, '%') OR users.Surname LIKE concat(?, '%') )`,
+			AND ( users.Name LIKE concat(?, '%') AND users.Surname LIKE concat(?, '%') )`,
 		user.(*auth.UserModel).Id,
 		user.(*auth.UserModel).Id,
-		pref,
-		pref,
+		postName,
+		postSurname,
 	)
 	if err != nil || results == nil {
 		err500("can't get user list from DB: ", err, r)
@@ -166,7 +167,8 @@ func PostUserList(app application.App, user auth.User, r render.Render, req *htt
 }
 
 func PostUserSearch(app application.App, r render.Render, req *http.Request) {
-	pref := req.FormValue("pref")
+	postName := req.FormValue("name")
+	postSurname := req.FormValue("surname")
 	doc := make(map[string]interface{})
 	var users []auth.UserModel
 	var tmp auth.UserModel
@@ -181,9 +183,9 @@ func PostUserSearch(app application.App, r render.Render, req *http.Request) {
 		FROM
 			users
 		WHERE
-		  	( users.Name LIKE concat(?, '%') OR users.Surname LIKE concat(?, '%') )`,
-		pref,
-		pref,
+		  	( users.Name LIKE concat(?, '%') AND users.Surname LIKE concat(?, '%') )`,
+		postName,
+		postSurname,
 	)
 	if err != nil || results == nil {
 		err500("can't get user list from DB: ", err, r)
diff --git a/templates/list.tmpl b/templates/list.tmpl
index 3851def..80af5b5 100644
--- a/templates/list.tmpl
+++ b/templates/list.tmpl
@@ -21,8 +21,9 @@
         <h2>Search users</h2>
         <form method="POST">
             <div>
-                <td><b>Поиск по префиксу имени и(или) фамилии</b></td>
-                <td><input type="text" name="pref" /></td>
+                <td><b>Поиск по префиксу имени и фамилии</b></td><br />
+                <td><a>Префикс имени: </a><input type="text" name="name" /></td><br />
+                <td><a>Префикс фамилии: </a><input type="text" name="surname" /></td><br />
                 <td><button>Search</button></td>
             </div>
         </form>