Adding guest accounts count telemetry (#14257)
* Adding guest accounts count telemetry * Adding missed methods to the opentracing an timer layer
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
819f57037b
Коммит
f6f025aeaa
@@ -38,6 +38,29 @@ func (_m *UserStore) AnalyticsActiveCount(time int64, options model.UserCountOpt
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// AnalyticsGetGuestCount provides a mock function with given fields:
|
||||
func (_m *UserStore) AnalyticsGetGuestCount() (int64, *model.AppError) {
|
||||
ret := _m.Called()
|
||||
|
||||
var r0 int64
|
||||
if rf, ok := ret.Get(0).(func() int64); ok {
|
||||
r0 = rf()
|
||||
} else {
|
||||
r0 = ret.Get(0).(int64)
|
||||
}
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func() *model.AppError); ok {
|
||||
r1 = rf()
|
||||
} else {
|
||||
if ret.Get(1) != nil {
|
||||
r1 = ret.Get(1).(*model.AppError)
|
||||
}
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// AnalyticsGetInactiveUsersCount provides a mock function with given fields:
|
||||
func (_m *UserStore) AnalyticsGetInactiveUsersCount() (int64, *model.AppError) {
|
||||
ret := _m.Called()
|
||||
|
||||
@@ -38,6 +38,7 @@ func TestUserStore(t *testing.T, ss store.Store, s SqlSupplier) {
|
||||
t.Run("AnalyticsActiveCount", func(t *testing.T) { testUserStoreAnalyticsActiveCount(t, ss, s) })
|
||||
t.Run("AnalyticsGetInactiveUsersCount", func(t *testing.T) { testUserStoreAnalyticsGetInactiveUsersCount(t, ss) })
|
||||
t.Run("AnalyticsGetSystemAdminCount", func(t *testing.T) { testUserStoreAnalyticsGetSystemAdminCount(t, ss) })
|
||||
t.Run("AnalyticsGetGuestCount", func(t *testing.T) { testUserStoreAnalyticsGetGuestCount(t, ss) })
|
||||
t.Run("Save", func(t *testing.T) { testUserStoreSave(t, ss) })
|
||||
t.Run("Update", func(t *testing.T) { testUserStoreUpdate(t, ss) })
|
||||
t.Run("UpdateUpdateAt", func(t *testing.T) { testUserStoreUpdateUpdateAt(t, ss) })
|
||||
@@ -3162,6 +3163,42 @@ func testUserStoreAnalyticsGetSystemAdminCount(t *testing.T, ss store.Store) {
|
||||
|
||||
}
|
||||
|
||||
func testUserStoreAnalyticsGetGuestCount(t *testing.T, ss store.Store) {
|
||||
countBefore, err := ss.User().AnalyticsGetSystemAdminCount()
|
||||
require.Nil(t, err)
|
||||
|
||||
u1 := model.User{}
|
||||
u1.Email = MakeEmail()
|
||||
u1.Username = model.NewId()
|
||||
u1.Roles = "system_user system_admin"
|
||||
|
||||
u2 := model.User{}
|
||||
u2.Email = MakeEmail()
|
||||
u2.Username = model.NewId()
|
||||
u2.Roles = "system_user"
|
||||
|
||||
u3 := model.User{}
|
||||
u3.Email = MakeEmail()
|
||||
u3.Username = model.NewId()
|
||||
u3.Roles = "system_guest"
|
||||
|
||||
_, err = ss.User().Save(&u1)
|
||||
require.Nil(t, err, "couldn't save user")
|
||||
defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
|
||||
|
||||
_, err = ss.User().Save(&u2)
|
||||
require.Nil(t, err, "couldn't save user")
|
||||
defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
|
||||
|
||||
_, err = ss.User().Save(&u3)
|
||||
require.Nil(t, err, "couldn't save user")
|
||||
defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
|
||||
|
||||
result, err := ss.User().AnalyticsGetSystemAdminCount()
|
||||
require.Nil(t, err)
|
||||
require.Equal(t, countBefore+1, result, "Did not get the expected number of system admins.")
|
||||
}
|
||||
|
||||
func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) {
|
||||
team, err := ss.Team().Save(&model.Team{
|
||||
DisplayName: "Team",
|
||||
|
||||
Ссылка в новой задаче
Block a user