Make tests more reliable
MODIFY
userapi/storage/postgres/devices_table.go
userapi/storage/postgres/devices_table.go
@@ -75,7 +75,7 @@ const selectDeviceByTokenSQL = "" +
"SELECT session_id, device_id, localpart FROM device_devices WHERE access_token = $1"
const selectDeviceByIDSQL = "" +
- "SELECT display_name FROM device_devices WHERE localpart = $1 and device_id = $2"
+ "SELECT display_name, last_seen_ts, ip FROM device_devices WHERE localpart = $1 and device_id = $2"
const selectDevicesByLocalpartSQL = "" +
"SELECT device_id, display_name, last_seen_ts, ip, user_agent FROM device_devices WHERE localpart = $1 AND device_id != $2 ORDER BY last_seen_ts DESC"
@@ -215,15 +215,22 @@ func (s *devicesStatements) SelectDeviceByID(
ctx context.Context, localpart, deviceID string,
) (*api.Device, error) {
var dev api.Device
- var displayName sql.NullString
+ var displayName, ip sql.NullString
+ var lastseenTS sql.NullInt64
stmt := s.selectDeviceByIDStmt
- err := stmt.QueryRowContext(ctx, localpart, deviceID).Scan(&displayName)
+ err := stmt.QueryRowContext(ctx, localpart, deviceID).Scan(&displayName, &lastseenTS, &ip)
if err == nil {
dev.ID = deviceID
dev.UserID = userutil.MakeUserID(localpart, s.serverName)
if displayName.Valid {
dev.DisplayName = displayName.String
}
+ if lastseenTS.Valid {
+ dev.LastSeenTS = lastseenTS.Int64
+ }
+ if ip.Valid {
+ dev.LastSeenIP = ip.String
+ }
}
return &dev, err
}

MODIFY
userapi/storage/sqlite3/devices_table.go
userapi/storage/sqlite3/devices_table.go
@@ -60,7 +60,7 @@ const selectDeviceByTokenSQL = "" +
"SELECT session_id, device_id, localpart FROM device_devices WHERE access_token = $1"
const selectDeviceByIDSQL = "" +
- "SELECT display_name FROM device_devices WHERE localpart = $1 and device_id = $2"
+ "SELECT display_name, last_seen_ts, ip FROM device_devices WHERE localpart = $1 and device_id = $2"
const selectDevicesByLocalpartSQL = "" +
"SELECT device_id, display_name, last_seen_ts, ip, user_agent FROM device_devices WHERE localpart = $1 AND device_id != $2 ORDER BY last_seen_ts DESC"
@@ -212,15 +212,22 @@ func (s *devicesStatements) SelectDeviceByID(
ctx context.Context, localpart, deviceID string,
) (*api.Device, error) {
var dev api.Device
- var displayName sql.NullString
+ var displayName, ip sql.NullString
stmt := s.selectDeviceByIDStmt
- err := stmt.QueryRowContext(ctx, localpart, deviceID).Scan(&displayName)
+ var lastseenTS sql.NullInt64
+ err := stmt.QueryRowContext(ctx, localpart, deviceID).Scan(&displayName, &lastseenTS, &ip)
if err == nil {
dev.ID = deviceID
dev.UserID = userutil.MakeUserID(localpart, s.serverName)
if displayName.Valid {
dev.DisplayName = displayName.String
}
+ if lastseenTS.Valid {
+ dev.LastSeenTS = lastseenTS.Int64
+ }
+ if ip.Valid {
+ dev.LastSeenIP = ip.String
+ }
}
return &dev, err
}

MODIFY
userapi/storage/storage_test.go
userapi/storage/storage_test.go
@@ -180,12 +180,12 @@ func Test_Devices(t *testing.T) {
deviceWithID.DisplayName = newName
deviceWithID.LastSeenIP = "127.0.0.1"
deviceWithID.LastSeenTS = int64(gomatrixserverlib.AsTimestamp(time.Now().Truncate(time.Second)))
- devices, err = db.GetDevicesByLocalpart(ctx, localpart)
+ gotDevice, err = db.GetDeviceByID(ctx, localpart, deviceWithID.ID)
assert.NoError(t, err, "unable to get device by id")
assert.Equal(t, 2, len(devices))
- assert.Equal(t, deviceWithID.DisplayName, devices[0].DisplayName)
- assert.Equal(t, deviceWithID.LastSeenIP, devices[0].LastSeenIP)
- truncatedTime := gomatrixserverlib.Timestamp(devices[0].LastSeenTS).Time().Truncate(time.Second)
+ assert.Equal(t, deviceWithID.DisplayName, gotDevice.DisplayName)
+ assert.Equal(t, deviceWithID.LastSeenIP, gotDevice.LastSeenIP)
+ truncatedTime := gomatrixserverlib.Timestamp(gotDevice.LastSeenTS).Time().Truncate(time.Second)
assert.Equal(t, gomatrixserverlib.Timestamp(deviceWithID.LastSeenTS), gomatrixserverlib.AsTimestamp(truncatedTime))
// create one more device and remove the devices step by step

Make tests more reliable