From 25b340ecb79e0f4975b4cb000f545d30d0d5dc1b Mon Sep 17 00:00:00 2001
From: Jesse Hallam <jesse.hallam@gmail.com>
Date: Thu, 10 Oct 2019 16:16:25 -0300
Subject: [PATCH] Revert "Do not count deleted channels when checking max
 channel limit (#12021)" (#12730)

This reverts commit d6700e3b40fb7f11c300559b3c31b8799926ce3d.
---
 app/channel.go      | 15 ++-------------
 app/channel_test.go | 15 ---------------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/app/channel.go b/app/channel.go
index c9388da7b1..68851a477f 100644
--- a/app/channel.go
+++ b/app/channel.go
@@ -160,7 +160,7 @@ func (a *App) CreateChannelWithUser(channel *model.Channel, userId string) (*mod
 	}
 
 	// Get total number of channels on current team
-	count, err := a.GetNumberOfChannelsOnTeam(channel.TeamId, false)
+	count, err := a.GetNumberOfChannelsOnTeam(channel.TeamId)
 	if err != nil {
 		return nil, err
 	}
@@ -1724,23 +1724,12 @@ func (a *App) RemoveUserFromChannel(userIdToRemove string, removerUserId string,
 	return nil
 }
 
-func (a *App) GetNumberOfChannelsOnTeam(teamId string, includeDeleted bool) (int, *model.AppError) {
+func (a *App) GetNumberOfChannelsOnTeam(teamId string) (int, *model.AppError) {
 	// Get total number of channels on current team
 	list, err := a.Srv.Store.Channel().GetTeamChannels(teamId)
 	if err != nil {
 		return 0, err
 	}
-
-	if !includeDeleted {
-		count := 0
-		for _, channel := range *list {
-			if channel.DeleteAt == 0 {
-				count++
-			}
-		}
-		return count, nil
-	}
-
 	return len(*list), nil
 }
 
diff --git a/app/channel_test.go b/app/channel_test.go
index b64437dae1..7c6d836f48 100644
--- a/app/channel_test.go
+++ b/app/channel_test.go
@@ -1000,18 +1000,3 @@ func TestSearchChannelsForUser(t *testing.T) {
 		searchAndCheck(t, "dev", []string{"test-dev-1", "test-dev-2", "dev-3"})
 	})
 }
-
-func TestGetNumberOfChannelsOnTeam(t *testing.T) {
-	th := Setup(t).InitBasic()
-	defer th.TearDown()
-
-	th.App.DeleteChannel(th.BasicChannel, th.BasicUser.Id)
-
-	count, err := th.App.GetNumberOfChannelsOnTeam(th.BasicTeam.Id, true)
-	require.Nil(t, err)
-	assert.Equal(t, 3, count)
-
-	count, err = th.App.GetNumberOfChannelsOnTeam(th.BasicTeam.Id, false)
-	require.Nil(t, err)
-	assert.Equal(t, 2, count)
-}