refactor: removed isWithinViewsLimit implementation

mattermost-community · Jun 1, 2024 · ca49fd2 · ca49fd2
1 parent 03719cb
commit ca49fd2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 115 deletions.
diff --git a/server/app/blocks.go b/server/app/blocks.go
@@ -156,35 +156,6 @@ func (a *App) InsertBlockAndNotify(block *model.Block, modifiedByID string, disa
 	return err
 }
 
-func (a *App) isWithinViewsLimit(boardID string, block *model.Block) (bool, error) {
-	// ToDo: Cloud Limits have been disabled by design. We should
-	// revisit the decision and update the related code accordingly
-
-	/*
-		limits, err := a.GetBoardsCloudLimits()
-		if err != nil {
-			return false, err
-		}
-
-		if limits.Views == model.LimitUnlimited {
-			return true, nil
-		}
-
-		views, err := a.store.GetBlocksWithParentAndType(boardID, block.ParentID, model.TypeView)
-		if err != nil {
-			return false, err
-		}
-
-		// < rather than <= because we'll be creating new view if this
-		// check passes. When that view is created, the limit will be reached.
-		// That's why we need to check for if existing + the being-created
-		// view doesn't exceed the limit.
-		return len(views) < limits.Views, nil
-	*/
-
-	return true, nil
-}
-
 func (a *App) InsertBlocks(blocks []*model.Block, modifiedByID string) ([]*model.Block, error) {
 	return a.InsertBlocksAndNotify(blocks, modifiedByID, false)
 }
@@ -209,20 +180,6 @@ func (a *App) InsertBlocksAndNotify(blocks []*model.Block, modifiedByID string,
 
 	needsNotify := make([]*model.Block, 0, len(blocks))
 	for i := range blocks {
-		// this check is needed to whitelist inbuilt template
-		// initialization. They do contain more than 5 views per board.
-		if boardID != "0" && blocks[i].Type == model.TypeView {
-			withinLimit, err := a.isWithinViewsLimit(board.ID, blocks[i])
-			if err != nil {
-				return nil, err
-			}
-
-			if !withinLimit {
-				a.logger.Info("views limit reached on board", mlog.String("board_id", blocks[i].ParentID), mlog.String("team_id", board.TeamID))
-				return nil, model.ErrViewsLimitReached
-			}
-		}
-
 		err := a.store.InsertBlock(blocks[i], modifiedByID)
 		if err != nil {
 			return nil, err

diff --git a/server/app/blocks_test.go b/server/app/blocks_test.go
@@ -4,8 +4,6 @@ import (
 	"database/sql"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 
@@ -186,76 +184,6 @@ func TestUndeleteBlock(t *testing.T) {
 	})
 }
 
-func TestIsWithinViewsLimit(t *testing.T) {
-	t.Skipf("The Cloud Limits feature has been disabled")
-
-	th, tearDown := SetupTestHelper(t)
-	defer tearDown()
-
-	fakeLicense := &mmModel.License{
-		Features: &mmModel.Features{Cloud: mmModel.NewBool(true)},
-	}
-
-	t.Run("within views limit", func(t *testing.T) {
-		th.Store.EXPECT().GetLicense().Return(fakeLicense)
-
-		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil)
-		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil)
-		th.Store.EXPECT().GetBlocksWithParentAndType("board_id", "parent_id", "view").Return([]*model.Block{{}}, nil)
-
-		withinLimits, err := th.App.isWithinViewsLimit("board_id", &model.Block{ParentID: "parent_id"})
-		assert.NoError(t, err)
-		assert.True(t, withinLimits)
-	})
-
-	t.Run("view limit exactly reached", func(t *testing.T) {
-		th.Store.EXPECT().GetLicense().Return(fakeLicense)
-
-		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil)
-		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil)
-		th.Store.EXPECT().GetBlocksWithParentAndType("board_id", "parent_id", "view").Return([]*model.Block{{}}, nil)
-
-		withinLimits, err := th.App.isWithinViewsLimit("board_id", &model.Block{ParentID: "parent_id"})
-		assert.NoError(t, err)
-		assert.False(t, withinLimits)
-	})
-
-	t.Run("view limit already exceeded", func(t *testing.T) {
-		th.Store.EXPECT().GetLicense().Return(fakeLicense)
-
-		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil)
-		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil)
-		th.Store.EXPECT().GetBlocksWithParentAndType("board_id", "parent_id", "view").Return([]*model.Block{{}, {}, {}}, nil)
-
-		withinLimits, err := th.App.isWithinViewsLimit("board_id", &model.Block{ParentID: "parent_id"})
-		assert.NoError(t, err)
-		assert.False(t, withinLimits)
-	})
-
-	t.Run("creating first view", func(t *testing.T) {
-		th.Store.EXPECT().GetLicense().Return(fakeLicense)
-
-		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil)
-		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil)
-		th.Store.EXPECT().GetBlocksWithParentAndType("board_id", "parent_id", "view").Return([]*model.Block{}, nil)
-
-		withinLimits, err := th.App.isWithinViewsLimit("board_id", &model.Block{ParentID: "parent_id"})
-		assert.NoError(t, err)
-		assert.True(t, withinLimits)
-	})
-
-	t.Run("is not a cloud SKU so limits don't apply", func(t *testing.T) {
-		nonCloudLicense := &mmModel.License{
-			Features: &mmModel.Features{Cloud: mmModel.NewBool(false)},
-		}
-		th.Store.EXPECT().GetLicense().Return(nonCloudLicense)
-
-		withinLimits, err := th.App.isWithinViewsLimit("board_id", &model.Block{ParentID: "parent_id"})
-		assert.NoError(t, err)
-		assert.True(t, withinLimits)
-	})
-}
-
 func TestInsertBlocks(t *testing.T) {
 	th, tearDown := SetupTestHelper(t)
 	defer tearDown()