opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-24 16:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Team Edition User Limit Update (#33888)

Browse Source 
* Lower user limit for TE to final limit

* Added warning banner for user soft limit

* Linting

* Fix test

* Fix tests
This commit is contained in:
Maria A Nunez
2025-09-15 11:39:52 -04:00
committed by GitHub
parent 06b1bf3a51
commit 072c402e49
9 changed files with 282 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/channels/api4/limits_test.go
+2 -2
View File
@@ -29,8 +29,8 @@ func TestGetServerLimits(t *testing.T) {
// Should have full access to all limits data
require.Greater(t, serverLimits.ActiveUserCount, int64(0))
require.Equal(t, int64(2500), serverLimits.MaxUsersLimit)
require.Equal(t, int64(5000), serverLimits.MaxUsersHardLimit)
require.Equal(t, int64(200), serverLimits.MaxUsersLimit)
require.Equal(t, int64(250), serverLimits.MaxUsersHardLimit)
require.Equal(t, int64(0), serverLimits.PostHistoryLimit)
require.Equal(t, int64(0), serverLimits.LastAccessiblePostTime)
})
server/channels/app/limits.go
+2 -2
View File
@@ -10,8 +10,8 @@ import (
)
const (
maxUsersLimit = 2_500
maxUsersHardLimit = 5_000
maxUsersLimit = 200
maxUsersHardLimit = 250
)
func (a *App) GetServerLimits() (*model.ServerLimits, *model.AppError) {
server/channels/app/limits_test.go
+7 -7
View File
@@ -28,8 +28,8 @@ func TestGetServerLimits(t *testing.T) {
// InitBasic creates 3 users by default
require.Equal(t, int64(3), serverLimits.ActiveUserCount)
require.Equal(t, int64(2500), serverLimits.MaxUsersLimit)
require.Equal(t, int64(5000), serverLimits.MaxUsersHardLimit)
require.Equal(t, int64(200), serverLimits.MaxUsersLimit)
require.Equal(t, int64(250), serverLimits.MaxUsersHardLimit)
})
t.Run("user count should increase on creating new user and decrease on permanently deleting", func(t *testing.T) {
@@ -279,7 +279,7 @@ func TestIsAtUserLimit(t *testing.T) {
th.App.Srv().SetLicense(nil)
mockUserStore := storemocks.UserStore{}
mockUserStore.On("Count", mock.Anything).Return(int64(4000), nil) // Under hard limit of 5000
mockUserStore.On("Count", mock.Anything).Return(int64(200), nil) // Under hard limit of 250
mockStore := th.App.Srv().Store().(*storemocks.Store)
mockStore.On("User").Return(&mockUserStore)
@@ -295,7 +295,7 @@ func TestIsAtUserLimit(t *testing.T) {
th.App.Srv().SetLicense(nil)
mockUserStore := storemocks.UserStore{}
mockUserStore.On("Count", mock.Anything).Return(int64(5000), nil) // At hard limit of 5000
mockUserStore.On("Count", mock.Anything).Return(int64(250), nil) // At hard limit of 250
mockStore := th.App.Srv().Store().(*storemocks.Store)
mockStore.On("User").Return(&mockUserStore)
@@ -311,7 +311,7 @@ func TestIsAtUserLimit(t *testing.T) {
th.App.Srv().SetLicense(nil)
mockUserStore := storemocks.UserStore{}
mockUserStore.On("Count", mock.Anything).Return(int64(6000), nil) // Over hard limit of 5000
mockUserStore.On("Count", mock.Anything).Return(int64(300), nil) // Over hard limit of 250
mockStore := th.App.Srv().Store().(*storemocks.Store)
mockStore.On("User").Return(&mockUserStore)
@@ -547,8 +547,8 @@ func TestExtraUsersBehavior(t *testing.T) {
require.Nil(t, appErr)
// Unlicensed servers use hard-coded limits without extra users
require.Equal(t, int64(2500), serverLimits.MaxUsersLimit)
require.Equal(t, int64(5000), serverLimits.MaxUsersHardLimit)
require.Equal(t, int64(200), serverLimits.MaxUsersLimit)
require.Equal(t, int64(250), serverLimits.MaxUsersHardLimit)
})
}