PLT-4535/PLT-4503 Fix inactive users in searches and add option functionality to DB user search (#4413)

* Add options to user database search

* Fix inactive users showing up incorrectly in some user searches

* Read JSON for searchUsers API into anonymous struct

* Move anonymous struct to be a normal struct in model directory and upadte client to use it

* Added clarification comment about slightly odd query condition in search

3 files changed, 60 insertions, 4 deletions

diff --git a/model/client.go b/model/client.go
index e9d6c512c..02c6ac9b2 100644
--- a/model/client.go
+++ b/model/client.go
@@ -572,10 +572,8 @@ func (c *Client) GetProfilesByIds(userIds []string) (*Result, *AppError) {
 
 // SearchUsers returns a list of users that have a username matching or similar to the search term. Must
 // be authenticated.
-func (c *Client) SearchUsers(term string, teamId string, options map[string]string) (*Result, *AppError) {
-	options["term"] = term
-	options["team_id"] = teamId
-	if r, err := c.DoApiPost("/users/search", MapToJson(options)); err != nil {
+func (c *Client) SearchUsers(params UserSearch) (*Result, *AppError) {
+	if r, err := c.DoApiPost("/users/search", params.ToJson()); err != nil {
 		return nil, err
 	} else {
 		defer closeBody(r)
diff --git a/model/user_search.go b/model/user_search.go
new file mode 100644
index 000000000..4bbd2bd78
--- /dev/null
+++ b/model/user_search.go
@@ -0,0 +1,39 @@
+// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package model
+
+import (
+	"encoding/json"
+	"io"
+)
+
+type UserSearch struct {
+	Term           string `json:"term"`
+	TeamId         string `json:"team_id"`
+	InChannelId    string `json:"in_channel_id"`
+	NotInChannelId string `json:"not_in_channel_id"`
+	AllowInactive  bool   `json:"allow_inactive"`
+}
+
+// ToJson convert a User to a json string
+func (u *UserSearch) ToJson() string {
+	b, err := json.Marshal(u)
+	if err != nil {
+		return ""
+	} else {
+		return string(b)
+	}
+}
+
+// UserSearchFromJson will decode the input and return a User
+func UserSearchFromJson(data io.Reader) *UserSearch {
+	decoder := json.NewDecoder(data)
+	var us UserSearch
+	err := decoder.Decode(&us)
+	if err == nil {
+		return &us
+	} else {
+		return nil
+	}
+}
diff --git a/model/user_search_test.go b/model/user_search_test.go
new file mode 100644
index 000000000..b2543ffdb
--- /dev/null
+++ b/model/user_search_test.go
@@ -0,0 +1,19 @@
+// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package model
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestUserSearchJson(t *testing.T) {
+	userSearch := UserSearch{Term: NewId(), TeamId: NewId()}
+	json := userSearch.ToJson()
+	ruserSearch := UserSearchFromJson(strings.NewReader(json))
+
+	if userSearch.Term != ruserSearch.Term {
+		t.Fatal("Terms do not match")
+	}
+}