From b9842ddd5e5a8e3fcbd1803d71d02f62cf5b1df1 Mon Sep 17 00:00:00 2001 From: yequari Date: Sun, 8 Jun 2025 21:29:17 -0700 Subject: [PATCH] reflect model changes in mocks --- cmd/web/main.go | 6 +-- cmd/web/testutils_test.go | 1 - internal/models/mocks/guestbook.go | 66 ------------------------------ internal/models/mocks/website.go | 27 ++++++++++++ internal/models/user.go | 1 - internal/models/website.go | 4 +- 6 files changed, 33 insertions(+), 72 deletions(-) delete mode 100644 internal/models/mocks/guestbook.go diff --git a/cmd/web/main.go b/cmd/web/main.go index ba9115c..7f22d07 100644 --- a/cmd/web/main.go +++ b/cmd/web/main.go @@ -21,9 +21,9 @@ import ( type application struct { sequence uint16 logger *slog.Logger - websites *models.WebsiteModel - users *models.UserModel - guestbookComments *models.GuestbookCommentModel + websites models.WebsiteModelInterface + users models.UserModelInterface + guestbookComments models.GuestbookCommentModelInterface sessionManager *scs.SessionManager formDecoder *schema.Decoder debug bool diff --git a/cmd/web/testutils_test.go b/cmd/web/testutils_test.go index 2aad5e0..b5267b6 100644 --- a/cmd/web/testutils_test.go +++ b/cmd/web/testutils_test.go @@ -30,7 +30,6 @@ func newTestApplication(t *testing.T) *application { logger: slog.New(slog.NewTextHandler(io.Discard, nil)), sessionManager: sessionManager, websites: &mocks.WebsiteModel{}, - guestbooks: &mocks.GuestbookModel{}, users: &mocks.UserModel{}, guestbookComments: &mocks.GuestbookCommentModel{}, formDecoder: formDecoder, diff --git a/internal/models/mocks/guestbook.go b/internal/models/mocks/guestbook.go deleted file mode 100644 index fcde0a3..0000000 --- a/internal/models/mocks/guestbook.go +++ /dev/null @@ -1,66 +0,0 @@ -package mocks - -import ( - "time" - - "git.32bit.cafe/32bitcafe/guestbook/internal/models" -) - -var mockGuestbook = models.Guestbook{ - ID: 1, - ShortId: 1, - UserId: 1, - WebsiteId: 1, - Created: time.Now(), - IsActive: true, - Settings: models.GuestbookSettings{ - IsCommentingEnabled: true, - IsVisible: true, - FilteredWords: make([]string, 0), - AllowRemoteHostAccess: true, - }, -} - -type GuestbookModel struct{} - -func (m *GuestbookModel) InitializeSettingsMap() error { - return nil -} - -func (m *GuestbookModel) Insert(shortId uint64, userId int64, websiteId int64, settings models.GuestbookSettings) (int64, error) { - return 2, nil -} - -func (m *GuestbookModel) Get(shortId uint64) (models.Guestbook, error) { - switch shortId { - case 1: - return mockGuestbook, nil - default: - return models.Guestbook{}, models.ErrNoRecord - } -} - -func (m *GuestbookModel) GetAll(userId int64) ([]models.Guestbook, error) { - switch userId { - case 1: - return []models.Guestbook{mockGuestbook}, nil - default: - return []models.Guestbook{}, models.ErrNoRecord - } -} - -func (m *GuestbookModel) UpdateGuestbookSettings(guestbookId int64, settings models.GuestbookSettings) error { - return nil -} - -func (m *GuestbookModel) UpdateSetting(guestbookId int64, setting models.Setting, value string) error { - return nil -} - -func (m *GuestbookModel) AddFilteredWord(guestbookId int64, word string) error { - return nil -} - -func (m *GuestbookModel) RemoveFilteredWord(guestbookId int64, word string) error { - return nil -} diff --git a/internal/models/mocks/website.go b/internal/models/mocks/website.go index 77791ff..83cc69e 100644 --- a/internal/models/mocks/website.go +++ b/internal/models/mocks/website.go @@ -6,6 +6,21 @@ import ( "git.32bit.cafe/32bitcafe/guestbook/internal/models" ) +var mockGuestbook = models.Guestbook{ + ID: 1, + ShortId: 1, + UserId: 1, + WebsiteId: 1, + Created: time.Now(), + IsActive: true, + Settings: models.GuestbookSettings{ + IsCommentingEnabled: true, + IsVisible: true, + FilteredWords: make([]string, 0), + AllowRemoteHostAccess: true, + }, +} + var mockWebsite = models.Website{ ID: 1, ShortId: 1, @@ -48,3 +63,15 @@ func (m *WebsiteModel) GetById(id int64) (models.Website, error) { func (m *WebsiteModel) GetAll() ([]models.Website, error) { return []models.Website{mockWebsite}, nil } + +func (m *WebsiteModel) InitializeSettingsMap() error { + return nil +} + +func (m *WebsiteModel) UpdateGuestbookSettings(guestbookId int64, settings models.GuestbookSettings) error { + return nil +} + +func (m *WebsiteModel) UpdateSetting(guestbookId int64, setting models.Setting, value string) error { + return nil +} diff --git a/internal/models/user.go b/internal/models/user.go index a3fa930..f7c5ab0 100644 --- a/internal/models/user.go +++ b/internal/models/user.go @@ -43,7 +43,6 @@ type UserModelInterface interface { GetAll() ([]User, error) Authenticate(email, password string) (int64, error) Exists(id int64) (bool, error) - GetSettings(userId int64) (UserSettings, error) UpdateUserSettings(userId int64, settings UserSettings) error UpdateSetting(userId int64, setting Setting, value string) error } diff --git a/internal/models/website.go b/internal/models/website.go index 7b0e906..53eb35d 100644 --- a/internal/models/website.go +++ b/internal/models/website.go @@ -93,9 +93,11 @@ func (m *WebsiteModel) InitializeSettingsMap() error { type WebsiteModelInterface interface { Insert(shortId uint64, userId int64, siteName, siteUrl, authorName string) (int64, error) Get(shortId uint64) (Website, error) - GetById(id int64) (Website, error) GetAllUser(userId int64) ([]Website, error) GetAll() ([]Website, error) + InitializeSettingsMap() error + UpdateGuestbookSettings(guestbookId int64, settings GuestbookSettings) error + UpdateSetting(guestbookId int64, setting Setting, value string) error } func (m *WebsiteModel) Insert(shortId uint64, userId int64, siteName, siteUrl, authorName string) (int64, error) {