diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-01-19 09:00:13 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-19 09:00:13 -0500 |
commit | d3a285e64d051aa8d5c4c9854597dfbcce107675 (patch) | |
tree | e16ca3d52b6347a754e506aa8cac7457c62d3639 /store | |
parent | 61b7226533568f3261fc233538ce998bb71a5345 (diff) | |
download | chat-d3a285e64d051aa8d5c4c9854597dfbcce107675.tar.gz chat-d3a285e64d051aa8d5c4c9854597dfbcce107675.tar.bz2 chat-d3a285e64d051aa8d5c4c9854597dfbcce107675.zip |
Migrate functions to app package (#5106)
* Refactor and move session logic into app package
* Refactor email functions into the app package
* Refactor password update into app package
* Migrate user functions to app package
* Move team functions into app package
* Migrate channel functions into app package
* Pass SiteURL through to app functions
* Update based on feedback
Diffstat (limited to 'store')
-rw-r--r-- | store/sql_channel_store.go | 4 | ||||
-rw-r--r-- | store/sql_channel_store_test.go | 10 | ||||
-rw-r--r-- | store/sql_team_store.go | 4 | ||||
-rw-r--r-- | store/sql_team_store_test.go | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 66562ae67..6ac69df5a 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -702,7 +702,7 @@ func (s SqlChannelStore) GetMember(channelId string, userId string) StoreChannel result.Err = model.NewLocAppError("SqlChannelStore.GetMember", "store.sql_channel.get_member.app_error", nil, "channel_id="+channelId+"user_id="+userId+","+err.Error()) } } else { - result.Data = member + result.Data = &member } storeChannel <- result @@ -1361,7 +1361,7 @@ func (s SqlChannelStore) GetMembersByIds(channelId string, userIds []string) Sto if _, err := s.GetReplica().Select(&members, "SELECT * FROM ChannelMembers WHERE ChannelId = :ChannelId AND UserId IN ("+idQuery+")", props); err != nil { result.Err = model.NewLocAppError("SqlChannelStore.GetMembersByIds", "store.sql_channel.get_members_by_ids.app_error", nil, "channelId="+channelId+" "+err.Error()) } else { - result.Data = members + result.Data = &members } storeChannel <- result diff --git a/store/sql_channel_store_test.go b/store/sql_channel_store_test.go index 6186a242c..38446bf94 100644 --- a/store/sql_channel_store_test.go +++ b/store/sql_channel_store_test.go @@ -446,7 +446,7 @@ func TestChannelMemberStore(t *testing.T) { t.Fatal("Member update time incorrect on delete") } - member := (<-store.Channel().GetMember(o1.ChannelId, o1.UserId)).Data.(model.ChannelMember) + member := (<-store.Channel().GetMember(o1.ChannelId, o1.UserId)).Data.(*model.ChannelMember) if member.ChannelId != o1.ChannelId { t.Fatal("should have go member") } @@ -918,7 +918,7 @@ func TestGetMember(t *testing.T) { if result := <-store.Channel().GetMember(c1.Id, userId); result.Err != nil { t.Fatal("shouldn't have errored when getting member", result.Err) - } else if member := result.Data.(model.ChannelMember); member.ChannelId != c1.Id { + } else if member := result.Data.(*model.ChannelMember); member.ChannelId != c1.Id { t.Fatal("should've gotten member of channel 1") } else if member.UserId != userId { t.Fatal("should've gotten member for user") @@ -926,7 +926,7 @@ func TestGetMember(t *testing.T) { if result := <-store.Channel().GetMember(c2.Id, userId); result.Err != nil { t.Fatal("shouldn't have errored when getting member", result.Err) - } else if member := result.Data.(model.ChannelMember); member.ChannelId != c2.Id { + } else if member := result.Data.(*model.ChannelMember); member.ChannelId != c2.Id { t.Fatal("should've gotten member of channel 2") } else if member.UserId != userId { t.Fatal("should've gotten member for user") @@ -1313,7 +1313,7 @@ func TestChannelStoreGetMembersByIds(t *testing.T) { if r := <-store.Channel().GetMembersByIds(m1.ChannelId, []string{m1.UserId}); r.Err != nil { t.Fatal(r.Err) } else { - rm1 := r.Data.(model.ChannelMembers)[0] + rm1 := (*r.Data.(*model.ChannelMembers))[0] if rm1.ChannelId != m1.ChannelId { t.Fatal("bad team id") @@ -1330,7 +1330,7 @@ func TestChannelStoreGetMembersByIds(t *testing.T) { if r := <-store.Channel().GetMembersByIds(m1.ChannelId, []string{m1.UserId, m2.UserId, model.NewId()}); r.Err != nil { t.Fatal(r.Err) } else { - rm := r.Data.(model.ChannelMembers) + rm := (*r.Data.(*model.ChannelMembers)) if len(rm) != 2 { t.Fatal("return wrong number of results") diff --git a/store/sql_team_store.go b/store/sql_team_store.go index 023ce8a5a..b0af895c5 100644 --- a/store/sql_team_store.go +++ b/store/sql_team_store.go @@ -301,7 +301,7 @@ func (s SqlTeamStore) GetAllTeamListing() StoreChannel { var data []*model.Team if _, err := s.GetReplica().Select(&data, query); err != nil { - result.Err = model.NewLocAppError("SqlTeamStore.GetAllTeams", "store.sql_team.get_all_team_listing.app_error", nil, err.Error()) + result.Err = model.NewLocAppError("SqlTeamStore.GetAllTeamListing", "store.sql_team.get_all_team_listing.app_error", nil, err.Error()) } for _, team := range data { @@ -438,7 +438,7 @@ func (s SqlTeamStore) GetMember(teamId string, userId string) StoreChannel { result.Err = model.NewLocAppError("SqlTeamStore.GetMember", "store.sql_team.get_member.app_error", nil, "teamId="+teamId+" userId="+userId+" "+err.Error()) } } else { - result.Data = member + result.Data = &member } storeChannel <- result diff --git a/store/sql_team_store_test.go b/store/sql_team_store_test.go index 8a302a9e2..0ea499d7e 100644 --- a/store/sql_team_store_test.go +++ b/store/sql_team_store_test.go @@ -415,7 +415,7 @@ func TestGetTeamMember(t *testing.T) { if r := <-store.Team().GetMember(m1.TeamId, m1.UserId); r.Err != nil { t.Fatal(r.Err) } else { - rm1 := r.Data.(model.TeamMember) + rm1 := r.Data.(*model.TeamMember) if rm1.TeamId != m1.TeamId { t.Fatal("bad team id") |