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/redis_supplier_roles.go | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'store/redis_supplier_roles.go')

diff --git a/store/redis_supplier_roles.go b/store/redis_supplier_roles.go
index 232a8c040..c4f269268 100644
--- a/store/redis_supplier_roles.go
+++ b/store/redis_supplier_roles.go
@@ -84,6 +84,21 @@ func (s *RedisSupplier) RoleGetByNames(ctx context.Context, roleNames []string,
 	return result
 }
 
+func (s *RedisSupplier) RoleDelete(ctx context.Context, roleId string, hints ...LayeredStoreHint) *LayeredStoreSupplierResult {
+	result := s.Next().RoleGet(ctx, roleId, hints...)
+
+	if result.Err == nil {
+		role := result.Data.(*model.Role)
+		key := buildRedisKeyForRoleName(role.Name)
+
+		if err := s.client.Del(key).Err(); err != nil {
+			l4g.Error("Redis failed to remove key " + key + " Error: " + err.Error())
+		}
+	}
+
+	return result
+}
+
 func (s *RedisSupplier) RolePermanentDeleteAll(ctx context.Context, hints ...LayeredStoreHint) *LayeredStoreSupplierResult {
 	defer func() {
 		if keys, err := s.client.Keys("roles:*").Result(); err != nil {
-- 
cgit v1.2.3-1-g7c22


From aa42ed8abae72ade1cb193027b06e6f19b579ddf Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Fri, 27 Apr 2018 14:26:58 -0700
Subject: Fixing structured logging conflicts.

---
 store/redis_supplier_roles.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'store/redis_supplier_roles.go')

diff --git a/store/redis_supplier_roles.go b/store/redis_supplier_roles.go
index ec4142273..49f8ede48 100644
--- a/store/redis_supplier_roles.go
+++ b/store/redis_supplier_roles.go
@@ -91,7 +91,7 @@ func (s *RedisSupplier) RoleDelete(ctx context.Context, roleId string, hints ...
 		key := buildRedisKeyForRoleName(role.Name)
 
 		if err := s.client.Del(key).Err(); err != nil {
-			l4g.Error("Redis failed to remove key " + key + " Error: " + err.Error())
+			mlog.Error("Redis failed to remove key " + key + " Error: " + err.Error())
 		}
 	}
 
-- 
cgit v1.2.3-1-g7c22