[MM-16751] golint model (#17896)

store/storetest/channel_member_history_store.go

@@ -30,7 +30,7 @@ func testLogJoinEvent(t *testing.T, ss store.Store) {
 		TeamId:      model.NewId(),
 		DisplayName: "Display " + model.NewId(),
 		Name:        "zz" + model.NewId() + "b",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel, err := ss.Channel().Save(&ch, -1)
 	require.NoError(t, err)
@@ -56,7 +56,7 @@ func testLogLeaveEvent(t *testing.T, ss store.Store) {
 		TeamId:      model.NewId(),
 		DisplayName: "Display " + model.NewId(),
 		Name:        "zz" + model.NewId() + "b",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel, err := ss.Channel().Save(&ch, -1)
 	require.NoError(t, err)
@@ -85,7 +85,7 @@ func testGetUsersInChannelAtChannelMemberHistory(t *testing.T, ss store.Store) {
 		TeamId:      model.NewId(),
 		DisplayName: "Display " + model.NewId(),
 		Name:        "zz" + model.NewId() + "b",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel, err := ss.Channel().Save(ch, -1)
 	require.NoError(t, err)
@@ -181,7 +181,7 @@ func testGetUsersInChannelAtChannelMembers(t *testing.T, ss store.Store) {
 		TeamId:      model.NewId(),
 		DisplayName: "Display " + model.NewId(),
 		Name:        "zz" + model.NewId() + "b",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel, err := ss.Channel().Save(channel, -1)
 	require.NoError(t, err)
@@ -293,7 +293,7 @@ func testPermanentDeleteBatch(t *testing.T, ss store.Store) {
 		TeamId:      model.NewId(),
 		DisplayName: "Display " + model.NewId(),
 		Name:        "zz" + model.NewId() + "b",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel, err := ss.Channel().Save(channel, -1)
 	require.NoError(t, err)
@@ -353,14 +353,14 @@ func testPermanentDeleteBatchForRetentionPolicies(t *testing.T, ss store.Store)
 		DisplayName: "DisplayName",
 		Name:        "team" + model.NewId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	})
 	require.NoError(t, err)
 	channel, err := ss.Channel().Save(&model.Channel{
 		TeamId:      team.Id,
 		DisplayName: "DisplayName",
 		Name:        "channel" + model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}, -1)
 	require.NoError(t, err)
 	userID := model.NewId()

store/storetest/channel_store_categories.go

@@ -141,7 +141,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
 		// Set up two channels, one favorited and one not
 		channel1, nErr := ss.Channel().Save(&model.Channel{
 			TeamId: teamId,
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 			Name:   "channel1",
 		}, 1000)
 		require.NoError(t, nErr)
@@ -154,7 +154,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
 
 		channel2, nErr := ss.Channel().Save(&model.Channel{
 			TeamId: teamId,
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 			Name:   "channel2",
 		}, 1000)
 		require.NoError(t, nErr)
@@ -168,7 +168,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
 		nErr = ss.Preference().Save(&model.Preferences{
 			{
 				UserId:   userId,
-				Category: model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
+				Category: model.PreferenceCategoryFavoriteChannel,
 				Name:     channel1.Id,
 				Value:    "true",
 			},
@@ -197,7 +197,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
 		// Set up two channels
 		channel1, nErr := ss.Channel().Save(&model.Channel{
 			TeamId:      teamId,
-			Type:        model.CHANNEL_OPEN,
+			Type:        model.ChannelTypeOpen,
 			Name:        "channel1",
 			DisplayName: "zebra",
 		}, 1000)
@@ -211,7 +211,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
 
 		channel2, nErr := ss.Channel().Save(&model.Channel{
 			TeamId:      teamId,
-			Type:        model.CHANNEL_OPEN,
+			Type:        model.ChannelTypeOpen,
 			Name:        "channel2",
 			DisplayName: "aardvark",
 		}, 1000)
@@ -226,13 +226,13 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
 		nErr = ss.Preference().Save(&model.Preferences{
 			{
 				UserId:   userId,
-				Category: model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
+				Category: model.PreferenceCategoryFavoriteChannel,
 				Name:     channel1.Id,
 				Value:    "true",
 			},
 			{
 				UserId:   userId,
-				Category: model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
+				Category: model.PreferenceCategoryFavoriteChannel,
 				Name:     channel2.Id,
 				Value:    "true",
 			},
@@ -263,7 +263,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
 		dmChannel1, err := ss.Channel().SaveDirectChannel(
 			&model.Channel{
 				Name: model.GetDMNameFromIds(userId, otherUserId1),
-				Type: model.CHANNEL_DIRECT,
+				Type: model.ChannelTypeDirect,
 			},
 			&model.ChannelMember{
 				UserId:      userId,
@@ -279,7 +279,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
 		dmChannel2, err := ss.Channel().SaveDirectChannel(
 			&model.Channel{
 				Name: model.GetDMNameFromIds(userId, otherUserId2),
-				Type: model.CHANNEL_DIRECT,
+				Type: model.ChannelTypeDirect,
 			},
 			&model.ChannelMember{
 				UserId:      userId,
@@ -295,7 +295,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
 		err = ss.Preference().Save(&model.Preferences{
 			{
 				UserId:   userId,
-				Category: model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
+				Category: model.PreferenceCategoryFavoriteChannel,
 				Name:     dmChannel1.Id,
 				Value:    "true",
 			},
@@ -325,7 +325,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
 		// Set up a channel on another team and favorite it
 		channel1, nErr := ss.Channel().Save(&model.Channel{
 			TeamId: teamId2,
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 			Name:   "channel1",
 		}, 1000)
 		require.NoError(t, nErr)
@@ -339,7 +339,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
 		nErr = ss.Preference().Save(&model.Preferences{
 			{
 				UserId:   userId,
-				Category: model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
+				Category: model.PreferenceCategoryFavoriteChannel,
 				Name:     channel1.Id,
 				Value:    "true",
 			},
@@ -451,13 +451,13 @@ func testCreateSidebarCategory(t *testing.T, ss store.Store) {
 
 		// Create some channels
 		channel1, err := ss.Channel().Save(&model.Channel{
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 			TeamId: teamId,
 			Name:   model.NewId(),
 		}, 100)
 		require.NoError(t, err)
 		channel2, err := ss.Channel().Save(&model.Channel{
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 			TeamId: teamId,
 			Name:   model.NewId(),
 		}, 100)
@@ -498,13 +498,13 @@ func testCreateSidebarCategory(t *testing.T, ss store.Store) {
 
 		// Create some channels
 		channel1, nErr := ss.Channel().Save(&model.Channel{
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 			TeamId: teamId,
 			Name:   model.NewId(),
 		}, 100)
 		require.NoError(t, nErr)
 		channel2, nErr := ss.Channel().Save(&model.Channel{
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 			TeamId: teamId,
 			Name:   model.NewId(),
 		}, 100)
@@ -594,7 +594,7 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
 			Name:        "channel1",
 			DisplayName: "DEF",
 			TeamId:      teamId,
-			Type:        model.CHANNEL_PRIVATE,
+			Type:        model.ChannelTypePrivate,
 		}, 10)
 		require.NoError(t, nErr)
 		_, nErr = ss.Channel().SaveMember(&model.ChannelMember{
@@ -608,7 +608,7 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
 			Name:        "channel2",
 			DisplayName: "ABC",
 			TeamId:      teamId,
-			Type:        model.CHANNEL_OPEN,
+			Type:        model.ChannelTypeOpen,
 		}, 10)
 		require.NoError(t, nErr)
 		_, nErr = ss.Channel().SaveMember(&model.ChannelMember{
@@ -656,7 +656,7 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
 		channel1, nErr := ss.Channel().Save(&model.Channel{
 			Name:   "abc",
 			TeamId: model.NewId(),
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 		}, 10)
 		require.NoError(t, nErr)
 		defer ss.Channel().PermanentDelete(channel1.Id)
@@ -698,7 +698,7 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
 			Name:        "channel1",
 			DisplayName: "DEF",
 			TeamId:      teamId,
-			Type:        model.CHANNEL_PRIVATE,
+			Type:        model.ChannelTypePrivate,
 		}, 10)
 		require.NoError(t, nErr)
 		_, nErr = ss.Channel().SaveMember(&model.ChannelMember{
@@ -712,7 +712,7 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
 			Name:        "channel2",
 			DisplayName: "ABC",
 			TeamId:      teamId,
-			Type:        model.CHANNEL_OPEN,
+			Type:        model.ChannelTypeOpen,
 		}, 10)
 		require.NoError(t, nErr)
 		_, nErr = ss.Channel().SaveMember(&model.ChannelMember{
@@ -759,7 +759,7 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
 		dmChannel, nErr := ss.Channel().SaveDirectChannel(
 			&model.Channel{
 				Name: model.GetDMNameFromIds(userId, otherUserId),
-				Type: model.CHANNEL_DIRECT,
+				Type: model.ChannelTypeDirect,
 			},
 			&model.ChannelMember{
 				UserId:      userId,
@@ -799,7 +799,7 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
 		gmChannel, nErr := ss.Channel().Save(&model.Channel{
 			Name:   "abc",
 			TeamId: "",
-			Type:   model.CHANNEL_GROUP,
+			Type:   model.ChannelTypeGroup,
 		}, 10)
 		require.NoError(t, nErr)
 		defer ss.Channel().PermanentDelete(gmChannel.Id)
@@ -838,7 +838,7 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
 		dmChannel, nErr := ss.Channel().SaveDirectChannel(
 			&model.Channel{
 				Name: model.GetDMNameFromIds(userId, otherUserId),
-				Type: model.CHANNEL_DIRECT,
+				Type: model.ChannelTypeDirect,
 			},
 			&model.ChannelMember{
 				UserId:      userId,
@@ -1060,7 +1060,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		// Join a channel
 		channel, nErr := ss.Channel().Save(&model.Channel{
 			Name:   "channel",
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 			TeamId: teamId,
 		}, 10)
 		require.NoError(t, nErr)
@@ -1080,7 +1080,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		})
 		assert.NoError(t, err)
 
-		res2, nErr := ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
+		res2, nErr := ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, channel.Id)
 		assert.NoError(t, nErr)
 		assert.NotNil(t, res2)
 		assert.Equal(t, "true", res2.Value)
@@ -1097,7 +1097,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		})
 		assert.NoError(t, err)
 
-		res2, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
+		res2, nErr = ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, channel.Id)
 		assert.Error(t, nErr)
 		assert.True(t, errors.Is(nErr, sql.ErrNoRows))
 		assert.Nil(t, res2)
@@ -1124,7 +1124,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		dmChannel, nErr := ss.Channel().SaveDirectChannel(
 			&model.Channel{
 				Name: model.GetDMNameFromIds(userId, otherUserId),
-				Type: model.CHANNEL_DIRECT,
+				Type: model.ChannelTypeDirect,
 			},
 			&model.ChannelMember{
 				UserId:      userId,
@@ -1146,7 +1146,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		})
 		assert.NoError(t, err)
 
-		res2, nErr := ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id)
+		res2, nErr := ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, dmChannel.Id)
 		assert.NoError(t, nErr)
 		assert.NotNil(t, res2)
 		assert.Equal(t, "true", res2.Value)
@@ -1163,7 +1163,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		})
 		assert.NoError(t, err)
 
-		res2, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id)
+		res2, nErr = ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, dmChannel.Id)
 		assert.Error(t, nErr)
 		assert.True(t, errors.Is(nErr, sql.ErrNoRows))
 		assert.Nil(t, res2)
@@ -1201,7 +1201,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		dmChannel, nErr := ss.Channel().SaveDirectChannel(
 			&model.Channel{
 				Name: model.GetDMNameFromIds(userId, otherUserId),
-				Type: model.CHANNEL_DIRECT,
+				Type: model.ChannelTypeDirect,
 			},
 			&model.ChannelMember{
 				UserId:      userId,
@@ -1223,7 +1223,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		})
 		assert.NoError(t, err)
 
-		res2, nErr := ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id)
+		res2, nErr := ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, dmChannel.Id)
 		assert.NoError(t, nErr)
 		assert.NotNil(t, res2)
 		assert.Equal(t, "true", res2.Value)
@@ -1238,7 +1238,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		assert.NoError(t, err)
 		assert.Equal(t, []string{dmChannel.Id}, updated[0].Channels)
 
-		res2, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id)
+		res2, nErr = ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, dmChannel.Id)
 		assert.NoError(t, nErr)
 		assert.NotNil(t, res2)
 		assert.Equal(t, "true", res2.Value)
@@ -1252,7 +1252,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		})
 		assert.NoError(t, err)
 
-		res2, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id)
+		res2, nErr = ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, dmChannel.Id)
 		require.Error(t, nErr)
 		assert.Nil(t, res2)
 
@@ -1265,7 +1265,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		})
 		assert.NoError(t, err)
 
-		res2, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id)
+		res2, nErr = ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, dmChannel.Id)
 		require.Error(t, nErr)
 		assert.Nil(t, res2)
 	})
@@ -1305,7 +1305,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		// Have both users join a channel
 		channel, nErr := ss.Channel().Save(&model.Channel{
 			Name:   "channel",
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 			TeamId: teamId,
 		}, 10)
 		require.NoError(t, nErr)
@@ -1335,12 +1335,12 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		})
 		assert.NoError(t, err)
 
-		res2, nErr := ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
+		res2, nErr := ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, channel.Id)
 		assert.NoError(t, nErr)
 		assert.NotNil(t, res2)
 		assert.Equal(t, "true", res2.Value)
 
-		res2, nErr = ss.Preference().Get(userId2, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
+		res2, nErr = ss.Preference().Get(userId2, model.PreferenceCategoryFavoriteChannel, channel.Id)
 		assert.True(t, errors.Is(nErr, sql.ErrNoRows))
 		assert.Nil(t, res2)
 
@@ -1357,12 +1357,12 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		})
 		assert.NoError(t, err)
 
-		res2, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
+		res2, nErr = ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, channel.Id)
 		assert.NoError(t, nErr)
 		assert.NotNil(t, res2)
 		assert.Equal(t, "true", res2.Value)
 
-		res2, nErr = ss.Preference().Get(userId2, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
+		res2, nErr = ss.Preference().Get(userId2, model.PreferenceCategoryFavoriteChannel, channel.Id)
 		assert.NoError(t, nErr)
 		assert.NotNil(t, res2)
 		assert.Equal(t, "true", res2.Value)
@@ -1380,11 +1380,11 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		})
 		assert.NoError(t, err)
 
-		res2, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
+		res2, nErr = ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, channel.Id)
 		assert.True(t, errors.Is(nErr, sql.ErrNoRows))
 		assert.Nil(t, res2)
 
-		res2, nErr = ss.Preference().Get(userId2, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
+		res2, nErr = ss.Preference().Get(userId2, model.PreferenceCategoryFavoriteChannel, channel.Id)
 		assert.NoError(t, nErr)
 		assert.NotNil(t, res2)
 		assert.Equal(t, "true", res2.Value)
@@ -1402,11 +1402,11 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		})
 		assert.NoError(t, err)
 
-		res2, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
+		res2, nErr = ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, channel.Id)
 		assert.True(t, errors.Is(nErr, sql.ErrNoRows))
 		assert.Nil(t, res2)
 
-		res2, nErr = ss.Preference().Get(userId2, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
+		res2, nErr = ss.Preference().Get(userId2, model.PreferenceCategoryFavoriteChannel, channel.Id)
 		assert.True(t, errors.Is(nErr, sql.ErrNoRows))
 		assert.Nil(t, res2)
 	})
@@ -1418,7 +1418,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		// Create some channels
 		channel, nErr := ss.Channel().Save(&model.Channel{
 			Name:   "channel",
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 			TeamId: teamId,
 		}, 10)
 		require.NoError(t, nErr)
