From f1468a195845c622b1df54a56d2920ba3dda7263 Mon Sep 17 00:00:00 2001 From: Harshil Sharma <18575143+harshilsharma63@users.noreply.github.com> Date: Sat, 22 Jul 2023 01:46:56 +0530 Subject: [PATCH] Renamed channel index fix migration key (#24061) Automatic Merge --- server/channels/testlib/store.go | 2 +- server/public/model/migration.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/channels/testlib/store.go b/server/channels/testlib/store.go index b34b04523f..05af2385b4 100644 --- a/server/channels/testlib/store.go +++ b/server/channels/testlib/store.go @@ -72,7 +72,7 @@ func GetMockStoreForSetupFunctions() *mocks.Store { systemStore.On("GetByName", model.MigrationKeyAddCustomUserGroupsPermissionRestore).Return(&model.System{Name: model.MigrationKeyAddCustomUserGroupsPermissionRestore, Value: "true"}, nil) systemStore.On("GetByName", "CustomGroupAdminRoleCreationMigrationComplete").Return(&model.System{Name: model.MigrationKeyAddPlayboosksManageRolesPermissions, Value: "true"}, nil) systemStore.On("GetByName", "products_boards").Return(&model.System{Name: "products_boards", Value: "true"}, nil) - systemStore.On("GetByName", "elasticsearch_fix_channel_index_migration_complete").Return(&model.System{Name: "elasticsearch_fix_channel_index_migration_complete", Value: "true"}, nil) + systemStore.On("GetByName", "elasticsearch_fix_channel_index_migration").Return(&model.System{Name: "elasticsearch_fix_channel_index_migration", Value: "true"}, nil) systemStore.On("InsertIfExists", mock.AnythingOfType("*model.System")).Return(&model.System{}, nil).Once() systemStore.On("Save", mock.AnythingOfType("*model.System")).Return(nil) diff --git a/server/public/model/migration.go b/server/public/model/migration.go index 3369851479..1e1929dc74 100644 --- a/server/public/model/migration.go +++ b/server/public/model/migration.go @@ -40,5 +40,5 @@ const ( MigrationKeyAddPlayboosksManageRolesPermissions = "playbooks_manage_roles" MigrationKeyAddProductsBoardsPermissions = "products_boards" MigrationKeyAddCustomUserGroupsPermissionRestore = "custom_groups_permission_restore" - MigrationKeyElasticsearchFixChannelIndex = "elasticsearch_fix_channel_index_migration_complete" + MigrationKeyElasticsearchFixChannelIndex = "elasticsearch_fix_channel_index_migration" )