APIv4 post /teams/search (#5931)
Этот коммит содержится в:
коммит произвёл
Corey Hulen
родитель
6b61834ab1
Коммит
43e795448f
@@ -257,6 +257,48 @@ func (s SqlTeamStore) SearchByName(name string) StoreChannel {
|
||||
return storeChannel
|
||||
}
|
||||
|
||||
func (s SqlTeamStore) SearchAll(term string) StoreChannel {
|
||||
storeChannel := make(StoreChannel, 1)
|
||||
|
||||
go func() {
|
||||
result := StoreResult{}
|
||||
|
||||
var teams []*model.Team
|
||||
|
||||
if _, err := s.GetReplica().Select(&teams, "SELECT * FROM Teams WHERE Name LIKE :Term OR DisplayName LIKE :Term", map[string]interface{}{"Term": term + "%"}); err != nil {
|
||||
result.Err = model.NewLocAppError("SqlTeamStore.SearchAll", "store.sql_team.search_all_team.app_error", nil, "term="+term+", "+err.Error())
|
||||
}
|
||||
|
||||
result.Data = teams
|
||||
|
||||
storeChannel <- result
|
||||
close(storeChannel)
|
||||
}()
|
||||
|
||||
return storeChannel
|
||||
}
|
||||
|
||||
func (s SqlTeamStore) SearchOpen(term string) StoreChannel {
|
||||
storeChannel := make(StoreChannel, 1)
|
||||
|
||||
go func() {
|
||||
result := StoreResult{}
|
||||
|
||||
var teams []*model.Team
|
||||
|
||||
if _, err := s.GetReplica().Select(&teams, "SELECT * FROM Teams WHERE Type = 'O' AND (Name LIKE :Term OR DisplayName LIKE :Term)", map[string]interface{}{"Term": term + "%"}); err != nil {
|
||||
result.Err = model.NewLocAppError("SqlTeamStore.SearchOpen", "store.sql_team.search_open_team.app_error", nil, "term="+term+", "+err.Error())
|
||||
}
|
||||
|
||||
result.Data = teams
|
||||
|
||||
storeChannel <- result
|
||||
close(storeChannel)
|
||||
}()
|
||||
|
||||
return storeChannel
|
||||
}
|
||||
|
||||
func (s SqlTeamStore) GetAll() StoreChannel {
|
||||
storeChannel := make(StoreChannel, 1)
|
||||
|
||||
|
||||
@@ -4,9 +4,10 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"github.com/mattermost/platform/model"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/mattermost/platform/model"
|
||||
)
|
||||
|
||||
func TestTeamStoreSave(t *testing.T) {
|
||||
@@ -156,6 +157,130 @@ func TestTeamStoreSearchByName(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestTeamStoreSearchAll(t *testing.T) {
|
||||
Setup()
|
||||
|
||||
o1 := model.Team{}
|
||||
o1.DisplayName = "ADisplayName" + model.NewId()
|
||||
o1.Name = "a" + model.NewId() + "a"
|
||||
o1.Email = model.NewId() + "@nowhere.com"
|
||||
o1.Type = model.TEAM_OPEN
|
||||
|
||||
if err := (<-store.Team().Save(&o1)).Err; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
p2 := model.Team{}
|
||||
p2.DisplayName = "BDisplayName" + model.NewId()
|
||||
p2.Name = "b" + model.NewId() + "b"
|
||||
p2.Email = model.NewId() + "@nowhere.com"
|
||||
p2.Type = model.TEAM_INVITE
|
||||
|
||||
if err := (<-store.Team().Save(&p2)).Err; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
r1 := <-store.Team().SearchAll(o1.Name)
|
||||
if r1.Err != nil {
|
||||
t.Fatal(r1.Err)
|
||||
}
|
||||
if len(r1.Data.([]*model.Team)) != 1 {
|
||||
t.Fatal("should have returned 1 team")
|
||||
}
|
||||
if r1.Data.([]*model.Team)[0].ToJson() != o1.ToJson() {
|
||||
t.Fatal("invalid returned team")
|
||||
}
|
||||
|
||||
r1 = <-store.Team().SearchAll(p2.DisplayName)
|
||||
if r1.Err != nil {
|
||||
t.Fatal(r1.Err)
|
||||
}
|
||||
if len(r1.Data.([]*model.Team)) != 1 {
|
||||
t.Fatal("should have returned 1 team")
|
||||
}
|
||||
if r1.Data.([]*model.Team)[0].ToJson() != p2.ToJson() {
|
||||
t.Fatal("invalid returned team")
|
||||
}
|
||||
|
||||
r1 = <-store.Team().SearchAll("junk")
|
||||
if r1.Err != nil {
|
||||
t.Fatal(r1.Err)
|
||||
}
|
||||
if len(r1.Data.([]*model.Team)) != 0 {
|
||||
t.Fatal("should have not returned a team")
|
||||
}
|
||||
}
|
||||
|
||||
func TestTeamStoreSearchOpen(t *testing.T) {
|
||||
Setup()
|
||||
|
||||
o1 := model.Team{}
|
||||
o1.DisplayName = "ADisplayName" + model.NewId()
|
||||
o1.Name = "a" + model.NewId() + "a"
|
||||
o1.Email = model.NewId() + "@nowhere.com"
|
||||
o1.Type = model.TEAM_OPEN
|
||||
|
||||
if err := (<-store.Team().Save(&o1)).Err; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
p2 := model.Team{}
|
||||
p2.DisplayName = "BDisplayName" + model.NewId()
|
||||
p2.Name = "b" + model.NewId() + "b"
|
||||
p2.Email = model.NewId() + "@nowhere.com"
|
||||
p2.Type = model.TEAM_INVITE
|
||||
|
||||
if err := (<-store.Team().Save(&p2)).Err; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
r1 := <-store.Team().SearchOpen(o1.Name)
|
||||
if r1.Err != nil {
|
||||
t.Fatal(r1.Err)
|
||||
}
|
||||
if len(r1.Data.([]*model.Team)) != 1 {
|
||||
t.Fatal("should have returned 1 team")
|
||||
}
|
||||
if r1.Data.([]*model.Team)[0].ToJson() != o1.ToJson() {
|
||||
t.Fatal("invalid returned team")
|
||||
}
|
||||
|
||||
r1 = <-store.Team().SearchOpen(o1.DisplayName)
|
||||
if r1.Err != nil {
|
||||
t.Fatal(r1.Err)
|
||||
}
|
||||
if len(r1.Data.([]*model.Team)) != 1 {
|
||||
t.Fatal("should have returned 1 team")
|
||||
}
|
||||
if r1.Data.([]*model.Team)[0].ToJson() != o1.ToJson() {
|
||||
t.Fatal("invalid returned team")
|
||||
}
|
||||
|
||||
r1 = <-store.Team().SearchOpen(p2.Name)
|
||||
if r1.Err != nil {
|
||||
t.Fatal(r1.Err)
|
||||
}
|
||||
if len(r1.Data.([]*model.Team)) != 0 {
|
||||
t.Fatal("should have not returned a team")
|
||||
}
|
||||
|
||||
r1 = <-store.Team().SearchOpen(p2.DisplayName)
|
||||
if r1.Err != nil {
|
||||
t.Fatal(r1.Err)
|
||||
}
|
||||
if len(r1.Data.([]*model.Team)) != 0 {
|
||||
t.Fatal("should have not returned a team")
|
||||
}
|
||||
|
||||
r1 = <-store.Team().SearchOpen("junk")
|
||||
if r1.Err != nil {
|
||||
t.Fatal(r1.Err)
|
||||
}
|
||||
if len(r1.Data.([]*model.Team)) != 0 {
|
||||
t.Fatal("should have not returned a team")
|
||||
}
|
||||
}
|
||||
|
||||
func TestTeamStoreGetByIniviteId(t *testing.T) {
|
||||
Setup()
|
||||
|
||||
|
||||
@@ -61,6 +61,8 @@ type TeamStore interface {
|
||||
Get(id string) StoreChannel
|
||||
GetByName(name string) StoreChannel
|
||||
SearchByName(name string) StoreChannel
|
||||
SearchAll(term string) StoreChannel
|
||||
SearchOpen(term string) StoreChannel
|
||||
GetAll() StoreChannel
|
||||
GetAllPage(offset int, limit int) StoreChannel
|
||||
GetAllTeamListing() StoreChannel
|
||||
|
||||
Ссылка в новой задаче
Block a user