diff options
Diffstat (limited to 'store')
-rw-r--r-- | store/sql_post_store.go | 3 | ||||
-rw-r--r-- | store/sql_store.go | 4 | ||||
-rw-r--r-- | store/sql_team_store.go | 21 | ||||
-rw-r--r-- | store/sql_team_store_test.go | 31 | ||||
-rw-r--r-- | store/store.go | 1 |
5 files changed, 57 insertions, 3 deletions
diff --git a/store/sql_post_store.go b/store/sql_post_store.go index d7d009ce4..8b1c2bf9b 100644 --- a/store/sql_post_store.go +++ b/store/sql_post_store.go @@ -598,6 +598,7 @@ var specialSearchChar = []string{ ")", "~", "@", + ":", } func (s SqlPostStore) Search(teamId string, userId string, params *model.SearchParams) StoreChannel { @@ -628,7 +629,7 @@ func (s SqlPostStore) Search(teamId string, userId string, params *model.SearchP } } - // these chars have speical meaning and can be treated as spaces + // these chars have special meaning and can be treated as spaces for _, c := range specialSearchChar { terms = strings.Replace(terms, c, " ", -1) } diff --git a/store/sql_store.go b/store/sql_store.go index 0979579df..e45d1ef94 100644 --- a/store/sql_store.go +++ b/store/sql_store.go @@ -101,7 +101,7 @@ func NewSqlStore() Store { } } - // This is a speical case for upgrading the schema to the 3.0 user model + // This is a special case for upgrading the schema to the 3.0 user model // ADDED for 3.0 REMOVE for 3.4 if sqlStore.SchemaVersion == "2.2.0" || sqlStore.SchemaVersion == "2.1.0" || @@ -183,7 +183,7 @@ func NewSqlStore() Store { } // ADDED for 3.0 REMOVE for 3.4 -// This is a speical case for upgrading the schema to the 3.0 user model +// This is a special case for upgrading the schema to the 3.0 user model func NewSqlStoreForUpgrade30() *SqlStore { sqlStore := initConnection() diff --git a/store/sql_team_store.go b/store/sql_team_store.go index 4692ecd3e..a9f265273 100644 --- a/store/sql_team_store.go +++ b/store/sql_team_store.go @@ -411,6 +411,27 @@ func (s SqlTeamStore) UpdateMember(member *model.TeamMember) StoreChannel { return storeChannel } +func (s SqlTeamStore) GetMember(teamId string, userId string) StoreChannel { + storeChannel := make(StoreChannel) + + go func() { + result := StoreResult{} + + var member model.TeamMember + err := s.GetReplica().SelectOne(&member, "SELECT * FROM TeamMembers WHERE TeamId = :TeamId AND UserId = :UserId", map[string]interface{}{"TeamId": teamId, "UserId": userId}) + if err != nil { + result.Err = model.NewLocAppError("SqlTeamStore.GetMember", "store.sql_team.get_member.app_error", nil, "teamId="+teamId+" userId="+userId+" "+err.Error()) + } else { + result.Data = member + } + + storeChannel <- result + close(storeChannel) + }() + + return storeChannel +} + func (s SqlTeamStore) GetMembers(teamId string) StoreChannel { storeChannel := make(StoreChannel) diff --git a/store/sql_team_store_test.go b/store/sql_team_store_test.go index d5ee15bc6..be72786d3 100644 --- a/store/sql_team_store_test.go +++ b/store/sql_team_store_test.go @@ -403,3 +403,34 @@ func TestTeamMembers(t *testing.T) { } } } + +func TestGetTeamMember(t *testing.T) { + Setup() + + teamId1 := model.NewId() + + m1 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} + Must(store.Team().SaveMember(m1)) + + if r := <-store.Team().GetMember(m1.TeamId, m1.UserId); r.Err != nil { + t.Fatal(r.Err) + } else { + rm1 := r.Data.(model.TeamMember) + + if rm1.TeamId != m1.TeamId { + t.Fatal("bad team id") + } + + if rm1.UserId != m1.UserId { + t.Fatal("bad user id") + } + } + + if r := <-store.Team().GetMember(m1.TeamId, ""); r.Err == nil { + t.Fatal("empty user id - should have failed") + } + + if r := <-store.Team().GetMember("", m1.UserId); r.Err == nil { + t.Fatal("empty team id - should have failed") + } +} diff --git a/store/store.go b/store/store.go index 7f62fcd97..ebbd2e454 100644 --- a/store/store.go +++ b/store/store.go @@ -61,6 +61,7 @@ type TeamStore interface { AnalyticsTeamCount() StoreChannel SaveMember(member *model.TeamMember) StoreChannel UpdateMember(member *model.TeamMember) StoreChannel + GetMember(teamId string, userId string) StoreChannel GetMembers(teamId string) StoreChannel GetTeamsForUser(userId string) StoreChannel RemoveMember(teamId string, userId string) StoreChannel |