Merge pull request #277 from systemli/Fix-Deleting-Message-Storage

🐛 Fix deleting messages
systemli · Nov 12, 2023 · 8b5bad2 · 8b5bad2
2 parents b320dc0 + 7ef4471
commit 8b5bad2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 29 deletions.
diff --git a/internal/bridge/mock_Bridge.go b/internal/bridge/mock_Bridge.go
diff --git a/internal/storage/mock_Storage.go b/internal/storage/mock_Storage.go
diff --git a/internal/storage/sql_storage.go b/internal/storage/sql_storage.go
@@ -277,17 +277,14 @@ func (s *SqlStorage) SaveMessage(message *Message) error {
 }
 
 func (s *SqlStorage) DeleteMessage(message Message) error {
-	var err error
-	err = s.DB.Delete(&message).Error
-	if err != nil {
-		return err
-	}
-
 	if len(message.Attachments) > 0 {
-		err = s.DeleteAttachmentsByMessage(message)
+		err := s.DB.Where("message_id = ?", message.ID).Delete(&Attachment{}).Error
+		if err != nil {
+			log.WithError(err).WithField("message_id", message.ID).Error("failed to delete attachments")
+		}
 	}
 
-	return err
+	return s.DB.Delete(&message).Error
 }
 
 func (s *SqlStorage) DeleteMessages(ticker Ticker) error {
@@ -305,10 +302,6 @@ func (s *SqlStorage) DeleteMessages(ticker Ticker) error {
 	return s.DB.Where("ticker_id = ?", ticker.ID).Delete(&Message{}).Error
 }
 
-func (s *SqlStorage) DeleteAttachmentsByMessage(message Message) error {
-	return s.DB.Where("message_id = ?", message.ID).Delete(&Attachment{}).Error
-}
-
 func (s *SqlStorage) GetInactiveSettings() InactiveSettings {
 	var setting Setting
 	err := s.DB.First(&setting, "name = ?", SettingInactiveName).Error

diff --git a/internal/storage/storage.go b/internal/storage/storage.go
@@ -39,7 +39,6 @@ type Storage interface {
 	SaveMessage(message *Message) error
 	DeleteMessage(message Message) error
 	DeleteMessages(ticker Ticker) error
-	DeleteAttachmentsByMessage(message Message) error
 	GetInactiveSettings() InactiveSettings
 	GetRefreshIntervalSettings() RefreshIntervalSettings
 	SaveInactiveSettings(inactiveSettings InactiveSettings) error