@@ -1433,7 +1433,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		dmChannel, nErr := ss.Channel().SaveDirectChannel(
 			&model.Channel{
 				Name: model.GetDMNameFromIds(userId, otherUserId),
-				Type: model.CHANNEL_DIRECT,
+				Type: model.ChannelTypeDirect,
 			},
 			&model.ChannelMember{
 				UserId:      userId,
@@ -1488,7 +1488,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		dmChannel, nErr := ss.Channel().SaveDirectChannel(
 			&model.Channel{
 				Name: model.GetDMNameFromIds(userId, otherUserId),
-				Type: model.CHANNEL_DIRECT,
+				Type: model.ChannelTypeDirect,
 			},
 			&model.ChannelMember{
 				UserId:      userId,
@@ -1577,7 +1577,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		// Join a channel
 		channel, nErr := ss.Channel().Save(&model.Channel{
 			Name:   "channel",
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 			TeamId: teamId,
 		}, 10)
 		require.NoError(t, nErr)
@@ -1641,7 +1641,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
 		// Join a channel
 		channel, nErr := ss.Channel().Save(&model.Channel{
 			Name:   "channel",
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 			TeamId: teamId,
 		}, 10)
 		require.NoError(t, nErr)
@@ -1734,7 +1734,7 @@ func testClearSidebarOnTeamLeave(t *testing.T, ss store.Store, s SqlStore) {
 		channel1, nErr := ss.Channel().Save(&model.Channel{
 			Name:   model.NewId(),
 			TeamId: teamId,
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 		}, 1000)
 		require.NoError(t, nErr)
 
@@ -1782,7 +1782,7 @@ func testClearSidebarOnTeamLeave(t *testing.T, ss store.Store, s SqlStore) {
 		channel1, nErr := ss.Channel().Save(&model.Channel{
 			Name:   model.NewId(),
 			TeamId: teamId,
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 		}, 1000)
 		require.NoError(t, nErr)
 
@@ -1844,7 +1844,7 @@ func testClearSidebarOnTeamLeave(t *testing.T, ss store.Store, s SqlStore) {
 		channel1, nErr := ss.Channel().Save(&model.Channel{
 			Name:   model.NewId(),
 			TeamId: teamId,
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 		}, 1000)
 		require.NoError(t, nErr)
 
@@ -1860,7 +1860,7 @@ func testClearSidebarOnTeamLeave(t *testing.T, ss store.Store, s SqlStore) {
 		channel2, nErr := ss.Channel().Save(&model.Channel{
 			Name:   model.NewId(),
 			TeamId: teamId2,
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 		}, 1000)
 		require.NoError(t, nErr)
 
@@ -1936,7 +1936,7 @@ func testDeleteSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
 		channel1, nErr := ss.Channel().Save(&model.Channel{
 			Name:   model.NewId(),
 			TeamId: teamId,
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 		}, 1000)
 		require.NoError(t, nErr)
 		defer ss.Channel().PermanentDelete(channel1.Id)
@@ -1944,7 +1944,7 @@ func testDeleteSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
 		channel2, nErr := ss.Channel().Save(&model.Channel{
 			Name:   model.NewId(),
 			TeamId: teamId,
-			Type:   model.CHANNEL_PRIVATE,
+			Type:   model.ChannelTypePrivate,
 		}, 1000)
 		require.NoError(t, nErr)
 		defer ss.Channel().PermanentDelete(channel2.Id)
@@ -2023,7 +2023,7 @@ func testUpdateSidebarChannelsByPreferences(t *testing.T, ss store.Store) {
 
 		channel, nErr := ss.Channel().Save(&model.Channel{
 			Name:   "channel",
-			Type:   model.CHANNEL_OPEN,
+			Type:   model.ChannelTypeOpen,
 			TeamId: teamId,
 		}, 10)
 		require.NoError(t, nErr)
@@ -2031,7 +2031,7 @@ func testUpdateSidebarChannelsByPreferences(t *testing.T, ss store.Store) {
 		err := ss.Channel().UpdateSidebarChannelsByPreferences(&model.Preferences{
 			model.Preference{
 				Name:     channel.Id,
-				Category: model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
+				Category: model.PreferenceCategoryFavoriteChannel,
 				Value:    "true",
 			},
 		})
@@ -2050,7 +2050,7 @@ func testUpdateSidebarChannelsByPreferences(t *testing.T, ss store.Store) {
 			_ = ss.Channel().UpdateSidebarChannelsByPreferences(&model.Preferences{
 				model.Preference{
 					Name:     "fakeid",
-					Category: model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
+					Category: model.PreferenceCategoryFavoriteChannel,
 					Value:    "true",
 				},
 			})
@@ -2068,7 +2068,7 @@ func testSidebarCategoryDeadlock(t *testing.T, ss store.Store) {
 	// Join a channel
 	channel, err := ss.Channel().Save(&model.Channel{
 		Name:   "channel",
-		Type:   model.CHANNEL_OPEN,
+		Type:   model.ChannelTypeOpen,
 		TeamId: teamID,
 	}, 10)
 	require.NoError(t, err)

store/storetest/command_store.go

@@ -28,7 +28,7 @@ func TestCommandStore(t *testing.T, ss store.Store) {
 func testCommandStoreSave(t *testing.T, ss store.Store) {
 	o1 := model.Command{}
 	o1.CreatorId = model.NewId()
-	o1.Method = model.COMMAND_METHOD_POST
+	o1.Method = model.CommandMethodPost
 	o1.TeamId = model.NewId()
 	o1.URL = "http://nowhere.com/"
 	o1.Trigger = "trigger"
@@ -43,7 +43,7 @@ func testCommandStoreSave(t *testing.T, ss store.Store) {
 func testCommandStoreGet(t *testing.T, ss store.Store) {
 	o1 := &model.Command{}
 	o1.CreatorId = model.NewId()
-	o1.Method = model.COMMAND_METHOD_POST
+	o1.Method = model.CommandMethodPost
 	o1.TeamId = model.NewId()
 	o1.URL = "http://nowhere.com/"
 	o1.Trigger = "trigger"
@@ -64,7 +64,7 @@ func testCommandStoreGet(t *testing.T, ss store.Store) {
 func testCommandStoreGetByTeam(t *testing.T, ss store.Store) {
 	o1 := &model.Command{}
 	o1.CreatorId = model.NewId()
-	o1.Method = model.COMMAND_METHOD_POST
+	o1.Method = model.CommandMethodPost
 	o1.TeamId = model.NewId()
 	o1.URL = "http://nowhere.com/"
 	o1.Trigger = "trigger"
@@ -85,14 +85,14 @@ func testCommandStoreGetByTeam(t *testing.T, ss store.Store) {
 func testCommandStoreGetByTrigger(t *testing.T, ss store.Store) {
 	o1 := &model.Command{}
 	o1.CreatorId = model.NewId()
-	o1.Method = model.COMMAND_METHOD_POST
+	o1.Method = model.CommandMethodPost
 	o1.TeamId = model.NewId()
 	o1.URL = "http://nowhere.com/"
 	o1.Trigger = "trigger1"
 
 	o2 := &model.Command{}
 	o2.CreatorId = model.NewId()
-	o2.Method = model.COMMAND_METHOD_POST
+	o2.Method = model.CommandMethodPost
 	o2.TeamId = model.NewId()
 	o2.URL = "http://nowhere.com/"
 	o2.Trigger = "trigger1"
@@ -120,7 +120,7 @@ func testCommandStoreGetByTrigger(t *testing.T, ss store.Store) {
 func testCommandStoreDelete(t *testing.T, ss store.Store) {
 	o1 := &model.Command{}
 	o1.CreatorId = model.NewId()
-	o1.Method = model.COMMAND_METHOD_POST
+	o1.Method = model.CommandMethodPost
 	o1.TeamId = model.NewId()
 	o1.URL = "http://nowhere.com/"
 	o1.Trigger = "trigger"
@@ -144,7 +144,7 @@ func testCommandStoreDelete(t *testing.T, ss store.Store) {
 func testCommandStoreDeleteByTeam(t *testing.T, ss store.Store) {
 	o1 := &model.Command{}
 	o1.CreatorId = model.NewId()
-	o1.Method = model.COMMAND_METHOD_POST
+	o1.Method = model.CommandMethodPost
 	o1.TeamId = model.NewId()
 	o1.URL = "http://nowhere.com/"
 	o1.Trigger = "trigger"
@@ -168,7 +168,7 @@ func testCommandStoreDeleteByTeam(t *testing.T, ss store.Store) {
 func testCommandStoreDeleteByUser(t *testing.T, ss store.Store) {
 	o1 := &model.Command{}
 	o1.CreatorId = model.NewId()
-	o1.Method = model.COMMAND_METHOD_POST
+	o1.Method = model.CommandMethodPost
 	o1.TeamId = model.NewId()
 	o1.URL = "http://nowhere.com/"
 	o1.Trigger = "trigger"
@@ -192,7 +192,7 @@ func testCommandStoreDeleteByUser(t *testing.T, ss store.Store) {
 func testCommandStoreUpdate(t *testing.T, ss store.Store) {
 	o1 := &model.Command{}
 	o1.CreatorId = model.NewId()
-	o1.Method = model.COMMAND_METHOD_POST
+	o1.Method = model.CommandMethodPost
 	o1.TeamId = model.NewId()
 	o1.URL = "http://nowhere.com/"
 	o1.Trigger = "trigger"
@@ -214,7 +214,7 @@ func testCommandStoreUpdate(t *testing.T, ss store.Store) {
 func testCommandCount(t *testing.T, ss store.Store) {
 	o1 := &model.Command{}
 	o1.CreatorId = model.NewId()
-	o1.Method = model.COMMAND_METHOD_POST
+	o1.Method = model.CommandMethodPost
 	o1.TeamId = model.NewId()
 	o1.URL = "http://nowhere.com/"
 	o1.Trigger = "trigger"

store/storetest/command_webhook_store.go

@@ -38,7 +38,7 @@ func testCommandWebhookStore(t *testing.T, ss store.Store) {
 	require.True(t, errors.As(nErr, &nfErr), "Should have set the status as not found for missing id")
 
 	h2 := &model.CommandWebhook{}
-	h2.CreateAt = model.GetMillis() - 2*model.COMMAND_WEBHOOK_LIFETIME
+	h2.CreateAt = model.GetMillis() - 2*model.CommandWebhookLifetime
 	h2.CommandId = model.NewId()
 	h2.UserId = model.NewId()
 	h2.ChannelId = model.NewId()

store/storetest/compliance_store.go

@@ -60,28 +60,28 @@ func TestComplianceStore(t *testing.T, ss store.Store) {
 }
 
 func testComplianceStore(t *testing.T, ss store.Store) {
-	compliance1 := &model.Compliance{Desc: "Audit for federal subpoena case #22443", UserId: model.NewId(), Status: model.COMPLIANCE_STATUS_FAILED, StartAt: model.GetMillis() - 1, EndAt: model.GetMillis() + 1, Type: model.COMPLIANCE_TYPE_ADHOC}
+	compliance1 := &model.Compliance{Desc: "Audit for federal subpoena case #22443", UserId: model.NewId(), Status: model.ComplianceStatusFailed, StartAt: model.GetMillis() - 1, EndAt: model.GetMillis() + 1, Type: model.ComplianceTypeAdhoc}
 	_, err := ss.Compliance().Save(compliance1)
 	require.NoError(t, err)
 	time.Sleep(100 * time.Millisecond)
 
-	compliance2 := &model.Compliance{Desc: "Audit for federal subpoena case #11458", UserId: model.NewId(), Status: model.COMPLIANCE_STATUS_RUNNING, StartAt: model.GetMillis() - 1, EndAt: model.GetMillis() + 1, Type: model.COMPLIANCE_TYPE_ADHOC}
+	compliance2 := &model.Compliance{Desc: "Audit for federal subpoena case #11458", UserId: model.NewId(), Status: model.ComplianceStatusRunning, StartAt: model.GetMillis() - 1, EndAt: model.GetMillis() + 1, Type: model.ComplianceTypeAdhoc}
 	_, err = ss.Compliance().Save(compliance2)
 	require.NoError(t, err)
 	time.Sleep(100 * time.Millisecond)
 
 	compliances, _ := ss.Compliance().GetAll(0, 1000)
 
-	require.Equal(t, model.COMPLIANCE_STATUS_RUNNING, compliances[0].Status)
+	require.Equal(t, model.ComplianceStatusRunning, compliances[0].Status)
 	require.Equal(t, compliance2.Id, compliances[0].Id)
 
-	compliance2.Status = model.COMPLIANCE_STATUS_FAILED
+	compliance2.Status = model.ComplianceStatusFailed
 	_, err = ss.Compliance().Update(compliance2)
 	require.NoError(t, err)
 
 	compliances, _ = ss.Compliance().GetAll(0, 1000)
 
-	require.Equal(t, model.COMPLIANCE_STATUS_FAILED, compliances[0].Status)
+	require.Equal(t, model.ComplianceStatusFailed, compliances[0].Status)
 	require.Equal(t, compliance2.Id, compliances[0].Id)
 
 	compliances, _ = ss.Compliance().GetAll(0, 1)
@@ -106,7 +106,7 @@ func testComplianceExport(t *testing.T, ss store.Store) {
 	t1.DisplayName = "DisplayName"
 	t1.Name = "zz" + model.NewId() + "b"
 	t1.Email = MakeEmail()
-	t1.Type = model.TEAM_OPEN
+	t1.Type = model.TeamOpen
 	t1, err := ss.Team().Save(t1)
 	require.NoError(t, err)
 
@@ -130,7 +130,7 @@ func testComplianceExport(t *testing.T, ss store.Store) {
 	c1.TeamId = t1.Id
 	c1.DisplayName = "Channel2"
 	c1.Name = "zz" + model.NewId() + "b"
-	c1.Type = model.CHANNEL_OPEN
+	c1.Type = model.ChannelTypeOpen
 	c1, nErr = ss.Channel().Save(c1, -1)
 	require.NoError(t, nErr)
 
@@ -235,7 +235,7 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) {
 	t1.DisplayName = "DisplayName"
 	t1.Name = "zz" + model.NewId() + "b"
 	t1.Email = MakeEmail()
-	t1.Type = model.TEAM_OPEN
+	t1.Type = model.TeamOpen
 	t1, err := ss.Team().Save(t1)
 	require.NoError(t, err)
 
@@ -259,7 +259,7 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) {
 	c1.TeamId = t1.Id
 	c1.DisplayName = "Channel2"
 	c1.Name = "zz" + model.NewId() + "b"
-	c1.Type = model.CHANNEL_OPEN
+	c1.Type = model.ChannelTypeOpen
 	c1, nErr = ss.Channel().Save(c1, -1)
 	require.NoError(t, nErr)
 
@@ -403,7 +403,7 @@ func testMessageExportPublicChannel(t *testing.T, ss store.Store) {
 		DisplayName: "DisplayName",
 		Name:        "zz" + model.NewId() + "b",
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	}
 	team, err = ss.Team().Save(team)
 	require.NoError(t, err)
@@ -438,7 +438,7 @@ func testMessageExportPublicChannel(t *testing.T, ss store.Store) {
 		TeamId:      team.Id,
 		Name:        model.NewId(),
 		DisplayName: "Public Channel",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel, nErr = ss.Channel().Save(channel, -1)
 	require.NoError(t, nErr)
@@ -507,7 +507,7 @@ func testMessageExportPrivateChannel(t *testing.T, ss store.Store) {
 		DisplayName: "DisplayName",
 		Name:        "zz" + model.NewId() + "b",
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	}
 	team, err = ss.Team().Save(team)
 	require.NoError(t, err)
@@ -542,7 +542,7 @@ func testMessageExportPrivateChannel(t *testing.T, ss store.Store) {
 		TeamId:      team.Id,
 		Name:        model.NewId(),
 		DisplayName: "Private Channel",
-		Type:        model.CHANNEL_PRIVATE,
+		Type:        model.ChannelTypePrivate,
 	}
 	channel, nErr = ss.Channel().Save(channel, -1)
 	require.NoError(t, nErr)
@@ -613,7 +613,7 @@ func testMessageExportDirectMessageChannel(t *testing.T, ss store.Store) {
 		DisplayName: "DisplayName",
 		Name:        "zz" + model.NewId() + "b",
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	}
 	team, err = ss.Team().Save(team)
 	require.NoError(t, err)
@@ -694,7 +694,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, ss store.Store) {
 		DisplayName: "DisplayName",
 		Name:        "zz" + model.NewId() + "b",
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	}
 	team, err = ss.Team().Save(team)
 	require.NoError(t, err)
@@ -740,7 +740,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, ss store.Store) {
 	groupMessageChannel := &model.Channel{
 		TeamId: team.Id,
 		Name:   model.NewId(),
-		Type:   model.CHANNEL_GROUP,
+		Type:   model.ChannelTypeGroup,
 	}
 	groupMessageChannel, nErr = ss.Channel().Save(groupMessageChannel, -1)
 	require.NoError(t, nErr)
@@ -791,7 +791,7 @@ func testEditExportMessage(t *testing.T, ss store.Store) {
 		DisplayName: "DisplayName",
 		Name:        "zz" + model.NewId() + "b",
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	}
 	team, err = ss.Team().Save(team)
 	require.NoError(t, err)
@@ -814,7 +814,7 @@ func testEditExportMessage(t *testing.T, ss store.Store) {
 		TeamId:      team.Id,
 		Name:        model.NewId(),
 		DisplayName: "Public Channel",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel, nErr = ss.Channel().Save(channel, -1)
 	require.NoError(t, nErr)
@@ -883,7 +883,7 @@ func testEditAfterExportMessage(t *testing.T, ss store.Store) {
 		DisplayName: "DisplayName",
 		Name:        "zz" + model.NewId() + "b",
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	}
 	team, err = ss.Team().Save(team)
 	require.NoError(t, err)
@@ -906,7 +906,7 @@ func testEditAfterExportMessage(t *testing.T, ss store.Store) {
 		TeamId:      team.Id,
 		Name:        model.NewId(),
 		DisplayName: "Public Channel",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel, nErr = ss.Channel().Save(channel, -1)
 	require.NoError(t, nErr)
@@ -994,7 +994,7 @@ func testDeleteExportMessage(t *testing.T, ss store.Store) {
 		DisplayName: "DisplayName",
 		Name:        "zz" + model.NewId() + "b",
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	}
 	team, err = ss.Team().Save(team)
 	require.NoError(t, err)
@@ -1017,7 +1017,7 @@ func testDeleteExportMessage(t *testing.T, ss store.Store) {
 		TeamId:      team.Id,
 		Name:        model.NewId(),
 		DisplayName: "Public Channel",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel, nErr = ss.Channel().Save(channel, -1)
 	require.NoError(t, nErr)
@@ -1054,7 +1054,7 @@ func testDeleteExportMessage(t *testing.T, ss store.Store) {
 	e := json.Unmarshal([]byte(*v.PostProps), &props)
 	require.NoError(t, e)
 
-	_, ok := props[model.POST_PROPS_DELETE_BY]
+	_, ok := props[model.PostPropsDeleteBy]
 	assert.True(t, ok)
 
 	assert.Equal(t, post1.Message, *v.PostMessage)
@@ -1079,7 +1079,7 @@ func testDeleteAfterExportMessage(t *testing.T, ss store.Store) {
 		DisplayName: "DisplayName",
 		Name:        "zz" + model.NewId() + "b",
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	}
 	team, err = ss.Team().Save(team)
 	require.NoError(t, err)
@@ -1102,7 +1102,7 @@ func testDeleteAfterExportMessage(t *testing.T, ss store.Store) {
 		TeamId:      team.Id,
 		Name:        model.NewId(),
 		DisplayName: "Public Channel",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel, nErr = ss.Channel().Save(channel, -1)
 	require.NoError(t, nErr)
@@ -1157,7 +1157,7 @@ func testDeleteAfterExportMessage(t *testing.T, ss store.Store) {
 	e := json.Unmarshal([]byte(*v.PostProps), &props)
 	require.NoError(t, e)
 
-	_, ok := props[model.POST_PROPS_DELETE_BY]
+	_, ok := props[model.PostPropsDeleteBy]
 	assert.True(t, ok)
 
 	assert.Equal(t, post1.Message, *v.PostMessage)

store/storetest/emoji_store.go

@@ -223,14 +223,14 @@ func testEmojiGetList(t *testing.T, ss store.Store) {
 		require.Truef(t, found, "failed to get emoji with id %v", emoji.Id)
 	}
 
-	remojis, err := ss.Emoji().GetList(0, 3, model.EMOJI_SORT_BY_NAME)
+	remojis, err := ss.Emoji().GetList(0, 3, model.EmojiSortByName)
 	assert.NoError(t, err)
 	assert.Equal(t, 3, len(remojis))
 	assert.Equal(t, emojis[0].Name, remojis[0].Name)
 	assert.Equal(t, emojis[1].Name, remojis[1].Name)
 	assert.Equal(t, emojis[2].Name, remojis[2].Name)
 
-	remojis, err = ss.Emoji().GetList(1, 2, model.EMOJI_SORT_BY_NAME)
+	remojis, err = ss.Emoji().GetList(1, 2, model.EmojiSortByName)
 	assert.NoError(t, err)
 	assert.Equal(t, 2, len(remojis))
 	assert.Equal(t, emojis[1].Name, remojis[0].Name)

store/storetest/file_info_store.go

@@ -357,7 +357,7 @@ func testFileInfoGetWithOptions(t *testing.T, ss store.Store) {
 			PerPage: 10,
 			Opt: &model.GetFileInfosOptions{
 				IncludeDeleted: true,
-				SortBy:         model.FILEINFO_SORT_BY_CREATED,
+				SortBy:         model.FileinfoSortByCreated,
 			},
 			ExpectedFileIds: []string{file1_1.Id, file1_2.Id, file1_3.Id, file2_1.Id, file2_2.Id},
 		},
@@ -367,7 +367,7 @@ func testFileInfoGetWithOptions(t *testing.T, ss store.Store) {
 			PerPage: 10,
 			Opt: &model.GetFileInfosOptions{
 				UserIds:        []string{userId1},
-				SortBy:         model.FILEINFO_SORT_BY_CREATED,
+				SortBy:         model.FileinfoSortByCreated,
 				SortDescending: true,
 			},
 			ExpectedFileIds: []string{file1_3.Id, file1_2.Id, file1_1.Id},
@@ -378,7 +378,7 @@ func testFileInfoGetWithOptions(t *testing.T, ss store.Store) {
 			PerPage: 3,
 			Opt: &model.GetFileInfosOptions{
 				IncludeDeleted: true,
-				SortBy:         model.FILEINFO_SORT_BY_CREATED,
+				SortBy:         model.FileinfoSortByCreated,
 				SortDescending: true,
 			},
 			ExpectedFileIds: []string{file1_2.Id, file1_1.Id},
@@ -610,14 +610,14 @@ func testFileInfoStoreGetFilesBatchForIndexing(t *testing.T, ss store.Store) {
 	c1.TeamId = model.NewId()
 	c1.DisplayName = "Channel1"
 	c1.Name = "zz" + model.NewId() + "b"
-	c1.Type = model.CHANNEL_OPEN
+	c1.Type = model.ChannelTypeOpen
 	c1, _ = ss.Channel().Save(c1, -1)
 
 	c2 := &model.Channel{}
 	c2.TeamId = model.NewId()
 	c2.DisplayName = "Channel2"
 	c2.Name = "zz" + model.NewId() + "b"
-	c2.Type = model.CHANNEL_OPEN
+	c2.Type = model.ChannelTypeOpen
 	c2, _ = ss.Channel().Save(c2, -1)
 
 	o1 := &model.Post{}

store/storetest/group_store.go

@@ -702,7 +702,7 @@ func testGroupGetMemberUsersInTeam(t *testing.T, ss store.Store) {
 		CompanyName: "Some company name",
 		Name:        "z-z-" + model.NewId() + "a",
 		Email:       "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	}
 	team, err := ss.Team().Save(team)
 	require.NoError(t, err)
@@ -788,7 +788,7 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, ss store.Store) {
 		CompanyName: "Some company name",
 		Name:        "z-z-" + model.NewId() + "a",
 		Email:       "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	}
 	team, err := ss.Team().Save(team)
 	require.NoError(t, err)
@@ -839,7 +839,7 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, ss store.Store) {
 		TeamId:      team.Id,
 		DisplayName: "Channel",
 		Name:        model.NewId(),
-		Type:        model.CHANNEL_OPEN, // Query does not look at type so this shouldn't matter.
+		Type:        model.ChannelTypeOpen, // Query does not look at type so this shouldn't matter.
 	}
 	channel, nErr := ss.Channel().Save(channel, 9999)
 	require.NoError(t, nErr)
@@ -1085,7 +1085,7 @@ func testCreateGroupSyncable(t *testing.T, ss store.Store) {
 		InviteId:        "inviteid0",
 		Name:            "z-z-" + model.NewId() + "a",
 		Email:           "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:            model.TEAM_OPEN,
+		Type:            model.TeamOpen,
 	}
 	team, nErr := ss.Team().Save(t1)
 	require.NoError(t, nErr)
@@ -1122,7 +1122,7 @@ func testGetGroupSyncable(t *testing.T, ss store.Store) {
 		InviteId:        "inviteid0",
 		Name:            "z-z-" + model.NewId() + "a",
 		Email:           "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:            model.TEAM_OPEN,
+		Type:            model.TeamOpen,
 	}
 	team, nErr := ss.Team().Save(t1)
 	require.NoError(t, nErr)
@@ -1170,7 +1170,7 @@ func testGetAllGroupSyncablesByGroup(t *testing.T, ss store.Store) {
 			InviteId:        "inviteid0",
 			Name:            "z-z-" + model.NewId() + "a",
 			Email:           "success+" + model.NewId() + "@simulator.amazonses.com",
-			Type:            model.TEAM_OPEN,
+			Type:            model.TeamOpen,
 		}
 		var team *model.Team
 		team, nErr := ss.Team().Save(t1)
@@ -1222,7 +1222,7 @@ func testUpdateGroupSyncable(t *testing.T, ss store.Store) {
 		InviteId:        "inviteid0",
 		Name:            "z-z-" + model.NewId() + "a",
 		Email:           "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:            model.TEAM_OPEN,
+		Type:            model.TeamOpen,
 	}
 	team, nErr := ss.Team().Save(t1)
 	require.NoError(t, nErr)
@@ -1290,7 +1290,7 @@ func testDeleteGroupSyncable(t *testing.T, ss store.Store) {
 		InviteId:        "inviteid0",
 		Name:            "z-z-" + model.NewId() + "a",
 		Email:           "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:            model.TEAM_OPEN,
+		Type:            model.TeamOpen,
 	}
 	team, nErr := ss.Team().Save(t1)
 	require.NoError(t, nErr)
@@ -1357,7 +1357,7 @@ func testTeamMembersToAdd(t *testing.T, ss store.Store) {
 		InviteId:        "inviteid0",
 		Name:            "z-z-" + model.NewId() + "a",
 		Email:           "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:            model.TEAM_OPEN,
+		Type:            model.TeamOpen,
 	}
 	team, nErr = ss.Team().Save(team)
 	require.NoError(t, nErr)
@@ -1558,7 +1558,7 @@ func testTeamMembersToAddSingleTeam(t *testing.T, ss store.Store) {
 		InviteId:        "inviteid0",
 		Name:            "z-z-" + model.NewId() + "a",
 		Email:           "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:            model.TEAM_OPEN,
+		Type:            model.TeamOpen,
 	}
 	team1, nErr = ss.Team().Save(team1)
 	require.NoError(t, nErr)
@@ -1571,7 +1571,7 @@ func testTeamMembersToAddSingleTeam(t *testing.T, ss store.Store) {
 		InviteId:        "inviteid0",
 		Name:            "z-z-" + model.NewId() + "a",
 		Email:           "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:            model.TEAM_OPEN,
+		Type:            model.TeamOpen,
 	}
 	team2, nErr = ss.Team().Save(team2)
 	require.NoError(t, nErr)
@@ -1622,7 +1622,7 @@ func testChannelMembersToAdd(t *testing.T, ss store.Store) {
 		TeamId:      model.NewId(),
 		DisplayName: "A Name",
 		Name:        model.NewId(),
-		Type:        model.CHANNEL_OPEN, // Query does not look at type so this shouldn't matter.
+		Type:        model.ChannelTypeOpen, // Query does not look at type so this shouldn't matter.
 	}
 	channel, nErr = ss.Channel().Save(channel, 9999)
 	require.NoError(t, nErr)
@@ -1820,7 +1820,7 @@ func testChannelMembersToAddSingleChannel(t *testing.T, ss store.Store) {
 	channel1 := &model.Channel{
 		DisplayName: "Name",
 		Name:        "z-z-" + model.NewId() + "a",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel1, nErr = ss.Channel().Save(channel1, 999)
 	require.NoError(t, nErr)
@@ -1828,7 +1828,7 @@ func testChannelMembersToAddSingleChannel(t *testing.T, ss store.Store) {
 	channel2 := &model.Channel{
 		DisplayName: "Name",
 		Name:        "z-z-" + model.NewId() + "a",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel2, nErr = ss.Channel().Save(channel2, 999)
 	require.NoError(t, nErr)
@@ -1957,7 +1957,7 @@ func testTeamMembersToRemoveSingleTeam(t *testing.T, ss store.Store) {
 		InviteId:         "inviteid0",
 		Name:             "z-z-" + model.NewId() + "a",
 		Email:            "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:             model.TEAM_OPEN,
+		Type:             model.TeamOpen,
 		GroupConstrained: model.NewBool(true),
 	}
 	team1, nErr := ss.Team().Save(team1)
@@ -1971,7 +1971,7 @@ func testTeamMembersToRemoveSingleTeam(t *testing.T, ss store.Store) {
 		InviteId:         "inviteid0",
 		Name:             "z-z-" + model.NewId() + "a",
 		Email:            "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:             model.TEAM_OPEN,
+		Type:             model.TeamOpen,
 		GroupConstrained: model.NewBool(true),
 	}
 	team2, nErr = ss.Team().Save(team2)
@@ -2104,7 +2104,7 @@ func testChannelMembersToRemoveSingleChannel(t *testing.T, ss store.Store) {
 	channel1 := &model.Channel{
 		DisplayName:      "Name",
 		Name:             "z-z-" + model.NewId() + "a",
-		Type:             model.CHANNEL_OPEN,
+		Type:             model.ChannelTypeOpen,
 		GroupConstrained: model.NewBool(true),
 	}
 	channel1, nErr := ss.Channel().Save(channel1, 999)
@@ -2113,7 +2113,7 @@ func testChannelMembersToRemoveSingleChannel(t *testing.T, ss store.Store) {
 	channel2 := &model.Channel{
 		DisplayName:      "Name",
 		Name:             "z-z-" + model.NewId() + "a",
-		Type:             model.CHANNEL_OPEN,
+		Type:             model.ChannelTypeOpen,
 		GroupConstrained: model.NewBool(true),
 	}
 	channel2, nErr = ss.Channel().Save(channel2, 999)
@@ -2206,7 +2206,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData
 		TeamId:           model.NewId(),
 		DisplayName:      "A Name",
 		Name:             model.NewId(),
-		Type:             model.CHANNEL_PRIVATE,
+		Type:             model.ChannelTypePrivate,
 		GroupConstrained: model.NewBool(true),
 	}
 	channelConstrained, nErr = ss.Channel().Save(channelConstrained, 9999)
@@ -2216,7 +2216,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData
 		TeamId:      model.NewId(),
 		DisplayName: "A Name",
 		Name:        model.NewId(),
-		Type:        model.CHANNEL_PRIVATE,
+		Type:        model.ChannelTypePrivate,
 	}
 	channelUnconstrained, nErr = ss.Channel().Save(channelUnconstrained, 9999)
 	require.NoError(t, nErr)
@@ -2230,7 +2230,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData
 		InviteId:         "inviteid0",
 		Name:             "z-z-" + model.NewId() + "a",
 		Email:            "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:             model.TEAM_INVITE,
+		Type:             model.TeamInvite,
 		GroupConstrained: model.NewBool(true),
 	}
 	teamConstrained, nErr = ss.Team().Save(teamConstrained)
@@ -2244,7 +2244,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData
 		InviteId:        "inviteid1",
 		Name:            "z-z-" + model.NewId() + "a",
 		Email:           "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:            model.TEAM_INVITE,
+		Type:            model.TeamInvite,
 	}
 	teamUnconstrained, nErr = ss.Team().Save(teamUnconstrained)
 	require.NoError(t, nErr)
@@ -2318,7 +2318,7 @@ func testGetGroupsByChannel(t *testing.T, ss store.Store) {
 		TeamId:      model.NewId(),
 		DisplayName: "Channel1",
 		Name:        model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel1, err := ss.Channel().Save(channel1, 9999)
 	require.NoError(t, err)
@@ -2368,7 +2368,7 @@ func testGetGroupsByChannel(t *testing.T, ss store.Store) {
 		TeamId:      model.NewId(),
 		DisplayName: "Channel2",
 		Name:        model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel2, nErr := ss.Channel().Save(channel2, 9999)
 	require.NoError(t, nErr)
@@ -2556,7 +2556,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, ss store.Store) {
 		InviteId:        model.NewId(),
 		Name:            "zz" + model.NewId(),
 		Email:           "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:            model.TEAM_OPEN,
+		Type:            model.TeamOpen,
 	}
 	team1, errt := ss.Team().Save(team1)
 	require.NoError(t, errt)
@@ -2566,7 +2566,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, ss store.Store) {
 		TeamId:      team1.Id,
 		DisplayName: "Channel1",
 		Name:        model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel1, err := ss.Channel().Save(channel1, 9999)
 	require.NoError(t, err)
@@ -2616,7 +2616,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, ss store.Store) {
 		TeamId:      team1.Id,
 		DisplayName: "Channel2",
 		Name:        model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel2, err = ss.Channel().Save(channel2, 9999)
 	require.NoError(t, err)
@@ -2799,7 +2799,7 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) {
 		InviteId:        model.NewId(),
 		Name:            "zz" + model.NewId(),
 		Email:           "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:            model.TEAM_OPEN,
+		Type:            model.TeamOpen,
 	}
 	team1, err := ss.Team().Save(team1)
 	require.NoError(t, err)
@@ -2853,7 +2853,7 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) {
 		InviteId:        model.NewId(),
 		Name:            "zz" + model.NewId(),
 		Email:           "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:            model.TEAM_INVITE,
+		Type:            model.TeamInvite,
 	}
 	team2, err = ss.Team().Save(team2)
 	require.NoError(t, err)
@@ -3045,7 +3045,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
 		InviteId:         model.NewId(),
 		Name:             "zz" + model.NewId(),
 		Email:            "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:             model.TEAM_OPEN,
+		Type:             model.TeamOpen,
 		GroupConstrained: model.NewBool(true),
 	}
 	team1, err := ss.Team().Save(team1)
@@ -3058,7 +3058,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
 		TeamId:      model.NewId(),
 		DisplayName: "Channel1",
 		Name:        model.NewId(),
-		Type:        model.CHANNEL_PRIVATE,
+		Type:        model.ChannelTypePrivate,
 	}
 	channel1, nErr := ss.Channel().Save(channel1, 9999)
 	require.NoError(t, nErr)
@@ -3112,7 +3112,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
 		InviteId:        model.NewId(),
 		Name:            "zz" + model.NewId(),
 		Email:           "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:            model.TEAM_INVITE,
+		Type:            model.TeamInvite,
 	}
 	team2, err = ss.Team().Save(team2)
 	require.NoError(t, err)
@@ -3122,7 +3122,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
 		TeamId:      model.NewId(),
 		DisplayName: "Channel2",
 		Name:        model.NewId(),
-		Type:        model.CHANNEL_PRIVATE,
+		Type:        model.ChannelTypePrivate,
 	}
 	channel2, nErr = ss.Channel().Save(channel2, 9999)
 	require.NoError(t, nErr)
@@ -3132,7 +3132,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
 		TeamId:      team1.Id,
 		DisplayName: "Channel3",
 		Name:        model.NewId(),
-		Type:        model.CHANNEL_PRIVATE,
+		Type:        model.ChannelTypePrivate,
 	}
 	channel3, nErr = ss.Channel().Save(channel3, 9999)
 	require.NoError(t, nErr)
@@ -3216,7 +3216,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
 		InviteId:        model.NewId(),
 		Name:            "zz" + model.NewId(),
 		Email:           "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:            model.TEAM_INVITE,
+		Type:            model.TeamInvite,
 	}
 	team3, err = ss.Team().Save(team3)
 	require.NoError(t, err)
@@ -3225,7 +3225,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
 		TeamId:      team3.Id,
 		DisplayName: "Channel4",
 		Name:        model.NewId(),
-		Type:        model.CHANNEL_PRIVATE,
+		Type:        model.ChannelTypePrivate,
 	}
 	channel4, nErr = ss.Channel().Save(channel4, 9999)
 	require.NoError(t, nErr)
@@ -3475,7 +3475,7 @@ func testTeamMembersMinusGroupMembers(t *testing.T, ss store.Store) {
 		InviteId:         model.NewId(),
 		Name:             "zz" + model.NewId(),
 		Email:            model.NewId() + "@simulator.amazonses.com",
-		Type:             model.TEAM_OPEN,
+		Type:             model.TeamOpen,
 		GroupConstrained: model.NewBool(true),
 	}
 	team, err := ss.Team().Save(team)
@@ -3627,7 +3627,7 @@ func testChannelMembersMinusGroupMembers(t *testing.T, ss store.Store) {
 		TeamId:           model.NewId(),
 		DisplayName:      "A Name",
 		Name:             model.NewId(),
-		Type:             model.CHANNEL_PRIVATE,
+		Type:             model.ChannelTypePrivate,
 		GroupConstrained: model.NewBool(true),
 	}
 	channel, err := ss.Channel().Save(channel, 9999)
@@ -3855,7 +3855,7 @@ func groupTestAdminRoleGroupsForSyncableMemberChannel(t *testing.T, ss store.Sto
 		TeamId:      model.NewId(),
 		DisplayName: "A Name",
 		Name:        model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel, nErr := ss.Channel().Save(channel, 9999)
 	require.NoError(t, nErr)
@@ -3942,7 +3942,7 @@ func groupTestAdminRoleGroupsForSyncableMemberTeam(t *testing.T, ss store.Store)
 	team := &model.Team{
 		DisplayName: "A Name",
 		Name:        "zz" + model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	team, nErr := ss.Team().Save(team)
 	require.NoError(t, nErr)
@@ -4045,7 +4045,7 @@ func groupTestPermittedSyncableAdminsTeam(t *testing.T, ss store.Store) {
 	team := &model.Team{
 		DisplayName: "A Name",
 		Name:        "zz" + model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	team, nErr := ss.Team().Save(team)
 	require.NoError(t, nErr)
@@ -4152,7 +4152,7 @@ func groupTestPermittedSyncableAdminsChannel(t *testing.T, ss store.Store) {
 		TeamId:      model.NewId(),
 		DisplayName: "A Name",
 		Name:        model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	channel, nErr := ss.Channel().Save(channel, 9999)
 	require.NoError(t, nErr)
@@ -4214,7 +4214,7 @@ func groupTestpUpdateMembersRoleTeam(t *testing.T, ss store.Store) {
 		InviteId:        "inviteid0",
 		Name:            "z-z-" + model.NewId() + "a",
 		Email:           "success+" + model.NewId() + "@simulator.amazonses.com",
-		Type:            model.TEAM_OPEN,
+		Type:            model.TeamOpen,
 	}
 	team, err := ss.Team().Save(team)
 	require.NoError(t, err)
@@ -4314,7 +4314,7 @@ func groupTestpUpdateMembersRoleChannel(t *testing.T, ss store.Store) {
 		TeamId:      model.NewId(),
 		DisplayName: "A Name",
 		Name:        model.NewId(),
-		Type:        model.CHANNEL_OPEN, // Query does not look at type so this shouldn't matter.
+		Type:        model.ChannelTypeOpen, // Query does not look at type so this shouldn't matter.
 	}
 	channel, err := ss.Channel().Save(channel, 9999)
 	require.NoError(t, err)
@@ -4455,7 +4455,7 @@ func groupTestGroupTeamCount(t *testing.T, ss store.Store) {
 		InviteId:        model.NewId(),
 		Name:            "zz" + model.NewId(),
 		Email:           model.NewId() + "@simulator.amazonses.com",
-		Type:            model.TEAM_OPEN,
+		Type:            model.TeamOpen,
 	})
 	require.NoError(t, err)
 	defer ss.Team().PermanentDelete(team.Id)
@@ -4500,7 +4500,7 @@ func groupTestGroupChannelCount(t *testing.T, ss store.Store) {
 		TeamId:      model.NewId(),
 		DisplayName: model.NewId(),
 		Name:        model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}, 9999)
 	require.NoError(t, err)
 	defer ss.Channel().Delete(channel.Id, 0)

store/storetest/job_store.go

@@ -445,9 +445,9 @@ func testJobStoreGetCountByStatusAndType(t *testing.T, ss store.Store) {
 func testJobUpdateOptimistically(t *testing.T, ss store.Store) {
 	job := &model.Job{
 		Id:       model.NewId(),
-		Type:     model.JOB_TYPE_DATA_RETENTION,
+		Type:     model.JobTypeDataRetention,
 		CreateAt: model.GetMillis(),
-		Status:   model.JOB_STATUS_PENDING,
+		Status:   model.JobStatusPending,
 	}
 
 	_, err := ss.Job().Save(job)
@@ -455,18 +455,18 @@ func testJobUpdateOptimistically(t *testing.T, ss store.Store) {
 	defer ss.Job().Delete(job.Id)
 
 	job.LastActivityAt = model.GetMillis()
-	job.Status = model.JOB_STATUS_IN_PROGRESS
+	job.Status = model.JobStatusInProgress
 	job.Progress = 50
 	job.Data = map[string]string{
 		"Foo": "Bar",
 	}
 
-	updated, err := ss.Job().UpdateOptimistically(job, model.JOB_STATUS_SUCCESS)
+	updated, err := ss.Job().UpdateOptimistically(job, model.JobStatusSuccess)
 	require.False(t, err != nil && updated)
 
 	time.Sleep(2 * time.Millisecond)
 
-	updated, err = ss.Job().UpdateOptimistically(job, model.JOB_STATUS_PENDING)
+	updated, err = ss.Job().UpdateOptimistically(job, model.JobStatusPending)
 	require.NoError(t, err)
 	require.True(t, updated)
 
@@ -484,9 +484,9 @@ func testJobUpdateOptimistically(t *testing.T, ss store.Store) {
 func testJobUpdateStatusUpdateStatusOptimistically(t *testing.T, ss store.Store) {
 	job := &model.Job{
 		Id:       model.NewId(),
-		Type:     model.JOB_TYPE_DATA_RETENTION,
+		Type:     model.JobTypeDataRetention,
 		CreateAt: model.GetMillis(),
-		Status:   model.JOB_STATUS_SUCCESS,
+		Status:   model.JobStatusSuccess,
 	}
 
 	var lastUpdateAt int64
@@ -498,35 +498,35 @@ func testJobUpdateStatusUpdateStatusOptimistically(t *testing.T, ss store.Store)
 
 	time.Sleep(2 * time.Millisecond)
 
-	received, err = ss.Job().UpdateStatus(job.Id, model.JOB_STATUS_PENDING)
+	received, err = ss.Job().UpdateStatus(job.Id, model.JobStatusPending)
 	require.NoError(t, err)
 
-	require.Equal(t, model.JOB_STATUS_PENDING, received.Status)
+	require.Equal(t, model.JobStatusPending, received.Status)
 	require.Greater(t, received.LastActivityAt, lastUpdateAt)
 	lastUpdateAt = received.LastActivityAt
 
 	time.Sleep(2 * time.Millisecond)
 
-	updated, err := ss.Job().UpdateStatusOptimistically(job.Id, model.JOB_STATUS_IN_PROGRESS, model.JOB_STATUS_SUCCESS)
+	updated, err := ss.Job().UpdateStatusOptimistically(job.Id, model.JobStatusInProgress, model.JobStatusSuccess)
 	require.NoError(t, err)
 	require.False(t, updated)
 
 	received, err = ss.Job().Get(job.Id)
 	require.NoError(t, err)
 
-	require.Equal(t, model.JOB_STATUS_PENDING, received.Status)
+	require.Equal(t, model.JobStatusPending, received.Status)
 	require.Equal(t, received.LastActivityAt, lastUpdateAt)
 
 	time.Sleep(2 * time.Millisecond)
 
-	updated, err = ss.Job().UpdateStatusOptimistically(job.Id, model.JOB_STATUS_PENDING, model.JOB_STATUS_IN_PROGRESS)
+	updated, err = ss.Job().UpdateStatusOptimistically(job.Id, model.JobStatusPending, model.JobStatusInProgress)
 	require.NoError(t, err)
 	require.True(t, updated, "should have succeeded")
 
 	var startAtSet int64
 	received, err = ss.Job().Get(job.Id)
 	require.NoError(t, err)
-	require.Equal(t, model.JOB_STATUS_IN_PROGRESS, received.Status)
+	require.Equal(t, model.JobStatusInProgress, received.Status)
 	require.NotEqual(t, 0, received.StartAt)
 	require.Greater(t, received.LastActivityAt, lastUpdateAt)
 	lastUpdateAt = received.LastActivityAt
@@ -534,13 +534,13 @@ func testJobUpdateStatusUpdateStatusOptimistically(t *testing.T, ss store.Store)
 
 	time.Sleep(2 * time.Millisecond)
 
-	updated, err = ss.Job().UpdateStatusOptimistically(job.Id, model.JOB_STATUS_IN_PROGRESS, model.JOB_STATUS_SUCCESS)
+	updated, err = ss.Job().UpdateStatusOptimistically(job.Id, model.JobStatusInProgress, model.JobStatusSuccess)
 	require.NoError(t, err)
 	require.True(t, updated, "should have succeeded")
 
 	received, err = ss.Job().Get(job.Id)
 	require.NoError(t, err)
-	require.Equal(t, model.JOB_STATUS_SUCCESS, received.Status)
+	require.Equal(t, model.JobStatusSuccess, received.Status)
 	require.Equal(t, startAtSet, received.StartAt)
 	require.Greater(t, received.LastActivityAt, lastUpdateAt)
 }

store/storetest/link_metadata_store.go

@@ -35,7 +35,7 @@ func testLinkMetadataStoreSave(t *testing.T, ss store.Store) {
 		metadata := &model.LinkMetadata{
 			URL:       "http://example.com",
 			Timestamp: getNextLinkMetadataTimestamp(),
-			Type:      model.LINK_METADATA_TYPE_IMAGE,
+			Type:      model.LinkMetadataTypeImage,
 			Data:      &model.PostImage{},
 		}
 
@@ -62,7 +62,7 @@ func testLinkMetadataStoreSave(t *testing.T, ss store.Store) {
 		metadata := &model.LinkMetadata{
 			URL:       "http://example.com",
 			Timestamp: getNextLinkMetadataTimestamp(),
-			Type:      model.LINK_METADATA_TYPE_IMAGE,
+			Type:      model.LinkMetadataTypeImage,
 			Data:      &model.PostImage{},
 		}
 
@@ -81,7 +81,7 @@ func testLinkMetadataStoreSave(t *testing.T, ss store.Store) {
 		metadata := &model.LinkMetadata{
 			URL:       "http://example.com",
 			Timestamp: getNextLinkMetadataTimestamp(),
-			Type:      model.LINK_METADATA_TYPE_IMAGE,
+			Type:      model.LinkMetadataTypeImage,
 			Data:      &model.PostImage{},
 		}
 
@@ -100,7 +100,7 @@ func testLinkMetadataStoreSave(t *testing.T, ss store.Store) {
 		metadata := &model.LinkMetadata{
 			URL:       "http://example.com",
 			Timestamp: getNextLinkMetadataTimestamp(),
-			Type:      model.LINK_METADATA_TYPE_IMAGE,
+			Type:      model.LinkMetadataTypeImage,
 			Data:      &model.PostImage{},
 		}
 
@@ -126,7 +126,7 @@ func testLinkMetadataStoreGet(t *testing.T, ss store.Store) {
 		metadata := &model.LinkMetadata{
 			URL:       "http://example.com",
 			Timestamp: getNextLinkMetadataTimestamp(),
-			Type:      model.LINK_METADATA_TYPE_IMAGE,
+			Type:      model.LinkMetadataTypeImage,
 			Data:      &model.PostImage{},
 		}
 
@@ -144,7 +144,7 @@ func testLinkMetadataStoreGet(t *testing.T, ss store.Store) {
 		metadata := &model.LinkMetadata{
 			URL:       "http://example.com",
 			Timestamp: getNextLinkMetadataTimestamp(),
-			Type:      model.LINK_METADATA_TYPE_IMAGE,
+			Type:      model.LinkMetadataTypeImage,
 			Data:      &model.PostImage{},
 		}
 
@@ -162,7 +162,7 @@ func testLinkMetadataStoreGet(t *testing.T, ss store.Store) {
 		metadata := &model.LinkMetadata{
 			URL:       "http://example.com",
 			Timestamp: getNextLinkMetadataTimestamp(),
-			Type:      model.LINK_METADATA_TYPE_IMAGE,
+			Type:      model.LinkMetadataTypeImage,
 			Data:      &model.PostImage{},
 		}
 
@@ -182,7 +182,7 @@ func testLinkMetadataStoreTypes(t *testing.T, ss store.Store) {
 		metadata := &model.LinkMetadata{
 			URL:       "http://example.com",
 			Timestamp: getNextLinkMetadataTimestamp(),
-			Type:      model.LINK_METADATA_TYPE_IMAGE,
+			Type:      model.LinkMetadataTypeImage,
 			Data: &model.PostImage{
 				Width:  123,
 				Height: 456,
@@ -215,7 +215,7 @@ func testLinkMetadataStoreTypes(t *testing.T, ss store.Store) {
 		metadata := &model.LinkMetadata{
 			URL:       "http://example.com",
 			Timestamp: getNextLinkMetadataTimestamp(),
-			Type:      model.LINK_METADATA_TYPE_OPENGRAPH,
+			Type:      model.LinkMetadataTypeOpengraph,
 			Data:      og,
 		}
 
@@ -236,7 +236,7 @@ func testLinkMetadataStoreTypes(t *testing.T, ss store.Store) {
 		metadata := &model.LinkMetadata{
 			URL:       "http://example.com",
 			Timestamp: getNextLinkMetadataTimestamp(),
-			Type:      model.LINK_METADATA_TYPE_NONE,
+			Type:      model.LinkMetadataTypeNone,
 			Data:      nil,
 		}
 

store/storetest/oauth_store.go

@@ -302,7 +302,7 @@ func testOAuthGetAuthorizedApps(t *testing.T, ss store.Store) {
 	// allow the app
 	p := model.Preference{}
 	p.UserId = a1.CreatorId
-	p.Category = model.PREFERENCE_CATEGORY_AUTHORIZED_OAUTH_APP
+	p.Category = model.PreferenceCategoryAuthorizedOAuthApp
 	p.Name = a1.Id
 	p.Value = "true"
 	nErr := ss.Preference().Save(&model.Preferences{p})
@@ -325,7 +325,7 @@ func testOAuthGetAccessDataByUserForApp(t *testing.T, ss store.Store) {
 	// allow the app
 	p := model.Preference{}
 	p.UserId = a1.CreatorId
-	p.Category = model.PREFERENCE_CATEGORY_AUTHORIZED_OAUTH_APP
+	p.Category = model.PreferenceCategoryAuthorizedOAuthApp
 	p.Name = a1.Id
 	p.Value = "true"
 	nErr := ss.Preference().Save(&model.Preferences{p})

store/storetest/post_store.go

@@ -148,7 +148,7 @@ func testPostStoreSave(t *testing.T, ss store.Store) {
 		channel := model.Channel{}
 		channel.Name = "zz" + model.NewId() + "b"
 		channel.DisplayName = "zz" + model.NewId() + "b"
-		channel.Type = model.CHANNEL_OPEN
+		channel.Type = model.ChannelTypeOpen
 
 		_, err := ss.Channel().Save(&channel, 100)
 		require.NoError(t, err)
@@ -328,7 +328,7 @@ func testPostStoreSaveMultiple(t *testing.T, ss store.Store) {
 		channel := model.Channel{}
 		channel.Name = "zz" + model.NewId() + "b"
 		channel.DisplayName = "zz" + model.NewId() + "b"
-		channel.Type = model.CHANNEL_OPEN
+		channel.Type = model.ChannelTypeOpen
 
 		_, err := ss.Channel().Save(&channel, 100)
 		require.NoError(t, err)
@@ -360,7 +360,7 @@ func testPostStoreSaveMultiple(t *testing.T, ss store.Store) {
 }
 
 func testPostStoreSaveChannelMsgCounts(t *testing.T, ss store.Store) {
-	c1 := &model.Channel{Name: model.NewId(), DisplayName: "posttestchannel", Type: model.CHANNEL_OPEN}
+	c1 := &model.Channel{Name: model.NewId(), DisplayName: "posttestchannel", Type: model.ChannelTypeOpen}
 	_, err := ss.Channel().Save(c1, 1000000)
 	require.NoError(t, err)
 
@@ -377,12 +377,12 @@ func testPostStoreSaveChannelMsgCounts(t *testing.T, ss store.Store) {
 	assert.Equal(t, int64(1), c1.TotalMsgCount, "Message count should update by 1")
 
 	o1.Id = ""
-	o1.Type = model.POST_ADD_TO_TEAM
+	o1.Type = model.PostTypeAddToTeam
 	_, err = ss.Post().Save(&o1)
 	require.NoError(t, err)
 
 	o1.Id = ""
-	o1.Type = model.POST_REMOVE_FROM_TEAM
+	o1.Type = model.PostTypeRemoveFromTeam
 	_, err = ss.Post().Save(&o1)
 	require.NoError(t, err)
 
@@ -634,9 +634,9 @@ func testPostStoreDelete(t *testing.T, ss store.Store) {
 
 	posts, _ := ss.Post().GetPostsCreatedAt(o1.ChannelId, o1.CreateAt)
 	post := posts[0]
-	actual := post.GetProp(model.POST_PROPS_DELETE_BY)
+	actual := post.GetProp(model.PostPropsDeleteBy)
 
-	assert.Equal(t, deleteByID, actual, "Expected (*Post).Props[model.POST_PROPS_DELETE_BY] to be %v but got %v.", deleteByID, actual)
+	assert.Equal(t, deleteByID, actual, "Expected (*Post).Props[model.PostPropsDeleteBy] to be %v but got %v.", deleteByID, actual)
 
 	r3, err := ss.Post().Get(context.Background(), o1.Id, false, false, false, "")
 	require.Error(t, err, "Missing id should have failed - PostList %v", r3)
@@ -1595,7 +1595,7 @@ func testPostStoreGetPostBeforeAfter(t *testing.T, ss store.Store) {
 
 	o1 := &model.Post{}
 	o1.ChannelId = channelId
-	o1.Type = model.POST_JOIN_CHANNEL
+	o1.Type = model.PostTypeJoinChannel
 	o1.UserId = model.NewId()
 	o1.Message = "system_join_channel message"
 	_, err = ss.Post().Save(o1)
@@ -1690,7 +1690,7 @@ func testUserCountsWithPostsByDay(t *testing.T, ss store.Store) {
 	t1.DisplayName = "DisplayName"
 	t1.Name = "zz" + model.NewId() + "b"
 	t1.Email = MakeEmail()
-	t1.Type = model.TEAM_OPEN
+	t1.Type = model.TeamOpen
 	t1, err := ss.Team().Save(t1)
 	require.NoError(t, err)
 
@@ -1698,7 +1698,7 @@ func testUserCountsWithPostsByDay(t *testing.T, ss store.Store) {
 	c1.TeamId = t1.Id
 	c1.DisplayName = "Channel2"
 	c1.Name = "zz" + model.NewId() + "b"
-	c1.Type = model.CHANNEL_OPEN
+	c1.Type = model.ChannelTypeOpen
 	c1, nErr := ss.Channel().Save(c1, -1)
 	require.NoError(t, nErr)
 
@@ -1749,7 +1749,7 @@ func testPostCountsByDay(t *testing.T, ss store.Store) {
 	t1.DisplayName = "DisplayName"
 	t1.Name = "zz" + model.NewId() + "b"
 	t1.Email = MakeEmail()
-	t1.Type = model.TEAM_OPEN
+	t1.Type = model.TeamOpen
 	t1, err := ss.Team().Save(t1)
 	require.NoError(t, err)
 
@@ -1757,7 +1757,7 @@ func testPostCountsByDay(t *testing.T, ss store.Store) {
 	c1.TeamId = t1.Id
 	c1.DisplayName = "Channel2"
 	c1.Name = "zz" + model.NewId() + "b"
-	c1.Type = model.CHANNEL_OPEN
+	c1.Type = model.ChannelTypeOpen
 	c1, nErr := ss.Channel().Save(c1, -1)
 	require.NoError(t, nErr)
 
@@ -1886,7 +1886,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor
 	c1.TeamId = model.NewId()
 	c1.DisplayName = "Channel1"
 	c1.Name = "zz" + model.NewId() + "b"
-	c1.Type = model.CHANNEL_OPEN
+	c1.Type = model.ChannelTypeOpen
 	c1, err := ss.Channel().Save(c1, -1)
 	require.NoError(t, err)
 
@@ -1926,7 +1926,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor
 	c2 := &model.Channel{}
 	c2.DisplayName = "DMChannel1"
 	c2.Name = "zz" + model.NewId() + "b"
-	c2.Type = model.CHANNEL_DIRECT
+	c2.Type = model.ChannelTypeDirect
 
 	m1 := &model.ChannelMember{}
 	m1.ChannelId = c2.Id
@@ -1957,7 +1957,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor
 	preferences := model.Preferences{
 		{
 			UserId:   o1.UserId,
-			Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
+			Category: model.PreferenceCategoryFlaggedPost,
 			Name:     o1.Id,
 			Value:    "true",
 		},
@@ -1973,7 +1973,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor
 	preferences = model.Preferences{
 		{
 			UserId:   o1.UserId,
-			Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
+			Category: model.PreferenceCategoryFlaggedPost,
 			Name:     o2.Id,
 			Value:    "true",
 		},
@@ -2001,7 +2001,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor
 	preferences = model.Preferences{
 		{
 			UserId:   o1.UserId,
-			Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
+			Category: model.PreferenceCategoryFlaggedPost,
 			Name:     o3.Id,
 			Value:    "true",
 		},
@@ -2017,7 +2017,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor
 	preferences = model.Preferences{
 		{
 			UserId:   o1.UserId,
-			Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
+			Category: model.PreferenceCategoryFlaggedPost,
 			Name:     o4.Id,
 			Value:    "true",
 		},
@@ -2036,7 +2036,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor
 	preferences = model.Preferences{
 		{
 			UserId:   o1.UserId,
-			Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
+			Category: model.PreferenceCategoryFlaggedPost,
 			Name:     o5.Id,
 			Value:    "true",
 		},
@@ -2085,7 +2085,7 @@ func testPostStoreGetFlaggedPosts(t *testing.T, ss store.Store) {
 	preferences := model.Preferences{
 		{
 			UserId:   o1.UserId,
-			Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
+			Category: model.PreferenceCategoryFlaggedPost,
 			Name:     o1.Id,
 			Value:    "true",
 		},
@@ -2101,7 +2101,7 @@ func testPostStoreGetFlaggedPosts(t *testing.T, ss store.Store) {
 	preferences = model.Preferences{
 		{
 			UserId:   o1.UserId,
-			Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
+			Category: model.PreferenceCategoryFlaggedPost,
 			Name:     o2.Id,
 			Value:    "true",
 		},
@@ -2129,7 +2129,7 @@ func testPostStoreGetFlaggedPosts(t *testing.T, ss store.Store) {
 	preferences = model.Preferences{
 		{
 			UserId:   o1.UserId,
-			Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
+			Category: model.PreferenceCategoryFlaggedPost,
 			Name:     o3.Id,
 			Value:    "true",
 		},
@@ -2184,7 +2184,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, ss store.Store) {
 
 	preference := model.Preference{
 		UserId:   o1.UserId,
-		Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
+		Category: model.PreferenceCategoryFlaggedPost,
 		Name:     o1.Id,
 		Value:    "true",
 	}
@@ -2556,14 +2556,14 @@ func testPostStoreGetPostsBatchForIndexing(t *testing.T, ss store.Store) {
 	c1.TeamId = model.NewId()
 	c1.DisplayName = "Channel1"
 	c1.Name = "zz" + model.NewId() + "b"
-	c1.Type = model.CHANNEL_OPEN
+	c1.Type = model.ChannelTypeOpen
 	c1, _ = ss.Channel().Save(c1, -1)
 
 	c2 := &model.Channel{}
 	c2.TeamId = model.NewId()
 	c2.DisplayName = "Channel2"
 	c2.Name = "zz" + model.NewId() + "b"
-	c2.Type = model.CHANNEL_OPEN
+	c2.Type = model.ChannelTypeOpen
 	c2, _ = ss.Channel().Save(c2, -1)
 
 	o1 := &model.Post{}
@@ -2613,14 +2613,14 @@ func testPostStorePermanentDeleteBatch(t *testing.T, ss store.Store) {
 		DisplayName: "DisplayName",
 		Name:        "team" + model.NewId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	})
 	require.NoError(t, err)
 	channel, err := ss.Channel().Save(&model.Channel{
 		TeamId:      team.Id,
 		DisplayName: "DisplayName",
 		Name:        "channel" + model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}, -1)
 	require.NoError(t, err)
 
@@ -2753,14 +2753,14 @@ func testPostStorePermanentDeleteBatch(t *testing.T, ss store.Store) {
 		c1.TeamId = model.NewId()
 		c1.DisplayName = "Channel1"
 		c1.Name = "zz" + model.NewId() + "b"
-		c1.Type = model.CHANNEL_OPEN
+		c1.Type = model.ChannelTypeOpen
 		c1, _ = ss.Channel().Save(c1, -1)
 
 		c2 := &model.Channel{}
 		c2.TeamId = model.NewId()
 		c2.DisplayName = "Channel2"
 		c2.Name = "zz" + model.NewId() + "b"
-		c2.Type = model.CHANNEL_OPEN
+		c2.Type = model.ChannelTypeOpen
 		c2, _ = ss.Channel().Save(c2, -1)
 
 		channelPolicy, err2 := ss.RetentionPolicy().Save(&model.RetentionPolicyWithTeamAndChannelIDs{
@@ -2846,8 +2846,8 @@ func testPostStoreGetOldest(t *testing.T, ss store.Store) {
 }
 
 func testGetMaxPostSize(t *testing.T, ss store.Store) {
-	assert.Equal(t, model.POST_MESSAGE_MAX_RUNES_V2, ss.Post().GetMaxPostSize())
-	assert.Equal(t, model.POST_MESSAGE_MAX_RUNES_V2, ss.Post().GetMaxPostSize())
+	assert.Equal(t, model.PostMessageMaxRunesV2, ss.Post().GetMaxPostSize())
+	assert.Equal(t, model.PostMessageMaxRunesV2, ss.Post().GetMaxPostSize())
 }
 
 func testPostStoreGetParentsForExportAfter(t *testing.T, ss store.Store) {
@@ -2855,7 +2855,7 @@ func testPostStoreGetParentsForExportAfter(t *testing.T, ss store.Store) {
 	t1.DisplayName = "Name"
 	t1.Name = "zz" + model.NewId()
 	t1.Email = MakeEmail()
-	t1.Type = model.TEAM_OPEN
+	t1.Type = model.TeamOpen
 	_, err := ss.Team().Save(&t1)
 	require.NoError(t, err)
 
@@ -2863,7 +2863,7 @@ func testPostStoreGetParentsForExportAfter(t *testing.T, ss store.Store) {
 	c1.TeamId = t1.Id
 	c1.DisplayName = "Channel1"
 	c1.Name = "zz" + model.NewId() + "b"
-	c1.Type = model.CHANNEL_OPEN
+	c1.Type = model.ChannelTypeOpen
 	_, nErr := ss.Channel().Save(&c1, -1)
 	require.NoError(t, nErr)
 
@@ -2904,7 +2904,7 @@ func testPostStoreGetRepliesForExport(t *testing.T, ss store.Store) {
 	t1.DisplayName = "Name"
 	t1.Name = "zz" + model.NewId()
 	t1.Email = MakeEmail()
-	t1.Type = model.TEAM_OPEN
+	t1.Type = model.TeamOpen
 	_, err := ss.Team().Save(&t1)
 	require.NoError(t, err)
 
@@ -2912,7 +2912,7 @@ func testPostStoreGetRepliesForExport(t *testing.T, ss store.Store) {
 	c1.TeamId = t1.Id
 	c1.DisplayName = "Channel1"
 	c1.Name = "zz" + model.NewId() + "b"
-	c1.Type = model.CHANNEL_OPEN
+	c1.Type = model.ChannelTypeOpen
 	_, nErr := ss.Channel().Save(&c1, -1)
 	require.NoError(t, nErr)
 
@@ -2974,7 +2974,7 @@ func testPostStoreGetDirectPostParentsForExportAfter(t *testing.T, ss store.Stor
 	o1.TeamId = teamId
 	o1.DisplayName = "Name"
 	o1.Name = "zz" + model.NewId() + "b"
-	o1.Type = model.CHANNEL_DIRECT
+	o1.Type = model.ChannelTypeDirect
 
 	u1 := &model.User{}
 	u1.Email = MakeEmail()
@@ -3028,7 +3028,7 @@ func testPostStoreGetDirectPostParentsForExportAfterDeleted(t *testing.T, ss sto
 	o1.TeamId = teamId
 	o1.DisplayName = "Name"
 	o1.Name = "zz" + model.NewId() + "b"
-	o1.Type = model.CHANNEL_DIRECT
+	o1.Type = model.ChannelTypeDirect
 
 	u1 := &model.User{}
 	u1.DeleteAt = 1
@@ -3094,7 +3094,7 @@ func testPostStoreGetDirectPostParentsForExportAfterBatched(t *testing.T, ss sto
 	o1.TeamId = teamId
 	o1.DisplayName = "Name"
 	o1.Name = "zz" + model.NewId() + "b"
-	o1.Type = model.CHANNEL_DIRECT
+	o1.Type = model.ChannelTypeDirect
 
 	var postIds []string
 	for i := 0; i < 150; i++ {
@@ -3188,7 +3188,7 @@ func testHasAutoResponsePostByUserSince(t *testing.T, ss store.Store) {
 			ChannelId: channelId,
 			UserId:    userId,
 			Message:   "auto response message",
-			Type:      model.POST_AUTO_RESPONDER,
+			Type:      model.PostTypeAutoResponder,
 		})
 		require.NoError(t, err)
 		time.Sleep(time.Millisecond)

store/storetest/preference_store.go

@@ -31,13 +31,13 @@ func testPreferenceSave(t *testing.T, ss store.Store) {
 	preferences := model.Preferences{
 		{
 			UserId:   id,
-			Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW,
+			Category: model.PreferenceCategoryDirectChannelShow,
 			Name:     model.NewId(),
 			Value:    "value1a",
 		},
 		{
 			UserId:   id,
-			Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW,
+			Category: model.PreferenceCategoryDirectChannelShow,
 			Name:     model.NewId(),
 			Value:    "value1b",
 		},
@@ -63,7 +63,7 @@ func testPreferenceSave(t *testing.T, ss store.Store) {
 
 func testPreferenceGet(t *testing.T, ss store.Store) {
 	userId := model.NewId()
-	category := model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW
+	category := model.PreferenceCategoryDirectChannelShow
 	name := model.NewId()
 
 	preferences := model.Preferences{
@@ -103,7 +103,7 @@ func testPreferenceGet(t *testing.T, ss store.Store) {
 
 func testPreferenceGetCategory(t *testing.T, ss store.Store) {
 	userId := model.NewId()
-	category := model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW
+	category := model.PreferenceCategoryDirectChannelShow
 	name := model.NewId()
 
 	preferences := model.Preferences{
@@ -152,7 +152,7 @@ func testPreferenceGetCategory(t *testing.T, ss store.Store) {
 
 func testPreferenceGetAll(t *testing.T, ss store.Store) {
 	userId := model.NewId()
-	category := model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW
+	category := model.PreferenceCategoryDirectChannelShow
 	name := model.NewId()
 
 	preferences := model.Preferences{
@@ -196,7 +196,7 @@ func testPreferenceGetAll(t *testing.T, ss store.Store) {
 
 func testPreferenceDeleteByUser(t *testing.T, ss store.Store) {
 	userId := model.NewId()
-	category := model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW
+	category := model.PreferenceCategoryDirectChannelShow
 	name := model.NewId()
 
 	preferences := model.Preferences{
@@ -235,7 +235,7 @@ func testPreferenceDeleteByUser(t *testing.T, ss store.Store) {
 func testPreferenceDelete(t *testing.T, ss store.Store) {
 	preference := model.Preference{
 		UserId:   model.NewId(),
-		Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW,
+		Category: model.PreferenceCategoryDirectChannelShow,
 		Name:     model.NewId(),
 		Value:    "value1a",
 	}
@@ -336,17 +336,17 @@ func testPreferenceDeleteOrphanedRows(t *testing.T, ss store.Store) {
 		DisplayName: "DisplayName",
 		Name:        "team" + model.NewId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	})
 	require.NoError(t, err)
 	channel, err := ss.Channel().Save(&model.Channel{
 		TeamId:      team.Id,
 		DisplayName: "DisplayName",
 		Name:        "channel" + model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}, -1)
 	require.NoError(t, err)
-	category := model.PREFERENCE_CATEGORY_FLAGGED_POST
+	category := model.PreferenceCategoryFlaggedPost
 	userId := model.NewId()
 
 	olderPost, err := ss.Post().Save(&model.Post{

store/storetest/reaction_store.go

@@ -391,13 +391,13 @@ func forceUpdateAt(reaction *model.Reaction, updateAt int64, s SqlStore) error {
 	}
 
 	sqlResult, err := s.GetMaster().Exec(`
-		UPDATE 
-			Reactions 
-		SET 
-			UpdateAt=:UpdateAt 
-		WHERE 
-			UserId = :UserId AND 
-			PostId = :PostId AND 
+		UPDATE
+			Reactions
+		SET
+			UpdateAt=:UpdateAt
+		WHERE
+			UserId = :UserId AND
+			PostId = :PostId AND
 			EmojiName = :EmojiName`, params,
 	)
 
@@ -527,14 +527,14 @@ func testReactionStorePermanentDeleteBatch(t *testing.T, ss store.Store) {
 		DisplayName: "DisplayName",
 		Name:        "team" + model.NewId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	})
 	require.NoError(t, err)
 	channel, err := ss.Channel().Save(&model.Channel{
 		TeamId:      team.Id,
 		DisplayName: "DisplayName",
 		Name:        "channel" + model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}, -1)
 	require.NoError(t, err)
 	olderPost, err := ss.Post().Save(&model.Post{

store/storetest/retention_policy_store.go

@@ -116,7 +116,7 @@ func createChannelsForRetentionPolicy(t *testing.T, ss store.Store, teamId strin
 			TeamId:      teamId,
 			DisplayName: "Channel " + name,
 			Name:        name,
-			Type:        model.CHANNEL_OPEN,
+			Type:        model.ChannelTypeOpen,
 		}
 		channel, err := ss.Channel().Save(channel, -1)
 		require.NoError(t, err)
@@ -132,7 +132,7 @@ func createTeamsForRetentionPolicy(t *testing.T, ss store.Store, numTeams int) (
 		team := &model.Team{
 			DisplayName: "Team " + name,
 			Name:        name,
-			Type:        model.TEAM_OPEN,
+			Type:        model.TeamOpen,
 		}
 		team, err := ss.Team().Save(team)
 		require.NoError(t, err)

store/storetest/role_store.go

@@ -368,7 +368,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) {
 		DisplayName: model.NewId(),
 		Name:        model.NewId(),
 		Description: model.NewId(),
-		Scope:       model.SCHEME_SCOPE_TEAM,
+		Scope:       model.SchemeScopeTeam,
 	}
 	teamScheme1, err := ss.Scheme().Save(teamScheme1)
 	require.NoError(t, err)
@@ -378,7 +378,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) {
 		DisplayName: model.NewId(),
 		Name:        model.NewId(),
 		Description: model.NewId(),
-		Scope:       model.SCHEME_SCOPE_TEAM,
+		Scope:       model.SchemeScopeTeam,
 	}
 	teamScheme2, err = ss.Scheme().Save(teamScheme2)
 	require.NoError(t, err)
@@ -388,7 +388,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) {
 		DisplayName: model.NewId(),
 		Name:        model.NewId(),
 		Description: model.NewId(),
-		Scope:       model.SCHEME_SCOPE_CHANNEL,
+		Scope:       model.SchemeScopeChannel,
 	}
 	channelScheme1, err = ss.Scheme().Save(channelScheme1)
 	require.NoError(t, err)
@@ -398,7 +398,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) {
 		DisplayName: model.NewId(),
 		Name:        model.NewId(),
 		Description: model.NewId(),
-		Scope:       model.SCHEME_SCOPE_CHANNEL,
+		Scope:       model.SchemeScopeChannel,
 	}
 	channelScheme2, err = ss.Scheme().Save(channelScheme2)
 	require.NoError(t, err)
@@ -408,7 +408,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) {
 		DisplayName: "Name",
 		Name:        "zz" + model.NewId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 		SchemeId:    &teamScheme1.Id,
 	}
 	team1, err = ss.Team().Save(team1)
@@ -419,7 +419,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) {
 		DisplayName: "Name",
 		Name:        "zz" + model.NewId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 		SchemeId:    &teamScheme2.Id,
 	}
 	team2, err = ss.Team().Save(team2)
@@ -430,7 +430,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) {
 		TeamId:      team1.Id,
 		DisplayName: "Display " + model.NewId(),
 		Name:        "zz" + model.NewId() + "b",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 		SchemeId:    &channelScheme1.Id,
 	}
 	channel1, nErr := ss.Channel().Save(channel1, -1)
@@ -441,7 +441,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) {
 		TeamId:      team2.Id,
 		DisplayName: "Display " + model.NewId(),
 		Name:        "zz" + model.NewId() + "b",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 		SchemeId:    &channelScheme2.Id,
 	}
 	channel2, nErr = ss.Channel().Save(channel2, -1)
@@ -522,7 +522,7 @@ func testRoleStoreChannelHigherScopedPermissionsBlankTeamSchemeChannelGuest(t *t
 		DisplayName: model.NewId(),
 		Name:        model.NewId(),
 		Description: model.NewId(),
-		Scope:       model.SCHEME_SCOPE_TEAM,
+		Scope:       model.SchemeScopeTeam,
 	}
 	teamScheme, err := ss.Scheme().Save(teamScheme)
 	require.NoError(t, err)
@@ -532,7 +532,7 @@ func testRoleStoreChannelHigherScopedPermissionsBlankTeamSchemeChannelGuest(t *t
 		DisplayName: model.NewId(),
 		Name:        model.NewId(),
 		Description: model.NewId(),
-		Scope:       model.SCHEME_SCOPE_CHANNEL,
+		Scope:       model.SchemeScopeChannel,
 	}
 	channelScheme, err = ss.Scheme().Save(channelScheme)
 	require.NoError(t, err)
@@ -542,7 +542,7 @@ func testRoleStoreChannelHigherScopedPermissionsBlankTeamSchemeChannelGuest(t *t
 		DisplayName: "Name",
 		Name:        "zz" + model.NewId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 		SchemeId:    &teamScheme.Id,
 	}
 	team, err = ss.Team().Save(team)
@@ -553,7 +553,7 @@ func testRoleStoreChannelHigherScopedPermissionsBlankTeamSchemeChannelGuest(t *t
 		TeamId:      team.Id,
 		DisplayName: "Display " + model.NewId(),
 		Name:        "zz" + model.NewId() + "b",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 		SchemeId:    &channelScheme.Id,
 	}
 	channel, nErr := ss.Channel().Save(channel, -1)
@@ -568,7 +568,7 @@ func testRoleStoreChannelHigherScopedPermissionsBlankTeamSchemeChannelGuest(t *t
 
 	teamSchemeUserRole, err := ss.Role().GetByName(context.Background(), teamScheme.DefaultChannelUserRole)
 	require.NoError(t, err)
-	teamSchemeUserRole.Permissions = []string{model.PERMISSION_UPLOAD_FILE.Id}
+	teamSchemeUserRole.Permissions = []string{model.PermissionUploadFile.Id}
 	_, err = ss.Role().Save(teamSchemeUserRole)
 	require.NoError(t, err)
 

store/storetest/scheme_store.go

@@ -29,54 +29,54 @@ func TestSchemeStore(t *testing.T, ss store.Store) {
 
 func createDefaultRoles(ss store.Store) {
 	ss.Role().Save(&model.Role{
-		Name:        model.TEAM_ADMIN_ROLE_ID,
-		DisplayName: model.TEAM_ADMIN_ROLE_ID,
+		Name:        model.TeamAdminRoleId,
+		DisplayName: model.TeamAdminRoleId,
 		Permissions: []string{
-			model.PERMISSION_DELETE_OTHERS_POSTS.Id,
+			model.PermissionDeleteOthersPosts.Id,
 		},
 	})
 
 	ss.Role().Save(&model.Role{
-		Name:        model.TEAM_USER_ROLE_ID,
-		DisplayName: model.TEAM_USER_ROLE_ID,
+		Name:        model.TeamUserRoleId,
+		DisplayName: model.TeamUserRoleId,
 		Permissions: []string{
-			model.PERMISSION_VIEW_TEAM.Id,
-			model.PERMISSION_ADD_USER_TO_TEAM.Id,
+			model.PermissionViewTeam.Id,
+			model.PermissionAddUserToTeam.Id,
 		},
 	})
 
 	ss.Role().Save(&model.Role{
-		Name:        model.TEAM_GUEST_ROLE_ID,
-		DisplayName: model.TEAM_GUEST_ROLE_ID,
+		Name:        model.TeamGuestRoleId,
+		DisplayName: model.TeamGuestRoleId,
 		Permissions: []string{
-			model.PERMISSION_VIEW_TEAM.Id,
+			model.PermissionViewTeam.Id,
 		},
 	})
 
 	ss.Role().Save(&model.Role{
-		Name:        model.CHANNEL_ADMIN_ROLE_ID,
-		DisplayName: model.CHANNEL_ADMIN_ROLE_ID,
+		Name:        model.ChannelAdminRoleId,
+		DisplayName: model.ChannelAdminRoleId,
 		Permissions: []string{
-			model.PERMISSION_MANAGE_PUBLIC_CHANNEL_MEMBERS.Id,
-			model.PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS.Id,
+			model.PermissionManagePublicChannelMembers.Id,
+			model.PermissionManagePrivateChannelMembers.Id,
 		},
 	})
 
 	ss.Role().Save(&model.Role{
-		Name:        model.CHANNEL_USER_ROLE_ID,
-		DisplayName: model.CHANNEL_USER_ROLE_ID,
+		Name:        model.ChannelUserRoleId,
+		DisplayName: model.ChannelUserRoleId,
 		Permissions: []string{
-			model.PERMISSION_READ_CHANNEL.Id,
-			model.PERMISSION_CREATE_POST.Id,
+			model.PermissionReadChannel.Id,
+			model.PermissionCreatePost.Id,
 		},
 	})
 
 	ss.Role().Save(&model.Role{
-		Name:        model.CHANNEL_GUEST_ROLE_ID,
-		DisplayName: model.CHANNEL_GUEST_ROLE_ID,
+		Name:        model.ChannelGuestRoleId,
+		DisplayName: model.ChannelGuestRoleId,
 		Permissions: []string{
-			model.PERMISSION_READ_CHANNEL.Id,
-			model.PERMISSION_CREATE_POST.Id,
+			model.PermissionReadChannel.Id,
+			model.PermissionCreatePost.Id,
 		},
 	})
 }
@@ -87,7 +87,7 @@ func testSchemeStoreSave(t *testing.T, ss store.Store) {
 		DisplayName: model.NewId(),
 		Name:        model.NewId(),
 		Description: model.NewId(),
-		Scope:       model.SCHEME_SCOPE_TEAM,
+		Scope:       model.SchemeScopeTeam,
 	}
 
 	// Check all fields saved correctly.
@@ -165,7 +165,7 @@ func testSchemeStoreSave(t *testing.T, ss store.Store) {
 		DisplayName: model.NewId(),
 		Name:        model.NewId(),
 		Description: model.NewId(),
-		Scope:       model.SCHEME_SCOPE_TEAM,
+		Scope:       model.SchemeScopeTeam,
 	}
 
 	_, err = ss.Scheme().Save(s3)
@@ -178,7 +178,7 @@ func testSchemeStoreGet(t *testing.T, ss store.Store) {
 		DisplayName: model.NewId(),
 		Name:        model.NewId(),
 		Description: model.NewId(),
-		Scope:       model.SCHEME_SCOPE_TEAM,
+		Scope:       model.SchemeScopeTeam,
 	}
 
 	d1, err := ss.Scheme().Save(s1)
@@ -214,7 +214,7 @@ func testSchemeStoreGetByName(t *testing.T, ss store.Store) {
 		DisplayName: model.NewId(),
 		Name:        model.NewId(),
 		Description: model.NewId(),
-		Scope:       model.SCHEME_SCOPE_TEAM,
+		Scope:       model.SchemeScopeTeam,
 	}
 
 	d1, err := ss.Scheme().Save(s1)
@@ -251,25 +251,25 @@ func testSchemeStoreGetAllPage(t *testing.T, ss store.Store) {
 			DisplayName: model.NewId(),
 			Name:        model.NewId(),
 			Description: model.NewId(),
-			Scope:       model.SCHEME_SCOPE_TEAM,
+			Scope:       model.SchemeScopeTeam,
 		},
 		{
 			DisplayName: model.NewId(),
 			Name:        model.NewId(),
 			Description: model.NewId(),
-			Scope:       model.SCHEME_SCOPE_CHANNEL,
+			Scope:       model.SchemeScopeChannel,
 		},
 		{
 			DisplayName: model.NewId(),
 			Name:        model.NewId(),
 			Description: model.NewId(),
-			Scope:       model.SCHEME_SCOPE_TEAM,
+			Scope:       model.SchemeScopeTeam,
 		},
 		{
 			DisplayName: model.NewId(),
 			Name:        model.NewId(),
 			Description: model.NewId(),
-			Scope:       model.SCHEME_SCOPE_CHANNEL,
+			Scope:       model.SchemeScopeChannel,
 		},
 	}
 
@@ -315,7 +315,7 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) {
 		DisplayName: model.NewId(),
 		Name:        model.NewId(),
 		Description: model.NewId(),
-		Scope:       model.SCHEME_SCOPE_TEAM,
+		Scope:       model.SchemeScopeTeam,
 	}
 
 	// Check all fields saved correctly.
@@ -406,7 +406,7 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) {
 		DisplayName: model.NewId(),
 		Name:        model.NewId(),
 		Description: model.NewId(),
-		Scope:       model.SCHEME_SCOPE_TEAM,
+		Scope:       model.SchemeScopeTeam,
 	}
 	d4, err := ss.Scheme().Save(s4)
 	assert.NoError(t, err)
@@ -415,7 +415,7 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) {
 		Name:        "xx" + model.NewId(),
 		DisplayName: model.NewId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 		SchemeId:    &d4.Id,
 	}
 	t4, err = ss.Team().Save(t4)
@@ -433,7 +433,7 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) {
 		DisplayName: model.NewId(),
 		Name:        model.NewId(),
 		Description: model.NewId(),
-		Scope:       model.SCHEME_SCOPE_CHANNEL,
+		Scope:       model.SchemeScopeChannel,
 	}
 	d5, err := ss.Scheme().Save(s5)
 	assert.NoError(t, err)
@@ -442,7 +442,7 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) {
 		TeamId:      model.NewId(),
 		DisplayName: model.NewId(),
 		Name:        model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 		SchemeId:    &d5.Id,
 	}
 	c5, nErr := ss.Channel().Save(c5, -1)
@@ -461,14 +461,14 @@ func testSchemeStorePermanentDeleteAll(t *testing.T, ss store.Store) {
 		Name:        model.NewId(),
 		DisplayName: model.NewId(),
 		Description: model.NewId(),
-		Scope:       model.SCHEME_SCOPE_TEAM,
+		Scope:       model.SchemeScopeTeam,
 	}
 
 	s2 := &model.Scheme{
 		Name:        model.NewId(),
 		DisplayName: model.NewId(),
 		Description: model.NewId(),
-		Scope:       model.SCHEME_SCOPE_CHANNEL,
+		Scope:       model.SchemeScopeChannel,
 	}
 
 	s1, err := ss.Scheme().Save(s1)
@@ -492,11 +492,11 @@ func testSchemeStorePermanentDeleteAll(t *testing.T, ss store.Store) {
 
 func testSchemeStoreCountByScope(t *testing.T, ss store.Store) {
 	testCounts := func(expectedTeamCount, expectedChannelCount int) {
-		actualCount, err := ss.Scheme().CountByScope(model.SCHEME_SCOPE_TEAM)
+		actualCount, err := ss.Scheme().CountByScope(model.SchemeScopeTeam)
 		require.NoError(t, err)
 		require.Equal(t, int64(expectedTeamCount), actualCount)
 
-		actualCount, err = ss.Scheme().CountByScope(model.SCHEME_SCOPE_CHANNEL)
+		actualCount, err = ss.Scheme().CountByScope(model.SchemeScopeChannel)
 		require.NoError(t, err)
 		require.Equal(t, int64(expectedChannelCount), actualCount)
 	}
@@ -514,17 +514,17 @@ func testSchemeStoreCountByScope(t *testing.T, ss store.Store) {
 	err := ss.Scheme().PermanentDeleteAll()
 	require.NoError(t, err)
 
-	createScheme(model.SCHEME_SCOPE_CHANNEL)
-	createScheme(model.SCHEME_SCOPE_TEAM)
+	createScheme(model.SchemeScopeChannel)
+	createScheme(model.SchemeScopeTeam)
 	testCounts(1, 1)
-	createScheme(model.SCHEME_SCOPE_TEAM)
+	createScheme(model.SchemeScopeTeam)
 	testCounts(2, 1)
-	createScheme(model.SCHEME_SCOPE_CHANNEL)
+	createScheme(model.SchemeScopeChannel)
 	testCounts(2, 2)
 }
 
 func testCountWithoutPermission(t *testing.T, ss store.Store) {
-	perm := model.PERMISSION_CREATE_POST.Id
+	perm := model.PermissionCreatePost.Id
 
 	createScheme := func(scope string) *model.Scheme {
 		scheme, err := ss.Scheme().Save(&model.Scheme{
@@ -548,13 +548,13 @@ func testCountWithoutPermission(t *testing.T, ss store.Store) {
 		return
 	}
 
-	teamScheme1 := createScheme(model.SCHEME_SCOPE_TEAM)
+	teamScheme1 := createScheme(model.SchemeScopeTeam)
 	defer ss.Scheme().Delete(teamScheme1.Id)
-	teamScheme2 := createScheme(model.SCHEME_SCOPE_TEAM)
+	teamScheme2 := createScheme(model.SchemeScopeTeam)
 	defer ss.Scheme().Delete(teamScheme2.Id)
-	channelScheme1 := createScheme(model.SCHEME_SCOPE_CHANNEL)
+	channelScheme1 := createScheme(model.SchemeScopeChannel)
 	defer ss.Scheme().Delete(channelScheme1.Id)
-	channelScheme2 := createScheme(model.SCHEME_SCOPE_CHANNEL)
+	channelScheme2 := createScheme(model.SchemeScopeChannel)
 	defer ss.Scheme().Delete(channelScheme2.Id)
 
 	ts1User, ts1Guest := getRoles(teamScheme1)
@@ -573,11 +573,11 @@ func testCountWithoutPermission(t *testing.T, ss store.Store) {
 		cs2Guest,
 	}
 
-	teamUserCount, err := ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_TEAM, perm, model.RoleScopeChannel, model.RoleTypeUser)
+	teamUserCount, err := ss.Scheme().CountWithoutPermission(model.SchemeScopeTeam, perm, model.RoleScopeChannel, model.RoleTypeUser)
 	require.NoError(t, err)
 	require.Equal(t, int64(0), teamUserCount)
 
-	teamGuestCount, err := ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_TEAM, perm, model.RoleScopeChannel, model.RoleTypeGuest)
+	teamGuestCount, err := ss.Scheme().CountWithoutPermission(model.SchemeScopeTeam, perm, model.RoleScopeChannel, model.RoleTypeGuest)
 	require.NoError(t, err)
 	require.Equal(t, int64(0), teamGuestCount)
 
@@ -614,19 +614,19 @@ func testCountWithoutPermission(t *testing.T, ss store.Store) {
 	for _, test := range tests {
 		removePermission(test.removePermissionFromRole)
 
-		count, err := ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_TEAM, perm, model.RoleScopeChannel, model.RoleTypeUser)
+		count, err := ss.Scheme().CountWithoutPermission(model.SchemeScopeTeam, perm, model.RoleScopeChannel, model.RoleTypeUser)
 		require.NoError(t, err)
 		require.Equal(t, int64(test.expectTeamSchemeChannelUserCount), count)
 
-		count, err = ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_TEAM, perm, model.RoleScopeChannel, model.RoleTypeGuest)
+		count, err = ss.Scheme().CountWithoutPermission(model.SchemeScopeTeam, perm, model.RoleScopeChannel, model.RoleTypeGuest)
 		require.NoError(t, err)
 		require.Equal(t, int64(test.expectTeamSchemeChannelGuestCount), count)
 
-		count, err = ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_CHANNEL, perm, model.RoleScopeChannel, model.RoleTypeUser)
+		count, err = ss.Scheme().CountWithoutPermission(model.SchemeScopeChannel, perm, model.RoleScopeChannel, model.RoleTypeUser)
 		require.NoError(t, err)
 		require.Equal(t, int64(test.expectChannelSchemeChannelUserCount), count)
 
-		count, err = ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_CHANNEL, perm, model.RoleScopeChannel, model.RoleTypeGuest)
+		count, err = ss.Scheme().CountWithoutPermission(model.SchemeScopeChannel, perm, model.RoleScopeChannel, model.RoleTypeGuest)
 		require.NoError(t, err)
 		require.Equal(t, int64(test.expectChannelSchemeChannelGuestCount), count)
 	}

store/storetest/session_store.go

@@ -187,7 +187,7 @@ func testSessionUpdateDeviceId(t *testing.T, ss store.Store) {
 	s1, err := ss.Session().Save(s1)
 	require.NoError(t, err)
 
-	_, err = ss.Session().UpdateDeviceId(s1.Id, model.PUSH_NOTIFY_APPLE+":1234567890", s1.ExpiresAt)
+	_, err = ss.Session().UpdateDeviceId(s1.Id, model.PushNotifyApple+":1234567890", s1.ExpiresAt)
 	require.NoError(t, err)
 
 	s2 := &model.Session{}
@@ -196,7 +196,7 @@ func testSessionUpdateDeviceId(t *testing.T, ss store.Store) {
 	s2, err = ss.Session().Save(s2)
 	require.NoError(t, err)
 
-	_, err = ss.Session().UpdateDeviceId(s2.Id, model.PUSH_NOTIFY_APPLE+":1234567890", s1.ExpiresAt)
+	_, err = ss.Session().UpdateDeviceId(s2.Id, model.PushNotifyApple+":1234567890", s1.ExpiresAt)
 	require.NoError(t, err)
 }
 
@@ -207,7 +207,7 @@ func testSessionUpdateDeviceId2(t *testing.T, ss store.Store) {
 	s1, err := ss.Session().Save(s1)
 	require.NoError(t, err)
 
-	_, err = ss.Session().UpdateDeviceId(s1.Id, model.PUSH_NOTIFY_APPLE_REACT_NATIVE+":1234567890", s1.ExpiresAt)
+	_, err = ss.Session().UpdateDeviceId(s1.Id, model.PushNotifyAppleReactNative+":1234567890", s1.ExpiresAt)
 	require.NoError(t, err)
 
 	s2 := &model.Session{}
@@ -216,7 +216,7 @@ func testSessionUpdateDeviceId2(t *testing.T, ss store.Store) {
 	s2, err = ss.Session().Save(s2)
 	require.NoError(t, err)
 
-	_, err = ss.Session().UpdateDeviceId(s2.Id, model.PUSH_NOTIFY_APPLE_REACT_NATIVE+":1234567890", s1.ExpiresAt)
+	_, err = ss.Session().UpdateDeviceId(s2.Id, model.PushNotifyAppleReactNative+":1234567890", s1.ExpiresAt)
 	require.NoError(t, err)
 }
 

store/storetest/settings.go

@@ -161,9 +161,9 @@ func execAsRoot(settings *model.SqlSettings, sqlCommand string) error {
 	var driver = *settings.DriverName
 
 	switch driver {
-	case model.DATABASE_DRIVER_MYSQL:
+	case model.DatabaseDriverMysql:
 		dsn = mySQLRootDSN(*settings.DataSource)
-	case model.DATABASE_DRIVER_POSTGRES:
+	case model.DatabaseDriverPostgres:
 		dsn = postgreSQLRootDSN(*settings.DataSource)
 	default:
 		return fmt.Errorf("unsupported driver %s", driver)
@@ -196,7 +196,7 @@ func MakeSqlSettings(driver string, withReplica bool) *model.SqlSettings {
 	var dbName string
 
 	switch driver {
-	case model.DATABASE_DRIVER_MYSQL:
+	case model.DatabaseDriverMysql:
 		settings = MySQLSettings(withReplica)
 		dbName = mySQLDSNDatabase(*settings.DataSource)
 		newDSRs := []string{}
@@ -204,7 +204,7 @@ func MakeSqlSettings(driver string, withReplica bool) *model.SqlSettings {
 			newDSRs = append(newDSRs, replaceMySQLDatabaseName(dataSource, dbName))
 		}
 		settings.DataSourceReplicas = newDSRs
-	case model.DATABASE_DRIVER_POSTGRES:
+	case model.DatabaseDriverPostgres:
 		settings = PostgreSQLSettings()
 		dbName = postgreSQLDSNDatabase(*settings.DataSource)
 	default:
@@ -216,11 +216,11 @@ func MakeSqlSettings(driver string, withReplica bool) *model.SqlSettings {
 	}
 
 	switch driver {
-	case model.DATABASE_DRIVER_MYSQL:
+	case model.DatabaseDriverMysql:
 		if err := execAsRoot(settings, "GRANT ALL PRIVILEGES ON "+dbName+".* TO 'mmuser'"); err != nil {
 			panic("failed to grant mmuser permission to " + dbName + ":" + err.Error())
 		}
-	case model.DATABASE_DRIVER_POSTGRES:
+	case model.DatabaseDriverPostgres:
 		if err := execAsRoot(settings, "GRANT ALL PRIVILEGES ON DATABASE \""+dbName+"\" TO mmuser"); err != nil {
 			panic("failed to grant mmuser permission to " + dbName + ":" + err.Error())
 		}
@@ -238,9 +238,9 @@ func CleanupSqlSettings(settings *model.SqlSettings) {
 	var dbName string
 
 	switch driver {
-	case model.DATABASE_DRIVER_MYSQL:
+	case model.DatabaseDriverMysql:
 		dbName = mySQLDSNDatabase(*settings.DataSource)
-	case model.DATABASE_DRIVER_POSTGRES:
+	case model.DatabaseDriverPostgres:
 		dbName = postgreSQLDSNDatabase(*settings.DataSource)
 	default:
 		panic("unsupported driver " + driver)

store/storetest/shared_channel_store.go

@@ -791,7 +791,7 @@ func createTestChannel(ss store.Store, name string) (*model.Channel, error) {
 func createSharedTestChannel(ss store.Store, name string, shared bool) (*model.Channel, error) {
 	channel := &model.Channel{
 		TeamId:      model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 		Name:        name,
 		DisplayName: name + " display name",
 		Header:      name + " header",

store/storetest/status_store.go

@@ -20,7 +20,7 @@ func TestStatusStore(t *testing.T, ss store.Store) {
 }
 
 func testStatusStore(t *testing.T, ss store.Store) {
-	status := &model.Status{UserId: model.NewId(), Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: 0, ActiveChannel: ""}
+	status := &model.Status{UserId: model.NewId(), Status: model.StatusOnline, Manual: false, LastActivityAt: 0, ActiveChannel: ""}
 	require.NoError(t, ss.Status().SaveOrUpdate(status))
 
 	status.LastActivityAt = 10
@@ -28,10 +28,10 @@ func testStatusStore(t *testing.T, ss store.Store) {
 	_, err := ss.Status().Get(status.UserId)
 	require.NoError(t, err)
 
-	status2 := &model.Status{UserId: model.NewId(), Status: model.STATUS_AWAY, Manual: false, LastActivityAt: 0, ActiveChannel: ""}
+	status2 := &model.Status{UserId: model.NewId(), Status: model.StatusAway, Manual: false, LastActivityAt: 0, ActiveChannel: ""}
 	require.NoError(t, ss.Status().SaveOrUpdate(status2))
 
-	status3 := &model.Status{UserId: model.NewId(), Status: model.STATUS_OFFLINE, Manual: false, LastActivityAt: 0, ActiveChannel: ""}
+	status3 := &model.Status{UserId: model.NewId(), Status: model.StatusOffline, Manual: false, LastActivityAt: 0, ActiveChannel: ""}
 	require.NoError(t, ss.Status().SaveOrUpdate(status3))
 
 	statuses, err := ss.Status().GetByIds([]string{status.UserId, "junk"})
@@ -43,14 +43,14 @@ func testStatusStore(t *testing.T, ss store.Store) {
 
 	statusParameter, err := ss.Status().Get(status.UserId)
 	require.NoError(t, err)
-	require.Equal(t, statusParameter.Status, model.STATUS_OFFLINE, "should be offline")
+	require.Equal(t, statusParameter.Status, model.StatusOffline, "should be offline")
 
 	err = ss.Status().UpdateLastActivityAt(status.UserId, 10)
 	require.NoError(t, err)
 }
 
 func testActiveUserCount(t *testing.T, ss store.Store) {
-	status := &model.Status{UserId: model.NewId(), Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: model.GetMillis(), ActiveChannel: ""}
+	status := &model.Status{UserId: model.NewId(), Status: model.StatusOnline, Manual: false, LastActivityAt: model.GetMillis(), ActiveChannel: ""}
 	require.NoError(t, ss.Status().SaveOrUpdate(status))
 
 	count, err := ss.Status().GetTotalActiveUsersCount()
@@ -67,8 +67,8 @@ func (s ByUserId) Less(i, j int) bool { return s[i].UserId < s[j].UserId }
 func testUpdateExpiredDNDStatuses(t *testing.T, ss store.Store) {
 	userID := NewTestId()
 
-	status := &model.Status{UserId: userID, Status: model.STATUS_DND, Manual: true,
-		DNDEndTime: time.Now().Add(5 * time.Second).Unix(), PrevStatus: model.STATUS_ONLINE}
+	status := &model.Status{UserId: userID, Status: model.StatusDnd, Manual: true,
+		DNDEndTime: time.Now().Add(5 * time.Second).Unix(), PrevStatus: model.StatusOnline}
 	require.NoError(t, ss.Status().SaveOrUpdate(status))
 
 	time.Sleep(2 * time.Second)
@@ -87,8 +87,8 @@ func testUpdateExpiredDNDStatuses(t *testing.T, ss store.Store) {
 
 	updatedStatus := *statuses[0]
 	require.Equal(t, updatedStatus.UserId, userID)
-	require.Equal(t, updatedStatus.Status, model.STATUS_ONLINE)
+	require.Equal(t, updatedStatus.Status, model.StatusOnline)
 	require.Equal(t, updatedStatus.DNDEndTime, int64(0))
-	require.Equal(t, updatedStatus.PrevStatus, model.STATUS_DND)
+	require.Equal(t, updatedStatus.PrevStatus, model.StatusDnd)
 	require.Equal(t, updatedStatus.Manual, false)
 }

store/storetest/system_store.go

@@ -63,29 +63,29 @@ func testSystemStoreSaveOrUpdateWithWarnMetricHandling(t *testing.T, ss store.St
 	err := ss.System().SaveOrUpdateWithWarnMetricHandling(system)
 	require.NoError(t, err)
 
-	_, err = ss.System().GetByName(model.SYSTEM_WARN_METRIC_LAST_RUN_TIMESTAMP_KEY)
+	_, err = ss.System().GetByName(model.SystemWarnMetricLastRunTimestampKey)
 	assert.Error(t, err)
 
 	system.Name = "warn_metric_number_of_active_users_100"
-	system.Value = model.WARN_METRIC_STATUS_RUNONCE
+	system.Value = model.WarnMetricStatusRunonce
 	err = ss.System().SaveOrUpdateWithWarnMetricHandling(system)
 	require.NoError(t, err)
 
-	val1, nerr := ss.System().GetByName(model.SYSTEM_WARN_METRIC_LAST_RUN_TIMESTAMP_KEY)
+	val1, nerr := ss.System().GetByName(model.SystemWarnMetricLastRunTimestampKey)
 	assert.NoError(t, nerr)
 
 	system.Name = "warn_metric_number_of_active_users_100"
-	system.Value = model.WARN_METRIC_STATUS_ACK
+	system.Value = model.WarnMetricStatusAck
 	err = ss.System().SaveOrUpdateWithWarnMetricHandling(system)
 	require.NoError(t, err)
 
-	val2, nerr := ss.System().GetByName(model.SYSTEM_WARN_METRIC_LAST_RUN_TIMESTAMP_KEY)
+	val2, nerr := ss.System().GetByName(model.SystemWarnMetricLastRunTimestampKey)
 	assert.NoError(t, nerr)
 	assert.Equal(t, val1, val2)
 }
 
 func testSystemStoreGetByNameNoEntries(t *testing.T, ss store.Store) {
-	res, nErr := ss.System().GetByName(model.SYSTEM_FIRST_ADMIN_VISIT_MARKETPLACE)
+	res, nErr := ss.System().GetByName(model.SystemFirstAdminVisitMarketplace)
 	_, ok := nErr.(*store.ErrNotFound)
 	require.Error(t, nErr)
 	assert.True(t, ok)
@@ -128,13 +128,13 @@ func testSystemStorePermanentDeleteByName(t *testing.T, ss store.Store) {
 
 func testInsertIfExists(t *testing.T, ss store.Store) {
 	t.Run("Serial", func(t *testing.T) {
-		s1 := &model.System{Name: model.SYSTEM_CLUSTER_ENCRYPTION_KEY, Value: "somekey"}
+		s1 := &model.System{Name: model.SystemClusterEncryptionKey, Value: "somekey"}
 
 		s2, err := ss.System().InsertIfExists(s1)
 		require.NoError(t, err)
 		assert.Equal(t, s1.Value, s2.Value)
 
-		s1New := &model.System{Name: model.SYSTEM_CLUSTER_ENCRYPTION_KEY, Value: "anotherKey"}
+		s1New := &model.System{Name: model.SystemClusterEncryptionKey, Value: "anotherKey"}
 
 		s3, err := ss.System().InsertIfExists(s1New)
 		require.NoError(t, err)
@@ -147,7 +147,7 @@ func testInsertIfExists(t *testing.T, ss store.Store) {
 		wg.Add(2)
 		go func() {
 			defer wg.Done()
-			s1 := &model.System{Name: model.SYSTEM_CLUSTER_ENCRYPTION_KEY, Value: "firstKey"}
+			s1 := &model.System{Name: model.SystemClusterEncryptionKey, Value: "firstKey"}
 			var err error
 			s2, err = ss.System().InsertIfExists(s1)
 			require.NoError(t, err)
@@ -155,7 +155,7 @@ func testInsertIfExists(t *testing.T, ss store.Store) {
 
 		go func() {
 			defer wg.Done()
-			s1 := &model.System{Name: model.SYSTEM_CLUSTER_ENCRYPTION_KEY, Value: "secondKey"}
+			s1 := &model.System{Name: model.SystemClusterEncryptionKey, Value: "secondKey"}
 			var err error
 			s3, err = ss.System().InsertIfExists(s1)
 			require.NoError(t, err)

store/storetest/team_store.go

@@ -79,7 +79,7 @@ func testTeamStoreSave(t *testing.T, ss store.Store) {
 	o1.DisplayName = "DisplayName"
 	o1.Name = NewTestId()
 	o1.Email = MakeEmail()
-	o1.Type = model.TEAM_OPEN
+	o1.Type = model.TeamOpen
 
 	_, err := ss.Team().Save(&o1)
 	require.NoError(t, err, "couldn't save item")
@@ -97,7 +97,7 @@ func testTeamStoreUpdate(t *testing.T, ss store.Store) {
 	o1.DisplayName = "DisplayName"
 	o1.Name = NewTestId()
 	o1.Email = MakeEmail()
-	o1.Type = model.TEAM_OPEN
+	o1.Type = model.TeamOpen
 	_, err := ss.Team().Save(&o1)
 	require.NoError(t, err)
 
@@ -120,7 +120,7 @@ func testTeamStoreGet(t *testing.T, ss store.Store) {
 	o1.DisplayName = "DisplayName"
 	o1.Name = NewTestId()
 	o1.Email = MakeEmail()
-	o1.Type = model.TEAM_OPEN
+	o1.Type = model.TeamOpen
 	_, err := ss.Team().Save(&o1)
 	require.NoError(t, err)
 
@@ -137,7 +137,7 @@ func testTeamStoreGetByNames(t *testing.T, ss store.Store) {
 	o1.DisplayName = "DisplayName"
 	o1.Name = NewTestId()
 	o1.Email = MakeEmail()
-	o1.Type = model.TEAM_OPEN
+	o1.Type = model.TeamOpen
 
 	_, err := ss.Team().Save(&o1)
 	require.NoError(t, err)
@@ -146,7 +146,7 @@ func testTeamStoreGetByNames(t *testing.T, ss store.Store) {
 	o2.DisplayName = "DisplayName2"
 	o2.Name = NewTestId()
 	o2.Email = MakeEmail()
-	o2.Type = model.TEAM_OPEN
+	o2.Type = model.TeamOpen
 
 	_, err = ss.Team().Save(&o2)
 	require.NoError(t, err)
@@ -190,7 +190,7 @@ func testTeamStoreGetByName(t *testing.T, ss store.Store) {
 	o1.DisplayName = "DisplayName"
 	o1.Name = NewTestId()
 	o1.Email = MakeEmail()
-	o1.Type = model.TEAM_OPEN
+	o1.Type = model.TeamOpen
 
 	_, err := ss.Team().Save(&o1)
 	require.NoError(t, err)
@@ -220,7 +220,7 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) {
 	o.DisplayName = "ADisplayName" + NewTestId()
 	o.Name = "searchterm-" + NewTestId()
 	o.Email = MakeEmail()
-	o.Type = model.TEAM_OPEN
+	o.Type = model.TeamOpen
 	o.AllowOpenInvite = true
 
 	_, err := ss.Team().Save(&o)
@@ -230,7 +230,7 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) {
 	p.DisplayName = "BDisplayName" + NewTestId()
 	p.Name = "searchterm-" + NewTestId()
 	p.Email = MakeEmail()
-	p.Type = model.TEAM_OPEN
+	p.Type = model.TeamOpen
 	p.AllowOpenInvite = false
 
 	_, err = ss.Team().Save(&p)
@@ -240,7 +240,7 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) {
 	g.DisplayName = "CDisplayName" + NewTestId()
 	g.Name = "searchterm-" + NewTestId()
 	g.Email = MakeEmail()
-	g.Type = model.TEAM_OPEN
+	g.Type = model.TeamOpen
 	g.AllowOpenInvite = false
 	g.GroupConstrained = model.NewBool(true)
 
@@ -251,7 +251,7 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) {
 	q.DisplayName = "CHOCOLATE"
 	q.Name = "ilovecake"
 	q.Email = MakeEmail()
-	q.Type = model.TEAM_OPEN
+	q.Type = model.TeamOpen
 	q.AllowOpenInvite = false
 
 	q, err = ss.Team().Save(q)
@@ -407,7 +407,7 @@ func testTeamStoreSearchOpen(t *testing.T, ss store.Store) {
 	o.DisplayName = "ADisplayName" + NewTestId()
 	o.Name = NewTestId()
 	o.Email = MakeEmail()
-	o.Type = model.TEAM_OPEN
+	o.Type = model.TeamOpen
 	o.AllowOpenInvite = true
 
 	_, err := ss.Team().Save(&o)
@@ -417,7 +417,7 @@ func testTeamStoreSearchOpen(t *testing.T, ss store.Store) {
 	p.DisplayName = "ADisplayName" + NewTestId()
 	p.Name = NewTestId()
 	p.Email = MakeEmail()
-	p.Type = model.TEAM_OPEN
+	p.Type = model.TeamOpen
 	p.AllowOpenInvite = false
 
 	_, err = ss.Team().Save(&p)
@@ -427,7 +427,7 @@ func testTeamStoreSearchOpen(t *testing.T, ss store.Store) {
 	q.DisplayName = "PINEAPPLEPIE"
 	q.Name = "ihadsomepineapplepiewithstrawberry"
 	q.Email = MakeEmail()
-	q.Type = model.TEAM_OPEN
+	q.Type = model.TeamOpen
 	q.AllowOpenInvite = true
 
 	_, err = ss.Team().Save(&q)
@@ -513,7 +513,7 @@ func testTeamStoreSearchPrivate(t *testing.T, ss store.Store) {
 	o.DisplayName = "ADisplayName" + NewTestId()
 	o.Name = NewTestId()
 	o.Email = MakeEmail()
-	o.Type = model.TEAM_OPEN
+	o.Type = model.TeamOpen
 	o.AllowOpenInvite = true
 
 	_, err := ss.Team().Save(&o)
@@ -523,7 +523,7 @@ func testTeamStoreSearchPrivate(t *testing.T, ss store.Store) {
 	p.DisplayName = "ADisplayName" + NewTestId()
 	p.Name = NewTestId()
 	p.Email = MakeEmail()
-	p.Type = model.TEAM_OPEN
+	p.Type = model.TeamOpen
 	p.AllowOpenInvite = false
 
 	_, err = ss.Team().Save(&p)
@@ -533,7 +533,7 @@ func testTeamStoreSearchPrivate(t *testing.T, ss store.Store) {
 	q.DisplayName = "FOOBARDISPLAYNAME"
 	q.Name = "averylongname"
 	q.Email = MakeEmail()
-	q.Type = model.TEAM_OPEN
+	q.Type = model.TeamOpen
 	q.AllowOpenInvite = false
 
 	_, err = ss.Team().Save(&q)
@@ -619,7 +619,7 @@ func testTeamStoreGetByInviteId(t *testing.T, ss store.Store) {
 	o1.DisplayName = "DisplayName"
 	o1.Name = NewTestId()
 	o1.Email = MakeEmail()
-	o1.Type = model.TEAM_OPEN
+	o1.Type = model.TeamOpen
 	o1.InviteId = model.NewId()
 
 	save1, err := ss.Team().Save(&o1)
@@ -629,7 +629,7 @@ func testTeamStoreGetByInviteId(t *testing.T, ss store.Store) {
 	o2.DisplayName = "DisplayName"
 	o2.Name = NewTestId()
 	o2.Email = MakeEmail()
-	o2.Type = model.TEAM_OPEN
+	o2.Type = model.TeamOpen
 
 	r1, err := ss.Team().GetByInviteId(save1.InviteId)
 	require.NoError(t, err)
@@ -644,7 +644,7 @@ func testTeamStoreByUserId(t *testing.T, ss store.Store) {
 	o1.DisplayName = "DisplayName"
 	o1.Name = NewTestId()
 	o1.Email = MakeEmail()
-	o1.Type = model.TEAM_OPEN
+	o1.Type = model.TeamOpen
 	o1.InviteId = model.NewId()
 	o1, err := ss.Team().Save(o1)
 	require.NoError(t, err)
@@ -664,7 +664,7 @@ func testTeamStoreGetAllPage(t *testing.T, ss store.Store) {
 	o.DisplayName = "ADisplayName" + model.NewId()
 	o.Name = "zz" + model.NewId() + "a"
 	o.Email = MakeEmail()
-	o.Type = model.TEAM_OPEN
+	o.Type = model.TeamOpen
 	o.AllowOpenInvite = true
 	_, err := ss.Team().Save(&o)
 	require.NoError(t, err)
@@ -722,7 +722,7 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) {
 	o1.DisplayName = "DisplayName"
 	o1.Name = NewTestId()
 	o1.Email = MakeEmail()
-	o1.Type = model.TEAM_OPEN
+	o1.Type = model.TeamOpen
 	o1.AllowOpenInvite = true
 	_, err := ss.Team().Save(&o1)
 	require.NoError(t, err)
@@ -731,7 +731,7 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) {
 	o2.DisplayName = "DisplayName"
 	o2.Name = NewTestId()
 	o2.Email = MakeEmail()
-	o2.Type = model.TEAM_OPEN
+	o2.Type = model.TeamOpen
 	_, err = ss.Team().Save(&o2)
 	require.NoError(t, err)
 
@@ -739,7 +739,7 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) {
 	o3.DisplayName = "DisplayName"
 	o3.Name = NewTestId()
 	o3.Email = MakeEmail()
-	o3.Type = model.TEAM_INVITE
+	o3.Type = model.TeamInvite
 	o3.AllowOpenInvite = true
 	_, err = ss.Team().Save(&o3)
 	require.NoError(t, err)
@@ -748,7 +748,7 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) {
 	o4.DisplayName = "DisplayName"
 	o4.Name = NewTestId()
 	o4.Email = MakeEmail()
-	o4.Type = model.TEAM_INVITE
+	o4.Type = model.TeamInvite
 	_, err = ss.Team().Save(&o4)
 	require.NoError(t, err)
 
@@ -766,7 +766,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) {
 	o1.DisplayName = "DisplayName"
 	o1.Name = NewTestId()
 	o1.Email = MakeEmail()
-	o1.Type = model.TEAM_OPEN
+	o1.Type = model.TeamOpen
 	o1.AllowOpenInvite = true
 	_, err := ss.Team().Save(&o1)
 	require.NoError(t, err)
@@ -775,7 +775,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) {
 	o2.DisplayName = "DisplayName"
 	o2.Name = NewTestId()
 	o2.Email = MakeEmail()
-	o2.Type = model.TEAM_OPEN
+	o2.Type = model.TeamOpen
 	o2.AllowOpenInvite = false
 	_, err = ss.Team().Save(&o2)
 	require.NoError(t, err)
@@ -784,7 +784,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) {
 	o3.DisplayName = "DisplayName"
 	o3.Name = NewTestId()
 	o3.Email = MakeEmail()
-	o3.Type = model.TEAM_INVITE
+	o3.Type = model.TeamInvite
 	o3.AllowOpenInvite = true
 	_, err = ss.Team().Save(&o3)
 	require.NoError(t, err)
@@ -793,7 +793,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) {
 	o4.DisplayName = "DisplayName"
 	o4.Name = NewTestId()
 	o4.Email = MakeEmail()
-	o4.Type = model.TEAM_INVITE
+	o4.Type = model.TeamInvite
 	o4.AllowOpenInvite = false
 	_, err = ss.Team().Save(&o4)
 	require.NoError(t, err)
@@ -813,7 +813,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) {
 	o5.DisplayName = "DisplayName"
 	o5.Name = NewTestId()
 	o5.Email = MakeEmail()
-	o5.Type = model.TEAM_OPEN
+	o5.Type = model.TeamOpen
 	o5.AllowOpenInvite = true
 	_, err = ss.Team().Save(&o5)
 	require.NoError(t, err)
@@ -842,7 +842,7 @@ func testGetAllPrivateTeamListing(t *testing.T, ss store.Store) {
 	o1.DisplayName = "DisplayName"
 	o1.Name = NewTestId()
 	o1.Email = MakeEmail()
-	o1.Type = model.TEAM_OPEN
+	o1.Type = model.TeamOpen
 	o1.AllowOpenInvite = true
 	_, err := ss.Team().Save(&o1)
 	require.NoError(t, err)
@@ -851,7 +851,7 @@ func testGetAllPrivateTeamListing(t *testing.T, ss store.Store) {
 	o2.DisplayName = "DisplayName"
 	o2.Name = NewTestId()
 	o2.Email = MakeEmail()
-	o2.Type = model.TEAM_OPEN
+	o2.Type = model.TeamOpen
 	_, err = ss.Team().Save(&o2)
 	require.NoError(t, err)
 
@@ -859,7 +859,7 @@ func testGetAllPrivateTeamListing(t *testing.T, ss store.Store) {
 	o3.DisplayName = "DisplayName"
 	o3.Name = NewTestId()
 	o3.Email = MakeEmail()
-	o3.Type = model.TEAM_INVITE
+	o3.Type = model.TeamInvite
 	o3.AllowOpenInvite = true
 	_, err = ss.Team().Save(&o3)
 	require.NoError(t, err)
@@ -868,7 +868,7 @@ func testGetAllPrivateTeamListing(t *testing.T, ss store.Store) {
 	o4.DisplayName = "DisplayName"
 	o4.Name = NewTestId()
 	o4.Email = MakeEmail()
-	o4.Type = model.TEAM_INVITE
+	o4.Type = model.TeamInvite
 	_, err = ss.Team().Save(&o4)
 	require.NoError(t, err)
 
@@ -886,7 +886,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) {
 	o1.DisplayName = "DisplayName"
 	o1.Name = NewTestId()
 	o1.Email = MakeEmail()
-	o1.Type = model.TEAM_OPEN
+	o1.Type = model.TeamOpen
 	o1.AllowOpenInvite = true
 	_, err := ss.Team().Save(&o1)
 	require.NoError(t, err)
@@ -895,7 +895,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) {
 	o2.DisplayName = "DisplayName"
 	o2.Name = NewTestId()
 	o2.Email = MakeEmail()
-	o2.Type = model.TEAM_OPEN
+	o2.Type = model.TeamOpen
 	o2.AllowOpenInvite = false
 	_, err = ss.Team().Save(&o2)
 	require.NoError(t, err)
@@ -904,7 +904,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) {
 	o3.DisplayName = "DisplayName"
 	o3.Name = NewTestId()
 	o3.Email = MakeEmail()
-	o3.Type = model.TEAM_INVITE
+	o3.Type = model.TeamInvite
 	o3.AllowOpenInvite = true
 	_, err = ss.Team().Save(&o3)
 	require.NoError(t, err)
@@ -913,7 +913,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) {
 	o4.DisplayName = "DisplayName"
 	o4.Name = NewTestId()
 	o4.Email = MakeEmail()
-	o4.Type = model.TEAM_INVITE
+	o4.Type = model.TeamInvite
 	o4.AllowOpenInvite = false
 	_, err = ss.Team().Save(&o4)
 	require.NoError(t, err)
@@ -932,7 +932,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) {
 	o5.DisplayName = "DisplayName"
 	o5.Name = NewTestId()
 	o5.Email = MakeEmail()
-	o5.Type = model.TEAM_OPEN
+	o5.Type = model.TeamOpen
 	o5.AllowOpenInvite = true
 	_, err = ss.Team().Save(&o5)
 	require.NoError(t, err)
@@ -961,7 +961,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) {
 	o1.DisplayName = "DisplayName1"
 	o1.Name = NewTestId()
 	o1.Email = MakeEmail()
-	o1.Type = model.TEAM_OPEN
+	o1.Type = model.TeamOpen
 	o1.AllowOpenInvite = true
 	t1, err := ss.Team().Save(&o1)
 	require.NoError(t, err)
@@ -970,7 +970,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) {
 	o2.DisplayName = "DisplayName2"
 	o2.Name = NewTestId()
 	o2.Email = MakeEmail()
-	o2.Type = model.TEAM_OPEN
+	o2.Type = model.TeamOpen
 	o2.AllowOpenInvite = false
 	_, err = ss.Team().Save(&o2)
 	require.NoError(t, err)
@@ -979,7 +979,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) {
 	o3.DisplayName = "DisplayName3"
 	o3.Name = NewTestId()
 	o3.Email = MakeEmail()
-	o3.Type = model.TEAM_INVITE
+	o3.Type = model.TeamInvite
 	o3.AllowOpenInvite = true
 	t3, err := ss.Team().Save(&o3)
 	require.NoError(t, err)
@@ -988,7 +988,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) {
 	o4.DisplayName = "DisplayName4"
 	o4.Name = NewTestId()
 	o4.Email = MakeEmail()
-	o4.Type = model.TEAM_INVITE
+	o4.Type = model.TeamInvite
 	o4.AllowOpenInvite = false
 	_, err = ss.Team().Save(&o4)
 	require.NoError(t, err)
@@ -1003,7 +1003,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) {
 	o5.DisplayName = "DisplayName5"
 	o5.Name = NewTestId()
 	o5.Email = MakeEmail()
-	o5.Type = model.TEAM_OPEN
+	o5.Type = model.TeamOpen
 	o5.AllowOpenInvite = true
 	t5, err := ss.Team().Save(&o5)
 	require.NoError(t, err)
@@ -1021,7 +1021,7 @@ func testDelete(t *testing.T, ss store.Store) {
 	o1.DisplayName = "DisplayName"
 	o1.Name = NewTestId()
 	o1.Email = MakeEmail()
-	o1.Type = model.TEAM_OPEN
+	o1.Type = model.TeamOpen
 	o1.AllowOpenInvite = true
 	_, err := ss.Team().Save(&o1)
 	require.NoError(t, err)
@@ -1030,7 +1030,7 @@ func testDelete(t *testing.T, ss store.Store) {
 	o2.DisplayName = "DisplayName"
 	o2.Name = NewTestId()
 	o2.Email = MakeEmail()
-	o2.Type = model.TEAM_OPEN
+	o2.Type = model.TeamOpen
 	_, err = ss.Team().Save(&o2)
 	require.NoError(t, err)
 
@@ -1045,7 +1045,7 @@ func testPublicTeamCount(t *testing.T, ss store.Store) {
 	o1.DisplayName = "DisplayName"
 	o1.Name = NewTestId()
 	o1.Email = MakeEmail()
-	o1.Type = model.TEAM_OPEN
+	o1.Type = model.TeamOpen
 	o1.AllowOpenInvite = true
 	_, err := ss.Team().Save(&o1)
 	require.NoError(t, err)
@@ -1054,7 +1054,7 @@ func testPublicTeamCount(t *testing.T, ss store.Store) {
 	o2.DisplayName = "DisplayName"
 	o2.Name = NewTestId()
 	o2.Email = MakeEmail()
-	o2.Type = model.TEAM_OPEN
+	o2.Type = model.TeamOpen
 	o2.AllowOpenInvite = false
 	_, err = ss.Team().Save(&o2)
 	require.NoError(t, err)
@@ -1063,7 +1063,7 @@ func testPublicTeamCount(t *testing.T, ss store.Store) {
 	o3.DisplayName = "DisplayName"
 	o3.Name = NewTestId()
 	o3.Email = MakeEmail()
-	o3.Type = model.TEAM_OPEN
+	o3.Type = model.TeamOpen
 	o3.AllowOpenInvite = true
 	_, err = ss.Team().Save(&o3)
 	require.NoError(t, err)
@@ -1080,7 +1080,7 @@ func testPrivateTeamCount(t *testing.T, ss store.Store) {
 	o1.DisplayName = "DisplayName"
 	o1.Name = NewTestId()
 	o1.Email = MakeEmail()
-	o1.Type = model.TEAM_OPEN
+	o1.Type = model.TeamOpen
 	o1.AllowOpenInvite = false
 	_, err := ss.Team().Save(&o1)
 	require.NoError(t, err)
@@ -1089,7 +1089,7 @@ func testPrivateTeamCount(t *testing.T, ss store.Store) {
 	o2.DisplayName = "DisplayName"
 	o2.Name = NewTestId()
 	o2.Email = MakeEmail()
-	o2.Type = model.TEAM_OPEN
+	o2.Type = model.TeamOpen
 	o2.AllowOpenInvite = true
 	_, err = ss.Team().Save(&o2)
 	require.NoError(t, err)
@@ -1098,7 +1098,7 @@ func testPrivateTeamCount(t *testing.T, ss store.Store) {
 	o3.DisplayName = "DisplayName"
 	o3.Name = NewTestId()
 	o3.Email = MakeEmail()
-	o3.Type = model.TEAM_OPEN
+	o3.Type = model.TeamOpen
 	o3.AllowOpenInvite = false
 	_, err = ss.Team().Save(&o3)
 	require.NoError(t, err)
@@ -1113,7 +1113,7 @@ func testTeamCount(t *testing.T, ss store.Store) {
 	o1.DisplayName = "DisplayName"
 	o1.Name = NewTestId()
 	o1.Email = MakeEmail()
-	o1.Type = model.TEAM_OPEN
+	o1.Type = model.TeamOpen
 	o1.AllowOpenInvite = true
 	team, err := ss.Team().Save(&o1)
 	require.NoError(t, err)
@@ -1381,7 +1381,7 @@ func testTeamSaveMember(t *testing.T, ss store.Store) {
 			DisplayName: "Name",
 			Name:        NewTestId(),
 			Email:       MakeEmail(),
-			Type:        model.TEAM_OPEN,
+			Type:        model.TeamOpen,
 		}
 
 		team, nErr := ss.Team().Save(team)
@@ -1522,7 +1522,7 @@ func testTeamSaveMember(t *testing.T, ss store.Store) {
 			Name:        NewTestId(),
 			DisplayName: NewTestId(),
 			Description: NewTestId(),
-			Scope:       model.SCHEME_SCOPE_TEAM,
+			Scope:       model.SchemeScopeTeam,
 		}
 		ts, nErr := ss.Scheme().Save(ts)
 		require.NoError(t, nErr)
@@ -1531,7 +1531,7 @@ func testTeamSaveMember(t *testing.T, ss store.Store) {
 			DisplayName: "Name",
 			Name:        NewTestId(),
 			Email:       MakeEmail(),
-			Type:        model.TEAM_OPEN,
+			Type:        model.TeamOpen,
 			SchemeId:    &ts.Id,
 		}
 
@@ -1737,7 +1737,7 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) {
 			DisplayName: "Name",
 			Name:        NewTestId(),
 			Email:       MakeEmail(),
-			Type:        model.TEAM_OPEN,
+			Type:        model.TeamOpen,
 		}
 
 		team, nErr := ss.Team().Save(team)
@@ -1890,7 +1890,7 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) {
 			Name:        NewTestId(),
 			DisplayName: NewTestId(),
 			Description: NewTestId(),
-			Scope:       model.SCHEME_SCOPE_TEAM,
+			Scope:       model.SchemeScopeTeam,
 		}
 		ts, nErr := ss.Scheme().Save(ts)
 		require.NoError(t, nErr)
@@ -1899,7 +1899,7 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) {
 			DisplayName: "Name",
 			Name:        NewTestId(),
 			Email:       MakeEmail(),
-			Type:        model.TEAM_OPEN,
+			Type:        model.TeamOpen,
 			SchemeId:    &ts.Id,
 		}
 
@@ -2066,7 +2066,7 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) {
 			DisplayName: "Name",
 			Name:        NewTestId(),
 			Email:       MakeEmail(),
-			Type:        model.TEAM_OPEN,
+			Type:        model.TeamOpen,
 		}
 
 		team, nErr := ss.Team().Save(team)
@@ -2207,7 +2207,7 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) {
 			Name:        NewTestId(),
 			DisplayName: NewTestId(),
 			Description: NewTestId(),
-			Scope:       model.SCHEME_SCOPE_TEAM,
+			Scope:       model.SchemeScopeTeam,
 		}
 		ts, nErr := ss.Scheme().Save(ts)
 		require.NoError(t, nErr)
@@ -2216,7 +2216,7 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) {
 			DisplayName: "Name",
 			Name:        NewTestId(),
 			Email:       MakeEmail(),
-			Type:        model.TEAM_OPEN,
+			Type:        model.TeamOpen,
 			SchemeId:    &ts.Id,
 		}
 
@@ -2375,7 +2375,7 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) {
 			DisplayName: "Name",
 			Name:        NewTestId(),
 			Email:       MakeEmail(),
-			Type:        model.TEAM_OPEN,
+			Type:        model.TeamOpen,
 		}
 
 		team, nErr := ss.Team().Save(team)
@@ -2524,7 +2524,7 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) {
 			Name:        NewTestId(),
 			DisplayName: NewTestId(),
 			Description: NewTestId(),
-			Scope:       model.SCHEME_SCOPE_TEAM,
+			Scope:       model.SchemeScopeTeam,
 		}
 		ts, nErr := ss.Scheme().Save(ts)
 		require.NoError(t, nErr)
@@ -2533,7 +2533,7 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) {
 			DisplayName: "Name",
 			Name:        NewTestId(),
 			Email:       MakeEmail(),
-			Type:        model.TEAM_OPEN,
+			Type:        model.TeamOpen,
 			SchemeId:    &ts.Id,
 		}
 
@@ -2834,7 +2834,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) {
 	team, errSave := ss.Team().Save(&model.Team{
 		DisplayName: "DisplayName",
 		Name:        NewTestId(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	})
 	require.NoError(t, errSave)
 	defer func() {
@@ -2956,7 +2956,7 @@ func testGetTeamMember(t *testing.T, ss store.Store) {
 		Name:        NewTestId(),
 		DisplayName: NewTestId(),
 		Description: NewTestId(),
-		Scope:       model.SCHEME_SCOPE_TEAM,
+		Scope:       model.SchemeScopeTeam,
 	}
 	s2, nErr = ss.Scheme().Save(s2)
 	require.NoError(t, nErr)
@@ -2965,7 +2965,7 @@ func testGetTeamMember(t *testing.T, ss store.Store) {
 	t2, nErr := ss.Team().Save(&model.Team{
 		DisplayName: "DisplayName",
 		Name:        NewTestId(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 		SchemeId:    &s2.Id,
 	})
 	require.NoError(t, nErr)
@@ -3078,11 +3078,11 @@ func testGetChannelUnreadsForAllTeams(t *testing.T, ss store.Store) {
 	_, nErr = ss.Team().SaveMember(m2, -1)
 	require.NoError(t, nErr)
 
-	c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.CHANNEL_OPEN, TotalMsgCount: 100}
+	c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.ChannelTypeOpen, TotalMsgCount: 100}
 	_, nErr = ss.Channel().Save(c1, -1)
 	require.NoError(t, nErr)
 
-	c2 := &model.Channel{TeamId: m2.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.CHANNEL_OPEN, TotalMsgCount: 100}
+	c2 := &model.Channel{TeamId: m2.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.ChannelTypeOpen, TotalMsgCount: 100}
 	_, nErr = ss.Channel().Save(c2, -1)
 	require.NoError(t, nErr)
 
@@ -3132,11 +3132,11 @@ func testGetChannelUnreadsForTeam(t *testing.T, ss store.Store) {
 	_, nErr := ss.Team().SaveMember(m1, -1)
 	require.NoError(t, nErr)
 
-	c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.CHANNEL_OPEN, TotalMsgCount: 100}
+	c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.ChannelTypeOpen, TotalMsgCount: 100}
 	_, nErr = ss.Channel().Save(c1, -1)
 	require.NoError(t, nErr)
 
-	c2 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.CHANNEL_OPEN, TotalMsgCount: 100}
+	c2 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.ChannelTypeOpen, TotalMsgCount: 100}
 	_, nErr = ss.Channel().Save(c2, -1)
 	require.NoError(t, nErr)
 
@@ -3163,7 +3163,7 @@ func testUpdateLastTeamIconUpdate(t *testing.T, ss store.Store) {
 	o1.DisplayName = "Display Name"
 	o1.Name = "z-z-z" + model.NewId() + "b"
 	o1.Email = MakeEmail()
-	o1.Type = model.TEAM_OPEN
+	o1.Type = model.TeamOpen
 	o1.LastTeamIconUpdate = lastTeamIconUpdateInitial
 	o1, err := ss.Team().Save(o1)
 	require.NoError(t, err)
@@ -3185,14 +3185,14 @@ func testGetTeamsByScheme(t *testing.T, ss store.Store) {
 		DisplayName: NewTestId(),
 		Name:        NewTestId(),
 		Description: NewTestId(),
-		Scope:       model.SCHEME_SCOPE_TEAM,
+		Scope:       model.SchemeScopeTeam,
 	}
 
 	s2 := &model.Scheme{
 		DisplayName: NewTestId(),
 		Name:        NewTestId(),
 		Description: NewTestId(),
-		Scope:       model.SCHEME_SCOPE_TEAM,
+		Scope:       model.SchemeScopeTeam,
 	}
 
 	s1, err := ss.Scheme().Save(s1)
@@ -3205,7 +3205,7 @@ func testGetTeamsByScheme(t *testing.T, ss store.Store) {
 		Name:        NewTestId(),
 		DisplayName: NewTestId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 		SchemeId:    &s1.Id,
 	}
 
@@ -3213,7 +3213,7 @@ func testGetTeamsByScheme(t *testing.T, ss store.Store) {
 		Name:        NewTestId(),
 		DisplayName: NewTestId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 		SchemeId:    &s1.Id,
 	}
 
@@ -3221,7 +3221,7 @@ func testGetTeamsByScheme(t *testing.T, ss store.Store) {
 		Name:        NewTestId(),
 		DisplayName: NewTestId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	}
 
 	_, err = ss.Team().Save(t1)
@@ -3255,7 +3255,7 @@ func testTeamStoreMigrateTeamMembers(t *testing.T, ss store.Store) {
 		DisplayName: "Name",
 		Name:        NewTestId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 		InviteId:    model.NewId(),
 		SchemeId:    &s1,
 	}
@@ -3323,7 +3323,7 @@ func testResetAllTeamSchemes(t *testing.T, ss store.Store) {
 		Name:        NewTestId(),
 		DisplayName: NewTestId(),
 		Description: NewTestId(),
-		Scope:       model.SCHEME_SCOPE_TEAM,
+		Scope:       model.SchemeScopeTeam,
 	}
 	s1, err := ss.Scheme().Save(s1)
 	require.NoError(t, err)
@@ -3332,7 +3332,7 @@ func testResetAllTeamSchemes(t *testing.T, ss store.Store) {
 		Name:        NewTestId(),
 		DisplayName: NewTestId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 		SchemeId:    &s1.Id,
 	}
 
@@ -3340,7 +3340,7 @@ func testResetAllTeamSchemes(t *testing.T, ss store.Store) {
 		Name:        NewTestId(),
 		DisplayName: NewTestId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 		SchemeId:    &s1.Id,
 	}
 
@@ -3414,7 +3414,7 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) {
 		DisplayName: NewTestId(),
 		Name:        NewTestId(),
 		Description: NewTestId(),
-		Scope:       model.SCHEME_SCOPE_TEAM,
+		Scope:       model.SchemeScopeTeam,
 	}
 	s1, err := ss.Scheme().Save(s1)
 	require.NoError(t, err)
@@ -3427,7 +3427,7 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) {
 		Name:        NewTestId(),
 		DisplayName: NewTestId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 		SchemeId:    &s1.Id,
 	}
 	_, err = ss.Team().Save(t1)
@@ -3441,7 +3441,7 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) {
 		Name:        NewTestId(),
 		DisplayName: NewTestId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 		SchemeId:    &s1.Id,
 	}
 	_, err = ss.Team().Save(t2)
@@ -3455,7 +3455,7 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) {
 		Name:        NewTestId(),
 		DisplayName: NewTestId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	}
 	_, err = ss.Team().Save(t3)
 	require.NoError(t, err)
@@ -3468,7 +3468,7 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) {
 		Name:        NewTestId(),
 		DisplayName: NewTestId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 		SchemeId:    &s1.Id,
 		DeleteAt:    model.GetMillis(),
 	}
@@ -3485,7 +3485,7 @@ func testTeamStoreGetAllForExportAfter(t *testing.T, ss store.Store) {
 	t1.DisplayName = "Name"
 	t1.Name = NewTestId()
 	t1.Email = MakeEmail()
-	t1.Type = model.TEAM_OPEN
+	t1.Type = model.TeamOpen
 	_, err := ss.Team().Save(&t1)
 	require.NoError(t, err)
 
@@ -3509,7 +3509,7 @@ func testTeamStoreGetTeamMembersForExport(t *testing.T, ss store.Store) {
 	t1.DisplayName = "Name"
 	t1.Name = NewTestId()
 	t1.Email = MakeEmail()
-	t1.Type = model.TEAM_OPEN
+	t1.Type = model.TeamOpen
 	_, err := ss.Team().Save(&t1)
 	require.NoError(t, err)
 
@@ -3546,7 +3546,7 @@ func testGroupSyncedTeamCount(t *testing.T, ss store.Store) {
 		DisplayName:      NewTestId(),
 		Name:             NewTestId(),
 		Email:            MakeEmail(),
-		Type:             model.TEAM_INVITE,
+		Type:             model.TeamInvite,
 		GroupConstrained: model.NewBool(true),
 	})
 	require.NoError(t, err)
@@ -3557,7 +3557,7 @@ func testGroupSyncedTeamCount(t *testing.T, ss store.Store) {
 		DisplayName: NewTestId(),
 		Name:        "zz" + model.NewId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_INVITE,
+		Type:        model.TeamInvite,
 	})
 	require.NoError(t, err)
 	require.False(t, team2.IsGroupConstrained())

store/storetest/thread_store.go

@@ -39,7 +39,7 @@ func testThreadStorePopulation(t *testing.T, ss store.Store) {
 
 		c, err2 := ss.Channel().Save(&model.Channel{
 			DisplayName: model.NewId(),
-			Type:        model.CHANNEL_OPEN,
+			Type:        model.ChannelTypeOpen,
 			Name:        model.NewId(),
 		}, 999)
 		require.NoError(t, err2)
@@ -455,14 +455,14 @@ func testThreadStorePermanentDeleteBatchForRetentionPolicies(t *testing.T, ss st
 		DisplayName: "DisplayName",
 		Name:        "team" + model.NewId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	})
 	require.NoError(t, err)
 	channel, err := ss.Channel().Save(&model.Channel{
 		TeamId:      team.Id,
 		DisplayName: "DisplayName",
 		Name:        "channel" + model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}, -1)
 	require.NoError(t, err)
 
@@ -544,14 +544,14 @@ func testThreadStorePermanentDeleteBatchThreadMembershipsForRetentionPolicies(t
 		DisplayName: "DisplayName",
 		Name:        "team" + model.NewId(),
 		Email:       MakeEmail(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	})
 	require.NoError(t, err)
 	channel, err := ss.Channel().Save(&model.Channel{
 		TeamId:      team.Id,
 		DisplayName: "DisplayName",
 		Name:        "channel" + model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}, -1)
 	require.NoError(t, err)
 	post, err := ss.Post().Save(&model.Post{

store/storetest/user_store.go

@@ -370,7 +370,7 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) {
 	u1, err := ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u1" + model.NewId(),
-		Roles:    model.SYSTEM_USER_ROLE_ID,
+		Roles:    model.SystemUserRoleId,
 	})
 	require.NoError(t, err)
 	defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }()
@@ -378,7 +378,7 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) {
 	u2, err := ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
-		Roles:    model.SYSTEM_USER_ROLE_ID,
+		Roles:    model.SystemUserRoleId,
 	})
 	require.NoError(t, err)
 	defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }()
@@ -427,7 +427,7 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u7" + model.NewId(),
 		DeleteAt: model.GetMillis(),
-		Roles:    model.SYSTEM_USER_ROLE_ID,
+		Roles:    model.SystemUserRoleId,
 	})
 	require.NoError(t, err)
 	defer func() { require.NoError(t, ss.User().PermanentDelete(u7.Id)) }()
@@ -846,7 +846,7 @@ func testUserStoreGetProfilesInChannel(t *testing.T, ss store.Store) {
 		TeamId:      teamId,
 		DisplayName: "Profiles in channel",
 		Name:        "profiles-" + model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	c1, nErr := ss.Channel().Save(ch1, -1)
 	require.NoError(t, nErr)
@@ -855,7 +855,7 @@ func testUserStoreGetProfilesInChannel(t *testing.T, ss store.Store) {
 		TeamId:      teamId,
 		DisplayName: "Profiles in private",
 		Name:        "profiles-" + model.NewId(),
-		Type:        model.CHANNEL_PRIVATE,
+		Type:        model.ChannelTypePrivate,
 	}
 	c2, nErr := ss.Channel().Save(ch2, -1)
 	require.NoError(t, nErr)
@@ -1013,7 +1013,7 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, ss store.Store, s S
 		TeamId:      teamId,
 		DisplayName: "Profiles in channel",
 		Name:        "profiles-" + model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	c1, nErr := ss.Channel().Save(ch1, -1)
 	require.NoError(t, nErr)
@@ -1022,7 +1022,7 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, ss store.Store, s S
 		TeamId:      teamId,
 		DisplayName: "Profiles in private",
 		Name:        "profiles-" + model.NewId(),
-		Type:        model.CHANNEL_PRIVATE,
+		Type:        model.ChannelTypePrivate,
 	}
 	c2, nErr := ss.Channel().Save(ch2, -1)
 	require.NoError(t, nErr)
@@ -1067,15 +1067,15 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, ss store.Store, s S
 	require.NoError(t, nErr)
 	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{
 		UserId: u1.Id,
-		Status: model.STATUS_DND,
+		Status: model.StatusDnd,
 	}))
 	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{
 		UserId: u2.Id,
-		Status: model.STATUS_AWAY,
+		Status: model.StatusAway,
 	}))
 	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{
 		UserId: u3.Id,
-		Status: model.STATUS_ONLINE,
+		Status: model.StatusOnline,
 	}))
 
 	t.Run("get all users in channel 1, offset 0, limit 100", func(t *testing.T) {
@@ -1230,7 +1230,7 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, ss store.Store) {
 		TeamId:      teamId,
 		DisplayName: "Profiles in channel",
 		Name:        "profiles-" + model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	c1, nErr := ss.Channel().Save(ch1, -1)
 	require.NoError(t, nErr)
@@ -1239,7 +1239,7 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, ss store.Store) {
 		TeamId:      teamId,
 		DisplayName: "Profiles in private",
 		Name:        "profiles-" + model.NewId(),
-		Type:        model.CHANNEL_PRIVATE,
+		Type:        model.ChannelTypePrivate,
 	}
 	c2, nErr := ss.Channel().Save(ch2, -1)
 	require.NoError(t, nErr)
@@ -1356,7 +1356,7 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, ss store.Store) {
 		TeamId:      teamId,
 		DisplayName: "Profiles in channel",
 		Name:        "profiles-" + model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	c1, nErr := ss.Channel().Save(ch1, -1)
 	require.NoError(t, nErr)
@@ -1365,7 +1365,7 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, ss store.Store) {
 		TeamId:      teamId,
 		DisplayName: "Profiles in private",
 		Name:        "profiles-" + model.NewId(),
-		Type:        model.CHANNEL_PRIVATE,
+		Type:        model.ChannelTypePrivate,
 	}
 	c2, nErr := ss.Channel().Save(ch2, -1)
 	require.NoError(t, nErr)
@@ -1595,7 +1595,7 @@ func testUserStoreGetProfileByGroupChannelIdsForUser(t *testing.T, ss store.Stor
 	gc1, nErr := ss.Channel().Save(&model.Channel{
 		DisplayName: "Profiles in private",
 		Name:        "profiles-" + model.NewId(),
-		Type:        model.CHANNEL_GROUP,
+		Type:        model.ChannelTypeGroup,
 	}, -1)
 	require.NoError(t, nErr)
 
@@ -1611,7 +1611,7 @@ func testUserStoreGetProfileByGroupChannelIdsForUser(t *testing.T, ss store.Stor
 	gc2, nErr := ss.Channel().Save(&model.Channel{
 		DisplayName: "Profiles in private",
 		Name:        "profiles-" + model.NewId(),
-		Type:        model.CHANNEL_GROUP,
+		Type:        model.ChannelTypeGroup,
 	}, -1)
 	require.NoError(t, nErr)
 
@@ -1760,7 +1760,7 @@ func testUserStoreGetSystemAdminProfiles(t *testing.T, ss store.Store) {
 
 	u1, err := ss.User().Save(&model.User{
 		Email:    MakeEmail(),
-		Roles:    model.SYSTEM_USER_ROLE_ID + " " + model.SYSTEM_ADMIN_ROLE_ID,
+		Roles:    model.SystemUserRoleId + " " + model.SystemAdminRoleId,
 		Username: "u1" + model.NewId(),
 	})
 	require.NoError(t, err)
@@ -1779,7 +1779,7 @@ func testUserStoreGetSystemAdminProfiles(t *testing.T, ss store.Store) {
 
 	u3, err := ss.User().Save(&model.User{
 		Email:    MakeEmail(),
-		Roles:    model.SYSTEM_USER_ROLE_ID + " " + model.SYSTEM_ADMIN_ROLE_ID,
+		Roles:    model.SystemUserRoleId + " " + model.SystemAdminRoleId,
 		Username: "u3" + model.NewId(),
 	})
 	require.NoError(t, err)
@@ -2032,7 +2032,7 @@ func testUserStoreGetForLogin(t *testing.T, ss store.Store) {
 	u1, err := ss.User().Save(&model.User{
 		Email:       MakeEmail(),
 		Username:    "u1" + model.NewId(),
-		AuthService: model.USER_AUTH_SERVICE_GITLAB,
+		AuthService: model.UserAuthServiceGitlab,
 		AuthData:    &auth,
 	})
 
@@ -2044,7 +2044,7 @@ func testUserStoreGetForLogin(t *testing.T, ss store.Store) {
 	u2, err := ss.User().Save(&model.User{
 		Email:       MakeEmail(),
 		Username:    "u2" + model.NewId(),
-		AuthService: model.USER_AUTH_SERVICE_LDAP,
+		AuthService: model.UserAuthServiceLdap,
 		AuthData:    &auth2,
 	})
 	require.NoError(t, err)
@@ -2055,7 +2055,7 @@ func testUserStoreGetForLogin(t *testing.T, ss store.Store) {
 	u3, err := ss.User().Save(&model.User{
 		Email:       MakeEmail(),
 		Username:    "u3" + model.NewId(),
-		AuthService: model.USER_AUTH_SERVICE_LDAP,
+		AuthService: model.UserAuthServiceLdap,
 		AuthData:    &auth3,
 	})
 	require.NoError(t, err)
@@ -2194,17 +2194,17 @@ func testUserStoreResetAuthDataToEmailForUsers(t *testing.T, ss store.Store) {
 
 	resetAuthDataToID := func() {
 		_, err = ss.User().UpdateAuthData(
-			user.Id, model.USER_AUTH_SERVICE_SAML, model.NewString("some-id"), "", false)
+			user.Id, model.UserAuthServiceSaml, model.NewString("some-id"), "", false)
 		require.NoError(t, err)
 	}
 	resetAuthDataToID()
 
 	// dry run
-	numAffected, err := ss.User().ResetAuthDataToEmailForUsers(model.USER_AUTH_SERVICE_SAML, nil, false, true)
+	numAffected, err := ss.User().ResetAuthDataToEmailForUsers(model.UserAuthServiceSaml, nil, false, true)
 	require.NoError(t, err)
 	require.Equal(t, 1, numAffected)
 	// real run
-	numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.USER_AUTH_SERVICE_SAML, nil, false, false)
+	numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.UserAuthServiceSaml, nil, false, false)
 	require.NoError(t, err)
 	require.Equal(t, 1, numAffected)
 	user, appErr := ss.User().Get(context.Background(), user.Id)
@@ -2213,10 +2213,10 @@ func testUserStoreResetAuthDataToEmailForUsers(t *testing.T, ss store.Store) {
 
 	resetAuthDataToID()
 	// with specific user IDs
-	numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.USER_AUTH_SERVICE_SAML, []string{model.NewId()}, false, true)
+	numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.UserAuthServiceSaml, []string{model.NewId()}, false, true)
 	require.NoError(t, err)
 	require.Equal(t, 0, numAffected)
-	numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.USER_AUTH_SERVICE_SAML, []string{user.Id}, false, true)
+	numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.UserAuthServiceSaml, []string{user.Id}, false, true)
 	require.NoError(t, err)
 	require.Equal(t, 1, numAffected)
 
@@ -2224,11 +2224,11 @@ func testUserStoreResetAuthDataToEmailForUsers(t *testing.T, ss store.Store) {
 	user.DeleteAt = model.GetMillisForTime(time.Now())
 	ss.User().Update(user, true)
 	// without deleted user
-	numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.USER_AUTH_SERVICE_SAML, nil, false, true)
+	numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.UserAuthServiceSaml, nil, false, true)
 	require.NoError(t, err)
 	require.Equal(t, 0, numAffected)
 	// with deleted user
-	numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.USER_AUTH_SERVICE_SAML, nil, true, true)
+	numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.UserAuthServiceSaml, nil, true, true)
 	require.NoError(t, err)
 	require.Equal(t, 1, numAffected)
 }
@@ -2240,13 +2240,13 @@ func testUserUnreadCount(t *testing.T, ss store.Store) {
 	c1.TeamId = teamId
 	c1.DisplayName = "Unread Messages"
 	c1.Name = "unread-messages-" + model.NewId()
-	c1.Type = model.CHANNEL_OPEN
+	c1.Type = model.ChannelTypeOpen
 
 	c2 := model.Channel{}
 	c2.TeamId = teamId
 	c2.DisplayName = "Unread Direct"
 	c2.Name = "unread-direct-" + model.NewId()
-	c2.Type = model.CHANNEL_DIRECT
+	c2.Type = model.ChannelTypeDirect
 
 	u1 := &model.User{}
 	u1.Username = "user1" + model.NewId()
@@ -2414,9 +2414,9 @@ func testUserStoreGetRecentlyActiveUsersForTeam(t *testing.T, ss store.Store, s
 	u2.LastActivityAt = millis - 1
 	u1.LastActivityAt = millis - 1
 
-	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: u1.LastActivityAt, ActiveChannel: ""}))
-	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: u2.LastActivityAt, ActiveChannel: ""}))
-	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: u3.LastActivityAt, ActiveChannel: ""}))
+	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.StatusOnline, Manual: false, LastActivityAt: u1.LastActivityAt, ActiveChannel: ""}))
+	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.StatusOnline, Manual: false, LastActivityAt: u2.LastActivityAt, ActiveChannel: ""}))
+	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.StatusOnline, Manual: false, LastActivityAt: u3.LastActivityAt, ActiveChannel: ""}))
 
 	t.Run("get team 1, offset 0, limit 100", func(t *testing.T) {
 		users, err := ss.User().GetRecentlyActiveUsersForTeam(teamId, 0, 100, nil)
@@ -2603,7 +2603,7 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
 			"jimb",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{u1, u3},
 		},
@@ -2613,8 +2613,8 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
 			"jimb",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
-				TeamRoles:      []string{model.TEAM_GUEST_ROLE_ID, model.TEAM_ADMIN_ROLE_ID},
+				Limit:          model.UserSearchDefaultLimit,
+				TeamRoles:      []string{model.TeamGuestRoleId, model.TeamAdminRoleId},
 			},
 			[]*model.User{u3},
 		},
@@ -2624,9 +2624,9 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
 			"jimb",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
-				Roles:          []string{model.SYSTEM_ADMIN_ROLE_ID},
-				TeamRoles:      []string{model.TEAM_ADMIN_ROLE_ID},
+				Limit:          model.UserSearchDefaultLimit,
+				Roles:          []string{model.SystemAdminRoleId},
+				TeamRoles:      []string{model.TeamAdminRoleId},
 			},
 			[]*model.User{u1},
 		},
@@ -2636,8 +2636,8 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
 			"jim",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
-				TeamRoles:      []string{model.TEAM_ADMIN_ROLE_ID},
+				Limit:          model.UserSearchDefaultLimit,
+				TeamRoles:      []string{model.TeamAdminRoleId},
 			},
 			[]*model.User{u2},
 		},
@@ -2647,8 +2647,8 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
 			"jim",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
-				TeamRoles:      []string{model.TEAM_ADMIN_ROLE_ID, model.TEAM_GUEST_ROLE_ID},
+				Limit:          model.UserSearchDefaultLimit,
+				TeamRoles:      []string{model.TeamAdminRoleId, model.TeamGuestRoleId},
 			},
 			[]*model.User{u2, u3},
 		},
@@ -2658,9 +2658,9 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
 			"jim",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
-				Roles:          []string{model.SYSTEM_ADMIN_ROLE_ID},
-				TeamRoles:      []string{model.TEAM_ADMIN_ROLE_ID},
+				Limit:          model.UserSearchDefaultLimit,
+				Roles:          []string{model.SystemAdminRoleId},
+				TeamRoles:      []string{model.TeamAdminRoleId},
 			},
 			[]*model.User{u2, u1},
 		},
@@ -2670,8 +2670,8 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
 			"jim",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
-				Roles:          []string{model.SYSTEM_GUEST_ROLE_ID},
+				Limit:          model.UserSearchDefaultLimit,
+				Roles:          []string{model.SystemGuestRoleId},
 				TeamRoles:      []string{},
 			},
 			[]*model.User{u3},
@@ -2748,7 +2748,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
 		TeamId:      tid,
 		DisplayName: "NameName",
 		Name:        "zz" + model.NewId() + "b",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	c1, nErr := ss.Channel().Save(&ch1, -1)
 	require.NoError(t, nErr)
@@ -2757,7 +2757,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
 		TeamId:      tid,
 		DisplayName: "NameName",
 		Name:        "zz" + model.NewId() + "b",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	c2, nErr := ss.Channel().Save(&ch2, -1)
 	require.NoError(t, nErr)
@@ -2796,7 +2796,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
 			"jimb",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{u1},
 		},
@@ -2808,7 +2808,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
 			&model.UserSearchOptions{
 				AllowFullNames: true,
 				AllowInactive:  true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{u1},
 		},
@@ -2819,7 +2819,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
 			"jimb",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{u1},
 		},
@@ -2830,7 +2830,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
 			"jimb",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{},
 		},
@@ -2841,7 +2841,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
 			"jimb",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{},
 		},
@@ -2853,7 +2853,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
 			&model.UserSearchOptions{
 				AllowFullNames: true,
 				AllowInactive:  true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{u3},
 		},
@@ -2864,7 +2864,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
 			"jimb",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{},
 		},
@@ -2875,7 +2875,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
 			"jimb",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{},
 		},
@@ -2886,7 +2886,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
 			"jim",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{u2, u1},
 		},
@@ -2977,7 +2977,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
 		TeamId:      tid,
 		DisplayName: "NameName",
 		Name:        "zz" + model.NewId() + "b",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	c1, nErr := ss.Channel().Save(&ch1, -1)
 	require.NoError(t, nErr)
@@ -2986,7 +2986,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
 		TeamId:      tid,
 		DisplayName: "NameName",
 		Name:        "zz" + model.NewId() + "b",
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	c2, nErr := ss.Channel().Save(&ch2, -1)
 	require.NoError(t, nErr)
@@ -3029,7 +3029,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
 			"jimb",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{u1},
 		},
@@ -3040,7 +3040,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
 			&model.UserSearchOptions{
 				AllowFullNames: true,
 				AllowInactive:  true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{u1, u3},
 		},
@@ -3061,7 +3061,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
 			"jimb",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{},
 		},
@@ -3072,7 +3072,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
 			&model.UserSearchOptions{
 				AllowFullNames: true,
 				AllowInactive:  true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{},
 		},
@@ -3083,8 +3083,8 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
 			&model.UserSearchOptions{
 				AllowFullNames: true,
 				AllowInactive:  true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
-				Roles:          []string{model.SYSTEM_ADMIN_ROLE_ID},
+				Limit:          model.UserSearchDefaultLimit,
+				Roles:          []string{model.SystemAdminRoleId},
 			},
 			[]*model.User{u1},
 		},
@@ -3095,8 +3095,8 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
 			&model.UserSearchOptions{
 				AllowFullNames: true,
 				AllowInactive:  true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
-				Roles:          []string{model.SYSTEM_ADMIN_ROLE_ID, model.SYSTEM_USER_ROLE_ID},
+				Limit:          model.UserSearchDefaultLimit,
+				Roles:          []string{model.SystemAdminRoleId, model.SystemUserRoleId},
 			},
 			[]*model.User{u1, u3},
 		},
@@ -3107,8 +3107,8 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
 			&model.UserSearchOptions{
 				AllowFullNames: true,
 				AllowInactive:  true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
-				ChannelRoles:   []string{model.CHANNEL_USER_ROLE_ID},
+				Limit:          model.UserSearchDefaultLimit,
+				ChannelRoles:   []string{model.ChannelUserRoleId},
 			},
 			[]*model.User{u3},
 		},
@@ -3119,8 +3119,8 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
 			&model.UserSearchOptions{
 				AllowFullNames: true,
 				AllowInactive:  true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
-				ChannelRoles:   []string{model.CHANNEL_USER_ROLE_ID, model.CHANNEL_ADMIN_ROLE_ID},
+				Limit:          model.UserSearchDefaultLimit,
+				ChannelRoles:   []string{model.ChannelUserRoleId, model.ChannelAdminRoleId},
 			},
 			[]*model.User{u3},
 		},
@@ -3131,8 +3131,8 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
 			&model.UserSearchOptions{
 				AllowFullNames: true,
 				AllowInactive:  true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
-				ChannelRoles:   []string{model.CHANNEL_USER_ROLE_ID},
+				Limit:          model.UserSearchDefaultLimit,
+				ChannelRoles:   []string{model.ChannelUserRoleId},
 			},
 			[]*model.User{u2},
 		},
@@ -3260,7 +3260,7 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) {
 			"simo",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{u4},
 		},
@@ -3271,7 +3271,7 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) {
 			"jimb",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{},
 		},
@@ -3282,7 +3282,7 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) {
 			&model.UserSearchOptions{
 				AllowFullNames: true,
 				AllowInactive:  true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{},
 		},
@@ -3292,7 +3292,7 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) {
 			"simo",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{},
 		},
@@ -3302,7 +3302,7 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) {
 			"jimb",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{u1},
 		},
@@ -3313,7 +3313,7 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) {
 			&model.UserSearchOptions{
 				AllowFullNames: true,
 				AllowInactive:  true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{u1, u3},
 		},
@@ -3403,7 +3403,7 @@ func testUserStoreSearchWithoutTeam(t *testing.T, ss store.Store) {
 			"",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{u2, u1},
 		},
@@ -3412,7 +3412,7 @@ func testUserStoreSearchWithoutTeam(t *testing.T, ss store.Store) {
 			"jim",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{u2, u1},
 		},
@@ -3421,7 +3421,7 @@ func testUserStoreSearchWithoutTeam(t *testing.T, ss store.Store) {
 			"* ",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{u2, u1},
 		},
@@ -3526,7 +3526,7 @@ func testUserStoreSearchInGroup(t *testing.T, ss store.Store) {
 			"jimb",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{u1},
 		},
@@ -3537,7 +3537,7 @@ func testUserStoreSearchInGroup(t *testing.T, ss store.Store) {
 			&model.UserSearchOptions{
 				AllowFullNames: true,
 				AllowInactive:  true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{u1, u3},
 		},
@@ -3558,7 +3558,7 @@ func testUserStoreSearchInGroup(t *testing.T, ss store.Store) {
 			"jimb",
 			&model.UserSearchOptions{
 				AllowFullNames: true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{},
 		},
@@ -3569,7 +3569,7 @@ func testUserStoreSearchInGroup(t *testing.T, ss store.Store) {
 			&model.UserSearchOptions{
 				AllowFullNames: true,
 				AllowInactive:  true,
-				Limit:          model.USER_SEARCH_DEFAULT_LIMIT,
+				Limit:          model.UserSearchDefaultLimit,
 			},
 			[]*model.User{},
 		},
@@ -3594,7 +3594,7 @@ func testCount(t *testing.T, ss store.Store) {
 	channelId := model.NewId()
 	regularUser := &model.User{}
 	regularUser.Email = MakeEmail()
-	regularUser.Roles = model.SYSTEM_USER_ROLE_ID
+	regularUser.Roles = model.SystemUserRoleId
 	_, err := ss.User().Save(regularUser)
 	require.NoError(t, err)
 	defer func() { require.NoError(t, ss.User().PermanentDelete(regularUser.Id)) }()
@@ -3605,7 +3605,7 @@ func testCount(t *testing.T, ss store.Store) {
 
 	guestUser := &model.User{}
 	guestUser.Email = MakeEmail()
-	guestUser.Roles = model.SYSTEM_GUEST_ROLE_ID
+	guestUser.Roles = model.SystemGuestRoleId
 	_, err = ss.User().Save(guestUser)
 	require.NoError(t, err)
 	defer func() { require.NoError(t, ss.User().PermanentDelete(guestUser.Id)) }()
@@ -3616,7 +3616,7 @@ func testCount(t *testing.T, ss store.Store) {
 
 	teamAdmin := &model.User{}
 	teamAdmin.Email = MakeEmail()
-	teamAdmin.Roles = model.SYSTEM_USER_ROLE_ID
+	teamAdmin.Roles = model.SystemUserRoleId
 	_, err = ss.User().Save(teamAdmin)
 	require.NoError(t, err)
 	defer func() { require.NoError(t, ss.User().PermanentDelete(teamAdmin.Id)) }()
@@ -3627,7 +3627,7 @@ func testCount(t *testing.T, ss store.Store) {
 
 	sysAdmin := &model.User{}
 	sysAdmin.Email = MakeEmail()
-	sysAdmin.Roles = model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID
+	sysAdmin.Roles = model.SystemAdminRoleId + " " + model.SystemUserRoleId
 	_, err = ss.User().Save(sysAdmin)
 	require.NoError(t, err)
 	defer func() { require.NoError(t, ss.User().PermanentDelete(sysAdmin.Id)) }()
@@ -3752,7 +3752,7 @@ func testCount(t *testing.T, ss store.Store) {
 			"Filter by system admins only",
 			model.UserCountOptions{
 				TeamId: teamId,
-				Roles:  []string{model.SYSTEM_ADMIN_ROLE_ID},
+				Roles:  []string{model.SystemAdminRoleId},
 			},
 			1,
 		},
@@ -3760,7 +3760,7 @@ func testCount(t *testing.T, ss store.Store) {
 			"Filter by system users only",
 			model.UserCountOptions{
 				TeamId: teamId,
-				Roles:  []string{model.SYSTEM_USER_ROLE_ID},
+				Roles:  []string{model.SystemUserRoleId},
 			},
 			2,
 		},
@@ -3768,7 +3768,7 @@ func testCount(t *testing.T, ss store.Store) {
 			"Filter by system guests only",
 			model.UserCountOptions{
 				TeamId: teamId,
-				Roles:  []string{model.SYSTEM_GUEST_ROLE_ID},
+				Roles:  []string{model.SystemGuestRoleId},
 			},
 			1,
 		},
@@ -3776,7 +3776,7 @@ func testCount(t *testing.T, ss store.Store) {
 			"Filter by system admins and system users",
 			model.UserCountOptions{
 				TeamId: teamId,
-				Roles:  []string{model.SYSTEM_ADMIN_ROLE_ID, model.SYSTEM_USER_ROLE_ID},
+				Roles:  []string{model.SystemAdminRoleId, model.SystemUserRoleId},
 			},
 			3,
 		},
@@ -3784,7 +3784,7 @@ func testCount(t *testing.T, ss store.Store) {
 			"Filter by system admins, system user and system guests",
 			model.UserCountOptions{
 				TeamId: teamId,
-				Roles:  []string{model.SYSTEM_ADMIN_ROLE_ID, model.SYSTEM_USER_ROLE_ID, model.SYSTEM_GUEST_ROLE_ID},
+				Roles:  []string{model.SystemAdminRoleId, model.SystemUserRoleId, model.SystemGuestRoleId},
 			},
 			4,
 		},
@@ -3792,7 +3792,7 @@ func testCount(t *testing.T, ss store.Store) {
 			"Filter by team admins",
 			model.UserCountOptions{
 				TeamId:    teamId,
-				TeamRoles: []string{model.TEAM_ADMIN_ROLE_ID},
+				TeamRoles: []string{model.TeamAdminRoleId},
 			},
 			1,
 		},
@@ -3800,7 +3800,7 @@ func testCount(t *testing.T, ss store.Store) {
 			"Filter by team members",
 			model.UserCountOptions{
 				TeamId:    teamId,
-				TeamRoles: []string{model.TEAM_USER_ROLE_ID},
+				TeamRoles: []string{model.TeamUserRoleId},
 			},
 			1,
 		},
@@ -3808,7 +3808,7 @@ func testCount(t *testing.T, ss store.Store) {
 			"Filter by team guests",
 			model.UserCountOptions{
 				TeamId:    teamId,
-				TeamRoles: []string{model.TEAM_GUEST_ROLE_ID},
+				TeamRoles: []string{model.TeamGuestRoleId},
 			},
 			1,
 		},
@@ -3816,8 +3816,8 @@ func testCount(t *testing.T, ss store.Store) {
 			"Filter by team guests and any system role",
 			model.UserCountOptions{
 				TeamId:    teamId,
-				TeamRoles: []string{model.TEAM_GUEST_ROLE_ID},
-				Roles:     []string{model.SYSTEM_ADMIN_ROLE_ID},
+				TeamRoles: []string{model.TeamGuestRoleId},
+				Roles:     []string{model.SystemAdminRoleId},
 			},
 			2,
 		},
@@ -3825,7 +3825,7 @@ func testCount(t *testing.T, ss store.Store) {
 			"Filter by channel members",
 			model.UserCountOptions{
 				ChannelId:    channelId,
-				ChannelRoles: []string{model.CHANNEL_USER_ROLE_ID},
+				ChannelRoles: []string{model.ChannelUserRoleId},
 			},
 			1,
 		},
@@ -3833,8 +3833,8 @@ func testCount(t *testing.T, ss store.Store) {
 			"Filter by channel members and system admins",
 			model.UserCountOptions{
 				ChannelId:    channelId,
-				Roles:        []string{model.SYSTEM_ADMIN_ROLE_ID},
-				ChannelRoles: []string{model.CHANNEL_USER_ROLE_ID},
+				Roles:        []string{model.SystemAdminRoleId},
+				ChannelRoles: []string{model.ChannelUserRoleId},
 			},
 			2,
 		},
@@ -3842,8 +3842,8 @@ func testCount(t *testing.T, ss store.Store) {
 			"Filter by channel members and system admins and channel admins",
 			model.UserCountOptions{
 				ChannelId:    channelId,
-				Roles:        []string{model.SYSTEM_ADMIN_ROLE_ID},
-				ChannelRoles: []string{model.CHANNEL_USER_ROLE_ID, model.CHANNEL_ADMIN_ROLE_ID},
+				Roles:        []string{model.SystemAdminRoleId},
+				ChannelRoles: []string{model.ChannelUserRoleId, model.ChannelAdminRoleId},
 			},
 			3,
 		},
@@ -3851,7 +3851,7 @@ func testCount(t *testing.T, ss store.Store) {
 			"Filter by channel guests",
 			model.UserCountOptions{
 				ChannelId:    channelId,
-				ChannelRoles: []string{model.CHANNEL_GUEST_ROLE_ID},
+				ChannelRoles: []string{model.ChannelGuestRoleId},
 			},
 			1,
 		},
@@ -3859,8 +3859,8 @@ func testCount(t *testing.T, ss store.Store) {
 			"Filter by channel guests and any system role",
 			model.UserCountOptions{
 				ChannelId:    channelId,
-				ChannelRoles: []string{model.CHANNEL_GUEST_ROLE_ID},
-				Roles:        []string{model.SYSTEM_ADMIN_ROLE_ID},
+				ChannelRoles: []string{model.ChannelGuestRoleId},
+				Roles:        []string{model.SystemAdminRoleId},
 			},
 			2,
 		},
@@ -3927,11 +3927,11 @@ func testUserStoreAnalyticsActiveCount(t *testing.T, ss store.Store, s SqlStore)
 	// u0 last activity status is two months ago.
 	// u1 last activity status is two days ago.
 	// u2, u3, u4 last activity is within last day
-	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u0.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoMonthsAgo}))
-	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoDaysAgo}))
-	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millis}))
-	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millis}))
-	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u4.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millis}))
+	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u0.Id, Status: model.StatusOffline, LastActivityAt: millisTwoMonthsAgo}))
+	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.StatusOffline, LastActivityAt: millisTwoDaysAgo}))
+	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.StatusOffline, LastActivityAt: millis}))
+	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.StatusOffline, LastActivityAt: millis}))
+	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u4.Id, Status: model.StatusOffline, LastActivityAt: millis}))
 
 	// Daily counts (without bots)
 	count, err := ss.User().AnalyticsActiveCount(DayMilliseconds, model.UserCountOptions{IncludeBotAccounts: false, IncludeDeleted: true})
@@ -4015,11 +4015,11 @@ func testUserStoreAnalyticsActiveCountForPeriod(t *testing.T, ss store.Store, s
 	// u2 last activity is one day ago
 	// u3 last activity is within last day
 	// u4 last activity is within last day
-	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u0.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoMonthsAgo}))
-	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoMonthsAgo + MonthMilliseconds}))
-	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoDaysAgo}))
-	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoDaysAgo + DayMilliseconds}))
-	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u4.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millis}))
+	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u0.Id, Status: model.StatusOffline, LastActivityAt: millisTwoMonthsAgo}))
+	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.StatusOffline, LastActivityAt: millisTwoMonthsAgo + MonthMilliseconds}))
+	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.StatusOffline, LastActivityAt: millisTwoDaysAgo}))
+	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.StatusOffline, LastActivityAt: millisTwoDaysAgo + DayMilliseconds}))
+	require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u4.Id, Status: model.StatusOffline, LastActivityAt: millis}))
 
 	// Two months to two days (without bots)
 	count, nerr := ss.User().AnalyticsActiveCountForPeriod(millisTwoMonthsAgo, millisTwoDaysAgo, model.UserCountOptions{IncludeBotAccounts: false, IncludeDeleted: false})
@@ -4170,7 +4170,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) {
 	team, err := ss.Team().Save(&model.Team{
 		DisplayName: "Team",
 		Name:        "zz" + model.NewId(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	})
 	require.NoError(t, err)
 
@@ -4482,27 +4482,27 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, ss store.Store) {
 	t1, err := ss.Team().Save(&model.Team{
 		DisplayName: "Team1",
 		Name:        "zz" + model.NewId(),
-		Type:        model.TEAM_OPEN,
+		Type:        model.TeamOpen,
 	})
 	require.NoError(t, err)
 
 	ch1 := &model.Channel{
 		Name: model.NewId(),
-		Type: model.CHANNEL_OPEN,
+		Type: model.ChannelTypeOpen,
 	}
 	cPub1, nErr := ss.Channel().Save(ch1, -1)
 	require.NoError(t, nErr)
 
 	ch2 := &model.Channel{
 		Name: model.NewId(),
-		Type: model.CHANNEL_OPEN,
+		Type: model.ChannelTypeOpen,
 	}
 	cPub2, nErr := ss.Channel().Save(ch2, -1)
 	require.NoError(t, nErr)
 
 	ch3 := &model.Channel{
 		Name: model.NewId(),
-		Type: model.CHANNEL_PRIVATE,
+		Type: model.ChannelTypePrivate,
 	}
 
 	cPriv, nErr := ss.Channel().Save(ch3, -1)
@@ -4619,7 +4619,7 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, ss store.Store) {
 		DisplayName: "dn_" + id,
 		Name:        "n-" + id,
 		Email:       id + "@test.com",
-		Type:        model.TEAM_INVITE,
+		Type:        model.TeamInvite,
 	})
 	require.NoError(t, err)
 	require.NotNil(t, team)
@@ -4739,7 +4739,7 @@ func testUserStoreGetChannelGroupUsers(t *testing.T, ss store.Store) {
 	channel, nErr := ss.Channel().Save(&model.Channel{
 		DisplayName: "dn_" + id,
 		Name:        "n-" + id,
-		Type:        model.CHANNEL_PRIVATE,
+		Type:        model.ChannelTypePrivate,
 	}, 999)
 	require.NoError(t, nErr)
 	require.NotNil(t, channel)
@@ -4878,7 +4878,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) {
 			TeamId:      teamId,
 			DisplayName: "Channel name",
 			Name:        "channel-" + model.NewId(),
-			Type:        model.CHANNEL_OPEN,
+			Type:        model.ChannelTypeOpen,
 		}, -1)
 		require.NoError(t, nErr)
 		_, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()})
@@ -4924,7 +4924,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) {
 			TeamId:      teamId,
 			DisplayName: "Channel name",
 			Name:        "channel-" + model.NewId(),
-			Type:        model.CHANNEL_OPEN,
+			Type:        model.ChannelTypeOpen,
 		}, -1)
 		require.NoError(t, nErr)
 		_, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()})
@@ -5020,7 +5020,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) {
 			TeamId:      teamId,
 			DisplayName: "Channel name",
 			Name:        "channel-" + model.NewId(),
-			Type:        model.CHANNEL_OPEN,
+			Type:        model.ChannelTypeOpen,
 		}, -1)
 		require.NoError(t, nErr)
 		_, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()})
@@ -5065,7 +5065,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) {
 			TeamId:      teamId,
 			DisplayName: "Channel name",
 			Name:        "channel-" + model.NewId(),
-			Type:        model.CHANNEL_OPEN,
+			Type:        model.ChannelTypeOpen,
 		}, -1)
 		require.NoError(t, nErr)
 		_, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()})
@@ -5110,7 +5110,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) {
 			TeamId:      teamId1,
 			DisplayName: "Channel name",
 			Name:        "channel-" + model.NewId(),
-			Type:        model.CHANNEL_OPEN,
+			Type:        model.ChannelTypeOpen,
 		}, -1)
 		require.NoError(t, nErr)
 
@@ -5193,7 +5193,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) {
 			TeamId:      teamId,
 			DisplayName: "Channel name",
 			Name:        "channel-" + model.NewId(),
-			Type:        model.CHANNEL_OPEN,
+			Type:        model.ChannelTypeOpen,
 		}, -1)
 		require.NoError(t, nErr)
 		_, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: false, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()})
@@ -5237,7 +5237,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) {
 			TeamId:      teamId,
 			DisplayName: "Channel name",
 			Name:        "channel-" + model.NewId(),
-			Type:        model.CHANNEL_OPEN,
+			Type:        model.ChannelTypeOpen,
 		}, -1)
 		require.NoError(t, nErr)
 		_, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()})
@@ -5327,7 +5327,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) {
 			TeamId:      teamId,
 			DisplayName: "Channel name",
 			Name:        "channel-" + model.NewId(),
-			Type:        model.CHANNEL_OPEN,
+			Type:        model.ChannelTypeOpen,
 		}, -1)
 		require.NoError(t, nErr)
 		_, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: false, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()})
