diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-02-03 09:30:57 -0500 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2017-02-03 09:30:57 -0500 |
| commit | ccb034382850b7e8ea924a4559e47ef44203155c (patch) | |
| tree | 72026c58e6bb8e8ad679ac07476906281ffbb1d5 /store/sql_user_store.go | |
| parent | 177589b1e26fcabd7749dd0fbe8c39999c206609 (diff) | |
| download | chat-ccb034382850b7e8ea924a4559e47ef44203155c.tar.gz chat-ccb034382850b7e8ea924a4559e47ef44203155c.tar.bz2 chat-ccb034382850b7e8ea924a4559e47ef44203155c.zip | |
Implement POST /users/ids endpoint for APIv4 (#5274)
Diffstat (limited to 'store/sql_user_store.go')
| -rw-r--r-- | store/sql_user_store.go | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/store/sql_user_store.go b/store/sql_user_store.go index 02cbb3fbf..827c5a064 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -808,8 +808,7 @@ func (us SqlUserStore) GetProfileByIds(userIds []string, allowFromCache bool) St result := StoreResult{} metrics := einterfaces.GetMetricsInterface() - var users []*model.User - userMap := make(map[string]*model.User) + users := []*model.User{} props := make(map[string]interface{}) idQuery := "" remainingUserIds := make([]string, 0) @@ -818,13 +817,13 @@ func (us SqlUserStore) GetProfileByIds(userIds []string, allowFromCache bool) St for _, userId := range userIds { if cacheItem, ok := profileByIdsCache.Get(userId); ok { u := cacheItem.(*model.User) - userMap[u.Id] = u + users = append(users, u) } else { remainingUserIds = append(remainingUserIds, userId) } } if metrics != nil { - metrics.AddMemCacheHitCounter("Profile By Ids", float64(len(userMap))) + metrics.AddMemCacheHitCounter("Profile By Ids", float64(len(users))) metrics.AddMemCacheMissCounter("Profile By Ids", float64(len(remainingUserIds))) } } else { @@ -836,7 +835,7 @@ func (us SqlUserStore) GetProfileByIds(userIds []string, allowFromCache bool) St // If everything came from the cache then just return if len(remainingUserIds) == 0 { - result.Data = userMap + result.Data = users storeChannel <- result close(storeChannel) return @@ -859,11 +858,10 @@ func (us SqlUserStore) GetProfileByIds(userIds []string, allowFromCache bool) St u.Password = "" u.AuthData = new(string) *u.AuthData = "" - userMap[u.Id] = u profileByIdsCache.AddWithExpiresInSecs(u.Id, u, PROFILE_BY_IDS_CACHE_SEC) } - result.Data = userMap + result.Data = users } storeChannel <- result |