77d42568f9
* Add support for timed DND status - accept a date time value in api query when dnd mode for user needs to be unset - Create a new function to handle SetDNDStatus calls - Create a scheduled task to unset dnd mode to wahtever mode was before setting it to DND * update schema version * Model changes to make fields more intuitive - move dndendtime to status model - add new field prev status in status to keep track of previous status of user - update db migration function - make use of prevstatus and dndendtime from status model * set prev status and dndendtime appropriately after unsetting dnd mode * add json tag for dndendtime * unset dnd status only if not changed manually by user * update dnd statuses after server restart * make app-layers * fix failing tests * don't create sched task when setting status to DND * get only expired statuses from db - convert end time from any timezone to utc - store dnd end time in unix format for usability reasons * run update dnd status only on leader * make mocks * fix tests * run UpdateDNDStatusOfUsers as recurring task * save all statuses at once in db and update UpdateDNDStatusOfUsers logic * add app method to get timezone of user * store dnd end time in context.Params * set max size of prevstatus * update status model to take endtime input as string and store in db as unix time(int64) * Add tests for SetStatusDoNotDisturbTimed * if dnd_end_time is not passed the call old api to set dnd mode * fix tests * new plugin api to use new timed dnd mode * get and update rows in a single db query * dnd end time will be stored in request body and not route param * exclude statuses which has dndendtimeunix < 0 * update and get the updated dnd statuses in single db query * add updated status to cache * DNDEndTimeUnix and PrevStatus need not to be visible to users * update db schema version for migration * Keep Status and PrevStatus varchar size same * add test to verify status is restored after dnd end time expires * expect endtime in utc from client - remove store method GetTimezone as no longer needed - add documentation for SetStatusDoNotDisturbTimed * reduce sleep time for dnd timed restore test * more appropriate name for new api to update user status * update db migration function * parse and validate time before potentially triggering db query to get status of user * add migration changes in to existing upgrade function * not supporting un-timed dnd status via api * don't call Srv.Store directly, call via app layer * rename dndendtime to statuscleartime to make it suitable for custom status usage as well * Revert "rename dndendtime to statuscleartime to make it suitable for custom status usage as well" This reverts commit fa69152d9a3db18f1c59b34c878fb7ce494440b5. * mysql doesn't support RETURNING clause so add tx to get and update statuses * add UpdateDNDStatusOfUsers mock in tests * update store mock import path * add mock in storelib * Add status mocks to empty store * Close the task during server shutdown * Do not cancel a nil task * update squirrel queries * remove untimed dnd test * start recurring task to unset statuses on leadership change * set dndTask to nil after cancelling it upon server shutdown * new recurring task which starts at nearest rounded time of the interval * mock Get() call for status * return updated statuses in case of mysql * remove unneccessary code * add Get() mock to empty store * fix mocking for once and all * address review comments fix mysql updateStatus fn protect dndTask with mutex minor refactors * move runDNDStatusExpireJob to server.go and pass App as arg instead of method receiver * frontend will send endtime in unix epoch format so get rid of double representation * scan for all fields and not just two * add some tests and fix review comments * remove extra sql query and create needed result in go * add storetest for UpdateExpiredDNDStatuses * add migrations to latest version * update min supported version * add comment to fix a bug in future * update test to expect 1 status in return * rename UpdateUserStatusWithDNDTimeout to SetUserStatusTimedDND * rename DNDEndTimeUnix to DNDEndTime * cast int to int64 for equality * fix tests and error handling * move updating values to retrieved statuses fields outside sql transaction * move migrations to 5.36 Co-authored-by: Agniva De Sarker <agnivade@yahoo.co.in> Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
64 строки
2.1 KiB
Go
64 строки
2.1 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package model
|
|
|
|
import (
|
|
"encoding/json"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestStatus(t *testing.T) {
|
|
status := Status{NewId(), STATUS_ONLINE, true, 0, "123", 0, ""}
|
|
json := status.ToJson()
|
|
status2 := StatusFromJson(strings.NewReader(json))
|
|
|
|
assert.Equal(t, status.UserId, status2.UserId, "UserId should have matched")
|
|
assert.Equal(t, status.Status, status2.Status, "Status should have matched")
|
|
assert.Equal(t, status.LastActivityAt, status2.LastActivityAt, "LastActivityAt should have matched")
|
|
assert.Equal(t, status.Manual, status2.Manual, "Manual should have matched")
|
|
assert.Equal(t, "", status2.ActiveChannel)
|
|
|
|
json = status.ToClusterJson()
|
|
status2 = StatusFromJson(strings.NewReader(json))
|
|
|
|
assert.Equal(t, status.ActiveChannel, status2.ActiveChannel)
|
|
}
|
|
|
|
func TestStatusListToJson(t *testing.T) {
|
|
statuses := []*Status{{NewId(), STATUS_ONLINE, true, 0, "123", 0, ""}, {NewId(), STATUS_OFFLINE, true, 0, "", 0, ""}}
|
|
jsonStatuses := StatusListToJson(statuses)
|
|
|
|
var dat []map[string]interface{}
|
|
if err := json.Unmarshal([]byte(jsonStatuses), &dat); err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
assert.Equal(t, len(dat), 2)
|
|
|
|
_, ok := dat[0]["active_channel"]
|
|
assert.False(t, ok)
|
|
assert.Equal(t, statuses[0].ActiveChannel, "123")
|
|
assert.Equal(t, statuses[0].UserId, dat[0]["user_id"])
|
|
assert.Equal(t, statuses[1].UserId, dat[1]["user_id"])
|
|
}
|
|
|
|
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)
|
|
statusesFromJson := StatusListFromJson(toDec)
|
|
|
|
assert.Equal(t, statusesFromJson[0].UserId, dat[0]["user_id"], "UserId should be equal")
|
|
assert.Equal(t, statusesFromJson[1].UserId, dat[1]["user_id"], "UserId should be equal")
|
|
}
|