Migrate Preference.DeleteCategoryAndName to Sync by default (#10940)

app/post.go

@@ -766,8 +766,8 @@ func (a *App) DeletePost(postId, deleteByID string) (*model.Post, *model.AppErro
 }
 
 func (a *App) DeleteFlaggedPosts(postId string) {
-	if result := <-a.Srv.Store.Preference().DeleteCategoryAndName(model.PREFERENCE_CATEGORY_FLAGGED_POST, postId); result.Err != nil {
+	if err := a.Srv.Store.Preference().DeleteCategoryAndName(model.PREFERENCE_CATEGORY_FLAGGED_POST, postId); err != nil {
-		mlog.Warn(fmt.Sprintf("Unable to delete flagged post preference when deleting post, err=%v", result.Err))
+		mlog.Warn(fmt.Sprintf("Unable to delete flagged post preference when deleting post, err=%v", err))
 		return
 	}
 }

store/sqlstore/preference_store.go

@@ -268,17 +268,19 @@ func (s SqlPreferenceStore) DeleteCategory(userId string, category string) store
 	})
 }
 
-func (s SqlPreferenceStore) DeleteCategoryAndName(category string, name string) store.StoreChannel {
+func (s SqlPreferenceStore) DeleteCategoryAndName(category string, name string) *model.AppError {
-	return store.Do(func(result *store.StoreResult) {
+	_, err := s.GetMaster().Exec(
-		if _, err := s.GetMaster().Exec(
+		`DELETE FROM
-			`DELETE FROM
+			Preferences
-				Preferences
+		WHERE
-			WHERE
+			Name = :Name
-				Name = :Name
+			AND Category = :Category`, map[string]interface{}{"Name": name, "Category": category})
-				AND Category = :Category`, map[string]interface{}{"Name": name, "Category": category}); err != nil {
+
-			result.Err = model.NewAppError("SqlPreferenceStore.DeleteCategoryAndName", "store.sql_preference.delete.app_error", nil, err.Error(), http.StatusInternalServerError)
+	if err != nil {
-		}
+		return model.NewAppError("SqlPreferenceStore.DeleteCategoryAndName", "store.sql_preference.delete.app_error", nil, err.Error(), http.StatusInternalServerError)
-	})
+	}
+
+	return nil
 }
 
 func (s SqlPreferenceStore) CleanupFlagsBatch(limit int64) (int64, *model.AppError) {

store/store.go

@@ -434,7 +434,7 @@ type PreferenceStore interface {
 	GetAll(userId string) StoreChannel
 	Delete(userId, category, name string) StoreChannel
 	DeleteCategory(userId string, category string) StoreChannel
-	DeleteCategoryAndName(category string, name string) StoreChannel
+	DeleteCategoryAndName(category string, name string) *model.AppError
 	PermanentDeleteByUser(userId string) *model.AppError
 	IsFeatureEnabled(feature, userId string) StoreChannel
 	CleanupFlagsBatch(limit int64) (int64, *model.AppError)

store/storetest/mocks/PreferenceStore.go

@@ -69,15 +69,15 @@ func (_m *PreferenceStore) DeleteCategory(userId string, category string) store.
 }
 
 // DeleteCategoryAndName provides a mock function with given fields: category, name
-func (_m *PreferenceStore) DeleteCategoryAndName(category string, name string) store.StoreChannel {
+func (_m *PreferenceStore) DeleteCategoryAndName(category string, name string) *model.AppError {
 	ret := _m.Called(category, name)
 
-	var r0 store.StoreChannel
+	var r0 *model.AppError
-	if rf, ok := ret.Get(0).(func(string, string) store.StoreChannel); ok {
+	if rf, ok := ret.Get(0).(func(string, string) *model.AppError); ok {
 		r0 = rf(category, name)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(store.StoreChannel)
+			r0 = ret.Get(0).(*model.AppError)
 		}
 	}
 

store/storetest/preference_store.go

@@ -417,8 +417,8 @@ func testPreferenceDeleteCategoryAndName(t *testing.T, ss store.Store) {
 		t.Fatal("should've returned 1 preference")
 	}
 
-	if result := <-ss.Preference().DeleteCategoryAndName(category, name); result.Err != nil {
+	if err := ss.Preference().DeleteCategoryAndName(category, name); err != nil {
-		t.Fatal(result.Err)
+		t.Fatal(err)
 	}
 
 	if prefs := store.Must(ss.Preference().GetAll(userId)).(model.Preferences); len([]model.Preference(prefs)) != 0 {