OTUS
/
HighLoad_HomeWork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Меняем OR на AND

actency-mysql57-replication
Andrey Ivanov 2021-02-01 10:36:26 +03:00 committed by ya@tiburon.su
parent 1b2cc3866f
commit 0d9b504be6
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/handlers/handlers.go
View File

@ -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) { 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 := make(map[string]interface{})
doc["user"] = user.(*auth.UserModel) doc["user"] = user.(*auth.UserModel)
var users []auth.UserModel var users []auth.UserModel
@ -132,11 +133,11 @@ func PostUserList(app application.App, user auth.User, r render.Render, req *htt
relations relations
WHERE WHERE
relations.userId=?) 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,
user.(*auth.UserModel).Id, user.(*auth.UserModel).Id,
pref, postName,
pref, postSurname,
) )
if err != nil || results == nil { if err != nil || results == nil {
err500("can't get user list from DB: ", err, r) 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) { 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{}) doc := make(map[string]interface{})
var users []auth.UserModel var users []auth.UserModel
var tmp auth.UserModel var tmp auth.UserModel
@ -181,9 +183,9 @@ func PostUserSearch(app application.App, r render.Render, req *http.Request) {
FROM FROM
users users
WHERE WHERE
( users.Name LIKE concat(?, '%') OR users.Surname LIKE concat(?, '%') )`, ( users.Name LIKE concat(?, '%') AND users.Surname LIKE concat(?, '%') )`,
pref, postName,
pref, postSurname,
) )
if err != nil || results == nil { if err != nil || results == nil {
err500("can't get user list from DB: ", err, r) err500("can't get user list from DB: ", err, r)

5
templates/list.tmpl
View File

@ -21,8 +21,9 @@
<h2>Search users</h2> <h2>Search users</h2>
<form method="POST"> <form method="POST">
<div> <div>
<td><b>Поиск по префиксу имени и(или) фамилии</b></td> <td><b>Поиск по префиксу имени и фамилии</b></td><br />
<td><input type="text" name="pref" /></td> <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> <td><button>Search</button></td>
</div> </div>
</form> </form>