diff --git a/src/storage/model/model.go b/src/storage/model/model.go index fc232dc..c127ab9 100644 --- a/src/storage/model/model.go +++ b/src/storage/model/model.go @@ -156,6 +156,21 @@ func (s Settings) Map() map[string]any { } } +func SettingsDefault() Settings { + return Settings{ + Filter: "", + Feed: "", + FeedListWidth: 300, + ItemListWidth: 300, + SortNewestFirst: true, + ThemeName: "light", + ThemeFont: "", + ThemeSize: 1, + RefreshRate: 0, + Language: "en", + } +} + type FeedState struct { FeedID int64 LastRefreshed time.Time diff --git a/src/storage/postgres/settings.go b/src/storage/postgres/settings.go index 0fd6aaf..099c23f 100644 --- a/src/storage/postgres/settings.go +++ b/src/storage/postgres/settings.go @@ -7,23 +7,8 @@ import ( "github.com/nkanaev/yarr/src/storage/model" ) -func settingsDefaults() model.Settings { - return model.Settings{ - Filter: "", - Feed: "", - FeedListWidth: 300, - ItemListWidth: 300, - SortNewestFirst: true, - ThemeName: "light", - ThemeFont: "", - ThemeSize: 1, - RefreshRate: 0, - Language: "en", - } -} - func (s *PostgresStorage) GetSettings() model.Settings { - result := settingsDefaults() + result := model.SettingsDefault() rows, err := s.db.Query(`select key, val from settings;`) if err != nil { log.Print(err) diff --git a/src/storage/sqlite/settings.go b/src/storage/sqlite/settings.go index fac3d82..64651f5 100644 --- a/src/storage/sqlite/settings.go +++ b/src/storage/sqlite/settings.go @@ -8,23 +8,8 @@ import ( "github.com/nkanaev/yarr/src/storage/model" ) -func settingsDefaults() model.Settings { - return model.Settings{ - Filter: "", - Feed: "", - FeedListWidth: 300, - ItemListWidth: 300, - SortNewestFirst: true, - ThemeName: "light", - ThemeFont: "", - ThemeSize: 1, - RefreshRate: 0, - Language: "en", - } -} - func (s *SQLiteStorage) GetSettings() model.Settings { - result := settingsDefaults() + result := model.SettingsDefault() rows, err := s.db.Query(`select key, val from settings;`) if err != nil { log.Print(err) diff --git a/src/storage/tests/settings_test.go b/src/storage/tests/settings_test.go index adb33d2..30535f7 100644 --- a/src/storage/tests/settings_test.go +++ b/src/storage/tests/settings_test.go @@ -12,7 +12,7 @@ import ( func TestSettingsDefaults(t *testing.T) { dbtest(t, func(t *testing.T, s storage.Storage) { settings := s.GetSettings() - defaults := settingsDefaults() + defaults := model.SettingsDefault() if !reflect.DeepEqual(settings, defaults) { t.Errorf("expected defaults %+v, got %+v", defaults, settings) @@ -49,7 +49,6 @@ func TestUpdateSettings(t *testing.T) { func TestGetSettings(t *testing.T) { dbtest(t, func(t *testing.T, s storage.Storage) { - s.UpdateSettings(model.UpdateSettingsParams{Language: ptr("fr")}) settings := s.GetSettings() diff --git a/src/storage/tests/storage_test.go b/src/storage/tests/storage_test.go index 9f99783..29b53b1 100644 --- a/src/storage/tests/storage_test.go +++ b/src/storage/tests/storage_test.go @@ -9,7 +9,7 @@ import ( func dbtest(t *testing.T, testcase func(t *testing.T, db storage.Storage)) { testurls := map[string]string{ "sqlite": ":memory:", - "postgres": "postgres://postgres:postgres@localhost:5432/yarr_test", + "postgres": "postgres://postgres:postgres@localhost:5432/yarr_test?sslmode=disable", } for testname, url := range testurls { db, err := storage.New(url)