From cd55c44c8fd8f61cdb7cbfb57a588be82c7aa0ab Mon Sep 17 00:00:00 2001
From: George Goldberg <george@gberg.me>
Date: Fri, 20 Apr 2018 19:49:13 +0100
Subject: MM-8796: Full implementation of "Schemes" in Store/Model/App layers.
 (#8357)

* Add Scheme model and stub store.

* Port ChannelStore to be Scheme aware.

* Make almost all the API/APP layer work with ChannelSchemes.

Only thing still hacky is UpdateChannelMemberRoles().

* Add basic SchemeStore implementation.

* Migrate UpdateChannelMemberRoles properly and fix tests.

* Update store tests and mocks so they work.

* Include creating default roles in Scheme create store function.

* Implement role deletion and start scheme deletion.

* Only use non-deleted roles for authorization.

* Add GetByScheme method to Team store.

* Add GetChannelsByScheme.

* Update store mocks.

* Implement scheme deletion in the store.

* Rename is valid function.

* Add offset and limit to queries to fetch teams and channels by scheme.

* Fix queries.

* Implement scheme awareness in Team store and add a migration.

* Tidy up ChannelStore mapping functions and add exhaustive unit tests.

* Add all missing i18n.

* Proper tests for TeamStore internal functions and fix them.

* Make additional TeamMember fields nullable.

* Make new ChannelMember fields nullable.

* Create new nullable columns without defaults.

* Make new fields in large tables nullalble.

* Fix empty list of TeamMembers.

* Deduplicate SQL queries.

* Fix spelling.

* Fix review comment.

* More review fixes.

* More review fixes.
---
 store/storetest/role_store.go | 45 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

(limited to 'store/storetest/role_store.go')

diff --git a/store/storetest/role_store.go b/store/storetest/role_store.go
index e51c32622..1618b6c6d 100644
--- a/store/storetest/role_store.go
+++ b/store/storetest/role_store.go
@@ -17,6 +17,7 @@ func TestRoleStore(t *testing.T, ss store.Store) {
 	t.Run("Get", func(t *testing.T) { testRoleStoreGet(t, ss) })
 	t.Run("GetByName", func(t *testing.T) { testRoleStoreGetByName(t, ss) })
 	t.Run("GetNames", func(t *testing.T) { testRoleStoreGetByNames(t, ss) })
+	t.Run("Delete", func(t *testing.T) { testRoleStoreDelete(t, ss) })
 	t.Run("PermanentDeleteAll", func(t *testing.T) { testRoleStorePermanentDeleteAll(t, ss) })
 }
 
@@ -244,6 +245,49 @@ func testRoleStoreGetByNames(t *testing.T, ss store.Store) {
 	assert.NotContains(t, roles6, d3)
 }
 
+func testRoleStoreDelete(t *testing.T, ss store.Store) {
+	// Save a role to test with.
+	r1 := &model.Role{
+		Name:        model.NewId(),
+		DisplayName: model.NewId(),
+		Description: model.NewId(),
+		Permissions: []string{
+			"invite_user",
+			"create_public_channel",
+			"add_user_to_team",
+		},
+		SchemeManaged: false,
+	}
+
+	res1 := <-ss.Role().Save(r1)
+	assert.Nil(t, res1.Err)
+	d1 := res1.Data.(*model.Role)
+	assert.Len(t, d1.Id, 26)
+
+	// Check the role is there.
+	res2 := <-ss.Role().Get(d1.Id)
+	assert.Nil(t, res2.Err)
+
+	// Delete the role.
+	res3 := <-ss.Role().Delete(d1.Id)
+	assert.Nil(t, res3.Err)
+
+	// Check the role is deleted there.
+	res4 := <-ss.Role().Get(d1.Id)
+	assert.Nil(t, res4.Err)
+	d2 := res4.Data.(*model.Role)
+	assert.NotZero(t, d2.DeleteAt)
+
+	res5 := <-ss.Role().GetByName(d1.Name)
+	assert.Nil(t, res5.Err)
+	d3 := res5.Data.(*model.Role)
+	assert.NotZero(t, d3.DeleteAt)
+
+	// Try and delete a role that does not exist.
+	res6 := <-ss.Role().Delete(model.NewId())
+	assert.NotNil(t, res6.Err)
+}
+
 func testRoleStorePermanentDeleteAll(t *testing.T, ss store.Store) {
 	r1 := &model.Role{
 		Name:        model.NewId(),
@@ -256,6 +300,7 @@ func testRoleStorePermanentDeleteAll(t *testing.T, ss store.Store) {
 		},
 		SchemeManaged: false,
 	}
+
 	r2 := &model.Role{
 		Name:        model.NewId(),
 		DisplayName: model.NewId(),
-- 
cgit v1.2.3-1-g7c22