Implement POST /users/status/ids for apiv4 (#5894)

Этот коммит содержится в:
Carlos Tadeu Panato Junior
2017-03-30 17:09:39 +02:00
коммит произвёл Corey Hulen
родитель ee3b983a63
Коммит 29e6db5713
6 изменённых файлов: 136 добавлений и 2 удалений

Просмотреть файл

@@ -194,10 +194,14 @@ func (c *Client4) GetPreferencesRoute(userId string) string {
return fmt.Sprintf(c.GetUserRoute(userId) + "/preferences")
}
func (c *Client4) GetStatusRoute(userId string) string {
func (c *Client4) GetUserStatusRoute(userId string) string {
return fmt.Sprintf(c.GetUserRoute(userId) + "/status")
}
func (c *Client4) GetUserStatusesRoute() string {
return fmt.Sprintf(c.GetUsersRoute() + "/status")
}
func (c *Client4) GetSamlRoute() string {
return fmt.Sprintf("/saml")
}
@@ -1989,10 +1993,20 @@ func (c *Client4) CreateCommand(cmd *Command) (*Command, *Response) {
// GetUserStatus returns a user based on the provided user id string.
func (c *Client4) GetUserStatus(userId, etag string) (*Status, *Response) {
if r, err := c.DoApiGet(c.GetStatusRoute(userId), etag); err != nil {
if r, err := c.DoApiGet(c.GetUserStatusRoute(userId), etag); err != nil {
return nil, &Response{StatusCode: r.StatusCode, Error: err}
} else {
defer closeBody(r)
return StatusFromJson(r.Body), BuildResponse(r)
}
}
// GetUsersStatusesByIds returns a list of users status based on the provided user ids.
func (c *Client4) GetUsersStatusesByIds(userIds []string) ([]*Status, *Response) {
if r, err := c.DoApiPost(c.GetUserStatusesRoute()+"/ids", ArrayToJson(userIds)); err != nil {
return nil, &Response{StatusCode: r.StatusCode, Error: err}
} else {
defer closeBody(r)
return StatusListFromJson(r.Body), BuildResponse(r)
}
}

Просмотреть файл

@@ -45,6 +45,26 @@ func StatusFromJson(data io.Reader) *Status {
}
}
func StatusListToJson(u []*Status) string {
b, err := json.Marshal(u)
if err != nil {
return ""
} else {
return string(b)
}
}
func StatusListFromJson(data io.Reader) []*Status {
decoder := json.NewDecoder(data)
var statuses []*Status
err := decoder.Decode(&statuses)
if err == nil {
return statuses
} else {
return nil
}
}
func StatusMapToInterfaceMap(statusMap map[string]*Status) map[string]interface{} {
interfaceMap := map[string]interface{}{}
for _, s := range statusMap {

Просмотреть файл

@@ -4,6 +4,7 @@
package model
import (
"encoding/json"
"strings"
"testing"
)
@@ -29,3 +30,44 @@ func TestStatus(t *testing.T) {
t.Fatal("Manual should have matched")
}
}
func TestStatusListToJson(t *testing.T) {
statuses := []*Status{{NewId(), STATUS_ONLINE, true, 0, ""}, {NewId(), STATUS_OFFLINE, true, 0, ""}}
jsonStatuses := StatusListToJson(statuses)
var dat []map[string]interface{}
if err := json.Unmarshal([]byte(jsonStatuses), &dat); err != nil {
panic(err)
}
if len(dat) != 2 {
t.Fatal("Status array should contain 2 elements")
}
if statuses[0].UserId != dat[0]["user_id"] {
t.Fatal("UserId should be equal")
}
if statuses[1].UserId != dat[1]["user_id"] {
t.Fatal("UserId should be equal")
}
}
func TestStatusListFromJson(t *testing.T) {
const jsonStream = `
[{"user_id":"k39fowpzhfffjxeaw8ecyrygme","status":"online","manual":true,"last_activity_at":0},{"user_id":"e9f1bbg8wfno7b3k7yk79bbwfy","status":"offline","manual":true,"last_activity_at":0}]
`
var dat []map[string]interface{}
if err := json.Unmarshal([]byte(jsonStream), &dat); err != nil {
panic(err)
}
toDec := strings.NewReader(jsonStream)
var statusesFromJson []*Status
statusesFromJson = StatusListFromJson(toDec)
if statusesFromJson[0].UserId != dat[0]["user_id"] {
t.Fatal("UserId should be equal")
}
if statusesFromJson[1].UserId != dat[1]["user_id"] {
t.Fatal("UserId should be equal")
}
}