[MM-61302] Use model.NewPointer throughout the code base (mattermost#…

…28957)
Dithn · Oct 29, 2024 · 2424358 · 2424358
1 parent 97c7c25
commit 2424358
Show file tree

Hide file tree

Showing 10 changed files with 804 additions and 849 deletions.
diff --git a/server/channels/api4/bot_test.go b/server/channels/api4/bot_test.go
@@ -204,9 +204,9 @@ func TestPatchBot(t *testing.T) {
 
 		th.TestForSystemAdminAndLocal(t, func(t *testing.T, client *model.Client4) {
 			botPatch := &model.BotPatch{
-				Username:    sToP(GenerateTestUsername()),
-				DisplayName: sToP("an updated bot"),
-				Description: sToP("updated bot"),
+				Username:    model.NewPointer(GenerateTestUsername()),
+				DisplayName: model.NewPointer("an updated bot"),
+				Description: model.NewPointer("updated bot"),
 			}
 			patchedBot, patchResp, err2 := client.PatchBot(context.Background(), createdBot.UserId, botPatch)
 			require.NoError(t, err2)
@@ -231,9 +231,9 @@ func TestPatchBot(t *testing.T) {
 
 		th.TestForSystemAdminAndLocal(t, func(t *testing.T, client *model.Client4) {
 			botPatch := &model.BotPatch{
-				Username:    sToP(GenerateTestUsername()),
-				DisplayName: sToP("an updated bot"),
-				Description: sToP("updated bot"),
+				Username:    model.NewPointer(GenerateTestUsername()),
+				DisplayName: model.NewPointer("an updated bot"),
+				Description: model.NewPointer("updated bot"),
 			}
 			patchedBot, patchResp, err := client.PatchBot(context.Background(), createdBotSystemAdmin.UserId, botPatch)
 			require.NoError(t, err)
@@ -323,9 +323,9 @@ func TestPatchBot(t *testing.T) {
 		}()
 
 		botPatch := &model.BotPatch{
-			Username:    sToP(GenerateTestUsername()),
-			DisplayName: sToP("an updated bot"),
-			Description: sToP("updated bot"),
+			Username:    model.NewPointer(GenerateTestUsername()),
+			DisplayName: model.NewPointer("an updated bot"),
+			Description: model.NewPointer("updated bot"),
 		}
 
 		patchedBot, resp, err := th.Client.PatchBot(context.Background(), createdBot.UserId, botPatch)
@@ -379,9 +379,9 @@ func TestPatchBot(t *testing.T) {
 		}()
 
 		botPatch := &model.BotPatch{
-			Username:    sToP(GenerateTestUsername()),
-			DisplayName: sToP("an updated bot"),
-			Description: sToP("updated bot"),
+			Username:    model.NewPointer(GenerateTestUsername()),
+			DisplayName: model.NewPointer("an updated bot"),
+			Description: model.NewPointer("updated bot"),
 		}
 
 		_, _, err = th.Client.PatchBot(context.Background(), createdBot.UserId, botPatch)
@@ -414,9 +414,9 @@ func TestPatchBot(t *testing.T) {
 		}()
 
 		botPatch := &model.BotPatch{
-			Username:    sToP(GenerateTestUsername()),
-			DisplayName: sToP("an updated bot"),
-			Description: sToP("updated bot"),
+			Username:    model.NewPointer(GenerateTestUsername()),
+			DisplayName: model.NewPointer("an updated bot"),
+			Description: model.NewPointer("updated bot"),
 		}
 
 		_, _, err = th.Client.PatchBot(context.Background(), createdBot.UserId, botPatch)
@@ -449,9 +449,9 @@ func TestPatchBot(t *testing.T) {
 		}()
 
 		botPatch := &model.BotPatch{
-			Username:    sToP(GenerateTestUsername()),
-			DisplayName: sToP("an updated bot"),
-			Description: sToP("updated bot"),
+			Username:    model.NewPointer(GenerateTestUsername()),
+			DisplayName: model.NewPointer("an updated bot"),
+			Description: model.NewPointer("updated bot"),
 		}
 
 		patchedBot, resp, err := th.Client.PatchBot(context.Background(), createdBot.UserId, botPatch)
@@ -491,7 +491,7 @@ func TestPatchBot(t *testing.T) {
 		}()
 
 		botPatch := &model.BotPatch{
-			Username: sToP(GenerateTestUsername()),
+			Username: model.NewPointer(GenerateTestUsername()),
 		}
 
 		patchedBot, resp, err := th.Client.PatchBot(context.Background(), createdBot.UserId, botPatch)
@@ -1546,7 +1546,3 @@ func TestConvertBotToUser(t *testing.T) {
 		CheckNotFoundStatus(t, resp)
 	})
 }
-
-func sToP(s string) *string {
-	return &s
-}
diff --git a/server/channels/api4/config_test.go b/server/channels/api4/config_test.go
@@ -273,7 +273,7 @@ func TestUpdateConfig(t *testing.T) {
 		require.Equal(t, nonEmptyURL, *cfg.ServiceSettings.SiteURL)
 
 		// Check that the Site URL can't be cleared
-		cfg.ServiceSettings.SiteURL = sToP("")
+		cfg.ServiceSettings.SiteURL = model.NewPointer("")
 		cfg, resp, err = th.SystemAdminClient.UpdateConfig(context.Background(), cfg)
 		require.Error(t, err)
 		CheckBadRequestStatus(t, resp)

diff --git a/server/channels/app/bot_test.go b/server/channels/app/bot_test.go
@@ -206,9 +206,9 @@ func TestPatchBot(t *testing.T) {
 		}()
 
 		botPatch := &model.BotPatch{
-			Username:    sToP("invalid username"),
-			DisplayName: sToP("an updated bot"),
-			Description: sToP("updated bot"),
+			Username:    model.NewPointer("invalid username"),
+			DisplayName: model.NewPointer("an updated bot"),
+			Description: model.NewPointer("updated bot"),
 		}
 
 		_, err = th.App.PatchBot(th.Context, bot.UserId, botPatch)
@@ -232,9 +232,9 @@ func TestPatchBot(t *testing.T) {
 		}()
 
 		botPatch := &model.BotPatch{
-			Username:    sToP("username"),
-			DisplayName: sToP("display name"),
-			Description: sToP(strings.Repeat("x", 1025)),
+			Username:    model.NewPointer("username"),
+			DisplayName: model.NewPointer("display name"),
+			Description: model.NewPointer(strings.Repeat("x", 1025)),
 		}
 
 		_, err = th.App.PatchBot(th.Context, bot.UserId, botPatch)
@@ -261,9 +261,9 @@ func TestPatchBot(t *testing.T) {
 		}()
 
 		botPatch := &model.BotPatch{
-			Username:    sToP("username2"),
-			DisplayName: sToP("updated bot"),
-			Description: sToP("an updated bot"),
+			Username:    model.NewPointer("username2"),
+			DisplayName: model.NewPointer("updated bot"),
+			Description: model.NewPointer("an updated bot"),
 		}
 
 		patchedBot, err := th.App.PatchBot(th.Context, createdBot.UserId, botPatch)
@@ -296,7 +296,7 @@ func TestPatchBot(t *testing.T) {
 		}()
 
 		botPatch := &model.BotPatch{
-			Username: sToP(th.BasicUser2.Username),
+			Username: model.NewPointer(th.BasicUser2.Username),
 		}
 
 		_, err = th.App.PatchBot(th.Context, bot.UserId, botPatch)
@@ -927,7 +927,3 @@ func TestGetSystemBot(t *testing.T) {
 		require.Equal(t, bot.UserId, botUser.Id)
 	})
 }
-
-func sToP(s string) *string {
-	return &s
-}