@@ -5370,7 +5370,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) {
 			TeamId:      teamId,
 			DisplayName: "Channel name",
 			Name:        "channel-" + model.NewId(),
-			Type:        model.CHANNEL_OPEN,
+			Type:        model.ChannelTypeOpen,
 		}, -1)
 		require.NoError(t, nErr)
 		_, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: false, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()})
@@ -5413,7 +5413,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) {
 			TeamId:      teamId1,
 			DisplayName: "Channel name",
 			Name:        "channel-" + model.NewId(),
-			Type:        model.CHANNEL_OPEN,
+			Type:        model.ChannelTypeOpen,
 		}, -1)
 		require.NoError(t, nErr)
 
@@ -5633,7 +5633,7 @@ func testGetKnownUsers(t *testing.T, ss store.Store) {
 		TeamId:      teamId,
 		DisplayName: "Profiles in channel",
 		Name:        "profiles-" + model.NewId(),
-		Type:        model.CHANNEL_OPEN,
+		Type:        model.ChannelTypeOpen,
 	}
 	c1, nErr := ss.Channel().Save(ch1, -1)
 	require.NoError(t, nErr)
@@ -5642,7 +5642,7 @@ func testGetKnownUsers(t *testing.T, ss store.Store) {
 		TeamId:      teamId,
 		DisplayName: "Profiles in private",
 		Name:        "profiles-" + model.NewId(),
-		Type:        model.CHANNEL_PRIVATE,
+		Type:        model.ChannelTypePrivate,
 	}
 	c2, nErr := ss.Channel().Save(ch2, -1)
 	require.NoError(t, nErr)
@@ -5651,7 +5651,7 @@ func testGetKnownUsers(t *testing.T, ss store.Store) {
 		TeamId:      teamId,
 		DisplayName: "Profiles in private",
 		Name:        "profiles-" + model.NewId(),
-		Type:        model.CHANNEL_PRIVATE,
+		Type:        model.ChannelTypePrivate,
 	}
 	c3, nErr := ss.Channel().Save(ch3, -1)
 	require.NoError(t, nErr)