[MM-55595] Use annotated logger in search layer (#25468)

server/channels/app/file_test.go

@@ -60,7 +60,7 @@ func TestDoUploadFile(t *testing.T) {
 	info1, err := th.App.DoUploadFile(th.Context, time.Date(2007, 2, 4, 1, 2, 3, 4, time.Local), teamID, channelID, userID, filename, data)
 	require.Nil(t, err, "DoUploadFile should succeed with valid data")
 	defer func() {
-		th.App.Srv().Store().FileInfo().PermanentDelete(info1.Id)
+		th.App.Srv().Store().FileInfo().PermanentDelete(th.Context, info1.Id)
 		th.App.RemoveFile(info1.Path)
 	}()
 
@@ -70,7 +70,7 @@ func TestDoUploadFile(t *testing.T) {
 	info2, err := th.App.DoUploadFile(th.Context, time.Date(2007, 2, 4, 1, 2, 3, 4, time.Local), teamID, channelID, userID, filename, data)
 	require.Nil(t, err, "DoUploadFile should succeed with valid data")
 	defer func() {
-		th.App.Srv().Store().FileInfo().PermanentDelete(info2.Id)
+		th.App.Srv().Store().FileInfo().PermanentDelete(th.Context, info2.Id)
 		th.App.RemoveFile(info2.Path)
 	}()
 
@@ -80,7 +80,7 @@ func TestDoUploadFile(t *testing.T) {
 	info3, err := th.App.DoUploadFile(th.Context, time.Date(2008, 3, 5, 1, 2, 3, 4, time.Local), teamID, channelID, userID, filename, data)
 	require.Nil(t, err, "DoUploadFile should succeed with valid data")
 	defer func() {
-		th.App.Srv().Store().FileInfo().PermanentDelete(info3.Id)
+		th.App.Srv().Store().FileInfo().PermanentDelete(th.Context, info3.Id)
 		th.App.RemoveFile(info3.Path)
 	}()
 
@@ -90,7 +90,7 @@ func TestDoUploadFile(t *testing.T) {
 	info4, err := th.App.DoUploadFile(th.Context, time.Date(2009, 3, 5, 1, 2, 3, 4, time.Local), "../../"+teamID, "../../"+channelID, "../../"+userID, "../../"+filename, data)
 	require.Nil(t, err, "DoUploadFile should succeed with valid data")
 	defer func() {
-		th.App.Srv().Store().FileInfo().PermanentDelete(info4.Id)
+		th.App.Srv().Store().FileInfo().PermanentDelete(th.Context, info4.Id)
 		th.App.RemoveFile(info4.Path)
 	}()
 
@@ -117,7 +117,7 @@ func TestUploadFile(t *testing.T) {
 	info1, err = th.App.UploadFile(th.Context, data, channelID, filename)
 	require.Nil(t, err, "UploadFile should succeed with valid data")
 	defer func() {
-		th.App.Srv().Store().FileInfo().PermanentDelete(info1.Id)
+		th.App.Srv().Store().FileInfo().PermanentDelete(th.Context, info1.Id)
 		th.App.RemoveFile(info1.Path)
 	}()
 
@@ -348,17 +348,17 @@ func TestCopyFileInfos(t *testing.T) {
 	info1, err := th.App.DoUploadFile(th.Context, time.Date(2007, 2, 4, 1, 2, 3, 4, time.Local), teamID, channelID, userID, filename, data)
 	require.Nil(t, err)
 	defer func() {
-		th.App.Srv().Store().FileInfo().PermanentDelete(info1.Id)
+		th.App.Srv().Store().FileInfo().PermanentDelete(th.Context, info1.Id)
 		th.App.RemoveFile(info1.Path)
 	}()
 
-	infoIds, err := th.App.CopyFileInfos(userID, []string{info1.Id})
+	infoIds, err := th.App.CopyFileInfos(th.Context, userID, []string{info1.Id})
 	require.Nil(t, err)
 
 	info2, err := th.App.GetFileInfo(th.Context, infoIds[0])
 	require.Nil(t, err)
 	defer func() {
-		th.App.Srv().Store().FileInfo().PermanentDelete(info2.Id)
+		th.App.Srv().Store().FileInfo().PermanentDelete(th.Context, info2.Id)
 		th.App.RemoveFile(info2.Path)
 	}()
 
@@ -404,15 +404,16 @@ func TestSearchFilesInTeamForUser(t *testing.T) {
 
 		fileInfos := make([]*model.FileInfo, 7)
 		for i := 0; i < cap(fileInfos); i++ {
-			fileInfo, err := th.App.Srv().Store().FileInfo().Save(&model.FileInfo{
-				CreatorId: th.BasicUser.Id,
-				PostId:    th.BasicPost.Id,
-				ChannelId: th.BasicPost.ChannelId,
-				Name:      searchTerm,
-				Path:      searchTerm,
-				Extension: "jpg",
-				MimeType:  "image/jpeg",
-			})
+			fileInfo, err := th.App.Srv().Store().FileInfo().Save(th.Context,
+				&model.FileInfo{
+					CreatorId: th.BasicUser.Id,
+					PostId:    th.BasicPost.Id,
+					ChannelId: th.BasicPost.ChannelId,
+					Name:      searchTerm,
+					Path:      searchTerm,
+					Extension: "jpg",
+					MimeType:  "image/jpeg",
+				})
 			time.Sleep(1 * time.Millisecond)
 
 			require.NoError(t, err)
@@ -693,22 +694,23 @@ func TestSetFileSearchableContent(t *testing.T) {
 	th := Setup(t).InitBasic()
 	defer th.TearDown()
 
-	fileInfo, err := th.App.Srv().Store().FileInfo().Save(&model.FileInfo{
-		CreatorId: th.BasicUser.Id,
-		PostId:    th.BasicPost.Id,
-		ChannelId: th.BasicPost.ChannelId,
-		Name:      "test",
-		Path:      "test",
-		Extension: "jpg",
-		MimeType:  "image/jpeg",
-	})
+	fileInfo, err := th.App.Srv().Store().FileInfo().Save(th.Context,
+		&model.FileInfo{
+			CreatorId: th.BasicUser.Id,
+			PostId:    th.BasicPost.Id,
+			ChannelId: th.BasicPost.ChannelId,
+			Name:      "test",
+			Path:      "test",
+			Extension: "jpg",
+			MimeType:  "image/jpeg",
+		})
 	require.NoError(t, err)
 
 	result, appErr := th.App.SearchFilesInTeamForUser(th.Context, "searchable", th.BasicUser.Id, th.BasicTeam.Id, false, false, 0, 0, 60)
 	require.Nil(t, appErr)
 	assert.Equal(t, 0, len(result.Order))
 
-	appErr = th.App.SetFileSearchableContent(fileInfo.Id, "searchable")
+	appErr = th.App.SetFileSearchableContent(th.Context, fileInfo.Id, "searchable")
 	require.Nil(t, appErr)
 
 	result, appErr = th.App.SearchFilesInTeamForUser(th.Context, "searchable", th.BasicUser.Id, th.BasicTeam.Id, false, false, 0, 0, 60)